Index: net/samba422/Makefile =================================================================== --- net/samba422/Makefile +++ net/samba422/Makefile @@ -192,7 +192,6 @@ SAMBA4_BUNDLED_TALLOC?= no SAMBA4_BUNDLED_TEVENT?= no SAMBA4_BUNDLED_TDB?= no -SAMBA4_BUNDLED_LDB?= yes # cmocka .if defined(SAMBA4_BUNDLED_CMOCKA) && ${SAMBA4_BUNDLED_CMOCKA} == yes SAMBA4_BUNDLED_LIBS+= cmocka @@ -244,31 +243,21 @@ PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment " SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment " .endif -# ldb -.if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes -SAMBA4_BUNDLED_LDB= yes -SAMBA4_BUNDLED_LIBS+= ldb -CONFLICTS_INSTALL+= ldb-* ldb2-* -PLIST_SUB+= SAMBA4_BUNDLED_LDB="" -SUB_LIST+= SAMBA4_BUNDLED_LDB="" -SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/modules -.else -SAMBA4_BUNDLED_LIBS+= !ldb -BUILD_DEPENDS+= ldb29>=2.9.1:databases/ldb29 -RUN_DEPENDS+= ldb29>=2.9.1:databases/ldb29 -PLIST_SUB+= SAMBA4_BUNDLED_LDB="@comment " -SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment " -SAMBA4_MODULEDIR= ${PREFIX}/lib/shared-modules -.endif .if (defined(SAMBA4_BUNDLED_TALLOC) && ${SAMBA4_BUNDLED_TALLOC} == yes) \ || (defined(SAMBA4_BUNDLED_TDB) && ${SAMBA4_BUNDLED_TDB} == yes) \ - || (defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes) \ || (defined(SAMBA4_BUNDLED_TEVENT) && ${SAMBA4_BUNDLED_TEVENT} == yes) SAMBA4_BUNDLED_LIBS+= replace .endif # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err + +### Public libraries +# ldb +SAMBA4_PRIVATE_LIBS+= !ldb +CONFLICTS_INSTALL+= ldb-* ldb2[0-9]-* +SAMBA4_MODULEDIR= ${SAMBA4_LIBDIR}/modules + # Set the test environment variables TEST_USES= python TEST_ENV= PYTHON="${PYTHON_CMD}" \ @@ -471,17 +460,17 @@ SAMBA4_BUNDLED_LIBS+= !pytdb . endif -. if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes SAMBA4_BUNDLED_LIBS+= pyldb pyldb-util -. else -SAMBA4_BUNDLED_LIBS+= !pyldb !pyldb-util -. endif .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) SAMBA4_MODULES+= ${WANT_EXP_MODULES} .endif +.if defined(SAMBA4_PRIVATE_LIBS) && !empty(SAMBA4_PRIVATE_LIBS) +CONFIGURE_ARGS+= --private-libraries="${SAMBA4_PRIVATE_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" +.endif + .if defined(SAMBA4_BUNDLED_LIBS) && !empty(SAMBA4_BUNDLED_LIBS) CONFIGURE_ARGS+= --bundled-libraries="${SAMBA4_BUNDLED_LIBS:Q:C|(\\\\ )+|,|g:S|\\||g}" .endif @@ -511,7 +500,7 @@ ############################################################################## # Only for 64-bit architectures .if ${ARCH} != armv6 && ${ARCH} != armv7 && ${ARCH} != i386 && ${ARCH} != mips && ${ARCH} != powerpc && ${ARCH} != powerpcspe -. if defined(SAMBA4_BUNDLED_LDB) && ${SAMBA4_BUNDLED_LDB} == yes && (${PORT_OPTIONS:MAD_DC} || ${PORT_OPTIONS:MDEVELOPER}) +. if (${PORT_OPTIONS:MAD_DC} || ${PORT_OPTIONS:MDEVELOPER}) # LMDB SAMBA4_LMDB_DEPENDS= lmdb>=0.9.16:databases/lmdb PLIST_FILES+= ${SAMBA4_LIBDIR}/private/libldb-mdb-int-private-samba.so \ Index: net/samba422/pkg-plist =================================================================== --- net/samba422/pkg-plist +++ net/samba422/pkg-plist @@ -40,6 +40,20 @@ sbin/nmbd sbin/smbd sbin/winbindd +include/samba4/credentials.h +include/samba4/dcerpc.h +include/samba4/dcerpc_server.h +include/samba4/gen_ndr/ndr_samr_c.h +include/samba4/ldb.h +include/samba4/ldb_errors.h +include/samba4/ldb_handlers.h +include/samba4/ldb_module.h +include/samba4/ldb_version.h +include/samba4/param.h +include/samba4/policy.h +include/samba4/util/tevent_ntstatus.h +include/samba4/util/tevent_unix.h +include/samba4/util/tevent_werror.h include/samba4/charset.h include/samba4/core/doserr.h include/samba4/core/error.h @@ -121,6 +135,24 @@ @dir include/samba4/gen_ndr @dir include/samba4/core @dir include/samba4 +%%SAMBA4_LIBDIR%%/libdcerpc-samr.so +%%SAMBA4_LIBDIR%%/libdcerpc-samr.so.0 +%%SAMBA4_LIBDIR%%/libdcerpc-server.so +%%SAMBA4_LIBDIR%%/libdcerpc-server.so.0 +%%SAMBA4_LIBDIR%%/libdcerpc.so +%%SAMBA4_LIBDIR%%/libdcerpc.so.0 +%%SAMBA4_LIBDIR%%/libldb.so +%%SAMBA4_LIBDIR%%/libldb.so.2 +%%SAMBA4_LIBDIR%%/libsamba-credentials.so +%%SAMBA4_LIBDIR%%/libsamba-credentials.so.1 +%%SAMBA4_LIBDIR%%/libsamba-hostconfig.so +%%SAMBA4_LIBDIR%%/libsamba-hostconfig.so.0 +%%SAMBA4_LIBDIR%%/libsamba-policy.so +%%SAMBA4_LIBDIR%%/libsamba-policy.so.0 +%%SAMBA4_LIBDIR%%/libsamdb.so +%%SAMBA4_LIBDIR%%/libsamdb.so.0 +%%SAMBA4_LIBDIR%%/libtevent-util.so +%%SAMBA4_LIBDIR%%/libtevent-util.so.0 %%SAMBA4_LIBDIR%%/libdcerpc-binding.so %%SAMBA4_LIBDIR%%/libdcerpc-binding.so.0 %%SAMBA4_LIBDIR%%/libdcerpc-server-core.so @@ -188,11 +220,8 @@ %%SAMBA4_LIBDIR%%/private/libdbwrap-private-samba.so %%SAMBA4_LIBDIR%%/private/libutil-crypt-private-samba.so %%SAMBA4_LIBDIR%%/private/libdcerpc-pkt-auth-private-samba.so -%%SAMBA4_LIBDIR%%/private/libdcerpc-private-samba.so %%SAMBA4_LIBDIR%%/private/libdcerpc-samba-private-samba.so %%SAMBA4_LIBDIR%%/private/libdcerpc-samba4-private-samba.so -%%SAMBA4_LIBDIR%%/private/libdcerpc-samr-private-samba.so -%%SAMBA4_LIBDIR%%/private/libdcerpc-server-private-samba.so %%SAMBA4_LIBDIR%%/private/libdnsserver-common-private-samba.so %%SAMBA4_LIBDIR%%/private/libdsdb-module-private-samba.so %%SAMBA4_LIBDIR%%/private/libevents-private-samba.so @@ -243,19 +272,7 @@ %%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libroken-private-samba.so %%SAMBA4_LIBDIR%%/private/libRPC-SERVER-LOOP-private-samba.so %%SAMBA4_LIBDIR%%/private/libRPC-WORKER-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-credentials-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-cluster-support-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-debug-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-hostconfig-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-modules-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-net-join%%PYTHON_TAG%%-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-net-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-policy-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-security-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba-sockets-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamba3-util-private-samba.so %%SAMBA4_LIBDIR%%/private/libsamdb-common-private-samba.so -%%SAMBA4_LIBDIR%%/private/libsamdb-private-samba.so %%SAMBA4_LIBDIR%%/private/libsecrets3-private-samba.so %%SAMBA4_LIBDIR%%/private/libserver-id-db-private-samba.so %%SAMBA4_LIBDIR%%/private/libserver-role-private-samba.so @@ -270,7 +287,6 @@ %%SAMBA4_LIBDIR%%/private/libsys-rw-private-samba.so %%SAMBA4_LIBDIR%%/private/libtalloc-report-printf-private-samba.so %%SAMBA4_LIBDIR%%/private/libtalloc-report-private-samba.so -%%SAMBA4_LIBDIR%%/private/libtevent-util-private-samba.so %%SAMBA4_LIBDIR%%/private/libtdb-wrap-private-samba.so %%SAMBA4_LIBDIR%%/private/libtime-basic-private-samba.so %%SAMBA4_LIBDIR%%/private/libtorture-private-samba.so @@ -279,6 +295,14 @@ %%SAMBA4_LIBDIR%%/private/libutil-tdb-private-samba.so %%GSSAPI_BUILTIN%%%%SAMBA4_LIBDIR%%/private/libwind-private-samba.so %%SAMBA4_LIBDIR%%/private/libxattr-tdb-private-samba.so +%%SAMBA4_LIBDIR%%/private/libsamba-cluster-support-private-samba.so +%%SAMBA4_LIBDIR%%/private/libsamba-debug-private-samba.so +%%SAMBA4_LIBDIR%%/private/libsamba-modules-private-samba.so +%%SAMBA4_LIBDIR%%/private/libsamba-net-join%%PYTHON_TAG%%-private-samba.so +%%SAMBA4_LIBDIR%%/private/libsamba-net-private-samba.so +%%SAMBA4_LIBDIR%%/private/libsamba-security-private-samba.so +%%SAMBA4_LIBDIR%%/private/libsamba-sockets-private-samba.so +%%SAMBA4_LIBDIR%%/private/libsamba3-util-private-samba.so @dir %%SAMBA4_LIBDIR%%/private @dir %%SAMBA4_LIBDIR%% %%PKGCONFIGDIR%%/ndr.pc @@ -289,6 +313,14 @@ %%PKGCONFIGDIR%%/samba-util.pc %%PKGCONFIGDIR%%/smbclient.pc %%PKGCONFIGDIR%%/wbclient.pc +%%PKGCONFIGDIR%%/dcerpc.pc +%%PKGCONFIGDIR%%/dcerpc_samr.pc +%%PKGCONFIGDIR%%/dcerpc_server.pc +%%PKGCONFIGDIR%%/ldb.pc +%%PKGCONFIGDIR%%/samba-credentials.pc +%%PKGCONFIGDIR%%/samba-hostconfig.pc +%%PKGCONFIGDIR%%/samba-policy.pc +%%PKGCONFIGDIR%%/samdb.pc @comment Setup files @comment Man pages %%MANPAGES%%share/man/man1/dbwrap_tool.1.gz @@ -402,38 +434,37 @@ @dir %%SAMBA4_BINDDNSDIR%% @comment Use bundled libraries %%SAMBA4_BUNDLED_CMOCKA%%%%SAMBA4_LIBDIR%%/private/libcmocka-private-samba.so -%%SAMBA4_BUNDLED_LDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_ldb_text.py -%%SAMBA4_BUNDLED_LDB%%%%PYTHON3%%%%PYTHON_SITELIBDIR%%/ldb%%PYTHON_TAG%%.so -%%SAMBA4_BUNDLED_LDB%%%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libpyldb-util%%PYTHON_TAG%%-private-samba.so -%%SAMBA4_BUNDLED_LDB%%bin/ldbadd -%%SAMBA4_BUNDLED_LDB%%bin/ldbdel -%%SAMBA4_BUNDLED_LDB%%bin/ldbedit -%%SAMBA4_BUNDLED_LDB%%bin/ldbmodify -%%SAMBA4_BUNDLED_LDB%%bin/ldbrename -%%SAMBA4_BUNDLED_LDB%%bin/ldbsearch -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-cmdline-private-samba.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-key-value-private-samba.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-private-samba.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-tdb-err-map-private-samba.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_LIBDIR%%/private/libldb-tdb-int-private-samba.so -%%AD_DC%%%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/count_attrs.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/asq.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/ildap.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/ldb.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/ldbsamba_extensions.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/paged_searches.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/rdn_name.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/sample.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/server_sort.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/skel.so -%%SAMBA4_BUNDLED_LDB%%%%SAMBA4_MODULEDIR%%/ldb/tdb.so -%%MANPAGES%%%%SAMBA4_BUNDLED_LDB%%share/man/man3/ldb.3.gz -%%MANPAGES%%%%SAMBA4_BUNDLED_LDB%%share/man/man1/ldbadd.1.gz -%%MANPAGES%%%%SAMBA4_BUNDLED_LDB%%share/man/man1/ldbdel.1.gz -%%MANPAGES%%%%SAMBA4_BUNDLED_LDB%%share/man/man1/ldbedit.1.gz -%%MANPAGES%%%%SAMBA4_BUNDLED_LDB%%share/man/man1/ldbmodify.1.gz -%%MANPAGES%%%%SAMBA4_BUNDLED_LDB%%share/man/man1/ldbrename.1.gz -%%MANPAGES%%%%SAMBA4_BUNDLED_LDB%%share/man/man1/ldbsearch.1.gz +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/_ldb_text.py +%%PYTHON3%%%%PYTHON_SITELIBDIR%%/ldb%%PYTHON_TAG%%.so +%%PYTHON3%%%%SAMBA4_LIBDIR%%/private/libpyldb-util%%PYTHON_TAG%%-private-samba.so +bin/ldbadd +bin/ldbdel +bin/ldbedit +bin/ldbmodify +bin/ldbrename +bin/ldbsearch +%%SAMBA4_LIBDIR%%/private/libldb-cmdline-private-samba.so +%%SAMBA4_LIBDIR%%/private/libldb-key-value-private-samba.so +%%SAMBA4_LIBDIR%%/private/libldb-tdb-err-map-private-samba.so +%%SAMBA4_LIBDIR%%/private/libldb-tdb-int-private-samba.so +%%AD_DC%%%%SAMBA4_MODULEDIR%%/ldb/count_attrs.so +%%SAMBA4_MODULEDIR%%/ldb/asq.so +%%SAMBA4_MODULEDIR%%/ldb/ildap.so +%%SAMBA4_MODULEDIR%%/ldb/ldb.so +%%SAMBA4_MODULEDIR%%/ldb/ldbsamba_extensions.so +%%SAMBA4_MODULEDIR%%/ldb/paged_searches.so +%%SAMBA4_MODULEDIR%%/ldb/rdn_name.so +%%SAMBA4_MODULEDIR%%/ldb/sample.so +%%SAMBA4_MODULEDIR%%/ldb/server_sort.so +%%SAMBA4_MODULEDIR%%/ldb/skel.so +%%SAMBA4_MODULEDIR%%/ldb/tdb.so +%%MANPAGES%%share/man/man3/ldb.3.gz +%%MANPAGES%%share/man/man1/ldbadd.1.gz +%%MANPAGES%%share/man/man1/ldbdel.1.gz +%%MANPAGES%%share/man/man1/ldbedit.1.gz +%%MANPAGES%%share/man/man1/ldbmodify.1.gz +%%MANPAGES%%share/man/man1/ldbrename.1.gz +%%MANPAGES%%share/man/man1/ldbsearch.1.gz %%MANPAGES%%%%SAMBA4_BUNDLED_TDB%%share/man/man8/tdbbackup.8.gz %%MANPAGES%%%%SAMBA4_BUNDLED_TDB%%share/man/man8/tdbdump.8.gz %%MANPAGES%%%%SAMBA4_BUNDLED_TDB%%share/man/man8/tdbrestore.8.gz