From 45ffd9788268e636cde7101f24f56062effcb4fafe1ecece5435fc974ca77234 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 17 Oct 2019 13:42:44 +0000 Subject: [PATCH 1/3] Accepting request 739567 from home:RBrownSUSE:branches:Apache:Modules Remove obsolete Groups tag (fate#326485) OBS-URL: https://build.opensuse.org/request/show/739567 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_security2?expand=0&rev=79 --- apache2-mod_security2.changes | 5 +++++ apache2-mod_security2.spec | 5 ++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apache2-mod_security2.changes b/apache2-mod_security2.changes index 85d4b45..4a21b5e 100644 --- a/apache2-mod_security2.changes +++ b/apache2-mod_security2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 17 13:21:36 UTC 2019 - Richard Brown + +- Remove obsolete Groups tag (fate#326485) + ------------------------------------------------------------------- Fri Dec 29 00:09:38 UTC 2017 - jengelh@inai.de diff --git a/apache2-mod_security2.spec b/apache2-mod_security2.spec index 16cc487..44c5a69 100644 --- a/apache2-mod_security2.spec +++ b/apache2-mod_security2.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_security2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,6 @@ Version: 2.9.2 Release: 0 Summary: Web Application Firewall for apache httpd License: Apache-2.0 -Group: Productivity/Networking/Web/Servers Url: http://www.modsecurity.org/ Source: https://www.modsecurity.org/tarball/%{version}/%{tarballname}.tar.gz Source1: https://github.com/SpiderLabs/owasp-modsecurity-crs/tarball/master//SpiderLabs-owasp-modsecurity-crs-2.2.9-5-gebe8790.tar.gz From 4374cdecf2685375284b91f5df53b588928d0fb96b11bc4eed770b7b3844cb09 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Fri, 18 Oct 2019 09:16:43 +0000 Subject: [PATCH 2/3] Accepting request 741022 from openSUSE:Factory revert OBS-URL: https://build.opensuse.org/request/show/741022 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_security2?expand=0&rev=80 --- apache2-mod_security2.changes | 5 ----- apache2-mod_security2.spec | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/apache2-mod_security2.changes b/apache2-mod_security2.changes index 4a21b5e..85d4b45 100644 --- a/apache2-mod_security2.changes +++ b/apache2-mod_security2.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Thu Oct 17 13:21:36 UTC 2019 - Richard Brown - -- Remove obsolete Groups tag (fate#326485) - ------------------------------------------------------------------- Fri Dec 29 00:09:38 UTC 2017 - jengelh@inai.de diff --git a/apache2-mod_security2.spec b/apache2-mod_security2.spec index 44c5a69..16cc487 100644 --- a/apache2-mod_security2.spec +++ b/apache2-mod_security2.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_security2 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -24,6 +24,7 @@ Version: 2.9.2 Release: 0 Summary: Web Application Firewall for apache httpd License: Apache-2.0 +Group: Productivity/Networking/Web/Servers Url: http://www.modsecurity.org/ Source: https://www.modsecurity.org/tarball/%{version}/%{tarballname}.tar.gz Source1: https://github.com/SpiderLabs/owasp-modsecurity-crs/tarball/master//SpiderLabs-owasp-modsecurity-crs-2.2.9-5-gebe8790.tar.gz From edc44d368e0585eaa7d93ddc38b31e1999cdc165318da19d1fc3168b6ea44c54 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Thu, 13 Feb 2020 07:56:49 +0000 Subject: [PATCH 3/3] - removing %apache_test_* macros, do not test module just by loading the module OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_security2?expand=0&rev=81 --- apache2-mod_security2.changes | 6 ++++++ apache2-mod_security2.spec | 15 +++------------ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/apache2-mod_security2.changes b/apache2-mod_security2.changes index 85d4b45..7363af9 100644 --- a/apache2-mod_security2.changes +++ b/apache2-mod_security2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 12 10:26:15 UTC 2020 - pgajdos@suse.com + +- removing %apache_test_* macros, do not test module just by + loading the module + ------------------------------------------------------------------- Fri Dec 29 00:09:38 UTC 2017 - jengelh@inai.de diff --git a/apache2-mod_security2.spec b/apache2-mod_security2.spec index 16cc487..ab2ada2 100644 --- a/apache2-mod_security2.spec +++ b/apache2-mod_security2.spec @@ -1,7 +1,7 @@ # # spec file for package apache2-mod_security2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -25,7 +25,7 @@ Release: 0 Summary: Web Application Firewall for apache httpd License: Apache-2.0 Group: Productivity/Networking/Web/Servers -Url: http://www.modsecurity.org/ +URL: http://www.modsecurity.org/ Source: https://www.modsecurity.org/tarball/%{version}/%{tarballname}.tar.gz Source1: https://github.com/SpiderLabs/owasp-modsecurity-crs/tarball/master//SpiderLabs-owasp-modsecurity-crs-2.2.9-5-gebe8790.tar.gz Source2: mod_security2.conf @@ -110,15 +110,6 @@ mv %{buildroot}/%{usrsharedir}/rules/modsecurity_crs_10_setup.conf.example \ #make test #make test-regression -set +x -mkdir -p %{apache_test_module_dir} -cp %{SOURCE2} %{apache_test_module_dir}/%{modname}-test.conf -sed -i 's:%{_localstatedir}/log/apache2:/tmp:' %{apache_test_module_dir}/%{modname}-test.conf -sed -i 's:%{_prefix}/share:%{buildroot}%{_prefix}/share:' %{apache_test_module_dir}/%{modname}-test.conf -sed -i 's:%{_sysconfdir}/apache2:%{buildroot}%{_sysconfdir}/apache2:' %{apache_test_module_dir}/%{modname}-test.conf -%apache_test_module_load -m security2 -i %{modname}-test.conf -set -x - %files %if %{suse_version} == 1110 %defattr (-,root,root)