[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Tell the user the right config file and ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce79b2247d55
branches:  trunk
changeset: 556740:ce79b2247d55
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Apr 04 19:07:58 2009 +0000

description:
Tell the user the right config file and option for vulnerabilities based
on the pkg_install version.  Reported by Nicolas Joly.

diffstat:

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

diffs (41 lines):

diff -r bc018f03e197 -r ce79b2247d55 mk/flavor/pkg/check.mk
--- a/mk/flavor/pkg/check.mk    Sat Apr 04 18:36:04 2009 +0000
+++ b/mk/flavor/pkg/check.mk    Sat Apr 04 19:07:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: check.mk,v 1.12 2009/03/20 16:52:40 joerg Exp $
+# $NetBSD: check.mk,v 1.13 2009/04/04 19:07:58 joerg Exp $
 #
 
 # _flavor-check-vulnerable:
@@ -21,5 +21,5 @@
        fi;                                                     \
        ${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \
        ${AUDIT_PACKAGES} ${_AUDIT_PACKAGES_CMD} ${AUDIT_PACKAGES_FLAGS} ${PKGNAME} \
-       || ${FAIL_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or IGNORE_URLS in audit-packages.conf(5) if this package is absolutely essential."
+       || ${FAIL_MSG} "Define ALLOW_VULNERABLE_PACKAGES in mk.conf or ${_AUDIT_CONFIG_OPTION} in ${_AUDIT_CONFIG_FILE}(5) if this package is absolutely essential."
 .endif
diff -r bc018f03e197 -r ce79b2247d55 mk/flavor/pkg/flavor-vars.mk
--- a/mk/flavor/pkg/flavor-vars.mk      Sat Apr 04 18:36:04 2009 +0000
+++ b/mk/flavor/pkg/flavor-vars.mk      Sat Apr 04 19:07:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: flavor-vars.mk,v 1.11 2009/03/20 16:52:40 joerg Exp $
+# $NetBSD: flavor-vars.mk,v 1.12 2009/04/04 19:07:58 joerg Exp $
 #
 # This Makefile fragment is included indirectly by bsd.prefs.mk and
 # defines some variables which must be defined earlier than where
@@ -54,11 +54,15 @@
 _AUDIT_PACKAGES_CMD?=  audit-pkg
 _EXTRACT_PKGVULNDIR=   ${PKG_ADMIN} config-var PKGVULNDIR
 DOWNLOAD_VULN_LIST?=   ${PKG_ADMIN} fetch-pkg-vulnerabilities
+_AUDIT_CONFIG_FILE=    pkg_install.conf
+_AUDIT_CONFIG_OPTION=  IGNORE_URL
 .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
+_AUDIT_CONFIG_FILE=    audit-packages.conf
+_AUDIT_CONFIG_OPTION=  IGNORE_URLS
 .endif