- updated to 2.1

Changed files:
    apache-mod_auth_shadow.spec -> 1.8

diff --git a/apache-mod_auth_shadow.spec b/apache-mod_auth_shadow.spec
index 691f6d07e723acf953aa79ea37350b186851d1f1..a8405082203b6ecef9adfe315310bef2370ef008 100644 (file)
--- a/apache-mod_auth_shadow.spec
+++ b/apache-mod_auth_shadow.spec
@@ -1,45 +1,59 @@
-%define                mod_name        auth-shadow
-%define                orig_name       auth_shadow
-%define                ver             1.3
+# TODO
+# - mv SPECS/apache-mod_auth{-,_}shadow.spec,v
+%define                mod_name        auth_shadow
 %define        apxs            /usr/sbin/apxs
 Summary:       Apache module: authenticating against a /etc/shadow file
 Summary(pl):   Modu³ do apache: autoryzacja przez plik /etc/shadow
 Name:          apache-mod_%{mod_name}
-Version:       %{ver}
+Version:       2.1
 Release:       0.1
 License:       GPL
 Group:         Networking/Daemons
-Source0:       http://www.jdimedia.nl/igmar/mod_%{mod_name}/files/mod_%{orig_name}-%{version}.tar.gz
-# Source0-md5: 46164ccb94489415021a041daa8a3ded
-Patch0:                %{name}-path.patch
-URL:           http://www.jdimedia.nl/igmar/mod_auth-shadow/
+Source0:       http://dl.sourceforge.net/mod-auth-shadow/mod_auth_shadow-%{version}.tar.gz
+# Source0-md5: 564f11a9d19ea546673644fdacb928e7
+Patch0:                %{name}-make.patch
+URL:           http://mod-auth-shadow.sourceforge.net/
 BuildRequires: %{apxs}
 BuildRequires: apache-devel >= 2.0
 Requires:      apache(modules-api) = %apache_modules_api
+Obsoletes:     apache-mod_auth-shadow
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 %define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
-Apache module: authenticating against a /etc/shadow file
+mod_auth_shadow is an Apache module for authenticating users via an
+/etc/shadow file.
+
+When performing this task one encounters one fundamental difficulty:
+The /etc/shadow file is supposed to be read/writeable only by root.
+However, the webserver is supposed to run under a non-root user, such
+as "nobody".
+
+mod_auth_shadow addresses this difficulty by opening a pipe to an suid
+root program, validate, which does the actual validation. When there
+is a failure, validate writes an error message to the system log, and
+waits three seconds before exiting.
 
 %description -l pl
 Modu³ do apache: autoryzacja przez plik /etc/shadow
 
 %prep
-%setup -q -n mod_%{orig_name}-%{version}
+%setup -q -n mod_%{mod_name}-%{version}
 %patch0 -p1
 
 %build
-%{__cc} -o validate validate.c -lcrypt
-%{apxs} -c mod_%{orig_name}.c -o mod_%{mod_name}.so -lz
+%{__make} \
+       CC="%{__cc}" \
+       INSTBINDIR=%{_sbindir} \
+       APXS=%{apxs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sbindir},%{_sysconfdir}/httpd.conf}
 
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
 install validate $RPM_BUILD_ROOT%{_sbindir}
 echo 'LoadModule auth_shadow_module modules/mod_auth_shadow.so' > \
        $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
@@ -61,7 +75,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README
+%doc CHANGES INSTALL README
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
 %attr(4755,root,root) %{_sbindir}/*