- install base rules, rel. 2

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

diff --git a/apache-mod_security.spec b/apache-mod_security.spec
index 5541ea8b96c6f653ef318bd45fef748e77528059..5fe8ac1d0e31e930f9cd87d11ce870ee1600178e 100644 (file)
--- a/apache-mod_security.spec
+++ b/apache-mod_security.spec
@@ -1,22 +1,24 @@
 %define                mod_name        security
-%define        apxs            /usr/sbin/apxs
+%define                apxs            /usr/sbin/apxs
 Summary:       Apache module: securing web applications
-Summary(pl):   Modu³ do apache: ochrona aplikacji WWW
+Summary(pl.UTF-8):     Moduł do apache: ochrona aplikacji WWW
 Name:          apache-mod_%{mod_name}
-Version:       1.8.6
-Release:       0.1
+Version:       2.5.12
+Release:       2
 License:       GPL v2
-Group:         Networking/Daemons
-Source0:       http://www.modsecurity.org/download/mod_security-%{version}.tar.gz
-# Source0-md5: f6bf4724dd0db3d37586b64bc0ee160d
-URL:           http://sourceforge.net/projects/mod-acct/
+Group:         Networking/Daemons/HTTP
+Source0:       http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
+# Source0-md5: f7d14b97bbe54ecb953125b0f9b87a24
+Source1:       %{name}.conf
+URL:           http://www.modsecurity.org/
 BuildRequires: apache-devel
-Requires(post,preun):  %{apxs}
-Requires:      apache
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires:      apache(modules-api) = %apache_modules_api
+Requires:      apache-mod_unique_id
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
+%define                apacheconfdir   %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define                apachelibdir    %(%{apxs} -q LIBEXECDIR 2>/dev/null)
 
 %description
 ModSecurity is an open source intrusion detection and prevention
@@ -24,42 +26,57 @@ engine for web applications. It operates embedded into the web server,
 acting as a powerful umbrella - shielding web applications from
 attacks.
 
-%description -l pl
+%description -l pl.UTF-8
 ModSecurity jest otwartym silnikiem wykrywania i zapobiegania intruzom
-dla aplikacji WWW. Operuje w ramach serwera WWW, dzia³aj±c jak
-potê¿ny parasol chroni±cy aplikacje WWW przed atakami.
+dla aplikacji WWW. Operuje w ramach serwera WWW, działając jak potężny
+parasol chroniący aplikacje WWW przed atakami.
 
 %prep
-%setup -q -n mod_%{mod_name}-%{version}
+%setup -q -n modsecurity-apache_%{version}
+mv rules/README{,.rules}
+mv rules/CHANGELOG{,.rules}
 
 %build
 cd apache2
-%{apxs} -c mod_%{mod_name}.c
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%configure
+%{__make} \
+       CC="%{__cc}" \
+       CFLAGS="%{optflags}" \
+       top_dir="%{apachelibdir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
 
-install apache2/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install apache2/.libs/mod_%{mod_name}2.so $RPM_BUILD_ROOT%{apachelibdir}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/90_mod_%{mod_name}.conf
+
+install -d $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/blocking
+cp -a rules/*.conf rules/base_rules/* $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d
+#cp -a rules/blocking/*.conf $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/blocking
+echo '# Drop your local rules in here.' > $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/modsecurity_localrules.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 README CHANGES modsecurity-manual.pdf httpd.conf*
-%attr(755,root,root) %{_pkglibdir}/*
+%doc CHANGES MODSECURITY_LICENSING_EXCEPTION README.* modsecurity* doc/* rules/optional_rules rules/README.rules rules/CHANGELOG.rules
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%dir %{apacheconfdir}/modsecurity.d
+%dir %{apacheconfdir}/modsecurity.d/blocking
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/modsecurity.d/*.conf
+#%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/modsecurity.d/blocking/*.conf
+%attr(755,root,root) %{apachelibdir}/*.so