[pkgsrc/trunk]: pkgsrc/mk/bulk Enforce vulnerability list being installed & c...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7e9a2584328f
branches:  trunk
changeset: 471052:7e9a2584328f
user:      hubertf <hubertf%pkgsrc.org@localhost>
date:      Tue Mar 16 13:55:51 2004 +0000

description:
Enforce vulnerability list being installed & correct & upto-date
before trying to upload anything.

diffstat:

 mk/bulk/build.conf-example |   6 +++++-
 mk/bulk/upload             |  16 +++++++++++++---
 2 files changed, 18 insertions(+), 4 deletions(-)

diffs (54 lines):

diff -r 0a657bb39895 -r 7e9a2584328f mk/bulk/build.conf-example
--- a/mk/bulk/build.conf-example        Tue Mar 16 13:44:43 2004 +0000
+++ b/mk/bulk/build.conf-example        Tue Mar 16 13:55:51 2004 +0000
@@ -1,5 +1,5 @@
 # build.conf
-# $NetBSD: build.conf-example,v 1.17 2004/02/25 09:20:59 grant Exp $
+# $NetBSD: build.conf-example,v 1.18 2004/03/16 13:55:51 hubertf Exp $
 #
 # config file in /bin/sh syntax for {,pre,post}-build
 #
@@ -46,6 +46,10 @@
 
 # Uploading binary packages:
 
+# Update vulnerability database before uploading.
+# can be set to 'yes' or 'no'.
+UPDATE_VULNERABILITY_LIST=yes
+
 # destination for packages with the OSVERSION_SPECIFIC flag set.  Needs major.minor.patch
 # version.
 RSYNC_DST_SPECIFIC=$CVS_USER%ftp.NetBSD.org@localhost:/pub/NetBSD/packages/x.y.z/arch
diff -r 0a657bb39895 -r 7e9a2584328f mk/bulk/upload
--- a/mk/bulk/upload    Tue Mar 16 13:44:43 2004 +0000
+++ b/mk/bulk/upload    Tue Mar 16 13:55:51 2004 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: upload,v 1.15 2004/02/25 09:20:59 grant Exp $
+# $NetBSD: upload,v 1.16 2004/03/16 13:55:51 hubertf Exp $
 
 #
 # Upload non-restricted binary pkgs to ftp server
@@ -65,10 +65,20 @@
 # May be different than $USR_PKGSRC:
 pkgsrcdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=_PKGSRCDIR`
 packages=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=PACKAGES`
+distdir=`cd pkgtools/pkglint ; ${BMAKE} show-var VARNAME=DISTDIR`
 
 # Pull in some pkgs needed
-( cd pkgtools/pkglint ; ${BMAKE} bulk-install )
-( cd net/rsync ;        ${BMAKE} bulk-install )
+( cd pkgtools/pkglint ;        ${BMAKE} bulk-install )
+( cd net/rsync ;               ${BMAKE} bulk-install )
+( cd security/audit-packages ; ${BMAKE} bulk-install )
+
+echo "Making sure vulnerability-list is upto date:"
+if [ $UPDATE_VULNERABILITY_LIST = "yes" ]
+then
+       env PKGVULNDIR=${distdir} download-vulnerability-list
+else
+       echo '(skipped)'
+fi
 
 echo "Checking for restricted, out of date, and vulnerable packages:"
 # -p  =  report old versions of packages