From 4ee56da51fda4388cb501546197907e84f3b1877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98rjan=20Malde?= Date: Sun, 17 Apr 2022 21:24:37 +0200 Subject: groups/211.native_packages_cmdline.group: coreutils: bump to v9.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ørjan Malde --- groups/211.native_packages_cmdline.group | 4 +- patches/coreutils-9.0.local.patch | 113 ------------------------------ patches/coreutils-9.1.local.patch | 68 ++++++++++++++++++ patches/coreutils_minipix-9.0.local.patch | 1 - patches/coreutils_minipix-9.1.local.patch | 1 + 5 files changed, 71 insertions(+), 116 deletions(-) delete mode 100644 patches/coreutils-9.0.local.patch create mode 100644 patches/coreutils-9.1.local.patch delete mode 120000 patches/coreutils_minipix-9.0.local.patch create mode 120000 patches/coreutils_minipix-9.1.local.patch diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group index 10cb9ccb..2ee6cd8a 100644 --- a/groups/211.native_packages_cmdline.group +++ b/groups/211.native_packages_cmdline.group @@ -49,8 +49,8 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")"; : ${PKG_CLIPBOARD_UTILS_CFLAGS_BUILD_EXTRA:="-g2 -O0"}; : ${PKG_CLIPBOARD_UTILS_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib/w32lib"}; : ${PKG_COREUTILS_DEPENDS:="libiconv"}; -: ${PKG_COREUTILS_SHA256SUM:=ce30acdf4a41bc5bb30dd955e9eaa75fa216b4e3deb08889ed32433c7b3b97ce}; -: ${PKG_COREUTILS_VERSION:=9.0}; +: ${PKG_COREUTILS_SHA256SUM:=61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423}; +: ${PKG_COREUTILS_VERSION:=9.1}; : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz}; : ${PKG_COREUTILS_CONFIGURE_ARGS_EXTRA:="--enable-no-install-program=kill"} : ${PKG_CPIO_SHA256SUM:=eab5bdc5ae1df285c59f2a4f140a98fc33678a0bf61bdba67d9436ae26b46f6d}; diff --git a/patches/coreutils-9.0.local.patch b/patches/coreutils-9.0.local.patch deleted file mode 100644 index 1b36cf2b..00000000 --- a/patches/coreutils-9.0.local.patch +++ /dev/null @@ -1,113 +0,0 @@ -diff --git a/src/chmod.c b/src/chmod.c -index 37b04f500..57ac47f33 100644 ---- a/src/chmod.c -+++ b/src/chmod.c -@@ -44,8 +44,8 @@ struct change_status - enum - { - CH_NO_STAT, -- CH_NOT_APPLIED, - CH_FAILED, -+ CH_NOT_APPLIED, - CH_NO_CHANGE_REQUESTED, - CH_SUCCEEDED - } -@@ -322,7 +322,7 @@ process_file (FTS *fts, FTSENT *ent) - if ( ! recurse) - fts_set (fts, ent, FTS_SKIP); - -- return CH_NO_CHANGE_REQUESTED <= ch.status; -+ return CH_NOT_APPLIED <= ch.status; - } - - /* Recursively change the modes of the specified FILES (the last entry -diff -ru coreutils-9.0.orig/lib/lchmod.c coreutils-9.0/lib/lchmod.c ---- coreutils-9.0.orig/lib/lchmod.c 2021-09-24 13:32:44.000000000 +0200 -+++ coreutils-9.0/lib/lchmod.c 2021-09-28 21:21:23.721953133 +0200 -@@ -76,7 +76,7 @@ - return -1; - } - --# if defined __linux__ || defined __ANDROID__ || defined __CYGWIN__ -+# if defined __linux__ || defined __ANDROID__ || defined __CYGWIN__ || defined __midipix__ - static char const fmt[] = "/proc/self/fd/%d"; - char buf[sizeof fmt - sizeof "%d" + INT_BUFSIZE_BOUND (int)]; - sprintf (buf, fmt, fd); -diff -ru coreutils-9.0.orig/src/ls.c coreutils-9.0/src/ls.c ---- coreutils-9.0.orig/src/ls.c 2021-09-24 13:31:05.000000000 +0200 -+++ coreutils-9.0/src/ls.c 2021-09-28 19:14:34.301611763 +0200 -@@ -2273,18 +2273,14 @@ - if (linelen < 0) - { - /* Suppress bogus warning re comparing ws.ws_col to big integer. */ --# if __GNUC_PREREQ (4, 6) - # pragma GCC diagnostic push - # pragma GCC diagnostic ignored "-Wtype-limits" --# endif - struct winsize ws; - if (stdout_isatty () - && 0 <= ioctl (STDOUT_FILENO, TIOCGWINSZ, &ws) - && 0 < ws.ws_col) - linelen = ws.ws_col <= MIN (PTRDIFF_MAX, SIZE_MAX) ? ws.ws_col : 0; --# if __GNUC_PREREQ (4, 6) - # pragma GCC diagnostic pop --# endif - } - #endif - if (linelen < 0) -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/patches/coreutils-9.1.local.patch b/patches/coreutils-9.1.local.patch new file mode 100644 index 00000000..28d5e732 --- /dev/null +++ b/patches/coreutils-9.1.local.patch @@ -0,0 +1,68 @@ +diff -ru coreutils-9.0.orig/lib/lchmod.c coreutils-9.0/lib/lchmod.c +--- coreutils-9.0.orig/lib/lchmod.c 2021-09-24 13:32:44.000000000 +0200 ++++ coreutils-9.0/lib/lchmod.c 2021-09-28 21:21:23.721953133 +0200 +@@ -76,7 +76,7 @@ + return -1; + } + +-# if defined __linux__ || defined __ANDROID__ || defined __CYGWIN__ ++# if defined __linux__ || defined __ANDROID__ || defined __CYGWIN__ || defined __midipix__ + static char const fmt[] = "/proc/self/fd/%d"; + char buf[sizeof fmt - sizeof "%d" + INT_BUFSIZE_BOUND (int)]; + sprintf (buf, fmt, fd); +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/patches/coreutils_minipix-9.0.local.patch b/patches/coreutils_minipix-9.0.local.patch deleted file mode 120000 index 7d54ba2f..00000000 --- a/patches/coreutils_minipix-9.0.local.patch +++ /dev/null @@ -1 +0,0 @@ -coreutils-9.0.local.patch \ No newline at end of file diff --git a/patches/coreutils_minipix-9.1.local.patch b/patches/coreutils_minipix-9.1.local.patch new file mode 120000 index 00000000..f14daa0a --- /dev/null +++ b/patches/coreutils_minipix-9.1.local.patch @@ -0,0 +1 @@ +coreutils-9.1.local.patch \ No newline at end of file -- cgit v1.2.3