e484e47 Make vuxml the default source for pkg audit — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Make vuxml the default source for pkg audit

Baptiste Daroussin committed 12 years ago

commit e484e47865c2d9aeb336f628503f7ded2fef3154
parent 6f373c0

2 files changed +12 -12

modified pkg/audit.c

@@ -128,7 +128,7 @@ static size_t audit_entry_first_byte_idx[256];

 void
 usage_audit(void)
 {
 	fprintf(stderr, "Usage: pkg audit [-Fqx] <pattern>\n\n");
 	fprintf(stderr, "Usage: pkg audit [-Fqc] <pattern>\n\n");
 	fprintf(stderr, "For more information see 'pkg help audit'.\n");
 }

@@ -845,7 +845,7 @@ exec_audit(int argc, char **argv)

 	char audit_file[MAXPATHLEN + 1];
 	unsigned int vuln = 0;
 	bool fetch = false;
 	bool xml = false;
 	bool xml = true;
 	int ch;
 	int ret = EX_OK, res;
 	const char *portaudit_site = NULL;

@@ -855,13 +855,13 @@ exec_audit(int argc, char **argv)

 		return (EX_CONFIG);
 	}
 	while ((ch = getopt(argc, argv, "qxF")) != -1) {
 	while ((ch = getopt(argc, argv, "qcF")) != -1) {
 		switch (ch) {
 		case 'q':
 			quiet = true;
 			break;
 		case 'x':
 			xml = true;
 		case 'c':
 			xml = false;
 			break;
 		case 'F':
 			fetch = true;

modified pkg/pkg-audit.8

@@ -15,7 +15,7 @@

 .\"     @(#)pkg.8
 .\" $FreeBSD$
 .\"
 .Dd April 18, 2013
 .Dd October  10, 2013
 .Dt PKG-AUDIT 8
 .Os
 .Sh NAME

@@ -23,7 +23,7 @@

 .Nd Audits installed packages against known vulnerabilities.
 .Sh SYNOPSIS
 .Nm
 .Op Fl Fqx
 .Op Fl Fqc
 .Ar pkg-name
 .Sh DESCRIPTION
 .Nm

@@ -38,8 +38,8 @@ to check if security advisories for any installed packages exist.

 Note that a current ports tree (or any local copy of the ports tree) is not
 required for operation.
 .Pp
 The URL that is used to fetch the database can be overridden via the PORTAUDIT_SITE
 config variable or by VULNXML_SITE if you use xml directly.
 The URL that is used to fetch the database can be overridden via the VULNXML_SITE
 config variable or by PORTAUDIR_SITE if you still use the compact audit file.
 See
 .Xr pkg.conf 5
 for more information.

@@ -60,9 +60,9 @@ Fetch the database before checking.

 Be ``quiet''.
 Prints only the requested information without
 displaying many hints.
 .It Fl x
 Use vulnxml directly instead of parsing prepared audit file.
 Database is fetched according to VULNXML_SITE config variable.
 .It Fl c
 Use the prepared audit file instead of vunlxml.
 Database is fetched according to PORTAUDIR_SITE config variable.
 .El
 .Sh ENVIRONMENT
 The following environment variables affect the execution of