Fixed APOP authentication vulnerability (CVE-2007-1558). Thank Sune Kloppenborg Jeppesen <jaervosz AT gentoo.org> for report. Removed vulnerable versions from 1.10 branch.

Package-Manager: portage-2.1.2.2

8 files changed, 126 insertions, 46 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 409646e38101..abb655663ace 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.114 2007/04/18 08:56:09 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.115 2007/05/01 16:44:48 pva Exp $
+
+*evolution-data-server-1.10.1-r1 (01 May 2007)
+*evolution-data-server-1.8.3-r3 (01 May 2007)
+
+  01 May 2007; <pva@gentoo.org>
+  +files/evolution-data-server-APOP-auth-fix.patch,
+  +evolution-data-server-1.8.3-r3.ebuild,
+  -evolution-data-server-1.10.0.ebuild,
+  -evolution-data-server-1.10.1.ebuild,
+  +evolution-data-server-1.10.1-r1.ebuild:
+  Fixed APOP authentication vulnerability (CVE-2007-1558). Thank Sune
+  Kloppenborg Jeppesen <jaervosz AT gentoo.org> for report. Removed vulnerable
+  versions from 1.10 branch.
 
   18 Apr 2007; Roy Marples <uberlord@gentoo.org>
   evolution-data-server-1.8.3.ebuild, evolution-data-server-1.8.3-r1.ebuild,
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 0d3e839d6dd3..326a358579aa 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -34,23 +34,22 @@ AUX evolution-data-server-1.9.91-as-needed.patch 3305 RMD160 b4e19cdf22885530966
 MD5 bfaee338c362bdf3d4960767076a0fcb files/evolution-data-server-1.9.91-as-needed.patch 3305
 RMD160 b4e19cdf22885530966922fb173e33c31445405b files/evolution-data-server-1.9.91-as-needed.patch 3305
 SHA256 50343d5e7f4f98bdc9335bd5991d77ccaef701d2eff0e7418259740892795c90 files/evolution-data-server-1.9.91-as-needed.patch 3305
+AUX evolution-data-server-APOP-auth-fix.patch 983 RMD160 1963368dd64e6813afaf84fcb9dda5fea550f878 SHA1 fee5c4b5212e4a2bce7672d2fc91854eb29dbb1a SHA256 505c8a6f829ce745b929801387f45f34bb751355ddc93f6638b43ad79898ffdf
+MD5 75c4b5d5224c4af342df8b225157fba3 files/evolution-data-server-APOP-auth-fix.patch 983
+RMD160 1963368dd64e6813afaf84fcb9dda5fea550f878 files/evolution-data-server-APOP-auth-fix.patch 983
+SHA256 505c8a6f829ce745b929801387f45f34bb751355ddc93f6638b43ad79898ffdf files/evolution-data-server-APOP-auth-fix.patch 983
 AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c SHA1 34aa3d902e0e704f67c6fceee820dad158d82be2 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403
 MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551
 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c files/evolution-data-server-no_lazy_bindings.patch 551
 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403 files/evolution-data-server-no_lazy_bindings.patch 551
-DIST evolution-data-server-1.10.0.tar.bz2 7095934 RMD160 75ad8b846c35ff9a6cbf7f2e12d583fff899ae3d SHA1 a250ab605f1be7320b125e6b1224d0409f821889 SHA256 0a2ee6540ffa767d3c841993300fb4320cffc3738230e2a2ad1c566de35b1214
 DIST evolution-data-server-1.10.1.tar.bz2 7120388 RMD160 edf55c74c458ed849635ace52340615017ad6a6d SHA1 69691cf6fcbe43d5ff485c49755effd8fa8681be SHA256 289a541974fb37ed3e2392b19fd3e83429bfecd6873db52d4598ad4db5d1e905
 DIST evolution-data-server-1.6.2.tar.bz2 7179353 RMD160 59af916ab4a9fabc14c65c16189188f829459985 SHA1 b9bcea4fbcdd0a39cb23e7cd1bc53a59c474a74d SHA256 3b02b940aaa90034609b9401d3da586e5439363ade9bf8d7fc562acacd28bfde
 DIST evolution-data-server-1.8.2.tar.bz2 6963774 RMD160 b3ae6d2dafa0abbbaf5ffe2fbdc39b6b20fe762d SHA1 7b6ba62d96b6c54e762be4ddf1c476ebf8201dc1 SHA256 63a765c237504ed34344f7ef505c495d9a40c6022b7d69ca6ded32016508fecd
 DIST evolution-data-server-1.8.3.tar.bz2 7024111 RMD160 8051f35a0db514f919bf730cd35c37ea75029061 SHA1 f822fe520d778d0cd8efe8d6a767a5c0b483e798 SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc
