| Message ID | 20240707115749.3992393-1-dario.binacchi@amarulasolutions.com |
|---|---|
| State | New |
| Headers | show |
| Series |
|
| Related | show |
On Sun, 7 Jul 2024 13:57:49 +0200 Dario Binacchi <dario.binacchi@amarulasolutions.com> wrote: > Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum > fuzz factor to 0") reduced the fuzz factor. > > Due to this change, snort fails to build with output: > > Applying 0005-fix-sparc.patch using patch: > patching file configure.in > Hunk #1 FAILED at 942. > Hunk #2 succeeded at 915 (offset -42 lines). > 1 out of 2 hunks FAILED -- saving rejects to file configure.in.rej > > This commit refreshes the package patch on the current package version. > > Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> > --- > package/snort/0005-fix-sparc.patch | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) Applied to master, thanks. Thomas
diff --git a/package/snort/0005-fix-sparc.patch b/package/snort/0005-fix-sparc.patch index 14792d2c59df..56a294976c6b 100644 --- a/package/snort/0005-fix-sparc.patch +++ b/package/snort/0005-fix-sparc.patch @@ -4,20 +4,22 @@ like "let's see if this v9 instruction exists when I force the compiler to think I'm using v9", which is non-sensical. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> diff -Naurp ./snort-2.9.11.1-orig/configure.in snort-2.9.11.1/configure.in --- ./snort-2.9.11.1-orig/configure.in 2018-05-10 12:20:19.253510678 +0200 +++ snort-2.9.11.1/configure.in 2018-05-10 12:40:18.547584998 +0200 -@@ -942,8 +942,6 @@ fi +@@ -900,8 +900,6 @@ # check for sparc %time register if eval "echo $host_cpu|grep -i sparc >/dev/null"; then - OLD_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -mcpu=v9 " AC_MSG_CHECKING([for sparc %time register]) - AC_RUN_IFELSE( + AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( -@@ -957,8 +955,6 @@ if eval "echo $host_cpu|grep -i sparc >/ +@@ -915,8 +913,6 @@ AC_MSG_RESULT($sparcv9) if test "x$sparcv9" = "xyes"; then AC_DEFINE([SPARCV9],[1],[For sparc v9 with %time register])
Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, snort fails to build with output: Applying 0005-fix-sparc.patch using patch: patching file configure.in Hunk #1 FAILED at 942. Hunk #2 succeeded at 915 (offset -42 lines). 1 out of 2 hunks FAILED -- saving rejects to file configure.in.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com> --- package/snort/0005-fix-sparc.patch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)