summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArun Raghavan <ford_prefect@gentoo.org>2008-12-27 19:22:51 +0000
committerArun Raghavan <ford_prefect@gentoo.org>2008-12-27 19:22:51 +0000
commit578e9df98c6a5dd0c54626039060ad08b1d388da (patch)
tree0fdd526be1aa7139826d018da05423a422a3a94d /mail-client/evolution
parentVersion bump, thanks to Viaken (bug #250304). (diff)
downloadhistorical-578e9df98c6a5dd0c54626039060ad08b1d388da.tar.gz
historical-578e9df98c6a5dd0c54626039060ad08b1d388da.tar.bz2
historical-578e9df98c6a5dd0c54626039060ad08b1d388da.zip
Update the mail-config.c patch to fix some more leaks (especially w.r.t. Exchange). Thanks to Derek Dolney <nospam@dolney.com> for finding the cause. Bug #251060
Package-Manager: portage-2.2_rc17/cvs/Linux 2.6.27.5 i686
Diffstat (limited to 'mail-client/evolution')
-rw-r--r--mail-client/evolution/ChangeLog11
-rw-r--r--mail-client/evolution/Manifest4
-rw-r--r--mail-client/evolution/evolution-2.24.2-r2.ebuild159
-rw-r--r--mail-client/evolution/files/evolution-2.24.2-r2-mail-config-crash-fix.patch161
4 files changed, 333 insertions, 2 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 4b22e6f0c965..61f05284f519 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,15 @@
# 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.253 2008/12/10 18:58:44 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.254 2008/12/27 19:22:51 ford_prefect Exp $
+
+*evolution-2.24.2-r2 (27 Dec 2008)
+
+ 27 Dec 2008; Arun Raghavan <ford_prefect@gentoo.org>
+ +files/evolution-2.24.2-r2-mail-config-crash-fix.patch,
+ +evolution-2.24.2-r2.ebuild:
+ Update the mail-config.c patch to fix some more leaks (especially w.r.t.
+ Exchange). Thanks to Derek Dolney <nospam@dolney.com> for finding the
+ cause. Bug #251060
10 Dec 2008; Arun Raghavan <ford_prefect@gentoo.org>
evolution-2.24.2-r1.ebuild:
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index a0516c259d3c..3c7bd21537b7 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -11,6 +11,7 @@ AUX evolution-2.22.2-CVE-2008-1109.patch 1441 RMD160 01973241d615cb013dc03a053f0
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-r2-mail-config-crash-fix.patch 4004 RMD160 ae7ea2fcfe473512197ae1070a96a1a14cc81272 SHA1 7b573a74a30b036b2fce21f62910579632cb87d3 SHA256 0d6065ae41c8f14426ed3c6ca2d5281a257ba47d209ba24cac466361de7e667f
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
@@ -23,6 +24,7 @@ EBUILD evolution-2.22.2-r1.ebuild 4719 RMD160 b1b66e529b766a9eccdafb1e87d62c1a1b
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 4926 RMD160 fa23aa806869fa42b6da5cf1892811b02a111fb3 SHA1 92da2c594bc58a7d9da8968b840c426b475a5d39 SHA256 74677adcdbc87109b81b22796c68b65527f569784643c4cad4c4b9e669229340
+EBUILD evolution-2.24.2-r2.ebuild 4927 RMD160 19f6d5bbb1e9cd6bc450dc89d667432f6512a3d4 SHA1 c97fab91c8e91802cf0cfa7e205de4bdb0a9b02e SHA256 934ff1afc0e057a4b87aa93278cfd39e2b2c413331d9eae5e811c62e3d48e41b
EBUILD evolution-2.24.2.ebuild 4689 RMD160 a782a05c1d63521085adaec5b51eb0522f643384 SHA1 6d52790253c86cae90772a837366241a2c0234e9 SHA256 8e0dd18ecb62a4afcbeb0fc367c7234498bc300f5d3ee76598bc402901372b32
-MISC ChangeLog 60976 RMD160 983ea8ea3b11a30ed9b33ddb3c7d8dc93f679fea SHA1 780443b2920fc245732598e8b416ca490f0757bc SHA256 187c8851713e8d9a06532768bba33625e98223c2ab3c21f31d367da6bfe8eb2c
+MISC ChangeLog 61325 RMD160 59681313b65a27e97d8019b9318e57584e42ad1c SHA1 f1bd518533d13d555f3b8ea9f9d93c17c38bedb5 SHA256 822fa01719d8450f6fbc6a359055287f59e0d77e3b874311e0ea9039816dc52e
MISC metadata.xml 1403 RMD160 46bbe02ca00c865d3f90dd778d2b55cd7583cd42 SHA1 3d67fab1a280a4bf0fe6aad1a5784aeeebf8f1c3 SHA256 98257898dba7e207b5b929feccd3701a932adfe3fc48a9c2ed1abf9d0717dd5e
diff --git a/mail-client/evolution/evolution-2.24.2-r2.ebuild b/mail-client/evolution/evolution-2.24.2-r2.ebuild
new file mode 100644
index 000000000000..14149bfbc9a3
--- /dev/null
+++ b/mail-client/evolution/evolution-2.24.2-r2.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-r2.ebuild,v 1.1 2008/12/27 19:22:51 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 hal 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"
+GCONF_DEBUG="no"
+
+pkg_setup() {
+ G2CONF="--without-kde-applnk-path
+ --enable-plugins=experimental
+ $(use_enable ssl nss)
+ $(use_enable ssl smime)
+ $(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}"/${PF}-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-r2-mail-config-crash-fix.patch b/mail-client/evolution/files/evolution-2.24.2-r2-mail-config-crash-fix.patch
new file mode 100644
index 000000000000..3340a00c5ea7
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2.24.2-r2-mail-config-crash-fix.patch
@@ -0,0 +1,161 @@
+--- 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/16 12:29:17 36904
+@@ -778,53 +778,67 @@
+ 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) {
++ account = 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);
++ camel_url_free (url);
+
+- return NULL;
++ return account;
+ }
+
+ EAccount *
+@@ -832,48 +846,43 @@
+ {
+ 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) {
++ account = 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;
+- }
++ camel_url_free (account_url);
+ }
+
+ g_object_unref (iter);
++ camel_url_free (url);
+
+- return NULL;
++ return account;
+ }
+
+ int