Add support for the upcoming pkg_install-20070714 which now includes

audit-packages.

1 files changed, 53 insertions, 35 deletions

diff --git a/mk/flavor/pkg/check.mk b/mk/flavor/pkg/check.mk
index f78515f44ff..ca24b87f0b4 100644
--- a/mk/flavor/pkg/check.mk
+++ b/mk/flavor/pkg/check.mk
@@ -1,4 +1,4 @@
-# $NetBSD: check.mk,v 1.3 2007/03/09 00:39:54 rillig Exp $
+# $NetBSD: check.mk,v 1.4 2007/07/14 17:17:46 adrianp Exp $
 #
 
 # _flavor-check-vulnerable:
@@ -11,38 +11,56 @@
 #
 _flavor-check-vulnerable: .PHONY
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	vulnfile=${PKGVULNDIR:Q}/pkg-vulnerabilities;			\
-	if ${TEST} ! -f "$$vulnfile"; then				\
-		${PHASE_MSG} "Skipping vulnerability checks.";		\
-		${WARNING_MSG} "No $$vulnfile file found.";		\
-		${WARNING_MSG} "To fix, install the pkgsrc/security/audit-packages"; \
-		${WARNING_MSG} "package and run: \`\`${LOCALBASE}/sbin/download-vulnerability-list''."; \
-		exit 0;							\
-	fi;								\
-	${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}";	\
-	conffile=;							\
-	for dir in							\
-		__dummy							\
-		${PKG_SYSCONFDIR.audit-packages:Q}""			\
-		${PKG_SYSCONFDIR:Q}"";					\
-	do								\
-		case $$dir in						\
-		/*)	conffile="$$dir/audit-packages.conf"; break ;;	\
-		*)	continue ;;					\
-		esac;							\
-	done;								\
-	if ${TEST} -z "$$conffile" -a -f "$$conffile"; then		\
-		. $$conffile;						\
-	fi;								\
-	${SETENV} PKGNAME=${PKGNAME}					\
-		  PKGBASE=${PKGBASE}					\
-	${AWK} 'BEGIN { exitcode = 0 }					\
-		/^$$/ { next }						\
-		/^#.*/ { next }						\
-		$$1 !~ ENVIRON["PKGBASE"] && $$1 !~ /\{/ { next }	\
-		{ s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ERROR_MSG:S/"/\"/g} \"%s vulnerability in %s - see %s for more information\"", $$1, ENVIRON["PKGNAME"], $$2, ENVIRON["PKGNAME"], $$3); if (system(s) == 0) { print $$1; exitcode += 1 }; } \
-		END { exit exitcode }' < $$vulnfile || ${FALSE};	\
-	if ${TEST} "$$?" -ne 0; then					\
-		${ERROR_MSG} "Define ALLOW_VULNERABLE_PACKAGES if this package is absolutely essential"; \
-		${FALSE};						\
+	_INFO_VER=`${PKG_INFO} -V`;					\
+	if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-$$_INFO_VER; then \
+		vulnfile=${PKGVULNDIR:Q}/pkg-vulnerabilities;		\
+		if ${TEST} ! -f "$$vulnfile"; then			\
+			${PHASE_MSG} "Skipping vulnerability checks.";	\
+			${WARNING_MSG} "No $$vulnfile file found.";	\
+			${WARNING_MSG} "To fix, install the pkgsrc/security/audit-packages"; \
+			${WARNING_MSG} "package and run: \`\`${LOCALBASE}/sbin/download-vulnerability-list''."; \
+			exit 0;						\
+		fi;							\
+		${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \
+		conffile=;						\
+		for dir in						\
+			__dummy						\
+			${PKG_SYSCONFDIR.audit-packages:Q}""		\
+			${PKG_SYSCONFDIR:Q}"";				\
+		do							\
+			case $$dir in					\
+			/*)	conffile="$$dir/audit-packages.conf"; break ;; \
+			*)	continue ;;				\
+			esac;						\
+		done;							\
+		if ${TEST} -z "$$conffile" -a -f "$$conffile"; then	\
+			. $$conffile;					\
+		fi;							\
+		${SETENV} PKGNAME=${PKGNAME}				\
+		  	PKGBASE=${PKGBASE}				\
+		${AWK} 'BEGIN { exitcode = 0 }				\
+			/^$$/ { next }					\
+			/^#.*/ { next }					\
+			$$1 !~ ENVIRON["PKGBASE"] && $$1 !~ /\{/ { next } \
+			{ s = sprintf("${PKG_ADMIN} pmatch \"%s\" %s && ${ERROR_MSG:S/"/\"/g} \"%s vulnerability in %s - see %s for more information\"", $$1, ENVIRON["PKGNAME"], $$2, ENVIRON["PKGNAME"], $$3); if (system(s) == 0) { print $$1; exitcode += 1 }; } \
+			END { exit exitcode }' < $$vulnfile || ${FALSE}; \
+		if ${TEST} "$$?" -ne 0; then				\
+			${ERROR_MSG} "Define ALLOW_VULNERABLE_PACKAGES if this package is absolutely essential"; \
+			${FALSE};					\
+		fi;							\
+	else								\
+		_PKGVULNDIR=`audit-packages ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR`; \
+		vulnfile=$$_PKGVULNDIR/pkg-vulnerabilities;		\
+		if ${TEST} ! -f "$$vulnfile"; then 			\
+			${PHASE_MSG} "Skipping vulnerability checks.";	\
+			${WARNING_MSG} "No $$vulnfile file found.";	\
+			${WARNING_MSG} "To fix run: \`download-vulnerability-list'."; \
+			exit 0;						\
+		fi;							\
+		${PHASE_MSG} "Checking for vulnerabilities in ${PKGNAME}"; \
+		audit-packages ${AUDIT_PACKAGES_FLAGS} -n ${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};					\
+		fi;							\
 	fi