From 049972b3194085d398bd0e9dc430d167210bbdaf Mon Sep 17 00:00:00 2001
From: Jan Pazdziora <jpazdziora@redhat.com>
Date: Jun 30 2014 06:35:58 +0000
Subject: Rebase to 0.9.3.


---

diff --git a/.gitignore b/.gitignore
index 36345c3..fea3bcb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /mod_authnz_pam-0.8.1.tar.gz
 /mod_authnz_pam-0.9.tar.gz
 /mod_authnz_pam-0.9.2.tar.gz
+/mod_authnz_pam-0.9.3.tar.gz
diff --git a/mod_authnz_pam.spec b/mod_authnz_pam.spec
index 8d4b8ee..da755cb 100644
--- a/mod_authnz_pam.spec
+++ b/mod_authnz_pam.spec
@@ -7,8 +7,8 @@
 
 Summary: PAM authorization checker and PAM Basic Authentication provider
 Name: mod_authnz_pam
-Version: 0.9.2
-Release: 2%{?dist}
+Version: 0.9.3
+Release: 1%{?dist}
 License: ASL 2.0
 Group: System Environment/Daemons
 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
 %{_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
 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}"
 # httpd >= 2.4.x
-install -Dp -m 0644 authnz_pam.conf $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
+install -Dp -m 0644 authnz_pam.module $RPM_BUILD_ROOT%{_httpd_modconfdir}/55-authnz_pam.conf
 %endif
+install -Dp -m 0644 authnz_pam.confx $RPM_BUILD_ROOT%{_httpd_confdir}/authnz_pam.conf
 
 %files
 %doc README LICENSE
 %if "%{_httpd_modconfdir}" != "%{_httpd_confdir}"
 %config(noreplace) %{_httpd_modconfdir}/55-authnz_pam.conf
-%else
-%config(noreplace) %{_httpd_confdir}/authnz_pam.conf
 %endif
+%config(noreplace) %{_httpd_confdir}/authnz_pam.conf
 %{_httpd_moddir}/*.so
 
 %changelog
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+* Mon Jun 23 2014 Jan Pazdziora <jpazdziora@redhat.com> - 0.9.3-1
+- Fix module loading/configuration for Apache 2.4.
+- Set PAM_RHOST.
 
 * Tue May 13 2014 Jan Pazdziora <jpazdziora@redhat.com> - 0.9.2-1
 - Silence compile warnings by specifying C99.
diff --git a/sources b/sources
index fc82540..40c9927 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec2d4e0badaecad0a868c04bbe910b42  mod_authnz_pam-0.9.2.tar.gz
+35da73db23556dc4e4419399b8386a66  mod_authnz_pam-0.9.3.tar.gz