snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

samba: update to 4.13.3. 

Also revert private lib changes in da2cea569c
that seem to break some installations.

Fixes #27565.
This commit is contained in:
Andrew J. Hesford 2021-01-02 09:14:43 -05:00
parent 59453168f9
commit 6f0dda0a07
6 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/shlibs
View File

@ -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

7
srcpkgs/samba/REMOVE
View File

@ -1,7 +0,0 @@
case ${ACTION} in
purge)
[ -d var/samba ] && rm -rf var/samba
[ -d var/spool/samba ] && rm -rf var/spool/samba
[ -d etc/samba/private ] && rm -rf etc/samba/private
;;
esac

3
srcpkgs/samba/files/nmbd/run
View File

@ -1,3 +1,6 @@
#!/bin/sh
mkdir -p /run/samba
mkdir -p /run/lock/samba
exec nmbd -F -S

3
srcpkgs/samba/files/smbd/run
View File

@ -1,3 +1,6 @@
#!/bin/sh
mkdir -p /run/samba
mkdir -p /run/lock/samba
exec smbd -F -S

34
srcpkgs/samba/template
View File

@ -1,15 +1,16 @@
# 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"
_idmap_modules="idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2"
_pdb_modules="pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4"
_auth_modules="auth_unix,auth_wbc,auth_server,auth_netlogind,autH_script,auth_samba4"
configure_args="--enable-fhs --sbindir=/usr/bin --localstatedir=/var
--sysconfdir=/etc --with-piddir=/run/samba --with-sockets-dir=/run/samba
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-modulesdir=/usr/lib/samba --disable-rpath --disable-rpath-install
--without-systemd --without-gettext --bundled-libraries=NONE
@ -26,7 +27,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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 +46,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 +174,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.*"

2
srcpkgs/samba/update
View File

@ -1 +1 @@
ignore="4.* *rc[0-9] *a *b"
ignore="*rc[0-9] *a *b"