[mod_auth_kerb] really apply delegation fix

[jorton]

commit ee5b60232cd3f3180e68c6f4f6e13b3ffa9852eb
Author: Joe Orton <jorton at redhat.com>
Date:   Fri May 11 10:42:28 2012 +0100

    really apply delegation fix

 mod_auth_kerb-5.4-cachedir.patch |    4 ++--
 mod_auth_kerb.spec               |    9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/mod_auth_kerb-5.4-cachedir.patch b/mod_auth_kerb-5.4-cachedir.patch
index d543a56..2c2a1fd 100644
--- a/mod_auth_kerb-5.4-cachedir.patch
+++ b/mod_auth_kerb-5.4-cachedir.patch
@@ -8,8 +8,8 @@ switch the cache dir to be relative to runtimedir.
     int ret;
     krb5_ccache tmp_ccache = NULL;
  
--   ccname = apr_psprintf(r->pool, "FILE:%s/krb5cc_apache_XXXXXX", P_tmpdir);
-+   ccname = apr_pstrcat(r->pool, "FILE:",
+-   ccname = apr_psprintf(r->connection->pool, "FILE:%s/krb5cc_apache_XXXXXX", P_tmpdir);
++   ccname = apr_pstrcat(r->connection->pool, "FILE:",
 +                        ap_server_root_relative(r->pool, 
 +                                                DEFAULT_REL_RUNTIMEDIR
 +                                                "/krb5cc_apache_XXXXXX"));
diff --git a/mod_auth_kerb.spec b/mod_auth_kerb.spec
index f93a1bb..6e602f6 100644
--- a/mod_auth_kerb.spec
+++ b/mod_auth_kerb.spec
@@ -19,8 +19,8 @@ Patch1: mod_auth_kerb-5.4-rcopshack.patch
 Patch2: mod_auth_kerb-5.4-fixes.patch
 Patch3: mod_auth_kerb-5.4-s4u2proxy.patch
 Patch4: mod_auth_kerb-5.4-httpd24.patch
-Patch5: mod_auth_kerb-5.4-cachedir.patch
-Patch6: mod_auth_kerb-5.4-delegation.patch
+Patch5: mod_auth_kerb-5.4-delegation.patch
+Patch6: mod_auth_kerb-5.4-cachedir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: httpd-devel, krb5-devel
 Requires: httpd-mmn = %{_httpd_mmn}
@@ -37,6 +37,8 @@ authentication based on ticket exchanges.
 %patch2 -p1 -b .fixes
 %patch3 -p1 -b .s4u2proxy
 %patch4 -p1 -b .httpd24
+%patch5 -p1 -b .delegation
+%patch6 -p1 -b .cachedir
 
 %build
 export APXS=%{_httpd_apxs}
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_httpd_moddir}/*.so
 
 %changelog
+* Fri May 11 2012 Joe Orton <jorton at redhat.com> - 5.4-14
+- really apply delegation fix
+
 * Tue May  1 2012 Joe Orton <jorton at redhat.com> - 5.4-13
 - add delegation fix (Ben Kahn, mgbowman, #687975)