diff options
| -rw-r--r-- | mod_auth_kerb-5.4-cachedir.patch | 4 | ||||
| -rw-r--r-- | mod_auth_kerb.spec | 19 |
2 files changed, 17 insertions, 6 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 42d5ed2..095f0fe 100644 --- a/mod_auth_kerb.spec +++ b/mod_auth_kerb.spec @@ -8,7 +8,7 @@ Summary: Kerberos authentication module for HTTP Name: mod_auth_kerb Version: 5.4 -Release: 13%{?dist} +Release: 14%{?dist} License: BSD and MIT and ASL 2.0 Group: System Environment/Daemons URL: http://modauthkerb.sourceforge.net/ @@ -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} @@ -58,6 +60,10 @@ install -Dp -m 0644 10-auth_kerb.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}/10-aut install -Dp -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_httpd_confdir}/auth_kerb.conf %endif +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d +echo 'd /var/run/user/apache 700 apache apache' \ + > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/httpd-user.conf + # Copy the license files here so we can include them in %doc cp -p %{SOURCE2} . @@ -71,9 +77,14 @@ rm -rf $RPM_BUILD_ROOT %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" %doc example.conf %endif -%{_libdir}/httpd/modules/*.so +%{_httpd_moddir}/*.so +%config %{_sysconfdir}/tmpfiles.d/httpd-user.conf %changelog +* Fri May 11 2012 Joe Orton <jorton@redhat.com> - 5.4-14 +- add tmpfile drop-in for cred cache (#796430) +- really apply delegation fix + * Tue May 1 2012 Joe Orton <jorton@redhat.com> - 5.4-13 - add delegation fix (Ben Kahn, mgbowman, #687975) |