%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.9.2
-Release: 1
+Version: 2.5.12
+Release: 2
License: GPL v2
-Group: Networking/Daemons
-Source0: http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
-# Source0-md5: c28b66f02adb1ddb2d0885483f6f8e0e
+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
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 2>/dev/null)
-%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%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
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 modsecurity-apache-%{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},%{_sysconfdir}/httpd.conf}
+install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
-install apache2/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
-echo 'LoadModule %{mod_name}_module modules/mod_%{mod_name}.so' > \
- $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/90_mod_%{mod_name}.conf
+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
%files
%defattr(644,root,root,755)
-%doc README CHANGES INSTALL httpd.conf*
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
-%attr(755,root,root) %{_pkglibdir}/*.so
+%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