Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] coreutils: update to 9.1
@ 2022-12-06 15:45 dkwo
  2022-12-06 17:22 ` dkwo
                   ` (19 more replies)
  0 siblings, 20 replies; 21+ messages in thread
From: dkwo @ 2022-12-06 15:45 UTC (permalink / raw)
  To: ml

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

There is a new pull request by dkwo against master on the void-packages repository

https://github.com/dkwo/void-packages coreu
https://github.com/void-linux/void-packages/pull/40932

coreutils: update to 9.1
- skip test-getcwd.sh test-getlogin: is this ok?
- Add [.1 man page symlink so "man [" works. @ericonr 
- I tested the changes in this PR: YES
- I built this PR locally for my native architecture, (x86_64-musl)
- @leahneukirchen what should backport?

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

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

From 5441bdf7af48941cbd666f2e8ef562200efea4d5 Mon Sep 17 00:00:00 2001
From: dkwo <nicolopiazzalunga@gmail.com>
Date: Mon, 5 Dec 2022 20:16:46 -0500
Subject: [PATCH] coreutils: update to 9.1

	skip test-getcwd.sh test-getlogin
	Add [.1 man page symlink so "man [" works.
---
 ...8.31-behavior-on-removed-directories.patch | 120 ------------------
 srcpkgs/coreutils/template                    |  12 +-
 2 files changed, 9 insertions(+), 123 deletions(-)
 delete mode 100644 srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch

diff --git a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch b/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
deleted file mode 100644
index 93ec0fd84c74..000000000000
--- a/srcpkgs/coreutils/patches/0001-ls-restore-8.31-behavior-on-removed-directories.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Thu, 5 Mar 2020 17:25:29 -0800
-Subject: [PATCH] ls: restore 8.31 behavior on removed directories
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* NEWS: Mention this.
-* src/ls.c: Do not include <sys/sycall.h>
-(print_dir): Don't worry about whether the directory is removed.
-* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
-behavior.
----
- NEWS                          |  6 ++++++
- src/ls.c                      | 22 ----------------------
- tests/ls/removed-directory.sh | 10 ++--------
- 3 files changed, 8 insertions(+), 30 deletions(-)
-
-diff --git NEWS NEWS
-index fdc8bf5db..653e7178b 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,12 @@ GNU coreutils NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Changes in behavior
-+
-+  On GNU/Linux systems, ls no longer issues an error message on
-+  directory merely because it was removed.  This reverts a change
-+  that was made in release 8.32.
-+
- 
- * Noteworthy changes in release 8.32 (2020-03-05) [stable]
- 
-diff --git src/ls.c src/ls.c
-index 24b983287..4acf5f44d 100644
---- a/src/ls.c
-+++ b/src/ls.c
-@@ -49,10 +49,6 @@
- # include <sys/ptem.h>
- #endif
- 
--#ifdef __linux__
--# include <sys/syscall.h>
--#endif
--
- #include <stdio.h>
- #include <assert.h>
- #include <setjmp.h>
-@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
-   struct dirent *next;
-   uintmax_t total_blocks = 0;
-   static bool first = true;
--  bool found_any_entries = false;
- 
-   errno = 0;
-   dirp = opendir (name);
-@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
-       next = readdir (dirp);
-       if (next)
-         {
--          found_any_entries = true;
-           if (! file_ignored (next->d_name))
-             {
-               enum filetype type = unknown;
-@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
-           if (errno != EOVERFLOW)
-             break;
-         }
--#ifdef __linux__
--      else if (! found_any_entries)
--        {
--          /* If readdir finds no directory entries at all, not even "." or
--             "..", then double check that the directory exists.  */
--          if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
--              && errno != EINVAL)
--            {
--              /* We exclude EINVAL as that pertains to buffer handling,
--                 and we've passed NULL as the buffer for simplicity.
--                 ENOENT is returned if appropriate before buffer handling.  */
--              file_failure (command_line_arg, _("reading directory %s"), name);
--            }
--          break;
--        }
--#endif
-       else
-         break;
- 
-diff --git tests/ls/removed-directory.sh tests/ls/removed-directory.sh
-index e8c835dab..fe8f929a1 100755
---- a/tests/ls/removed-directory.sh
-+++ b/tests/ls/removed-directory.sh
-@@ -26,20 +26,14 @@ case $host_triplet in
-   *) skip_ 'non linux kernel' ;;
- esac
- 
--LS_FAILURE=2
--
--cat <<\EOF >exp-err || framework_failure_
--ls: reading directory '.': No such file or directory
--EOF
--
- cwd=$(pwd)
- mkdir d || framework_failure_
- cd d || framework_failure_
- rmdir ../d || framework_failure_
- 
--returns_ $LS_FAILURE ls >../out 2>../err || fail=1
-+ls >../out 2>../err || fail=1
- cd "$cwd" || framework_failure_
- compare /dev/null out || fail=1
--compare exp-err err || fail=1
-+compare /dev/null err || fail=1
- 
- Exit $fail
--- 
-2.24.0.375.geb5ae68d41
-
diff --git a/srcpkgs/coreutils/template b/srcpkgs/coreutils/template
index b9148c854960..420206e7451f 100644
--- a/srcpkgs/coreutils/template
+++ b/srcpkgs/coreutils/template
@@ -1,7 +1,7 @@
 # Template file for 'coreutils'
 pkgname=coreutils
-version=8.32
-revision=4
+version=9.1
+revision=1
 bootstrap=yes
 makedepends="gmp-devel acl-devel libcap-devel"
 short_desc="GNU core utilities"
@@ -10,7 +10,7 @@ license="GPL-3.0-or-later"
 homepage="https://www.gnu.org/software/coreutils"
 changelog="https://git.savannah.gnu.org/gitweb/?p=coreutils.git;a=blob_plain;f=NEWS;hb=HEAD"
 distfiles="${GNU_SITE}/coreutils/coreutils-${version}.tar.xz"
-checksum=4458d8de7849df44ccab15e16b1548b285224dbba5f08fac070c1c0e0bcc4cfa
+checksum=61a1f410d78ba7e7f37a5a4f50e6d1320aca33375484a3255eddf17a38580423
 
 replaces="chroot-coreutils>=0 coreutils-doc>=0 b2sum>=0"
 
@@ -104,6 +104,10 @@ do_check() {
 	# Tests that depend on the tests removed
 	exeext_tests+=" fchmodat fchdir"
 
+	# temporarily disable two tests (coreutils9.1)
+	vsed -i "s/test-getcwd.sh //" gnulib-tests/Makefile
+	exeext_tests+=" getlogin"
+
 	for test in $exeext_tests ; do
 		vsed -i "s/test-$test\$(EXEEXT) //" gnulib-tests/Makefile
 	done
@@ -121,4 +125,6 @@ do_install() {
 	fi
 	mv ${DESTDIR}/usr/bin/hostname ${DESTDIR}/usr/bin/hostname-coreutils
 	mv ${DESTDIR}/usr/share/man/man1/hostname.1 ${DESTDIR}/usr/share/man/man1/hostname-coreutils.1
+
+	ln -s test.1 "${DESTDIR}/usr/share/man/man1/[.1"
 }

^ permalink raw reply	[flat|nested] 21+ messages in thread

end of thread, other threads:[~2023-03-30 16:15 UTC | newest]

Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-06 15:45 [PR PATCH] coreutils: update to 9.1 dkwo
2022-12-06 17:22 ` dkwo
2022-12-06 18:23 ` leahneukirchen
2022-12-06 19:15 ` [PR PATCH] [Updated] " dkwo
2022-12-06 19:15 ` dkwo
2022-12-17  9:48 ` [PR PATCH] [Updated] " dkwo
2022-12-20 18:32 ` leahneukirchen
2022-12-21  9:26 ` dkwo
2023-01-24 23:51 ` motorto
2023-01-25 13:40 ` leahneukirchen
2023-01-25 15:34 ` dkwo
2023-01-26 22:59 ` motorto
2023-01-26 22:59 ` motorto
2023-03-21 16:27 ` coreutils: update to 9.2 dkwo
2023-03-21 16:34 ` [PR PATCH] [Updated] " dkwo
2023-03-30 14:50 ` dkwo
2023-03-30 14:58 ` leahneukirchen
2023-03-30 14:59 ` leahneukirchen
2023-03-30 15:52 ` [PR PATCH] [Updated] " dkwo
2023-03-30 15:54 ` dkwo
2023-03-30 16:15 ` [PR PATCH] [Merged]: " leahneukirchen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).