summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authormartti <martti@pkgsrc.org>2003-12-03 04:58:01 +0000
committermartti <martti@pkgsrc.org>2003-12-03 04:58:01 +0000
commitac3fc971177542787c353a74a5c69c0969244038 (patch)
tree24879e29cbd1a4f22ec85cfc035fca4764742d12 /security
parent01d98339bb2222573f975ce60b6318d3e864e4e0 (diff)
downloadpkgsrc-ac3fc971177542787c353a74a5c69c0969244038.tar.gz
Updated audit-packages to 1.26
Added support for audit-packages.conf. This file can be used to define environment variables (e.g. FETCH_ARGS).
Diffstat (limited to 'security')
-rw-r--r--security/audit-packages/Makefile5
-rw-r--r--security/audit-packages/files/audit-packages.817
-rw-r--r--security/audit-packages/files/download-vulnerability-list13
3 files changed, 28 insertions, 7 deletions
diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile
index 554e7a289c8..5954ff90d77 100644
--- a/security/audit-packages/Makefile
+++ b/security/audit-packages/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2003/10/18 10:16:57 agc Exp $
+# $NetBSD: Makefile,v 1.35 2003/12/03 04:58:01 martti Exp $
-DISTNAME= audit-packages-1.25
+DISTNAME= audit-packages-1.26
WRKSRC= ${WRKDIR}
CATEGORIES= security pkgtools
MASTER_SITES= # empty
@@ -38,6 +38,7 @@ do-build:
-e 's|@MV@|${MV}|g' \
-e 's|@RM@|${RM}|g' \
-e 's|@MKDIR@|${MKDIR}|g' \
+ -e 's|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g' \
${FILESDIR}/$$f > ${WRKSRC}/$$f; \
done
${NROFF} ${WRKSRC}/audit-packages.8 >${WRKSRC}/audit-packages.0
diff --git a/security/audit-packages/files/audit-packages.8 b/security/audit-packages/files/audit-packages.8
index dac6c8c4555..0c6b39af60b 100644
--- a/security/audit-packages/files/audit-packages.8
+++ b/security/audit-packages/files/audit-packages.8
@@ -1,4 +1,4 @@
-.\" $NetBSD: audit-packages.8,v 1.3 2003/09/16 14:50:47 grant Exp $
+.\" $NetBSD: audit-packages.8,v 1.4 2003/12/03 04:58:01 martti Exp $
.Dd September 16, 2003
.Os
.Dt AUDIT-PACKAGES 8
@@ -111,14 +111,22 @@ This can be changed by defining the environment variable
.Ev PKGVULNDIR
to the directory containing the vulnerabilities file.
.Sh ENVIRONMENT
+These variables can also be defined in the
+.Pa @PKG_SYSCONFDIR@/audit-packages.conf
+file.
+.Pp
.Bl -tag -width PKGVULNDIR
.It Ev PKGVULNDIR
Specifies the directory containing the
.Pa pkg-vulnerabilities
file.
+.It Ev FETCH_ARGS
+Specifies optional argements for the ftp client.
.El
.Sh FILES
.Pa @PKGVULNDIR@/pkg-vulnerabilities
+.Pp
+.Pa @PKG_SYSCONFDIR@/audit-packages.conf
.\" .Sh EXAMPLES
.Sh EXAMPLES
The
@@ -136,6 +144,13 @@ can be run via
.Nx Ns 's
.Pa /etc/security.local
daily security script).
+.Pp
+The
+.Nm download-vulnerability-list
+command can be forced to use IPv4 with the following setting in
+.Pa @PKG_SYSCONFDIR@/audit-packages.conf :
+.Pp
+export FETCH_ARGS="-4"
.Sh SEE ALSO
.Xr pkg_info 1 ,
.Xr mk.conf 5 ,
diff --git a/security/audit-packages/files/download-vulnerability-list b/security/audit-packages/files/download-vulnerability-list
index aa1b0e752f5..a6e01a0d08e 100644
--- a/security/audit-packages/files/download-vulnerability-list
+++ b/security/audit-packages/files/download-vulnerability-list
@@ -1,6 +1,6 @@
#! @SH@
-# $NetBSD: download-vulnerability-list,v 1.21 2003/10/18 10:16:57 agc Exp $
+# $NetBSD: download-vulnerability-list,v 1.22 2003/12/03 04:58:01 martti Exp $
#
# Copyright (c) 2000-2003 Alistair Crooks. All rights reserved.
#
@@ -44,12 +44,17 @@ VUL_SOURCE="ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/pkg-vulnerabiliti
NEW_VUL_LIST=pkg-vulnerabilities.$$
EXIST_VUL_LIST=pkg-vulnerabilities
+if [ -r @PKG_SYSCONFDIR@/audit-packages.conf ]; then
+ echo "Reading settings from @PKG_SYSCONFDIR@/audit-packages.conf"
+ . @PKG_SYSCONFDIR@/audit-packages.conf
+fi
+
cd ${PKGVULNDIR}
utility=`echo "@FETCH_CMD@" | @AWK@ '{ print $1 }'`
case "$utility" in
-*curl) @FETCH_CMD@ -o ${NEW_VUL_LIST} ${VUL_SOURCE} ;;
-*ftp) @FETCH_CMD@ -o ${NEW_VUL_LIST} ${VUL_SOURCE} ;;
-*wget) @FETCH_CMD@ -O ${NEW_VUL_LIST} ${VUL_SOURCE} ;;
+*curl) @FETCH_CMD@ ${FETCH_ARGS} -o ${NEW_VUL_LIST} ${VUL_SOURCE} ;;
+*ftp) @FETCH_CMD@ ${FETCH_ARGS} -o ${NEW_VUL_LIST} ${VUL_SOURCE} ;;
+*wget) @FETCH_CMD@ ${FETCH_ARGS} -O ${NEW_VUL_LIST} ${VUL_SOURCE} ;;
*) echo "Unknown fetch command - please use send-pr to send in support for your fetch command" 1>&2
exit 1
;;