Mon Apr 7 13:07:14 2008 UTC ()
pkg_install-20080407:
Add command to print effective value of configuration variables.
Remove FETCH_CMD variable from pkg_admin, it is not used.
(joerg)
diff -r1.2 -r1.3 pkgsrc/pkgtools/pkg_install/files/admin/admin.h
diff -r1.3 -r1.4 pkgsrc/pkgtools/pkg_install/files/admin/config.c
diff -r1.40 -r1.41 pkgsrc/pkgtools/pkg_install/files/admin/main.c
diff -r1.16 -r1.17 pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1
diff -r1.15 -r1.16 pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.cat1
diff -r1.98 -r1.99 pkgsrc/pkgtools/pkg_install/files/lib/version.h
--- pkgsrc/pkgtools/pkg_install/files/admin/admin.h 2008/03/13 16:35:30 1.2
+++ pkgsrc/pkgtools/pkg_install/files/admin/admin.h 2008/04/07 13:07:14 1.3
--- pkgsrc/pkgtools/pkg_install/files/admin/Attic/config.c 2008/03/21 14:47:53 1.3
+++ pkgsrc/pkgtools/pkg_install/files/admin/Attic/config.c 2008/04/07 13:07:14 1.4
--- pkgsrc/pkgtools/pkg_install/files/admin/main.c 2008/03/23 01:04:47 1.40
+++ pkgsrc/pkgtools/pkg_install/files/admin/main.c 2008/04/07 13:07:14 1.41
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.40 2008/03/23 01:04:47 dsainty Exp $ */
+/* $NetBSD: main.c,v 1.41 2008/04/07 13:07:14 joerg Exp $ */
#if HAVE_CONFIG_H
#include "config.h"
@@ -8,7 +8,7 @@
#include <sys/cdefs.h>
#endif
#ifndef lint
-__RCSID("$NetBSD: main.c,v 1.40 2008/03/23 01:04:47 dsainty Exp $");
+__RCSID("$NetBSD: main.c,v 1.41 2008/04/07 13:07:14 joerg Exp $");
#endif
/*-
@@ -113,9 +113,10 @@
" pmatch pattern pkg - returns true if pkg matches pattern, otherwise false\n"
" fetch-pkg-vulnerabilities [-s] - fetch new vulnerability file\n"
" check-pkg-vulnerabilities [-s] <file> - check syntax and checksums of the vulnerability file\n"
- " audit [-es] [-t type] ...\n"
- " audit-pkg [-es] [-t type] ...\n"
- " audit-batch [-es] [-t type] ...\n",
+ " audit [-es] [-t type] ... - check installed packages for vulnerabilities\n"
+ " audit-pkg [-es] [-t type] ... - check listed packages for vulnerabilities\n"
+ " audit-batch [-es] [-t type] ... - check packages in listed files for vulnerabilities\n"
+ " config-var name - print current value of the configuration variable\n",
getprogname());
exit(EXIT_FAILURE);
}
@@ -521,6 +522,11 @@
} else if (strcasecmp(argv[0], "unset") == 0) {
argv++; /* "unset" */
set_unset_variable(argv, TRUE);
+ } else if (strcasecmp(argv[0], "config-var") == 0) {
+ argv++;
+ if (argv == NULL || argv[1] != NULL)
+ errx(EXIT_FAILURE, "config-var takes exactly one argument");
+ pkg_install_show_variable(argv[0]);
}
#ifndef BOOTSTRAP
else if (strcasecmp(argv[0], "fetch-pkg-vulnerabilities") == 0) {
--- pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1 2008/03/13 16:35:30 1.16
+++ pkgsrc/pkgtools/pkg_install/files/admin/pkg_admin.1 2008/04/07 13:07:14 1.17
--- pkgsrc/pkgtools/pkg_install/files/admin/Attic/pkg_admin.cat1 2008/03/13 16:35:30 1.15
+++ pkgsrc/pkgtools/pkg_install/files/admin/Attic/pkg_admin.cat1 2008/04/07 13:07:14 1.16
--- pkgsrc/pkgtools/pkg_install/files/lib/version.h 2008/04/04 15:21:32 1.98
+++ pkgsrc/pkgtools/pkg_install/files/lib/version.h 2008/04/07 13:07:14 1.99