X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=apache-mod_auth_shadow.spec;h=f97d53ca86df319fb0338ed34de0733b54563f17;hb=HEAD;hp=b84ecdb85041b7790a051d9755e9928445fd2125;hpb=8a40357282007d23277966c5030654ca3ba733b0;p=packages%2Fapache-mod_auth_shadow.git

diff --git a/apache-mod_auth_shadow.spec b/apache-mod_auth_shadow.spec
index b84ecdb..f97d53c 100644
--- a/apache-mod_auth_shadow.spec
+++ b/apache-mod_auth_shadow.spec
@@ -1,67 +1,88 @@
-%define		mod_name	auth-shadow
-%define		orig_name	auth_shadow
-%define		ver		1.3
+%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
+Summary(pl.UTF-8):	Moduł do apache: autoryzacja przez plik /etc/shadow
 Name:		apache-mod_%{mod_name}
-Version:	%{ver}
+Version:	2.3
 Release:	0.1
 License:	GPL
-Group:		Networking/Daemons
-Source0:	http://www.jdimedia.nl/igmar/mod_%{mod_name}/files/mod_%{orig_name}-%{version}.tar.gz
-Patch0:		%{name}-path.patch
-URL:		http://www.jdimedia.nl/igmar/mod_%{mod_name}/
+Group:		Networking/Daemons/HTTP
+Source0:	http://dl.sourceforge.net/mod-auth-shadow/mod_auth_shadow-%{version}.tar.gz
+# Source0-md5:	3a7c4e053edd148a18d1eeee54cb73f7
+Patch0:		%{name}-make.patch
+URL:		http://mod-auth-shadow.sourceforge.net/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel
-Requires(post,preun):	%{apxs}
-Requires:	apache
+BuildRequires:	apache-devel >= 2.0
+BuildRequires:	rpmbuild(macros) >= 1.268
+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)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
-Apache module: authenticating against a /etc/shadow file
+mod_auth_shadow is an Apache module for authenticating users via an
+/etc/shadow file.
 
-%description -l pl
-Modu³ do apache: autoryzacja przez plik /etc/shadow
+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 "http".
 
-%prep
-%setup -q -n mod_%{orig_name}-%{version}
+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.UTF-8
+mod_auth_shadow to moduł Apache'a do uwierzytelniania użytkowników
+poprzez plik /etc/shadow.
+
+Przy wykonywaniu tego zadania jest jedna zasadnicza trudność: plik
+/etc/shadow może być odczytywany/zapisywany tylko przez roota. Jednak
+serwer WWW ma działać z prawami użytkownika innego niż root, takiego
+jak "http".
+
+mod_auth_shadow obchodzi ten problem poprzez otwieranie potoku do
+programu z ustawionym atrybutem suid root - validate - wykonującego
+właściwe sprawdzanie hasła. W przypadku błędu validate zapisuje
+komunikat do loga systemowego i czeka trzy sekundy przed zakończeniem.
 
+%prep
+%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}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sbindir},%{_sysconfdir}}
 
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-install validate $RPM_BUILD_ROOT%{_sbindir}
+install -p .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+# XXX: too generic name
+install -p validate $RPM_BUILD_ROOT%{_sbindir}
+echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
+	$RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.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
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(4755,root,root) %{_sbindir}/*
+%doc CHANGES INSTALL README
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(4755,root,root) %{_sbindir}/validate