From 47409ab810dc4b73cc496ddbcd4a72fa9ec55361 Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Fri, 22 Aug 2003 10:11:57 +0000
Subject: Update audit-packages to 1.17.

Instead of using the number of bytes to determine whether or not the
file has shrunk, use the number of lines.  This will allow for
spelling corrections, login name of committers being shorter than
others, etc.  This is a temporary measure until a better distribution
mechanism is used.  Suggested by David Brownlee.
---
 doc/CHANGES                                               | 3 ++-
 security/audit-packages/Makefile                          | 5 +++--
 security/audit-packages/files/download-vulnerability-list | 8 ++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/doc/CHANGES b/doc/CHANGES
index 078278e3df7..99e813f2656 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.3075 2003/08/20 12:24:18 tron Exp $
+$NetBSD: CHANGES,v 1.3076 2003/08/22 10:12:51 agc Exp $
 
 Changes to the packages collection and infrastructure in 2003:
 
@@ -3305,3 +3305,4 @@ Changes to the packages collection and infrastructure in 2003:
 	Added kmessage-0.1 [markd 2003-08-20]
 	Added kimagemapeditor-1.0 [markd 2003-08-20]
 	Updated unzip to 5.50nb1 [tron 2003-08-20]
+	Updated audit-packages to 1.17 [agc 2003-08-21]
diff --git a/security/audit-packages/Makefile b/security/audit-packages/Makefile
index df63e711397..893a2170fcd 100644
--- a/security/audit-packages/Makefile
+++ b/security/audit-packages/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2003/07/21 17:20:06 martti Exp $
+# $NetBSD: Makefile,v 1.26 2003/08/22 10:11:57 agc Exp $
 
-DISTNAME=	audit-packages-1.16
+DISTNAME=	audit-packages-1.17
 WRKSRC=		${WRKDIR}
 CATEGORIES=	security pkgtools
 MASTER_SITES=	# empty
@@ -31,6 +31,7 @@ do-build:
 			-e 's|@PKGSRCDIR@|${_PKGSRCDIR}|g'		\
 			-e 's|@PKG_TOOLS_BIN@|${PKG_TOOLS_BIN}|g'	\
 			-e 's|@SH@|${SH}|g'				\
+			-e 's|@WC@|${WC}|g'				\
 			${FILESDIR}/$$f > ${WRKSRC}/$$f;		\
 	done
 	${NROFF} ${WRKSRC}/audit-packages.8 >${WRKSRC}/audit-packages.0
diff --git a/security/audit-packages/files/download-vulnerability-list b/security/audit-packages/files/download-vulnerability-list
index 78e2da6c203..5cb6e83b057 100644
--- a/security/audit-packages/files/download-vulnerability-list
+++ b/security/audit-packages/files/download-vulnerability-list
@@ -1,5 +1,5 @@
 #! @SH@
-# $NetBSD: download-vulnerability-list,v 1.14 2003/05/21 14:07:45 seb Exp $
+# $NetBSD: download-vulnerability-list,v 1.15 2003/08/22 10:11:58 agc Exp $
 
 : ${PKGVULNDIR=@PKGVULNDIR@}
 
@@ -17,13 +17,13 @@ cd ${PKGVULNDIR}
 existsize=0
 newsize=0
 if [ -f ${EXIST_VUL_LIST} ]; then
-	existsize=`/bin/ls -l ${EXIST_VUL_LIST} | @AWK@ '{ print $5 }'`
+	existsize=`@WC@ -l ${EXIST_VUL_LIST} | @AWK@ '{ print $1 }'`
 fi
 if [ -f ${NEW_VUL_LIST} ]; then
-	newsize=`/bin/ls -l ${NEW_VUL_LIST} | @AWK@ '{ print $5 }'`
+	newsize=`@WC@ -l ${NEW_VUL_LIST} | @AWK@ '{ print $1 }'`
 fi
 if [ $newsize -lt $existsize ]; then
-	echo "New vulnerability list ($newsize bytes) is smaller than existing list ($existsize bytes)" 1>&2
+	echo "New vulnerability list ($newsize lines) is smaller than existing list ($existsize lines)" 1>&2
 	/bin/rm -f ${NEW_VUL_LIST}
 	exit 1
 fi
-- 
cgit v1.2.3