Add a couple of patches from stable svn to fix SpamAssassin plugin, filtering, crashes in the account prefs dialog, and more (GNOME bugs 552583 and 560420)

Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.5 i686

5 files changed, 339 insertions, 12 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 83405ebabf69..8dfb04ab64f2 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for mail-client/evolution
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.251 2008/12/08 22:04:37 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.252 2008/12/10 18:40:54 ford_prefect Exp $
+
+*evolution-2.24.2-r1 (10 Dec 2008)
+
+  10 Dec 2008; Arun Raghavan <ford_prefect@gentoo.org>
+  +files/evolution-2.24.2-mail-config-crash-fix.patch,
+  +files/evolution-2.24.2-spamassassin-plugin-fix.patch,
+  +evolution-2.24.2-r1.ebuild:
+  Add a couple of patches from stable svn to fix SpamAssassin plugin,
+  filtering, crashes in the account prefs dialog, and more (GNOME bugs
+  552583 and 560420)
 
   08 Dec 2008; Daniel Gryniewicz <dang@gentoo.org> evolution-2.24.2.ebuild:
   evo 2.24 doesn't need gnome-spell for spell checking anymore. Bug #250000
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 3780d76ea435..5d7b41f50a1e 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX evolution-2.10.2-fbsd.patch 1094 RMD160 d1e2ff1fe20f39ea7b2f812ae655f6782485de93 SHA1 74963e72dc0926bb714990432590ff0a1b1bfdba SHA256 226e248ce85db7f6eec28b31e8b69b2adf82e93a11672ee82e0599623247f092
 AUX evolution-2.12.1-mail-remote-broken.patch 563 RMD160 994638aa50c3b1170fb1a70de2999b490f472724 SHA1 58b37ac3463a96789173dbdd55bb72d4e78178a1 SHA256 3d3bc2ab0de5fe6ace2cddad6503287becbeea78e354fbf28337f0af383cb7b4
 AUX evolution-2.12.3-CVE-2008-1108.patch 11469 RMD160 6262f7c3b849a5f1696829a23f2d7ea5e8bfc917 SHA1 fb73dbf2e30efc8b2ece7ac9cab62385d1a1315f SHA256 a51877f82683337d0cccc5e0d94cde8cac17c643ec5be59415dec1cddd06d036
@@ -13,6 +10,8 @@ AUX evolution-2.22.2-CVE-2008-1108.patch 11489 RMD160 93873e431e6d1bc12f2b59d6d3
 AUX evolution-2.22.2-CVE-2008-1109.patch 1441 RMD160 01973241d615cb013dc03a053f0bb9b43a9b7707 SHA1 d9d8bd18f189aef40996a6247622a248ec3c0d52 SHA256 41b90cd2fdae7da61fa1fdfeb4c173272184ff1d89e6cb582863f6c52aefb3f0
 AUX evolution-2.22.2-deleted-mails.patch 3081 RMD160 8682338af8cd34a58160b0f2f46197d615bb219f SHA1 7ef7e767f45d47505676a7368874e63a40aad6ec SHA256 9101120bdce2830dfc6401264647fc41245444a8f08e60237f49b74ab6c6027d
 AUX evolution-2.23.3.1-delete-key.patch 2382 RMD160 41e30f2f9e52c8a1a45db11d12fa5da8eb137c04 SHA1 2df3f06c427072d2de7bf379f6d0b6fedaf2a4e1 SHA256 37809a6b12cb93a6da0cf11a50e33d040380ac31b1377eba867e3a12f92d1cbc
