X-Git-Url: http://git.pld-linux.org/?p=packages%2Fapache1-mod_antihak.git;a=blobdiff_plain;f=apache1-mod_antihak.spec;h=f8a1931a29c5efd0b6f8c22c86b086b000fff9b9;hp=3363bec2dbd923d6451a48783e407cff1e5a63b6;hb=refs%2Fheads%2Fmaster;hpb=ae28cecad4ccd48c032dee931d0134cdce967e96

diff --git a/apache1-mod_antihak.spec b/apache1-mod_antihak.spec
index 3363bec..f8a1931 100644
--- a/apache1-mod_antihak.spec
+++ b/apache1-mod_antihak.spec
@@ -1,52 +1,53 @@
-%define 	apxs	/usr/sbin/apxs
-Summary:	Antihak module for Apache
-Summary(pl):	Modu³ antihak dla Apache
-Name:		apache-mod_antihak
+%define apxs	/usr/sbin/apxs1
+%define	mod_name	antihak
 %define		tar_ver	0.3.1-beta
+Summary:	Antihak module for Apache
+Summary(pl.UTF-8):	Moduł antihak dla Apache
+Name:		apache1-mod_%{mod_name}
 Version:	0.3.1beta
-Release:	3
+Release:	3.4
 License:	GPL
 Group:		Networking/Daemons
-Source0:	ftp://ftp.sourceforge.net/pub/sourceforge/apantihak/mod_antihak-%{tar_ver}.tar.gz
-Patch0:		mod_antihak-iptables.patch
-Patch1:		mod_antihak-am.patch
-BuildRequires:	automake
+Source0:	http://dl.sourceforge.net/apantihak/mod_antihak-%{tar_ver}.tar.gz
+# Source0-md5:	38f22f5b5662e8dd7318c42fa96fb083
+Patch0:		%{name}-iptables.patch
+Patch1:		%{name}-am.patch
+Patch2:		%{name}-mysql-API.patch
+URL:		http://sourceforge.net/projects/apantihak/
+BuildRequires:	apache1-devel >= 1.3.39
 BuildRequires:	autoconf
-BuildRequires:	apache(EAPI)-devel
+BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	mysql-devel
-BuildRequires:	%{apxs}
-Requires(post,preun):	%{apxs}
+BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	grep
-Requires(post,preun):	sudo
-Requires(preun):	fileutils
-Requires:	apache(EAPI) >= 1.3.1
+Requires(preun):	sed >= 4.0
+Requires:	apache1(EAPI)
 Requires:	iptables
 Requires:	sudo
+Obsoletes:	apache-mod_antihak <= 0.3.1beta
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _libexecdir     %{_libdir}/apache
-%define         _htmldocdir     /home/httpd/manual/mod
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 mod_antihak is an Apache Module designed to eliminate the CodeRed and
 Nimda worm's network bandwidth consumption. We're working to make it
 as easy as writing a line of text to add more worms! :)
 
-%description -l pl
-mod_antihak to modu³ Apache s³u¿±cy do eliminowania zapychania sieci
-przez robaki CodeRed i Nimda. Ponadto trwaj± prace nad umo¿liwieniem
-³atwego dodawania obs³ugi kolejnych robaków.
+%description -l pl.UTF-8
+mod_antihak to moduł Apache służący do eliminowania zapychania sieci
+przez robaki CodeRed i Nimda. Ponadto trwają prace nad umożliwieniem
+łatwego dodawania obsługi kolejnych robaków.
 
 %prep
-%setup -q -n mod_antihak-0.3.1-beta
-cd src
+%setup -q -n mod_antihak-0.3.1-beta/src
 %patch0 -p0
 %patch1 -p0
+%patch2 -p1
 
 %build
-cd src
-
 rm -f tools/missing
 %{__libtoolize}
 %{__aclocal}
@@ -54,7 +55,7 @@ rm -f tools/missing
 %{__automake}
 
 %configure \
-	CC=%{__cc} \
+	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags} -I/usr/include/mysql" \
 	APACHE_APXS=%{apxs} \
 	--with-mysql
@@ -63,43 +64,34 @@ rm -f tools/missing
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libexecdir},%{_htmldocdir}}
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d}
 
-cd src
-
-install mod_antihak/mod_antihak.so $RPM_BUILD_ROOT%{_libexecdir}
+install mod_antihak/mod_antihak.so $RPM_BUILD_ROOT%{_pkglibdir}
+echo 'LoadModule %{mod_name}_module	modules/mod_%{mod_name}.so' > \
+	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d/90_mod_%{mod_name}.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
 if ! grep -qF "http ALL= NOPASSWD: /sbin/iptables" ; then
-	echo "http ALL= NOPASSWD: /sbin/iptables" >> /etc/sudoers
-fi
-
-%{apxs} -e -a -n antihak %{_libexecdir}/mod_antihak.so 1>&2
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-else
-	echo "Run \"/etc/rc.d/init.d/httpd start\" to start apache http daemon."
+	echo "#http ALL= NOPASSWD: /sbin/iptables" >> /etc/sudoers
+	echo "%{mod_name}: You need to allow apache to run iptables as root,"
+	echo "%{mod_name}: appropriate (commented out) line added to /etc/sudoers;"
+	echo "%{mod_name}: be sure to uncomment it if you want this module to work."
 fi
+%service -q apache restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-	if grep -qF "http ALL= NOPASSWD: /sbin/iptables" /etc/sudoers ; then
-		umask 227
-		grep -v '^http ALL= NOPASSWD: /sbin/iptables$' /etc/sudoers \
-			> /etc/sudoers.rpmnew-antihak
-		mv -f /etc/sudoers.rpmnew-antihak /etc/sudoers
-	fi
-
-	%{apxs} -e -A -n antihak %{_libexecdir}/mod_antihak.so 1>&2
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd restart 1>&2
+	if grep -qF "^http ALL= NOPASSWD: /sbin/iptables" /etc/sudoers ; then
+		sed -i -e '/^http ALL= NOPASSWD: /sbin/iptables$/d' /etc/sudoers
 	fi
+	%service -q apache restart
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc src/{AUTHORS,INSTALL,ChangeLog,NEWS,TODO}
-%attr(755,root,root) %{_libexecdir}/*
+%doc AUTHORS INSTALL ChangeLog NEWS TODO
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*