diff --git a/findutils-4.8.0.tar.xz b/findutils-4.8.0.tar.xz deleted file mode 100644 index a99e26b..0000000 --- a/findutils-4.8.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:57127b7e97d91282c6ace556378d5455a9509898297e46e10443016ea1387164 -size 1983096 diff --git a/findutils-4.8.0.tar.xz.sig b/findutils-4.8.0.tar.xz.sig deleted file mode 100644 index eb99f2a..0000000 --- a/findutils-4.8.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCAAdFiEEpRidtpwRZNMwApNmRlAu95aRcZUFAl/53q8ACgkQRlAu95aR -cZVPlwgAshQRkDwagj5Zi1tFovX2GBbGfoTT9PddleIqGCieCy28GvVRkQNKf/q9 -8hjZ5L/dKUhMPQuoiB6zlL2iVzWz/8pHxBIbCWUqWEIyoubSzPI6oSfpKmzODLNk -2BBWcM+7uTPEK7Q/l2GCk7R1txzFM7izk5wwyVNtq0ARjU0njUm3w6wSgKUcXKpR -deV4psEwSkkUzcZ/IBXKZrW41Dtj4LaS0AsIqj4j1lUsDyYd/NC4Z66GAlg80PRK -7TOv8AHels0nXpgJtWiwcIz74MmCfbMq8IL1vzoTVEMMYItRkGyREoGTKnDecjCm -w9GvH4sTRO0h7JDWjKMDXD2ZxHxXmg== -=QPJY ------END PGP SIGNATURE----- diff --git a/findutils-4.9.0.tar.xz b/findutils-4.9.0.tar.xz new file mode 100644 index 0000000..753ac8b --- /dev/null +++ b/findutils-4.9.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe +size 2046252 diff --git a/findutils-4.9.0.tar.xz.sig b/findutils-4.9.0.tar.xz.sig new file mode 100644 index 0000000..2ae2627 --- /dev/null +++ b/findutils-4.9.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEpRidtpwRZNMwApNmRlAu95aRcZUFAmH50AcACgkQRlAu95aR +cZU/DQgAjt38b5+7CREWR7rk9y/NRvc+xAg7wMfwjt90cAycjRZ7hMVviB7R+MhO +1rrV+4UkKCYzBzks5FIhN00IwmXoe0VPeH17ATtSB6c70rBNwHE7CWcGz2cnqHBQ +CzPBy3hXEq7YY1kq7bfZCkTTEnxve9eKrgoczj/NpxvxoRkLmXzzKd0ChvHLlYJl +m0GrPAl81eUF2vYIo5/9F28AR2mfCv1cwzsb1Ch3WEXqZB2tcIKsocrO4AVVpkmD +o1pmPZa1FTKPI4YdBOlOuWUYkf6rD7WEKTcFmXrafkPlzhY4HJyN35XslAllJg6w +81EbRarQvxrVDuxoS0jnx0oMvV7jxg== +=hp30 +-----END PGP SIGNATURE----- diff --git a/findutils-xautofs.patch b/findutils-xautofs.patch index 9f68548..e9cb856 100644 --- a/findutils-xautofs.patch +++ b/findutils-xautofs.patch @@ -4,14 +4,14 @@ find/find.1 | 3 +++ find/ftsfind.c | 6 ++++++ find/parser.c | 12 ++++++++++++ - find/util.c | 3 ++- - 6 files changed, 30 insertions(+), 1 deletion(-) + find/util.c | 4 +++- + 6 files changed, 31 insertions(+), 1 deletion(-) Index: doc/find.texi =================================================================== --- doc/find.texi.orig +++ doc/find.texi -@@ -1519,6 +1519,10 @@ them. +@@ -1608,6 +1608,10 @@ them. There are two ways to avoid searching certain filesystems. One way is to tell @code{find} to only search one filesystem: @@ -26,7 +26,7 @@ Index: find/defs.h =================================================================== --- find/defs.h.orig +++ find/defs.h -@@ -574,6 +574,9 @@ struct options +@@ -562,6 +562,9 @@ struct options /* If true, don't cross filesystem boundaries. */ bool stay_on_filesystem; @@ -40,7 +40,7 @@ Index: find/find.1 =================================================================== --- find/find.1.orig +++ find/find.1 -@@ -576,6 +576,9 @@ to stat them; this gives a significant i +@@ -638,6 +638,9 @@ to stat them; this gives a significant i .IP "\-version, \-\-version" Print the \fBfind\fR version number and exit. @@ -54,7 +54,7 @@ Index: find/ftsfind.c =================================================================== --- find/ftsfind.c.orig +++ find/ftsfind.c -@@ -432,6 +432,12 @@ consider_visiting (FTS *p, FTSENT *ent) +@@ -435,6 +435,12 @@ consider_visiting (FTS *p, FTSENT *ent) } } @@ -71,7 +71,7 @@ Index: find/parser.c =================================================================== --- find/parser.c.orig +++ find/parser.c -@@ -138,6 +138,7 @@ static bool parse_used (const s +@@ -139,6 +139,7 @@ static bool parse_used (const s static bool parse_user (const struct parser_table*, char *argv[], int *arg_ptr); static bool parse_wholename (const struct parser_table*, char *argv[], int *arg_ptr); static bool parse_xdev (const struct parser_table*, char *argv[], int *arg_ptr); @@ -79,7 +79,7 @@ Index: find/parser.c static bool parse_ignore_race (const struct parser_table*, char *argv[], int *arg_ptr); static bool parse_noignore_race (const struct parser_table*, char *argv[], int *arg_ptr); static bool parse_warn (const struct parser_table*, char *argv[], int *arg_ptr); -@@ -302,6 +303,7 @@ static struct parser_table const parse_t +@@ -304,6 +305,7 @@ static struct parser_table const parse_t PARSE_TEST_NP ("wholename", wholename), /* GNU, replaced -path, but now -path is standardized since POSIX 2008 */ {ARG_TEST, "writable", parse_accesscheck, pred_writable}, /* GNU, 4.3.0+ */ PARSE_OPTION ("xdev", xdev), /* POSIX */ @@ -87,7 +87,7 @@ Index: find/parser.c PARSE_TEST ("xtype", xtype), /* GNU */ #ifdef UNIMPLEMENTED_UNIX /* It's pretty ugly for find to know about archive formats. -@@ -2595,6 +2597,16 @@ parse_xdev (const struct parser_table* e +@@ -2608,6 +2610,16 @@ parse_xdev (const struct parser_table* e } static bool @@ -108,16 +108,17 @@ Index: find/util.c =================================================================== --- find/util.c.orig +++ find/util.c -@@ -181,7 +181,7 @@ operators (decreasing precedence; -and i - positional options (always true): -daystart -follow -regextype\n\n\ - normal options (always true, specified before other expressions):\n\ - -depth --help -maxdepth LEVELS -mindepth LEVELS -mount -noleaf\n\ -- --version -xdev -ignore_readdir_race -noignore_readdir_race\n")); -+ --version -xdev -xautofs -ignore_readdir_race -noignore_readdir_race\n")); - HTL (_("\ - tests (N can be +N or -N or N): -amin N -anewer FILE -atime N -cmin N\n\ - -cnewer FILE -ctime N -empty -false -fstype TYPE -gid N -group NAME\n\ -@@ -1044,6 +1044,7 @@ set_option_defaults (struct options *p) +@@ -183,7 +183,8 @@ Positional options (always true):\n\ + HTL (_("\n\ + Normal options (always true, specified before other expressions):\n\ + -depth -files0-from FILE -maxdepth LEVELS -mindepth LEVELS\n\ +- -mount -noleaf -xdev -ignore_readdir_race -noignore_readdir_race\n")); ++ -mount -noleaf -xdev -ignore_readdir_race -noignore_readdir_race\n\ ++ -xautofs\n")); + HTL (_("\n\ + Tests (N can be +N or -N or N):\n\ + -amin N -anewer FILE -atime N -cmin N -cnewer FILE -context CONTEXT\n\ +@@ -1028,6 +1029,7 @@ set_option_defaults (struct options *p) p->full_days = false; p->stay_on_filesystem = false; diff --git a/findutils.changes b/findutils.changes index 8348384..a8d8e77 100644 --- a/findutils.changes +++ b/findutils.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Feb 2 01:07:20 UTC 2022 - Bernhard Voelker + +- Update to 4.9.0. + Announcement: https://savannah.gnu.org/forum/forum.php?forum_id=10108 +- gnulib-port-year2038-to-glibc-2.34.patch: Remove now-upstream patch. +- findutils.spec: Update version and remove above patch. +- findutils-xautofs.patch: Refresh. + ------------------------------------------------------------------- Mon Oct 4 23:23:36 UTC 2021 - Bernhard Voelker diff --git a/findutils.spec b/findutils.spec index 8f4c8f6..a125fe9 100644 --- a/findutils.spec +++ b/findutils.spec @@ -1,7 +1,7 @@ # # spec file for package findutils # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: findutils -Version: 4.8.0 +Version: 4.9.0 Release: 0 Summary: The GNU versions of find utilities (find and xargs) License: GPL-3.0-or-later @@ -42,9 +42,6 @@ Source2: https://savannah.gnu.org/project/release-gpgkeys.php?group=%{nam # adds a new option -xautofs to find to not descend into directories on autofs file systems Patch0: findutils-xautofs.patch -# Upstream gnulib patch to avoid i586 build failure with glibc-2.34; remove with findutils>4.8.0. -# Requires installed automake and running 'autoreconf -fi' below. -Patch100: gnulib-port-year2038-to-glibc-2.34.patch BuildRequires: automake # BuildRequire dejagnu for 'runtest' to execute all tests. @@ -70,12 +67,8 @@ useful for finding things on your system. %prep %setup -q %patch0 -%patch100 %build -# Patch100 requires to refresh 'configure'; remove with findutils>4.8.0. -AUTOPOINT=true autoreconf -fi - %if 0%{?qemu_user_space_build} # this is a workaround for a qemu-user bug, we hit. A qemu patch is being discussed, but for now ... export DEFAULT_ARG_SIZE="(31u * 1024u)" diff --git a/gnulib-port-year2038-to-glibc-2.34.patch b/gnulib-port-year2038-to-glibc-2.34.patch deleted file mode 100644 index 4cdd25c..0000000 --- a/gnulib-port-year2038-to-glibc-2.34.patch +++ /dev/null @@ -1,241 +0,0 @@ -Upstream gnulib patches regarding the 'year2038' module. - -Port the gnulib module year2038 to glibc-2.34. - -Avoid the following build error regarding 64-bit time_t on i586 with glibc-2.34: - -[ 166s] checking for 64-bit time_t... no -[ 166s] configure: error: in `/home/abuild/rpmbuild/BUILD/findutils-4.8.0': -[ 166s] configure: error: This package requires a 64-bit 'time_t' type, which your system appears to support. You might try configuring with 'CPPFLAGS="-m64" LDFLAGS="-m64"'. To build with a 32-bit time_t anyway (not recommended), configure with 'TIME_T_32_BIT_OK=yes'. - -This patch squashes the M4 changes (no doc etc.) of the following upstream -gnulib commits related to the 'year2038' module: - -* https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=dc09dc088848 -* https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=7dd2562058aa -* https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=784f55e5c59a -* https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=7c6538cf0584 -* https://git.sv.gnu.org/cgit/gnulib.git/commit/?id=edb4fbdc9596 - -This patch changes m4 files in gnulib and therefore requires -'autoreconf -fi' to be run. ---- - gl/m4/largefile.m4 | 28 ++- - gl/m4/year2038.m4 | 106 +++++++++++--- - 4 files changed, 440 insertions(+), 76 deletions(-) - -Index: gl/m4/year2038.m4 -=================================================================== ---- gl/m4/year2038.m4.orig -+++ gl/m4/year2038.m4 -@@ -1,11 +1,11 @@ --# year2038.m4 serial 3 -+# year2038.m4 serial 7 - dnl Copyright (C) 2017-2021 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, - dnl with or without modifications, as long as this notice is preserved. - --dnl Attempt to ensure that 'time_t' is a 64-bit type --dnl and that the functions time(), stat(), etc. return 64-bit times. -+dnl Attempt to ensure that 'time_t' can go past the year 2038 and that -+dnl the functions 'time', 'stat', etc. work with post-2038 timestamps. - - AC_DEFUN([gl_YEAR2038_EARLY], - [ -@@ -18,13 +18,31 @@ AC_DEFUN([gl_YEAR2038_EARLY], - esac - ]) - --AC_DEFUN([gl_YEAR2038], -+# gl_YEAR2038_TEST_INCLUDES -+# ------------------------- -+AC_DEFUN([gl_YEAR2038_TEST_INCLUDES], -+[[ -+ #include -+ /* Check that time_t can represent 2**32 - 1 correctly. */ -+ #define LARGE_TIME_T \\ -+ ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30))) -+ int verify_time_t_range[(LARGE_TIME_T / 65537 == 65535 -+ && LARGE_TIME_T % 65537 == 0) -+ ? 1 : -1]; -+]]) -+ -+# gl_YEAR2038_BODY(REQUIRE-YEAR2038-SAFE) -+----------------------------------------- -+AC_DEFUN([gl_YEAR2038_BODY], - [ -+ AC_ARG_ENABLE([year2038], -+ [ --disable-year2038 omit support for timestamps past the year 2038]) -+ AS_IF([test "$enable_year2038" != no], -+ [ - dnl On many systems, time_t is already a 64-bit type. - dnl On those systems where time_t is still 32-bit, it requires kernel -- dnl and libc support to make it 64-bit. For glibc on Linux/x86, this -- dnl is work in progress; see -- dnl . -+ dnl and libc support to make it 64-bit. For glibc 2.34 and later on Linux, -+ dnl defining _TIME_BITS=64 and _FILE_OFFSET_BITS=64 is needed on x86 and ARM. - dnl - dnl On native Windows, the system include files define types __time32_t - dnl and __time64_t. By default, time_t is an alias of -@@ -34,16 +52,31 @@ AC_DEFUN([gl_YEAR2038], - dnl alias of __time64_t. - dnl And when compiling with -D_USE_32BIT_TIME_T, time_t is an alias of - dnl __time32_t. -- AC_CACHE_CHECK([for 64-bit time_t], [gl_cv_type_time_t_64], -+ AC_CACHE_CHECK([for time_t past the year 2038], [gl_cv_type_time_t_y2038], - [AC_COMPILE_IFELSE( -- [AC_LANG_PROGRAM( -- [[#include -- int verify_time_t_size[sizeof (time_t) >= 8 ? 1 : -1]; -- ]], -- [[]])], -- [gl_cv_type_time_t_64=yes], [gl_cv_type_time_t_64=no]) -+ [AC_LANG_SOURCE([gl_YEAR2038_TEST_INCLUDES])], -+ [gl_cv_type_time_t_y2038=yes], [gl_cv_type_time_t_y2038=no]) - ]) -- if test $gl_cv_type_time_t_64 = no; then -+ if test "$gl_cv_type_time_t_y2038" = no; then -+ AC_CACHE_CHECK([for 64-bit time_t with _TIME_BITS=64], -+ [gl_cv_type_time_t_bits_macro], -+ [AC_COMPILE_IFELSE( -+ [AC_LANG_SOURCE([[#define _TIME_BITS 64 -+ #define _FILE_OFFSET_BITS 64 -+ ]gl_YEAR2038_TEST_INCLUDES])], -+ [gl_cv_type_time_t_bits_macro=yes], -+ [gl_cv_type_time_t_bits_macro=no]) -+ ]) -+ if test "$gl_cv_type_time_t_bits_macro" = yes; then -+ AC_DEFINE([_TIME_BITS], [64], -+ [Number of bits in a timestamp, on hosts where this is settable.]) -+ dnl AC_SYS_LARGFILE also defines this; it's OK if we do too. -+ AC_DEFINE([_FILE_OFFSET_BITS], [64], -+ [Number of bits in a file offset, on hosts where this is settable.]) -+ gl_cv_type_time_t_y2038=yes -+ fi -+ fi -+ if test $gl_cv_type_time_t_y2038 = no; then - AC_COMPILE_IFELSE( - [AC_LANG_SOURCE( - [[#ifdef _USE_32BIT_TIME_T -@@ -52,19 +85,40 @@ AC_DEFUN([gl_YEAR2038], - error fail - #endif - ]])], -- [AC_MSG_FAILURE([This package requires a 64-bit 'time_t' type. Remove _USE_32BIT_TIME_T from the compiler flags.])], -- [# If TIME_T_32_BIT_OK is "no" (the default) and not cross-compiling -- # and 'touch' works with a large timestamp, then evidently 64-bit time_t -+ [AC_MSG_FAILURE( -+ [The 'time_t' type stops working after January 2038. -+ Remove _USE_32BIT_TIME_T from the compiler flags.])], -+ [# If not cross-compiling and $1 says we should check, -+ # and 'touch' works with a large timestamp, then evidently wider time_t - # is desired and supported, so fail and ask the builder to fix the - # problem. Otherwise, just warn the builder. -- if test "${TIME_T_32_BIT_OK-no}" = no \ -- && test $cross_compiling = no \ -- && TZ=UTC0 touch -t 210602070628.16 conftest.time 2>/dev/null; then -- rm -f conftest.time -- AC_MSG_FAILURE([This package requires a 64-bit 'time_t' type, which your system appears to support. You might try configuring with 'CPPFLAGS="-m64" LDFLAGS="-m64"'. To build with a 32-bit time_t anyway (not recommended), configure with 'TIME_T_32_BIT_OK=yes'.]) -- else -- AC_MSG_WARN([This package requires a 64-bit 'time_t' type if there is any way to access timestamps outside the year range 1901-2038 on your platform. Perhaps you should configure with 'CPPFLAGS="-m64" LDFLAGS="-m64"'?]) -+ m4_ifval([$1], -+ [if test $cross_compiling = no \ -+ && TZ=UTC0 touch -t 210602070628.15 conftest.time 2>/dev/null; then -+ case `TZ=UTC0 LC_ALL=C ls -l conftest.time 2>/dev/null` in -+ *'Feb 7 2106'* | *'Feb 7 17:10'*) -+ AC_MSG_FAILURE( -+ [The 'time_t' type stops working after January 2038, -+ and your system appears to support a wider 'time_t'. -+ Try configuring with 'CC="${CC} -m64"'. -+ To build with a 32-bit time_t anyway (not recommended), -+ configure with '--disable-year2038'.]);; -+ esac -+ rm -f conftest.time -+ fi]) -+ if test "$gl_warned_about_y2038" != yes; then -+ AC_MSG_WARN( -+ [The 'time_t' type stops working after January 2038, -+ and this package needs a wider 'time_t' type -+ if there is any way to access timestamps after that. -+ Configure with 'CC="${CC} -m64"' perhaps?]) -+ gl_warned_about_y2038=yes - fi - ]) -- fi -+ fi]) -+]) -+ -+AC_DEFUN([gl_YEAR2038], -+[ -+ gl_YEAR2038_BODY([require-year2038-safe]) - ]) -Index: gl/m4/largefile.m4 -=================================================================== ---- gl/m4/largefile.m4.orig -+++ gl/m4/largefile.m4 -@@ -22,7 +22,8 @@ AC_DEFUN([gl_SET_LARGEFILE_SOURCE], - esac - ]) - --# The following implementation works around a problem in autoconf <= 2.69; -+# Work around a problem in Autoconf through at least 2.71 on glibc 2.34+ -+# with _TIME_BITS. Also, work around a problem in autoconf <= 2.69: - # AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5, - # or configures them incorrectly in some cases. - m4_version_prereq([2.70], [], [ -@@ -40,6 +41,7 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUD - && LARGE_OFF_T % 2147483647 == 1) - ? 1 : -1]];[]dnl - ]) -+])# m4_version_prereq 2.70 - - - # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, -@@ -54,7 +56,8 @@ m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE - [AC_LANG_PROGRAM([$5], [$6])], - [$3=no; break]) - m4_ifval([$6], [AC_LINK_IFELSE], [AC_COMPILE_IFELSE])( -- [AC_LANG_PROGRAM([#define $1 $2 -+ [AC_LANG_PROGRAM([#undef $1 -+#define $1 $2 - $5], [$6])], - [$3=$2; break]) - $3=unknown -@@ -80,9 +83,8 @@ rm -rf conftest*[]dnl - AC_DEFUN([AC_SYS_LARGEFILE], - [AC_ARG_ENABLE(largefile, - [ --disable-largefile omit support for large files]) --if test "$enable_largefile" != no; then -- -- AC_CACHE_CHECK([for special C compiler options needed for large files], -+AS_IF([test "$enable_largefile" != no], -+ [AC_CACHE_CHECK([for special C compiler options needed for large files], - ac_cv_sys_largefile_CC, - [ac_cv_sys_largefile_CC=no - if test "$GCC" != yes; then -@@ -107,15 +109,15 @@ if test "$enable_largefile" != no; then - ac_cv_sys_file_offset_bits, - [Number of bits in a file offset, on hosts where this is settable.], - [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- if test $ac_cv_sys_file_offset_bits = unknown; then -- _AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1, -- ac_cv_sys_large_files, -- [Define for large files, on AIX-style hosts.], -- [_AC_SYS_LARGEFILE_TEST_INCLUDES]) -- fi --fi -+ AS_CASE([$ac_cv_sys_file_offset_bits], -+ [unknown], -+ [_AC_SYS_LARGEFILE_MACRO_VALUE([_LARGE_FILES], [1], -+ [ac_cv_sys_large_files], -+ [Define for large files, on AIX-style hosts.], -+ [_AC_SYS_LARGEFILE_TEST_INCLUDES])], -+ [64], -+ [gl_YEAR2038_BODY([])])]) - ])# AC_SYS_LARGEFILE --])# m4_version_prereq 2.70 - - # Enable large files on systems where this is implemented by Gnulib, not by the - # system headers.