dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-evolution-2.22.1.tar.bz2

.gitignore

@@ -0,0 +1 @@
+evolution-2.22.3.1.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: evolution
-# $Id: Makefile,v 1.1 2004/09/09 04:34:33 cvsdist Exp $
-NAME := evolution
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

evolution-2.21.92-CVE-2008-0072.patch

@@ -1,48 +0,0 @@
-diff -up evolution-2.21.92/mail/em-format.c.CVE-2008-0072 evolution-2.21.92/mail/em-format.c
---- evolution-2.21.92/mail/em-format.c.CVE-2008-0072	2008-01-27 22:59:48.000000000 -0500
-+++ evolution-2.21.92/mail/em-format.c	2008-03-04 15:40:29.000000000 -0500
-@@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf
- 	opart = camel_mime_part_new();
- 	valid = camel_cipher_decrypt(context, part, opart, ex);
- 	if (valid == NULL) {
--		em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
-+		em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error"));
- 		em_format_part_as(emf, stream, part, NULL);
- 	} else {
- 		if (emfc == NULL)
-@@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C
- 	if (valid == NULL) {
- 		em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error"));
- 		if (ex->desc)
--			em_format_format_error(emf, stream, ex->desc);
-+			em_format_format_error(emf, stream, "%s", ex->desc);
- 		em_format_part_as(emf, stream, part, "multipart/mixed");
- 	} else {
- 		if (emfc == NULL)
-@@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came
- 		if (valid == NULL) {
- 			em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
- 			if (ex->desc)
--				em_format_format_error(emf, stream, ex->desc);
-+				em_format_format_error(emf, stream, "%s", ex->desc);
- 			em_format_part_as(emf, stream, part, "multipart/mixed");
- 		} else {
- 			if (emfc == NULL)
-@@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came
- 	if (!valid) {
- 		em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature"));
- 		if (ex->desc)
--			em_format_format_error(emf, stream, ex->desc);
-+			em_format_format_error(emf, stream, "%s", ex->desc);
- 		em_format_format_source(emf, stream, ipart);
- 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
- 		camel_exception_free(ex);
-@@ -1658,7 +1658,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C
- 	if (!valid) {
- 		em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error"));
- 		if (ex->desc)
--			em_format_format_error(emf, stream, ex->desc);
-+			em_format_format_error(emf, stream, "%s", ex->desc);
- 		em_format_format_source(emf, stream, ipart);
- 		/* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */
- 		camel_exception_free(ex);

evolution-2.22.0-line-status.patch

@@ -1,185 +0,0 @@
-diff -up evolution-2.22.0/shell/e-shell-nm-glib.c.line-status evolution-2.22.0/shell/e-shell-nm-glib.c
---- evolution-2.22.0/shell/e-shell-nm-glib.c.line-status	2007-11-29 23:23:59.000000000 -0500
-+++ evolution-2.22.0/shell/e-shell-nm-glib.c	2008-03-14 12:13:29.000000000 -0400
-@@ -33,23 +33,40 @@
- static libnm_glib_ctx *nm_ctx = NULL;
- static guint id = 0;
- 
--static void e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data)
-+static void
-+e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data)
- {
- 	libnm_glib_state	state;
--	EShellLineStatus line_status;
- 	EShellWindow *window = E_SHELL_WINDOW (user_data);
- 	EShell *shell = e_shell_window_peek_shell (window);
- 	GNOME_Evolution_ShellState shell_state;
-+	gboolean shell_is_online;
-+	gboolean shell_is_offline;
- 
- 	g_return_if_fail (ctx != NULL);
- 
- 	state = libnm_glib_get_network_state (ctx);
--	line_status = e_shell_get_line_status (shell);
- 
--	if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == LIBNM_NO_NETWORK_CONNECTION) {
-+	switch (e_shell_get_line_status (shell)) {
-+		case E_SHELL_LINE_STATUS_ONLINE:
-+			shell_is_online = TRUE;
-+			shell_is_offline = FALSE;
-+			break;
-+		case E_SHELL_LINE_STATUS_OFFLINE:
-+		case E_SHELL_LINE_STATUS_FORCED_OFFLINE:
-+			shell_is_online = FALSE;
-+			shell_is_offline = TRUE;
-+			break;
-+		default:  /* in-between states */
-+			shell_is_online = FALSE;
-+			shell_is_offline = FALSE;
-+	}
-+
-+	if (shell_is_online && state == LIBNM_NO_NETWORK_CONNECTION) {
- 	   	 shell_state = GNOME_Evolution_FORCED_OFFLINE;
- 		 e_shell_go_offline (shell, window, shell_state);
--	} else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && state == LIBNM_ACTIVE_NETWORK_CONNECTION) {
-+
-+	} else if (shell_is_offline && state == LIBNM_ACTIVE_NETWORK_CONNECTION) {
- 	       	 shell_state = GNOME_Evolution_USER_ONLINE;
- 		 e_shell_go_online (shell, window, shell_state);
- 	}
-@@ -58,15 +75,15 @@ static void e_shell_glib_network_monitor
- int e_shell_nm_glib_initialise (EShellWindow *window);
- void e_shell_nm_glib_dispose (EShellWindow *window);
- 
--int e_shell_nm_glib_initialise (EShellWindow *window)
-+int
-+e_shell_nm_glib_initialise (EShellWindow *window)
- {
--	if (!nm_ctx)
--	{
-+	if (!nm_ctx) {
- 		nm_ctx = libnm_glib_init ();
- 		if (!nm_ctx) {
--				fprintf (stderr, "Could not initialize libnm.\n");
--				return FALSE;
--			  }
-+			g_warning ("Could not initialize libnm.");
-+			return FALSE;
-+		}
- 	}
- 
- 	id = libnm_glib_register_callback (nm_ctx, e_shell_glib_network_monitor, window, NULL);
-@@ -74,7 +91,8 @@ int e_shell_nm_glib_initialise (EShellWi
- 	return TRUE;
- }
- 
--void e_shell_nm_glib_dispose (EShellWindow *window)
-+void
-+e_shell_nm_glib_dispose (EShellWindow *window)
- {
- 	if (id != 0 && nm_ctx != NULL) {
- 		libnm_glib_unregister_callback (nm_ctx, id);
-@@ -83,4 +101,3 @@ void e_shell_nm_glib_dispose (EShellWind
- 		id = 0;
- 	}
- }
--
-diff -up evolution-2.22.0/shell/e-shell-nm.c.line-status evolution-2.22.0/shell/e-shell-nm.c
---- evolution-2.22.0/shell/e-shell-nm.c.line-status	2008-02-22 04:51:05.000000000 -0500
-+++ evolution-2.22.0/shell/e-shell-nm.c	2008-03-14 12:13:29.000000000 -0400
-@@ -35,17 +35,12 @@
- #include <dbus/dbus-glib.h>
- #include <NetworkManager/NetworkManager.h>
- 
--typedef enum _ShellLineStatus {
--	E_SHELL_LINE_DOWN,
--	E_SHELL_LINE_UP
--} ShellLineStatus;
--
--
- static gboolean init_dbus (EShellWindow *window);
-+int e_shell_dbus_initialise (EShellWindow *window);
-+void e_shell_dbus_dispose (EShellWindow *window);
- 
- static DBusConnection *dbus_connection = NULL;
- 
--
- static gboolean
- reinit_dbus (gpointer user_data)
- {
-@@ -63,11 +58,12 @@ e_shell_network_monitor (DBusConnection 
- {
- 	DBusError error;
- 	const char *object;
--	ShellLineStatus status;
- 	EShellWindow *window = NULL;
- 	EShell *shell = NULL;
- 	GNOME_Evolution_ShellState shell_state;
--	EShellLineStatus line_status;
-+	gboolean shell_is_online;
-+	gboolean shell_is_offline;
-+	gboolean network_device_active;
- 
-  	if (!user_data || !E_IS_SHELL_WINDOW (user_data))
-  		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
-@@ -89,9 +85,9 @@ e_shell_network_monitor (DBusConnection 
- 	}
- 
- 	if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive"))
--		status = E_SHELL_LINE_DOWN;
-+		network_device_active = FALSE;
- 	else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive"))
--		status = E_SHELL_LINE_UP;
-+		network_device_active = TRUE;
- 	else
- 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- 
-@@ -99,12 +95,26 @@ e_shell_network_monitor (DBusConnection 
- 				    &object, DBUS_TYPE_INVALID))
- 		return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
- 
--	line_status = e_shell_get_line_status (shell);
-+	switch (e_shell_get_line_status (shell)) {
-+		case E_SHELL_LINE_STATUS_ONLINE:
-+			shell_is_online = TRUE;
-+			shell_is_offline = FALSE;
-+			break;
-+		case E_SHELL_LINE_STATUS_OFFLINE:
-+		case E_SHELL_LINE_STATUS_FORCED_OFFLINE:
-+			shell_is_online = FALSE;
-+			shell_is_offline = TRUE;
-+			break;
-+		default:  /* in-between states */
-+			shell_is_online = FALSE;
-+			shell_is_offline = FALSE;
-+	}
- 
--	if (line_status == E_SHELL_LINE_STATUS_ONLINE && status == E_SHELL_LINE_DOWN) {
-+	if (shell_is_online && !network_device_active) {
- 		  shell_state = GNOME_Evolution_FORCED_OFFLINE;
- 		  e_shell_go_offline (shell, window, shell_state);
--	} else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && status == E_SHELL_LINE_UP) {
-+
-+	} else if (shell_is_offline && network_device_active) {
- 		  shell_state = GNOME_Evolution_USER_ONLINE;
- 		  e_shell_go_online (shell, window, shell_state);
- 	}
-@@ -153,14 +163,16 @@ init_dbus (EShellWindow *window)
- 	return FALSE;
- }
- 
--int e_shell_dbus_initialise (EShellWindow *window)
-+int
-+e_shell_dbus_initialise (EShellWindow *window)
- {
- 	g_type_init ();
- 
- 	return init_dbus (window);
- }
- 
--void e_shell_dbus_dispose (EShellWindow *window)
-+void
-+e_shell_dbus_dispose (EShellWindow *window)
- {
- 	//FIXME
- 	return;

evolution.spec

@@ -45,7 +45,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.22.1
+Version: 2.22.3.1
 Release: 1%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
@@ -81,9 +81,6 @@ Patch14: evolution-2.7.1-no-gnome-common.patch
 # RH bug #176400
 Patch15: evolution-2.9.1-im-context-reset.patch
 
-# RH bug #437208 / GNOME bug #518103
-Patch16: evolution-2.22.0-line-status.patch
-
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -173,7 +170,7 @@ personal information-management tool.
 %package devel
 Group: Development/Libraries
 Summary: Development files for building against %{name}
-Requires: %{name} = %{version}
+Requires: %{name} = %{version}-%{release}
 Requires: evolution-data-server-devel >= %{eds_version}
 Requires: gtkhtml3-devel >= %{gtkhtml_version}
 Requires: libsoup-devel >= %{soup_version}
@@ -229,7 +226,6 @@ This package contains the plugin to filter junk mail using SpamAssassin.
 %patch13 -p1 -b .fix-conduit-dir
 %patch14 -p1 -b .no-gnome-common
 %patch15 -p1 -b .im-context-reset
-%patch16 -p1 -b .line-status
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -657,6 +653,24 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Mon Jun 30 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.3.1-1.fc9
+- Update to 2.22.3.1
+- Removed patches for RH bug #449924 (fixed upstream).
+
+* Wed Jun 04 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.2-2.fc9
+- Add patches for RH bug #449924 (buffer overflow vulnerabilities).
+
+* Mon May 26 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.2-1.fc9
+- Update to 2.22.2
+
+* Fri May 02 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1.1-1.fc9
+- Update to 2.22.1.1
+- Remove patch for RH bug #437208 (fixed upstream).
+- Remove patch for GNOME bug #524121 (fixed upstream).
+
+* Tue Apr 29 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1-2.fc9
+- Add patch for GNOME bug #524121 (double free).
+
 * Mon Apr 07 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1-1.fc9
 - Update to 2.22.1
 - Remove patch for GNOME bug #524310 (fixed upstream).

sources

@@ -1 +1 @@
-b8eddd6e26b59b1fe6ad0ae849916836  evolution-2.22.1.tar.bz2
+5be2cb0584344cfe7bb4944c2fe468be  evolution-2.22.3.1.tar.bz2