Adding upstream patch to fix the use of plain text passwords. Thanks to Don Seiler<rizzo@gentoo.org> for tracking this in bug 80376

(Portage version: 2.0.51-r15)

5 files changed, 171 insertions, 3 deletions

diff --git a/mail-client/evolution/ChangeLog b/mail-client/evolution/ChangeLog
index 2d6dd500c919..45e698973a4a 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.45 2005/01/25 18:33:17 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/ChangeLog,v 1.46 2005/02/02 20:12:16 joem Exp $
+
+*evolution-2.0.3-r2 (02 Feb 2005)
+
+  02 Feb 2005; Joe McCann <joem@gentoo.org>
+  +files/evolution_mail-account-gui_authtype.diff,
+  +evolution-2.0.3-r2.ebuild:
+  Adding upstream patch to fix the use of plain text passwords. Thanks to Don
+  Seiler<rizzo@gentoo.org> for tracking this in bug 80376
 
   25 Jan 2005; Guy Martin <gmsoft@gentoo.org> evolution-2.0.2-r1.ebuild:
   Stable on hppa.
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index fb6351ebcb43..0b3e04ff4eec 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,11 +1,12 @@
 MD5 cbc12b8665800334129384afe78a5591 ChangeLog 22452
 MD5 f8967572708473b4e0c251f754929631 evolution-1.2.4.ebuild 6254
 MD5 0e26bab8ac570ce0deb481e2249e69f2 evolution-1.4.6.ebuild 5701
-MD5 fa8c9d7f7fbb82f353633af2881ab11e evolution-2.0.2-r1.ebuild 4078
 MD5 38beda8b6f053d01b75341ea0c888322 evolution-2.0.2.ebuild 4054
-MD5 6ce020116cdfd530f866baff39b6ce5c evolution-2.0.3-r1.ebuild 4015
 MD5 7c0483bef60bedff8559f3b9043d0f7e evolution-2.0.3.ebuild 3966
 MD5 6ec9b6a7896b799d17a21c4edffd33c9 metadata.xml 272
+MD5 fa8c9d7f7fbb82f353633af2881ab11e evolution-2.0.2-r1.ebuild 4078
+MD5 6ce020116cdfd530f866baff39b6ce5c evolution-2.0.3-r1.ebuild 4015
+MD5 6ce020116cdfd530f866baff39b6ce5c evolution-2.0.3-r2.ebuild 4015
 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
@@ -23,3 +24,4 @@ MD5 4df81c3442025403034c53975ba663b1 files/evolution-gcc34.patch 3044
 MD5 55cb14a4c3057ba1f6d91bea14ec28b6 files/digest-evolution-2.0.2-r1 70
 MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r1 70
 MD5 015ecd719e11c1170e7f41b3490f52f7 files/evolution-2-CAN-2005-0102.patch 467
+MD5 988789d67b6d0e09eea25ba441cda871 files/digest-evolution-2.0.3-r2 70
diff --git a/mail-client/evolution/evolution-2.0.3-r2.ebuild b/mail-client/evolution/evolution-2.0.3-r2.ebuild
new file mode 100644
index 000000000000..baab3eb6061d
--- /dev/null
+++ b/mail-client/evolution/evolution-2.0.3-r2.ebuild
@@ -0,0 +1,140 @@
+# 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-r2.ebuild,v 1.1 2005/02/02 20:12:17 joem Exp $
+
+inherit eutils 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
+	# bug #80376 -- allow plain text passwords
+	epatch ${FILESDIR}/${PN}_mail-account-gui_authtype.diff
+}
+
+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}
+
+	emake || make || 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.3-r2 b/mail-client/evolution/files/digest-evolution-2.0.3-r2
new file mode 100644
index 000000000000..cd4b309c65c4
--- /dev/null
+++ b/mail-client/evolution/files/digest-evolution-2.0.3-r2
@@ -0,0 +1 @@
+MD5 0a6c15b022f001d52b8533c42e83a462 evolution-2.0.3.tar.bz2 15381448
diff --git a/mail-client/evolution/files/evolution_mail-account-gui_authtype.diff b/mail-client/evolution/files/evolution_mail-account-gui_authtype.diff
new file mode 100644
index 000000000000..1b0519f70338
--- /dev/null
+++ b/mail-client/evolution/files/evolution_mail-account-gui_authtype.diff
@@ -0,0 +1,17 @@
+===================================================================
+RCS file: /cvs/gnome/evolution/mail/Attic/mail-account-gui.c,v
+retrieving revision 1.171.14.10
+retrieving revision 1.171.14.11
+diff -u -r1.171.14.10 -r1.171.14.11
+--- mail/mail-account-gui.c	2004/12/02 04:11:04	1.171.14.10
++++ mail/mail-account-gui.c	2005/01/21 04:58:37	1.171.14.11
+@@ -2306,7 +2306,7 @@
+ 	}
+ 	
+ 	if (CAMEL_PROVIDER_ALLOWS (gsvc->provider, CAMEL_URL_PART_AUTH) && url->user) {
+-		if (gsvc->needs_auth && gtk_toggle_button_get_active(gsvc->needs_auth)) {
++		if (gsvc->needs_auth == NULL || gtk_toggle_button_get_active(gsvc->needs_auth)) {
+ 			CamelServiceAuthType *authtype;
+ 		
+ 			authtype = g_object_get_data(G_OBJECT(gsvc->authitem), "authtype");
+