%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.7.3
+Release: 2
License: GPL v2
-Group: Networking/Daemons
-Source0: http://www.modsecurity.org/download/mod_security-%{version}.tar.gz
-# Source0-md5: f6bf4724dd0db3d37586b64bc0ee160d
+Group: Networking/Daemons/HTTP
+Source0: http://www.modsecurity.org/tarball/%{version}//modsecurity-apache_%{version}.tar.gz
+# Source0-md5: 4a220bf4b954ed1760462e5956f65b21
+Source1: %{name}.conf
URL: http://www.modsecurity.org/
BuildRequires: apache-devel
-Requires(post,preun): %{apxs}
-Requires: apache
+BuildRequires: autoconf
+BuildRequires: libxml2-devel
+BuildRequires: pcre-devel
+BuildRequires: pkgconfig
+BuildRequires: rpmbuild(macros) >= 1.268
+Requires: apache(modules-api) = %apache_modules_api
+Requires: apache-mod_unique_id
+Suggests: apache-mod_headers
+Suggests: apache-mod_security_crs
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
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.
+
+%package -n mlogc
+Summary: ModSecurity Audit Log Collector
+Group: Networking/Daemons/HTTP
+Requires: %{name} = %{version}
+
+%description -n mlogc
+This package contains the ModSecurity Audit Log Collector.
%prep
-%setup -q -n mod_%{mod_name}-%{version}
+%setup -q -n modsecurity-apache_%{version}
%build
-cd apache2
-%{apxs} -c mod_%{mod_name}.c
+%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}/modsecurity.d} \
+ $RPM_BUILD_ROOT{/var/log/mlogc/data,%{_bindir},%{_sysconfdir}} \
+ $RPM_BUILD_ROOT/var/lib/%{name}
+
+install apache2/.libs/mod_%{mod_name}2.so $RPM_BUILD_ROOT%{apachelibdir}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/90_mod_%{mod_name}.conf
+
+cp -a modsecurity.conf-recommended $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d
+echo '# Drop your local rules in here.' > $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/modsecurity_localrules.conf
-install apache2/.libs/mod_%{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}
+install mlogc/mlogc $RPM_BUILD_ROOT%{_bindir}
+install mlogc/mlogc-batch-load.pl $RPM_BUILD_ROOT%{_bindir}/mlogc-batch-load
+install mlogc/mlogc-default.conf $RPM_BUILD_ROOT%{_sysconfdir}/mlogc.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 README.* modsecurity* doc/* tools
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*_mod_%{mod_name}.conf
+%dir %{apacheconfdir}/modsecurity.d
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/modsecurity.d/*.*
+%attr(755,root,root) %{apachelibdir}/*.so
+%attr(770,http,root) %dir /var/lib/%{name}
+
+%files -n mlogc
+%defattr(644,root,root,755)
+%doc mlogc/INSTALL
+%attr(0640,root,http) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mlogc.conf
+%attr(0755,root,root) %{_bindir}/mlogc
+%attr(0755,root,root) %{_bindir}/mlogc-batch-load
+%attr(0755,root,root) %dir /var/log/mlogc
+%attr(0770,root,http) %dir /var/log/mlogc/data