From a9e61be4ee5bf6816e4a8fe1baf8930712d5d49d Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 7 Oct 2021 21:12:04 -0700 Subject: [PATCH 1/5] ldb: update to 2.4.0 --- srcpkgs/ldb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ldb/template b/srcpkgs/ldb/template index 8843e391d86c..f12a62623d9d 100644 --- a/srcpkgs/ldb/template +++ b/srcpkgs/ldb/template @@ -1,6 +1,6 @@ # Template file for 'ldb' pkgname=ldb -version=2.3.0 +version=2.4.0 revision=1 build_style=waf3 build_helper="qemu" @@ -18,7 +18,7 @@ maintainer="Yuusha Spacewolf " license="LGPL-3.0-or-later" homepage="https://www.samba.org/ldb/" distfiles="https://www.samba.org/ftp/pub/ldb/ldb-${version}.tar.gz" -checksum=a4d308b3d0922ef01f3661a69ebc373e772374defa76cf0979ad21b21f91922d +checksum=76e75278b069a939e1422166debbe80f85a0d2eade9f6a7aebe8634ac50f2d83 # workaround for cmocka's broken uintptr_t definition on musl if [ "$XBPS_TARGET_WORDSIZE" = "64" -a "$XBPS_TARGET_LIBC" = "musl" ]; then From 976e746f3258c0e4fe8452dc5d8b5e7c404ad60b Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 7 Oct 2021 21:12:16 -0700 Subject: [PATCH 2/5] talloc: update to 2.3.3 --- srcpkgs/talloc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/talloc/template b/srcpkgs/talloc/template index 8ad2baf8937a..40560a6632c4 100644 --- a/srcpkgs/talloc/template +++ b/srcpkgs/talloc/template @@ -1,6 +1,6 @@ # Template file for 'talloc' pkgname=talloc -version=2.3.2 +version=2.3.3 revision=1 build_style=waf3 build_helper="qemu" @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://talloc.samba.org/" distfiles="http://samba.org/ftp/${pkgname}/${pkgname}-${version}.tar.gz" -checksum=27a03ef99e384d779124df755deb229cd1761f945eca6d200e8cfd9bf5297bd7 +checksum=6be95b2368bd0af1c4cd7a88146eb6ceea18e46c3ffc9330bf6262b40d1d8aaa export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" From 5f9176882c65b6795c10652dfad81def7d93cc6b Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 7 Oct 2021 21:12:32 -0700 Subject: [PATCH 3/5] tdb: update to 1.4.5 --- srcpkgs/tdb/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/tdb/template b/srcpkgs/tdb/template index 87f0b211a05b..f30a225d3b8f 100644 --- a/srcpkgs/tdb/template +++ b/srcpkgs/tdb/template @@ -1,6 +1,6 @@ # Template file for 'tdb' pkgname=tdb -version=1.4.3 +version=1.4.5 revision=1 build_style=waf3 build_helper="qemu" @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://tdb.samba.org/" distfiles="http://samba.org/ftp/tdb/tdb-${version}.tar.gz" -checksum=c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b +checksum=bcfced884f7031080998b5c4b1c5dce57567055f79417f86dba40dcde99a0e41 export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" From 3f1d6734100d3ecdc462fdc492bd89debffae3dd Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 7 Oct 2021 21:12:44 -0700 Subject: [PATCH 4/5] tevent: update to 0.11.0 --- srcpkgs/tevent/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/tevent/template b/srcpkgs/tevent/template index 731d707efaaa..7f0358860e26 100644 --- a/srcpkgs/tevent/template +++ b/srcpkgs/tevent/template @@ -1,7 +1,7 @@ # Template file for 'tevent' pkgname=tevent -version=0.10.2 -revision=2 +version=0.11.0 +revision=1 build_style=waf3 build_helper="qemu" configure_script="buildtools/bin/waf" @@ -9,13 +9,13 @@ configure_args="--sysconfdir=/etc --localstatedir=/var --disable-rpath --disable-rpath-install --without-gettext --builtin-libraries=replace --bundled-libraries=NONE" hostmakedepends="pkg-config docbook2x" -makedepends="python3-devel talloc-devel libxslt gettext-devel" +makedepends="python3-devel talloc-devel libxslt gettext-devel cmocka-devel" short_desc="Event system based on the talloc memory management library" maintainer="Yuusha Spacewolf " license="GPL-3.0-or-later" homepage="https://tevent.samba.org" distfiles="https://ftp.samba.org/pub/tevent/tevent-${version}.tar.gz" -checksum=f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696 +checksum=ee9a86c8e808aac2fe1e924eaa139ff7f0269d0e8e4fafa850ae5c7489bc82ba export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config" From 6c206802ced71eec8946867c7b444ecdb8a3bcc4 Mon Sep 17 00:00:00 2001 From: Cameron Nemo Date: Thu, 7 Oct 2021 21:11:13 -0700 Subject: [PATCH 5/5] samba: update to 4.15.0 Also use the default privdir for compatibility with upstream AppArmor rules. --- common/shlibs | 8 +++++--- srcpkgs/samba/template | 13 +++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7e5289f58f66..4d9ee9691a64 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3937,8 +3937,10 @@ libantilib.so.1 libantimicrox-3.1.2_1 libinih.so.0 inih-52_1 libpcaudio.so.0 pcaudiolib-1.1_1 libdcerpc-samr.so.0 samba-4.13.2_1 +libdcerpc-pkt-auth-samba4.so samba-4.15.0_1 libdcerpc-server-core.so.0 samba-4.13.2_1 -libnetapi.so.0 samba-4.13.2_1 +libdnsserver-common-samba4.so samba-4.15.0_1 +libnetapi.so.1 samba-4.15.0_1 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 @@ -3962,7 +3964,7 @@ libdcerpc-binding.so.0 samba-libs-4.13.2_1 libndr-krb5pac.so.0 samba-libs-4.13.2_1 libndr-nbt.so.0 samba-libs-4.13.2_1 libndr-standard.so.0 samba-libs-4.13.2_1 -libndr.so.1 samba-libs-4.13.2_1 +libndr.so.2 samba-libs-4.15.0_1 libsamba-credentials.so.1 samba-libs-4.13.2_1 libsamba-errors.so.1 samba-libs-4.13.2_1 libsamba-hostconfig.so.0 samba-libs-4.13.2_1 @@ -3986,7 +3988,7 @@ 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 +libcmdline-samba4.so samba-libs-4.15.0_1 libwinbind-client-samba4.so samba-libs-4.13.2_1 libsixel.so.1 libsixel-1.8.6_1 libpamtest.so.0 pam_wrapper-1.1.3_1 diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 69ac97f71d34..0b63cfdcf5c0 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,6 +1,6 @@ # Template file for 'samba' pkgname=samba -version=4.14.7 +version=4.15.0 revision=1 build_style=waf3 build_helper="qemu" @@ -11,7 +11,7 @@ _auth_modules="auth_unix,auth_wbc,auth_server,auth_netlogind,autH_script,auth_sa configure_args="--enable-fhs --sbindir=/usr/bin --localstatedir=/var --sysconfdir=/etc --with-piddir=/run/samba --with-sockets-dir=/run/samba --with-lockdir=/run/lock/samba - --with-privatedir=/etc/samba/private --with-pammodulesdir=/usr/lib/security + --with-pammodulesdir=/usr/lib/security --with-modulesdir=/usr/lib/samba --disable-rpath --disable-rpath-install --without-systemd --without-gettext --bundled-libraries=NONE --with-system-mitkrb5 --without-ad-dc --with-cluster-support @@ -27,10 +27,10 @@ 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=6f50353f9602aa20245eb18ceb00e7e5ec793df0974aebd5254c38f16d8f1906 +checksum=b1f3470838623156283733e6295f49cd6ae44a7e61bb9c346315d1e668d24640 lib32disabled=yes conf_files="/etc/pam.d/samba /etc/samba/smb.conf" -make_dirs="/etc/samba/private 0750 root root" +make_dirs="/var/lib/samba/private 0700 root root" subpackages="smbclient samba-ctdb samba-cups samba-devel samba-libs samba-python3" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then @@ -110,7 +110,7 @@ smbclient_package() { local _t _tools # These utilities have man pages in section 1 - _tools="findsmb dbwrap_tool mdfind mvxattr nmblookup ntlm_auth + _tools="dbwrap_tool mvxattr nmblookup ntlm_auth oLschema2ldif regdiff regpatch regshell regtree rpcclient sharesec smbcacls smbclient smbcquotas smbget smbtar smbtree wbinfo" @@ -176,7 +176,8 @@ samba-libs_package() { samba-util samdb smbclient smbconf smbldap wbclient" _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" + smb-transport tdb-wrap winbind-client dcerpc-pkt-auth + dnsserver-common" for _lib in ${_libs}; do vmove "usr/lib/lib${_lib}.so.*"