fix crash in addressbook, bug #233263.

Package-Manager: portage-2.2_rc3/cvs/Linux 2.6.26-gentoo-mactel x86_64

4 files changed, 121 insertions, 5 deletions

diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog
index c499edd12d9b..45580c2c4cfe 100644
--- a/gnome-extra/evolution-exchange/ChangeLog
+++ b/gnome-extra/evolution-exchange/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/evolution-exchange
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.66 2008/07/30 21:48:30 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.67 2008/08/06 22:32:03 eva Exp $
+
+*evolution-exchange-2.22.3-r1 (06 Aug 2008)
+
+  06 Aug 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/evolution-exchange-2.22.3-addressbook-crash.patch,
+  +evolution-exchange-2.22.3-r1.ebuild:
+  fix crash in addressbook, bug #233263.
 
 *evolution-exchange-2.22.3 (30 Jul 2008)
 
diff --git a/gnome-extra/evolution-exchange/Manifest b/gnome-extra/evolution-exchange/Manifest
index 135d4e7ef782..4850c35e9477 100644
--- a/gnome-extra/evolution-exchange/Manifest
+++ b/gnome-extra/evolution-exchange/Manifest
@@ -3,18 +3,20 @@ Hash: SHA1
 
 AUX evolution-exchange-2.12.3-fix-locks.patch 4460 RMD160 935a763c56441b8c500aa1347aa74f44bb6b8b8b SHA1 e0226c670f6b008111c18ef7ab5137f0b7d85df1 SHA256 434cda88f36a7e145b3730e523c2ff2dcb77c80f3139060bf62a1308f8e8e547
 AUX evolution-exchange-2.12.3-no-libsoup24.patch 3754 RMD160 2b7148cc62028b75f3928f0fe94e91f51b19bc5f SHA1 22dac24671c43da7de5d26911443ebe37dae44fb SHA256 8bd039e257ef86f824775a9b329026e1a13cd8caa4789de21a2a88b83a3c6bc6
+AUX evolution-exchange-2.22.3-addressbook-crash.patch 1605 RMD160 8207035e781604cb8af5a534620f954438da7fe1 SHA1 14b627c06cb594446702e9fe69c3a0dd472f562c SHA256 72eff19232c9f83181c45d2fb8620d61e4757c92711d42a9f1c53c0015bc8623
 DIST evolution-exchange-2.12.3.tar.bz2 1064907 RMD160 751c386011846d630228ba976e203b39e373f782 SHA1 099f61a31528b7cb6f14f382eb39e7e2e110dcd5 SHA256 96f86d5a36f9f5583e5d4c14e6e48d0a42ccd4f7e4e04bf8b5616232cd82b50b
 DIST evolution-exchange-2.22.0.tar.bz2 1091609 RMD160 44e2cce6fc19497175be51a34dc71a01496f9bc4 SHA1 72cca65a863d49169f83b04fd9fa7f42920e5b53 SHA256 fb1296b0690625a3ce3ef196f36857fdd682f8a574c8003f2834bb23659a3b94
 DIST evolution-exchange-2.22.3.tar.bz2 1082324 RMD160 ef81a7ba6cff7d407ff91fea778a0edf1bfe9c99 SHA1 162383003589100f0239612e2d184cb720164de2 SHA256 6c00be9ba87a7c9370cb99bbab030ac220ab396888fdc17e6eb2b2b12939cf89
 EBUILD evolution-exchange-2.12.3-r1.ebuild 1519 RMD160 170a49d22c487abab7f2213d8c49c9cdf0fcb581 SHA1 35bbd469b310c019af26ce8279a4e80356faf6f3 SHA256 29d70844f55824c3b9093ce6f9ceb6022fd585e4d2f5c699cebfd16a8ea92a7f
 EBUILD evolution-exchange-2.22.0.ebuild 1348 RMD160 5099e7ba0356adb387cd9bfaea8b626a75185b62 SHA1 f7537d61e458d222e2f1de85d435c5ce81035c26 SHA256 5e8fbbabcf5a759e4e0033fd09c33d14e4f2b9ace31f173624623e90480ef02a
+EBUILD evolution-exchange-2.22.3-r1.ebuild 1440 RMD160 d1404067d5e686e8666873952445ec895654ab48 SHA1 aedaa4e6befe54198f246ee4b0849b0ca6156492 SHA256 9c6d0b1ea47c55232a19701f27ee286735f33dc9a522b5e22cfa453030eb50c9
 EBUILD evolution-exchange-2.22.3.ebuild 1346 RMD160 50483fe22a3ddd7c9527a88df90dcf55f75a9055 SHA1 e36e03a43ab0b8499f515b9d6c6a58923f3f1336 SHA256 36a5f81e49228c8f0e6f2eca51c85bdb925a87239839910a221b444165258ec7
