- updated config

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

diff --git a/apache-mod_security.spec b/apache-mod_security.spec
index 2a345c9dd2ecd715232c358003607a368eb60358..e0c50f186e0294fa60cc642971500eccb49302d3 100644 (file)
--- a/apache-mod_security.spec
+++ b/apache-mod_security.spec
@@ -1,19 +1,26 @@
 %define                mod_name        security
-%define        apxs            /usr/sbin/apxs
+%define                apxs            /usr/sbin/apxs
 Summary:       Apache module: securing web applications
 Summary(pl.UTF-8):     Moduł do apache: ochrona aplikacji WWW
 Name:          apache-mod_%{mod_name}
-Version:       2.1.7
-Release:       1
+Version:       2.7.3
+Release:       2
 License:       GPL v2
 Group:         Networking/Daemons/HTTP
-Source0:       http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
-# Source0-md5: 19c34dd5611e0c516c0717de793f4640
-Source1:       apache-mod_security.conf
+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
+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                apacheconfdir   %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
@@ -30,26 +37,39 @@ 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.
 
+%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 modsecurity-apache_%{version}
 
 %build
-%{__make} -C apache2 \
+%configure
+%{__make} \
        CC="%{__cc}" \
        CFLAGS="%{optflags}" \
        top_dir="%{apachelibdir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir}}
+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
 
-install -d $RPM_BUILD_ROOT%{apacheconfdir}/modsecurity.d/blocking
-cp -a rules/*.conf $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
+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 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
@@ -64,10 +84,18 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGES README.* modsecurity* doc/*
+%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
-%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(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