From owner-svn-ports-head@freebsd.org Fri Mar 24 10:19:49 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 01B6CCA273D; Fri, 24 Mar 2017 10:19:49 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B3B4A1154; Fri, 24 Mar 2017 10:19:48 +0000 (UTC) (envelope-from timur@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2OAJlbK034749; Fri, 24 Mar 2017 10:19:47 GMT (envelope-from timur@FreeBSD.org) Received: (from timur@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2OAJlCG034742; Fri, 24 Mar 2017 10:19:47 GMT (envelope-from timur@FreeBSD.org) Message-Id: <201703241019.v2OAJlCG034742@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: timur set sender to timur@FreeBSD.org using -f From: "Timur I. Bakeyev" Date: Fri, 24 Mar 2017 10:19:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436805 - in head/net/samba44: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 24 Mar 2017 10:19:49 -0000 Author: timur Date: Fri Mar 24 10:19:46 2017 New Revision: 436805 URL: https://svnweb.freebsd.org/changeset/ports/436805 Log: Upgrade Samba 4.4 to the 4.4.12 version to address CVE-2017-2619 PR: 217993 Security: CVE-2017-2619 Added: head/net/samba44/files/patch-third_party__waf__wafadmin__Tools__cc.py (contents, props changed) Modified: head/net/samba44/Makefile head/net/samba44/distinfo head/net/samba44/files/patch-buildtools__wafsamba__samba_pidl.py head/net/samba44/files/patch-wscript head/net/samba44/files/patch-wscript_build head/net/samba44/pkg-plist Modified: head/net/samba44/Makefile ============================================================================== --- head/net/samba44/Makefile Fri Mar 24 09:25:12 2017 (r436804) +++ head/net/samba44/Makefile Fri Mar 24 10:19:46 2017 (r436805) @@ -3,7 +3,7 @@ PORTNAME?= ${SAMBA4_BASENAME}44 PORTVERSION?= ${SAMBA4_VERSION} -PORTREVISION?= 2 +PORTREVISION?= 0 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} @@ -19,7 +19,7 @@ CONFLICTS?= *samba3[2-6]-3.* samba4-4.0 SAMBA4_BASENAME= samba SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4 -SAMBA4_VERSION= 4.4.8 +SAMBA4_VERSION= 4.4.12 SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|} WRKSRC?= ${WRKDIR}/${DISTNAME} @@ -140,11 +140,12 @@ DEVELOPER_DESC= With development suppor MANPAGES_DESC= Build manpages from DOCBOOK templates OPTIONS_RADIO= DNS ZEROCONF -OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 +OPTIONS_RADIO_DNS= NSUPDATE BIND99 BIND910 BIND911 OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER BIND99_DESC= Use bind99 as AD DC DNS server frontend BIND910_DESC= Use bind910 as AD DC DNS server frontend +BIND911_DESC= Use bind911 as AD DC DNS server frontend NSUPDATE_DESC= Use samba NSUPDATE utility for AD DC .include @@ -168,6 +169,9 @@ SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MBIND910} RUN_DEPENDS+= bind910>=9.10.0.0:dns/bind910 SUB_LIST+= NSUPDATE="@comment " +.elif ${PORT_OPTIONS:MBIND911} +RUN_DEPENDS+= bind911>=9.11.0.0:dns/bind911 +SUB_LIST+= NSUPDATE="@comment " .elif ${PORT_OPTIONS:MNSUPDATE} RUN_DEPENDS+= samba-nsupdate:dns/samba-nsupdate SUB_LIST+= NSUPDATE="" @@ -460,13 +464,6 @@ pre-configure: ${FALSE}; \ fi -# XXX: Gross hack to allow build newer Samba while old one is installed. -# This implies that LINKFLAGS_PYEMBED contains flags which are already -# used in other parts of LINKFLAGS, namely -L${LOCALBASE}/lib and -pthread -post-configure: - -${REINPLACE_CMD} -e 's|LINKFLAGS_PYEMBED.*|LINKFLAGS_PYEMBED = []|' \ - ${CONFIGURE_WRKSRC}/bin/c4che/default.cache.py - pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} . for man in libcli/nbt/man/nmblookup4.1 \ Modified: head/net/samba44/distinfo ============================================================================== --- head/net/samba44/distinfo Fri Mar 24 09:25:12 2017 (r436804) +++ head/net/samba44/distinfo Fri Mar 24 10:19:46 2017 (r436805) @@ -1,3 +1,3 @@ -TIMESTAMP = 1482669451 -SHA256 (samba-4.4.8.tar.gz) = 0e54de8a22b77f9712578029639331b51f818b70e194766c98475a5b99470fbf -SIZE (samba-4.4.8.tar.gz) = 20743869 +TIMESTAMP = 1490313767 +SHA256 (samba-4.4.12.tar.gz) = 9dd0e12b5f49c1e11f44447853ed59aa9394f8cb322bc04aa747602d1366c131 +SIZE (samba-4.4.12.tar.gz) = 20768303 Modified: head/net/samba44/files/patch-buildtools__wafsamba__samba_pidl.py ============================================================================== --- head/net/samba44/files/patch-buildtools__wafsamba__samba_pidl.py Fri Mar 24 09:25:12 2017 (r436804) +++ head/net/samba44/files/patch-buildtools__wafsamba__samba_pidl.py Fri Mar 24 10:19:46 2017 (r436805) @@ -1,6 +1,6 @@ ---- ./buildtools/wafsamba/samba_pidl.py.orig 2013-01-27 23:15:21.739874063 +0000 -+++ ./buildtools/wafsamba/samba_pidl.py 2013-01-27 23:15:50.549893124 +0000 -@@ -88,7 +88,7 @@ +--- buildtools/wafsamba/samba_pidl.py.orig 2016-01-26 11:45:46 UTC ++++ buildtools/wafsamba/samba_pidl.py +@@ -89,7 +89,7 @@ def SAMBA_PIDL(bld, pname, source, # prime the list of nodes we are dependent on with the cached pidl sources t.allnodes = pidl_src_nodes Added: head/net/samba44/files/patch-third_party__waf__wafadmin__Tools__cc.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/samba44/files/patch-third_party__waf__wafadmin__Tools__cc.py Fri Mar 24 10:19:46 2017 (r436805) @@ -0,0 +1,11 @@ +--- third_party/waf/wafadmin/Tools/cc.py.orig 2016-01-26 11:45:47 UTC ++++ third_party/waf/wafadmin/Tools/cc.py +@@ -88,7 +88,7 @@ def c_hook(self, node): + raise Utils.WafError('Have you forgotten to set the feature "cc" on %s?' % str(self)) + return task + +-cc_str = '${CC} ${CCFLAGS} ${CPPFLAGS} ${_CCINCFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' ++cc_str = '${CC} ${CCFLAGS} ${_CCINCFLAGS} ${CPPFLAGS} ${_CCDEFFLAGS} ${CC_SRC_F}${SRC} ${CC_TGT_F}${TGT}' + cls = Task.simple_task_type('cc', cc_str, 'GREEN', ext_out='.o', ext_in='.c', shell=False) + cls.scan = ccroot.scan + cls.vars.append('CCDEPS') Modified: head/net/samba44/files/patch-wscript ============================================================================== --- head/net/samba44/files/patch-wscript Fri Mar 24 09:25:12 2017 (r436804) +++ head/net/samba44/files/patch-wscript Fri Mar 24 10:19:46 2017 (r436805) @@ -1,18 +1,18 @@ ---- wscript.orig 2014-10-01 09:17:32.000000000 +0000 -+++ wscript 2014-11-03 14:50:56.381380474 +0000 -@@ -40,7 +40,6 @@ - opt.RECURSE('lib/ntdb') +--- wscript.orig 2016-01-26 11:45:47 UTC ++++ wscript +@@ -39,7 +39,6 @@ def set_options(opt): + opt.RECURSE('lib/ldb') opt.RECURSE('selftest') opt.RECURSE('source4/lib/tls') - opt.RECURSE('pidl') opt.RECURSE('source3') opt.RECURSE('lib/util') - -@@ -162,7 +161,6 @@ - conf.RECURSE('lib/subunit/c') + opt.RECURSE('ctdb') +@@ -156,7 +155,6 @@ def configure(conf): + conf.RECURSE('nsswitch') conf.RECURSE('libcli/smbreadline') conf.RECURSE('lib/crypto') - conf.RECURSE('pidl') conf.RECURSE('selftest') - conf.RECURSE('source3') - conf.RECURSE('lib/texpect') + if conf.CONFIG_GET('ENABLE_SELFTEST'): + conf.RECURSE('lib/nss_wrapper') Modified: head/net/samba44/files/patch-wscript_build ============================================================================== --- head/net/samba44/files/patch-wscript_build Fri Mar 24 09:25:12 2017 (r436804) +++ head/net/samba44/files/patch-wscript_build Fri Mar 24 10:19:46 2017 (r436805) @@ -1,8 +1,8 @@ ---- ./wscript_build.orig 2013-01-27 22:58:14.032166250 +0000 -+++ ./wscript_build 2013-01-27 23:03:34.089892588 +0000 -@@ -130,7 +130,6 @@ - if bld.AD_DC_BUILD_IS_ENABLED(): - bld.RECURSE('source4/setup') +--- wscript_build.orig 2016-01-26 11:45:47 UTC ++++ wscript_build +@@ -141,7 +141,6 @@ if bld.AD_DC_BUILD_IS_ENABLED(): + if bld.env.with_ctdb: + bld.RECURSE('ctdb') bld.RECURSE('source4/scripting') -bld.RECURSE('pidl') bld.RECURSE('lib') Modified: head/net/samba44/pkg-plist ============================================================================== --- head/net/samba44/pkg-plist Fri Mar 24 09:25:12 2017 (r436804) +++ head/net/samba44/pkg-plist Fri Mar 24 10:19:46 2017 (r436805) @@ -286,8 +286,9 @@ lib/samba4/private/libwinbind-client-sam 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_9.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/gensec/krb5.so %%AD_DC%%lib/shared-modules/ldb/acl.so %%AD_DC%%lib/shared-modules/ldb/aclread.so