-EBUILD evolution-data-server-1.10.0.ebuild 4166 RMD160 ad73424609c7ee3181c785332d2d20367532a035 SHA1 8c9ab0c36ac06dda27e915270037594a912cd8cd SHA256 645964ae0743eb91cbe91d19534daa82aa410c8587a8e6ec4d06142f7c0bd9f5
-MD5 2ae224288f7915990016a6c394d44384 evolution-data-server-1.10.0.ebuild 4166
-RMD160 ad73424609c7ee3181c785332d2d20367532a035 evolution-data-server-1.10.0.ebuild 4166
-SHA256 645964ae0743eb91cbe91d19534daa82aa410c8587a8e6ec4d06142f7c0bd9f5 evolution-data-server-1.10.0.ebuild 4166
-EBUILD evolution-data-server-1.10.1.ebuild 4439 RMD160 715c081f093eac647a637edde8fff8075cdcf780 SHA1 821583e6f9060cd0359f23ed52fd323e763face1 SHA256 5f58ac1d0e3b3cc514327e46e8657a7058112a159774c0448cf823410efb1201
-MD5 987dc95fbe179e15ce5ee85ed68037a3 evolution-data-server-1.10.1.ebuild 4439
-RMD160 715c081f093eac647a637edde8fff8075cdcf780 evolution-data-server-1.10.1.ebuild 4439
-SHA256 5f58ac1d0e3b3cc514327e46e8657a7058112a159774c0448cf823410efb1201 evolution-data-server-1.10.1.ebuild 4439
+EBUILD evolution-data-server-1.10.1-r1.ebuild 4545 RMD160 e40533dd762a6519d9b8988666f864a843a5ae6d SHA1 bdcac442ce9a2f470416326747e385dd0d46a6aa SHA256 10fa2c944e4d02c842e2ac8ff320be3fec03dd71eedfb683af3d4682729f640e
+MD5 8f5a47d4e1bf2fb83dc221dfda9e9385 evolution-data-server-1.10.1-r1.ebuild 4545
+RMD160 e40533dd762a6519d9b8988666f864a843a5ae6d evolution-data-server-1.10.1-r1.ebuild 4545
+SHA256 10fa2c944e4d02c842e2ac8ff320be3fec03dd71eedfb683af3d4682729f640e evolution-data-server-1.10.1-r1.ebuild 4545
 EBUILD evolution-data-server-1.6.2.ebuild 2706 RMD160 211d5019853b66abbe33c9946a2e9f8e03fb306a SHA1 36a19989ac93ee07fef25c058af82221a6f3e204 SHA256 2a113f8725e2d9cc2c232ed480ff7a80802edce463871000f1dd7435d78a7d78
 MD5 4f8fcace4cd514a092c08e3b5a1e5162 evolution-data-server-1.6.2.ebuild 2706
 RMD160 211d5019853b66abbe33c9946a2e9f8e03fb306a evolution-data-server-1.6.2.ebuild 2706
@@ -67,24 +66,25 @@ EBUILD evolution-data-server-1.8.3-r2.ebuild 4953 RMD160 4abcee4295fee6f8b7ff825
 MD5 78687ad28951013cf444ac16db843e60 evolution-data-server-1.8.3-r2.ebuild 4953
 RMD160 4abcee4295fee6f8b7ff8256a6d771583e5e2652 evolution-data-server-1.8.3-r2.ebuild 4953
 SHA256 9fa49faa24030d12cb8ecdf6a0731632daa3e1a0ef443a3d7936a59a4a9b8a5a evolution-data-server-1.8.3-r2.ebuild 4953
