From 0ca30887794c0e9d333df7bcbb162f926bce3ca0 Mon Sep 17 00:00:00 2001 From: Dario Binacchi Date: Wed, 3 Jul 2024 14:52:11 +0200 Subject: [PATCH] package/libfcgi: 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, libfcgi fails to build with output: Applying 0001-link-against-math.patch using patch: patching file libfcgi/Makefile.am Hunk #1 FAILED at 18. 1 out of 1 hunk FAILED -- saving rejects to file libfcgi/Makefile.am.rej Applying 0002-disable-examples.patch using patch: patching file Makefile.am Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED -- saving rejects to file Makefile.am.rej This commit refreshes the package patches on the current package version. Signed-off-by: Dario Binacchi Signed-off-by: Romain Naour --- .checkpackageignore | 2 +- package/libfcgi/0001-link-against-math.patch | 4 +++- package/libfcgi/0002-disable-examples.patch | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.checkpackageignore b/.checkpackageignore index dca7253453..ca94fb56b0 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -809,7 +809,7 @@ package/libeXosip2/0001-src-eXtl_dtls.c-fix-build-with-libressl-3.4.1.patch lib_ package/libedit/0001-check-bsd-functions-in-libbsd.patch lib_patch.Upstream package/libevent/0001-Don-t-define-BIO_get_init-for-LibreSSL-3-5.patch lib_patch.Upstream package/libfcgi/0001-link-against-math.patch lib_patch.Upstream -package/libfcgi/0002-disable-examples.patch lib_patch.Sob lib_patch.Upstream +package/libfcgi/0002-disable-examples.patch lib_patch.Upstream package/libffi/0001-Fix-use-of-compact-eh-frames-on-MIPS.patch lib_patch.Upstream package/libfm/0001-modules-fix-cross-compilation.patch lib_patch.Upstream package/libfreeimage/0001-no-root-install.patch lib_patch.Upstream diff --git a/package/libfcgi/0001-link-against-math.patch b/package/libfcgi/0001-link-against-math.patch index efba67123e..909a295bd6 100644 --- a/package/libfcgi/0001-link-against-math.patch +++ b/package/libfcgi/0001-link-against-math.patch @@ -3,12 +3,14 @@ Link libfcgi against the math library. Signed-off-by: Thomas Claveirole [Louis: rebase on top of 2.4.2] Signed-off-by: Louis Rannou +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Index: b/libfcgi/Makefile.am =================================================================== --- a/libfcgi/Makefile.am +++ b/libfcgi/Makefile.am -@@ -18,4 +18,5 @@ +@@ -19,6 +19,7 @@ os_@SYSTEM@.c libfcgi_la_CC = @PTHREAD_CC@ libfcgi_la_CFLAGS = @PTHREAD_CFLAGS@ diff --git a/package/libfcgi/0002-disable-examples.patch b/package/libfcgi/0002-disable-examples.patch index 4a9916f02a..ccd01c0ce0 100644 --- a/package/libfcgi/0002-disable-examples.patch +++ b/package/libfcgi/0002-disable-examples.patch @@ -1,3 +1,5 @@ +[Dario: make the patch to be applied with fuzz factor 0] +Signed-off-by: Dario Binacchi Common subdirectories: libfcgi-2.4.0.orig/cgi-fcgi and libfcgi-2.4.0/cgi-fcgi Common subdirectories: libfcgi-2.4.0.orig/doc and libfcgi-2.4.0/doc Common subdirectories: libfcgi-2.4.0.orig/examples and libfcgi-2.4.0/examples @@ -8,9 +10,9 @@ Common subdirectories: libfcgi-2.4.0.orig/libfcgi and libfcgi-2.4.0/libfcgi diff -du libfcgi-2.4.0.orig/Makefile.am libfcgi-2.4.0/Makefile.am --- libfcgi-2.4.0.orig/Makefile.am 2001-12-22 14:05:39.000000000 +0100 +++ libfcgi-2.4.0/Makefile.am 2014-07-19 16:56:21.935216540 +0200 -@@ -4,7 +4,7 @@ - # $Id: Makefile.am,v 1.7 2001/12/22 13:05:39 robs Exp $ - # +@@ -10,7 +10,7 @@ + aclocal.m4 m4/libtool.m4 m4/lt*.m4 Makefile.in install-sh missing ltmain.sh \ + COPYING INSTALL -SUBDIRS = libfcgi cgi-fcgi examples include +SUBDIRS = libfcgi cgi-fcgi include