Thanks, applied as 21f1faaf7398b5d3313d75cdfb863bcf661b5c94. Michael
[sent from post-receive hook] On Fri, 06 Jan 2023 17:01:27 +0100, Christian Melki <[email protected]> wrote: > https://github.com/coreutils/coreutils/blob/ca22b9eba09feae9ad5c8105c37e2ae5fb9abbb2/NEWS > A bunch of bugfixes, some new shiny features, but no new programs afaics. > > * Remove patch, as that behavior is included in 9.1 > * Remove prepare text, not sure what copying parts of configure was useful > for? > * Fix collision with busybox (1.36.0) TSORT. > * configure option gpm has been renamed to libgmp. > > Signed-off-by: Christian Melki <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/coreutils-8.32/0001-ls-restore-8.31-behavior-on-removed-directories.patch > > b/patches/coreutils-8.32/0001-ls-restore-8.31-behavior-on-removed-directories.patch > deleted file mode 100644 > index a558a13d5c98..000000000000 > --- > a/patches/coreutils-8.32/0001-ls-restore-8.31-behavior-on-removed-directories.patch > +++ /dev/null > @@ -1,113 +0,0 @@ > -From: Paul Eggert <[email protected]> > -Date: Thu, 5 Mar 2020 17:25:29 -0800 > -Subject: [PATCH] ls: restore 8.31 behavior on removed directories > - > -* 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 a/NEWS b/NEWS > -index 3e44c0c5a1f0..0f0612aa65d2 100644 > ---- a/NEWS > -+++ b/NEWS > -@@ -5045,6 +5045,12 @@ point at which the packages merged to form the > coreutils: > - > - * --full-time is now an alias for "-l --time-style=full-iso". > - > -+** 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. > -+ > - > - ======================================================================== > - Here are the NEWS entries made from sh-utils-2.0 until the > -diff --git a/src/ls.c b/src/ls.c > -index 24b983287dfc..4acf5f44d969 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 a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh > -index e8c835dabfcc..fe8f929a194b 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 > diff --git a/patches/coreutils-8.32/series b/patches/coreutils-8.32/series > deleted file mode 100644 > index 4d68683dcc9a..000000000000 > --- a/patches/coreutils-8.32/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-ls-restore-8.31-behavior-on-removed-directories.patch > -# c799e1eabffd5023beede5f24bad828d - git-ptx-patches magic > diff --git a/rules/coreutils.in b/rules/coreutils.in > index d24bbb9493ca..8be872056563 100644 > --- a/rules/coreutils.in > +++ b/rules/coreutils.in > @@ -302,6 +302,10 @@ comment "busybox' mknod is selected!" > config COREUTILS_TSORT > bool > prompt "tsort" > + depends on !BUSYBOX_TSORT || ALLYES > + > +comment "busybox' tsort is selected!" > + depends on BUSYBOX_TSORT > > config COREUTILS_MKTEMP > bool > diff --git a/rules/coreutils.make b/rules/coreutils.make > index e34c39d7465e..b10738d5d507 100644 > --- a/rules/coreutils.make > +++ b/rules/coreutils.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COREUTILS) += coreutils > # > # Paths and names > # > -COREUTILS_VERSION := 8.32 > -COREUTILS_MD5 := 022042695b7d5bcf1a93559a9735e668 > +COREUTILS_VERSION := 9.1 > +COREUTILS_MD5 := 8b1ca4e018a7dce9bb937faec6618671 > COREUTILS := coreutils-$(COREUTILS_VERSION) > COREUTILS_SUFFIX := tar.xz > COREUTILS_URL := $(call ptx/mirror, GNU, > coreutils/$(COREUTILS).$(COREUTILS_SUFFIX)) > @@ -28,29 +28,6 @@ COREUTILS_LICENSE_FILES := > file://COPYING;md5=1ebbd3e34237af26da5dc08a4e440464 > # Prepare > # > ---------------------------------------------------------------------------- > > -# --enable-install-program=PROG_LIST > -# install the programs in PROG_LIST > (comma-separated, > -# default: none) > -# --enable-no-install-program=PROG_LIST > -# do NOT install the programs in PROG_LIST > -# (comma-separated, default: arch,hostname,su) > -# --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and > DIR/lib > -# --without-libiconv-prefix don't search for libiconv in includedir > and libdir > -# --with-libpth-prefix[=DIR] search for libpth in DIR/include and DIR/lib > -# --without-libpth-prefix don't search for libpth in includedir and > libdir > -# --without-included-regex > -# don't compile regex; this is the default on > systems > -# with recent-enough versions of the GNU C Library > -# (use with caution on other systems). > -# --with-packager String identifying the packager of this software > -# --with-packager-version Packager-specific version information > -# --with-packager-bug-reports > -# Packager info for bug reports (URL/e-mail/...) > -# --without-gmp do not use the GNU MP library for arbitrary > -# precision calculation (default: use it if > available) > -# --with-libintl-prefix[=DIR] search for libintl in DIR/include and > DIR/lib > -# --without-libintl-prefix don't search for libintl in includedir and > libdir > - > COREUTILS_INST- = > COREUTILS_INST-y = > COREUTILS_INST-$(PTXCONF_COREUTILS_BASE64) += base64 > @@ -178,7 +155,7 @@ COREUTILS_CONF_OPT := \ > --without-openssl \ > --$(call ptx/wwo, PTXCONF_GLOBAL_SELINUX)-selinux \ > --with-tty-group=tty \ > - --without-gmp > + --without-libgmp > > COREUTILS_MAKE_OPT := \ > man1_MANS=
