pool/findutils
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 862053 from Base:System

Browse Source 
- update upstream signing key
- remove deprecated texinfo packaging macros
- run spec-cleaner
- Update to 4.8.0.
  Announcement: https://savannah.gnu.org/forum/forum.php?forum_id=9914
- findutils.spec:
  - Source0: Fix download URL: remove "pub/".
  - %check: Output the content of all test-suite files in case of errors.
- Remove now-upstream patches:
  - disable-null-ptr-test.patch
  - findutils-gnulib-disable-test-float.patch
  - findutils-gnulib-test-avoid-FP-perror-strerror.patch

OBS-URL: https://build.opensuse.org/request/show/862053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/findutils?expand=0&rev=66
This commit is contained in:
Dominique Leuenberger 2021-01-22 20:48:53 +00:00 committed by Git OBS Bridge
commit f81a7378a6
10 changed files with 142 additions and 498 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
disable-null-ptr-test.patch
View File

@ -1,19 +0,0 @@
---
gnulib-tests/test-canonicalize.c | 4 ----
1 file changed, 4 deletions(-)
Index: gnulib-tests/test-canonicalize.c
===================================================================
--- gnulib-tests/test-canonicalize.c.orig
+++ gnulib-tests/test-canonicalize.c
@@ -71,10 +71,6 @@ main (void)
ASSERT (result2 == NULL);
ASSERT (errno == ENOENT);
errno = 0;
- result1 = canonicalize_file_name (null_ptr ());
- ASSERT (result1 == NULL);
- ASSERT (errno == EINVAL);
- errno = 0;
result2 = canonicalize_filename_mode (NULL, CAN_EXISTING);
ASSERT (result2 == NULL);
ASSERT (errno == EINVAL);

3
findutils-4.7.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a
size 1895048

11
findutils-4.7.0.tar.xz.sig
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEpRidtpwRZNMwApNmRlAu95aRcZUFAl1oMFIACgkQRlAu95aR
cZW3SAgAkWnO8T7D2ljH3BU7h1VRdZyqCsyinorRt7/LdGVIGZ3pcc0pux+dhOxo
p1ZuwSBczXJ7+R9WCMTx6wlfn2wXerBGWjxVsU1J8LIhxou8su4Otp2NPSf1iRqe
TfJ8Fj2uJB3FzOPz93jq6MQhwn0DZyI5++TgxtuRIFEKHZh29Op3i3ceb+KUBknd
dIf/p7B25pc7OG8sn1ClaL6+fORvMcVg/VoVrD4KYXLkKgIHuwUutCGXlkaEx0tD
sZQ9Rzh1A4NF5gyHkeSWZFS8MHnOixOykPtxJWfrQRFkTLRNgICy+vBsKiL5tupG
EvOKD0mniJnHJW/jal/8hIz4zoq31A==
=YyBw
-----END PGP SIGNATURE-----

3
findutils-4.8.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164
size 1983096

11
findutils-4.8.0.tar.xz.sig Normal file
View File

@ -0,0 +1,11 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEpRidtpwRZNMwApNmRlAu95aRcZUFAl/53q8ACgkQRlAu95aR
cZVPlwgAshQRkDwagj5Zi1tFovX2GBbGfoTT9PddleIqGCieCy28GvVRkQNKf/q9
8hjZ5L/dKUhMPQuoiB6zlL2iVzWz/8pHxBIbCWUqWEIyoubSzPI6oSfpKmzODLNk
2BBWcM+7uTPEK7Q/l2GCk7R1txzFM7izk5wwyVNtq0ARjU0njUm3w6wSgKUcXKpR
deV4psEwSkkUzcZ/IBXKZrW41Dtj4LaS0AsIqj4j1lUsDyYd/NC4Z66GAlg80PRK
7TOv8AHels0nXpgJtWiwcIz74MmCfbMq8IL1vzoTVEMMYItRkGyREoGTKnDecjCm
w9GvH4sTRO0h7JDWjKMDXD2ZxHxXmg==
=QPJY
-----END PGP SIGNATURE-----

283
findutils-gnulib-disable-test-float.patch
View File

