From cb5d34771ac5f783e6e48e77f584580ca208f8e3 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 2 Jan 2021 09:14:43 -0500 Subject: [PATCH 1/2] samba: update to 4.13.3. Also revert private lib changes in da2cea569c8bcda165729b0a29555ab9ef320f76 that seem to break some installations. Fixes #27565. --- common/shlibs | 9 +++++++++ srcpkgs/samba/template | 29 +++++++++++++++-------------- srcpkgs/samba/update | 2 +- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/common/shlibs b/common/shlibs index 26a6259f6d2..d9319f0c221 100644 --- a/common/shlibs +++ b/common/shlibs @@ -4004,15 +4004,19 @@ libnss_winbind.so.2 samba-4.13.2_1 libnss_wins.so.2 samba-4.13.2_1 libsamba-policy.so.0 samba-4.13.2_1 libauth-unix-token-samba4.so samba-4.13.2_1 +libauth4-samba4.so samba-4.13.3_1 libdcerpc-samba4.so samba-4.13.2_1 libdsdb-module-samba4.so samba-4.13.2_1 libgpext-samba4.so samba-4.13.2_1 +libnet-keytab-samba4.so samba-4.13.3_1 libposix-eadb-samba4.so samba-4.13.2_1 libprinting-migrate-samba4.so samba-4.13.2_1 libsamba-net-samba4.so samba-4.13.2_1 +libsamba-python-samba4.so samba-4.13.3_1 libshares-samba4.so samba-4.13.2_1 libsmbd-base-samba4.so samba-4.13.2_1 libsmbd-conn-samba4.so samba-4.13.2_1 +libsmbpasswordparser-samba4.so samba-4.13.3_1 libxattr-tdb-samba4.so samba-4.13.2_1 libdcerpc.so.0 samba-libs-4.13.2_1 libdcerpc-binding.so.0 samba-libs-4.13.2_1 @@ -4032,11 +4036,16 @@ libsmbldap.so.2 samba-libs-4.13.2_1 libwbclient.so.0 samba-libs-4.13.2_1 libcli-ldap-samba4.so samba-libs-4.13.2_1 libcliauth-samba4.so samba-libs-4.13.2_1 +libcluster-samba4.so samba-libs-4.13.3_1 libcommon-auth-samba4.so samba-libs-4.13.2_1 libdcerpc-samba-samba4.so samba-libs-4.13.2_1 +libflag-mapping-samba4.so samba-libs-4.13.3_1 libgpo-samba4.so samba-libs-4.13.2_1 +libiov-buf-samba4.so samba-libs-4.13.3_1 libndr-samba-samba4.so samba-libs-4.13.2_1 libndr-samba4.so samba-libs-4.13.2_1 +libprinter-driver-samba4.so samba-libs-4.13.3_1 libsmb-transport-samba4.so samba-libs-4.13.2_1 +libtdb-wrap-samba4.so samba-libs-4.13.3_1 libutil-cmdline-samba4.so samba-libs-4.13.2_1 libwinbind-client-samba4.so samba-libs-4.13.2_1 diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 646546a27bb..86122a1a71b 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,7 +1,7 @@ # Template file for 'samba' pkgname=samba -version=4.13.2 -revision=3 +version=4.13.3 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -26,7 +26,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="http://www.samba.org" distfiles="http://download.samba.org/pub/samba/stable/${pkgname}-${version}.tar.gz" -checksum=276464396a05d88b775bda01ac2eb1e5a636ccf7010b0fd28efc3d85583af2b4 +checksum=c10585d43f33656fe4e1f9ff8bf40ea57d8d5b653521c1cc198fbf4922756541 lib32disabled=yes conf_files="/etc/pam.d/samba /etc/samba/smb.conf" make_dirs="/etc/samba/private 0750 root root" @@ -45,16 +45,16 @@ fi # that shouldn't be exposed locally. For those that cannot be built in, make # sure to install them into /usr/lib so xbps-src picks them up. _privlibs="CHARSET3 MESSAGING_SEND MESSAGING LIBWBCLIENT_OLD addns ads \ - asn1util auth auth4 authkrb5 cmdline_contexts cmdline-credentials cli_cldap \ - cli-ldap-common cli-nbt cli_smb_common cli_spoolss clidns cluster common-auth \ - dbwrap events flag_mapping genrand gensec gse http interfaces iov_buf krb5samba \ - ldbsamba libcli_lsa3 libcli_netlogon3 libsmb messages_dgm messages_util mscat \ - msghdr msrpc3 netif net_keytab npa_tstream popt_samba3 popt_samba3_cmdline \ - printer_driver registry replace samba-cluster-support samba-debug \ + asn1util auth authkrb5 cmdline_contexts cmdline-credentials cli_cldap \ + cli-ldap-common cli-nbt cli_smb_common cli_spoolss clidns common-auth \ + ctdb-event-client dbwrap events genrand gensec gse http interfaces \ + krb5samba ldbsamba libcli_lsa3 libcli_netlogon3 libsmb messages_dgm \ + messages_util mscat msghdr msrpc3 netif npa_tstream popt_samba3 \ + popt_samba3_cmdline registry replace samba-cluster-support samba-debug \ samba-modules samba-security samba-sockets samba3-util samdb-common secrets3 \ - server_id_db server-role samba_python smbclient-raw smbd_shim smbpasswdparser \ - socket-blocking sys_rw talloc_report_printf talloc_report tdb-wrap tevent-util \ - time-basic torture trusts_util util_reg util_setid util_tdb ctdb-event-client" + server_id_db server-role smbclient-raw smbd_shim socket-blocking sys_rw \ + talloc_report_printf talloc_report tevent-util time-basic trusts_util \ + util_reg util_setid util_tdb" configure_args+=" --with-privatelibdir=/usr/lib --builtin-libraries=${_privlibs// /,}" export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" @@ -173,8 +173,9 @@ samba-libs_package() { _libs="dcerpc dcerpc-binding ndr-krb5pac ndr-nbt ndr-standard ndr samba-credentials samba-errors samba-hostconfig samba-passdb samba-util samdb smbclient smbconf smbldap wbclient" - _privlibs="cli-ldap cliauth common-auth dcerpc-samba gpo - ndr-samba ndr smb-transport util-cmdline winbind-client" + _privlibs="cli-ldap cliauth cluster common-auth dcerpc-samba + flag-mapping gpo iov-buf ndr-samba ndr printer-driver + smb-transport tdb-wrap util-cmdline winbind-client" for _lib in ${_libs}; do vmove "usr/lib/lib${_lib}.so.*" diff --git a/srcpkgs/samba/update b/srcpkgs/samba/update index 9b5cdbfb10f..7a794aa66ec 100644 --- a/srcpkgs/samba/update +++ b/srcpkgs/samba/update @@ -1 +1 @@ -ignore="4.* *rc[0-9] *a *b" +ignore="*rc[0-9] *a *b" From 24188b0773bc2d016b473381bcf982f565ba196f Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sat, 2 Jan 2021 09:15:55 -0500 Subject: [PATCH 2/2] cifs-utils: update to 6.12. --- .../patches/cifs.upall-setcap.patch | 51 ------------------- .../patches/mount.cifs-setcap.patch | 51 ------------------- srcpkgs/cifs-utils/template | 6 +-- 3 files changed, 3 insertions(+), 105 deletions(-) delete mode 100644 srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch delete mode 100644 srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch diff --git a/srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch b/srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch deleted file mode 100644 index 376c8e1d512..00000000000 --- a/srcpkgs/cifs-utils/patches/cifs.upall-setcap.patch +++ /dev/null @@ -1,51 +0,0 @@ -From linux-cifs Sat Nov 21 11:11:45 2020 -From: Jonas Witschel -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 ---- - 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 diff --git a/srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch b/srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch deleted file mode 100644 index 74f17240469..00000000000 --- a/srcpkgs/cifs-utils/patches/mount.cifs-setcap.patch +++ /dev/null @@ -1,51 +0,0 @@ -From linux-cifs Sat Nov 21 11:11:44 2020 -From: Jonas Witschel -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 ---- - 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 diff --git a/srcpkgs/cifs-utils/template b/srcpkgs/cifs-utils/template index 85af0443318..3acf8585ff4 100644 --- a/srcpkgs/cifs-utils/template +++ b/srcpkgs/cifs-utils/template @@ -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 " 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() {