8 files changed, 30 insertions, 46 deletions
diff --git a/mail-client/ximian-connector/ChangeLog b/mail-client/ximian-connector/ChangeLog
index 5b2762c4d1f1..ed28805e0b35 100644
--- a/mail-client/ximian-connector/ChangeLog
+++ b/mail-client/ximian-connector/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for mail-client/ximian-connector
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ChangeLog,v 1.14 2004/11/30 17:07:33 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ChangeLog,v 1.15 2004/12/03 16:09:21 liquidx Exp $
+
+*ximian-connector-2.0.2-r1 (03 Dec 2004)
+
+  03 Dec 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/2.0.2-exchange_auth.patch, +ximian-connector-2.0.2-r1.ebuild:
+  added patch for authentication problems under exchange 2003 (#69191)
 
   30 Nov 2004; Mike Gardiner <obz@gentoo.org>
   ximian-connector-1.2.2_p1.ebuild:
diff --git a/mail-client/ximian-connector/Manifest b/mail-client/ximian-connector/Manifest
index d9f43f402b8d..17c97c3683d2 100644
--- a/mail-client/ximian-connector/Manifest
+++ b/mail-client/ximian-connector/Manifest
@@ -1,13 +1,15 @@
 MD5 4515a4f59e11ebb0112244d53b6065f6 ChangeLog 6358
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 f190bc915d55d2576cddd6652a921e32 ximian-connector-1.2.2_p1.ebuild 1832
-MD5 279f3c12bf43cc57e6a1fcef3ba9bd8d ximian-connector-1.4.7.2.ebuild 957
 MD5 7d1011e7aed9deb24a6fc1433700e40c ximian-connector-2.0.0.ebuild 896
 MD5 d5d4638760f932e0fead2e6e8391ee08 ximian-connector-2.0.1.ebuild 985
-MD5 7b066344f1bd66fd6d5b4928fcd26b7a ximian-connector-2.0.2.ebuild 906
+MD5 279f3c12bf43cc57e6a1fcef3ba9bd8d ximian-connector-1.4.7.2.ebuild 957
+MD5 b282b99aea38c7fe719f2205997b780f ximian-connector-2.0.2-r1.ebuild 991
 MD5 9dfb89cf8aa1ed2f2530cf73c0c6c478 files/digest-ximian-connector-1.2.2_p1 173
 MD5 7d1775fcd3f66e7fb5a1631fc9db5fcc files/digest-ximian-connector-1.4.7.2 76
 MD5 e9d7f494208fffcff73379ac9e7f12c8 files/digest-ximian-connector-2.0.0 76
 MD5 6d2437fbb82a87aa651c1c9b25ab4c3e files/digest-ximian-connector-2.0.1 76
-MD5 26036add2c9eea8522d465fa529fc43f files/digest-ximian-connector-2.0.2 76
 MD5 c54395967f9527952a219a01253770c9 files/ximian-connector-2.0.1-exchange2003.patch 625
+MD5 26036add2c9eea8522d465fa529fc43f files/digest-ximian-connector-2.0.2 76
+MD5 9fb7d691f96995adaac16cfedf42b202 files/2.0.2-exchange_auth.patch 555
+MD5 26036add2c9eea8522d465fa529fc43f files/digest-ximian-connector-2.0.2-r1 76
diff --git a/mail-client/ximian-connector/files/2.0.2-exchange_auth.patch b/mail-client/ximian-connector/files/2.0.2-exchange_auth.patch
new file mode 100644
index 000000000000..9e7aa22a3c86
--- /dev/null
+++ b/mail-client/ximian-connector/files/2.0.2-exchange_auth.patch
@@ -0,0 +1,11 @@
+--- storage/exchange-account.c.orig	2004-10-11 01:21:46.000000000 -0400
++++ storage/exchange-account.c	2004-10-27 17:37:02.328080687 -0400
+@@ -1507,7 +1507,7 @@
+ 	 */
+ 	account->priv->password_key = g_strdup_printf ("exchange://%s", account->priv->uri_authority);
+ 
+-	account->priv->username = g_strdup (uri->user);
++	account->priv->username = g_strconcat (uri->domain, "\\", uri->user, 0);
+ 	account->exchange_server = g_strdup (uri->host);
+ 	if (uri->authmech && !strcmp (uri->authmech, "Basic"))
+ 		account->priv->auth_pref = E2K_AUTOCONFIG_USE_BASIC;
diff --git a/mail-client/ximian-connector/files/digest-ximian-connector-2.0.0 b/mail-client/ximian-connector/files/digest-ximian-connector-2.0.0
deleted file mode 100644
index 35c0d90ffe0f..000000000000
--- a/mail-client/ximian-connector/files/digest-ximian-connector-2.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 220d9acec5a792595060cc508e0e2958 ximian-connector-2.0.0.tar.bz2 1210739
diff --git a/mail-client/ximian-connector/files/digest-ximian-connector-2.0.1 b/mail-client/ximian-connector/files/digest-ximian-connector-2.0.1
deleted file mode 100644
index 959cf09b04e5..000000000000
--- a/mail-client/ximian-connector/files/digest-ximian-connector-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 858549c2fa67b92c494214f905f2fa90 ximian-connector-2.0.1.tar.bz2 1185373
diff --git a/mail-client/ximian-connector/files/digest-ximian-connector-2.0.2-r1 b/mail-client/ximian-connector/files/digest-ximian-connector-2.0.2-r1
new file mode 100644
index 000000000000..0ebb3979f520
--- /dev/null
+++ b/mail-client/ximian-connector/files/digest-ximian-connector-2.0.2-r1
@@ -0,0 +1 @@
+MD5 706f53c9c26321c938248264a4456c30 ximian-connector-2.0.2.tar.bz2 1185897
diff --git a/mail-client/ximian-connector/ximian-connector-2.0.0.ebuild b/mail-client/ximian-connector/ximian-connector-2.0.0.ebuild
deleted file mode 100644
index 8cddb9986017..000000000000
--- a/mail-client/ximian-connector/ximian-connector-2.0.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ximian-connector-2.0.0.ebuild,v 1.4 2004/10/22 22:37:46 liquidx Exp $
-
-inherit gnome2
-
-DESCRIPTION="Evolution module for connecting to Microsoft Exchange"
-HOMEPAGE="http://www.novell.com/products/connector/"
-LICENSE="GPL-2"
-
-SLOT="2.0"
-KEYWORDS="~x86 ~sparc"
-IUSE="debug doc"
-
-RDEPEND=">=mail-client/evolution-2
-		>=dev-libs/glib-2.0
-		>=gnome-base/orbit-2.3
-		>=gnome-base/gconf-2.0
-		>=net-libs/libsoup-2.2
-		>=gnome-base/libglade-2.0
-		>=gnome-base/libgnomeui-2.0
-		>=gnome-base/libbonobo-2.0
-		>=net-nds/openldap-2.1.30-r2
-		virtual/krb5"
-
-DEPEND="${RDEPEND}
-		dev-util/intltool
-		dev-util/pkgconfig
-		doc? ( dev-util/gtk-doc )"
-
-MAKEOPTS="${MAKEOPTS} -j1"
-G2CONF="${G2CONF} `use_with debug e2k-debug`"
-USE_DESTDIR="1"
-
-
diff --git a/mail-client/ximian-connector/ximian-connector-2.0.1.ebuild b/mail-client/ximian-connector/ximian-connector-2.0.2-r1.ebuild
index 39c98966e817..78a6cd208ded 100644
--- a/mail-client/ximian-connector/ximian-connector-2.0.1.ebuild
+++ b/mail-client/ximian-connector/ximian-connector-2.0.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ximian-connector-2.0.1.ebuild,v 1.2 2004/10/22 22:37:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/ximian-connector/ximian-connector-2.0.2-r1.ebuild,v 1.1 2004/12/03 16:09:21 liquidx Exp $
 
 inherit gnome2 eutils
 
@@ -12,11 +12,11 @@ SLOT="2.0"
 KEYWORDS="~x86 ~sparc"
 IUSE="debug doc"
 
-RDEPEND=">=mail-client/evolution-2
+RDEPEND=">=mail-client/evolution-2.0.2
 		>=dev-libs/glib-2.0
 		>=gnome-base/orbit-2.3
 		>=gnome-base/gconf-2.0
-		>=net-libs/libsoup-2.2
+		>=net-libs/libsoup-2.2.1
 		>=gnome-base/libglade-2.0
 		>=gnome-base/libgnomeui-2.0
 		>=gnome-base/libbonobo-2.0
@@ -34,5 +34,6 @@ USE_DESTDIR="1"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/${P}-exchange2003.patch
-}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-exchange_auth.patch
+}
+\ No newline at end of file