[pkgsrc/trunk]: pkgsrc/mk Require newer pkg_install for make README.html as w...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/fe3f9eb724dd
branches:  trunk
changeset: 539877:fe3f9eb724dd
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sat Mar 15 16:17:43 2008 +0000

description:
Require newer pkg_install for make README.html as well.

diffstat:

 mk/bsd.pkg.readme.mk |  36 ++++++++++--------------------------
 1 files changed, 10 insertions(+), 26 deletions(-)

diffs (54 lines):

diff -r 61d492fb3fdf -r fe3f9eb724dd mk/bsd.pkg.readme.mk
--- a/mk/bsd.pkg.readme.mk      Sat Mar 15 16:12:27 2008 +0000
+++ b/mk/bsd.pkg.readme.mk      Sat Mar 15 16:17:43 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.readme.mk,v 1.17 2008/02/07 21:36:13 rillig Exp $
+# $NetBSD: bsd.pkg.readme.mk,v 1.18 2008/03/15 16:17:43 joerg Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and encapsulates the
 # code to produce README.html files in each package directory.
@@ -230,35 +230,19 @@
 SED_HOMEPAGE_EXPR=     -e 's|%%HOMEPAGE%%||'
 .endif
 
-# XXX: The code for the pkg_install<20070714 vulnerability checks are
-# XXX: broken.  It will not find vulnerabilities in any packages that
-# XXX: have complex names in the pkg-vulnerabilties file.
-# XXX: e.g. php{4,5}-perl and sun-{jdk,jre}15
-# XXX: Post pkg_install-20070714 only currently known vulnerabilities are
-# XXX: shown in the generated README.html files for packages.
-#
 .PHONY: show-vulnerabilities-html
 show-vulnerabilities-html:
        ${RUN}                                  \
-       if ${PKG_ADMIN} pmatch 'pkg_install<20070714' pkg_install-${PKGTOOLS_VERSION}; then \
-               if [ -f ${PKGVULNDIR}/pkg-vulnerabilities ]; then       \
-                       ${AWK} '/^${PKGBASE}[-<>=]+[0-9]/ { gsub("\<", "\\&lt;", $$1);  \
-                                gsub("\>", "\\&gt;", $$1);             \
-                               printf("<LI><STRONG>%s has a %s exploit (see <a href=\"%s\">%s</a> for more details)</STRONG></LI>\n", $$1, $$2, $$3, $$3) }' \
-                               ${PKGVULNDIR}/pkg-vulnerabilities;      \
-               fi;                                                     \
-       else                                                            \
-               _PKGVULNDIR=`${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR`; \
-               if [ -f $$_PKGVULNDIR/pkg-vulnerabilities ]; then       \
-                       ${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -n ${PKGNAME} 2>&1| ${AWK} \
-                               '{ printurl = $$8;                      \
+       _PKGVULNDIR=`${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -Q PKGVULNDIR`; \
+       if [ -f $$_PKGVULNDIR/pkg-vulnerabilities ]; then       \
+               ${AUDIT_PACKAGES} ${AUDIT_PACKAGES_FLAGS} -n ${PKGNAME} 2>&1| ${AWK} \
+                       '{ printurl = $$8;                      \
                                gsub("\<", "\\&lt;", $$2);              \
-                               gsub("\>", "\\&gt;", $$2);              \
-                               gsub("\<", "\\&lt;", printurl);         \
-                               gsub("\>", "\\&gt;", printurl);         \
-                               gsub("\&", "\\&amp;", printurl);        \
-                               printf("<LI><STRONG>%s has a %s exploit (see <a href=\"%s\">%s</a> for more details)</STRONG></LI>\n", $$2, $$5, $$8, printurl) }'; \
-               fi;                                                     \
+                       gsub("\>", "\\&gt;", $$2);              \
+                       gsub("\<", "\\&lt;", printurl);         \
+                       gsub("\>", "\\&gt;", printurl);         \
+                       gsub("\&", "\\&amp;", printurl);        \
+                       printf("<LI><STRONG>%s has a %s exploit (see <a href=\"%s\">%s</a> for more details)</STRONG></LI>\n", $$2, $$5, $$8, printurl) }'; \
        fi
 
 # If PACKAGES is set to the default (../../packages), the current