From 1dc5fe6050f4b49a2b2b7b0593246bfc5f1eb408 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sat, 6 Jul 2024 17:10:04 +0200 Subject: [PATCH] package/freeradius-server: update the patches to be applied with fuzz 0 Commit 8f88a644ed7d6 ("support/scripts/apply-patches.sh: set the maximum fuzz factor to 0") reduced the fuzz factor. Due to this change, freeradius-server fails to build with output: Applying 0001-jlibtool-cross-with-host-CC.patch using patch: patching file scripts/libtool.mk Hunk #1 FAILED at 43. 1 out of 1 hunk FAILED -- saving rejects to file scripts/libtool.mk.rej Applying 0009-src-modules-rlm_python-fix-build-with-Ofast.patch using patch: patching file src/modules/rlm_python3/configure.ac Hunk #1 succeeded at 44 (offset -15 lines). Hunk #2 FAILED at 73. 1 out of 2 hunks FAILED -- saving rejects to file src/modules/rlm_python3/configure.ac.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- .../0001-jlibtool-cross-with-host-CC.patch | 5 +++-- ...9-src-modules-rlm_python-fix-build-with-Ofast.patch | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch index 0cd55071c4..94205754c2 100644 --- a/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch +++ b/package/freeradius-server/0001-jlibtool-cross-with-host-CC.patch @@ -11,6 +11,8 @@ Signed-off-by: David Gouarin Signed-off-by: Matt Weber [Fabrice: update for 3.2.3] SIgned-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- scripts/libtool.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) @@ -19,8 +21,7 @@ diff --git a/scripts/libtool.mk b/scripts/libtool.mk index 57915e1053..c28260dd7e 100644 --- a/scripts/libtool.mk +++ b/scripts/libtool.mk -@@ -43,8 +43,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" - +@@ -48,8 +48,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" # binary! ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) diff --git a/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch index c92b4171d2..2c1f07cb66 100644 --- a/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch +++ b/package/freeradius-server/0009-src-modules-rlm_python-fix-build-with-Ofast.patch @@ -18,15 +18,17 @@ Fixes: Signed-off-by: Fabrice Fontaine Upstream: https://github.com/FreeRADIUS/freeradius-server/pull/5263 +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- - src/modules/rlm_python/configure.ac | 4 ++-- + src/modules/rlm_python3/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/rlm_python3/configure.ac b/src/modules/rlm_python3/configure.ac index e2f74574fb..ee30b324d9 100644 --- a/src/modules/rlm_python3/configure.ac +++ b/src/modules/rlm_python3/configure.ac -@@ -59,7 +59,7 @@ else +@@ -44,7 +44,7 @@ else dnl # Convert -I to -isystem to get rid of warnings about issues in Python headers dnl # Strip -systemroot @@ -35,8 +37,8 @@ index e2f74574fb..ee30b324d9 100644 dnl # -D_FORTIFY_SOURCE needs -O. dnl # Strip debug symbol flags (-g[0-9]?). We decide on debugging symbols, not python dnl # Strip -W*, we decide what warnings are important -@@ -73,7 +73,7 @@ else - mod_cflags=`echo " $python_cflags" | sed -e '\ +@@ -56,7 +56,7 @@ else + mod_cflags=`echo " $python3_cflags" | sed -e '\ s/ -I/ -isystem/g;\ s/ -isysroot[[ =]]\{0,1\}[[^-]]*/ /g;\ - s/ -O[[^[[:blank:]]]]*/ /g;\