+AUX evolution-2.24.2-mail-config-crash-fix.patch 3869 RMD160 cb6a36fffb92a61edb650e95a1b96131a9d2de8f SHA1 5cba354f5569ca2aea370e694c387e2c151eebc9 SHA256 f85e0f75ec58a235789f01b1b097ee5816fde3d3e97e43ab6356cf9698b6685a
+AUX evolution-2.24.2-spamassassin-plugin-fix.patch 380 RMD160 9e731f7b92a32fe7e1ec009fb0d5053994398b73 SHA1 172b3202e39d24f70b67cdd9d6a4137fb9c0e138 SHA256 4cce0f46f5eb8c57e35a870e47d04f0c9d9216bb0b1ababa482f881d1be2597a
 AUX evolution-CVE-2008-0072.patch 2890 RMD160 8911d13efd9c86d1b95cd844ebeab695e2e80ab6 SHA1 f040da832c681efe7ac85c281ec54f3b991ff6bf SHA256 28a7cda8c1a3aab284d69a7142e74fc345f7130627e180b6de0ae8389e8adbc1
 DIST evolution-2.12.3.tar.bz2 25938535 RMD160 afe803833e213387fde3c180afc91bfc1e792262 SHA1 14861dd497e935074424269f2d1e6c11be56abfe SHA256 1703f6888c1549a1b9b89112bed73504f4ae2db5b2fb8f926adb5cf3a490d6bf
 DIST evolution-2.22.2.tar.bz2 30989731 RMD160 47c1813d564e97a7eca679a9e6c607bd6ac951ee SHA1 ec52b816c95daaa694a0116d32d03832dc95d707 SHA256 5aca34588601ba46f8ec4d81760ca950466eb8a05fc5bf760596a8c7243b1247
@@ -23,13 +22,7 @@ EBUILD evolution-2.12.3-r2.ebuild 6110 RMD160 521fb22abbadca1cf34339827fc47381f9
 EBUILD evolution-2.22.2-r1.ebuild 4719 RMD160 b1b66e529b766a9eccdafb1e87d62c1a1b65fbfc SHA1 8cb974c771126a16e226c72079a398ffa5bc4b2d SHA256 a1a6a6c05f4ede00084a378d39f779665174297a4cf44dd664fe8940fdf9fd04
 EBUILD evolution-2.22.2-r2.ebuild 4820 RMD160 271cc65bb091ff14623e6f48bc9b592470559494 SHA1 2df257de99d5c8a1a929bd9a0e4adb32ce5ea586 SHA256 8130b45a3f9dab10e9c50a7ab2a2bf29690aab7b66bde47f7a113f28f508df2c
 EBUILD evolution-2.22.3.1.ebuild 4624 RMD160 7d6cc692a6a9633023c50154be50d0e5ebb0e308 SHA1 7c80c9592ab8558a91c7abde63b553cf10f26068 SHA256 653c47be0b97086be99e161bfd8542ff9000b22d946ee056a80ac20b5ad7a2b4
+EBUILD evolution-2.24.2-r1.ebuild 4941 RMD160 532401b68b9ad7e9b19730fe5c366e6a1b9c56e9 SHA1 27d65e919d00d81ddd64a4f2c06a2d7f5d5f2f17 SHA256 1c4763d26f9c8b06b6c6cd55bf0ffd49ba1898267252a15415d7da0f622ec60d
 EBUILD evolution-2.24.2.ebuild 4689 RMD160 a782a05c1d63521085adaec5b51eb0522f643384 SHA1 6d52790253c86cae90772a837366241a2c0234e9 SHA256 8e0dd18ecb62a4afcbeb0fc367c7234498bc300f5d3ee76598bc402901372b32
-MISC ChangeLog 60419 RMD160 48676de3c5e421031a541871b99502fb27872035 SHA1 a8157830cdea89c423098f20f85c4f6fbdcd5a01 SHA256 1e2aa71725870e6815e1451130eb066f9183f4071c9b50a6ce9c017d1591cd33
+MISC ChangeLog 60824 RMD160 5485c3638db3d2a0ab95d8cf30037c1d8a0e1740 SHA1 12797768c6afe44107f8cba996abae02eaa17d42 SHA256 9746f9b921ff7f5efe7ae567ecb62f3fc5c2fc27acd27e1f160ed892a3e72691
 MISC metadata.xml 1403 RMD160 46bbe02ca00c865d3f90dd778d2b55cd7583cd42 SHA1 3d67fab1a280a4bf0fe6aad1a5784aeeebf8f1c3 SHA256 98257898dba7e207b5b929feccd3701a932adfe3fc48a9c2ed1abf9d0717dd5e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iD8DBQFJPZoEomPajV0RnrERAg/9AJ9LE/Q1Y+XrO6zlc3FTahC32nvWyACdH/L4
