Re: [PR PATCH] [Updated] findutils: update to 4.7.0.

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 360 bytes --]

There is an updated pull request by pbui against master on the void-packages repository

https://github.com/pbui/void-packages findutils
https://github.com/void-linux/void-packages/pull/14799

findutils: update to 4.7.0.
- Drop unnecessary patches (changes upstreamed)

A patch file from https://github.com/void-linux/void-packages/pull/14799.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-findutils-14799.patch --]
[-- Type: text/x-diff, Size: 5129 bytes --]

From 4aa57548f345fe07455d80a84d3b86bcd2de41db Mon Sep 17 00:00:00 2001
From: Peter Bui <pbui@github.bx612.space>
Date: Sat, 28 Sep 2019 12:55:06 -0400
Subject: [PATCH] findutils: update to 4.7.0.

- Drop unnecessary patches (changes upstreamed)
- Fix xlint issues
---
 .../findutils/patches/gnulib-freadahead.patch | 11 ----------
 srcpkgs/findutils/patches/gnulib-fseeko.patch | 21 -------------------
 .../findutils/patches/gnulib-mountlist.patch  | 15 -------------
 .../findutils/patches/gnulib-stdio-impl.patch | 14 -------------
 srcpkgs/findutils/template                    | 12 +++++------
 5 files changed, 6 insertions(+), 67 deletions(-)
 delete mode 100644 srcpkgs/findutils/patches/gnulib-freadahead.patch
 delete mode 100644 srcpkgs/findutils/patches/gnulib-fseeko.patch
 delete mode 100644 srcpkgs/findutils/patches/gnulib-mountlist.patch
 delete mode 100644 srcpkgs/findutils/patches/gnulib-stdio-impl.patch

diff --git a/srcpkgs/findutils/patches/gnulib-freadahead.patch b/srcpkgs/findutils/patches/gnulib-freadahead.patch
deleted file mode 100644
index 5d8e5af28bf..00000000000
--- a/srcpkgs/findutils/patches/gnulib-freadahead.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gl/lib/freadahead.c
-+++ gl/lib/freadahead.c
-@@ -30,7 +30,7 @@ extern size_t __sreadahead (FILE *);
- size_t
- freadahead (FILE *fp)
- {
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_write_ptr > fp->_IO_write_base)
-     return 0;
-   return (fp->_IO_read_end - fp->_IO_read_ptr)
diff --git a/srcpkgs/findutils/patches/gnulib-fseeko.patch b/srcpkgs/findutils/patches/gnulib-fseeko.patch
deleted file mode 100644
index 6d4c75ac737..00000000000
--- a/srcpkgs/findutils/patches/gnulib-fseeko.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gl/lib/fseeko.c
-+++ gl/lib/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
-
diff --git a/srcpkgs/findutils/patches/gnulib-mountlist.patch b/srcpkgs/findutils/patches/gnulib-mountlist.patch
deleted file mode 100644
index bb58385a69a..00000000000
--- a/srcpkgs/findutils/patches/gnulib-mountlist.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gl/lib/mountlist.c
-+++ gl/lib/mountlist.c
-@@ -37,6 +37,12 @@
- # include <sys/param.h>
- #endif
- 
-+#if MAJOR_IN_MKDEV
-+# include <sys/mkdev.h>
-+#elif MAJOR_IN_SYSMACROS
-+# include <sys/sysmacros.h>
-+#endif
-+
- #if defined MOUNTED_GETFSSTAT   /* OSF_1 and Darwin1.3.x */
- # if HAVE_SYS_UCRED_H
- #  include <grp.h> /* needed on OSF V4.0 for definition of NGROUPS,
diff --git a/srcpkgs/findutils/patches/gnulib-stdio-impl.patch b/srcpkgs/findutils/patches/gnulib-stdio-impl.patch
deleted file mode 100644
index e054879d577..00000000000
--- a/srcpkgs/findutils/patches/gnulib-stdio-impl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gl/lib/stdio-impl.h
-+++ gl/lib/stdio-impl.h
-@@ -18,6 +18,12 @@
-    the same implementation of stdio extension API, except that some fields
-    have different naming conventions, or their access requires some casts.  */
- 
-+/* Glibc 2.28 made _IO_IN_BACKUP private.  For now, work around this
-+   problem by defining it ourselves.  FIXME: Do not rely on glibc
-+   internals.  */
-+#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN
-+# define _IO_IN_BACKUP 0x100
-+#endif
- 
- /* BSD stdio derived implementations.  */
diff --git a/srcpkgs/findutils/template b/srcpkgs/findutils/template
index d2e6737291f..2155bdd80bd 100644
--- a/srcpkgs/findutils/template
+++ b/srcpkgs/findutils/template
@@ -1,16 +1,16 @@
 # Template file for 'findutils'
 pkgname=findutils
-version=4.6.0
-revision=4
+version=4.7.0
+revision=1
 bootstrap=yes
 build_style=gnu-configure
 configure_args="--program-prefix=g"
-short_desc="The GNU Find Utilities"
+short_desc="GNU Find Utilities"
 maintainer="Enno Boland <gottox@voidlinux.org>"
-license="GPL-3"
+license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/findutils"
-distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d
+distfiles="${GNU_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
+checksum=c5fefbdf9858f7e4feb86f036e1247a54c79fc2d8e4b7064d5aaa1f47dfa789a
 
 alternatives="
  xargs:xargs:/usr/bin/gxargs