summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-04-18 19:58:04 +0000
committer Eric Hameleers <alien@slackware.com>2022-04-19 06:59:45 +0200
commit615523f1128f2b40168434af4e8e00e95136fa71 (patch)
tree3068279d052c3271a7e83b6f953c52bbfcb8f33a /source
parent8b9b348d17ffe04d5a5087505a9f30b2ff9c1ebe (diff)
downloadcurrent-615523f1128f2b40168434af4e8e00e95136fa71.tar.gz
current-615523f1128f2b40168434af4e8e00e95136fa71.tar.xz
Mon Apr 18 19:58:04 UTC 202220220418195804
a/coreutils-9.1-x86_64-1.txz: Upgraded. kde/krita-5.0.5-x86_64-3.txz: Rebuilt. Recompiled against quazip-1.3. l/enchant-2.3.3-x86_64-1.txz: Upgraded. l/imagemagick-7.1.0_30-x86_64-1.txz: Upgraded. l/json-c-0.16_20220414-x86_64-1.txz: Upgraded. l/libnl3-3.6.0-x86_64-1.txz: Upgraded. l/pcre2-10.40-x86_64-1.txz: Upgraded. l/quazip-1.3-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/rsync-3.2.4-x86_64-1.txz: Upgraded. x/libpinyin-2.6.2-x86_64-1.txz: Upgraded. xap/xsnow-3.5.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/coreutils/coreutils.SlackBuild12
-rw-r--r--source/a/coreutils/coreutils.uname.diff37
-rw-r--r--source/a/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch109
-rw-r--r--source/kde/kde/build/krita2
-rwxr-xr-xsource/l/json-c/json-c.SlackBuild2
-rw-r--r--source/l/libnl/libnl.info2
-rw-r--r--source/l/libnl/libnl.url1
-rw-r--r--source/l/libnl/slack-desc2
-rwxr-xr-xsource/l/libnl3/libnl3.SlackBuild2
-rwxr-xr-xsource/n/rsync/rsync.SlackBuild4
-rw-r--r--source/n/rsync/rsync.no_lchmod.diff21
11 files changed, 26 insertions, 168 deletions
diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild
index ea9a79ad0..728c30248 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:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -80,16 +80,6 @@ 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 \) \
diff --git a/source/a/coreutils/coreutils.uname.diff b/source/a/coreutils/coreutils.uname.diff
index 699110318..3aec5e5f6 100644
--- a/source/a/coreutils/coreutils.uname.diff
+++ b/source/a/coreutils/coreutils.uname.diff
@@ -1,8 +1,7 @@
-diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c
---- coreutils-7.6.orig/src/uname.c 2009-09-01 06:01:16.000000000 -0500
-+++ coreutils-7.6/src/uname.c 2009-09-15 08:55:26.239452858 -0500
-@@ -50,6 +50,11 @@
- # include <mach-o/arch.h>
+--- ./src/uname.c.orig 2022-04-08 06:22:18.000000000 -0500
++++ ./src/uname.c 2022-04-17 13:30:46.550023254 -0500
+@@ -44,6 +44,11 @@
+ # endif
#endif
+#if defined (__linux__)
@@ -11,9 +10,9 @@ diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c
+#endif
+
#include "system.h"
+ #include "die.h"
#include "error.h"
- #include "quote.h"
-@@ -155,6 +160,106 @@
+@@ -149,6 +154,106 @@
exit (status);
}
@@ -120,23 +119,25 @@ diff -Nur coreutils-7.6.orig/src/uname.c coreutils-7.6/src/uname.c
/* Print ELEMENT, preceded by a space if something has already been
printed. */
-@@ -302,10 +407,14 @@
- if (toprint & PRINT_PROCESSOR)
- {
- char const *element = unknown;
+@@ -323,11 +428,16 @@
+ element = "powerpc";
+ # endif
+ #endif
-#if HAVE_SYSINFO && defined SI_ARCHITECTURE
+#if ( HAVE_SYSINFO && defined SI_ARCHITECTURE ) || defined(USE_PROCINFO)
- {
- static char processor[257];
+ if (element == unknown)
+ {
+ static char processor[257];
+#if defined(USE_PROCINFO)
-+ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
++ if (0 <= __linux_procinfo (PROCINFO_PROCESSOR, processor, sizeof processor))
+#else
- if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
++
+ if (0 <= sysinfo (SI_ARCHITECTURE, processor, sizeof processor))
+#endif
- element = processor;
- }
+ element = processor;
+ }
#endif
-@@ -358,9 +467,13 @@
+@@ -360,9 +470,13 @@
if (element == unknown)
{
static char hardware_platform[257];
diff --git a/source/a/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch b/source/a/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
deleted file mode 100644
index 295df9b37..000000000
--- a/source/a/coreutils/e8b56ebd536e82b15542a00c888109471936bfda.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-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/kde/kde/build/krita b/source/kde/kde/build/krita
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-2
+3
diff --git a/source/l/json-c/json-c.SlackBuild b/source/l/json-c/json-c.SlackBuild
index c6dd70644..06e548e24 100755
--- a/source/l/json-c/json-c.SlackBuild
+++ b/source/l/json-c/json-c.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=json-c
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -f 3- -d - | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
diff --git a/source/l/libnl/libnl.info b/source/l/libnl/libnl.info
deleted file mode 100644
index fafac745d..000000000
--- a/source/l/libnl/libnl.info
+++ /dev/null
@@ -1,2 +0,0 @@
-HOMEPAGE="http://people.suug.ch/~tgr/libnl/"
-DOWNLOAD="http://people.suug.ch/~tgr/libnl/files/libnl-1.1.tar.gz"
diff --git a/source/l/libnl/libnl.url b/source/l/libnl/libnl.url
new file mode 100644
index 000000000..c28c821ab
--- /dev/null
+++ b/source/l/libnl/libnl.url
@@ -0,0 +1 @@
+https://www.infradead.org/~tgr/libnl
diff --git a/source/l/libnl/slack-desc b/source/l/libnl/slack-desc
index 7fc981fd2..ce73e0241 100644
--- a/source/l/libnl/slack-desc
+++ b/source/l/libnl/slack-desc
@@ -12,7 +12,7 @@ libnl: libnl is a library for applications dealing with netlink sockets.
libnl: The library provides an interface for raw netlink messaging and
libnl: various netlink family specific interfaces.
libnl:
-libnl: Homepage: http://people.suug.ch/~tgr/libnl/
+libnl: Homepage: https://www.infradead.org/~tgr/libnl
libnl:
libnl:
libnl:
diff --git a/source/l/libnl3/libnl3.SlackBuild b/source/l/libnl3/libnl3.SlackBuild
index 43fd07cef..6e11e9699 100755
--- a/source/l/libnl3/libnl3.SlackBuild
+++ b/source/l/libnl3/libnl3.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libnl
PKGNAME=libnl3
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/rsync/rsync.SlackBuild b/source/n/rsync/rsync.SlackBuild
index 07fbb1a87..07896eea9 100755
--- a/source/n/rsync/rsync.SlackBuild
+++ b/source/n/rsync/rsync.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=rsync
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:
if [ -z "$ARCH" ]; then
@@ -66,8 +66,6 @@ rm -rf rsync-$VERSION
tar xvf $CWD/rsync-$VERSION.tar.?z || exit 1
cd rsync-$VERSION || exit 1
-zcat $CWD/rsync.no_lchmod.diff.gz | patch -p1 --verbose || exit 1
-
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/source/n/rsync/rsync.no_lchmod.diff b/source/n/rsync/rsync.no_lchmod.diff
deleted file mode 100644
index 7d7d33bf4..000000000
--- a/source/n/rsync/rsync.no_lchmod.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./syscall.c.orig 2021-02-22 14:30:03.639032473 -0600
-+++ ./syscall.c 2021-02-22 14:30:07.490032559 -0600
-@@ -232,7 +232,8 @@
- RETURN_ERROR_IF_RO_OR_LO;
- #ifdef HAVE_LCHMOD
- code = lchmod(path, mode & CHMOD_BITS);
--#else
-+ if (code < 0 && errno == ENOTSUP) {
-+#endif
- if (S_ISLNK(mode)) {
- # if defined HAVE_SETATTRLIST
- struct attrlist attrList;
-@@ -247,6 +248,8 @@
- # endif
- } else
- code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
-+#ifdef HAVE_LCHMOD
-+ }
- #endif /* !HAVE_LCHMOD */
- if (code != 0 && (preserve_perms || preserve_executability))
- return code;