-MISC ChangeLog 10058 RMD160 95f3d49ce4e4945a23fe550230b4c8ee07a9d575 SHA1 c93cc30252b368abc3a4c118565b964ab3411d3c SHA256 5e97ddeffc16ba99e4169e977674e604c396445e4e4fdacce039e9f0234962f9
+MISC ChangeLog 10299 RMD160 27b1fc2e22a45ce8da9303244901d7c1b35719ab SHA1 06afba017ddf5b2069ac2efc1adefa0d83c1f045 SHA256 575d0cbe0b195d1270fe2677daa008584aeaf6f2661e90ecff1f3393cf897337
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiQ4bYACgkQ1fmVwcYIWAbyMACg4ZdnI5lt5w5HfV7jRXlT3slR
-no8AnAuks/KbbPCTT/Lzk60EbU7uN3nE
-=eO9H
+iEYEARECAAYFAkiaJmoACgkQ1fmVwcYIWAYT7QCg5ed0nR6FjTvwPE7pbh0fPODG
+qEYAniV0rsqB15l/7tsiXccomGYxwNV8
+=3Uf5
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r1.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r1.ebuild
new file mode 100644
index 000000000000..0ee1ebae67c2
--- /dev/null
+++ b/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/evolution-exchange-2.22.3-r1.ebuild,v 1.1 2008/08/06 22:32:03 eva Exp $
+EAPI="1"
+
+inherit gnome2 eutils
+
+DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
+HOMEPAGE="http://www.novell.com/products/desktop/features/evolution.html"
+LICENSE="GPL-2"
+
+SLOT="2.0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE="debug doc static"
+
+RDEPEND="
+	>=mail-client/evolution-2.21.90
+	>=dev-libs/glib-2.15.3
+	>=x11-libs/gtk+-2.10
+	>=gnome-base/gconf-2.0
+	>=gnome-base/libbonobo-2.20.3
+	>=gnome-base/libglade-2.0
+	>=gnome-base/libgnomeui-2.0
+	dev-libs/libxml2
+	net-libs/libsoup:2.4
+	>=gnome-extra/evolution-data-server-2.22.3
+	>=net-nds/openldap-2.1.30-r2"
+
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.35.5
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} $(use_with debug e2k-debug)"
+
+	if ! built_with_use gnome-extra/evolution-data-server ldap || ! built_with_use gnome-extra/evolution-data-server kerberos; then
+		eerror "Please re-emerge gnome-extra/evolution-data-server with"
+		eerror "the use flags ldap and kerberos."
+		die
+	fi
+
+	G2CONF="${G2CONF} $(use_with static static-ldap) --with-openldap"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	epatch "${FILESDIR}/${P}-addressbook-crash.patch"
+}
diff --git a/gnome-extra/evolution-exchange/files/evolution-exchange-2.22.3-addressbook-crash.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.22.3-addressbook-crash.patch
new file mode 100644
index 000000000000..c24f956a1ef0
--- /dev/null
+++ b/gnome-extra/evolution-exchange/files/evolution-exchange-2.22.3-addressbook-crash.patch
@@ -0,0 +1,55 @@
+Index: addressbook/e-book-backend-exchange.c
+===================================================================
+--- addressbook/e-book-backend-exchange.c
++++ addressbook/e-book-backend-exchange.c
+@@ -1766,17 +1766,21 @@ e_book_backend_exchange_build_restrictio
+ 	r = e_sexp_eval (sexp);
+ 	if (r && r->type == ESEXP_RES_UNDEFINED)
+ 		rn = (E2kRestriction *)r->value.string;
+-	else {
+-		g_warning ("conversion to exchange restriction failed");
++	else
+ 		rn = NULL;
+-	}
++
++	if (!rn)
++		g_warning ("conversion to exchange restriction failed, query: '%s'", query ? query : "[null]");
+ 
+ 	e_sexp_result_free (sexp, r);
+ 	e_sexp_unref (sexp);
+ 
+-	if (base_rn) {
++	if (base_rn && rn) {
+ 		e2k_restriction_ref (base_rn);
+ 		rn = e2k_restriction_andv (rn, base_rn, NULL);
++
++		if (!rn)
++			g_warning ("failed to concat with a base_rn, query: '%s'", query ? query : "[null]");
+ 	}
+ 
+ 	return rn;
+@@ -1890,9 +1894,14 @@ e_book_backend_exchange_get_contact_list
+ 
+ 		rn = e_book_backend_exchange_build_restriction (query,
+ 								bepriv->base_rn);
++
++		if (!rn)
++			return GNOME_Evolution_Addressbook_OtherError;
++
+ 		iter = e_folder_exchange_search_start (bepriv->folder, NULL,
+ 					       field_names, n_field_names,
+ 					       rn, NULL, TRUE);
++
+ 		e2k_restriction_unref (rn);
+ 
+ 		*contacts = NULL;
+@@ -1986,6 +1995,9 @@ e_book_backend_exchange_start_book_view 
+ 		rn = e_book_backend_exchange_build_restriction (query,
+ 							bepriv->base_rn);
+ 
++		if (!rn)
++			return;
++
+ 		iter = e_folder_exchange_search_start (bepriv->folder, NULL,
+ 					       field_names, n_field_names,
+ 					       rn, NULL, TRUE);