diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-02-22 17:34:47 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-02-22 17:34:47 +0000 |
| commit | 7d51693e8c5337bb4971cdef923228972b73c161 (patch) | |
| tree | 0d31f1819f69285413a420afa23451e8cd7765c0 /Mk/bsd.port.mk | |
| parent | 902f3b04d93098651438657405d7def58a270922 (diff) | |
| download | ports-7d51693e8c5337bb4971cdef923228972b73c161.tar.gz ports-7d51693e8c5337bb4971cdef923228972b73c161.zip | |
- only include bsd.pkgng.mk once [1]
- only read bsd.pkgng.mk in post.mk [1]
- move the command definition to bsd.command.mk [1]
- fix check-vulnerable [2]
Submitted by: avilla [1], rene [2]
Notes
Notes:
svn path=/head/; revision=292069
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 50ef85751cee..c6d55a8a3713 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1404,10 +1404,6 @@ LDCONFIG_CMD?= ${LINUXBASE}/sbin/ldconfig -r ${LINUXBASE} PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg -.if defined(WITH_PKGNG) -.include "${PORTSDIR}/Mk/bsd.pkgng.mk" -.endif - .if defined(USE_LOCAL_MK) .include "${PORTSDIR}/Mk/bsd.local.mk" .endif @@ -2440,8 +2436,12 @@ PKG_ARGS+= -C "${CONFLICTS_INSTALL}" .if defined(PKG_NOCOMPRESS) PKG_SUFX?= .tar .else +.if defined(WITH_PKGNG) +PKG_SUFX?= .txz +.else PKG_SUFX?= .tbz .endif +.endif # where pkg_add records its dirty deeds. PKG_DBDIR?= /var/db/pkg @@ -3397,8 +3397,13 @@ check-deprecated: # Check if the port is listed in the vulnerability database +.if defined(WITH_PKGNG) +AUDITFILE?= ${PKG_DBDIR}/auditfile +_EXTRACT_AUDITFILE= ${CAT} "${AUDITFILE}" +.else AUDITFILE?= /var/db/portaudit/auditfile.tbz _EXTRACT_AUDITFILE= ${TAR} -jxOf "${AUDITFILE}" auditfile +.endif check-vulnerable: .if !defined(DISABLE_VULNERABILITIES) && !defined(PACKAGE_BUILDING) @@ -3409,12 +3414,16 @@ check-vulnerable: if [ "$$audit_created" -lt "$$audit_expiry" ]; then \ ${ECHO_MSG} "===> WARNING: Vulnerability database out of date, checking anyway"; \ fi; \ - vlist=`${_EXTRACT_AUDITFILE} | ${GREP} "${PORTNAME}" | \ - ${AWK} -F\| ' /^[^#]/ { \ - if (!system("${PKG_VERSION} -T \"${PKGNAME}\" \"" $$1 "\"")) \ - print "=> " $$3 ".\n Reference: " $$2 \ - } \ - '`; \ + if [ -n "${WITH_PKGNG}" ]; then \ + vlist=`${PKG_BIN} audit "${PKGNAME}"`; \ + else \ + vlist=`${_EXTRACT_AUDITFILE} | ${GREP} "${PORTNAME}" | \ + ${AWK} -F\| ' /^[^#]/ { \ + if (!system("${PKG_VERSION} -T \"${PKGNAME}\" \"" $$1 "\"")) \ + print "=> " $$3 ".\n Reference: " $$2 \ + } \ + '`; \ + fi; \ if [ -n "$$vlist" ]; then \ ${ECHO_MSG} "===> ${PKGNAME} has known vulnerabilities:"; \ ${ECHO_MSG} "$$vlist"; \ |