From owner-svn-ports-head@FreeBSD.ORG Fri Aug 8 14:09:14 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFD07F8 for ; Fri, 8 Aug 2014 14:09:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B09A3272C for ; Fri, 8 Aug 2014 14:09:14 +0000 (UTC) Received: from timur (uid 1138) (envelope-from timur@FreeBSD.org) id 2f27 by svn.freebsd.org (DragonFly Mail Agent v0.9+); Fri, 08 Aug 2014 14:09:14 +0000 From: Timur I. Bakeyev Date: Fri, 8 Aug 2014 14:09:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r364363 - in head/net: samba36 samba36/files samba4 samba41 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Message-Id: <53e4da0a.2f27.1e2df298@svn.freebsd.org> X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18 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, 08 Aug 2014 14:09:15 -0000 Author: timur Date: Fri Aug 8 14:09:13 2014 New Revision: 364363 URL: http://svnweb.freebsd.org/changeset/ports/364363 QAT: https://qat.redports.org/buildarchive/r364363/ Log: Add CPE support on request of the security officer. Deleted: head/net/samba36/files/patch-source3__script__findsmb.in Modified: head/net/samba36/Makefile head/net/samba36/pkg-plist head/net/samba4/Makefile head/net/samba41/Makefile Modified: head/net/samba36/Makefile ============================================================================== --- head/net/samba36/Makefile Fri Aug 8 14:08:40 2014 (r364362) +++ head/net/samba36/Makefile Fri Aug 8 14:09:13 2014 (r364363) @@ -20,6 +20,8 @@ PATCH_STRIP= -p1 EXTRA_PATCHES= ${PATCHDIR}/sernet.patch SAMBA_BASENAME= samba +CPE_VENDOR= samba +CPE_PRODUCT= samba LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} @@ -30,7 +32,7 @@ AUTOHEADER_ARGS= ${IPATHS} AUTOCONF_ARGS= ${IPATHS} GNU_CONFIGURE= yes -USES= gmake pkgconfig iconv +USES= gmake pkgconfig iconv cpe USE_AUTOTOOLS= autoconf autoheader USE_LDCONFIG= ${SAMBA_LIBDIR} # pkg-config is used to find talloc @@ -483,6 +485,7 @@ pre-install: .endif post-install: + @${RM} -f ${STAGEDIR}/${PREFIX}/bin/findsmb .for sect in 1 3 5 7 8 @${MKDIR} ${STAGEDIR}${MAN${sect}PREFIX}/man/man${sect} . for man in ${SAMBA_MAN${sect}} Modified: head/net/samba36/pkg-plist ============================================================================== --- head/net/samba36/pkg-plist Fri Aug 8 14:08:40 2014 (r364362) +++ head/net/samba36/pkg-plist Fri Aug 8 14:09:13 2014 (r364363) @@ -1,6 +1,5 @@ etc/%%SAMBA_CONFIG%%.sample bin/eventlogadm -bin/findsmb bin/make_smbpasswd bin/net bin/nmblookup Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Fri Aug 8 14:08:40 2014 (r364362) +++ head/net/samba4/Makefile Fri Aug 8 14:09:13 2014 (r364363) @@ -24,6 +24,8 @@ SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SA WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) +CPE_VENDOR= samba +CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} @@ -63,7 +65,7 @@ CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHRE PTHREAD_LDFLAGS="${PTHREAD_LIBS}" USE_PYTHON= 2 -USES= shebangfix compiler perl5 pkgconfig iconv readline +USES= shebangfix compiler perl5 pkgconfig iconv readline cpe USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_TOOL= buildtools/bin/waf Modified: head/net/samba41/Makefile ============================================================================== --- head/net/samba41/Makefile Fri Aug 8 14:08:40 2014 (r364362) +++ head/net/samba41/Makefile Fri Aug 8 14:09:13 2014 (r364363) @@ -24,6 +24,8 @@ SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SA WRKSRC?= ${WRKDIR}/${DISTNAME} .if !defined(SAMBA4_SUBPORT) +CPE_VENDOR= samba +CPE_PRODUCT= samba # Directories VARDIR= ${DESTDIR}/var SAMBA4_RUNDIR= ${VARDIR}/run/${SAMBA4_PORTNAME} @@ -63,7 +65,7 @@ CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHRE PTHREAD_LDFLAGS="${PTHREAD_LIBS}" USE_PYTHON= 2 -USES= shebangfix compiler perl5 pkgconfig iconv readline +USES= shebangfix compiler perl5 pkgconfig iconv readline cpe USE_PERL5= build USE_LDCONFIG= ${SAMBA4_LIBDIR} WAF_TOOL= buildtools/bin/waf