[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Use pkg_admin for audit processing if pk...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/03960d1b1037
branches:  trunk
changeset: 554249:03960d1b1037
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Feb 11 14:34:36 2009 +0000

description:
Use pkg_admin for audit processing if pkg_install >= 20090201 is
installed.

diffstat:

 mk/flavor/pkg/check.mk       |   6 +++---
 mk/flavor/pkg/flavor-vars.mk |  12 +++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r 6d283e5d136b -r 03960d1b1037 mk/flavor/pkg/check.mk
--- a/mk/flavor/pkg/check.mk    Wed Feb 11 14:23:31 2009 +0000
+++ b/mk/flavor/pkg/check.mk    Wed Feb 11 14:34:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check.mk,v 1.9 2008/04/07 13:16:26 joerg Exp $
+# $NetBSD: check.mk,v 1.10 2009/02/11 14:34:36 joerg Exp $
 #
 
 # _flavor-check-vulnerable:
@@ -7,7 +7,7 @@
 #
 _flavor-check-vulnerable: .PHONY
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       _PKGVULNDIR=`${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR`; \
+       _PKGVULNDIR=`${_EXTRACT_PKGVULNDIR}`; \
        vulnfile=$$_PKGVULNDIR/pkg-vulnerabilities;             \
        if ${TEST} ! -f "$$vulnfile"; then                      \
                ${PHASE_MSG} "Skipping vulnerability checks.";  \
@@ -16,7 +16,7 @@
                exit 0;                                         \
        fi;                                                     \
        ${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \
-       ${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -n ${PKGNAME};        \
+       ${AUDIT_PACKAGES} ${_AUDIT_PACKAGES_CMD} ${AUDIT_PACKAGES_FLAGS} ${PKGNAME};    \
        if ${TEST} "$$?" -ne 0; then                            \
                ${ERROR_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential."; \
                ${FALSE};                                       \
diff -r 6d283e5d136b -r 03960d1b1037 mk/flavor/pkg/flavor-vars.mk
--- a/mk/flavor/pkg/flavor-vars.mk      Wed Feb 11 14:23:31 2009 +0000
+++ b/mk/flavor/pkg/flavor-vars.mk      Wed Feb 11 14:34:36 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: flavor-vars.mk,v 1.9 2008/04/07 13:18:25 joerg Exp $
+# $NetBSD: flavor-vars.mk,v 1.10 2009/02/11 14:34:36 joerg Exp $
 #
 # This Makefile fragment is included indirectly by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
@@ -49,8 +49,18 @@
 _PKG_INSTALL_DEPENDS=  yes
 .endif
 
+.if !defined(NO_PKGTOOLS_REQD_CHECK) && ${PKGTOOLS_VERSION} >= 20090201
+AUDIT_PACKAGES?=       ${PKG_ADMIN}
+_AUDIT_PACKAGES_CMD?=  audit-pkg
+_EXTRACT_PKGVULNDIR=   ${PKG_ADMIN} config-var PKGVULNDIR
+DOWNLOAD_VULN_LIST?=   ${PKG_ADMIN} fetch-pkg-vulnerabilities
+.else
 AUDIT_PACKAGES?=       ${PKG_TOOLS_BIN}/audit-packages
+_AUDIT_PACKAGES_CMD?=  -n
+_EXTRACT_PKGVULNDIR=   ${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR
 DOWNLOAD_VULN_LIST?=   ${PKG_TOOLS_BIN}/download-vulnerability-list
+.endif
+
 
 # The binary pkg_install tools all need to consistently to refer to the
 # correct package database directory.