summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gardiner <obz@gentoo.org>2005-01-23 12:08:51 +0000
committerMike Gardiner <obz@gentoo.org>2005-01-23 12:08:51 +0000
commita0932b968072d29fc3f7b36d1e92c2adc04849cc (patch)
treeabb8f48b1899500b0880bc8966b04f055b2fec6f /mail-client/evolution
parentUnmasking binutils verisons (diff)
downloadhistorical-a0932b968072d29fc3f7b36d1e92c2adc04849cc.tar.gz
historical-a0932b968072d29fc3f7b36d1e92c2adc04849cc.tar.bz2
historical-a0932b968072d29fc3f7b36d1e92c2adc04849cc.zip
New revisions for 2.0.2 and 2.0.3, including CAN-2005-0102 patch. See bug #79183
Diffstat (limited to 'mail-client/evolution')
-rw-r--r--mail-client/evolution/ChangeLog10
-rw-r--r--mail-client/evolution/Manifest29
-rw-r--r--mail-client/evolution/evolution-2.0.2-r1.ebuild141
-rw-r--r--mail-client/evolution/evolution-2.0.3-r1.ebuild139
-rw-r--r--mail-client/evolution/files/digest-evolution-2.0.2-r11
-rw-r--r--mail-client/evolution/files/digest-evolution-2.0.3-r11
-rw-r--r--mail-client/evolution/files/evolution-2-CAN-2005-0102.patch11
7 files changed, 319 insertions, 13 deletions
diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index ebfc22645f3c..a2c136a7bb35 100644
--- a/mail-client/evolution/ChangeLog
+++ b/mail-client/evolution/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for mail-client/evolution
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.39 2005/01/20 21:47:22 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.40 2005/01/23 12:08:51 obz Exp $
+
+*evolution-2.0.2-r1 (23 Jan 2005)
+
+ 23 Jan 2005; Mike Gardiner <obz@gentoo.org>
+ +files/evolution-2-CAN-2005-0102.patch, +evolution-2.0.2-r1.ebuild,
+ +evolution-2.0.3-r1.ebuild:
+ New revisions for 2.0.2 and 2.0.3, including CAN-2005-0102 patch. See bug
+ #79183
19 Jan 2005; Aron Griffis <agriffis@gentoo.org> evolution-2.0.2.ebuild:
stable on ia64
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 94b610428985..2fcff557267a 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,20 +1,25 @@
-MD5 e687e34bee199a780d98efc887a11c83 ChangeLog 21469
MD5 f8967572708473b4e0c251f754929631 evolution-1.2.4.ebuild 6254
-MD5 0e26bab8ac570ce0deb481e2249e69f2 evolution-1.4.6.ebuild 5701
+MD5 7c0483bef60bedff8559f3b9043d0f7e evolution-2.0.3.ebuild 3966
+MD5 959d577c112641133065713135c209eb evolution-2.0.3-r1.ebuild 4076
+MD5 48185538de294181ba60dc3e3d7af531 evolution-2.0.2-r1.ebuild 4144
MD5 38beda8b6f053d01b75341ea0c888322 evolution-2.0.2.ebuild 4054
+MD5 0e26bab8ac570ce0deb481e2249e69f2 evolution-1.4.6.ebuild 5701
+MD5 7cdf9daca0d71b7e296685270a0e90a4 ChangeLog 21731
MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217
-MD5 7c0483bef60bedff8559f3b9043d0f7e evolution-2.0.3.ebuild 3966
-MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
-MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
-MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3 70
-MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2 70
+MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
+MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
+MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
+MD5 8cc9e70dc9a35125fa2a37d58be5d139 files/evolution-2.0.2-gentoo_etc_services.patch 1712
MD5 c837abd50d990dea46fcea32b8a1b001 files/evolution-1.1.90-kde.patch 689
-MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
+MD5 8a4178ab2571a9be24e1c27cfedf20bb files/evolution-2.0.2-camel_typo.patch 298
MD5 f44bc5e363c1f976a7a72676886b9d13 files/evolution-1.1.90-subversion.patch 470
-MD5 a3a0071b78894fc80b10a0ec765647f5 files/evolution-1.4.4-alpha.patch 1799
+MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2-r1 70
+MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r1 70
MD5 6e58f5e7a4195267cc545d8c9eba07a3 files/evolution-1.5.93-addressbooklibs.patch 564
+MD5 5d430637760a0c93974ed91b72a16438 files/digest-evolution-1.2.4 131
+MD5 fe0cafc4040da525377526f4a1fa297f files/digest-evolution-1.4.6 132
+MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2 70
+MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3 70
MD5 dc2deff6647a30a151572ec5d6e11c77 files/evolution-2.0.1-camel.patch 457
-MD5 8a4178ab2571a9be24e1c27cfedf20bb files/evolution-2.0.2-camel_typo.patch 298
-MD5 8cc9e70dc9a35125fa2a37d58be5d139 files/evolution-2.0.2-gentoo_etc_services.patch 1712
MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
-MD5 7b8c1cc2fd2428815184d471af4bb3bf files/evolution-2.0.3-gentoo_etc_services.patch 1662
+MD5 8909b7f2d3483d55036f21ca2780e4a3 files/evolution-1.1.90-sharedldap.patch 370
diff --git a/mail-client/evolution/evolution-2.0.2-r1.ebuild b/mail-client/evolution/evolution-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..95675da0b0fc
--- /dev/null
+++ b/mail-client/evolution/evolution-2.0.2-r1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.2-r1.ebuild,v 1.1 2005/01/23 12:08:51 obz Exp $
+
+inherit eutils virtualx gnome2 flag-o-matic alternatives
+
+DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
+HOMEPAGE="http://ximian.com/products/evolution/"
+
+LICENSE="GPL-2"
+SLOT="2.0"
+KEYWORDS="x86 ~amd64 ppc ~sparc ~hppa ~ia64 ~mips ~alpha"
+IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
+
+# Top stanza are ximian deps
+RDEPEND=">=gnome-extra/libgtkhtml-3.2.3
+ >=gnome-extra/gal-2.2.3
+ >=gnome-extra/evolution-data-server-1.0.2
+ >=net-libs/libsoup-2.2.1
+ >=dev-libs/glib-2
+ >=dev-libs/libxml2-2
+ >=gnome-base/gconf-2
+ >=gnome-extra/yelp-2.5.1
+ >=gnome-base/libglade-2
+ >=gnome-base/gnome-vfs-2
+ >=gnome-base/libbonoboui-2.4.2
+ >=gnome-base/libgnomecanvas-2.0
+ >=gnome-base/libgnomeui-2
+ >=gnome-base/libgnomeprint-2
+ >=gnome-base/libgnomeprintui-2
+ >=x11-themes/gnome-icon-theme-1.2
+ >=gnome-base/orbit-2.9.8
+ mail-filter/spamassassin
+ pda? ( >=app-pda/gnome-pilot-2.0.10
+ >=app-pda/gnome-pilot-conduits-2.0.10 )
+ spell? ( >=app-text/gnome-spell-1.0.5 )
+ crypt? ( >=app-crypt/gnupg-1.2.2 )
+ ssl? ( mozilla? ( net-www/mozilla )
+ !mozilla? ( >=dev-libs/nspr-4.4.1
+ >=dev-libs/nss-3.9.2 ) )
+ ldap? ( >=net-nds/openldap-2 )
+ kerberos? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4
+ dev-util/pkgconfig
+ >=sys-devel/libtool-1.4.1-r1
+ >=dev-util/intltool-0.30
+ sys-devel/gettext
+ sys-devel/bison
+ >=app-text/scrollkeeper-0.3.10-r1
+ doc? ( dev-util/gtk-doc )"
+
+G2CONF="--disable-default-binary \
+ $(use_enable ssl nss) \
+ $(use_enable ssl smime) \
+ $(use_enable ipv6) \
+ $(use_enable nntp) \
+ $(use_enable pda pilot-conduits)"
+
+USE_DESTDIR="1"
+DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ # bug #66166 -- temporary workaround until new baselayout exists
+ epatch ${FILESDIR}/${P}-gentoo_etc_services.patch
+ # bug #67824 -- fix typo of USE -ipv6
+ epatch ${FILESDIR}/${P}-camel_typo.patch
+ # bug #79183 -- security vuln in camel
+ epatch ${FILESDIR}/${PN}-2-CAN-2005-0102.patch
+}
+
+src_compile() {
+ # problems with -O3 on gcc-3.3.1
+ replace-flags -O3 -O2
+
+ if [ "${ARCH}" = "hppa" ]; then
+ append-flags "-fPIC -ffunction-sections"
+ export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+ fi
+
+ cd ${S}
+ local myconf=""
+
+ use ldap \
+ && myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
+ || myconf="${myconf} --with-openldap=no"
+
+ use kerberos \
+ && myconf="${myconf} --with-krb5=/usr" \
+ || myconf="${myconf} --without-krb5"
+
+ myconf="${myconf} --with-kde-applnk-path=no"
+
+ # Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
+ # Use standalone NSS/NSPR if only 'ssl' in USE
+ # Openssl support doesn't work and has been disabled in cvs
+
+ if use ssl ; then
+ if use mozilla ; then
+ NSS_LIB=/usr/lib/mozilla
+ NSPR_LIB=/usr/lib/mozilla
+ NSS_INC=/usr/lib/mozilla/include/nss
+ NSPR_INC=/usr/lib/mozilla/include/nspr
+ else
+ NSS_LIB=/usr/lib/nss
+ NSPR_LIB=/usr/lib/nspr
+ NSS_INC=/usr/include/nss
+ NSPR_INC=/usr/include/nspr
+ fi
+
+ myconf="${myconf} --enable-nss=yes \
+ --with-nspr-includes=${NSPR_INC} \
+ --with-nspr-libs=${NSPR_LIB} \
+ --with-nss-includes=${NSS_INC} \
+ --with-nss-libs=${NSS_LIB}"
+ else
+ myconf="${myconf} --without-nspr-libs --without-nspr-includes \
+ --without-nss-libs --without-nss-includes"
+ fi
+
+ gnome2_src_configure ${G2CONF} ${myconf}
+
+ # Needs to be able to connect to X display to build.
+ Xemake || Xmake || die "make failed"
+}
+
+pkg_postinst() {
+
+ alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
+ gnome2_gconf_install ${GCONFFILEPATH}
+ einfo "To change the default browser if you are not using GNOME, do:"
+ einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+ einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+ einfo ""
+ einfo "Replace 'mozilla %s' with which ever browser you use."
+
+}
diff --git a/mail-client/evolution/evolution-2.0.3-r1.ebuild b/mail-client/evolution/evolution-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..c476f6e86469
--- /dev/null
+++ b/mail-client/evolution/evolution-2.0.3-r1.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.0.3-r1.ebuild,v 1.1 2005/01/23 12:08:51 obz Exp $
+
+inherit eutils virtualx gnome2 flag-o-matic alternatives
+
+DESCRIPTION="A GNOME groupware application, a Microsoft Outlook workalike"
+HOMEPAGE="http://ximian.com/products/evolution/"
+
+LICENSE="GPL-2"
+SLOT="2.0"
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~ia64 ~mips ~alpha"
+IUSE="ssl mozilla ldap doc spell ipv6 kerberos crypt nntp debug pda"
+
+# Top stanza are ximian deps
+RDEPEND=">=gnome-extra/libgtkhtml-3.2.4
+ >=gnome-extra/gal-2.2.4
+ >=gnome-extra/evolution-data-server-1.0.3
+ >=net-libs/libsoup-2.2.1
+ >=dev-libs/glib-2
+ >=dev-libs/libxml2-2
+ >=gnome-base/gconf-2
+ >=gnome-extra/yelp-2.5.1
+ >=gnome-base/libglade-2
+ >=gnome-base/gnome-vfs-2
+ >=gnome-base/libbonoboui-2.4.2
+ >=gnome-base/libgnomecanvas-2
+ >=gnome-base/libgnomeui-2
+ >=gnome-base/libgnomeprint-2
+ >=gnome-base/libgnomeprintui-2
+ >=x11-themes/gnome-icon-theme-1.2
+ >=gnome-base/orbit-2.9.8
+ mail-filter/spamassassin
+ pda? ( >=app-pda/gnome-pilot-2.0.10
+ >=app-pda/gnome-pilot-conduits-2.0.10 )
+ spell? ( >=app-text/gnome-spell-1.0.5 )
+ crypt? ( >=app-crypt/gnupg-1.2.2 )
+ ssl? ( mozilla? ( net-www/mozilla )
+ !mozilla? ( >=dev-libs/nspr-4.4.1
+ >=dev-libs/nss-3.9.2 ) )
+ ldap? ( >=net-nds/openldap-2 )
+ kerberos? ( virtual/krb5 )"
+
+DEPEND="${RDEPEND}
+ >=sys-apps/sed-4
+ dev-util/pkgconfig
+ >=sys-devel/libtool-1.4.1-r1
+ >=dev-util/intltool-0.30
+ sys-devel/gettext
+ sys-devel/bison
+ >=app-text/scrollkeeper-0.3.10-r1
+ doc? ( dev-util/gtk-doc )"
+
+G2CONF="--disable-default-binary \
+ $(use_enable ssl nss) \
+ $(use_enable ssl smime) \
+ $(use_enable ipv6) \
+ $(use_enable nntp) \
+ $(use_enable pda pilot-conduits)"
+
+USE_DESTDIR="1"
+DOCS="AUTHORS COPYING* ChangeLog HACKING MAINTAINERS NEWS README"
+ELTCONF="--reverse-deps"
+
+src_unpack() {
+ unpack ${A}
+ # bug #66166 -- temporary workaround until new baselayout exists
+ epatch ${FILESDIR}/${P}-gentoo_etc_services.patch
+ # bug #79183 -- fix security vulnerability in camel
+ cd ${S}
+ epatch ${FILESDIR}/${PN}-2-CAN-2005-0102.patch
+}
+
+src_compile() {
+ # problems with -O3 on gcc-3.3.1
+ replace-flags -O3 -O2
+
+ if [ "${ARCH}" = "hppa" ]; then
+ append-flags "-fPIC -ffunction-sections"
+ export LDFLAGS="-ffunction-sections -Wl,--stub-group-size=25000"
+ fi
+
+ cd ${S}
+ local myconf=""
+
+ use ldap \
+ && myconf="${myconf} --with-openldap=yes --with-static-ldap=no" \
+ || myconf="${myconf} --with-openldap=no"
+
+ use kerberos \
+ && myconf="${myconf} --with-krb5=/usr" \
+ || myconf="${myconf} --without-krb5"
+
+ myconf="${myconf} --with-kde-applnk-path=no"
+
+ # Use Mozilla's NSS/NSPR libs if 'mozilla' *and* 'ssl' in USE
+ # Use standalone NSS/NSPR if only 'ssl' in USE
+ # Openssl support doesn't work and has been disabled in cvs
+
+ if use ssl ; then
+ if use mozilla ; then
+ NSS_LIB=/usr/lib/mozilla
+ NSPR_LIB=/usr/lib/mozilla
+ NSS_INC=/usr/lib/mozilla/include/nss
+ NSPR_INC=/usr/lib/mozilla/include/nspr
+ else
+ NSS_LIB=/usr/lib/nss
+ NSPR_LIB=/usr/lib/nspr
+ NSS_INC=/usr/include/nss
+ NSPR_INC=/usr/include/nspr
+ fi
+
+ myconf="${myconf} --enable-nss=yes \
+ --with-nspr-includes=${NSPR_INC} \
+ --with-nspr-libs=${NSPR_LIB} \
+ --with-nss-includes=${NSS_INC} \
+ --with-nss-libs=${NSS_LIB}"
+ else
+ myconf="${myconf} --without-nspr-libs --without-nspr-includes \
+ --without-nss-libs --without-nss-includes"
+ fi
+
+ gnome2_src_configure ${G2CONF} ${myconf}
+
+ # Needs to be able to connect to X display to build.
+ Xemake || Xmake || die "make failed"
+}
+
+pkg_postinst() {
+
+ alternatives_auto_makesym "/usr/bin/evolution" "/usr/bin/evolution-[0-9].[0-9]"
+ gnome2_gconf_install ${GCONFFILEPATH}
+ einfo "To change the default browser if you are not using GNOME, do:"
+ einfo "gconftool-2 --set /desktop/gnome/url-handlers/http/command -t string 'mozilla %s'"
+ einfo "gconftool-2 --set /desktop/gnome/url-handlers/https/command -t string 'mozilla %s'"
+ einfo ""
+ einfo "Replace 'mozilla %s' with which ever browser you use."
+
+}
diff --git a/mail-client/evolution/files/digest-evolution-2.0.2-r1 b/mail-client/evolution/files/digest-evolution-2.0.2-r1
new file mode 100644
index 000000000000..568f8e872c8d
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.0.2-r1
@@ -0,0 +1 @@
+MD5 d3f12240ebb05dc6c984af68b5fe1955 evolution-2.0.2.tar.bz2 15400311
diff --git a/mail-client/evolution/files/digest-evolution-2.0.3-r1 b/mail-client/evolution/files/digest-evolution-2.0.3-r1
new file mode 100644
index 000000000000..cd4b309c65c4
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.0.3-r1
@@ -0,0 +1 @@
+MD5 0a6c15b022f001d52b8533c42e83a462 evolution-2.0.3.tar.bz2 15381448
diff --git a/mail-client/evolution/files/evolution-2-CAN-2005-0102.patch b/mail-client/evolution/files/evolution-2-CAN-2005-0102.patch
new file mode 100644
index 000000000000..2ca9f61de138
--- /dev/null
+++ b/mail-client/evolution/files/evolution-2-CAN-2005-0102.patch
@@ -0,0 +1,11 @@
+--- evolution-1.0.5.orig/camel/camel-lock-helper.c 2001-10-27 18:59:27.000000000 +0200
++++ evolution-1.0.5/camel/camel-lock-helper.c 2005-01-21 16:57:44.000000000 +0100
+@@ -360,6 +360,8 @@ int main(int argc, char **argv)
+ switch(msg.id) {
+ case CAMEL_LOCK_HELPER_LOCK:
+ res = CAMEL_LOCK_HELPER_STATUS_NOMEM;
++ if (msg.data+1 < msg.data)
++ break;
+ path = malloc(msg.data+1);
+ if (path != NULL) {
+ res = CAMEL_LOCK_HELPER_STATUS_PROTOCOL;