From 01e7fbb65c642597d952d43f023a86667ec44d1f Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Mon, 24 Apr 2023 08:01:04 +0200 Subject: [PATCH] findutils, enable 32bit, cleanup (#8495) --- sys-apps/findutils/findutils-4.4.2.recipe | 62 -------- sys-apps/findutils/findutils-4.6.0.recipe | 77 --------- sys-apps/findutils/findutils-4.9.0.recipe | 62 +++++--- .../findutils/patches/findutils-4.4.0.patch | 49 ------ .../patches/findutils-4.6.0.patchset | 147 ------------------ sys-apps/findutils/patches/parser-haiku.diff | 18 --- 6 files changed, 37 insertions(+), 378 deletions(-) delete mode 100644 sys-apps/findutils/findutils-4.4.2.recipe delete mode 100644 sys-apps/findutils/findutils-4.6.0.recipe delete mode 100644 sys-apps/findutils/patches/findutils-4.4.0.patch delete mode 100644 sys-apps/findutils/patches/findutils-4.6.0.patchset delete mode 100644 sys-apps/findutils/patches/parser-haiku.diff diff --git a/sys-apps/findutils/findutils-4.4.2.recipe b/sys-apps/findutils/findutils-4.4.2.recipe deleted file mode 100644 index cc47b7716..000000000 --- a/sys-apps/findutils/findutils-4.4.2.recipe +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY="Basic directory searching utilities" -DESCRIPTION=" -GNU Findutils are typically used in conjunction with other programs to \ -provide modular and powerful directory search and file locating \ -capabilities to other commands. -The tools supplied with this package are: -- find - search for files in a directory hierarchy -- locate - list files in databases that match a pattern -- updatedb - update a file name database -- xargs - build and execute command lines from a standard input. -" -HOMEPAGE="http://www.gnu.org/software/findutils" -COPYRIGHT="1994-2011 Free Software Foundation, Inc." -LICENSE="GNU GPL v3" -REVISION="5" -SOURCE_URI="http://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz" -CHECKSUM_SHA256="434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a" - -ARCHITECTURES="all" - -PROVIDES=" - findutils = $portVersion compat >= 4 - cmd:find = $portVersion compat >= 4 - cmd:locate = $portVersion compat >= 4 - cmd:oldfind = $portVersion compat >= 4 - cmd:updatedb = $portVersion compat >= 4 - cmd:xargs = $portVersion compat >= 4 - " -REQUIRES=" - haiku - cmd:awk - cmd:sed - cmd:sort - cmd:tr - " - -BUILD_PREREQUIRES=" - haiku_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - cmd:sed - " - -defineDebugInfoPackage findutils \ - $binDir/find \ - $binDir/locate \ - $binDir/xargs - -BUILD() -{ - runConfigure ./configure \ - --without-included-regex \ - --disable-rpath --with-gnu-ld - make $jobArgs -} - -INSTALL() -{ - make install - rm $libDir/charset.alias -} diff --git a/sys-apps/findutils/findutils-4.6.0.recipe b/sys-apps/findutils/findutils-4.6.0.recipe deleted file mode 100644 index dc1570341..000000000 --- a/sys-apps/findutils/findutils-4.6.0.recipe +++ /dev/null @@ -1,77 +0,0 @@ -SUMMARY="Basic directory searching utilities" -DESCRIPTION=" -GNU Findutils are typically used in conjunction with other programs to \ -provide modular and powerful directory search and file locating \ -capabilities to other commands. -The tools supplied with this package are: -- find - search for files in a directory hierarchy -- locate - list files in databases that match a pattern -- updatedb - update a file name database -- xargs - build and execute command lines from a standard input. -" -HOMEPAGE="http://www.gnu.org/software/findutils" -COPYRIGHT="1994-2015 Free Software Foundation, Inc." -LICENSE="GNU GPL v3" -REVISION="1" -SOURCE_URI="http://ftp.gnu.org/gnu/findutils/findutils-$portVersion.tar.gz" -CHECKSUM_SHA256="ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d" -PATCHES="findutils-$portVersion.patchset" - -ARCHITECTURES="all" - -PROVIDES=" - findutils = $portVersion compat >= 4 - cmd:find = $portVersion compat >= 4 - cmd:locate = $portVersion compat >= 4 - cmd:oldfind = $portVersion compat >= 4 - cmd:updatedb = $portVersion compat >= 4 - cmd:xargs = $portVersion compat >= 4 - " -REQUIRES=" - haiku - lib:libiconv - lib:libintl - " - -BUILD_REQUIRES=" - haiku_devel - devel:libiconv - devel:libintl - " -BUILD_PREREQUIRES=" - cmd:aclocal - cmd:autoconf - cmd:awk - cmd:find - cmd:gcc - cmd:ld - cmd:make - cmd:python - cmd:sed - " - -defineDebugInfoPackage findutils \ - $binDir/find \ - $binDir/locate \ - $binDir/xargs - -BUILD() -{ - autoreconf -vfi - runConfigure ./configure \ - --libexecdir=$libDir/findutils \ - --without-included-regex \ - --disable-rpath --with-gnu-ld - make $jobArgs -} - -INSTALL() -{ - make install - rm $libDir/charset.alias -} - -TEST() -{ - make check -} diff --git a/sys-apps/findutils/findutils-4.9.0.recipe b/sys-apps/findutils/findutils-4.9.0.recipe index 2e4683760..dab151d76 100644 --- a/sys-apps/findutils/findutils-4.9.0.recipe +++ b/sys-apps/findutils/findutils-4.9.0.recipe @@ -1,64 +1,76 @@ SUMMARY="Basic directory searching utilities" -DESCRIPTION=" -GNU Findutils are typically used in conjunction with other programs to \ +DESCRIPTION="GNU Findutils are typically used in conjunction with other programs to \ provide modular and powerful directory search and file locating \ capabilities to other commands. The tools supplied with this package are: - find - search for files in a directory hierarchy - locate - list files in databases that match a pattern - updatedb - update a file name database -- xargs - build and execute command lines from a standard input. -" +- xargs - build and execute command lines from a standard input." HOMEPAGE="http://www.gnu.org/software/findutils" COPYRIGHT="1994-2015 Free Software Foundation, Inc." LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="https://ftp.gnu.org/gnu/findutils/findutils-$portVersion.tar.xz" CHECKSUM_SHA256="a2bfb8c09d436770edc59f50fa483e785b161a3b7b9d547573cb08065fd462fe" PATCHES="findutils-$portVersion.patchset" -ARCHITECTURES="all ?x86_gcc2" +ARCHITECTURES="all !x86_gcc2" +SECONDARY_ARCHITECTURES="x86" + +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ]; then + commandSuffix= + commandBinDir=$prefix/bin +fi PROVIDES=" - findutils = $portVersion compat >= 4 - cmd:find = $portVersion compat >= 4 - cmd:locate = $portVersion compat >= 4 - cmd:oldfind = $portVersion compat >= 4 - cmd:updatedb = $portVersion compat >= 4 - cmd:xargs = $portVersion compat >= 4 + findutils$secondaryArchSuffix = $portVersion compat >= 4 + cmd:find$commandSuffix = $portVersion compat >= 4 + cmd:locate$commandSuffix = $portVersion compat >= 4 + cmd:oldfind$commandSuffix = $portVersion compat >= 4 + cmd:updatedb$commandSuffix = $portVersion compat >= 4 + cmd:xargs$commandSuffix = $portVersion compat >= 4 " REQUIRES=" - haiku - lib:libiconv - lib:libintl + haiku$secondaryArchSuffix + lib:libiconv$secondaryArchSuffix + lib:libintl$secondaryArchSuffix " +if [ "$targetArchitecture" = x86_gcc2 ]; then + REPLACES=" + findutils + " +fi BUILD_REQUIRES=" - haiku_devel - devel:libiconv - devel:libintl + haiku${secondaryArchSuffix}_devel + devel:libiconv$secondaryArchSuffix + devel:libintl$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf cmd:awk cmd:find - cmd:gcc + cmd:gcc$secondaryArchSuffix cmd:ld cmd:make - cmd:python + cmd:python3 cmd:sed " -defineDebugInfoPackage findutils \ - $binDir/find \ - $binDir/locate \ - $binDir/xargs +defineDebugInfoPackage findutils$secondaryArchSuffix \ + $commandBinDir/find \ + $commandBinDir/locate \ + $commandBinDir/xargs BUILD() { autoreconf -vfi - MAKEINFO=: runConfigure ./configure \ + MAKEINFO=: runConfigure --omit-dirs binDir ./configure \ + --bindir=$commandBinDir \ --libexecdir=$libDir/findutils \ --without-included-regex \ --disable-rpath --with-gnu-ld diff --git a/sys-apps/findutils/patches/findutils-4.4.0.patch b/sys-apps/findutils/patches/findutils-4.4.0.patch deleted file mode 100644 index 3b2b0fba2..000000000 --- a/sys-apps/findutils/patches/findutils-4.4.0.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -urN findutils-4.4.0/find/parser.c findutils-4.4.0-haiku/find/parser.c ---- findutils-4.4.0/find/parser.c 2008-11-30 02:34:06.000000000 +0000 -+++ findutils-4.4.0-haiku/find/parser.c 2008-11-30 02:30:02.000000000 +0000 -@@ -1385,8 +1385,8 @@ - if (collect_arg(argv, arg_ptr, &minutes)) - { - struct time_val tval; -- tval.xval = xv; - struct timespec origin = options.cur_day_start; -+ tval.xval = xv; - origin.tv_sec += DAYSECS; - if (get_relative_timestamp(minutes, &tval, origin, 60, - "arithmetic overflow while converting %s " -diff -urN findutils-4.4.0/gnulib/lib/fpurge.c findutils-4.4.0-haiku/gnulib/lib/fpurge.c ---- findutils-4.4.0/gnulib/lib/fpurge.c 2008-11-30 02:33:58.000000000 +0000 -+++ findutils-4.4.0-haiku/gnulib/lib/fpurge.c 2008-11-30 02:45:47.000000000 +0000 -@@ -59,7 +59,7 @@ - /* Most systems provide FILE as a struct and the necessary bitmask in - , because they need it for implementing getc() and putc() as - fast macros. */ --# if defined _IO_ferror_unlocked /* GNU libc, BeOS */ -+# if defined _IO_ftrylockfile /* GNU libc, BeOS */ - fp->_IO_read_end = fp->_IO_read_ptr; - fp->_IO_write_ptr = fp->_IO_write_base; - /* Avoid memory leak when there is an active ungetc buffer. */ -diff -urN findutils-4.4.0/gnulib/lib/freadahead.c findutils-4.4.0-haiku/gnulib/lib/freadahead.c ---- findutils-4.4.0/gnulib/lib/freadahead.c 2008-11-30 02:33:58.000000000 +0000 -+++ findutils-4.4.0-haiku/gnulib/lib/freadahead.c 2008-11-30 03:08:04.000000000 +0000 -@@ -22,7 +22,7 @@ - size_t - freadahead (FILE *fp) - { --#if defined _IO_ferror_unlocked /* GNU libc, BeOS */ -+#if defined _IO_ftrylockfile /* GNU libc, BeOS */ - if (fp->_IO_write_ptr > fp->_IO_write_base) - return 0; - return fp->_IO_read_end - fp->_IO_read_ptr; -diff -urN findutils-4.4.0/tests/binary-io.h findutils-4.4.0-haiku/tests/binary-io.h ---- findutils-4.4.0/tests/binary-io.h 2008-11-30 02:34:03.000000000 +0000 -+++ findutils-4.4.0-haiku/tests/binary-io.h 2008-11-30 02:32:51.000000000 +0000 -@@ -30,7 +30,7 @@ - # define O_BINARY _O_BINARY - # define O_TEXT _O_TEXT - #endif --#ifdef __BEOS__ -+#if defined __BEOS__ || defined __HAIKU__ - /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ - # undef O_BINARY - # undef O_TEXT diff --git a/sys-apps/findutils/patches/findutils-4.6.0.patchset b/sys-apps/findutils/patches/findutils-4.6.0.patchset deleted file mode 100644 index 47056ff7d..000000000 --- a/sys-apps/findutils/patches/findutils-4.6.0.patchset +++ /dev/null @@ -1,147 +0,0 @@ -From 04f664a592137bccf67f39de12e655f950dea491 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sat, 2 Sep 2017 13:29:15 +0200 -Subject: fix gcc2 parse errors - - -diff --git a/tests/test-quotearg-simple.c b/tests/test-quotearg-simple.c -index 516e890..971ccef 100644 ---- a/tests/test-quotearg-simple.c -+++ b/tests/test-quotearg-simple.c -@@ -337,19 +337,23 @@ main (int argc _GL_UNUSED, char *argv[]) - /* Z points to the boundary between a readable/writable page - and one that is neither readable nor writable. Position - our string so its NUL is at the end of the writable one. */ -- char const *str = "____"; -- size_t s_len = strlen (str); -- z -= s_len + 1; -- memcpy (z, str, s_len + 1); -- -- set_custom_quoting (NULL, q, q); -- /* Whether this actually triggers a SEGV depends on the -- implementation of memcmp: whether it compares only byte-at- -- a-time, and from left to right (no SEGV) or some other way. */ -- size_t n = quotearg_buffer (buf, sizeof buf, z, SIZE_MAX, NULL); -- ASSERT (n == s_len + 2 * q_len); -- ASSERT (memcmp (buf, q, sizeof buf) == 0); -- free (q); -+ { -+ char const *str = "____"; -+ size_t s_len = strlen (str); -+ z -= s_len + 1; -+ memcpy (z, str, s_len + 1); -+ -+ set_custom_quoting (NULL, q, q); -+ /* Whether this actually triggers a SEGV depends on the -+ implementation of memcmp: whether it compares only byte-at- -+ a-time, and from left to right (no SEGV) or some other way. */ -+ { -+ size_t n = quotearg_buffer (buf, sizeof buf, z, SIZE_MAX, NULL); -+ ASSERT (n == s_len + 2 * q_len); -+ ASSERT (memcmp (buf, q, sizeof buf) == 0); -+ free (q); -+ } -+ } - } - } - -diff --git a/xargs/xargs.c b/xargs/xargs.c -index 1116cfe..5100633 100644 ---- a/xargs/xargs.c -+++ b/xargs/xargs.c -@@ -1183,26 +1183,28 @@ prep_child_for_exec (void) - - We use 0 here in order to avoid generating a data structure that appears - to indicate that we (the child) have a child. */ -- unsigned int slot = add_proc (0); -- set_slot_var (slot); -+ { -+ unsigned int slot = add_proc (0); -+ set_slot_var (slot); - -- if (!keep_stdin) -- { -- const char inputfile[] = "/dev/null"; -- /* fprintf (stderr, "attaching stdin to /dev/null\n"); */ -+ if (!keep_stdin) -+ { -+ const char inputfile[] = "/dev/null"; -+ /* fprintf (stderr, "attaching stdin to /dev/null\n"); */ - -- close (0); -- if (open (inputfile, O_RDONLY) < 0) -- { -- /* This is not entirely fatal, since -- * executing the child with a closed -- * stdin is almost as good as executing it -- * with its stdin attached to /dev/null. -- */ -- error (0, errno, "%s", -- quotearg_n_style (0, locale_quoting_style, inputfile)); -- } -- } -+ close (0); -+ if (open (inputfile, O_RDONLY) < 0) -+ { -+ /* This is not entirely fatal, since -+ * executing the child with a closed -+ * stdin is almost as good as executing it -+ * with its stdin attached to /dev/null. -+ */ -+ error (0, errno, "%s", -+ quotearg_n_style (0, locale_quoting_style, inputfile)); -+ } -+ } -+ } - } - - --- -2.7.0 - - -From f6bd0ec6d6c51cd2d45b9f531504cd2acb9a82ff Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sat, 2 Sep 2017 13:30:14 +0200 -Subject: fix check needed for inet_pton - - -diff --git a/configure.ac b/configure.ac -index 876d981..ab1a600 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -149,6 +149,8 @@ AC_HEADER_DIRENT - AC_HEADER_STAT - AC_HEADER_SYS_WAIT - -+dnl Check for -lsocket -lnetwork inet -+AC_SEARCH_LIBS([socket],[socket inet network]) - - dnl Checks for typedefs, structures, and compiler characteristics. - --- -2.7.0 - - -From 886cc62f8bc82305a675529bd0a5a423f6a64382 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sat, 2 Sep 2017 14:01:27 +0200 -Subject: fix ioctl conflict error - - -diff --git a/tests/sys_ioctl.in.h b/tests/sys_ioctl.in.h -index d3758ac..649acbf 100644 ---- a/tests/sys_ioctl.in.h -+++ b/tests/sys_ioctl.in.h -@@ -56,7 +56,7 @@ _GL_CXXALIAS_RPL (ioctl, int, - # else - # if @SYS_IOCTL_H_HAVE_WINSOCK2_H@ || 1 - _GL_FUNCDECL_SYS (ioctl, int, -- (int fd, int request, ... /* {void *,char *} arg */)); -+ (int fd, unsigned long request, ... /* {void *,char *} arg */)); - # endif - _GL_CXXALIAS_SYS (ioctl, int, - (int fd, int request, ... /* {void *,char *} arg */)); --- -2.7.0 - diff --git a/sys-apps/findutils/patches/parser-haiku.diff b/sys-apps/findutils/patches/parser-haiku.diff deleted file mode 100644 index 820b8ab4a..000000000 --- a/sys-apps/findutils/patches/parser-haiku.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- parser.c 2008-03-10 02:37:21.000000000 -0700 -+++ parser-haiku.c 2008-08-29 07:56:04.000000000 -0700 -@@ -1381,12 +1381,13 @@ - enum xval xv) - { - const char *minutes; -+ struct timespec origin; -+ struct time_val tval; - - if (collect_arg(argv, arg_ptr, &minutes)) - { -- struct time_val tval; - tval.xval = xv; -- struct timespec origin = options.cur_day_start; -+ origin = options.cur_day_start; - origin.tv_sec += DAYSECS; - if (get_relative_timestamp(minutes, &tval, origin, 60, - "arithmetic overflow while converting %s "