+EBUILD evolution-data-server-1.8.3-r3.ebuild 5058 RMD160 9b33af59939d3f48c3c41512f24653089793f2cb SHA1 3613c0aee051d6cc7d1c7c366b7d0fc7b94a7cb3 SHA256 35d335e40722af599bf6238965fee297688f004ac0f2ccebd7d635eff178b323
+MD5 c48df1a441ca2663bace67096ac59164 evolution-data-server-1.8.3-r3.ebuild 5058
+RMD160 9b33af59939d3f48c3c41512f24653089793f2cb evolution-data-server-1.8.3-r3.ebuild 5058
+SHA256 35d335e40722af599bf6238965fee297688f004ac0f2ccebd7d635eff178b323 evolution-data-server-1.8.3-r3.ebuild 5058
 EBUILD evolution-data-server-1.8.3.ebuild 4729 RMD160 9a5e76ee1fe1571d2870fd57c251e6597248464c SHA1 d24dc9946500ed22607bdb6adf90ed63c4642fd4 SHA256 56ae3975cb9c27a969fd4d2338f2f734f9b24ac17b5a45a910568ee5a940ffaa
 MD5 1b04e7a1837f3d52f305f325bd2c5388 evolution-data-server-1.8.3.ebuild 4729
 RMD160 9a5e76ee1fe1571d2870fd57c251e6597248464c evolution-data-server-1.8.3.ebuild 4729
 SHA256 56ae3975cb9c27a969fd4d2338f2f734f9b24ac17b5a45a910568ee5a940ffaa evolution-data-server-1.8.3.ebuild 4729
-MISC ChangeLog 17390 RMD160 3acdab0405401ec3d1d39747e07c316d2697f4f2 SHA1 d61b754036240cde1540dab29bbf0a9f00ea28ef SHA256 b1bfd96ba7c70995c0293574610fd000e4cdc06f07927dc4332902007acbcf82
-MD5 4e1024c750b51af50655316dd665325a ChangeLog 17390
-RMD160 3acdab0405401ec3d1d39747e07c316d2697f4f2 ChangeLog 17390
-SHA256 b1bfd96ba7c70995c0293574610fd000e4cdc06f07927dc4332902007acbcf82 ChangeLog 17390
+MISC ChangeLog 17907 RMD160 a52e85c1fc8d9e5303c693e5a0745d4c5b1d3dc4 SHA1 538836b165e27d75ffaa9fd3432c3a5424e6467d SHA256 d1463a7439e74ecc8ff9f3e2a0774742c5ee09fb540c3f99a252b9e0dfa90b28
+MD5 a8fedfa2cbdabf50ff8a9c152aa1495f ChangeLog 17907
+RMD160 a52e85c1fc8d9e5303c693e5a0745d4c5b1d3dc4 ChangeLog 17907
+SHA256 d1463a7439e74ecc8ff9f3e2a0774742c5ee09fb540c3f99a252b9e0dfa90b28 ChangeLog 17907
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 d0be19aece028289dd552cfead14fd97 files/digest-evolution-data-server-1.10.0 292
-RMD160 2e7f2dd4a8e09ae9d66dca253d0854e54a8f6561 files/digest-evolution-data-server-1.10.0 292
-SHA256 0395d791f6e7997725cd034be909ec143c7679597db1234ff40f2beb5de0f973 files/digest-evolution-data-server-1.10.0 292
-MD5 573dbe403dae7f25d5e7ce2fe00acd5e files/digest-evolution-data-server-1.10.1 292
-RMD160 4eed8dd19f9c36d6ab1d059798c07415e391fabf files/digest-evolution-data-server-1.10.1 292
-SHA256 e904500ed1ce42ed49972d566f56dee3e0a97162012c7c1adae4775413f3d6ef files/digest-evolution-data-server-1.10.1 292
+MD5 573dbe403dae7f25d5e7ce2fe00acd5e files/digest-evolution-data-server-1.10.1-r1 292
+RMD160 4eed8dd19f9c36d6ab1d059798c07415e391fabf files/digest-evolution-data-server-1.10.1-r1 292
+SHA256 e904500ed1ce42ed49972d566f56dee3e0a97162012c7c1adae4775413f3d6ef files/digest-evolution-data-server-1.10.1-r1 292
 MD5 7fd74c11700c9860da2318b520a983f8 files/digest-evolution-data-server-1.6.2 289
 RMD160 4d8c1fc955f215beddbbc5b95ac3a0c81f8912fa files/digest-evolution-data-server-1.6.2 289
 SHA256 c474de3fb11f9641e62deea95bc409b7d208389cf6deca8c15c08a39a0c70d14 files/digest-evolution-data-server-1.6.2 289
