- fix config dir

[packages/apache-mod_ntlm.git] / apache-mod_ntlm.spec

diff --git a/apache-mod_ntlm.spec b/apache-mod_ntlm.spec
index b5a5d5ebf7972d0a2418754d95ac24061a679cbd..8acd9ba760aff2110e5dfca5b1be0b45b5cd446b 100644 (file)
--- a/apache-mod_ntlm.spec
+++ b/apache-mod_ntlm.spec
@@ -1,57 +1,66 @@
+# TODO: review security issues
 %define                mod_name        ntlm
-Summary:       This is the PAM authentication module for Apache
+%define        apxs            /usr/sbin/apxs
+Summary:       This is the NTLM authentication module for Apache
+Summary(pl.UTF-8):     Moduł uwierzytelnienia NTLM dla Apache
 Name:          apache-mod_%{mod_name}
-Version:       0.3
-Release:       1
+Version:       0.1
+Release:       0.1
+Epoch:         1
 License:       GPL
-Group:         Networking/Daemons
-Group(de):     Netzwerkwesen/Server
-Group(pl):     Sieciowe/Serwery
-Source0:       http://prdownloads.sourceforge.net/modntlm/mod_%{mod_name}-%{version}.tar.gz
-Patch0:                %{name}-symbol_fix.patch
-BuildRequires: /usr/sbin/apxs
-BuildRequires: apache(EAPI)-devel
-Prereq:                /usr/sbin/apxs
-Requires:      apache(EAPI)
+Group:         Networking/Daemons/HTTP
+Source0:       http://dl.sourceforge.net/modntlm/mod_%{mod_name}2-%{version}.tgz
+# Source0-md5: 8abe4f235af6825f723412e187cac96b
+#Patch0:       %{name}-security.patch
+Patch1:                %{name}-apr_pool.patch
 URL:           http://modntlm.sourceforge.net/
+BuildRequires: %{apxs}
+BuildRequires: apache-devel >= 2.0
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache(modules-api) = %apache_modules_api
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(/usr/sbin/apxs -q LIBEXECDIR)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 This is an authentication module for Apache that allows you to
-authenticate HTTP clients using samba or window$-like server.
+authenticate HTTP clients using samba or windows-like server (using
+NTLM protocol).
 
-%prep 
-%setup -q -n mod_%{mod_name}-%{version}
-%patch -p0
+%description -l pl.UTF-8
+To jest moduł uwierzytelnienia dla Apache pozwalający na
+uwierzytelnianie klientów HTTP poprzez sambę lub serwer na Windows (z
+użyciem protokołu NTLM).
+
+%prep
+%setup -q -n mod_%{mod_name}2-%{version}
+#%patch -p1
+%patch1 -p0
 
 %build
-/usr/sbin/apxs -c mod_%{mod_name}.c -o mod_%{mod_name}.so
+%{__make} APXS=%{apxs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}}
+
+install .libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
+       $RPM_BUILD_ROOT%{_sysconfdir}/90_mod_%{mod_name}.conf
 
-install mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/sbin/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
-       /usr/sbin/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
-
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_pkglibdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so