diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/a/coreutils/DIR_COLORS | 2 | ||||
-rwxr-xr-x | source/a/coreutils/coreutils.SlackBuild | 13 | ||||
-rw-r--r-- | source/a/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch | 109 | ||||
-rwxr-xr-x | source/ap/ghostscript/dump.unused.internal.libraries.from.sources.sh | 8 | ||||
-rwxr-xr-x | source/l/glib2/glib2.SlackBuild | 2 | ||||
-rwxr-xr-x | source/l/librsvg/librsvg.SlackBuild | 5 | ||||
-rwxr-xr-x | source/l/libsoup/libsoup.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/NetworkManager/NetworkManager.SlackBuild | 2 | ||||
-rwxr-xr-x | source/n/nftables/nftables.SlackBuild | 4 | ||||
-rwxr-xr-x | source/n/tin/tin.SlackBuild | 2 |
10 files changed, 140 insertions, 9 deletions
diff --git a/source/a/coreutils/DIR_COLORS b/source/a/coreutils/DIR_COLORS index ceb18a08..5b97e4a4 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 d54fbde8..ea9a79ad 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 00000000..295df9b3 --- /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 \ + diff --git a/source/ap/ghostscript/dump.unused.internal.libraries.from.sources.sh b/source/ap/ghostscript/dump.unused.internal.libraries.from.sources.sh index c4f1ce80..5a3690db 100755 --- a/source/ap/ghostscript/dump.unused.internal.libraries.from.sources.sh +++ b/source/ap/ghostscript/dump.unused.internal.libraries.from.sources.sh @@ -8,8 +8,12 @@ VERSION=${VERSION:-$(echo ghostscript-*.tar.?z* | rev | cut -f 3- -d . | cut -f tar xf ghostscript-${VERSION}.tar.xz || exit 1 mv ghostscript-${VERSION}.tar.xz ghostscript-${VERSION}.tar.xz.orig ( cd ghostscript-${VERSION} && rm -rf freetype jpeg lcms2 lcms2art/doc/* libpng libtiff png tiff zlib ) -# Dump this huge PDF: -( cd ghostscript-${VERSION} && find . -name GS9_Color_Management.pdf -exec rm {} \; ) +# Dump huge PDFs: +( cd ghostscript-${VERSION} + find . -name GS9_Color_Management.pdf -exec rm {} \; + rm -f doc/colormanage/figures/*.pdf + rm -f lcms2mt/doc/* +) tar cf ghostscript-${VERSION}.tar ghostscript-${VERSION} rm -r ghostscript-${VERSION} plzip -9 -n 6 ghostscript-${VERSION}.tar diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index 6beafe56..f86924ff 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=glib2 VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/l/librsvg/librsvg.SlackBuild b/source/l/librsvg/librsvg.SlackBuild index ab9ab4fb..82f83f46 100755 --- a/source/l/librsvg/librsvg.SlackBuild +++ b/source/l/librsvg/librsvg.SlackBuild @@ -94,6 +94,11 @@ make install DESTDIR=$PKG || exit 1 # Don't ship .la files: rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la +# Add this symlink for now so that we don't break compiles: +if [ ! -r $PKG/usr/include/librsvg-2.0/librsvg/librsvg-features.h ]; then + ln -sf rsvg-features.h $PKG/usr/include/librsvg-2.0/librsvg/librsvg-features.h +fi + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/l/libsoup/libsoup.SlackBuild b/source/l/libsoup/libsoup.SlackBuild index ba90083d..0fcdcbfb 100755 --- a/source/l/libsoup/libsoup.SlackBuild +++ b/source/l/libsoup/libsoup.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libsoup VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/source/n/NetworkManager/NetworkManager.SlackBuild b/source/n/NetworkManager/NetworkManager.SlackBuild index c2fb7ed0..f607e36a 100755 --- a/source/n/NetworkManager/NetworkManager.SlackBuild +++ b/source/n/NetworkManager/NetworkManager.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=NetworkManager VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: MARCH=$( uname -m ) diff --git a/source/n/nftables/nftables.SlackBuild b/source/n/nftables/nftables.SlackBuild index ca860fb5..8dbb9e4e 100755 --- a/source/n/nftables/nftables.SlackBuild +++ b/source/n/nftables/nftables.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=nftables VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -91,6 +91,8 @@ LIBS="-lncursesw" \ --with-python-bin=python3 \ --with-xtables \ --disable-static \ + --with-json \ + --enable-python \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 diff --git a/source/n/tin/tin.SlackBuild b/source/n/tin/tin.SlackBuild index 69a47bd8..53e983ee 100755 --- a/source/n/tin/tin.SlackBuild +++ b/source/n/tin/tin.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |