Rebase to 0.9.3.

This commit is contained in:
Jan Pazdziora 2014-06-30 08:35:58 +02:00
parent c35b282506
commit 049972b319
3 changed files with 18 additions and 11 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/mod_authnz_pam-0.8.1.tar.gz /mod_authnz_pam-0.8.1.tar.gz
/mod_authnz_pam-0.9.tar.gz /mod_authnz_pam-0.9.tar.gz
/mod_authnz_pam-0.9.2.tar.gz /mod_authnz_pam-0.9.2.tar.gz
/mod_authnz_pam-0.9.3.tar.gz

View File

@ -7,8 +7,8 @@
Summary: PAM authorization checker and PAM Basic Authentication provider Summary: PAM authorization checker and PAM Basic Authentication provider
Name: mod_authnz_pam Name: mod_authnz_pam
Version: 0.9.2 Version: 0.9.3
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_authnz_pam/ URL: http://www.adelton.com/apache/mod_authnz_pam/
@ -36,6 +36,14 @@ can also be used as full Basic Authentication provider which runs the
%build %build
%{_httpd_apxs} -c -Wc,"%{optflags} -Wall -pedantic -std=c99" -lpam mod_authnz_pam.c %{_httpd_apxs} -c -Wc,"%{optflags} -Wall -pedantic -std=c99" -lpam mod_authnz_pam.c
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
echo > authnz_pam.confx
echo "# Load the module in %{_httpd_modconfdir}/55-authnz_pam.conf" >> authnz_pam.confx
cat authnz_pam.conf >> authnz_pam.confx
%else
cat authnz_pam.module > authnz_pam.confx
cat authnz_pam.conf >> authnz_pam.confx
%endif
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -43,24 +51,22 @@ install -Dm 755 .libs/mod_authnz_pam.so $RPM_BUILD_ROOT%{_httpd_moddir}/mod_auth
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
# httpd >= 2.4.x # httpd >= 2.4.x
install -Dp -m 0644 authnz_pam.conf $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-authnz_pam.conf install -Dp -m 0644 authnz_pam.module $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-authnz_pam.conf
%else
# httpd <= 2.2.x
install -Dp -m 0644 authnz_pam.conf $RPM_BUILD_ROOT%{_httpd_confdir}/authnz_pam.conf
%endif %endif
install -Dp -m 0644 authnz_pam.confx $RPM_BUILD_ROOT%{_httpd_confdir}/authnz_pam.conf
%files %files
%doc README LICENSE %doc README LICENSE
%if "%{_httpd_modconfdir}" != "%{_httpd_confdir}" %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
%config(noreplace) %{_httpd_modconfdir}/55-authnz_pam.conf %config(noreplace) %{_httpd_modconfdir}/55-authnz_pam.conf
%else
%config(noreplace) %{_httpd_confdir}/authnz_pam.conf
%endif %endif
%config(noreplace) %{_httpd_confdir}/authnz_pam.conf
%{_httpd_moddir}/*.so %{_httpd_moddir}/*.so
%changelog %changelog
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2 * Mon Jun 23 2014 Jan Pazdziora <jpazdziora@redhat.com> - 0.9.3-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - Fix module loading/configuration for Apache 2.4.
- Set PAM_RHOST.
* Tue May 13 2014 Jan Pazdziora <jpazdziora@redhat.com> - 0.9.2-1 * Tue May 13 2014 Jan Pazdziora <jpazdziora@redhat.com> - 0.9.2-1
- Silence compile warnings by specifying C99. - Silence compile warnings by specifying C99.

View File

@ -1 +1 @@
ec2d4e0badaecad0a868c04bbe910b42 mod_authnz_pam-0.9.2.tar.gz 35da73db23556dc4e4419399b8386a66 mod_authnz_pam-0.9.3.tar.gz