@ -1,283 +0,0 @@
Disable gnulib test 'test-float' temporarily as it fails on ppc and ppc64le.
* gnulib-tests/Makefile.am: Comment lines related to 'test-float'.
* gnulib-tests/Makefile.in: Re-generate via 'autoreconfi -f -i'.
---
gnulib-tests/Makefile.am | 7 +
gnulib-tests/Makefile.in | 168 ++++++++++++++++++++---------------------------
2 files changed, 78 insertions(+), 97 deletions(-)
Index: gnulib-tests/Makefile.am
===================================================================
--- gnulib-tests/Makefile.am.orig
+++ gnulib-tests/Makefile.am
@@ -482,9 +482,10 @@ EXTRA_DIST += test-fgetc.c signature.h m
## begin gnulib module float-tests
-TESTS += test-float
-check_PROGRAMS += test-float
-EXTRA_DIST += test-float.c macros.h
+# Test fails with GCC-10 on ppc and ppc64le.
+#TESTS += test-float
+#check_PROGRAMS += test-float
+#EXTRA_DIST += test-float.c macros.h
## end gnulib module float-tests
Index: gnulib-tests/Makefile.in
===================================================================
--- gnulib-tests/Makefile.in.orig
+++ gnulib-tests/Makefile.in
@@ -129,16 +129,16 @@ TESTS = test-accept$(EXEEXT) test-alloca
test-fcntl-h$(EXEEXT) test-fcntl-safer$(EXEEXT) \
test-fcntl$(EXEEXT) test-fdopen$(EXEEXT) \
test-fdopendir$(EXEEXT) test-fflush$(EXEEXT) test-fflush2.sh \
- test-fgetc$(EXEEXT) test-float$(EXEEXT) \
- test-fnmatch-h$(EXEEXT) test-fnmatch$(EXEEXT) \
- test-fopen-safer$(EXEEXT) test-fopen$(EXEEXT) test-fpending.sh \
- test-fpurge$(EXEEXT) test-fputc$(EXEEXT) test-fread$(EXEEXT) \
- test-freadahead.sh test-freading$(EXEEXT) test-fseek.sh \
- test-fseek2.sh test-fseeko.sh test-fseeko2.sh test-fseeko3.sh \
- test-fseeko4.sh test-fstat$(EXEEXT) test-fstatat$(EXEEXT) \
- test-ftell.sh test-ftell2.sh test-ftell3$(EXEEXT) \
- test-ftello.sh test-ftello2.sh test-ftello3$(EXEEXT) \
- test-ftello4.sh test-ftruncate.sh test-fwrite$(EXEEXT) \
+ test-fgetc$(EXEEXT) test-fnmatch-h$(EXEEXT) \
+ test-fnmatch$(EXEEXT) test-fopen-safer$(EXEEXT) \
+ test-fopen$(EXEEXT) test-fpending.sh test-fpurge$(EXEEXT) \
+ test-fputc$(EXEEXT) test-fread$(EXEEXT) test-freadahead.sh \
+ test-freading$(EXEEXT) test-fseek.sh test-fseek2.sh \
+ test-fseeko.sh test-fseeko2.sh test-fseeko3.sh test-fseeko4.sh \
+ test-fstat$(EXEEXT) test-fstatat$(EXEEXT) test-ftell.sh \
+ test-ftell2.sh test-ftell3$(EXEEXT) test-ftello.sh \
+ test-ftello2.sh test-ftello3$(EXEEXT) test-ftello4.sh \
+ test-ftruncate.sh test-fwrite$(EXEEXT) \
test-getcwd-lgpl$(EXEEXT) test-getcwd.sh \
test-getdelim$(EXEEXT) test-getdtablesize$(EXEEXT) \
test-getgroups$(EXEEXT) test-gethostname$(EXEEXT) \
@@ -233,7 +233,7 @@ check_PROGRAMS = test-accept$(EXEEXT) te
test-fcntl-h$(EXEEXT) test-fcntl-safer$(EXEEXT) \
test-fcntl$(EXEEXT) test-fdopen$(EXEEXT) \
test-fdopendir$(EXEEXT) test-fflush$(EXEEXT) \
- test-fflush2$(EXEEXT) test-fgetc$(EXEEXT) test-float$(EXEEXT) \
+ test-fflush2$(EXEEXT) test-fgetc$(EXEEXT) \
test-fnmatch-h$(EXEEXT) test-fnmatch$(EXEEXT) \
test-fopen-safer$(EXEEXT) test-fopen$(EXEEXT) \
test-fpending$(EXEEXT) test-fpurge$(EXEEXT) \
@@ -744,11 +744,6 @@ test_fgetc_OBJECTS = test-fgetc.$(OBJEXT
test_fgetc_LDADD = $(LDADD)
test_fgetc_DEPENDENCIES = libtests.a ../gl/lib/libgnulib.a libtests.a \
$(am__DEPENDENCIES_1)
-test_float_SOURCES = test-float.c
-test_float_OBJECTS = test-float.$(OBJEXT)
-test_float_LDADD = $(LDADD)
-test_float_DEPENDENCIES = libtests.a ../gl/lib/libgnulib.a libtests.a \
- $(am__DEPENDENCIES_1)
test_fnmatch_SOURCES = test-fnmatch.c
test_fnmatch_OBJECTS = test-fnmatch.$(OBJEXT)
test_fnmatch_LDADD = $(LDADD)
@@ -1571,21 +1566,20 @@ am__depfiles_remade = ./$(DEPDIR)/accept
./$(DEPDIR)/test-fcntl-safer.Po ./$(DEPDIR)/test-fcntl.Po \
./$(DEPDIR)/test-fdopen.Po ./$(DEPDIR)/test-fdopendir.Po \
./$(DEPDIR)/test-fflush.Po ./$(DEPDIR)/test-fflush2.Po \
- ./$(DEPDIR)/test-fgetc.Po ./$(DEPDIR)/test-float.Po \
- ./$(DEPDIR)/test-fnmatch-h.Po ./$(DEPDIR)/test-fnmatch.Po \
- ./$(DEPDIR)/test-fopen-safer.Po ./$(DEPDIR)/test-fopen.Po \
- ./$(DEPDIR)/test-fpending.Po ./$(DEPDIR)/test-fpurge.Po \
- ./$(DEPDIR)/test-fputc.Po ./$(DEPDIR)/test-fread.Po \
- ./$(DEPDIR)/test-freadahead.Po ./$(DEPDIR)/test-freading.Po \
- ./$(DEPDIR)/test-fseek.Po ./$(DEPDIR)/test-fseeko.Po \
- ./$(DEPDIR)/test-fseeko3.Po ./$(DEPDIR)/test-fseeko4.Po \
- ./$(DEPDIR)/test-fstat.Po ./$(DEPDIR)/test-fstatat.Po \
- ./$(DEPDIR)/test-ftell.Po ./$(DEPDIR)/test-ftell3.Po \
- ./$(DEPDIR)/test-ftello.Po ./$(DEPDIR)/test-ftello3.Po \
- ./$(DEPDIR)/test-ftello4.Po ./$(DEPDIR)/test-ftruncate.Po \
- ./$(DEPDIR)/test-fwrite.Po ./$(DEPDIR)/test-getcwd-lgpl.Po \
- ./$(DEPDIR)/test-getcwd.Po ./$(DEPDIR)/test-getdelim.Po \
- ./$(DEPDIR)/test-getdtablesize.Po \
+ ./$(DEPDIR)/test-fgetc.Po ./$(DEPDIR)/test-fnmatch-h.Po \
+ ./$(DEPDIR)/test-fnmatch.Po ./$(DEPDIR)/test-fopen-safer.Po \
+ ./$(DEPDIR)/test-fopen.Po ./$(DEPDIR)/test-fpending.Po \
+ ./$(DEPDIR)/test-fpurge.Po ./$(DEPDIR)/test-fputc.Po \
+ ./$(DEPDIR)/test-fread.Po ./$(DEPDIR)/test-freadahead.Po \
+ ./$(DEPDIR)/test-freading.Po ./$(DEPDIR)/test-fseek.Po \
+ ./$(DEPDIR)/test-fseeko.Po ./$(DEPDIR)/test-fseeko3.Po \
+ ./$(DEPDIR)/test-fseeko4.Po ./$(DEPDIR)/test-fstat.Po \
+ ./$(DEPDIR)/test-fstatat.Po ./$(DEPDIR)/test-ftell.Po \
+ ./$(DEPDIR)/test-ftell3.Po ./$(DEPDIR)/test-ftello.Po \
+ ./$(DEPDIR)/test-ftello3.Po ./$(DEPDIR)/test-ftello4.Po \
+ ./$(DEPDIR)/test-ftruncate.Po ./$(DEPDIR)/test-fwrite.Po \
+ ./$(DEPDIR)/test-getcwd-lgpl.Po ./$(DEPDIR)/test-getcwd.Po \
+ ./$(DEPDIR)/test-getdelim.Po ./$(DEPDIR)/test-getdtablesize.Po \
./$(DEPDIR)/test-getgroups.Po ./$(DEPDIR)/test-gethostname.Po \
./$(DEPDIR)/test-getline.Po ./$(DEPDIR)/test-getopt-gnu.Po \
./$(DEPDIR)/test-getopt-posix.Po \
@@ -1694,7 +1688,7 @@ SOURCES = $(libtests_a_SOURCES) $(EXTRA_
test-errno.c test-faccessat.c test-fchdir.c test-fcntl.c \
test-fcntl-h.c test-fcntl-safer.c test-fdopen.c \
test-fdopendir.c test-fflush.c test-fflush2.c test-fgetc.c \
- test-float.c test-fnmatch.c test-fnmatch-h.c test-fopen.c \
+ test-fnmatch.c test-fnmatch-h.c test-fopen.c \
test-fopen-safer.c test-fpending.c test-fpurge.c test-fputc.c \
test-fread.c test-freadahead.c test-freading.c test-fseek.c \
test-fseeko.c test-fseeko3.c test-fseeko4.c test-fstat.c \
@@ -1759,7 +1753,7 @@ DIST_SOURCES = $(libtests_a_SOURCES) $(E
test-errno.c test-faccessat.c test-fchdir.c test-fcntl.c \
test-fcntl-h.c test-fcntl-safer.c test-fdopen.c \
test-fdopendir.c test-fflush.c test-fflush2.c test-fgetc.c \
- test-float.c test-fnmatch.c test-fnmatch-h.c test-fopen.c \
+ test-fnmatch.c test-fnmatch-h.c test-fopen.c \
test-fopen-safer.c test-fpending.c test-fpurge.c test-fputc.c \
test-fread.c test-freadahead.c test-freading.c test-fseek.c \
test-fseeko.c test-fseeko3.c test-fseeko4.c test-fstat.c \
@@ -3444,53 +3438,53 @@ EXTRA_DIST = accept.c w32sock.h test-acc
test-fcntl.c signature.h macros.h fdopen.c test-fdopen.c \
signature.h macros.h test-fdopendir.c signature.h macros.h \
test-fflush.c test-fflush2.sh test-fflush2.c signature.h \
- macros.h test-fgetc.c signature.h macros.h test-float.c \
- macros.h test-fnmatch-h.c test-fnmatch.c signature.h macros.h \
- test-fopen.h test-fopen-safer.c macros.h test-fopen.h \
- test-fopen.c signature.h macros.h test-fpending.c \
- test-fpending.sh macros.h fpucw.h test-fpurge.c macros.h \
- test-fputc.c signature.h macros.h test-fread.c signature.h \
- macros.h test-freadahead.c test-freadahead.sh macros.h \
- test-freading.c macros.h test-fseek.c test-fseek.sh \
- test-fseek2.sh signature.h macros.h test-fseeko.c \
- test-fseeko.sh test-fseeko2.sh test-fseeko3.c test-fseeko3.sh \
- test-fseeko4.c test-fseeko4.sh signature.h macros.h \
- test-fstat.c signature.h macros.h test-fstatat.c test-lstat.h \
- test-stat.h signature.h macros.h test-ftell.c test-ftell.sh \
- test-ftell2.sh test-ftell3.c signature.h macros.h \
- test-ftello.c test-ftello.sh test-ftello2.sh test-ftello3.c \
- test-ftello4.c test-ftello4.sh signature.h macros.h \
- ftruncate.c test-ftruncate.c test-ftruncate.sh signature.h \
- macros.h test-fwrite.c signature.h macros.h test-getcwd-lgpl.c \
- signature.h macros.h test-getcwd.c test-getcwd.sh \
- test-getdelim.c signature.h macros.h test-getdtablesize.c \
- signature.h macros.h test-getgroups.c signature.h macros.h \
- signature.h test-gethostname.c test-getline.c signature.h \
- macros.h macros.h signature.h test-getopt-gnu.c \
- test-getopt-main.h test-getopt.h test-getopt_long.h macros.h \
- signature.h test-getopt-posix.c test-getopt-main.h \
- test-getopt.h getpagesize.c test-getprogname.c signature.h \
- test-gettimeofday.c test-hash.c macros.h test-i-ring.c \
- macros.h ignore-value.h test-ignore-value.c inet_pton.c \
- test-inet_pton.c signature.h macros.h test-intprops.c macros.h \
- anytostr.c inttostr.h macros.h test-inttostr.c test-inttypes.c \
- ioctl.c w32sock.h test-ioctl.c signature.h macros.h \
- test-isblank.c signature.h macros.h test-isfinite.c infinity.h \
- macros.h test-isinf.c infinity.h macros.h test-isnand-nolibm.c \
- test-isnand.h minus-zero.h infinity.h nan.h macros.h \
- test-isnanf-nolibm.c test-isnanf.h minus-zero.h infinity.h \
- nan.h macros.h test-isnanl-nolibm.c test-isnanl.h minus-zero.h \
- infinity.h nan.h macros.h test-iswblank.c macros.h \
- test-langinfo.c test-limits-h.c listen.c w32sock.h \
- test-listen.c signature.h macros.h test-localcharset.c \
- test-locale.c test-localeconv.c signature.h macros.h \
- localename-table.h localename.h test-localename.c macros.h \
- test-rwlock1.c test-lock.c test-once.c test-lseek.c \
- test-lseek.sh signature.h macros.h test-lstat.h test-lstat.c \
- signature.h macros.h test-malloc-gnu.c test-malloca.c \
- test-math.c macros.h test-mbrtowc1.sh test-mbrtowc2.sh \
- test-mbrtowc3.sh test-mbrtowc4.sh test-mbrtowc5.sh \
- test-mbrtowc.c test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
+ macros.h test-fgetc.c signature.h macros.h test-fnmatch-h.c \
+ test-fnmatch.c signature.h macros.h test-fopen.h \
+ test-fopen-safer.c macros.h test-fopen.h test-fopen.c \
+ signature.h macros.h test-fpending.c test-fpending.sh macros.h \
+ fpucw.h test-fpurge.c macros.h test-fputc.c signature.h \
+ macros.h test-fread.c signature.h macros.h test-freadahead.c \
+ test-freadahead.sh macros.h test-freading.c macros.h \
+ test-fseek.c test-fseek.sh test-fseek2.sh signature.h macros.h \
+ test-fseeko.c test-fseeko.sh test-fseeko2.sh test-fseeko3.c \
+ test-fseeko3.sh test-fseeko4.c test-fseeko4.sh signature.h \
+ macros.h test-fstat.c signature.h macros.h test-fstatat.c \
+ test-lstat.h test-stat.h signature.h macros.h test-ftell.c \
+ test-ftell.sh test-ftell2.sh test-ftell3.c signature.h \
+ macros.h test-ftello.c test-ftello.sh test-ftello2.sh \
+ test-ftello3.c test-ftello4.c test-ftello4.sh signature.h \
+ macros.h ftruncate.c test-ftruncate.c test-ftruncate.sh \
+ signature.h macros.h test-fwrite.c signature.h macros.h \
+ test-getcwd-lgpl.c signature.h macros.h test-getcwd.c \
+ test-getcwd.sh test-getdelim.c signature.h macros.h \
+ test-getdtablesize.c signature.h macros.h test-getgroups.c \
+ signature.h macros.h signature.h test-gethostname.c \
+ test-getline.c signature.h macros.h macros.h signature.h \
+ test-getopt-gnu.c test-getopt-main.h test-getopt.h \
+ test-getopt_long.h macros.h signature.h test-getopt-posix.c \
+ test-getopt-main.h test-getopt.h getpagesize.c \
+ test-getprogname.c signature.h test-gettimeofday.c test-hash.c \
+ macros.h test-i-ring.c macros.h ignore-value.h \
+ test-ignore-value.c inet_pton.c test-inet_pton.c signature.h \
+ macros.h test-intprops.c macros.h anytostr.c inttostr.h \
+ macros.h test-inttostr.c test-inttypes.c ioctl.c w32sock.h \
+ test-ioctl.c signature.h macros.h test-isblank.c signature.h \
+ macros.h test-isfinite.c infinity.h macros.h test-isinf.c \
+ infinity.h macros.h test-isnand-nolibm.c test-isnand.h \
+ minus-zero.h infinity.h nan.h macros.h test-isnanf-nolibm.c \
+ test-isnanf.h minus-zero.h infinity.h nan.h macros.h \
+ test-isnanl-nolibm.c test-isnanl.h minus-zero.h infinity.h \
+ nan.h macros.h test-iswblank.c macros.h test-langinfo.c \
+ test-limits-h.c listen.c w32sock.h test-listen.c signature.h \
+ macros.h test-localcharset.c test-locale.c test-localeconv.c \
+ signature.h macros.h localename-table.h localename.h \
+ test-localename.c macros.h test-rwlock1.c test-lock.c \
+ test-once.c test-lseek.c test-lseek.sh signature.h macros.h \
+ test-lstat.h test-lstat.c signature.h macros.h \
+ test-malloc-gnu.c test-malloca.c test-math.c macros.h \
+ test-mbrtowc1.sh test-mbrtowc2.sh test-mbrtowc3.sh \
+ test-mbrtowc4.sh test-mbrtowc5.sh test-mbrtowc.c \
+ test-mbrtowc-w32-1.sh test-mbrtowc-w32-2.sh \
test-mbrtowc-w32-3.sh test-mbrtowc-w32-4.sh \
test-mbrtowc-w32-5.sh test-mbrtowc-w32.c signature.h macros.h \
test-mbscasestr1.c test-mbscasestr2.sh test-mbscasestr2.c \
@@ -3929,10 +3923,6 @@ test-fgetc$(EXEEXT): $(test_fgetc_OBJECT
@rm -f test-fgetc$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_fgetc_OBJECTS) $(test_fgetc_LDADD) $(LIBS)
-test-float$(EXEEXT): $(test_float_OBJECTS) $(test_float_DEPENDENCIES) $(EXTRA_test_float_DEPENDENCIES)
- @rm -f test-float$(EXEEXT)
- $(AM_V_CCLD)$(LINK) $(test_float_OBJECTS) $(test_float_LDADD) $(LIBS)
-
test-fnmatch$(EXEEXT): $(test_fnmatch_OBJECTS) $(test_fnmatch_DEPENDENCIES) $(EXTRA_test_fnmatch_DEPENDENCIES)
@rm -f test-fnmatch$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(test_fnmatch_OBJECTS) $(test_fnmatch_LDADD) $(LIBS)
@@ -4716,7 +4706,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fflush.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fflush2.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fgetc.Po@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-float.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fnmatch-h.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fnmatch.Po@am__quote@ # am--include-marker
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-fopen-safer.Po@am__quote@ # am--include-marker
@@ -5447,13 +5436,6 @@ test-fgetc.log: test-fgetc$(EXEEXT)
--log-file $$b.log --trs-file $$b.trs \
$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
"$$tst" $(AM_TESTS_FD_REDIRECT)
-test-float.log: test-float$(EXEEXT)
- @p='test-float$(EXEEXT)'; \
- b='test-float'; \
- $(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
- --log-file $$b.log --trs-file $$b.trs \
- $(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
- "$$tst" $(AM_TESTS_FD_REDIRECT)
test-fnmatch-h.log: test-fnmatch-h$(EXEEXT)
@p='test-fnmatch-h$(EXEEXT)'; \
b='test-fnmatch-h'; \
@@ -7020,7 +7002,6 @@ distclean: distclean-recursive
-rm -f ./$(DEPDIR)/test-fflush.Po
-rm -f ./$(DEPDIR)/test-fflush2.Po
-rm -f ./$(DEPDIR)/test-fgetc.Po
- -rm -f ./$(DEPDIR)/test-float.Po
-rm -f ./$(DEPDIR)/test-fnmatch-h.Po
-rm -f ./$(DEPDIR)/test-fnmatch.Po
-rm -f ./$(DEPDIR)/test-fopen-safer.Po
@@ -7323,7 +7304,6 @@ maintainer-clean: maintainer-clean-recur
-rm -f ./$(DEPDIR)/test-fflush.Po
-rm -f ./$(DEPDIR)/test-fflush2.Po
-rm -f ./$(DEPDIR)/test-fgetc.Po
- -rm -f ./$(DEPDIR)/test-float.Po
-rm -f ./$(DEPDIR)/test-fnmatch-h.Po
-rm -f ./$(DEPDIR)/test-fnmatch.Po
-rm -f ./$(DEPDIR)/test-fopen-safer.Po

101
findutils-gnulib-test-avoid-FP-perror-strerror.patch
View File

@ -1,101 +0,0 @@
Avoid false-positive error in gnulib tests 'test-perror2' and 'test-strerror_r'.
On openSUSE OBS, the above gnulib tests fail on armv7l.
Corresponding report on the gnulib mailing list:
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
From: Florian Weimer
Date: Thu, 27 Aug 2020 09:41:34 +0200
Subject: Use-after-free in test-perror2, test-strerror_r
The problem is visible with glibc 2.32 under valgrind:
==20== Invalid read of size 1
==20== at 0x483DAB4: strcmp (vg_replace_strmem.c:847)
==20== by 0x109414: main (test-perror2.c:84)
==20== Address 0x4a1a3d0 is 0 bytes inside a block of size 17 free'd
==20== at 0x483A9F5: free (vg_replace_malloc.c:538)
==20== by 0x48E2134: strerror_l (in /usr/lib64/libc-2.32.so)
==20== by 0x109328: main (test-perror2.c:72)
==20== Block was alloc'd at
==20== at 0x4839809: malloc (vg_replace_malloc.c:307)
==20== by 0x48CA03F: __vasprintf_internal (in /usr/lib64/libc-2.32.so)
==20== by 0x48A46F9: asprintf (in /usr/lib64/libc-2.32.so)
==20== by 0x48E2184: strerror_l (in /usr/lib64/libc-2.32.so)
==20== by 0x1092E2: main (test-perror2.c:67)
==20==
==20== Invalid read of size 1
==20== at 0x483DAC8: strcmp (vg_replace_strmem.c:847)
==20== by 0x109414: main (test-perror2.c:84)
==20== Address 0x4a1a3d1 is 1 bytes inside a block of size 17 free'd
==20== at 0x483A9F5: free (vg_replace_malloc.c:538)
==20== by 0x48E2134: strerror_l (in /usr/lib64/libc-2.32.so)
==20== by 0x109328: main (test-perror2.c:72)
==20== Block was alloc'd at
==20== at 0x4839809: malloc (vg_replace_malloc.c:307)
==20== by 0x48CA03F: __vasprintf_internal (in /usr/lib64/libc-2.32.so)
==20== by 0x48A46F9: asprintf (in /usr/lib64/libc-2.32.so)
==20== by 0x48E2184: strerror_l (in /usr/lib64/libc-2.32.so)
==20== by 0x1092E2: main (test-perror2.c:67)
I think it's the test that's invalid.
This was reported as an actual grep test failure (without valgrind) on
32-bit Arm, where glibc malloc happens to return a different buffer
address for the internal allocation (so that msg3 != msg4).
test-strerror_r has the same issue.
Thanks,
Florian
Upstream patch:
https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=175e0bc72808
From 175e0bc72808d564074c4adcc72aeadb74adfcc6 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 27 Aug 2020 17:52:58 -0700
Subject: [PATCH] perror, strerror_r: remove unportable tests
Problem reported by Florian Weimer in:
https://lists.gnu.org/r/bug-gnulib/2020-08/msg00220.html
* tests/test-perror2.c (main):
* tests/test-strerror_r.c (main): Omit unportable tests.
This downstream patch is identical to upstream one modulo the ChangeLog entry.
---
gnulib-tests/test-perror2.c | 3 ---
gnulib-tests/test-strerror_r.c | 3 ---
2 files changed, 6 deletions(-)
Index: gnulib-tests/test-perror2.c
===================================================================
--- gnulib-tests/test-perror2.c.orig
+++ gnulib-tests/test-perror2.c
@@ -79,9 +79,6 @@ main (void)
errno = -5;
perror ("");
ASSERT (!ferror (stderr));
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
ASSERT (STREQ (msg4, str4));
free (str1);
Index: gnulib-tests/test-strerror_r.c
===================================================================
--- gnulib-tests/test-strerror_r.c.orig
+++ gnulib-tests/test-strerror_r.c
@@ -165,9 +165,6 @@ main (void)
strerror_r (EACCES, buf, sizeof buf);
strerror_r (-5, buf, sizeof buf);
- ASSERT (msg1 == msg2 || msg1 == msg4 || STREQ (msg1, str1));
- ASSERT (msg2 == msg4 || STREQ (msg2, str2));
- ASSERT (msg3 == msg4 || STREQ (msg3, str3));
ASSERT (STREQ (msg4, str4));
free (str1);

20
findutils.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
Sat Jan 9 20:08:51 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
- update upstream signing key
- remove deprecated texinfo packaging macros
- run spec-cleaner
-------------------------------------------------------------------
Sat Jan 9 19:21:23 UTC 2021 - Bernhard Voelker <mail@bernhard-voelker.de>
- Update to 4.8.0.
Announcement: https://savannah.gnu.org/forum/forum.php?forum_id=9914
- findutils.spec:
- Source0: Fix download URL: remove "pub/".
- %check: Output the content of all test-suite files in case of errors.
- Remove now-upstream patches:
- disable-null-ptr-test.patch
- findutils-gnulib-disable-test-float.patch
- findutils-gnulib-test-avoid-FP-perror-strerror.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Oct 16 09:48:05 UTC 2020 - Ludwig Nussel <lnussel@suse.de> Fri Oct 16 09:48:05 UTC 2020 - Ludwig Nussel <lnussel@suse.de>

130
findutils.keyring
View File

@ -115,19 +115,19 @@ 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
@ -248,31 +248,85 @@ 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
=lMPX 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
=MuTV
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----
GPG keys of Eric Blake <ericb> GPG keys of Eric Blake <ericb>

59
findutils.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package findutils # spec file for package findutils
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -17,17 +17,15 @@
Name: findutils Name: findutils
URL: http://www.gnu.org/software/findutils/ Version: 4.8.0
Version: 4.7.0
Release: 0 Release: 0
Summary: The GNU versions of find utilities (find and xargs) Summary: The GNU versions of find utilities (find and xargs)
License: GPL-3.0-or-later License: GPL-3.0-or-later
Group: Productivity/File utilities Group: Productivity/File utilities
URL: https://www.gnu.org/software/findutils/
# Upstream development: # Upstream development:
# cgit-URL: https://git.savannah.gnu.org/cgit/findutils.git/ # cgit-URL: https://git.savannah.gnu.org/cgit/findutils.git/
# Git-Clone: git://git.sv.gnu.org/findutils # Git-Clone: git://git.sv.gnu.org/findutils
# For upgrading the upstream version, increase the version number (above), # For upgrading the upstream version, increase the version number (above),
# then remove the old tarball and signature files and let OSC download # then remove the old tarball and signature files and let OSC download
# those files of the new version: # those files of the new version:
@ -38,27 +36,19 @@ Group: Productivity/File utilities
# Finally, add a changelog entry and commit: # Finally, add a changelog entry and commit:
# osc vc # osc vc
# osc ci # osc ci
Source0: https://ftp.gnu.org/pub/gnu/%{name}/%{name}-%{version}.tar.xz Source0: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig Source1: https://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz.sig
Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{name}&download=1&file=./%{name}.keyring Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{name}&download=1&file=./%{name}.keyring
# adds a new option -xautofs to find to not descend into directories on autofs file systems # adds a new option -xautofs to find to not descend into directories on autofs file systems
Patch0: findutils-xautofs.patch Patch0: findutils-xautofs.patch
Patch1: disable-null-ptr-test.patch
Patch2: findutils-gnulib-disable-test-float.patch
Patch3: findutils-gnulib-test-avoid-FP-perror-strerror.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# BuildRequire dejagnu for 'runtest' to execute all tests. # BuildRequire dejagnu for 'runtest' to execute all tests.
BuildRequires: dejagnu BuildRequires: dejagnu
%if 0%{?suse_version} > 1100
BuildRequires: libselinux-devel
%endif
BuildRequires: makeinfo BuildRequires: makeinfo
Provides: find = %{version} Provides: find = %{version}
Obsoletes: find < %{version} Obsoletes: find < %{version}
Requires(post): %{install_info_prereq} %if 0%{?suse_version} > 1100
Requires(preun): %{install_info_prereq} BuildRequires: libselinux-devel
%endif
%description %description
The findutils package contains programs which will help you locate The findutils package contains programs which will help you locate
@ -71,21 +61,11 @@ names generated by the find command).
You should install findutils because it includes tools that are very You should install findutils because it includes tools that are very
useful for finding things on your system. useful for finding things on your system.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 %patch0
%patch1
%ifarch ppc ppc64le
# Disable gnulib test 'test-float' temporarily as it fails on ppc and ppc64le.
%patch2
%endif
# Avoid FP error in gnulib tests 'test-perror2' and 'test-strerror_r'.
%patch3
%build %build
%if 0%{?qemu_user_space_build} %if 0%{?qemu_user_space_build}
@ -94,16 +74,16 @@ export DEFAULT_ARG_SIZE="(31u * 1024u)"
%endif %endif
%configure \ %configure \
--libexecdir=%{_libdir}/find \ --libexecdir=%{_libdir}/find \
--localstatedir=/var/lib --localstatedir=%{_localstatedir}/lib
make %{?_smp_mflags} %make_build
%check %check
make check \ %make_build check \
|| { cat tests/test-suite.log; exit 1; } || { grep . */test-suite.log; exit 1; }
%install %install
make DESTDIR=%{buildroot} install %make_install
rm -f %{buildroot}%{_infodir}/find-maint* rm -f %{buildroot}%{_infodir}/find-maint*
%find_lang %{name} %find_lang %{name}
@ -119,14 +99,7 @@ rm %{buildroot}%{_mandir}/man1/locate.1*
rm %{buildroot}%{_mandir}/man1/updatedb.1* rm %{buildroot}%{_mandir}/man1/updatedb.1*
rm %{buildroot}%{_mandir}/man5/locatedb.5* rm %{buildroot}%{_mandir}/man5/locatedb.5*
%post
%install_info --info-dir=%{_infodir} %{_infodir}/find.info.gz
%preun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/find.info.gz
%files %files
%defattr(-,root,root,-)
%license COPYING %license COPYING
%doc AUTHORS NEWS README THANKS TODO %doc AUTHORS NEWS README THANKS TODO
%if !0%{?usrmerged} %if !0%{?usrmerged}
@ -134,11 +107,11 @@ rm %{buildroot}%{_mandir}/man5/locatedb.5*
%endif %endif
%{_bindir}/find %{_bindir}/find
%{_bindir}/xargs %{_bindir}/xargs
%doc %{_infodir}/find.info*.gz %{_infodir}/find.info*.gz
%doc %{_mandir}/man1/find.1.gz %{_mandir}/man1/find.1%{?ext_man}
%doc %{_mandir}/man1/xargs.1.gz %{_mandir}/man1/xargs.1%{?ext_man}
%files lang -f %{name}.lang %files lang -f %{name}.lang
%defattr(-,root,root,-) %license COPYING
%changelog %changelog