-RtZexzsySvhZZDW50D5ePgI=
-=eTNW
------END PGP SIGNATURE-----
diff --git a/mail-client/evolution/evolution-2.24.2-r1.ebuild b/mail-client/evolution/evolution-2.24.2-r1.ebuild
new file mode 100644
index 000000000000..732a30ce3ed1
--- /dev/null
+++ b/mail-client/evolution/evolution-2.24.2-r1.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.24.2-r1.ebuild,v 1.1 2008/12/10 18:40:54 ford_prefect Exp $
+
+inherit gnome2 flag-o-matic libtool
+
+DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${P}-libtool-hack.patch.bz2"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt dbus debug hal ipv6 kerberos krb4 ldap mono networkmanager nntp pda profile ssl"
+
+# Pango dependency required to avoid font rendering problems
+RDEPEND=">=dev-libs/glib-2.16
+	>=x11-libs/gtk+-2.12
+	>=gnome-extra/evolution-data-server-2.23.91
+	>=x11-themes/gnome-icon-theme-2.20
+	>=gnome-base/libbonobo-2.20.3
+	>=gnome-base/libbonoboui-2.4.2
+	>=gnome-extra/gtkhtml-3.23.5
+	>=gnome-base/gconf-2
+	>=gnome-base/libglade-2
+	>=gnome-base/libgnomecanvas-2
+	>=gnome-base/libgnomeui-2
+	>=dev-libs/libxml2-2
+	>=x11-misc/shared-mime-info-0.22
+	dbus? ( dev-libs/dbus-glib )
+	hal? ( >=sys-apps/hal-0.5.4 )
+	x11-libs/libnotify
+	pda? (
+		>=app-pda/gnome-pilot-2.0.15
+		>=app-pda/gnome-pilot-conduits-2 )
+	dev-libs/atk
+	ssl? (
+		>=dev-libs/nspr-4.6.1
+		>=dev-libs/nss-3.11 )
+	networkmanager? ( net-misc/networkmanager )
+	>=net-libs/libsoup-2.4
+	kerberos? ( virtual/krb5 )
+	krb4? ( virtual/krb5 )
+	>=gnome-base/orbit-2.9.8
+	crypt? ( || ( >=app-crypt/gnupg-2.0.1-r2 =app-crypt/gnupg-1.4* ) )
+	ldap? ( >=net-nds/openldap-2 )
+	mono? ( >=dev-lang/mono-1 )"
+#	gstreamer? (
+#		>=media-libs/gstreamer-0.10
+#		>=media-libs/gst-plugins-base-0.10 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.16
+	>=dev-util/intltool-0.35.5
+	sys-devel/gettext
+	sys-devel/bison
+	app-text/scrollkeeper
+	>=gnome-base/gnome-common-2.12.0
+	>=app-text/gnome-doc-utils-0.9.1"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+ELTCONF="--reverse-deps"
+
+pkg_setup() {
+	G2CONF="--without-kde-applnk-path
+		--enable-plugins=experimental
+		$(use_enable ssl nss)
+		$(use_enable ssl smime)
+		$(use_enable ipv6)
+		$(use_enable mono)
+		$(use_enable nntp)
+		$(use_enable pda pilot-conduits)
+		$(use_enable profile profiling)
+		$(use_with ldap openldap)
+		$(use_with kerberos krb5 /usr)"
+
+	# We need a graphical pinentry frontend to be able to ask for the GPG
+	# password from inside evolution, bug 160302
+	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
+		if ! built_with_use -o app-crypt/pinentry gtk qt3; then
+			die "You must build app-crypt/pinentry with GTK or QT3 support"
+		fi
+	fi
+
+	if use krb4 && ! built_with_use virtual/krb5 krb4; then
+		ewarn
+		ewarn "In order to add kerberos 4 support, you have to emerge"
+		ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well."
+		ewarn
+		ewarn "Skipping for now."
+		ewarn
+		G2CONF="${G2CONF} --without-krb4"
+	else
+		G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)"
+	fi
+
+	# dang - I've changed this to do --enable-plugins=experimental.  This will
+	# autodetect new-mail-notify and exchange, but that cannot be helped for the
+	# moment.  They should be changed to depend on a --enable-<foo> like mono
+	# is.  This cleans up a ton of crap from this ebuild.
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix timezone offsets on fbsd.  bug #183708
+	epatch "${FILESDIR}"/${PN}-2.21.3-fbsd.patch
+
+	# Fix delete keyboard shortcut
+	epatch "${FILESDIR}"/${PN}-2.23.3.1-delete-key.patch
+
+	# Ugly hack, bug #235154
+	epatch "${WORKDIR}/${P}-libtool-hack.patch"
+
+	# Fix crasher in prefs, filtering bug and then some, from GNOME bug #552583
+	epatch "${FILESDIR}"/${P}-mail-config-crash-fix.patch
+
+	# Fix SpamAssassing plugin return value checking
+	epatch "${FILESDIR}"/${P}-spamassassin-plugin-fix.patch
+}
+
+src_compile() {
+	# Use NSS/NSPR only if 'ssl' is enabled.
+	if use ssl ; then
+		sed -i -e "s|mozilla-nss|nss|
+			s|mozilla-nspr|nspr|" "${S}"/configure
+		G2CONF="${G2CONF} --enable-nss=yes"
+	else
+		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
+			--without-nss-libs --without-nss-includes"
+	fi
+
+	# problems with -O3 on gcc-3.3.1
+	replace-flags -O3 -O2
+
+	# Bug #?
+	if [ "${ARCH}" = "hppa" ]; then
+		append-flags "-fPIC -ffunction-sections"
+		export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+	fi
+
+	gnome2_src_compile
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "To change the default browser if you are not using GNOME, do:"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+	elog "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+	elog ""
+	elog "Replace 'mozilla %s' with which ever browser you use."
+	elog ""
+	elog "Junk filters are now a run-time choice. You will get a choice of"
+	elog "bogofilter or spamassassin based on which you have installed"
+	elog ""
+	elog "You have to install one of these for the spam filtering to actually work"
+}
diff --git a/mail-client/evolution/files/evolution-2.24.2-mail-config-crash-fix.patch b/mail-client/evolution/files/evolution-2.24.2-mail-config-crash-fix.patch
new file mode 100644
index 000000000000..4deb64bee159
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.24.2-mail-config-crash-fix.patch
@@ -0,0 +1,154 @@
+--- branches/gnome-2-24/mail/mail-config.c	2008/11/07 06:34:14	36759
++++ branches/gnome-2-24/mail/mail-config.c	2008/12/08 05:56:00	36840
+@@ -778,53 +778,64 @@
+ 	return (EAccount *) e_account_list_find (config->accounts, E_ACCOUNT_FIND_UID, uid);
+ }
+ 
++static gboolean
++mail_config_account_url_equal (const CamelURL *u1,
++                               const CamelURL *u2)
++{
++	/* For the purpose of matching a URL to an EAccount, only compare
++	 * the protocol, user, host and port and disregard the rest. */
++
++	if (g_strcmp0 (u1->protocol, u2->protocol) != 0)
++		return FALSE;
++
++	if (g_strcmp0 (u1->user, u2->user) != 0)
++		return FALSE;
++
++	if (g_strcmp0 (u1->host, u2->host) != 0)
++		return FALSE;
++
++	return (u1->port == u2->port);
++}
++
+ EAccount *
+ mail_config_get_account_by_source_url (const char *source_url)
+ {
+ 	EAccount *account = NULL;
+ 	EIterator *iter;
++	CamelURL *url;
+ 
+ 	g_return_val_if_fail (source_url != NULL, NULL);
+ 
++	url = camel_url_new (source_url, NULL);
++	g_return_val_if_fail (url != NULL, NULL);
++
+ 	iter = e_list_get_iterator ((EList *) config->accounts);
+-	while (e_iterator_is_valid (iter)) {
+-		CamelURL *url;
+-		gchar *string;
++	while (account == NULL && e_iterator_is_valid (iter)) {
++		CamelURL *account_url;
+ 
+ 		account = (EAccount *) e_iterator_get (iter);
+ 
+ 		e_iterator_next (iter);
+ 
+-		if (account->source == NULL)
+-			continue;
+-
+-		else if (account->source->url == NULL)
+-			continue;
+-
+-		else if (*account->source->url == '\0')
++		if ( !account || (account->source == NULL) || 
++			(account->source->url == NULL) || (*account->source->url == '\0')) {
++			account = NULL;
+ 			continue;
++		}
+ 
+-		url = camel_url_new (account->source->url, NULL);
+-		if (url == NULL)
++		account_url = camel_url_new (account->source->url, NULL);
++		if (account_url == NULL)
+ 			continue;
+ 
+-		/* Simplify the account URL for comparison. */
+-		string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
+-		if (string == NULL || strcmp (string, source_url) != 0)
++		if (!mail_config_account_url_equal (url, account_url))
+ 			account = NULL;  /* not a match */
+ 
+-		camel_url_free (url);
+-		g_free (string);
+-
+-		if (account != NULL) {
+-			g_object_unref (iter);
+-			return account;
+-		}
++		camel_url_free (account_url);
+ 	}
+ 
+ 	g_object_unref (iter);
+ 
+-	return NULL;
++	return account;
+ }
+ 
+ EAccount *
+@@ -832,48 +843,40 @@
+ {
+ 	EAccount *account = NULL;
+ 	EIterator *iter;
++	CamelURL *url;
+ 
+ 	g_return_val_if_fail (transport_url != NULL, NULL);
+ 
++	url = camel_url_new (transport_url, NULL);
++	g_return_val_if_fail (url != NULL, NULL);
++
+ 	iter = e_list_get_iterator ((EList *) config->accounts);
+-	while (e_iterator_is_valid (iter)) {
+-		CamelURL *url;
+-		gchar *string;
++	while (account == NULL && e_iterator_is_valid (iter)) {
++		CamelURL *account_url;
+ 
+ 		account = (EAccount *) e_iterator_get (iter);
+ 
+ 		e_iterator_next (iter);
+ 
+-		if (account->transport == NULL)
+-			continue;
+-
+-		else if (account->transport->url == NULL)
+-			continue;
+-
+-		else if (*account->transport->url == '\0')
+-			continue;
++		if ( !account || (account->transport == NULL) || 
++			(account->transport->url == NULL) || (*account->transport->url == '\0')) {
++				account = NULL;
++				continue;
++		}
+ 
+-		url = camel_url_new (account->transport->url, NULL);
+-		if (url == NULL)
++		account_url = camel_url_new (account->transport->url, NULL);
++		if (account_url == NULL)
+ 			continue;
+ 
+-		/* Simplify the account URL for comparison. */
+-		string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
+-		if (string == NULL || strcmp (string, transport_url) != 0)
++		if (!mail_config_account_url_equal (url, account_url))
+ 			account = NULL;  /* not a match */
+ 
+ 		camel_url_free (url);
+-		g_free (string);
+-
+-		if (account != NULL) {
+-			g_object_unref (iter);
+-			return account;
+-		}
+ 	}
+ 
+ 	g_object_unref (iter);
+ 
+-	return NULL;
++	return account;
+ }
+ 
+ int
diff --git a/mail-client/evolution/files/evolution-2.24.2-spamassassin-plugin-fix.patch b/mail-client/evolution/files/evolution-2.24.2-spamassassin-plugin-fix.patch
new file mode 100644
index 000000000000..b791f73408af
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.24.2-spamassassin-plugin-fix.patch
@@ -0,0 +1,11 @@
+--- branches/gnome-2-24/plugins/sa-junk-plugin/em-junk-filter.c	2008/12/03 21:48:56	36828
++++ branches/gnome-2-24/plugins/sa-junk-plugin/em-junk-filter.c	2008/12/03 21:52:13	36829
+@@ -250,7 +250,7 @@
+ 		else
+ 			res = rv_err;
+ 
+-		if (res != 0)
++		if (res >= 64)
+ 			g_set_error (error, EM_JUNK_ERROR, res, _("Pipe to SpamAssassin failed, error code: %d"), res);
+ 
+ 		return res;