summaryrefslogtreecommitdiffstats
path: root/source/n
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-02-22 20:58:01 +0000
committer Eric Hameleers <alien@slackware.com>2021-02-23 08:59:52 +0100
commit023424d348f03bf2c7a0520928bb3d07ce9b48c2 (patch)
tree3335af2f0b9e60e9df8f875190be9e7dfd1ffd99 /source/n
parent95bebc24299ee006f72fc8b6972943a70c43a8f5 (diff)
downloadcurrent-023424d348f03bf2c7a0520928bb3d07ce9b48c2.tar.gz
current-023424d348f03bf2c7a0520928bb3d07ce9b48c2.tar.xz
Mon Feb 22 20:58:01 UTC 202120210222205801
ap/dash-0.5.11.3-x86_64-1.txz: Upgraded. ap/vim-8.2.2541-x86_64-1.txz: Upgraded. d/parallel-20210222-noarch-1.txz: Upgraded. l/mozjs78-78.8.0esr-x86_64-1.txz: Upgraded. n/libqmi-1.28.0-x86_64-1.txz: Upgraded. n/rsync-3.2.3-x86_64-4.txz: Rebuilt. Don't use lchmod(). Thanks to tadgy. x/ibus-anthy-1.5.12-x86_64-1.txz: Upgraded. xap/mozilla-firefox-78.8.0esr-x86_64-1.txz: Upgraded. This release contains security fixes and improvements. For more information, see: https://www.mozilla.org/en-US/firefox/78.8.0/releasenotes/ (* Security fix *) xap/vim-gvim-8.2.2541-x86_64-1.txz: Upgraded. xfce/xfce4-panel-profiles-1.0.13-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/n')
-rw-r--r--source/n/rsync.nolchmod.diff21
-rwxr-xr-xsource/n/rsync/rsync.SlackBuild4
-rw-r--r--source/n/rsync/rsync.no_lchmod.diff21
3 files changed, 45 insertions, 1 deletions
diff --git a/source/n/rsync.nolchmod.diff b/source/n/rsync.nolchmod.diff
new file mode 100644
index 000000000..9fc90dd3a
--- /dev/null
+++ b/source/n/rsync.nolchmod.diff
@@ -0,0 +1,21 @@
+--- ./rsync-3.2.3/syscall.c.orig 2020-07-27 18:36:55.000000000 -0500
++++ ./rsync-3.2.3/syscall.c 2021-02-22 14:28:02.306029758 -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;
diff --git a/source/n/rsync/rsync.SlackBuild b/source/n/rsync/rsync.SlackBuild
index ab36eed73..07fbb1a87 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:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -66,6 +66,8 @@ 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
new file mode 100644
index 000000000..7d7d33bf4
--- /dev/null
+++ b/source/n/rsync/rsync.no_lchmod.diff
@@ -0,0 +1,21 @@
+--- ./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;