Date: Sat, 25 Mar 2017 20:46:10 +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: r436916 - in head/net: . samba46 samba46/files samba46/files/man Message-ID: <201703252046.v2PKkAbi078034@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: timur Date: Sat Mar 25 20:46:10 2017 New Revision: 436916 URL: https://svnweb.freebsd.org/changeset/ports/436916 Log: New 4.6.1 version of Samba 4.6 port to address CVE-2017-2619 Security: CVE-2017-2619 Added: head/net/samba46/ - copied from r436862, head/net/samba45/ Deleted: head/net/samba46/files/man/idmap_script.8 head/net/samba46/files/patch-source3__modules__vfs_fruit.c Modified: head/net/Makefile head/net/samba46/Makefile head/net/samba46/distinfo head/net/samba46/files/patch-source3__wscript_build head/net/samba46/pkg-plist Modified: head/net/Makefile ============================================================================== --- head/net/Makefile Sat Mar 25 20:39:45 2017 (r436915) +++ head/net/Makefile Sat Mar 25 20:46:10 2017 (r436916) @@ -1235,6 +1235,7 @@ SUBDIR += samba43 SUBDIR += samba44 SUBDIR += samba45 + SUBDIR += samba46 SUBDIR += samplicator SUBDIR += sbd SUBDIR += sbm Modified: head/net/samba46/Makefile ============================================================================== --- head/net/samba45/Makefile Fri Mar 24 23:44:02 2017 (r436862) +++ head/net/samba46/Makefile Sat Mar 25 20:46:10 2017 (r436916) @@ -1,7 +1,7 @@ # Created by: timur@FreeBSD.org # $FreeBSD$ -PORTNAME?= ${SAMBA4_BASENAME}45 +PORTNAME?= ${SAMBA4_BASENAME}46 PORTVERSION?= ${SAMBA4_VERSION} PORTREVISION?= 0 CATEGORIES?= net @@ -13,13 +13,13 @@ COMMENT?= Free SMB/CIFS and AD/DC serv LICENSE= GPLv3 -CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-46]-4.* +CONFLICTS?= *samba3[2-6]-3.* samba4-4.0.* samba4[1-5]-4.* #EXTRA_PATCHES= ${PATCHDIR}/extra-patch-security:-p1 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.5.7 +SAMBA4_VERSION= 4.6.1 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -120,7 +120,7 @@ BUILD_DEPENDS+= libarchive>=3.1.2:arch RUN_DEPENDS+= libarchive>=3.1.2:archivers/libarchive # External Samba dependencies # IDL compiler -BUILD_DEPENDS+= p5-Parse-Pidl>=4.5.0:devel/p5-Parse-Pidl +BUILD_DEPENDS+= p5-Parse-Pidl>=4.6.0:devel/p5-Parse-Pidl PLIST_SUB+= PIDL="@comment " # External Python modules BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:dns/py-dnspython @@ -131,23 +131,23 @@ BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}iso8601>=0.1.11:devel/py-iso8601 PLIST_SUB+= PY_ISO8601="@comment " # talloc -BUILD_DEPENDS+= talloc>=2.1.8:devel/talloc -RUN_DEPENDS+= talloc>=2.1.8:devel/talloc +BUILD_DEPENDS+= talloc>=2.1.9:devel/talloc +RUN_DEPENDS+= talloc>=2.1.9:devel/talloc SAMBA4_BUNDLED_LIBS+= !talloc # tevent -BUILD_DEPENDS+= tevent>=0.9.29:devel/tevent -RUN_DEPENDS+= tevent>=0.9.29:devel/tevent +BUILD_DEPENDS+= tevent>=0.9.31:devel/tevent +RUN_DEPENDS+= tevent>=0.9.31:devel/tevent SAMBA4_BUNDLED_LIBS+= !tevent # tdb -BUILD_DEPENDS+= tdb>=1.3.10:databases/tdb -RUN_DEPENDS+= tdb>=1.3.10:databases/tdb +BUILD_DEPENDS+= tdb>=1.3.12:databases/tdb +RUN_DEPENDS+= tdb>=1.3.12:databases/tdb SAMBA4_BUNDLED_LIBS+= !tdb # ldb -BUILD_DEPENDS+= ldb>=1.1.27:databases/ldb -RUN_DEPENDS+= ldb>=1.1.27:databases/ldb +BUILD_DEPENDS+= ldb>=1.1.29:databases/ldb +RUN_DEPENDS+= ldb>=1.1.29:databases/ldb SAMBA4_BUNDLED_LIBS+= !ldb -# Don't use external libcom_err -SAMBA4_BUNDLED_LIBS+= com_err +# Don't use external libcom_err, cmocka +SAMBA4_BUNDLED_LIBS+= com_err,cmocka CONFIGURE_ARGS+= \ --with-pam \ @@ -165,8 +165,7 @@ BIND910_RUN_DEPENDS= bind910>=9.10.0.0: BIND911_RUN_DEPENDS= bind911>=9.11.0.0:dns/bind911 NSUPDATE_RUN_DEPENDS= samba-nsupdate:dns/samba-nsupdate -DEBUG_CONFIGURE_ENABLE= debug -DEBUG_CONFIGURE_ON= --verbose +DEBUG_CONFIGURE_ON= --verbose --enable-debug DEBUG_MAKE_ARGS= --verbose DEBUG_VARS= WITH_DEBUG=yes @@ -223,6 +222,8 @@ MANPAGES_CONFIGURE_ENV_OFF= XSLTPROC="tr .include <bsd.port.options.mk> ############################################################################## +.if !defined(SAMBA4_SUBPORT) + .if ${PORT_OPTIONS:MEXP_MODULES} . if !defined(WANT_EXP_MODULES) || empty(WANT_EXP_MODULES) WANT_EXP_MODULES= vfs_cacheprime gpext_scripts gpext_security gpext_registry @@ -255,6 +256,8 @@ CONFIGURE_ARGS+= --with-shared-modules= .for module in ${SAMBA4_MODULES} PLIST_FILES+= lib/shared-modules/${module:C,_,/,:C,-,_,}.so .endfor +# !SAMBA4_SUBPORT +.endif ############################################################################## .include <bsd.port.pre.mk> @@ -290,7 +293,7 @@ CONFIGURE_ENV+= NOCOLOR=yes WAF_LOG_FO MAKE_ENV+= NOCOLOR=yes WAF_LOG_FORMAT='%(c1)s%(zone)s%(c2)s %(message)s' SAMBA_MAN1+= dbwrap_tool.1 findsmb.1 gentest.1 locktest.1 \ - log2pcap.1 masktest.1 ndrdump.1 nmblookup.1 \ + log2pcap.1 masktest.1 mvxattr.1 ndrdump.1 nmblookup.1 \ nmblookup4.1 ntlm_auth.1 oLschema2ldif.1 \ profiles.1 regdiff.1 regpatch.1 regshell.1 \ regtree.1 rpcclient.1 sharesec.1 smbcacls.1 \ @@ -304,7 +307,7 @@ SAMBA_MAN5+= lmhosts.5 smbgetrc.5 smbp SAMBA_MAN7+= samba.7 winbind_krb5_locator.7 SAMBA_MAN8+= cifsdd.8 eventlogadm.8 idmap_ad.8 idmap_autorid.8 idmap_hash.8 \ - idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 \ + idmap_ldap.8 idmap_nss.8 idmap_rfc2307.8 idmap_rid.8 idmap_script.8 \ idmap_tdb.8 idmap_tdb2.8 net.8 nmbd.8 pam_winbind.8 pdbedit.8 \ samba-regedit.8 samba-tool.8 samba.8 smbd.8 smbpasswd.8 \ smbspool_krb5_wrapper.8 smbspool.8 smbta-util.8 vfs_acl_tdb.8 vfs_acl_xattr.8 \ @@ -360,8 +363,7 @@ pre-build-MANPAGES-off: source4/torture/man/masktest.1 \ source4/torture/man/smbtorture.1 \ source4/utils/man/ntlm_auth4.1 \ - source4/utils/man/oLschema2ldif.1 \ - docs-xml/manpages/idmap_script.8 + source4/utils/man/oLschema2ldif.1 -@${MKDIR} `dirname ${BUILD_WRKSRC}/bin/default/${man}` ${INSTALL_MAN} ${FILESDIR}/man/`basename ${man}` ${BUILD_WRKSRC}/bin/default/${man} .endfor Modified: head/net/samba46/distinfo ============================================================================== --- head/net/samba45/distinfo Fri Mar 24 23:44:02 2017 (r436862) +++ head/net/samba46/distinfo Sat Mar 25 20:46:10 2017 (r436916) @@ -1,3 +1,3 @@ -TIMESTAMP = 1490375600 -SHA256 (samba-4.5.7.tar.gz) = ac70f09af80639d8189e1b9bc0a554841ee44df2b1ef58e7e682ad5400fd9400 -SIZE (samba-4.5.7.tar.gz) = 20981612 +TIMESTAMP = 1490409185 +SHA256 (samba-4.6.1.tar.gz) = 5d2751faa3cd33affd4f49681f700eff9f6c22d6b08e8858ae0d3cd8e51c535e +SIZE (samba-4.6.1.tar.gz) = 21097666 Modified: head/net/samba46/files/patch-source3__wscript_build ============================================================================== --- head/net/samba45/files/patch-source3__wscript_build Fri Mar 24 23:44:02 2017 (r436862) +++ head/net/samba46/files/patch-source3__wscript_build Sat Mar 25 20:46:10 2017 (r436916) @@ -1,18 +1,18 @@ ---- source3/wscript_build.orig 2016-10-25 10:41:44 UTC -+++ source3/wscript_build -@@ -617,6 +617,7 @@ bld.SAMBA3_LIBRARY('smbd_base', - smbd_conn - param_service - AVAHI -+ dns_sd - PRINTBASE - PROFILE - LOCKING -@@ -1070,6 +1071,7 @@ bld.SAMBA3_BINARY('client/smbclient', - msrpc3 - RPC_NDR_SRVSVC - cli_smb_common -+ dns_sd - archive - ''') +--- source3/wscript_build.orig 2017-02-28 20:04:57.000000000 +0000 ++++ source3/wscript_build 2017-03-25 03:35:14.392623000 +0000 +@@ -741,6 +741,7 @@ + smbd_conn + param_service + AVAHI ++ dns_sd + PRINTBASE + PROFILE + LOCKING +@@ -1123,6 +1124,7 @@ + msrpc3 + RPC_NDR_SRVSVC + cli_smb_common ++ dns_sd + archive + ''') Modified: head/net/samba46/pkg-plist ============================================================================== --- head/net/samba45/pkg-plist Fri Mar 24 23:44:02 2017 (r436862) +++ head/net/samba46/pkg-plist Sat Mar 25 20:46:10 2017 (r436916) @@ -5,6 +5,7 @@ bin/findsmb bin/gentest bin/locktest bin/masktest +bin/mvxattr bin/ndrdump bin/net bin/nmblookup @@ -122,7 +123,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/xfile.h include/samba4/util_ldb.h include/samba4/wbclient.h @dir include/samba4/util @@ -274,7 +274,6 @@ lib/samba4/private/libsmbd-shim-samba4.s %%LDAP%%lib/samba4/private/libsmbldaphelper-samba4.so %%NTVFS%%lib/samba4/private/libntvfs-samba4.so lib/samba4/private/libsmbpasswdparser-samba4.so -lib/samba4/private/libsmbregistry-samba4.so lib/samba4/private/libsocket-blocking-samba4.so lib/samba4/private/libsys-rw-samba4.so lib/samba4/private/libtalloc-report-samba4.so @@ -586,6 +585,7 @@ lib/shared-modules/vfs/zfsacl.so %%PYTHON_SITELIBDIR%%/samba/tests/samba3sam.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/__init__.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/base.py +%%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/dnscmd.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/fsmo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/gpo.py %%PYTHON_SITELIBDIR%%/samba/tests/samba_tool/group.py @@ -757,6 +757,7 @@ man/man1/gentest.1.gz man/man1/locktest.1.gz man/man1/log2pcap.1.gz man/man1/masktest.1.gz +man/man1/mvxattr.1.gz man/man1/ndrdump.1.gz man/man1/nmblookup.1.gz man/man1/ntlm_auth.1.gz @@ -865,4 +866,3 @@ man/man8/winbindd.8.gz @dir /var/log/samba4 @dir /var/db/samba4/private @dir /var/db/samba4 -
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703252046.v2PKkAbi078034>