From ab3512b339b166be9c856369de9fd8bb5f6d42df Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Wed, 24 Feb 2010 22:49:07 +0000 Subject: [PATCH] Clean up old revisions. Package-Manager: portage-2.2_rc63/cvs/Linux x86_64 --- gnome-extra/evolution-data-server/ChangeLog | 13 +- .../evolution-data-server-2.24.5-r3.ebuild | 128 ---------------- .../evolution-data-server-2.28.1.ebuild | 118 -------------- ...volution-data-server-1.11.3-no-libdb.patch | 13 -- ...olution-data-server-2.23.6-as-needed.patch | 54 ------- ...ion-data-server-2.24.5-CVE-2009-0547.patch | 105 ------------- ...volution-data-server-2.24.5-fix-body.patch | 34 ----- ...ta-server-2.26.2-as-needed-configure.patch | 33 ---- .../evolution-data-server-CVE-2009-0582.patch | 144 ------------------ gnome-extra/evolution-exchange/ChangeLog | 8 +- .../evolution-exchange-2.24.5.ebuild | 55 ------- .../evolution-exchange-2.28.1.ebuild | 58 ------- ...on-exchange-2.22.3-addressbook-crash.patch | 55 ------- ...ion-exchange-2.22.3-exchange-contact.patch | 76 --------- 14 files changed, 19 insertions(+), 875 deletions(-) delete mode 100644 gnome-extra/evolution-data-server/evolution-data-server-2.24.5-r3.ebuild delete mode 100644 gnome-extra/evolution-data-server/evolution-data-server-2.28.1.ebuild delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-fix-body.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch delete mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-CVE-2009-0582.patch delete mode 100644 gnome-extra/evolution-exchange/evolution-exchange-2.24.5.ebuild delete mode 100644 gnome-extra/evolution-exchange/evolution-exchange-2.28.1.ebuild delete mode 100644 gnome-extra/evolution-exchange/files/evolution-exchange-2.22.3-addressbook-crash.patch delete mode 100644 gnome-extra/evolution-exchange/files/evolution-exchange-2.22.3-exchange-contact.patch diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index f2ef7e00d83b..b1dbd30df7a3 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.253 2010/01/18 00:03:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.254 2010/02/24 22:46:00 eva Exp $ + + 24 Feb 2010; Gilles Dartiguelongue + -files/evolution-data-server-1.11.3-no-libdb.patch, + -files/evolution-data-server-2.23.6-as-needed.patch, + -evolution-data-server-2.24.5-r3.ebuild, + -files/evolution-data-server-2.24.5-CVE-2009-0547.patch, + -files/evolution-data-server-2.24.5-fix-body.patch, + -files/evolution-data-server-2.26.2-as-needed-configure.patch, + -evolution-data-server-2.28.1.ebuild, + -files/evolution-data-server-CVE-2009-0582.patch: + Clean up old revisions. 18 Jan 2010; Jeroen Roovers evolution-data-server-2.26.3.ebuild: diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.24.5-r3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.24.5-r3.ebuild deleted file mode 100644 index 4d15b29c3241..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-2.24.5-r3.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.24.5-r3.ebuild,v 1.8 2010/01/17 06:51:11 ulm Exp $ - -EAPI="2" - -inherit db-use eutils flag-o-matic gnome2 autotools versionator - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="http://www.gnome.org/projects/evolution/" - -LICENSE="LGPL-2 BSD DB" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl" - -RDEPEND=">=dev-libs/glib-2.16.1 - >=x11-libs/gtk+-2.10 - >=gnome-base/orbit-2.9.8 - >=gnome-base/libbonobo-2.20.3 - >=gnome-base/gconf-2 - >=gnome-base/libglade-2 - >=gnome-base/libgnome-2 - >=dev-libs/libxml2-2 - >=net-libs/libsoup-2.4 - gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) - >=dev-db/sqlite-3.5 - ssl? ( - >=dev-libs/nspr-4.4 - >=dev-libs/nss-3.9 ) - >=gnome-base/libgnomeui-2 - sys-libs/zlib - =sys-libs/db-4* - ldap? ( >=net-nds/openldap-2.0 ) - kerberos? ( virtual/krb5 ) - krb4? ( app-crypt/mit-krb5[krb4] )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35.5 - >=gnome-base/gnome-common-2 - >=dev-util/gtk-doc-am-1.9 - doc? ( >=dev-util/gtk-doc-1.9 )" - -DOCS="ChangeLog MAINTAINERS NEWS TODO" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_with ldap openldap) - $(use_with krb4 krb4 /usr) - $(use_with kerberos krb5 /usr) - $(use_enable ssl nss) - $(use_enable ssl smime) - $(use_enable ipv6) - $(use_enable gnome-keyring) - --with-libdb=/usr/$(get_libdir)" -} - -src_prepare() { - gnome2_src_prepare - - # Adjust to gentoo's /etc/service - epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch - - # Fix broken libdb build - epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch - - # Rewind in camel-disco-diary to fix a crash - epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch - - # Fix building evo-exchange with --as-needed, upstream bug #342830 - epatch "${FILESDIR}"/${PN}-2.23.6-as-needed.patch - - # Fix S/MIME verification. Bug #258867 - epatch "${FILESDIR}"/${P}-CVE-2009-0547.patch - - # Fix S/MIME message display, bug #258867 - epatch "${FILESDIR}"/${P}-fix-body.patch - - # Fix NTLM SASL authentication. Bug #261203 - epatch "${FILESDIR}"/${PN}-CVE-2009-0582.patch - - if use doc; then - sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \ - -i gtk-doc.make || die "sed 1 failed" - else - sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \ - -i gtk-doc.make || die "sed 2 failed" - fi - - # gtk-doc-am and gnome-common needed for this - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - - # 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 || die "sed failed" - G2CONF="${G2CONF} --enable-nss=yes" - else - G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \ - --without-nss-libs --without-nss-includes" - fi - - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" -} - -src_install() { - gnome2_src_install - - if use ldap; then - MY_MAJORV=$(get_version_component_range 1-2) - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema || die "doins failed" - dosym "${D}"/usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if use ldap; then - elog "" - elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema" - fi -} diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.28.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.28.1.ebuild deleted file mode 100644 index 54fb13913ff4..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-2.28.1.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.28.1.ebuild,v 1.3 2010/01/17 06:51:11 ulm Exp $ - -EAPI="2" - -inherit db-use eutils flag-o-matic gnome2 versionator - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="http://www.gnome.org/projects/evolution/" - -LICENSE="LGPL-2 BSD DB" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl" - -RDEPEND=">=dev-libs/glib-2.16.1 - >=x11-libs/gtk+-2.14 - >=gnome-base/orbit-2.9.8 - >=gnome-base/libbonobo-2.20.3 - >=gnome-base/gconf-2 - >=gnome-base/libglade-2 - >=dev-libs/libxml2-2 - >=net-libs/libsoup-2.4 - >=dev-libs/libgweather-2.25.4 - >=dev-libs/libical-0.43 - gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) - >=dev-db/sqlite-3.5 - ssl? ( - >=dev-libs/nspr-4.4 - >=dev-libs/nss-3.9 ) - sys-libs/zlib - =sys-libs/db-4* - ldap? ( >=net-nds/openldap-2.0 ) - kerberos? ( virtual/krb5 ) - krb4? ( app-crypt/mit-krb5[krb4] )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.9 - >=dev-util/intltool-0.35.5 - >=gnome-base/gnome-common-2 - >=dev-util/gtk-doc-am-1.9 - doc? ( >=dev-util/gtk-doc-1.9 )" - -DOCS="ChangeLog MAINTAINERS NEWS TODO" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_with ldap openldap) - $(use_with krb4 krb4 /usr) - $(use_with kerberos krb5 /usr) - $(use_enable ssl nss) - $(use_enable ssl smime) - $(use_enable ipv6) - $(use_enable gnome-keyring) - --with-weather - --with-libdb=/usr/$(get_libdir)" -} - -src_prepare() { - gnome2_src_prepare - - # Adjust to gentoo's /etc/service - epatch "${FILESDIR}/${PN}-2.28.0-gentoo_etc_services.patch" - - # Rewind in camel-disco-diary to fix a crash - epatch "${FILESDIR}/${PN}-1.8.0-camel-rewind.patch" - - if use doc; then - sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \ - -i gtk-doc.make || die "sed 1 failed" - else - sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \ - -i gtk-doc.make || die "sed 2 failed" - fi - - # 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 || die "sed failed" - G2CONF="${G2CONF} --enable-nss=yes" - else - G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \ - --without-nss-libs --without-nss-includes" - fi - - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" - - # FIXME: Fix compilation flags crazyness - sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \ - -i configure.ac configure || die "sed 3 failed" - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ - || die "intltool rules fix failed" -} - -src_install() { - gnome2_src_install - - if use ldap; then - MY_MAJORV=$(get_version_component_range 1-2) - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema || die "doins failed" - dosym "${D}"/usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} - -pkg_postinst() { - gnome2_pkg_postinst - - if use ldap; then - elog "" - elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema" - fi -} diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch deleted file mode 100644 index b2b7769289e8..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-1.11.3-no-libdb.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-1.11.3.orig/configure.in evolution-data-server-1.11.3/configure.in ---- evolution-data-server-1.11.3.orig/configure.in 2007-06-04 06:50:47.000000000 -0400 -+++ evolution-data-server-1.11.3/configure.in 2007-06-07 10:58:22.000000000 -0400 -@@ -1431,9 +1431,6 @@ export privdatadir - if test $enable_calendar = yes; then - AC_CONFIG_SUBDIRS(calendar/libical) - fi --if test $dynamic_libdb = no; then -- AC_CONFIG_SUBDIRS(libdb/dist) --fi - AC_OUTPUT([ - Makefile - evolution-data-server-zip diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch deleted file mode 100644 index 57d10c82b2e4..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am evolution-data-server-2.23.6/addressbook/backends/Makefile.am ---- evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am 2008-08-04 00:28:27.000000000 -0400 -+++ evolution-data-server-2.23.6/addressbook/backends/Makefile.am 2008-08-05 12:26:15.000000000 -0400 -@@ -4,4 +4,4 @@ else - LDAP_SUBDIR = - endif - --SUBDIRS = file vcf $(LDAP_SUBDIR) google groupwise webdav -+SUBDIRS = file vcf $(LDAP_SUBDIR) -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am evolution-data-server-2.23.6/calendar/backends/Makefile.am ---- evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am 2008-04-11 07:10:31.000000000 -0400 -+++ evolution-data-server-2.23.6/calendar/backends/Makefile.am 2008-08-05 12:25:51.000000000 -0400 -@@ -1 +1 @@ --SUBDIRS = file groupwise http contacts weather caldav google -+SUBDIRS = file http contacts weather caldav -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/camel/providers/Makefile.am evolution-data-server-2.23.6/camel/providers/Makefile.am ---- evolution-data-server-2.23.6.orig/camel/providers/Makefile.am 2008-08-01 02:34:59.000000000 -0400 -+++ evolution-data-server-2.23.6/camel/providers/Makefile.am 2008-08-05 12:26:59.000000000 -0400 -@@ -21,6 +21,6 @@ else - SENDMAIL_DIR=sendmail - endif - --SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise $(HULA_DIR) -+SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) $(HULA_DIR) - - -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/Makefile.am evolution-data-server-2.23.6/Makefile.am ---- evolution-data-server-2.23.6.orig/Makefile.am 2008-08-01 02:35:37.000000000 -0400 -+++ evolution-data-server-2.23.6/Makefile.am 2008-08-05 12:28:22.000000000 -0400 -@@ -7,9 +7,12 @@ endif - - if ENABLE_CALENDAR - CALENDAR_DIR = calendar -+CALENDAR_LATER = calendar/backends/groupwise calendar/backends/google - endif - --SUBDIRS = $(LIBDB) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po -+LATER = camel/providers/groupwise addressbook/backends/groupwise addressbook/backends/google addressbook/backends/webdav $(CALENDAR_LATER) -+ -+SUBDIRS = $(LIBDB) win32 libedataserver libebackend camel addressbook $(CALENDAR_DIR) libedataserverui servers $(LATER) src docs art po - DIST_SUBDIRS= win32 libedataserver libebackend servers camel addressbook calendar libedataserverui src docs art po - changelogs = \ - ChangeLog -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am ---- evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am 2008-04-11 07:10:16.000000000 -0400 -+++ evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am 2008-08-05 12:25:51.000000000 -0400 -@@ -64,6 +64,7 @@ libexchange_storage_1_2_la_LIBADD = \ - $(top_builddir)/servers/exchange/lib/libexchange.la \ - $(top_builddir)/servers/exchange/xntlm/libxntlm.la \ - $(top_builddir)/libedataserver/libedataserver-1.2.la \ -+ $(top_builddir)/libedataserverui/libedataserverui-1.2.la \ - $(E_DATA_SERVER_LIBS) \ - $(E_DATA_SERVER_UI_LIBS) \ - $(LDAP_LIBS) \ diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch deleted file mode 100644 index b527c8021ba1..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-CVE-2009-0547.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.24.5.orig/camel/camel-smime-context.c evolution-data-server-2.24.5/camel/camel-smime-context.c ---- evolution-data-server-2.24.5.orig/camel/camel-smime-context.c 2008-09-22 06:53:58.000000000 -0400 -+++ evolution-data-server-2.24.5/camel/camel-smime-context.c 2009-03-07 14:52:57.000000000 -0500 -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - #include - -@@ -534,6 +535,7 @@ sm_verify_cmsg(CamelCipherContext *conte - for (i = 0; i < count; i++) { - NSSCMSContentInfo *cinfo = NSS_CMSMessage_ContentLevel(cmsg, i); - SECOidTag typetag = NSS_CMSContentInfo_GetContentTypeTag(cinfo); -+ int which_digest; - - switch (typetag) { - case SEC_OID_PKCS7_SIGNED_DATA: -@@ -543,44 +545,49 @@ sm_verify_cmsg(CamelCipherContext *conte - goto fail; - } - -- /* need to build digests of the content */ -- if (!NSS_CMSSignedData_HasDigests(sigd)) { -- if (extstream == NULL) { -- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data")); -- goto fail; -- } -- -- if ((poolp = PORT_NewArena(1024)) == NULL) { -- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM)); -- goto fail; -- } -- -- digestalgs = NSS_CMSSignedData_GetDigestAlgs(sigd); -- -- digcx = NSS_CMSDigestContext_StartMultiple(digestalgs); -- if (digcx == NULL) { -- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests")); -- goto fail; -- } -- -- mem = (CamelStreamMem *)camel_stream_mem_new(); -- camel_stream_write_to_stream(extstream, (CamelStream *)mem); -- NSS_CMSDigestContext_Update(digcx, mem->buffer->data, mem->buffer->len); -- camel_object_unref(mem); -- -- if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) { -- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests")); -- goto fail; -- } -- -- if (NSS_CMSSignedData_SetDigests(sigd, digestalgs, digests) != SECSuccess) { -- camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests")); -- goto fail; -- } - -- PORT_FreeArena(poolp, PR_FALSE); -- poolp = NULL; -+ if (extstream == NULL) { -+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Digests missing from enveloped data")); -+ goto fail; -+ } -+ -+ if ((poolp = PORT_NewArena(1024)) == NULL) { -+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, g_strerror (ENOMEM)); -+ goto fail; - } -+ -+ digestalgs = NSS_CMSSignedData_GetDigestAlgs(sigd); -+ -+ digcx = NSS_CMSDigestContext_StartMultiple(digestalgs); -+ if (digcx == NULL) { -+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests")); -+ goto fail; -+ } -+ -+ mem = (CamelStreamMem *)camel_stream_mem_new(); -+ camel_stream_write_to_stream(extstream, (CamelStream *)mem); -+ NSS_CMSDigestContext_Update(digcx, mem->buffer->data, mem->buffer->len); -+ camel_object_unref(mem); -+ -+ if (NSS_CMSDigestContext_FinishMultiple(digcx, poolp, &digests) != SECSuccess) { -+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot calculate digests")); -+ goto fail; -+ } -+ -+ for (which_digest = 0; digests[which_digest] != NULL; which_digest++) { -+ SECOidData *digest_alg = SECOID_FindOID (&digestalgs[which_digest]->algorithm); -+ if (digest_alg == NULL) { -+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests")); -+ goto fail; -+ } -+ if (NSS_CMSSignedData_SetDigestValue (sigd, digest_alg->offset, digests[which_digest]) != SECSuccess) { -+ camel_exception_set (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot set message digests")); -+ goto fail; -+ } -+ } -+ -+ PORT_FreeArena(poolp, PR_FALSE); -+ poolp = NULL; - - /* import all certificates present */ - if (NSS_CMSSignedData_ImportCerts(sigd, p->certdb, certUsageEmailSigner, PR_TRUE) != SECSuccess) { diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-fix-body.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-fix-body.patch deleted file mode 100644 index 2671d0de0000..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.24.5-fix-body.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dcd2f9ebc6c66ab1c068764da3b528f8fbfeb8b5 Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 31 Mar 2009 11:54:36 +0000 -Subject: [PATCH] ** Fix for bug #564465 - -2009-03-31 Milan Crha - - ** Fix for bug #564465 - - * camel-smime-context.c: (sm_decrypt): - Pass correct body for signature verification. - -svn path=/trunk/; revision=10194 ---- - camel/camel-smime-context.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/camel/camel-smime-context.c b/camel/camel-smime-context.c -index 7470953..1913d6a 100644 ---- a/camel/camel-smime-context.c -+++ b/camel/camel-smime-context.c -@@ -963,7 +963,8 @@ sm_decrypt(CamelCipherContext *context, CamelMimePart *ipart, CamelMimePart *opa - camel_data_wrapper_construct_from_stream((CamelDataWrapper *)opart, ostream); - - if (NSS_CMSMessage_IsSigned(cmsg)) { -- valid = sm_verify_cmsg(context, cmsg, NULL, ex); -+ camel_stream_reset (ostream); -+ valid = sm_verify_cmsg (context, cmsg, ostream, ex); - } else { - valid = camel_cipher_validity_new(); - valid->encrypt.description = g_strdup(_("Encrypted content")); --- -1.6.3.3 - diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch deleted file mode 100644 index 8db09e87acbc..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.26.2-as-needed-configure.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Naur evolution-data-server-2.26.2.orig/configure.in evolution-data-server-2.26.2/configure.in ---- evolution-data-server-2.26.2.orig/configure.in 2009-05-28 07:54:11.117306805 +0200 -+++ evolution-data-server-2.26.2/configure.in 2009-05-28 07:56:19.107288441 +0200 -@@ -1196,24 +1196,24 @@ - - msg_krb5="no" - if test "x${with_krb5}" != "xno"; then -- LDFLAGS_save="$LDFLAGS" -+ LIBS_save="$LIBS" - - mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" - heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" - sunlibs="-lkrb5 -lgss" - AC_CACHE_CHECK([for Kerberos 5], ac_cv_lib_kerberos5, - [ -- LDFLAGS="$LDFLAGS -L$with_krb5_libs $mitlibs" -+ LIBS="$LIBS -L$with_krb5_libs $mitlibs" - AC_TRY_LINK([#include ],krb5_init_context, ac_cv_lib_kerberos5="$mitlibs", - [ -- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $heimlibs" -+ LIBS="$LIBS_save -L$with_krb5_libs $heimlibs" - AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$heimlibs", - [ -- LDFLAGS="$LDFLAGS_save -L$with_krb5_libs $sunlibs" -+ LIBS="$LIBS_save -L$with_krb5_libs $sunlibs" - AC_TRY_LINK_FUNC(krb5_init_context, ac_cv_lib_kerberos5="$sunlibs", ac_cv_lib_kerberos5="no") - ]) - ]) -- LDFLAGS="$LDFLAGS_save" -+ LIBS="$LIBS_save" - ]) - if test "$ac_cv_lib_kerberos5" != "no"; then - AC_DEFINE(HAVE_KRB5,1,[Define if you have Krb5]) diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-CVE-2009-0582.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-CVE-2009-0582.patch deleted file mode 100644 index 46231c0c0c39..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-CVE-2009-0582.patch +++ /dev/null @@ -1,144 +0,0 @@ -Index: camel/camel-sasl-ntlm.c -=================================================================== ---- camel/camel-sasl-ntlm.c (revision 10105) -+++ camel/camel-sasl-ntlm.c (working copy) -@@ -74,9 +74,8 @@ camel_sasl_ntlm_get_type (void) - - #define NTLM_REQUEST "NTLMSSP\x00\x01\x00\x00\x00\x06\x82\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00" - --#define NTLM_CHALLENGE_NONCE_OFFSET 24 --#define NTLM_CHALLENGE_DOMAIN_OFFSET 48 --#define NTLM_CHALLENGE_DOMAIN_LEN_OFFSET 44 -+#define NTLM_CHALLENGE_DOMAIN_OFFSET 12 -+#define NTLM_CHALLENGE_NONCE_OFFSET 24 - - #define NTLM_RESPONSE_HEADER "NTLMSSP\x00\x03\x00\x00\x00" - #define NTLM_RESPONSE_FLAGS "\x82\x01" -@@ -93,22 +92,60 @@ static void ntlm_calc_response (const - guchar results[24]); - static void ntlm_lanmanager_hash (const char *password, char hash[21]); - static void ntlm_nt_hash (const char *password, char hash[21]); --static void ntlm_set_string (GByteArray *ba, int offset, -- const char *data, int len); -+ -+typedef struct { -+ guint16 length; -+ guint16 allocated; -+ guint32 offset; -+} SecurityBuffer; -+ -+static GString * -+ntlm_get_string (GByteArray *ba, int offset) -+{ -+ SecurityBuffer *secbuf; -+ GString *string; -+ gchar *buf_string; -+ guint16 buf_length; -+ guint32 buf_offset; -+ -+ secbuf = (SecurityBuffer *) &ba->data[offset]; -+ buf_length = GUINT16_FROM_LE (secbuf->length); -+ buf_offset = GUINT32_FROM_LE (secbuf->offset); -+ -+ if (ba->len < buf_offset + buf_length) -+ return NULL; -+ -+ string = g_string_sized_new (buf_length); -+ buf_string = (gchar *) &ba->data[buf_offset]; -+ g_string_append_len (string, buf_string, buf_length); -+ -+ return string; -+} -+ -+static void -+ntlm_set_string (GByteArray *ba, int offset, const char *data, int len) -+{ -+ SecurityBuffer *secbuf; -+ -+ secbuf = (SecurityBuffer *) &ba->data[offset]; -+ secbuf->length = GUINT16_TO_LE (len); -+ secbuf->offset = GUINT32_TO_LE (ba->len); -+ secbuf->allocated = secbuf->length; -+ -+ g_byte_array_append (ba, (guint8 *) data, len); -+} - - static GByteArray * - ntlm_challenge (CamelSasl *sasl, GByteArray *token, CamelException *ex) - { - GByteArray *ret; - guchar nonce[8], hash[21], lm_resp[24], nt_resp[24]; -+ GString *domain; - - ret = g_byte_array_new (); - -- if (!token || !token->len) { -- g_byte_array_append (ret, (guint8 *) NTLM_REQUEST, -- sizeof (NTLM_REQUEST) - 1); -- return ret; -- } -+ if (!token || token->len < NTLM_CHALLENGE_NONCE_OFFSET + 8) -+ goto fail; - - memcpy (nonce, token->data + NTLM_CHALLENGE_NONCE_OFFSET, 8); - ntlm_lanmanager_hash (sasl->service->url->passwd, (char *) hash); -@@ -116,7 +153,11 @@ ntlm_challenge (CamelSasl *sasl, GByteAr - ntlm_nt_hash (sasl->service->url->passwd, (char *) hash); - ntlm_calc_response (hash, nonce, nt_resp); - -- ret = g_byte_array_new (); -+ domain = ntlm_get_string (token, NTLM_CHALLENGE_DOMAIN_OFFSET); -+ if (domain == NULL) -+ goto fail; -+ -+ /* Don't jump to 'fail' label after this point. */ - g_byte_array_set_size (ret, NTLM_RESPONSE_BASE_SIZE); - memset (ret->data, 0, NTLM_RESPONSE_BASE_SIZE); - memcpy (ret->data, NTLM_RESPONSE_HEADER, -@@ -125,8 +166,7 @@ ntlm_challenge (CamelSasl *sasl, GByteAr - NTLM_RESPONSE_FLAGS, sizeof (NTLM_RESPONSE_FLAGS) - 1); - - ntlm_set_string (ret, NTLM_RESPONSE_DOMAIN_OFFSET, -- (const char *) token->data + NTLM_CHALLENGE_DOMAIN_OFFSET, -- atoi ((char *) token->data + NTLM_CHALLENGE_DOMAIN_LEN_OFFSET)); -+ domain->str, domain->len); - ntlm_set_string (ret, NTLM_RESPONSE_USER_OFFSET, - sasl->service->url->user, - strlen (sasl->service->url->user)); -@@ -138,6 +178,18 @@ ntlm_challenge (CamelSasl *sasl, GByteAr - (const char *) nt_resp, sizeof (nt_resp)); - - sasl->authenticated = TRUE; -+ -+ g_string_free (domain, TRUE); -+ -+ goto exit; -+ -+fail: -+ /* If the challenge is malformed, restart authentication. -+ * XXX A malicious server could make this loop indefinitely. */ -+ g_byte_array_append (ret, (guint8 *) NTLM_REQUEST, -+ sizeof (NTLM_REQUEST) - 1); -+ -+exit: - return ret; - } - -@@ -201,17 +253,6 @@ ntlm_nt_hash (const char *password, char - g_free (buf); - } - --static void --ntlm_set_string (GByteArray *ba, int offset, const char *data, int len) --{ -- ba->data[offset ] = ba->data[offset + 2] = len & 0xFF; -- ba->data[offset + 1] = ba->data[offset + 3] = (len >> 8) & 0xFF; -- ba->data[offset + 4] = ba->len & 0xFF; -- ba->data[offset + 5] = (ba->len >> 8) & 0xFF; -- g_byte_array_append (ba, (guint8 *) data, len); --} -- -- - #define KEYBITS(k,s) \ - (((k[(s)/8] << ((s)%8)) & 0xFF) | (k[(s)/8+1] >> (8-(s)%8))) - diff --git a/gnome-extra/evolution-exchange/ChangeLog b/gnome-extra/evolution-exchange/ChangeLog index 1ddc288f3612..1cbe40ec14f7 100644 --- a/gnome-extra/evolution-exchange/ChangeLog +++ b/gnome-extra/evolution-exchange/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-extra/evolution-exchange # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.110 2010/01/18 00:07:15 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-exchange/ChangeLog,v 1.111 2010/02/24 22:49:07 eva Exp $ + + 24 Feb 2010; Gilles Dartiguelongue + -files/evolution-exchange-2.22.3-addressbook-crash.patch, + -files/evolution-exchange-2.22.3-exchange-contact.patch, + -evolution-exchange-2.24.5.ebuild, -evolution-exchange-2.28.1.ebuild: + Clean up old revisions. 18 Jan 2010; Jeroen Roovers evolution-exchange-2.26.3.ebuild: diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.24.5.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.24.5.ebuild deleted file mode 100644 index e8078e5dc695..000000000000 --- a/gnome-extra/evolution-exchange/evolution-exchange-2.24.5.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2010 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.24.5.ebuild,v 1.6 2010/01/11 21:49:00 eva Exp $ - -EAPI="1" - -inherit eutils gnome2 - -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="hppa" -IUSE="debug doc static" - -RDEPEND=" - >=mail-client/evolution-2.24.3 - >=dev-libs/glib-2.16.0 - >=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.24.3 - >=net-nds/openldap-2.1.30-r2" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - 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 - - # intltoolize because e-e won't install locales otherwise - # thanks to recent intltool, no need to eautoreconf/eautomake - intltoolize --force --copy --automake || die "intltoolize failed" -} diff --git a/gnome-extra/evolution-exchange/evolution-exchange-2.28.1.ebuild b/gnome-extra/evolution-exchange/evolution-exchange-2.28.1.ebuild deleted file mode 100644 index fd4a81d1264e..000000000000 --- a/gnome-extra/evolution-exchange/evolution-exchange-2.28.1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2009 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.28.1.ebuild,v 1.1 2009/10/29 23:19:25 eva Exp $ - -EAPI="2" - -inherit autotools eutils gnome2 - -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="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug doc static" - -RDEPEND=" - >=mail-client/evolution-2.28.0 - >=gnome-extra/evolution-data-server-2.28.0[ldap,kerberos] - >=dev-libs/glib-2.16.0 - >=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 - >=net-nds/openldap-2.1.30-r2" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - dev-util/pkgconfig - dev-util/gtk-doc-am - doc? ( >=dev-util/gtk-doc-1 )" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} - --with-openldap - --disable-static - $(use_with debug e2k-debug) - $(use_with static static-ldap)" -} - -src_prepare() { - gnome2_src_prepare - - # Fix build with --as-needed, upstream bug #597489 - epatch "${FILESDIR}/${PN}-2.28.0-as-needed.patch" - - # FIXME: Fix compilation flags crazyness - sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \ - -i configure.ac configure || die "sed 1 failed" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf -} 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 deleted file mode 100644 index c24f956a1ef0..000000000000 --- a/gnome-extra/evolution-exchange/files/evolution-exchange-2.22.3-addressbook-crash.patch +++ /dev/null @@ -1,55 +0,0 @@ -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); diff --git a/gnome-extra/evolution-exchange/files/evolution-exchange-2.22.3-exchange-contact.patch b/gnome-extra/evolution-exchange/files/evolution-exchange-2.22.3-exchange-contact.patch deleted file mode 100644 index 19825ca8b368..000000000000 --- a/gnome-extra/evolution-exchange/files/evolution-exchange-2.22.3-exchange-contact.patch +++ /dev/null @@ -1,76 +0,0 @@ ---- - - # Fix exchange contacts tracking, upstream bug #546934 - #epatch "${FILESDIR}"/${P}-exchange-contact.patch - - -At http://bugzilla.gnome.org/show_bug.cgi?id=546934 - -e_book_backend_exchange_get_changes() (and therefore e_book_get_changes() with -an Exchange address book) has three different problems: - -* The list of collected changes in ctx->changes is never returned to the caller. - Instead the list is leaked when freeing the context. -* For deleted items, an empty vcard with the UID set should be returned. - Instead find_deleted_ids() stores the UID directly. -* find_deleted_ids() is a callback for g_hash_table_foreach() and modifies - the hash that is iterated over. That's a big no-no! The effect is that the - iteration is stopped prematurely, leading to incorrect change tracking. - g_hash_table_foreach_remove() and its XML wrapper function have to be used - instead. - -Index: addressbook/e-book-backend-exchange.c -=================================================================== ---- addressbook/e-book-backend-exchange.c (revision 1709) -+++ addressbook/e-book-backend-exchange.c (working copy) -@@ -2042,17 +2042,29 @@ - CORBA_free (change); - } - --static void -+static gboolean - find_deleted_ids (const char *id, const char *vcard, gpointer user_data) - { - EBookBackendExchangeChangeContext *ctx = user_data; -+ gboolean remove = FALSE; - - if (!g_hash_table_lookup (ctx->seen_ids, id)) { -- ctx->changes = g_list_prepend ( -- ctx->changes, -- e_book_backend_change_delete_new (id)); -- e_xmlhash_remove (ctx->ehash, id); -+ char *vcard = NULL; -+ EContact *contact = e_contact_new (); -+ if (contact) { -+ e_contact_set (contact, E_CONTACT_UID, id); -+ vcard = e_vcard_to_string (E_VCARD (contact), EVC_FORMAT_VCARD_30); -+ if (vcard) { -+ ctx->changes = g_list_prepend ( -+ ctx->changes, -+ e_book_backend_change_delete_new (vcard)); -+ g_free (vcard); -+ } -+ g_object_unref (contact); -+ } -+ remove = TRUE; - } -+ return remove; - } - - static EBookBackendSyncStatus -@@ -2135,9 +2147,14 @@ - g_list_foreach (ctx->changes, free_change, NULL); - ctx->changes = NULL; - } else { -- e_xmlhash_foreach_key (ctx->ehash, find_deleted_ids, ctx); -+ e_xmlhash_foreach_key_remove (ctx->ehash, find_deleted_ids, ctx); - e_xmlhash_write (ctx->ehash); - } -+ -+ /* transfer ownership of result to caller before cleaning up */ -+ *changes = ctx->changes; -+ ctx->changes = NULL; -+ - e_xmlhash_destroy (ctx->ehash); - g_hash_table_destroy (ctx->seen_ids); - g_free (ctx); -- 2.26.2