Skip to content

Commit

Permalink
samba: clean up private libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
@ahesford
ahesford committed Dec 20, 2020
1 parent b177b1f commit 6efd1c0
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 35 deletions.
37 changes: 14 additions & 23 deletions common/shlibs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3997,55 +3997,46 @@ libevemu.so.3 evemu-2.7.0_1
libantilib.so.1 libantimicrox-3.1.2_1
libinih.so.0 inih-52_1
libpcaudio.so.0 pcaudiolib-1.1_1
libauth-unix-token-samba4.so samba-4.13.2_1
libauth4-samba4.so samba-4.13.2_1
libdcerpc-samba4.so samba-4.13.2_1
libdcerpc-samr.so.0 samba-4.13.2_1
libdcerpc-server-core.so.0 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.2_1
libnetapi.so.0 samba-4.13.2_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
libauth-unix-token-samba4.so samba-4.13.2_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
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-policy.so.0 samba-4.13.2_1
libsamba-python-samba4.so samba-4.13.2_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
libsmbpasswdparser-samba4.so samba-4.13.2_1
libxattr-tdb-samba4.so samba-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.2_1
libcommon-auth-samba4.so samba-libs-4.13.2_1
libdcerpc.so.0 samba-libs-4.13.2_1
libdcerpc-binding.so.0 samba-libs-4.13.2_1
libdcerpc-samba-samba4.so samba-libs-4.13.2_1
libflag-mapping-samba4.so samba-libs-4.13.2_1
libgpo-samba4.so samba-libs-4.13.2_1
libiov-buf-samba4.so 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-samba-samba4.so samba-libs-4.13.2_1
libndr-samba4.so 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
libprinter-driver-samba4.so samba-libs-4.13.2_1
libsamba-credentials.so.0 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
libsamba-util.so.0 samba-libs-4.13.2_1
libsamdb.so.0 samba-libs-4.13.2_1
libsmb-transport-samba4.so samba-libs-4.13.2_1
libsmbclient.so.0 samba-libs-4.13.2_1
libsmbconf.so.0 samba-libs-4.13.2_1
libsmbldap.so.2 samba-libs-4.13.2_1
libtdb-wrap-samba4.so samba-libs-4.13.2_1
libutil-cmdline-samba4.so 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
libcommon-auth-samba4.so samba-libs-4.13.2_1
libdcerpc-samba-samba4.so samba-libs-4.13.2_1
libgpo-samba4.so samba-libs-4.13.2_1
libndr-samba-samba4.so samba-libs-4.13.2_1
libndr-samba4.so samba-libs-4.13.2_1
libsmb-transport-samba4.so samba-libs-4.13.2_1
libutil-cmdline-samba4.so samba-libs-4.13.2_1
libwinbind-client-samba4.so samba-libs-4.13.2_1
23 changes: 11 additions & 12 deletions srcpkgs/samba/template
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'samba'
pkgname=samba
version=4.13.2
revision=1
revision=2
build_style=waf3
build_helper="qemu"
configure_script="buildtools/bin/waf"
Expand Down Expand Up @@ -41,16 +41,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 authkrb5 cmdline_contexts cmdline-credentials cli_cldap \
cli-ldap-common cli-nbt cli_smb_common cli_spoolss clidns common-auth dbwrap \
events flag-mapping genrand gensec gse http interfaces iov-buf krb5samba \
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 npa_tstream popt_samba3 popt_samba3_cmdline \
printer-driver registry replace samba-cluster-support samba-debug \
msghdr msrpc3 netif net_keytab npa_tstream popt_samba3 popt_samba3_cmdline \
printer_driver registry replace samba-cluster-support samba-debug \
samba-modules samba-security samba-sockets samba3-util samdb-common secrets3 \
server_id_db server-role smbclient-raw smbd_shim socket-blocking \
sys_rw talloc_report_printf talloc_report tdb_wrap time-basic trusts_util \
util_reg util_setid util_tdb tevent-util"
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"
configure_args+=" --with-privatelibdir=/usr/lib --builtin-libraries=${_privlibs// /,}"

export PYTHON_CONFIG="${XBPS_CROSS_BASE}/usr/bin/python3-config"
Expand Down Expand Up @@ -134,9 +134,8 @@ 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 cluster common-auth dcerpc-samba
flag-mapping gpo iov-buf ndr-samba ndr printer-driver
smb-transport tdb-wrap util-cmdline winbind-client"
_privlibs="cli-ldap cliauth common-auth dcerpc-samba gpo
ndr-samba ndr smb-transport util-cmdline winbind-client"

for _lib in ${_libs}; do
vmove "usr/lib/lib${_lib}.so.*"
Expand Down

0 comments on commit 6efd1c0

Please sign in to comment.