@@ -100,3 +100,6 @@ SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/di
 MD5 159e4efbb6f5fe2e3973464851a6015b files/digest-evolution-data-server-1.8.3-r2 289
 RMD160 9311383fcc0546bb79ba3632bf984e3bb2783652 files/digest-evolution-data-server-1.8.3-r2 289
 SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/digest-evolution-data-server-1.8.3-r2 289
+MD5 159e4efbb6f5fe2e3973464851a6015b files/digest-evolution-data-server-1.8.3-r3 289
+RMD160 9311383fcc0546bb79ba3632bf984e3bb2783652 files/digest-evolution-data-server-1.8.3-r3 289
+SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/digest-evolution-data-server-1.8.3-r3 289
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.10.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r1.ebuild
index 3bb9585dc245..a28ca95cef39 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.10.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-1.10.1.ebuild,v 1.3 2007/04/19 12:07:58 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.10.1-r1.ebuild,v 1.1 2007/05/01 16:44:48 pva Exp $
 
 inherit db-use eutils flag-o-matic gnome2 autotools
 
@@ -80,6 +80,9 @@ src_unpack() {
 	# Rewind in camel-disco-diary to fix a crash
 	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
 
+	# Fix vulnerability in APOP authentification; bug #174210
+	epatch "${FILESDIR}"/${PN}-APOP-auth-fix.patch
+
 #-------------Upstream GNOME look here -----------------#
 
 	# --as-needed fixes
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.10.0.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r3.ebuild
index 6aa64fa3ba79..f015b08f7107 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-1.10.0.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r3.ebuild
@@ -1,18 +1,20 @@
 # Copyright 1999-2007 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-1.10.0.ebuild,v 1.1 2007/03/27 15:04:38 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r3.ebuild,v 1.1 2007/05/01 16:44:48 pva Exp $
 
-inherit eutils gnome2 autotools
+WANT_AUTOMAKE="1.9"
+WANT_AUTOCONF="latest"
+inherit db-use eutils flag-o-matic gnome2 autotools
 
 DESCRIPTION="Evolution groupware backend"
 HOMEPAGE="http://www.gnome.org/projects/evolution/"
 
 LICENSE="LGPL-2 Sleepycat"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc ipv6 kerberos keyring krb4 ldap ssl"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="doc ipv6 kerberos keyring krb4 ldap nntp ssl"
 
-RDEPEND=">=dev-libs/glib-2.10
+RDEPEND=">=dev-libs/glib-2.4
 	>=gnome-base/libbonobo-2.4.2
 	>=gnome-base/orbit-2.9.8
 	>=gnome-base/libgnomeui-2
@@ -36,20 +38,22 @@ RDEPEND=">=dev-libs/glib-2.10
 
 DEPEND="${RDEPEND}
 	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.35.5
+	>=dev-util/intltool-0.35
 	doc? ( >=dev-util/gtk-doc-1.4 )"
 
+MAKEOPTS="${MAKEOPTS} -j1"
 DOCS="ChangeLog MAINTAINERS NEWS TODO"
 
 RESTRICT="confcache"
 
 pkg_setup() {
-	G2CONF="$(use_with ldap openldap)       \
-		$(use_with kerberos krb5 /usr)      \
-		$(use_enable ssl nss)               \
-		$(use_enable ssl smime)             \
-		$(use_enable ipv6)                  \
-		$(use_enable keyring gnome-keyring) \
+	G2CONF="$(use_with ldap openldap)	\
+		$(use_with kerberos krb5 /usr)	\
+		$(use_enable ssl nss)		\
+		$(use_enable ssl smime)		\
+		$(use_enable ipv6)		\
+		$(use_enable nntp)		\
+		$(use_enable keyring gnome-keyring)		\
 		--with-libdb=/usr/$(get_libdir)"
 
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
@@ -68,8 +72,7 @@ pkg_setup() {
 src_unpack() {
 	gnome2_src_unpack
 
-	# Fix what ?
-	epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch
+	epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch
 
 	# Fix broken libdb build
 	epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch
@@ -77,13 +80,24 @@ src_unpack() {
 	# Resolve symbols at execution time for setgid binaries
 	epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch
 
+	# exchange-storage --as-needed fixes
+	epatch "${FILESDIR}"/${PN}-1.7.3-exchange-storage.patch
+	epatch "${FILESDIR}"/${PN}-1.7.4-move-subdirs.patch
+
 	# Rewind in camel-disco-diary to fix a crash
 	epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch
 
-#-------------Upstream GNOME look here -----------------#
+	# Fix non-english contact insertion.  Upstream bug:
+	# http://bugzilla.gnome.org/show_bug.cgi?id=405531
+	epatch "${FILESDIR}"/${P}-category.patch
 
-	# --as-needed fixes
-	epatch "${FILESDIR}"/${PN}-1.9.91-as-needed.patch
+	# Fix DST changes; bug #172835
+	epatch "${FILESDIR}"/${P}-dst.patch.gz
+
+	# Fix vulnerability in APOP authentification; bug #174210
+	epatch "${FILESDIR}"/${PN}-APOP-auth-fix.patch
+
+#-------------Upstream GNOME look here -----------------#
 
 	# fix for dep ordering so we can add libedataserverui to libexchange-storage
 	# we need to do this or: undefined reference to `e_passwords_get_password'
@@ -108,9 +122,12 @@ src_unpack() {
 	# tack on the server.deps Makefile on our last edit
 	sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in
 
-	# fix file includes 
+	# fix file includes
 	sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c
 
+	# Fix db version for FreeBSD users where -ldb is always db-1
+	sed -i -e "s:-ldb:-l$(db_libname):" configure.in
+
 #---------------Upstream GNOME stop here---------------
 	eautoreconf
 }
@@ -118,14 +135,25 @@ src_unpack() {
 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"
+		NSS_LIB=/usr/$(get_libdir)/nss
+		NSS_INC=/usr/include/nss
+		NSPR_LIB=/usr/$(get_libdir)/nspr
+		NSPR_INC=/usr/include/nspr
+
+		G2CONF="${G2CONF} \
+			--with-nspr-includes=${NSPR_INC} \
+			--with-nspr-libs=${NSPR_LIB}     \
+			--with-nss-includes=${NSS_INC}   \
+			--with-nss-libs=${NSS_LIB}"
 	else
 		G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \
-		--without-nss-libs --without-nss-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)"
+
 	cd "${S}"
 	gnome2_src_compile
 }
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.0 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.0
deleted file mode 100644
index 7253efcd7ba7..000000000000
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 390ea134306b667a2d77b7e859c8cba0 evolution-data-server-1.10.0.tar.bz2 7095934
-RMD160 75ad8b846c35ff9a6cbf7f2e12d583fff899ae3d evolution-data-server-1.10.0.tar.bz2 7095934
-SHA256 0a2ee6540ffa767d3c841993300fb4320cffc3738230e2a2ad1c566de35b1214 evolution-data-server-1.10.0.tar.bz2 7095934
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r1
index 031700144864..031700144864 100644
--- a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.10.1-r1
diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r3 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r3
new file mode 100644
index 000000000000..0defb70b07af
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r3
@@ -0,0 +1,3 @@
+MD5 f6a824f2553fd97555b8785a452fb6ab evolution-data-server-1.8.3.tar.bz2 7024111
+RMD160 8051f35a0db514f919bf730cd35c37ea75029061 evolution-data-server-1.8.3.tar.bz2 7024111
+SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc evolution-data-server-1.8.3.tar.bz2 7024111
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
new file mode 100644
index 000000000000..e1a814e008d9
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-APOP-auth-fix.patch
@@ -0,0 +1,33 @@
+--- branches/gnome-2-18/camel/providers/pop3/camel-pop3-store.c	2007/03/16 05:39:41	7656
++++ branches/gnome-2-18/camel/providers/pop3/camel-pop3-store.c	2007/04/30 11:04:28	7723
+@@ -34,6 +34,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <ctype.h>
+ 
+ #include "camel-operation.h"
+ 
+@@ -489,7 +490,21 @@
+ 	} else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
+ 		char *secret, md5asc[33], *d;
+ 		unsigned char md5sum[16], *s;
+-		
++
++		d = store->engine->apop;
++
++		while (*d != '\0') {
++			if (!isascii((int)*d)) {
++
++				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
++						_("Unable to connect to POP server %s: "),
++						CAMEL_SERVICE (store)->url->host);
++
++				return FALSE;
++			}
++			d++;
++		}
++
+ 		secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
+ 		sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);
+ 		md5_get_digest(secret, strlen (secret), md5sum);