diff options
Diffstat (limited to 'source/n/cifs-utils')
| -rwxr-xr-x | source/n/cifs-utils/cifs-utils.SlackBuild | 7 | ||||
| -rw-r--r-- | source/n/cifs-utils/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch | 101 |
2 files changed, 2 insertions, 106 deletions
diff --git a/source/n/cifs-utils/cifs-utils.SlackBuild b/source/n/cifs-utils/cifs-utils.SlackBuild index a7af8f9f..501cae5b 100755 --- a/source/n/cifs-utils/cifs-utils.SlackBuild +++ b/source/n/cifs-utils/cifs-utils.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cifs-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -74,16 +74,13 @@ TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM rm -rf $PKG -mkdir -p $TMP $PKG +mkdir -p $TMP $PKG/sbin cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION -# Fix for new libcap-ng: -zcat $CWD/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch.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/cifs-utils/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch b/source/n/cifs-utils/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch deleted file mode 100644 index ed319182..00000000 --- a/source/n/cifs-utils/cifs-utils.f4e7c84467152624a288351321c8664dbf3364af.patch +++ /dev/null @@ -1,101 +0,0 @@ -From f4e7c84467152624a288351321c8664dbf3364af Mon Sep 17 00:00:00 2001 -From: Jonas Witschel <diabonas@archlinux.org> -Date: Sat, 21 Nov 2020 11:41:26 +0100 -Subject: [PATCH 1/2] mount.cifs: update the cap bounding set only when - CAP_SETPCAP is given - -libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error -of -4 when trying to update the capability bounding set without having the -CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng -silently skipped updating the bounding set and only updated the normal -CAPNG_SELECT_CAPS capabilities instead. - -Check beforehand whether we have CAP_SETPCAP, in which case we can use -CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set. -Otherwise, we can at least update the normal capabilities, but refrain from -trying to update the bounding set to avoid getting an error. - -Signed-off-by: Jonas Witschel <diabonas@archlinux.org> ---- - mount.cifs.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/mount.cifs.c b/mount.cifs.c -index 4feb397..88b8b69 100644 ---- a/mount.cifs.c -+++ b/mount.cifs.c -@@ -338,6 +338,8 @@ static int set_password(struct parsed_mount_info *parsed_info, const char *src) - static int - drop_capabilities(int parent) - { -+ capng_select_t set = CAPNG_SELECT_CAPS; -+ - capng_setpid(getpid()); - capng_clear(CAPNG_SELECT_BOTH); - if (parent) { -@@ -355,7 +357,10 @@ drop_capabilities(int parent) - return EX_SYSERR; - } - } -- if (capng_apply(CAPNG_SELECT_BOTH)) { -+ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) { -+ set = CAPNG_SELECT_BOTH; -+ } -+ if (capng_apply(set)) { - fprintf(stderr, "Unable to apply new capability set.\n"); - return EX_SYSERR; - } --- -2.29.2 - - -From 64dfbafe7a0639a96d67f0b840b6e6498e1f68a9 Mon Sep 17 00:00:00 2001 -From: Jonas Witschel <diabonas@archlinux.org> -Date: Sat, 21 Nov 2020 11:48:33 +0100 -Subject: [PATCH 2/2] cifs.upall: update the cap bounding set only when - CAP_SETPCAP is given - -libcap-ng 0.8.1 tightened the error checking on capng_apply, returning an error -of -4 when trying to update the capability bounding set without having the -CAP_SETPCAP capability to be able to do so. Previous versions of libcap-ng -silently skipped updating the bounding set and only updated the normal -CAPNG_SELECT_CAPS capabilities instead. - -Check beforehand whether we have CAP_SETPCAP, in which case we can use -CAPNG_SELECT_BOTH to update both the normal capabilities and the bounding set. -Otherwise, we can at least update the normal capabilities, but refrain from -trying to update the bounding set to avoid getting an error. - -Signed-off-by: Jonas Witschel <diabonas@archlinux.org> ---- - cifs.upcall.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/cifs.upcall.c b/cifs.upcall.c -index 1559434..af1a0b0 100644 ---- a/cifs.upcall.c -+++ b/cifs.upcall.c -@@ -88,6 +88,8 @@ typedef enum _sectype { - static int - trim_capabilities(bool need_environ) - { -+ capng_select_t set = CAPNG_SELECT_CAPS; -+ - capng_clear(CAPNG_SELECT_BOTH); - - /* SETUID and SETGID to change uid, gid, and grouplist */ -@@ -105,7 +107,10 @@ trim_capabilities(bool need_environ) - return 1; - } - -- if (capng_apply(CAPNG_SELECT_BOTH)) { -+ if (capng_have_capability(CAPNG_EFFECTIVE, CAP_SETPCAP)) { -+ set = CAPNG_SELECT_BOTH; -+ } -+ if (capng_apply(set)) { - syslog(LOG_ERR, "%s: Unable to apply capability set: %m\n", __func__); - return 1; - } --- -2.29.2 - |