From 32b2b2d5bf5ea87a5ecb07691c3e423fbcfcbb79 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Fri, 9 Mar 2007 19:35:45 +0000
Subject: [PATCH] - Add patch for GNOME bug #415922 (support MS ISA Server
 2004). - Patch by Kenny Root.

---
 ...ution-data-server-1.9.92-isa-support.patch | 33 +++++++++++++++++++
 evolution-data-server.spec                    | 10 +++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 evolution-data-server-1.9.92-isa-support.patch

diff --git a/evolution-data-server-1.9.92-isa-support.patch b/evolution-data-server-1.9.92-isa-support.patch
new file mode 100644
index 0000000..311637d
--- /dev/null
+++ b/evolution-data-server-1.9.92-isa-support.patch
@@ -0,0 +1,33 @@
+--- evolution-data-server-1.9.92/servers/exchange/lib/e2k-context.c.isa-support	2007-01-03 09:56:24.000000000 -0500
++++ evolution-data-server-1.9.92/servers/exchange/lib/e2k-context.c	2007-03-09 14:05:48.000000000 -0500
+@@ -603,6 +603,7 @@
+ 		g_free (suri->path);
+ 		suri->path = g_strdup (value);
+ 		action = soup_uri_to_string (suri, FALSE);
++		soup_uri_decode (action);
+ 		soup_uri_free (suri);
+ 	} else
+ 		action = g_strdup (value);
+--- evolution-data-server-1.9.92/servers/exchange/lib/e2k-autoconfig.c.isa-support	2007-01-03 09:56:24.000000000 -0500
++++ evolution-data-server-1.9.92/servers/exchange/lib/e2k-autoconfig.c	2007-03-09 14:05:48.000000000 -0500
+@@ -442,7 +442,9 @@
+ 
+ 	/* A redirection to "logon.asp" means this is Exchange 5.5
+ 	 * OWA. A redirection to "owalogon.asp" means this is Exchange
+-	 * 2003 forms-based authentication. Other redirections most
++	 * 2003 forms-based authentication. A redirection to
++	 * "CookieAuth.dll" means that it's an Exchange 2003 server
++	 * behind an ISA Server 2004 proxy. Other redirections most
+ 	 * likely indicate that the user's mailbox has been moved to a
+ 	 * new server.
+ 	 */
+@@ -460,7 +462,8 @@
+ 		if (strstr (location, "/logon.asp")) {
+ 			*result = E2K_AUTOCONFIG_EXCHANGE_5_5;
+ 			goto done;
+-		} else if (strstr (location, "/owalogon.asp")) {
++		} else if (strstr (location, "/owalogon.asp") ||
++			   strstr (location, "/CookieAuth.dll")) {
+ 			if (e2k_context_fba (ctx, msg))
+ 				goto try_again;
+ 			*result = E2K_AUTOCONFIG_AUTH_ERROR;
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index a6118d3..34ee562 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.9.92
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -78,6 +78,9 @@ Patch25: evolution-data-server-1.9.92-e-flag.patch
 # GNOME bug #376991
 Patch26: evolution-data-server-1.9.92-e-passwords.patch
 
+# GNOME bug #415922
+Patch27: evolution-data-server-1.9.92-isa-support.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -172,6 +175,7 @@ evolution-data-server.
 %patch24 -p1 -b .updated-zoneinfo
 %patch25 -p1 -b .e-flag
 %patch26 -p1 -b .e-passwords
+%patch27 -p1 -b .isa-support
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -380,6 +384,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Fri Mar 09 2007 Matthew Barnes <mbarnes@redhat.com> - 1.9.92-4.fc7
+- Add patch for GNOME bug #415922 (support MS ISA Server 2004).
+- Patch by Kenny Root.
+
 * Thu Mar 08 2007 Matthew Barnes <mbarnes@redhat.com> - 1.9.92-3.fc7
 - Add patch for GNOME bug #415891 (introduce EFlag API).
 - Add patch for GNOME bug #376991 (refactor password handling).