Date: Tue, 13 Mar 2018 21:00:04 +0000 (UTC) From: "Timur I. Bakeyev" <timur@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r464431 - in head/net: samba45 samba46 samba46/files samba47 samba47/files samba47/files/man Message-ID: <201803132100.w2DL04QK045659@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Tue Mar 13 21:00:04 2018 New Revision: 464431 URL: https://svnweb.freebsd.org/changeset/ports/464431 Log: Security update for samba45, samba46, samba47 ports to address CVE-2018-1050 and CVE-2018-1057. As AD DC doesn't work in samba46 and was broken again in samba 4.7.4 - the attack vector is quite narrow. Security: CVE-2018-1050 CVE-2018-1057 Sponsored by: iXsystems Inc. Added: head/net/samba47/files/man/ldb.3 (contents, props changed) head/net/samba47/files/man/ldbadd.1 (contents, props changed) head/net/samba47/files/man/ldbdel.1 (contents, props changed) head/net/samba47/files/man/ldbedit.1 (contents, props changed) head/net/samba47/files/man/ldbmodify.1 (contents, props changed) head/net/samba47/files/man/ldbrename.1 (contents, props changed) head/net/samba47/files/man/ldbsearch.1 (contents, props changed) head/net/samba47/files/man/talloc.3 (contents, props changed) head/net/samba47/files/man/tdbbackup.8 (contents, props changed) head/net/samba47/files/man/tdbdump.8 (contents, props changed) head/net/samba47/files/man/tdbrestore.8 (contents, props changed) head/net/samba47/files/man/tdbtool.8 (contents, props changed) head/net/samba47/files/patch-buildtools__wafsamba__wscript (contents, props changed) Modified: head/net/samba45/Makefile head/net/samba45/distinfo head/net/samba46/Makefile head/net/samba46/distinfo head/net/samba46/files/patch-buildtools__wafsamba__wafsamba.py head/net/samba46/files/patch-source3__libads__kerberos_keytab.c head/net/samba46/pkg-plist head/net/samba47/Makefile head/net/samba47/distinfo head/net/samba47/files/patch-buildtools__wafsamba__samba_autoconf.py head/net/samba47/files/patch-buildtools__wafsamba__samba_python.py head/net/samba47/files/patch-ctdb__wscript head/net/samba47/files/patch-lib__replace__wscript head/net/samba47/files/patch-source3__libads__kerberos_keytab.c head/net/samba47/files/patch-source3__modules__vfs_streams_xattr.c head/net/samba47/pkg-plist Modified: head/net/samba45/Makefile ============================================================================== --- head/net/samba45/Makefile Tue Mar 13 20:44:18 2018 (r464430) +++ head/net/samba45/Makefile Tue Mar 13 21:00:04 2018 (r464431) @@ -19,7 +19,7 @@ CONFLICTS?= samba4-4.0.* samba4[1-46-9]-4.* p5-Parse SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.5.15 +SAMBA4_VERSION= 4.5.16 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} Modified: head/net/samba45/distinfo ============================================================================== --- head/net/samba45/distinfo Tue Mar 13 20:44:18 2018 (r464430) +++ head/net/samba45/distinfo Tue Mar 13 21:00:04 2018 (r464431) @@ -1,3 +1,3 @@ -TIMESTAMP = 1511311588 -SHA256 (samba-4.5.15.tar.gz) = 811bf727892a1e1e3d170eb72eb39c43d06ed8ff557e5e036a41aabc19008e94 -SIZE (samba-4.5.15.tar.gz) = 21020181 +TIMESTAMP = 1520943716 +SHA256 (samba-4.5.16.tar.gz) = 3a3356faab1694680e2ccd7fdf051ab1bbd3b0d058fc1f671e135dd2d1eae1aa +SIZE (samba-4.5.16.tar.gz) = 21024396 Modified: head/net/samba46/Makefile ============================================================================== --- head/net/samba46/Makefile Tue Mar 13 20:44:18 2018 (r464430) +++ head/net/samba46/Makefile Tue Mar 13 21:00:04 2018 (r464431) @@ -21,7 +21,7 @@ CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-57-9]-4.* p SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.6.12 +SAMBA4_VERSION= 4.6.14 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -239,7 +239,7 @@ SAMBA4_MODULES+= idmap_ad idmap_rfc2307 nss-info_temp .if ${PORT_OPTIONS:MDEVELOPER} SAMBA4_MODULES+= auth_skel pdb_test gpext_security gpext_registry gpext_scripts perfcount_test \ vfs_fake_dfq vfs_skel_opaque vfs_skel_transparent vfs_shadow_copy_test vfs_fake_acls \ - vfs_nfs4acl_xattr + vfs_nfs4acl_xattr vfs_error_inject .endif .if defined(WANT_EXP_MODULES) && !empty(WANT_EXP_MODULES) Modified: head/net/samba46/distinfo ============================================================================== --- head/net/samba46/distinfo Tue Mar 13 20:44:18 2018 (r464430) +++ head/net/samba46/distinfo Tue Mar 13 21:00:04 2018 (r464431) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514070924 -SHA256 (samba-4.6.12.tar.gz) = 18f1c89bb6687b94080f5ec8aa73c14acdad1106425403945a32928a4b1e54a1 -SIZE (samba-4.6.12.tar.gz) = 21160637 +TIMESTAMP = 1520935711 +SHA256 (samba-4.6.14.tar.gz) = 673f459f9e423f3893b017c86343df1e65d57571c949fe030fcffdcc05b8de47 +SIZE (samba-4.6.14.tar.gz) = 21161954 Modified: head/net/samba46/files/patch-buildtools__wafsamba__wafsamba.py ============================================================================== --- head/net/samba46/files/patch-buildtools__wafsamba__wafsamba.py Tue Mar 13 20:44:18 2018 (r464430) +++ head/net/samba46/files/patch-buildtools__wafsamba__wafsamba.py Tue Mar 13 21:00:04 2018 (r464431) @@ -1,5 +1,5 @@ ---- ./buildtools/wafsamba/wafsamba.py.orig 2015-07-21 09:47:48.000000000 +0000 -+++ ./buildtools/wafsamba/wafsamba.py 2015-10-05 20:12:39.057228568 +0000 +--- ./buildtools/wafsamba/wafsamba.py.orig 2015-07-21 09:47:48 UTC ++++ ./buildtools/wafsamba/wafsamba.py @@ -892,7 +892,7 @@ bld.env.SAMBA_EXPAND_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/expand-sambadoc.xsl' bld.env.SAMBA_MAN_XSL = bld.srcnode.abspath() + '/docs-xml/xslt/man.xsl' Modified: head/net/samba46/files/patch-source3__libads__kerberos_keytab.c ============================================================================== --- head/net/samba46/files/patch-source3__libads__kerberos_keytab.c Tue Mar 13 20:44:18 2018 (r464430) +++ head/net/samba46/files/patch-source3__libads__kerberos_keytab.c Tue Mar 13 21:00:04 2018 (r464431) @@ -1,5 +1,5 @@ ---- source3/libads/kerberos_keytab.c.orig 2017-12-23 14:23:53.247467000 +0100 -+++ source3/libads/kerberos_keytab.c 2017-12-23 18:57:07.135340000 +0100 +--- source3/libads/kerberos_keytab.c.orig 2017-12-23 15:23:53 UTC ++++ source3/libads/kerberos_keytab.c @@ -32,8 +32,6 @@ #ifdef HAVE_KRB5 Modified: head/net/samba46/pkg-plist ============================================================================== --- head/net/samba46/pkg-plist Tue Mar 13 20:44:18 2018 (r464430) +++ head/net/samba46/pkg-plist Tue Mar 13 21:00:04 2018 (r464431) @@ -36,16 +36,17 @@ bin/smbtree bin/testparm bin/wbinfo sbin/nmbd +sbin/smbd +sbin/winbindd %%AD_DC%%sbin/samba %%AD_DC%%sbin/samba_dnsupdate %%AD_DC%%sbin/samba_kcc %%AD_DC%%sbin/samba_spnupdate %%AD_DC%%sbin/samba_upgradedns -sbin/smbd -sbin/winbindd include/samba4/charset.h include/samba4/core/doserr.h include/samba4/core/error.h +include/samba4/core/hresult.h include/samba4/core/ntstatus.h include/samba4/core/werror.h include/samba4/credentials.h @@ -53,7 +54,6 @@ include/samba4/dcerpc.h %%AD_DC%%include/samba4/dcerpc_server.h %%LDAP%%include/samba4/smb_ldap.h %%LDAP%%include/samba4/smbldap.h -include/samba4/core/hresult.h include/samba4/domain_credentials.h include/samba4/gen_ndr/atsvc.h include/samba4/gen_ndr/auth.h @@ -71,10 +71,10 @@ include/samba4/gen_ndr/ndr_drsuapi.h include/samba4/gen_ndr/ndr_krb5pac.h include/samba4/gen_ndr/ndr_misc.h include/samba4/gen_ndr/ndr_nbt.h -include/samba4/gen_ndr/ndr_samr.h include/samba4/gen_ndr/ndr_samr_c.h -include/samba4/gen_ndr/ndr_svcctl.h +include/samba4/gen_ndr/ndr_samr.h include/samba4/gen_ndr/ndr_svcctl_c.h +include/samba4/gen_ndr/ndr_svcctl.h include/samba4/gen_ndr/netlogon.h include/samba4/gen_ndr/samr.h include/samba4/gen_ndr/security.h @@ -102,8 +102,9 @@ include/samba4/share.h include/samba4/smb2_lease_struct.h include/samba4/smbconf.h include/samba4/tdr.h -include/samba4/tsocket.h include/samba4/tsocket_internal.h +include/samba4/tsocket.h +include/samba4/util_ldb.h include/samba4/util/attr.h include/samba4/util/blocking.h include/samba4/util/byteorder.h @@ -111,8 +112,8 @@ include/samba4/util/data_blob.h include/samba4/util/debug.h include/samba4/util/fault.h include/samba4/util/genrand.h -include/samba4/util/idtree.h include/samba4/util/idtree_random.h +include/samba4/util/idtree.h include/samba4/util/memory.h include/samba4/util/safe_string.h include/samba4/util/signal.h @@ -123,7 +124,6 @@ include/samba4/util/tevent_ntstatus.h include/samba4/util/tevent_unix.h include/samba4/util/tevent_werror.h include/samba4/util/time.h -include/samba4/util_ldb.h include/samba4/wbclient.h lib/samba4/libdcerpc-binding.so lib/samba4/libdcerpc-binding.so.0 @@ -282,10 +282,10 @@ lib/samba4/private/libutil-tdb-samba4.so lib/samba4/private/libwinbind-client-samba4.so lib/samba4/private/libwind-samba4.so.0 lib/samba4/private/libxattr-tdb-samba4.so -%%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_10.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_11.so %%AD_DC%%lib/shared-modules/bind9/dlz_bind9_9.so +%%AD_DC%%lib/shared-modules/bind9/dlz_bind9.so %%AD_DC%%lib/shared-modules/gensec/krb5.so %%AD_DC%%lib/shared-modules/ldb/acl.so %%AD_DC%%lib/shared-modules/ldb/aclread.so @@ -301,8 +301,8 @@ lib/samba4/private/libxattr-tdb-samba4.so %%AD_DC%%lib/shared-modules/ldb/linked_attributes.so %%AD_DC%%lib/shared-modules/ldb/local_password.so %%AD_DC%%lib/shared-modules/ldb/new_partition.so -%%AD_DC%%lib/shared-modules/ldb/objectclass.so %%AD_DC%%lib/shared-modules/ldb/objectclass_attrs.so +%%AD_DC%%lib/shared-modules/ldb/objectclass.so %%AD_DC%%lib/shared-modules/ldb/objectguid.so %%AD_DC%%lib/shared-modules/ldb/operational.so %%AD_DC%%lib/shared-modules/ldb/partition.so @@ -311,10 +311,10 @@ lib/samba4/private/libxattr-tdb-samba4.so %%AD_DC%%lib/shared-modules/ldb/repl_meta_data.so %%AD_DC%%lib/shared-modules/ldb/resolve_oids.so %%AD_DC%%lib/shared-modules/ldb/rootdse.so -%%AD_DC%%lib/shared-modules/ldb/samba3sam.so -%%AD_DC%%lib/shared-modules/ldb/samba3sid.so %%AD_DC%%lib/shared-modules/ldb/samba_dsdb.so %%AD_DC%%lib/shared-modules/ldb/samba_secrets.so +%%AD_DC%%lib/shared-modules/ldb/samba3sam.so +%%AD_DC%%lib/shared-modules/ldb/samba3sid.so %%AD_DC%%lib/shared-modules/ldb/samldb.so %%AD_DC%%lib/shared-modules/ldb/schema_data.so %%AD_DC%%lib/shared-modules/ldb/schema_load.so @@ -330,8 +330,8 @@ lib/samba4/private/libxattr-tdb-samba4.so %%AD_DC%%lib/shared-modules/process_model/standard.so %%AD_DC%%lib/shared-modules/service/cldap.so %%AD_DC%%lib/shared-modules/service/dcerpc.so -%%AD_DC%%lib/shared-modules/service/dns.so %%AD_DC%%lib/shared-modules/service/dns_update.so +%%AD_DC%%lib/shared-modules/service/dns.so %%AD_DC%%lib/shared-modules/service/drepl.so %%AD_DC%%lib/shared-modules/service/kcc.so %%AD_DC%%lib/shared-modules/service/kdc.so @@ -339,11 +339,11 @@ lib/samba4/private/libxattr-tdb-samba4.so %%AD_DC%%lib/shared-modules/service/nbtd.so %%AD_DC%%lib/shared-modules/service/ntp_signd.so %%AD_DC%%lib/shared-modules/service/s3fs.so -%%NTVFS%%lib/shared-modules/service/smb.so %%AD_DC%%lib/shared-modules/service/web.so %%AD_DC%%lib/shared-modules/service/winbindd.so %%AD_DC%%lib/shared-modules/service/wrepl.so %%AD_DC%%lib/shared-modules/vfs/posix_eadb.so +%%NTVFS%%lib/shared-modules/service/smb.so lib/shared-modules/auth/script.so %%AD_DC%%lib/shared-modules/ldb/dns_notify.so lib/shared-modules/ldb/ildap.so Modified: head/net/samba47/Makefile ============================================================================== --- head/net/samba47/Makefile Tue Mar 13 20:44:18 2018 (r464430) +++ head/net/samba47/Makefile Tue Mar 13 21:00:04 2018 (r464431) @@ -1,28 +1,28 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ -PORTNAME?= ${SAMBA4_BASENAME}47 -PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 1 +PORTNAME= ${SAMBA4_BASENAME}47 +PORTVERSION= ${SAMBA4_VERSION} +PORTREVISION= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} -MAINTAINER?= timur@FreeBSD.org -COMMENT?= Free SMB/CIFS and AD/DC server and client for Unix +MAINTAINER= timur@FreeBSD.org +COMMENT= Free SMB/CIFS and AD/DC server and client for Unix LICENSE= GPLv3 IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support -CONFLICTS?= samba4-4.0.* samba4[1-689]-4.* p5-Parse-Pidl-4.* +CONFLICTS_INSTALL?= samba4-4.0.* samba4[1-689]-4.* p5-Parse-Pidl-4.* EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.patch:-p1 EXTRA_PATCHES+= ${PATCHDIR}/0001-Freenas-master-mdns-fixes-22.patch:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.7.4 +SAMBA4_VERSION= 4.7.6 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -62,11 +62,13 @@ CONFIGURE_ARGS+= --mandir="${MANPREFIX}/man" \ --with-cachedir="${SAMBA4_LOCKDIR}" \ --with-privatedir="${SAMBA4_PRIVATEDIR}" \ --with-logfilebase="${SAMBA4_LOGDIR}" -# Flags +# XXX: Flags CONFIGURE_ENV+= PTHREAD_LDFLAGS="-lpthread" +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib USES= cpe compiler waf pkgconfig perl5 \ - readline iconv shebangfix + iconv shebangfix USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_CMD= buildtools/bin/waf @@ -135,41 +137,96 @@ RUN_DEPENDS+= jansson>=2.10:devel/jansson # Needed for IDL compiler BUILD_DEPENDS+= p5-Parse-Yapp>=0:devel/p5-Parse-Yapp # Libarchive +SAMBA4_BUNDLED_LIBS+= !libarchive BUILD_DEPENDS+= libarchive>=3.1.2:archivers/libarchive RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive -SAMBA4_BUNDLED_LIBS+= !libarchive +### Bundled libraries +#SAMBA4_BUNDLED_CMOCKA= yes +#SAMBA4_BUNDLED_TALLOC= yes +#SAMBA4_BUNDLED_TEVENT= yes +#SAMBA4_BUNDLED_TDB= yes +#SAMBA4_BUNDLED_LDB= yes +SAMBA4_LDB= 12 # cmocka +.if defined(SAMBA4_BUNDLED_CMOCKA) +SAMBA4_BUNDLED_LIBS+= cmocka +CONFLICTS+= cmocka-1.* +PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="" +SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="" +.else +SAMBA4_BUNDLED_LIBS+= !cmocka BUILD_DEPENDS+= cmocka>=1.1.1:sysutils/cmocka RUN_DEPENDS+= cmocka>=1.1.1:sysutils/cmocka -SAMBA4_BUNDLED_LIBS+= !cmocka +PLIST_SUB+= SAMBA4_BUNDLED_CMOCKA="@comment " +SUB_LIST+= SAMBA4_BUNDLED_CMOCKA="@comment " +.endif # talloc -BUILD_DEPENDS+= talloc>=2.1.9:devel/talloc -RUN_DEPENDS+= talloc>=2.1.9:devel/talloc -SAMBA4_BUNDLED_LIBS+= !talloc,!pytalloc-util +.if defined(SAMBA4_BUNDLED_TALLOC) +SAMBA4_BUNDLED_LIBS+= talloc +CONFLICTS+= talloc-2.* +PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="" +SUB_LIST+= SAMBA4_BUNDLED_TALLOC="" +.else +SAMBA4_BUNDLED_LIBS+= !talloc +BUILD_DEPENDS+= talloc>=2.1.11:devel/talloc +RUN_DEPENDS+= talloc>=2.1.11:devel/talloc +PLIST_SUB+= SAMBA4_BUNDLED_TALLOC="@comment " +SUB_LIST+= SAMBA4_BUNDLED_TALLOC="@comment " +.endif # tevent -BUILD_DEPENDS+= tevent>=0.9.34:devel/tevent -RUN_DEPENDS+= tevent>=0.9.34:devel/tevent -SAMBA4_BUNDLED_LIBS+= !tevent,!pytevent +.if defined(SAMBA4_BUNDLED_TEVENT) +SAMBA4_BUNDLED_LIBS+= tevent +CONFLICTS+= tevent-0.* +PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="" +SUB_LIST+= SAMBA4_BUNDLED_TEVENT="" +.else +SAMBA4_BUNDLED_LIBS+= !tevent +BUILD_DEPENDS+= tevent>=0.9.36:devel/tevent +RUN_DEPENDS+= tevent>=0.9.36:devel/tevent +PLIST_SUB+= SAMBA4_BUNDLED_TEVENT="@comment " +SUB_LIST+= SAMBA4_BUNDLED_TEVENT="@comment " +.endif # tdb -BUILD_DEPENDS+= tdb>=1.3.14:databases/tdb -RUN_DEPENDS+= tdb>=1.3.14:databases/tdb -SAMBA4_BUNDLED_LIBS+= !tdb,!pytdb +.if defined(SAMBA4_BUNDLED_TDB) +SAMBA4_BUNDLED_LIBS+= tdb +CONFLICTS+= tdb-1.* +PLIST_SUB+= SAMBA4_BUNDLED_TDB="" +SUB_LIST+= SAMBA4_BUNDLED_TDB="" +.else +SAMBA4_BUNDLED_LIBS+= !tdb +BUILD_DEPENDS+= tdb>=1.3.15:databases/tdb +RUN_DEPENDS+= tdb>=1.3.15:databases/tdb +PLIST_SUB+= SAMBA4_BUNDLED_TDB="@comment " +SUB_LIST+= SAMBA4_BUNDLED_TDB="@comment " +.endif # ldb -SAMBA4_LDB= 12 -.if !defined(SAMBA4_LDB) || ${SAMBA4_LDB} == 13 -BUILD_DEPENDS+= ldb13>=1.3.0:databases/ldb13 -RUN_DEPENDS+= ldb13>=1.3.0:databases/ldb13 -.elif ${SAMBA4_LDB} == 12 +.if defined(SAMBA4_BUNDLED_LDB) || !defined(SAMBA4_LDB) +SAMBA4_BUNDLED_LDB= yes +SAMBA4_BUNDLED_LIBS+= ldb +CONFLICTS+= ldb-1.* ldb1[23]-1.* +PLIST_SUB+= SAMBA4_BUNDLED_LDB="" +SUB_LIST+= SAMBA4_BUNDLED_LDB="" +.else +. if ${SAMBA4_LDB} == 13 +BUILD_DEPENDS+= ldb13>=1.3.2:databases/ldb13 +RUN_DEPENDS+= ldb13>=1.3.2:databases/ldb13 +. elif ${SAMBA4_LDB} == 12 BUILD_DEPENDS+= ldb12>=1.2.3:databases/ldb12 RUN_DEPENDS+= ldb12>=1.2.3:databases/ldb12 -.elif ${SAMBA4_LDB} == 11 +. elif ${SAMBA4_LDB} == 11 BUILD_DEPENDS+= ldb>=1.1.29:databases/ldb RUN_DEPENDS+= ldb>=1.1.29:databases/ldb +. endif +SAMBA4_BUNDLED_LIBS+= !ldb +PLIST_SUB+= SAMBA4_BUNDLED_LDB="@comment " +SUB_LIST+= SAMBA4_BUNDLED_LDB="@comment " .endif -SAMBA4_BUNDLED_LIBS+= !ldb,!pyldb,!pyldb-util + +.if defined(SAMBA4_BUNDLED_TALLOC) || defined(SAMBA4_BUNDLED_TEVENT) || defined(SAMBA4_BUNDLED_TDB) +SAMBA4_BUNDLED_LIBS+= replace +.endif # Don't use external libcom_err SAMBA4_BUNDLED_LIBS+= com_err - # Set the test environment variables TEST_ENV+= PYTHON="${PYTHON_CMD}" \ SHA1SUM=/sbin/sha1 \ @@ -196,6 +253,7 @@ CONFIGURE_ARGS+= \ --with-sendfile-support \ --disable-ctdb-tests \ ${ICONV_CONFIGURE_BASE} + ############################################################################## BIND99_RUN_DEPENDS= bind99>=9.9.0.0:dns/bind99 BIND910_RUN_DEPENDS= bind910>=9.10.0.0:dns/bind910 @@ -210,8 +268,7 @@ MDNSRESPONDER_LIB_DEPENDS= libdns_sd.so:net/mDNSRespon ############################################################################## DEBUG_CONFIGURE_ON= --verbose --enable-debug DEBUG_MAKE_ARGS= --verbose -DEBUG_CFLAGS= -g -ggdb -gdwarf-2 -gstrict-dwarf -O0 -DEBUG_VARS= WITH_DEBUG=yes +DEBUG_FLAGS= -g -ggdb3 -O0 # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=194046 GDB_CMD?= ${LOCALBASE}/bin/gdb # https://bugzilla.samba.org/show_bug.cgi?id=8969 @@ -225,15 +282,14 @@ DEVELOPER_TEST_DEPENDS= ${GDB_CMD}:devel/gdb DEVELOPER_VARS_OFF= GDB_CMD=true # XXX: Mostly used in conjuction with the DEVELOPER option, don't enable it # if you don't know what you are doing -#NTVFS_PREVENTS= AD_DC -#NTVFS_PREVENTS_MSG= NTVFS can't be combined with AD_DC NTVFS_CONFIGURE_WITH= ntvfs-fileserver +NTVFS_PLIST_FILES= lib/shared-modules/service/smb.so \ + lib/samba4/private/libntvfs-samba4.so ############################################################################## CLUSTER_CONFIGURE_WITH= cluster-support CUPS_CONFIGURE_ENABLE= cups iprint CUPS_LIB_DEPENDS= libcups.so:print/cups - # https://bugzilla.samba.org/show_bug.cgi?id=9545 FAM_USES= fam FAM_CONFIGURE_WITH= fam @@ -261,23 +317,20 @@ UTMP_CONFIGURE_WITH= utmp AD_DC_CONFIGURE_OFF= --without-ad-dc -#NTVFS_PREVENTS= AD_DC -#NTVFS_PREVENTS_MSG= NTVFS needs AD_DC - ADS_IMPLIES= LDAP ADS_CONFIGURE_WITH= ads dnsupdate LDAP_CONFIGURE_WITH= ldap +LDAP_CONFIGURE_ON= --with-openldap=${LOCALBASE} LDAP_USE= OPENLDAP=yes LDAP_VARS= SAMBA4_MODULES+=idmap_ldap -# LIBZFS_CONFIGURE_WITH= libzfs -# LIBZFS_VARS= SAMBA4_MODULES+=vfs_zfs_space +LIBZFS_CONFIGURE_WITH= libzfs +LIBZFS_VARS= SAMBA4_MODULES+=vfs_zfs_space MANDOC_BUILD_DEPENDS= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \ xsltproc:textproc/libxslt MANDOC_CONFIGURE_ENV_OFF= XSLTPROC="true" - # !SAMBA4_SUBPORT .endif @@ -297,6 +350,8 @@ LIB_DEPENDS+= libdbus-1.so:devel/dbus LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib .endif +#SAMBA4_MODULES+= vfs_freebsd + SAMBA4_MODULES+= idmap_nss idmap_autorid idmap_rid idmap_hash idmap_tdb idmap_tdb2 idmap_script nss-info_hash # List of extra modules taken from RHEL build # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=197320 @@ -336,6 +391,19 @@ SUB_LIST+= SAMBA4_PYTHON2="@comment " SAMBA4_PYTHON3 USES+= python:2.7 PLIST_SUB+= SAMBA4_PYTHON2="" SUB_LIST+= SAMBA4_PYTHON2="" + +.if !defined(SAMBA4_BUNDLED_TALLOC) +SAMBA4_BUNDLED_LIBS+= !pytalloc-util +.endif +.if !defined(SAMBA4_BUNDLED_TEVENT) +SAMBA4_BUNDLED_LIBS+= !pytevent +.endif +.if !defined(SAMBA4_BUNDLED_TDB) +SAMBA4_BUNDLED_LIBS+= !pytdb +.endif +.if !defined(SAMBA4_BUNDLED_LDB) +SAMBA4_BUNDLED_LIBS+= !pyldb,!pyldb-util +.endif # External Python modules BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.15.0:dns/py-dnspython@${PY_FLAVOR} @@ -373,7 +441,6 @@ PLIST_SUB+= SAMBA4_PYTHON3="@comment " SUB_LIST+= SAMBA4_PYTHON3="@comment " .endif .endif - # !SAMBA4_SUBPORT .endif @@ -397,9 +464,9 @@ MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone) .if ${CHOSEN_COMPILER_TYPE} == clang CFLAGS+= -fno-color-diagnostics .endif -.if ${readline_ARGS} == port -CFLAGS+= -D_FUNCTION_DEF -.endif +#.if ${readline_ARGS} == port +#CFLAGS+= -D_FUNCTION_DEF +#.endif # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 SHEBANG_FILES= ${PATCH_WRKSRC}/source4/scripting/bin/* ${PATCH_WRKSRC}/selftest/* @@ -459,7 +526,19 @@ pre-build-MANDOC-off: source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ - source4/utils/man/oLschema2ldif.1 + source4/utils/man/oLschema2ldif.1 \ + lib/tdb/man/tdbdump.8 \ + lib/tdb/man/tdbbackup.8 \ + lib/tdb/man/tdbtool.8 \ + lib/talloc/man/talloc.3 \ + lib/tdb/man/tdbrestore.8 \ + lib/ldb/man/ldb.3 \ + lib/ldb/man/ldbadd.1 \ + lib/ldb/man/ldbsearch.1 \ + lib/ldb/man/ldbmodify.1 \ + lib/ldb/man/ldbrename.1 \ + lib/ldb/man/ldbdel.1 \ + lib/ldb/man/ldbedit.1 ${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` ${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} .endfor Modified: head/net/samba47/distinfo ============================================================================== --- head/net/samba47/distinfo Tue Mar 13 20:44:18 2018 (r464430) +++ head/net/samba47/distinfo Tue Mar 13 21:00:04 2018 (r464431) @@ -1,3 +1,3 @@ -TIMESTAMP = 1514004480 -SHA256 (samba-4.7.4.tar.gz) = fb12d0c4452f85b67b78bbeabd4c762d8feb8ff83e39d044d285120c2c488247 -SIZE (samba-4.7.4.tar.gz) = 16853555 +TIMESTAMP = 1520935629 +SHA256 (samba-4.7.6.tar.gz) = 1eede30fc8ef6504e24602fb72b00baa0a7b73b59f16d25cb0771dc8c7c57d6e +SIZE (samba-4.7.6.tar.gz) = 16864824 Added: head/net/samba47/files/man/ldb.3 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba47/files/man/ldb.3 Tue Mar 13 21:00:04 2018 (r464431) @@ -0,0 +1,457 @@ +'\" t +.\" Title: ldb +.\" Author: [see the "Author" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>; +.\" Date: 11/05/2017 +.\" Manual: System Administration tools +.\" Source: LDB 1.1 +.\" Language: English +.\" +.TH "LDB" "3" "11/05/2017" "LDB 1\&.1" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) +.ad l +.\" ----------------------------------------------------------------- +.\" * MAIN CONTENT STARTS HERE * +.\" ----------------------------------------------------------------- +.SH "NAME" +ldb \- A light\-weight database library +.SH "SYNOPSIS" +.sp +.nf +#include <ldb\&.h> +.fi +.SH "DESCRIPTION" +.PP +ldb is a light weight embedded database library and API\&. With a programming interface that is very similar to LDAP, ldb can store its data either in a tdb(3) database or in a real LDAP database\&. +.PP +When used with the tdb backend ldb does not require any database daemon\&. Instead, ldb function calls are processed immediately by the ldb library, which does IO directly on the database, while allowing multiple readers/writers using operating system byte range locks\&. This leads to an API with very low overheads, often resulting in speeds of more than 10x what can be achieved with a more traditional LDAP architecture\&. +.PP +In a taxonomy of databases ldb would sit half way between key/value pair databases (such as berkley db or tdb) and a full LDAP database\&. With a structured attribute oriented API like LDAP and good indexing capabilities, ldb can be used for quite sophisticated applications that need a light weight database, without the administrative overhead of a full LDAP installation\&. +.PP +Included with ldb are a number of useful command line tools for manipulating a ldb database\&. These tools are similar in style to the equivalent ldap command line tools\&. +.PP +In its default mode of operation with a tdb backend, ldb can also be seen as a "schema\-less LDAP"\&. By default ldb does not require a schema, which greatly reduces the complexity of getting started with ldb databases\&. As the complexity of you application grows you can take advantage of some of the optional schema\-like attributes that ldb offers, or you can migrate to using the full LDAP api while keeping your exiting ldb code\&. +.PP +If you are new to ldb, then I suggest starting with the manual pages for ldbsearch(1) and ldbedit(1), and experimenting with a local database\&. Then I suggest you look at the ldb_connect(3) and ldb_search(3) manual pages\&. +.SH "TOOLS" +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbsearch(1) +\- command line ldb search utility +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbedit(1) +\- edit all or part of a ldb database using your favourite editor +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbadd(1) +\- add records to a ldb database using LDIF formatted input +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbdel(1) +\- delete records from a ldb database +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +ldbmodify(1) +\- modify records in a ldb database using LDIF formatted input +.RE +.SH "FUNCTIONS" +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_connect(3)\fR +\- connect to a ldb backend +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_search(3)\fR +\- perform a database search +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_add(3)\fR +\- add a record to the database +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_delete(3)\fR +\- delete a record from the database +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_modify(3)\fR +\- modify a record in the database +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_errstring(3)\fR +\- retrieve extended error information from the last operation +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_write(3)\fR +\- write a LDIF formatted message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_write_file(3)\fR +\- write a LDIF formatted message to a file +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_read(3)\fR +\- read a LDIF formatted message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_read_free(3)\fR +\- free the result of a ldb_ldif_read() +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_read_file(3)\fR +\- read a LDIF message from a file +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_ldif_read_string(3)\fR +\- read a LDIF message from a string +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_element(3)\fR +\- find an element in a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_val_equal_exact(3)\fR +\- compare two ldb_val structures +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_val(3)\fR +\- find an element by value +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_add_empty(3)\fR +\- add an empty message element to a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_add(3)\fR +\- add a non\-empty message element to a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_element_compare(3)\fR +\- compare two ldb_message_element structures +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_int(3)\fR +\- return an integer value from a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_uint(3)\fR +\- return an unsigned integer value from a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_double(3)\fR +\- return a double value from a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_msg_find_string(3)\fR +\- return a string value from a ldb_message +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_set_alloc(3)\fR +\- set the memory allocation function to be used by ldb +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_set_debug(3)\fR +\- set a debug handler to be used by ldb +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} + +\fBldb_set_debug_stderr(3)\fR +\- set a debug handler for stderr output +.RE +.SH "AUTHOR" +.PP +ldb was written by +\m[blue]\fBAndrew Tridgell\fR\m[]\&\s-2\u[1]\d\s+2\&. +.PP +If you wish to report a problem or make a suggestion then please see the +\m[blue]\fB\%http://ldb.samba.org/\fR\m[] +web site for current contact and maintainer information\&. +.PP +ldb is released under the GNU Lesser General Public License version 2 or later\&. Please see the file COPYING for license details\&. +.SH "NOTES" +.IP " 1." 4 +Andrew Tridgell +.RS 4 +\%https://www.samba.org/~tridge/ +.RE Added: head/net/samba47/files/man/ldbadd.1 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba47/files/man/ldbadd.1 Tue Mar 13 21:00:04 2018 (r464431) @@ -0,0 +1,78 @@ +'\" t +.\" Title: ldbadd +.\" Author: [see the "AUTHOR" section] +.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>; +.\" Date: 11/05/2017 +.\" Manual: System Administration tools +.\" Source: LDB 1.1 +.\" Language: English +.\" +.TH "LDBADD" "1" "11/05/2017" "LDB 1\&.1" "System Administration tools" +.\" ----------------------------------------------------------------- +.\" * Define some portability stuff +.\" ----------------------------------------------------------------- +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.\" http://bugs.debian.org/507673 +.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html +.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +.ie \n(.g .ds Aq \(aq +.el .ds Aq ' +.\" ----------------------------------------------------------------- +.\" * set default formatting +.\" ----------------------------------------------------------------- +.\" disable hyphenation +.nh +.\" disable justification (adjust text to left margin only) *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201803132100.w2DL04QK045659>