portaudit 0.5.10:

- Unbreak portaudit -vF.
- Sync usage with reality.
- Document the q, v, and V options.
- Markup fixes for the portaudit(1) manual page.
- Make quiet mode output even less "redundant" text [1].
- Set maintainership to security@. [2]

Suggested by:	Phil Kernick philk at rotfl dot com dot au [1]
Suggested by:	nectar, remko [2]

3 files changed, 29 insertions, 16 deletions

diff --git a/ports-mgmt/portaudit/Makefile b/ports-mgmt/portaudit/Makefile
index cb4a57f69f9c..43533d045eac 100644
--- a/ports-mgmt/portaudit/Makefile
+++ b/ports-mgmt/portaudit/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	portaudit
-PORTVERSION=	0.5.9
+PORTVERSION=	0.5.10
 CATEGORIES=	security
 DISTFILES=
 
-MAINTAINER=	simon@FreeBSD.org
+MAINTAINER=	security@FreeBSD.org
 COMMENT=	Checks installed ports against a list of security vulnerabilities
 
 MAN1=		portaudit.1
diff --git a/ports-mgmt/portaudit/files/portaudit-cmd.sh b/ports-mgmt/portaudit/files/portaudit-cmd.sh
index 9f0650544283..b16c7e368dab 100644
--- a/ports-mgmt/portaudit/files/portaudit-cmd.sh
+++ b/ports-mgmt/portaudit/files/portaudit-cmd.sh
@@ -153,10 +153,14 @@ audit_installed()
 			close(cmd)
 		}
 		END {
-			print vul " problem(s) in your installed packages found."
+			if ("'$opt_quiet'" == "false") {
+				print vul " problem(s) in your installed packages found."
+			}
 			if (vul > 0) {
-				print "\nYou are advised to update or deinstall" \
-					" the affected package(s) immediately."
+				if ("'$opt_quiet'" == "false") {
+					print "\nYou are advised to update or deinstall" \
+						" the affected package(s) immediately."
+				}
 				exit(1)
 			}
 		}
@@ -295,7 +299,7 @@ fetch_auditfile()
 		cp -f "$portaudit_filename" "$portaudit_filename.old"
 	fi
 
-	$opt_verbose && echo "Attempting to fetch from $portaudit_site."
+	$opt_verbose && echo "Attempting to fetch from $portaudit_sites."
 	urls=`echo "$portaudit_sites" | tr -s ' \t' '\n' | sed -E -e "s
/?\$
/$portaudit_filename
"`
 
 	if ! env $portaudit_fetch_env $portaudit_fetch_cmd $urls; then
@@ -367,7 +371,7 @@ while getopts aCdf:Fqr:vVX: opt; do
 	X)
 		opt_expiry="$OPTARG";;
 	?)
-		echo "Usage: $0 -aCdF [-X days] [-r pattern] [-f file] [pkg-name ...]"
+		echo "Usage: $0 -aCdFVvq [-X days] [-r pattern] [-f file] [pkg-name ...]"
 		exit 2;;
 	esac
 done
diff --git a/ports-mgmt/portaudit/files/portaudit.1 b/ports-mgmt/portaudit/files/portaudit.1
index 19531f4db1d2..da683a2a6e8b 100644
--- a/ports-mgmt/portaudit/files/portaudit.1
+++ b/ports-mgmt/portaudit/files/portaudit.1
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd August 12, 2004
+.Dd July 3, 2005
 .Os
 .Dt PORTAUDIT \&1 "FreeBSD ports collection"
 .
@@ -42,7 +42,7 @@
 .Sh SYNOPSIS
 .
 .Nm
-.Op Fl aCdF
+.Op Fl aCdFqvV
 .Op Fl X Ar days
 .Op Fl f Ar file
 .Op Fl r Ar eregex
@@ -79,11 +79,20 @@ Print a vulnerability report for all installed packages.
 .It Fl C
 Print a vulnerability report for the port in the current working directory.
 Mostly useful for port developers.
-.It Fl F
-Fetch the current database from the
-.Fx servers.
 .It Fl d
 Print the creation date of the database.
+.It Fl F
+Fetch the current database from the
+.Fx
+servers.
+.It Fl q
+Quiet mode.
+.It Fl V
+Show
+.Nm
+version number.
+.It Fl v
+Verbose mode.
 .It Fl X Ar days
 Download a fresh database when the local is at least
 .Ar days
@@ -145,9 +154,9 @@ Print a vulnerability report for the current set of prebuild packages:
 .
 .Xr ports 7 ,
 .Xr periodic.conf 5 ,
-.Li Aq http://www.FreeBSD.org/ports/portaudit/ ,
-.Li Aq http://www.FreeBSD.org/security/#adv ,
-.Li Aq http://FreeBSD.VuXML.org/ .
+.Pa http://www.FreeBSD.org/ports/portaudit/ ,
+.Pa http://www.FreeBSD.org/security/#adv ,
+.Pa http://FreeBSD.VuXML.org/ .
 .
 .
 .Sh BUGS
@@ -162,5 +171,5 @@ Sure to be some.
 .
 .Sh HISTORY
 .
-package auditing first appeared in
+Package auditing first appeared in
 .Nx 1.4.3 .