From c4b1823b47a0fb2b08273e7c457c35cbf0d3c4a8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:55:34 +0000 Subject: import findutils-4.5.11-5.el7 --- diff --git a/SOURCES/findutils-4.5.11-bz1116237.patch b/SOURCES/findutils-4.5.11-bz1116237.patch new file mode 100644 index 0000000..c457997 --- /dev/null +++ b/SOURCES/findutils-4.5.11-bz1116237.patch @@ -0,0 +1,124 @@ +From f5a43df0bd6481b407a6ec00a24679f521584e20 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Mon, 22 Apr 2013 21:49:40 +0100 +Subject: [PATCH] Resolves: #1116237 - find -perm +numeric does not work as + expected + +Also, do not reject -perm /MODE merely because of POSIXLY_CORRECT. +Problem reported in . +* doc/find.texi (Mode Bits): Document this. +* find/parser.c (parse_help): Mention /MODE, not +MODE. +Do not reject -perm /MODE merely because POSIXLY_CORRECT is set; +POSIXLY_CORRECT is not supposed to be for pedantic checking. + +[upstream commit 90f0c5d24153ad3327edd6f2249fc95a5cfb72e0] + +Signed-off-by: Kamil Dudka +--- + doc/find.texi | 11 ++--------- + find/find.1 | 17 ++++++++++++----- + find/parser.c | 10 ++++++++-- + 3 files changed, 22 insertions(+), 16 deletions(-) + +diff --git a/doc/find.texi b/doc/find.texi +index a44e5d5..1ad3af5 100644 +--- a/doc/find.texi ++++ b/doc/find.texi +@@ -1180,11 +1180,8 @@ optionally prefixed by @samp{-} or @samp{/}. + + A @var{pmode} that starts with neither @samp{-} nor @samp{/} matches + if @var{mode} exactly matches the file mode bits. +- +-A @var{pmode} that starts with @samp{+} but which is not valid (for +-example @samp{+a+x}) is an error if the POSIXLY_CORRECT environment +-variable it set. Otherwise this is treated as if the initial +-@samp{+} were a @samp{/}, for backward compatibility. ++(To avoid confusion with an obsolete GNU extension, @var{mode} ++must not start with a @samp{+} immediately followed by an octal digit.) + + A @var{pmode} that starts with @samp{-} matches if + @emph{all} the file mode bits set in @var{mode} are set for the file; +@@ -3944,10 +3941,6 @@ Setting this variable also turns off warning messages (that is, implies + the output for @samp{-ok}, all messages printed on stderr are + diagnostics and must result in a non-zero exit status. + +-Arguments to @samp{-perm} beginning with @samp{+} are treated +-differently when POSIXLY_CORRECT is set. See +-@ref{Mode Bits,-perm,File Mode Bits}. +- + When POSIXLY_CORRECT is set, the response to the prompt made by the + @code{-ok} action is interpreted according to the system's message + catalogue, as opposed to according to @code{find}'s own message +diff --git a/find/find.1 b/find/find.1 +index 34a4cba..00e45e6 100644 +--- a/find/find.1 ++++ b/find/find.1 +@@ -2046,11 +2046,6 @@ As of findutils-4.2.2, shell metacharacters (`*', `?' or `[]' for + example) used in filename patterns will match a leading `.', because + IEEE POSIX interpretation 126 requires this. + .P +-The syntax +-\.B \-perm +MODE +-was deprecated in findutils-4.2.21, in favour of +-\.B \-perm +-.BR /MODE . + As of findutils-4.3.3, + .B \-perm /000 + now matches all files instead of none. +@@ -2098,6 +2093,18 @@ Feature Added in Also occurs in + \-ipath 3.8 + \-iregex 3.8 + .TE ++.P ++The syntax ++\.B \-perm +MODE ++does not work as expected in findutils-4.5.11 and it ++was removed in findutils-4.5.12, in favour of ++\.B \-perm ++.BR /MODE . ++The ++.B +MODE ++syntax had been deprecated since findutils-4.2.21 ++which was released in 2005. ++.P + .SH "NON-BUGS" + .nf + .B $ find . \-name *.c \-print +diff --git a/find/parser.c b/find/parser.c +index d15c0e0..e5f02b3 100644 +--- a/find/parser.c ++++ b/find/parser.c +@@ -1239,7 +1239,7 @@ tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\ + -ilname PATTERN -iname PATTERN -inum N -iwholename PATTERN -iregex PATTERN\n\ + -links N -lname PATTERN -mmin N -mtime N -name PATTERN -newer FILE")); + puts (_("\ +- -nouser -nogroup -path PATTERN -perm [+-]MODE -regex PATTERN\n\ ++ -nouser -nogroup -path PATTERN -perm [-/]MODE -regex PATTERN\n\ + -readable -writable -executable\n\ + -wholename PATTERN -size N[bcwkMG] -true -type [bcdpflsD] -uid N\n\ + -used N -user NAME -xtype [bcdpfls]")); +@@ -1981,6 +1981,13 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr) + break; + + case '+': ++ if ('0' <= perm_expr[1] && perm_expr[1] < '8') ++ /* warn about using obsolete syntax (with unexpected behavior) */ ++ error(0, 0, "warning: you are using `-perm +MODE'. The " ++ "interpretation of `-perm +omode' changed in findutils-4.5.11. " ++ "The syntax `-perm +omode' was removed in findutils-4.5.12, in " ++ "favour of `-perm /omode'."); ++ + change = mode_compile (perm_expr); + if (NULL == change) + { +@@ -2011,7 +2018,6 @@ parse_perm (const struct parser_table* entry, char **argv, int *arg_ptr) + break; + + case '/': /* GNU extension */ +- non_posix_mode (perm_expr); + mode_start = 1; + kind = PERM_ANY; + havekind = true; +-- +1.9.3 + diff --git a/SOURCES/findutils-4.5.11-ppc-gnulib-tests.patch b/SOURCES/findutils-4.5.11-ppc-gnulib-tests.patch new file mode 100644 index 0000000..a9801ab --- /dev/null +++ b/SOURCES/findutils-4.5.11-ppc-gnulib-tests.patch @@ -0,0 +1,84 @@ +From de69fd334b77ec578c2232574fc76222808148b0 Mon Sep 17 00:00:00 2001 +From: Ulrich Weigand +Date: Fri, 30 May 2014 11:34:23 +0100 +Subject: [PATCH] isfinite, isinf, isnan tests: fix for little-endian PowerPC + +* tests/test-isfinite.c (test_isfinitel): Only manipulate the +first double of a PowerPC "double double" pair. +* tests/test-isinf.c (test_isinfl): Likewise. +* tests/test-isnan.c (test_long_double): Likewise. +* tests/test-isnanl.h (main): Likewise. +* tests/test-signbit.c (test_signbitl): Likewise. + +[upstream commit e962c07c0c8bb18f9a5969cbf1ddb01d0fe4f55c] + +Signed-off-by: Kamil Dudka +--- + tests/test-isfinite.c | 9 +++++++++ + tests/test-isinf.c | 9 +++++++++ + tests/test-isnanl.h | 9 +++++++++ + 3 files changed, 27 insertions(+) + +diff --git a/tests/test-isfinite.c b/tests/test-isfinite.c +index 828cd69..8e88b67 100644 +--- a/tests/test-isfinite.c ++++ b/tests/test-isfinite.c +@@ -152,6 +152,15 @@ test_isfinitel () + /* A bit pattern that is different from a Quiet NaN. With a bit of luck, + it's a Signalling NaN. */ + { ++#if defined __powerpc__ && LDBL_MANT_DIG == 106 ++ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are ++ represented as the corresponding 64-bit IEEE values in the first double; ++ the second is ignored. Manipulate only the first double. */ ++ #undef NWORDS ++ #define NWORDS \ ++ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) ++#endif ++ + memory_long_double m; + m.value = zerol / zerol; + # if LDBL_EXPBIT0_BIT > 0 +diff --git a/tests/test-isinf.c b/tests/test-isinf.c +index 253f341..76c132e 100644 +--- a/tests/test-isinf.c ++++ b/tests/test-isinf.c +@@ -158,6 +158,15 @@ test_isinfl () + /* A bit pattern that is different from a Quiet NaN. With a bit of luck, + it's a Signalling NaN. */ + { ++#if defined __powerpc__ && LDBL_MANT_DIG == 106 ++ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are ++ represented as the corresponding 64-bit IEEE values in the first double; ++ the second is ignored. Manipulate only the first double. */ ++ #undef NWORDS ++ #define NWORDS \ ++ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) ++#endif ++ + memory_long_double m; + m.value = zerol / zerol; + # if LDBL_EXPBIT0_BIT > 0 +diff --git a/tests/test-isnanl.h b/tests/test-isnanl.h +index 8a9e684..bf81630 100644 +--- a/tests/test-isnanl.h ++++ b/tests/test-isnanl.h +@@ -51,6 +51,15 @@ main () + /* A bit pattern that is different from a Quiet NaN. With a bit of luck, + it's a Signalling NaN. */ + { ++#if defined __powerpc__ && LDBL_MANT_DIG == 106 ++ /* This is PowerPC "double double", a pair of two doubles. Inf and Nan are ++ represented as the corresponding 64-bit IEEE values in the first double; ++ the second is ignored. Manipulate only the first double. */ ++ #undef NWORDS ++ #define NWORDS \ ++ ((sizeof (double) + sizeof (unsigned int) - 1) / sizeof (unsigned int)) ++#endif ++ + memory_long_double m; + m.value = NaNl (); + # if LDBL_EXPBIT0_BIT > 0 +-- +1.9.3 + diff --git a/SPECS/findutils.spec b/SPECS/findutils.spec index c26301d..9ab9eaa 100644 --- a/SPECS/findutils.spec +++ b/SPECS/findutils.spec @@ -1,7 +1,7 @@ Summary: The GNU versions of find utilities (find and xargs) Name: findutils Version: 4.5.11 -Release: 3%{?dist} +Release: 5%{?dist} Epoch: 1 License: GPLv3+ Group: Applications/File @@ -22,6 +22,12 @@ Patch3: findutils-4.4.2-xautofs.patch # eliminate compile-time warnings Patch4: findutils-4.5.7-warnings.patch +# eliminate failure of gnulib tests on little-endian PowerPC (#1083145) +Patch5: findutils-4.5.11-ppc-gnulib-tests.patch + +# print a warning if find -perm +omode is used (#1116237) +Patch6: findutils-4.5.11-bz1116237.patch + Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Conflicts: filesystem < 3 @@ -53,6 +59,8 @@ rm -rf locate %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 # needed because of findutils-4.4.0-no-locate.patch autoreconf -iv @@ -99,6 +107,12 @@ fi %{_infodir}/find-maint.info.gz %changelog +* Mon Jun 01 2015 Kamil Dudka - 1:4.5.11-5 +- print a warning if find -perm +omode is used (#1116237) + +* Fri Aug 01 2014 Kamil Dudka - 1:4.5.11-4 +- eliminate failure of gnulib tests on little-endian PowerPC (#1125504) + * Fri Jan 24 2014 Daniel Mach - 1:4.5.11-3 - Mass rebuild 2014-01-24