pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/pkgsrc-2003Q4]: pkgsrc/security/audit-packages Pullup more forgiving ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2e91af9c8286
branches: pkgsrc-2003Q4
changeset: 463717:2e91af9c8286
user: agc <agc%pkgsrc.org@localhost>
date: Tue Dec 30 15:45:01 2003 +0000
description:
Pullup more forgiving functionality to the pkgsrc-2003Q4 branch, and also
incorporate the patches for an audit-packages.conf file. Requested by
Jeremy Reed.
PatchSet 46
Date: 2003/12/03 04:58:01
Author: martti
Log:
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).
Members:
Makefile:1.34->1.35
files/audit-packages.8:1.3->1.4
files/download-vulnerability-list:1.21->1.22
---------------------
PatchSet 47
Date: 2003/12/03 09:31:01
Author: wiz
Log:
Bump date for previous. Fix typo.
Members:
files/audit-packages.8:1.4->1.5
---------------------
PatchSet 48
Date: 2003/12/11 17:10:21
Author: agc
Log:
Update audit-packages to version 1.27.
Difference from previous version (1.26):
+ if the vulnerability list is older than a week, just display a warning
message - don't consider this a fatal error.
Members:
Makefile:1.35->1.36
files/audit-packages:1.14->1.15
diffstat:
security/audit-packages/Makefile | 5 ++-
security/audit-packages/files/audit-packages | 4 +-
security/audit-packages/files/audit-packages.8 | 19 +++++++++++++-
security/audit-packages/files/download-vulnerability-list | 13 +++++++---
4 files changed, 31 insertions(+), 10 deletions(-)
diffs (120 lines):
diff -r 937abd96f64b -r 2e91af9c8286 security/audit-packages/Makefile
--- a/security/audit-packages/Makefile Sat Dec 20 19:49:01 2003 +0000
+++ b/security/audit-packages/Makefile Tue Dec 30 15:45:01 2003 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.34 2003/10/18 10:16:57 agc Exp $
+# $NetBSD: Makefile,v 1.34.2.1 2003/12/30 15:45:01 agc Exp $
-DISTNAME= audit-packages-1.25
+DISTNAME= audit-packages-1.27
WRKSRC= ${WRKDIR}
CATEGORIES= security pkgtools
MASTER_SITES= # empty
@@ -38,6 +38,7 @@
-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 -r 937abd96f64b -r 2e91af9c8286 security/audit-packages/files/audit-packages
--- a/security/audit-packages/files/audit-packages Sat Dec 20 19:49:01 2003 +0000
+++ b/security/audit-packages/files/audit-packages Tue Dec 30 15:45:01 2003 +0000
@@ -1,6 +1,6 @@
#! @SH@
#
-# $NetBSD: audit-packages,v 1.14 2003/10/18 10:16:57 agc Exp $
+# $NetBSD: audit-packages,v 1.14.2.1 2003/12/30 15:45:01 agc Exp $
#
# Copyright (c) 2000-2003 Alistair Crooks. All rights reserved.
#
@@ -44,7 +44,7 @@
case "$errmsg" in
"") # check for old vulnerabilities file
- [ -n "$(find $vuls -ctime +7)" ] && errmsg="** $vuls more than a week old"
+ [ -n "$(find $vuls -ctime +7)" ] && echo "*** WARNING - $vuls more than a week old, continuing..."
;;
esac
diff -r 937abd96f64b -r 2e91af9c8286 security/audit-packages/files/audit-packages.8
--- a/security/audit-packages/files/audit-packages.8 Sat Dec 20 19:49:01 2003 +0000
+++ b/security/audit-packages/files/audit-packages.8 Tue Dec 30 15:45:01 2003 +0000
@@ -1,5 +1,5 @@
-.\" $NetBSD: audit-packages.8,v 1.3 2003/09/16 14:50:47 grant Exp $
-.Dd September 16, 2003
+.\" $NetBSD: audit-packages.8,v 1.3.2.1 2003/12/30 15:45:01 agc Exp $
+.Dd December 3, 2003
.Os
.Dt AUDIT-PACKAGES 8
.Sh NAME
@@ -111,14 +111,22 @@
.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 arguments 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 @@
.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 -r 937abd96f64b -r 2e91af9c8286 security/audit-packages/files/download-vulnerability-list
--- a/security/audit-packages/files/download-vulnerability-list Sat Dec 20 19:49:01 2003 +0000
+++ b/security/audit-packages/files/download-vulnerability-list Tue Dec 30 15:45:01 2003 +0000
@@ -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.21.2.1 2003/12/30 15:45:01 agc Exp $
#
# Copyright (c) 2000-2003 Alistair Crooks. All rights reserved.
#
@@ -44,12 +44,17 @@
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
;;
Home |
Main Index |
Thread Index |
Old Index