vars/build.vars:coreutils: updated to v8.31 (via Redfoxmoon.)

vars/build.vars:coreutils_minipix:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --enable-single-binary=shebangs (via Redfoxmoon.)
patches/coreutils{,_minipix}-8.{29,31}.local.patch: via Redfoxmoon (cluck.)

4 files changed, 65 insertions, 10 deletions

diff --git a/patches/coreutils-8.29.local.patch b/patches/coreutils-8.31.local.patch
index f254d43d..45b861ee 100644
--- a/patches/coreutils-8.29.local.patch
+++ b/patches/coreutils-8.31.local.patch
@@ -42,16 +42,15 @@ diff -ru coreutils-8.27.orig/Makefile.in coreutils-8.27/Makefile.in
  info_TEXINFOS = doc/coreutils.texi
  doc_coreutils_TEXINFOS = \
    doc/perm.texi \
-diff -ru coreutils-8.27.orig/src/fs.h coreutils-8.27/src/fs.h
---- coreutils-8.27.orig/src/fs.h	2017-03-09 05:44:05.000000000 +0100
-+++ coreutils-8.27/src/fs.h	2017-08-11 19:05:05.283026746 +0200
+diff -ru coreutils-8.31.orig/src/fs.h coreutils-8.31/src/fs.h
+--- coreutils-8.31.orig/src/fs.h        2019-03-06 19:53:32.000000000 +0100
++++ coreutils-8.31/src/fs.h     2019-10-18 08:55:31.598366616 +0200
 @@ -2,7 +2,7 @@
     Please send additions to bug-coreutils@gnu.org and meskes@debian.org.
     This file is generated automatically from ./src/stat.c. */
- 
--#if defined __linux__
-+#if defined __linux__ || defined __midipix__
+
+-#if defined __linux__ || defined __ANDROID__
++#if defined __linux__ || defined __ANDROID__ || defined(__midipix__)
  # define S_MAGIC_AAFS 0x5A3C69F0
  # define S_MAGIC_ACFS 0x61636673
  # define S_MAGIC_ADFS 0xADF5
- # define S_MAGIC_AFFS 0xADFF
diff --git a/patches/coreutils_minipix-8.29.local.patch b/patches/coreutils_minipix-8.29.local.patch
deleted file mode 120000
index 1f90788e..00000000
--- a/patches/coreutils_minipix-8.29.local.patch
+++ /dev/null
@@ -1 +0,0 @@
-coreutils-8.29.local.patch
\ No newline at end of file
diff --git a/patches/coreutils_minipix-8.31.local.patch b/patches/coreutils_minipix-8.31.local.patch
new file mode 100644
index 00000000..45b861ee
--- /dev/null
+++ b/patches/coreutils_minipix-8.31.local.patch
@@ -0,0 +1,56 @@
+diff -ru coreutils-8.27.orig/configure coreutils-8.27/configure
+--- coreutils-8.27.orig/configure	2017-03-09 06:00:50.000000000 +0100
++++ coreutils-8.27/configure	2017-08-11 19:04:46.135115372 +0200
+@@ -68318,3 +68318,12 @@
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+ 
++# bypass dependency on help2man
++if [ x"$cross_compiling" = xyes ]; then
++	mkdir -p man;
++	for f in $srcdir/src/*.c; do src=$(basename $f); doc="${src%.*}"; echo $doc; touch man/$doc.1; done
++	for f in dir sha1sum sha224sum sha256sum sha384sum sha512sum vdir; do touch man/$f.1; done
++
++	sed -i -e 's/@cross_compiling@/'$cross_compiling'/g' Makefile || exit 2
++fi
++
+diff -ru coreutils-8.27.orig/Makefile.in coreutils-8.27/Makefile.in
+--- coreutils-8.27.orig/Makefile.in	2017-03-09 06:24:51.000000000 +0100
++++ coreutils-8.27/Makefile.in	2017-08-11 19:09:39.000000000 +0200
+@@ -3454,7 +3454,7 @@
+ INET_PTON_LIB = @INET_PTON_LIB@
+ INSTALL = $(cu_install_program) -c
+ INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_PROGRAM = install
+ INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
+@@ -5040,12 +5040,14 @@
+     $(bin_SCRIPTS) \
+     $(EXTRA_PROGRAMS)
+ 
++CROSS_COMPILE = @cross_compiling@
++
+ pm = progs-makefile
+ pr = progs-readme
+ @CROSS_COMPILING_FALSE@cu_install_program = src/ginstall
+ 
+ # Use the just-built 'ginstall', when not cross-compiling.
+-@CROSS_COMPILING_TRUE@cu_install_program = @INSTALL@
++@CROSS_COMPILING_TRUE@cu_install_program = install
+ info_TEXINFOS = doc/coreutils.texi
+ doc_coreutils_TEXINFOS = \
+   doc/perm.texi \
+diff -ru coreutils-8.31.orig/src/fs.h coreutils-8.31/src/fs.h
+--- coreutils-8.31.orig/src/fs.h        2019-03-06 19:53:32.000000000 +0100
++++ coreutils-8.31/src/fs.h     2019-10-18 08:55:31.598366616 +0200
+@@ -2,7 +2,7 @@
+    Please send additions to bug-coreutils@gnu.org and meskes@debian.org.
+    This file is generated automatically from ./src/stat.c. */
+
+-#if defined __linux__ || defined __ANDROID__
++#if defined __linux__ || defined __ANDROID__ || defined(__midipix__)
+ # define S_MAGIC_AAFS 0x5A3C69F0
+ # define S_MAGIC_ACFS 0x61636673
+ # define S_MAGIC_ADFS 0xADF5
diff --git a/vars/build.vars b/vars/build.vars
index 34fe9f0f..2b319350 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1272,8 +1272,8 @@ the_silver_searcher toilet tree terminally_tetris ubase which w3m zsh";
 : ${PKG_CALCURSE_VERSION:=4.4.0};
 : ${PKG_CALCURSE_URL:=https://www.calcurse.org/files/calcurse-${PKG_CALCURSE_VERSION}.tar.gz};
 : ${PKG_CALCURSE_ENV_VARS_EXTRA:="LIBS=-ltinfow"};
-: ${PKG_COREUTILS_SHA256SUM:=92d0fa1c311cacefa89853bdb53c62f4110cdfda3820346b59cbd098f40f955e};
-: ${PKG_COREUTILS_VERSION:=8.29};
+: ${PKG_COREUTILS_SHA256SUM:=ff7a9c918edce6b4f4b2725e3f9b37b0c4d193531cac49a48b56c4d0d3a9e9fd};
+: ${PKG_COREUTILS_VERSION:=8.31};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
 : ${PKG_DASH_SHA256SUM:=c34e1259c4179a6551dc3ceb41c668cf3be0135c5ec430deb2edfc17fff44da9};
 : ${PKG_DASH_VERSION:=0.5.10.2};
@@ -1904,6 +1904,7 @@ MINIPIX_RPM_DISABLE=1;
 : ${PKG_BZIP2_MINIPIX_INSTALL_FILES:="../bzip2-${PKG_BZIP2_VERSION}/bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"};
 : ${PKG_BZIP2_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"};
 : ${PKG_COREUTILS_MINIPIX_INHERIT_FROM:=coreutils};
+: ${PKG_COREUTILS_MINIPIX_CONFIGURE_ARGS_EXTRA:="--enable-single-binary=shebangs"};
 : ${PKG_COREUTILS_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
 : ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip};
 : ${PKG_DASH_MINIPIX_INHERIT_FROM:=dash};