From 3907da674cb3ddefb30314745c9e276a4a3d7487 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Sun, 7 Jul 2024 16:17:58 +0200 Subject: [PATCH] package/openvmtools: 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, openvmtools fails to build with output: Applying 0007-Use-configure-to-test-for-feature-instead-of-platfor.patch using patch: patching file configure.ac Hunk #1 succeeded at 940 (offset 142 lines). Hunk #2 succeeded at 1150 (offset 86 lines). patching file lib/misc/idLinux.c Hunk #2 succeeded at 1022 (offset 28 lines). patching file lib/nicInfo/nicInfoPosix.c Hunk #1 FAILED at 34. 1 out of 1 hunk FAILED -- saving rejects to file lib/nicInfo/nicInfoPosix.c.rej This commit refreshes the package patch on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Thomas Petazzoni --- ...ure-to-test-for-feature-instead-of-platfor.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch b/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch index abbc518362..f10e74e152 100644 --- a/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch +++ b/package/openvmtools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch @@ -22,6 +22,8 @@ Signed-off-by: Natanael Copa [Retrieved (and slightly updated) from: http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/open-vm-tools/open-vm-tools/0007-Use-configure-to-test-for-feature-instead-of-platfor.patch?h=sumo] Signed-off-by: Fabrice Fontaine +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi --- open-vm-tools/configure.ac | 4 ++++ open-vm-tools/lib/misc/idLinux.c | 30 ++++++++++++++---------------- @@ -32,7 +34,7 @@ Index: open-vm-tools/configure.ac =================================================================== --- open-vm-tools.orig/configure.ac +++ open-vm-tools/configure.ac -@@ -798,6 +798,7 @@ AC_CHECK_FUNCS( +@@ -940,6 +940,7 @@ AC_CHECK_FUNCS([ecvt]) AC_CHECK_FUNCS([fcvt]) @@ -40,7 +42,7 @@ Index: open-vm-tools/configure.ac AC_CHECK_FUNC([mkdtemp], [have_mkdtemp=yes]) -@@ -1063,10 +1064,13 @@ AC_PATH_PROG( +@@ -1149,10 +1150,13 @@ ### AC_CHECK_HEADERS([crypt.h]) @@ -72,7 +74,7 @@ Index: open-vm-tools/lib/misc/idLinux.c #ifdef __APPLE__ #include #include -@@ -997,31 +994,32 @@ Id_EndSuperUser(uid_t uid) // IN: +@@ -1025,31 +1022,32 @@ static Bool IdIsSetUGid(void) { @@ -121,8 +123,7 @@ Index: open-vm-tools/lib/nicInfo/nicInfoPosix.c =================================================================== --- open-vm-tools.orig/lib/nicInfo/nicInfoPosix.c +++ open-vm-tools/lib/nicInfo/nicInfoPosix.c -@@ -34,9 +34,13 @@ - #include +@@ -35,9 +35,13 @@ #include #include #include @@ -137,7 +138,7 @@ Index: open-vm-tools/lib/nicInfo/nicInfoPosix.c # include #endif #ifndef NO_DNET -@@ -348,10 +352,7 @@ GuestInfoGetNicInfo(NicInfoV3 *nicInfo) +@@ -499,10 +503,7 @@ * ****************************************************************************** */