1ebe1b2 Use -B for shared-libs consistently. Load SHLIBs data when working on shlibs. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Use -B for shared-libs consistently. Load SHLIBs data when working on shlibs.

Matthew Seaman committed 13 years ago

commit 1ebe1b200ce365f4c72b8d7b32ac63b21daf3f30
parent a519b9c

2 files changed +10 -10

modified pkg/check.c

@@ -221,7 +221,7 @@ check_summary(struct pkgdb *db, struct deps_head *dh)

 void
 usage_check(void)
 {
 	fprintf(stderr, "usage: pkg check [-dlsr] [-vy] [-a | -gxX <pattern>]\n\n");
 	fprintf(stderr, "usage: pkg check [-Bdsr] [-vy] [-a | -gxX <pattern>]\n\n");
 	fprintf(stderr, "For more information see 'pkg help check'.\n");
 }

@@ -247,7 +247,7 @@ exec_check(int argc, char **argv)

 	struct deps_head dh = STAILQ_HEAD_INITIALIZER(dh);
 	while ((ch = getopt(argc, argv, "yagdlxXsrv")) != -1) {
 	while ((ch = getopt(argc, argv, "yagdBxXsrv")) != -1) {
 		switch (ch) {
 			case 'a':
 				match = MATCH_ALL;

@@ -268,13 +268,13 @@ exec_check(int argc, char **argv)

 				dcheck = true;
 				flags |= PKG_LOAD_DEPS;
 				break;
 			case 'l':
 			case 'B':
 				pkg_config_bool(PKG_CONFIG_SHLIBS, &shlibs);
 				if (!shlibs)
 					errx(EX_USAGE, "reanalyzing shlibs requires SHLIBS"
 						       " in pkg.conf.");
 				reanalyse_shlibs = true;
 				flags |= PKG_LOAD_FILES;
 				flags |= PKG_LOAD_SHLIBS;
 				break;
 			case 's':
 				checksums = true;

modified pkg/pkg-check.8

@@ -23,22 +23,22 @@

 .Nd sanity checks installed packages
 .Sh SYNOPSIS
 .Nm
 .Op Fl dlsr
 .Op Fl Bdsr
 .Op Fl vy
 .Op Fl a | gxX Ar <pattern>
 .Sh DESCRIPTION
 .Nm
 .Fl d
 is used to check for and install missing dependencies.
 .Pp
 .Nm
 .Fl l
 .Fl B
 is used to reanalyse SHLIBS of installed packages.
 See
 .Xr pkg.conf 5
 for more information on SHLIBS.
 .Pp
 .Nm
 .Fl d
 is used to check for and install missing dependencies.
 .Pp
 .Nm
 .Fl r
 is used to recompute sizes and checksums of installed packages.
 .Pp