%define apxs /usr/sbin/apxs
Summary: This is the PAM authentication module for Apache
Summary(es): Este módulo proporciona autenticación PAM para Apache
-Summary(pl): Modu³ autentykacji PAM dla Apache
+Summary(pl): Modu³ uwierzytelnienia PAM dla Apache
Summary(pt_BR): Este módulo provê autenticação PAM para o Apache
Name: apache-mod_%{mod_name}
Version: 1.1.1
Release: 1
+Epoch: 1
License: GPL
Group: Networking/Daemons
-Source0: http://pam.sourceforge.net/mod_auth_pam/dist/mod_%{mod_name}-%{version}.tar.gz
-# Source0-md5: b1e36b5df18a177e671785f7f4c8001c
-Patch0: %{name}-symbol_fix.patch
+Source0: http://pam.sourceforge.net/mod_%{mod_name}/dist/mod_%{mod_name}-2.0-%{version}.tar.gz
+# Source0-md5: ab873520ddd2fee7d480dfd53e464e0a
+Source1: apache-mod_auth_pam.conf
URL: http://pam.sourceforge.net/mod_auth_pam/
BuildRequires: %{apxs}
-BuildRequires: apache(EAPI)-devel
-PreReq: %{_sbindir}/apxs
-Requires: apache(EAPI)
+BuildRequires: apache-devel >= 2.0
+BuildRequires: pam-devel
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires: apache(modules-api) = %apache_modules_api
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _pkglibdir %(%{apxs} -q LIBEXECDIR)
+%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
%description
This is an authentication module for Apache that allows you to
Este módulo permite autenticar clientes HTTP usando el directorio PAM.
%description -l pl
-To jest modu³ autentykacji dla Apache pozwalaj±cy na autentykacjê
-klientów HTTP przez PAM.
+To jest modu³ uwierzytelnienia dla Apache pozwalaj±cy na
+uwierzytelnianie klientów HTTP przez PAM.
%description -l pt_BR
Este módulo permite que você autentique clientes HTTP usando o
diretório PAM.
%prep
-%setup -q -n mod_%{mod_name}-%{version}
-%patch -p1
+%setup -q -n mod_%{mod_name}
%build
-%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.so -lpam -ldl
+%{apxs} -c mod_%{mod_name}.c -o mod_%{mod_name}.la -lpam
+%{apxs} -c mod_auth_sys_group.c -o mod_auth_sys_group.la -lpam
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},/etc/pam.d,%{_sysconfdir}/httpd.conf}
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install samples/httpd- $RPM_BUILD_ROOT/etc/pam.d/httpd
+install .libs/mod_*.so $RPM_BUILD_ROOT%{_pkglibdir}
+install samples/httpd $RPM_BUILD_ROOT/etc/pam.d/httpd
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
+
+%clean
+rm -rf $RPM_BUILD_ROOT
%post
-%{apxs} -e -a -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
-%preun
+%postun
if [ "$1" = "0" ]; then
- %{apxs} -e -A -n %{mod_name} %{_pkglibdir}/mod_%{mod_name}.so 1>&2
- if [ -f /var/lock/subsys/httpd ]; then
- /etc/rc.d/init.d/httpd restart 1>&2
- fi
+ %service -q httpd restart
fi
-%clean
-rm -rf $RPM_BUILD_ROOT
+%triggerpostun -- %{name} < 1:1.1.1-1
+if [ -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf ]; then
+ echo "Saving old configuration as %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave"
+ cp -f %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf.rpmsave
+ echo "Adjusting configuration for apache-mod_auth_pam >= 1.1"
+ sed -i -e '{ s/pam_auth_module/auth_pam_module/g; s/etc_group_auth_module/auth_sys_group_module/g; s/mod_auth_pam2.so/mod_auth_pam.so/g; s/mod_auth_etc_group.so/mod_auth_sys_group.so/g; }' %{_sysconfdir}/httpd.conf/52_mod_auth_pam.conf
+
+ %service -q httpd restart
+fi
%files
%defattr(644,root,root,755)
-%doc doc/{configure,faq}.txt samples/dot-htaccess README
+%doc doc/{configure,faq}.html samples/dot-htaccess README
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_auth_pam.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
%config(noreplace) /etc/pam.d/httpd
-%attr(755,root,root) %{_pkglibdir}/*