Date: Sun, 17 Nov 2013 02:00:30 +0000 (UTC) From: Eitan Adler <eadler@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r334044 - in head/ports-mgmt/portaudit: . files Message-ID: <201311170200.rAH20VSn068871@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: eadler Date: Sun Nov 17 02:00:30 2013 New Revision: 334044 URL: http://svnweb.freebsd.org/changeset/ports/334044 Log: Clean up the portaudit port - let the ports-secteam maintain this port instead of secteam. This should assign PRs to the appropriate place. [1] - recent freebsd versions should use pkg audit instead of portaudit - stagify - remove mention of preference file format changes which changed in 2004 PR: ports/184004 (partial Discussed with: simon (many months ago) [1] Added: head/ports-mgmt/portaudit/files/pkg-message.in (contents, props changed) Deleted: head/ports-mgmt/portaudit/pkg-install head/ports-mgmt/portaudit/pkg-req Modified: head/ports-mgmt/portaudit/Makefile head/ports-mgmt/portaudit/pkg-plist Modified: head/ports-mgmt/portaudit/Makefile ============================================================================== --- head/ports-mgmt/portaudit/Makefile Sun Nov 17 00:57:53 2013 (r334043) +++ head/ports-mgmt/portaudit/Makefile Sun Nov 17 02:00:30 2013 (r334044) @@ -9,18 +9,14 @@ DISTFILES= MAINTAINER= ports-secteam@FreeBSD.org COMMENT= Checks installed ports against a list of security vulnerabilities -MAN1= portaudit.1 - PERIODICDIR?= ${PREFIX}/etc/periodic DATABASEDIR?= /var/db/portaudit -PKGREQ= ${WRKDIR}/pkg-req -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall - PLIST_SUB+= PERIODICDIR="${PERIODICDIR:S,^${PREFIX}/,,}" \ DATABASEDIR="${DATABASEDIR}" +SUB_FILES= pkg-message + REQPKGVER= 20040623 SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g' \ @@ -32,33 +28,27 @@ SED_SCRIPT= -e 's|%%PREFIX%%|${PREFIX}|g -e "s|%%REQPKGVER%%|${REQPKGVER}|g" \ -e "s|%%BZIP2_CMD%%|${BZIP2_CMD}|g" \ -NO_STAGE= yes +.include <bsd.port.pre.mk> + +.if ${OSVERSION} > 1000000 +IGNORE= use 'pkg audit' instead +.endif + do-build: .for f in portaudit-cmd.sh portaudit.sh portaudit.1 portaudit.conf @${SED} ${SED_SCRIPT} ${FILESDIR}/${f} >${WRKDIR}/${f} .endfor post-build: -.for f in pkg-req pkg-install pkg-deinstall - @${SED} ${SED_SCRIPT} ${PKGDIR}/${f} >${WRKDIR}/${f} -.endfor - -pre-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGREQ} ${PKGNAME} INSTALL -.endif - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL + @${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${WRKDIR}/pkg-deinstall do-install: - @${INSTALL_SCRIPT} ${WRKDIR}/portaudit-cmd.sh ${PREFIX}/sbin/portaudit - @${INSTALL_DATA} ${WRKDIR}/portaudit.conf ${PREFIX}/etc/portaudit.conf.sample - @${INSTALL_DATA} ${FILESDIR}/portaudit.pubkey ${PREFIX}/etc - @${INSTALL_MAN} ${WRKDIR}/portaudit.1 ${MAN1PREFIX}/man/man1 - @${MKDIR} ${PERIODICDIR}/security - @${INSTALL_SCRIPT} ${WRKDIR}/portaudit.sh ${PERIODICDIR}/security/410.portaudit - @${MKDIR} ${DATABASEDIR} - -post-install: - @${SETENV} "PKG_PREFIX=${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL + @${INSTALL_SCRIPT} ${WRKDIR}/portaudit-cmd.sh ${STAGEDIR}${PREFIX}/sbin/portaudit + @${INSTALL_DATA} ${WRKDIR}/portaudit.conf ${STAGEDIR}${PREFIX}/etc/portaudit.conf.sample + @${INSTALL_DATA} ${FILESDIR}/portaudit.pubkey ${STAGEDIR}${PREFIX}/etc + @${INSTALL_MAN} ${WRKDIR}/portaudit.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 + @${MKDIR} ${STAGEDIR}${PERIODICDIR}/security + @${INSTALL_SCRIPT} ${WRKDIR}/portaudit.sh ${STAGEDIR}${PERIODICDIR}/security/410.portaudit + @${MKDIR} ${STAGEDIR}${DATABASEDIR} -.include <bsd.port.mk> +.include <bsd.port.post.mk> Added: head/ports-mgmt/portaudit/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/portaudit/files/pkg-message.in Sun Nov 17 02:00:30 2013 (r334044) @@ -0,0 +1,3 @@ +To check your installed ports for known vulnerabilities now, do: + +%%PREFIX%%/sbin/portaudit -Fda" Modified: head/ports-mgmt/portaudit/pkg-plist ============================================================================== --- head/ports-mgmt/portaudit/pkg-plist Sun Nov 17 00:57:53 2013 (r334043) +++ head/ports-mgmt/portaudit/pkg-plist Sun Nov 17 02:00:30 2013 (r334044) @@ -1,6 +1,7 @@ sbin/portaudit etc/portaudit.pubkey etc/portaudit.conf.sample +man/man1/portaudit.1.gz %%PERIODICDIR%%/security/410.portaudit @dirrmtry %%PERIODICDIR%%/security @dirrmtry %%PERIODICDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311170200.rAH20VSn068871>