diff options
| author | hubertf <hubertf@pkgsrc.org> | 2004-03-16 13:55:51 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2004-03-16 13:55:51 +0000 |
| commit | 51c65d98913fe0d4586a6d6c963c597a2b7e00a4 (patch) | |
| tree | fef33409341a9f90abf05ceef4ee31cc59a5991c /mk | |
| parent | 9d696352888adedf566a755d9c425518dc36f615 (diff) | |
| download | pkgsrc-51c65d98913fe0d4586a6d6c963c597a2b7e00a4.tar.gz | |
Enforce vulnerability list being installed & correct & upto-date
before trying to upload anything.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bulk/build.conf-example | 6 | ||||
| -rw-r--r-- | mk/bulk/upload | 16 |
2 files changed, 18 insertions, 4 deletions
diff --git a/mk/bulk/build.conf-example b/mk/bulk/build.conf-example index c75a5aea220..113c8f2279b 100644 --- a/mk/bulk/build.conf-example +++ b/mk/bulk/build.conf-example @@ -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 @@ PRUNEDISTFILES=no # 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:/pub/NetBSD/packages/x.y.z/arch diff --git a/mk/bulk/upload b/mk/bulk/upload index bd58936b235..73ce7275c70 100644 --- a/mk/bulk/upload +++ b/mk/bulk/upload @@ -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 @@ upload_others=$TMP/upload_others # 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 |