testing/findutils
SHA256
3
0
Fork 0
forked from pool/findutils
Code Pull Requests Activity

Accepting request 862014 from home:berny:branches:Base:System

Browse Source 
- 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/862014
OBS-URL: https://build.opensuse.org/package/show/Base:System/findutils?expand=0&rev=93
This commit is contained in:
Bernhard Voelker 2021-01-09 19:55:50 +00:00 committed by Git OBS Bridge
parent 0d6aa1b4e4
commit aca03de392
9 changed files with 31 additions and 433 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);

13
findutils.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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>

20
findutils.spec
View File

@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@ -18,7 +18,7 @@
Name: findutils
URL: http://www.gnu.org/software/findutils/
Version: 4.7.0
Version: 4.8.0
Release: 0
Summary: The GNU versions of find utilities (find and xargs)
License: GPL-3.0-or-later
@ -38,15 +38,12 @@ Group: Productivity/File utilities
# Finally, add a changelog entry and commit:
# osc vc
# 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
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
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.
@ -77,15 +74,6 @@ useful for finding things on your system.
%prep
%setup -q
%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
%if 0%{?qemu_user_space_build}
@ -100,7 +88,7 @@ make %{?_smp_mflags}
%check
make check \
|| { cat tests/test-suite.log; exit 1; }
|| { grep . */test-suite.log; exit 1; }
%install
make DESTDIR=%{buildroot} install