From bbe65b4e7c254bfe2dfee7c9109f0dab6176fe98 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Fri, 25 Jun 2021 11:08:18 -0400 Subject: [PATCH] samba: update to 4.14.5, fix nss modules for musl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit nss modules from samba, like libnss_winbind, will be used by musl-nscd-devel, and therefore should use its headers for the definitions of return values and others. Without musl-nscd-devel to provide , samba uses a fallback header that carries completely incompatible return value definitions. Co-authored-by: Érico Nogueira --- common/shlibs | 2 +- srcpkgs/samba/template | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 8a7eef8df8c..c06e74ed802 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3963,7 +3963,7 @@ 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 -libsamba-credentials.so.0 samba-libs-4.13.2_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 libsamba-passdb.so.0 samba-libs-4.13.2_1 diff --git a/srcpkgs/samba/template b/srcpkgs/samba/template index 90be22e5705..5ac491dd553 100644 --- a/srcpkgs/samba/template +++ b/srcpkgs/samba/template @@ -1,6 +1,6 @@ # Template file for 'samba' pkgname=samba -version=4.13.4 +version=4.14.5 revision=1 build_style=waf3 build_helper="qemu" @@ -27,14 +27,14 @@ 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=a1b34c63f7100cc8626902d80f335c7cb0b45d4707dd3c4b010f7a28ed615c78 +checksum=bb6ef5d2f16b85288d823578abc453d9a80514c42e5a2ea2c4e3c60dc42335c3 lib32disabled=yes conf_files="/etc/pam.d/samba /etc/samba/smb.conf" make_dirs="/etc/samba/private 0750 root root" subpackages="smbclient samba-ctdb samba-cups samba-devel samba-libs samba-python3" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then - makedepends+=" musl-legacy-compat" + makedepends+=" musl-legacy-compat musl-nscd-devel" else makedepends+=" glusterfs-devel" subpackages+=" samba-glusterfs"