Wed Feb 28 03:38:49 2018 UTC ()
net/samba4: use devel/talloc package instead of bundled library.

I'd like to install net/samba4 and net/freeradius on the same server.
But devel/talloc on which net/freeradius depends conflicts bundled talloc
library used in net/samba.
net/samba also should use devel/talloc package.

Bump PKGREVISION.


(nonaka)
diff -r1.38 -r1.39 pkgsrc/net/samba4/Makefile
diff -r1.12 -r1.13 pkgsrc/net/samba4/PLIST
cvs diff -r1.38 -r1.39 pkgsrc/net/samba4/Makefile (expand / switch to unified diff)

--- pkgsrc/net/samba4/Makefile 2018/01/28 20:11:00 1.38
+++ pkgsrc/net/samba4/Makefile 2018/02/28 03:38:49 1.39
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.38 2018/01/28 20:11:00 wiz Exp $ 1# $NetBSD: Makefile,v 1.39 2018/02/28 03:38:49 nonaka Exp $
2 2
3DISTNAME= samba-${VERSION} 3DISTNAME= samba-${VERSION}
4PKGREVISION= 3 4PKGREVISION= 4
5CATEGORIES= net 5CATEGORIES= net
6MASTER_SITES= http://download.samba.org/pub/samba/stable/ 6MASTER_SITES= http://download.samba.org/pub/samba/stable/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.samba.org/ 9HOMEPAGE= http://www.samba.org/
10COMMENT= SMB/CIFS protocol server suite 10COMMENT= SMB/CIFS protocol server suite
11LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
12 12
13DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 13DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
14 14
15VERSION= 4.6.8 15VERSION= 4.6.8
16CONFLICTS+= ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]* 16CONFLICTS+= ja-samba-[0-9]* tdb-[0-9]* winbind-[0-9]*
17 17
@@ -80,27 +80,27 @@ CONFIGURE_ARGS+= --with-privatedir=${SMB @@ -80,27 +80,27 @@ CONFIGURE_ARGS+= --with-privatedir=${SMB
80CONFIGURE_ARGS+= --with-piddir=${SMB_PID} 80CONFIGURE_ARGS+= --with-piddir=${SMB_PID}
81CONFIGURE_ARGS+= --with-cachedir=${SMB_CACHE} 81CONFIGURE_ARGS+= --with-cachedir=${SMB_CACHE}
82CONFIGURE_ARGS+= --with-lockdir=${SMB_LOCK} 82CONFIGURE_ARGS+= --with-lockdir=${SMB_LOCK}
83CONFIGURE_ARGS+= --with-logfilebase=${SMB_LOGFILEBASE} 83CONFIGURE_ARGS+= --with-logfilebase=${SMB_LOGFILEBASE}
84CONFIGURE_ARGS+= --with-sockets-dir=${SMB_SOCKETS} 84CONFIGURE_ARGS+= --with-sockets-dir=${SMB_SOCKETS}
85CONFIGURE_ARGS+= --with-modulesdir=${SMB_MODULES} 85CONFIGURE_ARGS+= --with-modulesdir=${SMB_MODULES}
86CONFIGURE_ARGS+= --with-privatelibdir=${SMB_PRIVATELIB} 86CONFIGURE_ARGS+= --with-privatelibdir=${SMB_PRIVATELIB}
87CONFIGURE_ARGS+= --with-privileged-socket-dir=${SMB_PRIVSOCKETS} 87CONFIGURE_ARGS+= --with-privileged-socket-dir=${SMB_PRIVSOCKETS}
88CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG} 88CONFIGURE_ARGS+= --with-configdir=${SMB_CONFIG}
89CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv} 89CONFIGURE_ARGS+= --with-libiconv=${BUILDLINK_PREFIX.iconv}
90#CONFIGURE_ARGS+= --bundled-libraries=com_err 90#CONFIGURE_ARGS+= --bundled-libraries=com_err
91CONFIGURE_ARGS+= --enable-gnutls 91CONFIGURE_ARGS+= --enable-gnutls
92CONFIGURE_ARGS+= --abi-check-disable 92CONFIGURE_ARGS+= --abi-check-disable
93#CONFIGURE_ARGS+= --bundled-libraries=!crypto,ldb,ntdb,talloc,tdb,tevent 93#CONFIGURE_ARGS+= --bundled-libraries=!crypto,ldb,ntdb,!talloc,tdb,tevent
94.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])) 94.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO]))
95CONFIGURE_ARGS+= --jobs=${MAKE_JOBS} 95CONFIGURE_ARGS+= --jobs=${MAKE_JOBS}
96.else 96.else
97CONFIGURE_ARGS+= --jobs=1 97CONFIGURE_ARGS+= --jobs=1
98.endif 98.endif
99 99
100# Depends on ncurses, explicitly disable for now. 100# Depends on ncurses, explicitly disable for now.
101CONFIGURE_ARGS+= --without-regedit 101CONFIGURE_ARGS+= --without-regedit
102 102
103# for winbind option build. 103# for winbind option build.
104.if ${OPSYS} != "SunOS" 104.if ${OPSYS} != "SunOS"
105LDFLAGS+= -Wl,--allow-shlib-undefined 105LDFLAGS+= -Wl,--allow-shlib-undefined
106.endif 106.endif
@@ -190,14 +190,16 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # @@ -190,14 +190,16 @@ PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 #
190 190
191PY_PATCHPLIST= yes 191PY_PATCHPLIST= yes
192.include "../../lang/python/extension.mk" 192.include "../../lang/python/extension.mk"
193 193
194.if ${OPSYS} == "Linux" 194.if ${OPSYS} == "Linux"
195.include "../../devel/libuuid/buildlink3.mk" 195.include "../../devel/libuuid/buildlink3.mk"
196.endif 196.endif
197.include "../../converters/libiconv/buildlink3.mk" 197.include "../../converters/libiconv/buildlink3.mk"
198.include "../../devel/gettext-lib/buildlink3.mk" 198.include "../../devel/gettext-lib/buildlink3.mk"
199.include "../../devel/popt/buildlink3.mk" 199.include "../../devel/popt/buildlink3.mk"
200.include "../../devel/readline/buildlink3.mk" 200.include "../../devel/readline/buildlink3.mk"
201.include "../../devel/zlib/buildlink3.mk" 201.include "../../devel/zlib/buildlink3.mk"
202.include "../../security/gnutls/buildlink3.mk" 202.include "../../security/gnutls/buildlink3.mk"
 203BUILDLINK_API_DEPENDS.talloc+= talloc>=2.1.9
 204.include "../../devel/talloc/buildlink3.mk"
