summaryrefslogtreecommitdiffstats
path: root/source/a/coreutils
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-09-28 01:37:33 +0000
committer Eric Hameleers <alien@slackware.com>2021-09-28 08:59:55 +0200
commit14c5bb40d1dfae2acc1a0c84ef261d09fbea0001 (patch)
tree9c80f8cc7ce6d76bce0aaec0576c758ef31b8f2c /source/a/coreutils
parentd66220bda595fffe9e5d8bf506be65e4a3dc7e50 (diff)
downloadcurrent-14c5bb40d1dfae2acc1a0c84ef261d09fbea0001.tar.gz
current-14c5bb40d1dfae2acc1a0c84ef261d09fbea0001.tar.xz
Tue Sep 28 01:37:33 UTC 202120210928013733
n/nftables-1.0.0-x86_64-2.txz: Rebuilt. Added options --with-json and --enable-python needed for firewalld. Thanks to stormtracknole. xap/mozilla-thunderbird-91.1.2-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/91.1.2/releasenotes/
Diffstat (limited to 'source/a/coreutils')
-rw-r--r--source/a/coreutils/DIR_COLORS2
-rwxr-xr-xsource/a/coreutils/coreutils.SlackBuild13
-rw-r--r--source/a/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch109
3 files changed, 122 insertions, 2 deletions
diff --git a/source/a/coreutils/DIR_COLORS b/source/a/coreutils/DIR_COLORS
index ceb18a087..5b97e4a45 100644
--- a/source/a/coreutils/DIR_COLORS
+++ b/source/a/coreutils/DIR_COLORS
@@ -192,6 +192,8 @@ EXEC 01;32 # This is for files with execute permission:
.tiff 01;35
.vob 01;35
.wav 01;35
+.webm 01;35
+.webp 01;35
.wma 01;35
.wmv 01;35
.xbm 01;35
diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild
index d54fbde85..ea9a79ad0 100755
--- a/source/a/coreutils/coreutils.SlackBuild
+++ b/source/a/coreutils/coreutils.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=coreutils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -80,6 +80,16 @@ rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
cd $PKGNAM-$VERSION || exit 1
+# Fix chmod exit status:
+touch -r NEWS NEWS.timestamp
+touch -r src/chmod.c src/chmod.c.timestamp
+touch -r tests/local.mk tests/local.mk.timestamp
+zcat $CWD/e8b56ebd536e82b15542a00c888109471936bfda.patch.gz | patch -p1 --verbose || exit 1
+touch -r NEWS.timestamp NEWS
+touch -r src/chmod.c.timestamp src/chmod.c
+touch -r tests/local.mk.timestamp tests/local.mk
+rm -f NEWS.timestamp src/chmod.c.timestamp tests/local.mk.timestamp
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -111,7 +121,6 @@ DEFAULT_POSIX2_VERSION=199209 \
--infodir=/usr/info \
--sysconfdir=/etc \
--libdir=/usr/lib${LIBDIRSUFFIX} \
- --without-gmp \
--enable-install-program=arch \
--build=$ARCH-slackware-linux || exit 1
diff --git a/source/a/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch b/source/a/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
new file mode 100644
index 000000000..295df9b37
--- /dev/null
+++ b/source/a/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
@@ -0,0 +1,109 @@
+From e8b56ebd536e82b15542a00c888109471936bfda Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Fri, 24 Sep 2021 20:57:41 +0100
+Subject: [PATCH] chmod: fix exit status when ignoring symlinks
+
+* src/chmod.c: Reorder enum so CH_NOT_APPLIED
+can be treated as a non error.
+* tests/chmod/ignore-symlink.sh: A new test.
+* tests/local.mk: Reference the new test.
+* NEWS: Mention the bug fix.
+Fixes https://bugs.gnu.org/50784
+---
+ NEWS | 6 ++++++
+ src/chmod.c | 4 ++--
+ tests/chmod/ignore-symlink.sh | 31 +++++++++++++++++++++++++++++++
+ tests/local.mk | 1 +
+ 4 files changed, 40 insertions(+), 2 deletions(-)
+ create mode 100755 tests/chmod/ignore-symlink.sh
+
+diff --git a/NEWS b/NEWS
+index a1470a7d7..1cb3c28a1 100644
+--- a/NEWS
++++ b/NEWS
+@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*-
+
+ * Noteworthy changes in release ?.? (????-??-??) [?]
+
++** Bug fixes
++
++ chmod -R no longer exits with error status when encountering symlinks.
++ All files would be processed correctly, but the exit status was incorrect.
++ [bug introduced in coreutils-9.0]
++
+
+ * Noteworthy changes in release 9.0 (2021-09-24) [stable]
+
+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 --git a/tests/chmod/ignore-symlink.sh b/tests/chmod/ignore-symlink.sh
+new file mode 100755
+index 000000000..5ce3de816
+--- /dev/null
++++ b/tests/chmod/ignore-symlink.sh
+@@ -0,0 +1,31 @@
++#!/bin/sh
++# Test for proper exit code of chmod on a processed symlink.
++
++# Copyright (C) 2021 Free Software Foundation, Inc.
++
++# This program is free software: you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# the Free Software Foundation, either version 3 of the License, or
++# (at your option) any later version.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU General Public License for more details.
++
++# You should have received a copy of the GNU General Public License
++# along with this program. If not, see <https://www.gnu.org/licenses/>.
++
++. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src
++print_ver_ chmod
++
++mkdir dir || framework_failure_
++touch dir/f || framework_failure_
++ln -s f dir/l || framework_failure_
++
++# This operation ignores symlinks but should succeed.
++chmod u+w -R dir 2> out || fail=1
++
++compare /dev/null out || fail=1
++
++Exit $fail
+diff --git a/tests/local.mk b/tests/local.mk
+index 228d0e368..b5b893fb7 100644
+--- a/tests/local.mk
++++ b/tests/local.mk
+@@ -456,6 +456,7 @@ all_tests = \
+ tests/chmod/c-option.sh \
+ tests/chmod/equal-x.sh \
+ tests/chmod/equals.sh \
++ tests/chmod/ignore-symlink.sh \
+ tests/chmod/inaccessible.sh \
+ tests/chmod/octal.sh \
+ tests/chmod/setgid.sh \
+