Rebase to 0.9.8.
This commit is contained in:
parent
2ec721b49d
commit
3bfbf2c6ba
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
/mod_intercept_form_submit-0.9.5.tar.gz
|
/mod_intercept_form_submit-0.9.5.tar.gz
|
||||||
/mod_intercept_form_submit-0.9.7.tar.gz
|
/mod_intercept_form_submit-0.9.7.tar.gz
|
||||||
|
/mod_intercept_form_submit-0.9.8.tar.gz
|
||||||
|
@ -7,8 +7,8 @@
|
|||||||
|
|
||||||
Summary: Apache module to intercept login form submission and run PAM authentication
|
Summary: Apache module to intercept login form submission and run PAM authentication
|
||||||
Name: mod_intercept_form_submit
|
Name: mod_intercept_form_submit
|
||||||
Version: 0.9.7
|
Version: 0.9.8
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
URL: http://www.adelton.com/apache/mod_intercept_form_submit/
|
URL: http://www.adelton.com/apache/mod_intercept_form_submit/
|
||||||
@ -35,6 +35,14 @@ the REMOTE_USER environment variable if the authentication passes.
|
|||||||
|
|
||||||
%build
|
%build
|
||||||
%{_httpd_apxs} -c -Wc,"%{optflags} -Wall -pedantic -std=c99" mod_intercept_form_submit.c
|
%{_httpd_apxs} -c -Wc,"%{optflags} -Wall -pedantic -std=c99" mod_intercept_form_submit.c
|
||||||
|
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
|
||||||
|
echo > intercept_form_submit.confx
|
||||||
|
echo "# Load the module in %{_httpd_modconfdir}/55-intercept_form_submit.conf" >> intercept_form_submit.confx
|
||||||
|
cat intercept_form_submit.conf >> intercept_form_submit.confx
|
||||||
|
%else
|
||||||
|
cat intercept_form_submit.module > intercept_form_submit.confx
|
||||||
|
cat intercept_form_submit.conf >> intercept_form_submit.confx
|
||||||
|
%endif
|
||||||
|
|
||||||
%install
|
%install
|
||||||
rm -rf $RPM_BUILD_ROOT
|
rm -rf $RPM_BUILD_ROOT
|
||||||
@ -42,24 +50,23 @@ install -Dm 755 .libs/mod_intercept_form_submit.so $RPM_BUILD_ROOT%{_httpd_moddi
|
|||||||
|
|
||||||
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
|
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
|
||||||
# httpd >= 2.4.x
|
# httpd >= 2.4.x
|
||||||
install -Dp -m 0644 intercept_form_submit.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-intercept_form_submit.conf
|
install -Dp -m 0644 intercept_form_submit.module $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-intercept_form_submit.conf
|
||||||
%else
|
|
||||||
# httpd <= 2.2.x
|
|
||||||
install -Dp -m 0644 intercept_form_submit.conf $RPM_BUILD_ROOT%{_httpd_confdir}/intercept_form_submit.conf
|
|
||||||
%endif
|
%endif
|
||||||
|
install -Dp -m 0644 intercept_form_submit.confx $RPM_BUILD_ROOT%{_httpd_confdir}/intercept_form_submit.conf
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%doc README LICENSE docs/*
|
%doc README LICENSE docs/*
|
||||||
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
|
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
|
||||||
%config(noreplace) %{_httpd_modconfdir}/55-intercept_form_submit.conf
|
%config(noreplace) %{_httpd_modconfdir}/55-intercept_form_submit.conf
|
||||||
%else
|
|
||||||
%config(noreplace) %{_httpd_confdir}/intercept_form_submit.conf
|
|
||||||
%endif
|
%endif
|
||||||
|
%config(noreplace) %{_httpd_confdir}/intercept_form_submit.conf
|
||||||
%{_httpd_moddir}/*.so
|
%{_httpd_moddir}/*.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.7-2
|
* Mon Jun 30 2014 Jan Pazdziora <jpazdziora@redhat.com> - 0.9.8-1
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
- 1109923 - Fix module loading/configuration for Apache 2.4.
|
||||||
|
- Document the runtime dependency on pam_authenticate_with_login_password.
|
||||||
|
- Comment/code cleanup.
|
||||||
|
|
||||||
* Tue May 13 2014 Jan Pazdziora <jpazdziora@redhat.com> - 0.9.7-1
|
* Tue May 13 2014 Jan Pazdziora <jpazdziora@redhat.com> - 0.9.7-1
|
||||||
- No longer call lookup_identity_hook explicitly, hook order does
|
- No longer call lookup_identity_hook explicitly, hook order does
|
||||||
|
Loading…
Reference in New Issue
Block a user