svn commit: r364363 - in head/net: samba36 samba36/files samba4 samba41
Timur I. Bakeyev
timur at FreeBSD.org
Fri Aug 8 14:09:15 UTC 2014
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
More information about the svn-ports-all
mailing list