203.include "../../mk/bsd.pkg.mk" 205.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/net/samba4/PLIST (expand / switch to unified diff)

--- pkgsrc/net/samba4/PLIST 2017/05/24 15:51:32 1.12
+++ pkgsrc/net/samba4/PLIST 2018/02/28 03:38:49 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.12 2017/05/24 15:51:32 he Exp $ 1@comment $NetBSD: PLIST,v 1.13 2018/02/28 03:38:49 nonaka Exp $
2bin/cifsdd 2bin/cifsdd
3bin/dbwrap_tool 3bin/dbwrap_tool
4bin/eventlogadm 4bin/eventlogadm
5bin/findsmb 5bin/findsmb
6bin/gentest 6bin/gentest
7bin/ldbadd 7bin/ldbadd
8bin/ldbdel 8bin/ldbdel
9bin/ldbedit 9bin/ldbedit
10bin/ldbmodify 10bin/ldbmodify
11bin/ldbrename 11bin/ldbrename
12bin/ldbsearch 12bin/ldbsearch
13bin/locktest 13bin/locktest
14bin/masktest 14bin/masktest
@@ -412,27 +412,26 @@ ${PYSITELIB}/samba/tests/strings.py @@ -412,27 +412,26 @@ ${PYSITELIB}/samba/tests/strings.py
412${PYSITELIB}/samba/tests/subunitrun.py 412${PYSITELIB}/samba/tests/subunitrun.py
413${PYSITELIB}/samba/tests/unicodenames.py 413${PYSITELIB}/samba/tests/unicodenames.py
414${PYSITELIB}/samba/tests/upgrade.py 414${PYSITELIB}/samba/tests/upgrade.py
415${PYSITELIB}/samba/tests/upgradeprovision.py 415${PYSITELIB}/samba/tests/upgradeprovision.py
416${PYSITELIB}/samba/tests/upgradeprovisionneeddc.py 416${PYSITELIB}/samba/tests/upgradeprovisionneeddc.py
417${PYSITELIB}/samba/tests/xattr.py 417${PYSITELIB}/samba/tests/xattr.py
418${PYSITELIB}/samba/third_party/__init__.py 418${PYSITELIB}/samba/third_party/__init__.py
419${PYSITELIB}/samba/upgrade.py 419${PYSITELIB}/samba/upgrade.py
420${PYSITELIB}/samba/upgradehelpers.py 420${PYSITELIB}/samba/upgradehelpers.py
421${PYSITELIB}/samba/web_server/__init__.py 421${PYSITELIB}/samba/web_server/__init__.py
422${PYSITELIB}/samba/xattr.py 422${PYSITELIB}/samba/xattr.py
423${PYSITELIB}/samba/xattr_native.so 423${PYSITELIB}/samba/xattr_native.so
424${PYSITELIB}/samba/xattr_tdb.so 424${PYSITELIB}/samba/xattr_tdb.so
425${PYSITELIB}/talloc.so 
426${PYSITELIB}/tdb.so 425${PYSITELIB}/tdb.so
427${PYSITELIB}/tevent.py 426${PYSITELIB}/tevent.py
428lib/samba/auth/script.so 427lib/samba/auth/script.so
429lib/samba/bind9/dlz_bind9.so 428lib/samba/bind9/dlz_bind9.so
430lib/samba/bind9/dlz_bind9_10.so 429lib/samba/bind9/dlz_bind9_10.so
431lib/samba/bind9/dlz_bind9_11.so 430lib/samba/bind9/dlz_bind9_11.so
432lib/samba/bind9/dlz_bind9_9.so 431lib/samba/bind9/dlz_bind9_9.so
433lib/samba/gensec/krb5.so 432lib/samba/gensec/krb5.so
434${PLIST.ldap}lib/samba/idmap/ad.so 433${PLIST.ldap}lib/samba/idmap/ad.so
435lib/samba/idmap/autorid.so 434lib/samba/idmap/autorid.so
436lib/samba/idmap/hash.so 435lib/samba/idmap/hash.so
437${PLIST.ldap}lib/samba/idmap/rfc2307.so 436${PLIST.ldap}lib/samba/idmap/rfc2307.so
438lib/samba/idmap/rid.so 437lib/samba/idmap/rid.so
@@ -570,28 +569,26 @@ lib/samba/private/libndr-samba-samba4.so @@ -570,28 +569,26 @@ lib/samba/private/libndr-samba-samba4.so
570lib/samba/private/libndr-samba4.so 569lib/samba/private/libndr-samba4.so
571lib/samba/private/libnet-keytab-samba4.so 570lib/samba/private/libnet-keytab-samba4.so
572lib/samba/private/libnetif-samba4.so 571lib/samba/private/libnetif-samba4.so
573lib/samba/private/libnon-posix-acls-samba4.so 572lib/samba/private/libnon-posix-acls-samba4.so
574lib/samba/private/libnpa-tstream-samba4.so 573lib/samba/private/libnpa-tstream-samba4.so
575lib/samba/private/libnss-info-samba4.so 574lib/samba/private/libnss-info-samba4.so
576lib/samba/private/libpac-samba4.so 575lib/samba/private/libpac-samba4.so
577lib/samba/private/libpopt-samba3-samba4.so 576lib/samba/private/libpopt-samba3-samba4.so
578lib/samba/private/libposix-eadb-samba4.so 577lib/samba/private/libposix-eadb-samba4.so
579lib/samba/private/libprinting-migrate-samba4.so 578lib/samba/private/libprinting-migrate-samba4.so
580lib/samba/private/libprocess-model-samba4.so 579lib/samba/private/libprocess-model-samba4.so
581lib/samba/private/libpyldb-util.so.1 580lib/samba/private/libpyldb-util.so.1
582lib/samba/private/libpyldb-util.so.1.1.29 581lib/samba/private/libpyldb-util.so.1.1.29
583lib/samba/private/libpytalloc-util.so.2 
584lib/samba/private/libpytalloc-util.so.2.1.9 
585lib/samba/private/libregistry-samba4.so 582lib/samba/private/libregistry-samba4.so
586lib/samba/private/libreplace-samba4.so 583lib/samba/private/libreplace-samba4.so
587lib/samba/private/libroken-samba4.so.19 584lib/samba/private/libroken-samba4.so.19
588lib/samba/private/libroken-samba4.so.19.0.1 585lib/samba/private/libroken-samba4.so.19.0.1
589lib/samba/private/libsamba-cluster-support-samba4.so 586lib/samba/private/libsamba-cluster-support-samba4.so
590lib/samba/private/libsamba-debug-samba4.so 587lib/samba/private/libsamba-debug-samba4.so
591lib/samba/private/libsamba-modules-samba4.so 588lib/samba/private/libsamba-modules-samba4.so
592lib/samba/private/libsamba-net-samba4.so 589lib/samba/private/libsamba-net-samba4.so
593lib/samba/private/libsamba-python-samba4.so 590lib/samba/private/libsamba-python-samba4.so
594lib/samba/private/libsamba-security-samba4.so 591lib/samba/private/libsamba-security-samba4.so
595lib/samba/private/libsamba-sockets-samba4.so 592lib/samba/private/libsamba-sockets-samba4.so
596lib/samba/private/libsamba3-util-samba4.so 593lib/samba/private/libsamba3-util-samba4.so
597lib/samba/private/libsamdb-common-samba4.so 594lib/samba/private/libsamdb-common-samba4.so
@@ -600,28 +597,26 @@ lib/samba/private/libserver-id-db-samba4 @@ -600,28 +597,26 @@ lib/samba/private/libserver-id-db-samba4
600lib/samba/private/libserver-role-samba4.so 597lib/samba/private/libserver-role-samba4.so
601lib/samba/private/libservice-samba4.so 598lib/samba/private/libservice-samba4.so
602lib/samba/private/libshares-samba4.so 599lib/samba/private/libshares-samba4.so
603lib/samba/private/libsmb-transport-samba4.so 600lib/samba/private/libsmb-transport-samba4.so
604lib/samba/private/libsmbclient-raw-samba4.so 601lib/samba/private/libsmbclient-raw-samba4.so
605lib/samba/private/libsmbd-base-samba4.so 602lib/samba/private/libsmbd-base-samba4.so
606lib/samba/private/libsmbd-conn-samba4.so 603lib/samba/private/libsmbd-conn-samba4.so
607lib/samba/private/libsmbd-shim-samba4.so 604lib/samba/private/libsmbd-shim-samba4.so
608${PLIST.ldap}lib/samba/private/libsmbldaphelper-samba4.so 605${PLIST.ldap}lib/samba/private/libsmbldaphelper-samba4.so
609lib/samba/private/libsmbpasswdparser-samba4.so 606lib/samba/private/libsmbpasswdparser-samba4.so
610lib/samba/private/libsocket-blocking-samba4.so 607lib/samba/private/libsocket-blocking-samba4.so
611lib/samba/private/libsys-rw-samba4.so 608lib/samba/private/libsys-rw-samba4.so
612lib/samba/private/libtalloc-report-samba4.so 609lib/samba/private/libtalloc-report-samba4.so
613lib/samba/private/libtalloc.so.2 
614lib/samba/private/libtalloc.so.2.1.9 
615lib/samba/private/libtdb-wrap-samba4.so 610lib/samba/private/libtdb-wrap-samba4.so
616lib/samba/private/libtdb.so.1 611lib/samba/private/libtdb.so.1
617lib/samba/private/libtdb.so.1.3.12 612lib/samba/private/libtdb.so.1.3.12
618lib/samba/private/libtevent.so.0 613lib/samba/private/libtevent.so.0
619lib/samba/private/libtevent.so.0.9.31 614lib/samba/private/libtevent.so.0.9.31
620lib/samba/private/libtime-basic-samba4.so 615lib/samba/private/libtime-basic-samba4.so
621lib/samba/private/libtorture-samba4.so 616lib/samba/private/libtorture-samba4.so
622lib/samba/private/libtrusts-util-samba4.so 617lib/samba/private/libtrusts-util-samba4.so
623lib/samba/private/libutil-cmdline-samba4.so 618lib/samba/private/libutil-cmdline-samba4.so
624lib/samba/private/libutil-reg-samba4.so 619lib/samba/private/libutil-reg-samba4.so
625lib/samba/private/libutil-setid-samba4.so 620lib/samba/private/libutil-setid-samba4.so
626lib/samba/private/libutil-tdb-samba4.so 621lib/samba/private/libutil-tdb-samba4.so
627lib/samba/private/libwinbind-client-samba4.so 622lib/samba/private/libwinbind-client-samba4.so