From 4f58a94cd5c997f99d02aaea619f688cd20f17527aeb592324b61679e7178f12 Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 4 Jun 2024 12:11:39 +0000 Subject: [PATCH 1/2] Accepting request 1178487 from home:dimstar:Factory - Fix patch application syntax: Use %patch -P N instead of deprecated %patchN. OBS-URL: https://build.opensuse.org/request/show/1178487 OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_security2?expand=0&rev=94 --- apache2-mod_security2.changes | 6 ++++++ apache2-mod_security2.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apache2-mod_security2.changes b/apache2-mod_security2.changes index 92bb3cf..a8cbd08 100644 --- a/apache2-mod_security2.changes +++ b/apache2-mod_security2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 4 11:03:29 UTC 2024 - Dominique Leuenberger + +- Fix patch application syntax: Use %patch -P N instead of + deprecated %patchN. + ------------------------------------------------------------------- Tue May 7 13:16:44 UTC 2024 - pgajdos@suse.com diff --git a/apache2-mod_security2.spec b/apache2-mod_security2.spec index e81f78a..c1cb752 100644 --- a/apache2-mod_security2.spec +++ b/apache2-mod_security2.spec @@ -70,7 +70,7 @@ mv -v SpiderLabs* rules %patch -P 1 -p1 %patch -P 2 -p1 %patch -P 3 -p1 -%patch4 -p1 +%patch -P 4 -p1 %build aclocal From d07185cefe1bb47a0ca2f080ebb58e19931d23d48fafc3c44e502a71241f1a0d Mon Sep 17 00:00:00 2001 From: Petr Gajdos Date: Tue, 4 Jun 2024 12:15:05 +0000 Subject: [PATCH 2/2] checkin OBS-URL: https://build.opensuse.org/package/show/Apache:Modules/apache2-mod_security2?expand=0&rev=95 --- apache2-mod_security2-no_rpath.diff | 12 ++++++------ apache2-mod_security2.changes | 7 +++++++ apache2-mod_security2.spec | 6 +----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/apache2-mod_security2-no_rpath.diff b/apache2-mod_security2-no_rpath.diff index 4ed88ff..513366d 100644 --- a/apache2-mod_security2-no_rpath.diff +++ b/apache2-mod_security2-no_rpath.diff @@ -1,7 +1,7 @@ Index: apache2/Makefile.am =================================================================== ---- apache2/Makefile.am.orig -+++ apache2/Makefile.am +--- a/apache2/Makefile.am.orig ++++ b/apache2/Makefile.am @@ -118,7 +118,7 @@ mod_security2_la_LDFLAGS = -module -avoi endif @@ -13,8 +13,8 @@ Index: apache2/Makefile.am @APXS_LDFLAGS@ \ Index: apache2/Makefile.in =================================================================== ---- apache2/Makefile.in.orig -+++ apache2/Makefile.in +--- a/apache2/Makefile.in.orig ++++ b/apache2/Makefile.in @@ -691,7 +691,7 @@ libinjection/mod_security2_la-libinjecti libinjection/$(DEPDIR)/$(am__dirstamp) @@ -26,8 +26,8 @@ Index: apache2/Makefile.in -rm -f *.$(OBJEXT) Index: build/libtool.m4 =================================================================== ---- build/libtool.m4.orig -+++ build/libtool.m4 +--- a/build/libtool.m4.orig ++++ b/build/libtool.m4 @@ -5053,7 +5053,7 @@ dnl Note also adjust exclude_expsyms for # are reset later if shared libraries are not supported. Putting them # here allows them to be overridden if necessary. diff --git a/apache2-mod_security2.changes b/apache2-mod_security2.changes index a8cbd08..84a127a 100644 --- a/apache2-mod_security2.changes +++ b/apache2-mod_security2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 4 12:14:51 UTC 2024 - pgajdos@suse.com + +- %autopatch instead of %patchN +- modified patches + % apache2-mod_security2-no_rpath.diff (refreshed) + ------------------------------------------------------------------- Tue Jun 4 11:03:29 UTC 2024 - Dominique Leuenberger diff --git a/apache2-mod_security2.spec b/apache2-mod_security2.spec index c1cb752..aabd703 100644 --- a/apache2-mod_security2.spec +++ b/apache2-mod_security2.spec @@ -66,11 +66,7 @@ applications from known and unknown attacks. %setup -q -n %{tarballname} %setup -q -D -T -a 1 -n %{tarballname} mv -v SpiderLabs* rules -%patch -P 0 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 -%patch -P 4 -p1 +%autopatch -p1 %build aclocal