package/xfsprogs: fix patch fuzz

Commit 8f88a64 "support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0" reduced the fuzz factor.

Due to this change, xfsprogs fails to build with output:

    Applying 0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch using patch:
    patching file mdrestore/Makefile
    Hunk #1 FAILED at 10.
    1 out of 1 hunk FAILED -- saving rejects to file mdrestore/Makefile.rej
    patching file scrub/Makefile
    Hunk #1 FAILED at 70.
    1 out of 1 hunk FAILED -- saving rejects to file scrub/Makefile.rej

This commit refreshes the package patches on the current package
version. Note: the patch 0001 file name is changed because it was
regenerated with the "git format-patch" command.

The patch 0001 had an "Upstream:" tag in brackets. The tag was not
detected as such by check-package. This commit updates this tag. The
patch 0002 is also marked with an alternative upstream commit, so it
can be easily dropped at the next bump.

With those changes, the ".checkpackageignore" entries are no longer
needed, so this commit removes those.

Signed-off-by: Julien Olivain <[email protected]>
Signed-off-by: Arnout Vandecappelle <[email protected]>

.checkpackageignore

@@ -1576,8 +1576,6 @@ package/xen/0004-libs-light-fix-tv_sec-fprintf-format.patch lib_patch.Upstream
 package/xenomai/3.0.10/0001-lib-boilerplate-iniparser-Allow-building-with-GCC-10-2-2020101.patch lib_patch.Upstream
 package/xenomai/3.0.10/0002-Add-disable-demo-testsuite-options.patch lib_patch.Upstream
 package/xenomai/3.0.10/0003-lib-cobalt-copperplate-Use-valid-addresses-for-pthread_setspecific.patch lib_patch.Upstream
-package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch lib_patch.Upstream
-package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch lib_patch.Upstream
 package/xinetd/0001-ar.patch lib_patch.Upstream
 package/xinetd/0002-destdir.patch lib_patch.Upstream
 package/xinetd/0003-rpc-fix.patch lib_patch.Upstream

package/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch → package/xfsprogs/0001-mdrestore-scrub-do-not-do-dynamic-linking-of-libtool.patch

@@ -1,4 +1,4 @@
-From d5cbb4f43cc9c30100fbf18a3e0d1fb95e1c1b0a Mon Sep 17 00:00:00 2001
+From fa3a4e036c8c78325216ed21eff6145aeb186686 Mon Sep 17 00:00:00 2001
 From: Vicente Olivert Riera <[email protected]>
 Date: Wed, 25 Nov 2015 10:50:00 +0000
 Subject: [PATCH] mdrestore, scrub: do not do dynamic linking of libtool
@@ -11,42 +11,44 @@ linking for libuuid only. Otherwise the build will fail like this:
 ld: attempted static link of dynamic object `/usr/lib/libuuid.so'
 
 Signed-off-by: Vicente Olivert Riera <[email protected]>
-[Sent upstream: https://www.spinics.net/lists/xfs/msg36149.html]
+Upstream: Proposed: https://www.spinics.net/lists/xfs/msg36149.html
 [baruch: update for v4.15.1; extend to include scrub]
 Signed-off-by: Baruch Siach <[email protected]>
 [matt: update for v4.16.1; adjusted libunistring -> libicu]
 Signed-off-by: Matt Weber <[email protected]>
+[Julien: rebased on v6.4.0]
+Signed-off-by: Julien Olivain <[email protected]>
 ---
  mdrestore/Makefile | 2 +-
  scrub/Makefile     | 2 +-
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/mdrestore/Makefile b/mdrestore/Makefile
-index 136ae716d691..75ff1bad78e9 100644
+index 4a932efb..7ea1fd45 100644
 --- a/mdrestore/Makefile
 +++ b/mdrestore/Makefile
 @@ -10,7 +10,7 @@ CFILES = xfs_mdrestore.c
 
- LLDLIBS = $(LIBXFS) $(LIBFROG) $(LIBRT) $(LIBPTHREAD) $(LIBUUID)
+ LLDLIBS = $(LIBXFS) $(LIBFROG) $(LIBRT) $(LIBUUID) $(LIBURCU) $(LIBPTHREAD)
  LTDEPENDENCIES = $(LIBXFS) $(LIBFROG)
 -LLDFLAGS = -static
 +LLDFLAGS = -static-libtool-libs
 
  default: depend $(LTCOMMAND)
 
 diff --git a/scrub/Makefile b/scrub/Makefile
-index 063279400262..949f6fd8ba94 100644
+index aba14ed2..f0ef492f 100644
 --- a/scrub/Makefile
 +++ b/scrub/Makefile
-@@ -70,7 +70,7 @@ xfs_scrub.c
-
- LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBPTHREAD) $(LIBICU_LIBS) $(LIBRT)
+@@ -71,7 +71,7 @@ xfs_scrub.c
+ LLDLIBS += $(LIBHANDLE) $(LIBFROG) $(LIBICU_LIBS) $(LIBRT) $(LIBURCU) \
+ 	$(LIBPTHREAD)
  LTDEPENDENCIES += $(LIBHANDLE) $(LIBFROG)
 -LLDFLAGS = -static
 +LLDFLAGS = -static-libtool-libs
 
  ifeq ($(HAVE_MALLINFO),yes)
  LCFLAGS += -DHAVE_MALLINFO
 -- 
-2.16.2
+2.45.2
 

package/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch

@@ -1,4 +1,4 @@
-From 3a77dfc54271059dcac305384bf6ace34fe1f3d3 Mon Sep 17 00:00:00 2001
+From 94ae5db7d017480e103aa6f07cc86648b613d114 Mon Sep 17 00:00:00 2001
 From: "Yann E. MORIN" <[email protected]>
 Date: Sun, 18 Dec 2016 15:37:27 +0100
 Subject: [PATCH] libxfs: do not try to run the crc32selftest
@@ -19,26 +19,29 @@ generator is natively built, but with the target CFLAGS.
 Signed-off-by: "Yann E. MORIN" <[email protected]>
 Signed-off-by: "Fabrice Fontaine" <[email protected]>
 [Update for 4.18.0: crc32 has been moved from libxfs to libfrog]
+[Julien: rebased on v6.4.0]
+Signed-off-by: Julien Olivain <[email protected]>
+Upstream: patch to be superseded by https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/commit/?id=e51b89e657af7843d8c7aea3df49fe1f0f1d4ac2
 ---
- libxfs/Makefile | 4 ++--
+ libfrog/Makefile | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/libfrog/Makefile b/libxfs/Makefile
-index 62608bd..e021625 100644
+diff --git a/libfrog/Makefile b/libfrog/Makefile
+index f292afe3..1d0d2083 100644
 --- a/libfrog/Makefile
 +++ b/libfrog/Makefile
-@@ -112,9 +112,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT)
- # don't try linking xfs_repair with a debug libxfs.
- DEBUG = -DNDEBUG
+@@ -57,9 +57,9 @@ ifeq ($(HAVE_GETMNTENT),yes)
+ LCFLAGS += -DHAVE_GETMNTENT
+ endif
 
 -LDIRT = gen_crc32table crc32table.h crc32selftest
 +LDIRT = gen_crc32table crc32table.h
 
 -default: crc32selftest ltdepend $(LTLIBRARY)
 +default: ltdepend $(LTLIBRARY)
 
- crc32table.h: gen_crc32table.c
+ crc32table.h: gen_crc32table.c crc32defs.h
  	@echo "    [CC]     gen_crc32table"
 -- 
-2.7.4
+2.45.2