Hello community, here is the log from the commit of package apache2-mod_security2 for openSUSE:Factory checked in at 2012-08-27 15:45:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/apache2-mod_security2 (Old) and /work/SRC/openSUSE:Factory/.apache2-mod_security2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "apache2-mod_security2", Maintainer is "draht@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/apache2-mod_security2/apache2-mod_security2.changes 2011-09-23 01:51:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.apache2-mod_security2.new/apache2-mod_security2.changes 2012-08-27 15:45:40.000000000 +0200 @@ -1,0 +2,35 @@ +Mon Aug 27 11:43:47 UTC 2012 - cfarrell@suse.com + +- license update: Apache-2.0 and GPL-2.0 + Many of the files in the rules/ subdirectory are GPL-2.0 licensed + +------------------------------------------------------------------- +Mon Aug 6 20:59:45 UTC 2012 - crrodriguez@opensuse.org + +- Update to version 2.6.7, fixes build in apache 2.4 +- Update spec file macros. + +------------------------------------------------------------------- +Sat Sep 17 11:20:39 UTC 2011 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Use %_smp_mflags for parallel build + +------------------------------------------------------------------- +Wed Jul 6 04:33:49 CEST 2011 - draht@suse.de + +- update to version 2.6.1-rc1 for submission to SLE11-SP2 (fate#309433): + - SecUnicodeCodePage and SecUnicodeMapFile directives added + - fixed bug: SecRequestBodyLimit was truncating the real request + body + additional fixes from 2.6.0: + - buffering filter problems fixed + - memory leak fix when using MATCHED_VAR_NAMES + - SecWriteStateLimit added against slow DoS + additional fixes from 2.6.0 release candidates: + - optimizations + - bug in logging code fixed + - cleanup + - google safe browsing support + +------------------------------------------------------------------- Old: ---- modsecurity-apache_2.5.9.tar.gz New: ---- modsecurity-apache_2.6.7.tar.gz rules.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ apache2-mod_security2.spec ++++++ --- /var/tmp/diff_new_pack.Q8vv3N/_old 2012-08-27 15:45:44.000000000 +0200 +++ /var/tmp/diff_new_pack.Q8vv3N/_new 2012-08-27 15:45:44.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package apache2-mod_security2 (Version 2.5.9) +# spec file for package apache2-mod_security2 # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,33 +15,44 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: apache2-mod_security2 -Version: 2.5.9 -Release: 2 +Version: 2.6.7 +Release: 0 +%define aversion 2.6.7 # -License: GPL v2 only; GPLv2 with some FLOSS linking exceptions -Group: Productivity/Networking/Web/Servers # BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: apache2-devel apache2-prefork c++_compiler curl-devel libxml2-devel pcre-devel +BuildRequires: apache2-devel +BuildRequires: apache2-prefork +BuildRequires: c++_compiler +BuildRequires: curl-devel +BuildRequires: libxml2-devel +BuildRequires: pcre-devel %define apache apache2 %define modname mod_security2 -%define tarballname modsecurity-apache_%{version} +%define tarballname modsecurity-apache_%{aversion} # -%define apxs %{_sbindir}/apxs2 -%define apache_libexecdir %(%{apxs} -q LIBEXECDIR) -%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) -%define apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)/MMN; test -x $MMN && $MMN) -Requires: apache2 %{apache_mmn} + +%{!?apxs: %global apxs /usr/sbin/apxs2} +%{!?apache_libexecdir: %global apache_libexecdir %(%{apxs} -q LIBEXECDIR)} +%{!?apache_sysconfdir: %global apache_sysconfdir %(%{apxs} -q SYSCONFDIR)} +%{!?apache_includedir: %global apache_includedir %(%{apxs} -q INCLUDEDIR)} +%{!?apache_serveroot: %global apache_serverroot %(%{apxs} -q PREFIX)} +%{!?apache_localstatedir: %global apache_localstatedir %(%{apxs} -q LOCALSTATEDIR)} +%{!?apache_mmn: %global apache_mmn %(MMN=$(%{apxs} -q LIBEXECDIR)_MMN; test -x $MMN && $MMN)} + +Requires: %{apache_mmn} +Requires: apache2 # Url: http://www.modsecurity.org/ Source: http://www.modsecurity.org/download/%{tarballname}.tar.gz Source1: mod_security2.conf +Source2: rules.tar.bz2 # Summary: ModSecurity Open Source Web Application Firewall +License: Apache-2.0 and GPL-2.0 +Group: Productivity/Networking/Web/Servers %description ModSecurity(TM) is an open source intrusion detection and prevention @@ -54,35 +65,38 @@ %prep %setup -n %{tarballname} +tar -xvjpf %{S:2} %build -pushd %{apache} +#pushd %{apache} ./configure - make - make -C mlogc-src/ -popd + make %{?_smp_mflags} +# make -C mlogc-src/ +#popd %install pushd %{apache} install -D -m 0755 .libs/mod_security2.so %{buildroot}%{apache_libexecdir}/%{modname}.so - install -D -m 0755 mlogc-src/mlogc %{buildroot}%{_sbindir}/mlogc - install -D -m 0755 mlogc-src/mlogc-batch-load.pl %{buildroot}%{_sbindir}/mlogc-batch-load.pl - install -D -m 0640 mlogc-src/mlogc-default.conf %{buildroot}%{_sysconfdir}/mlogc.conf - cp mlogc-src/INSTALL mlogc-src/INSTALL.mlogc popd + install -D -m 0755 mlogc/mlogc %{buildroot}%{_sbindir}/mlogc + install -D -m 0755 mlogc/mlogc-batch-load.pl %{buildroot}%{_sbindir}/mlogc-batch-load.pl + install -D -m 0640 mlogc/mlogc-default.conf %{buildroot}%{_sysconfdir}/mlogc.conf + cp mlogc/INSTALL mlogc/INSTALL.mlogc install -D -m 0644 %{SOURCE1} %{buildroot}%{apache_sysconfdir}/conf.d/%{modname}.conf - -%clean -%{__rm} -rf %{buildroot}; +mkdir examples +cp -a tools examples +rm -f examples/tools/M* +chmod 644 examples/tools/* %files %defattr(-, root, root, 0755) %{apache_libexecdir}/%{modname}.so %config(noreplace) %{apache_sysconfdir}/conf.d/%{modname}.conf -%doc doc/html-multipage/ doc/*.pdf -%doc README.TXT CHANGES LICENSE MODSECURITY_LICENSING_EXCEPTION modsecurity.conf-minimal -%doc apache2/mlogc-src/INSTALL.mlogc apache2/mlogc-src/mlogc-default.conf -%doc tools/ rules/ apache2/api/ +%doc doc/Reference_Manual.html +%doc README.TXT CHANGES LICENSE modsecurity.conf-recommended +%doc mlogc/INSTALL.mlogc mlogc/mlogc-default.conf +%doc examples/ +%doc rules/ %{_sbindir}/mlogc %{_sbindir}/mlogc-batch-load.pl %config(noreplace) %{_sysconfdir}/mlogc.conf ++++++ modsecurity-apache_2.5.9.tar.gz -> modsecurity-apache_2.6.7.tar.gz ++++++ ++++ 156380 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org