manuel/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cifs-utils: update to 6.12.

Browse Source
This commit is contained in:
Andrew J. Hesford 2021-01-02 09:15:55 -05:00
parent 6f0dda0a07
commit 92ac0f5fc6
3 changed files with 3 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch
View File

@ -1,51 +0,0 @@
From linux-cifs Sat Nov 21 11:11:45 2020
From: Jonas Witschel <diabonas () archlinux ! org>
Date: Sat, 21 Nov 2020 11:11:45 +0000
To: linux-cifs
Subject: [PATCH 2/2] cifs.upall: update the cap bounding set only when CAP_SETPCAP is given
Message-Id: <20201121111145.24975-3-diabonas () archlinux ! org>
X-MARC-Message: https://marc.info/?l=linux-cifs&m=160595758021261
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
--- cifs.upcall.c
+++ 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

51
srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch
View File

@ -1,51 +0,0 @@
From linux-cifs Sat Nov 21 11:11:44 2020
From: Jonas Witschel <diabonas () archlinux ! org>
Date: Sat, 21 Nov 2020 11:11:44 +0000
To: linux-cifs
Subject: [PATCH 1/2] mount.cifs: update the cap bounding set only when CAP_SETPCAP is given
Message-Id: <20201121111145.24975-2-diabonas () archlinux ! org>
X-MARC-Message: https://marc.info/?l=linux-cifs&m=160595758021264
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
--- mount.cifs.c
+++ 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

6
srcpkgs/cifs-utils/template
View File

@ -1,7 +1,7 @@
# Template file for 'cifs-utils'
pkgname=cifs-utils
version=6.11
revision=3
version=6.12
revision=1
build_style=gnu-configure
configure_args="--disable-systemd"
make_install_args="ROOTSBINDIR=/usr/bin"
@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://wiki.samba.org/index.php/LinuxCIFS_utils"
distfiles="https://ftp.samba.org/pub/linux-cifs/${pkgname}/${pkgname}-${version}.tar.bz2"
checksum=b859239a3f204f8220d3e54ed43bf8109e1ef202042dd87ba87492f8878728d9
checksum=922ddcc3059922e80789312c386b9c569991b4350d3ae3099de3e4b82f3885ef
python_version=3
pre_configure() {