83d60e3 Merge branch 'upstream-master' — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Merge branch 'upstream-master'

Shawn Webb committed 2 years ago

commit 83d60e33ef4ae7f479a68da854a27f0f79bd4d56
parent 9ce36fc

2 files changed +4 -4

modified libpkg/pkg_repo.c

@@ -693,7 +693,7 @@ pkg_repo_fetch_remote_extract_fd(struct pkg_repo *repo, struct pkg_repo_content

 	if (fd == -1) {
 		if (rc == EPKG_UPTODATE)
 			return (rc);
 		prc->manifest_fd = pkg_repo_fetch_remote_tmp(repo, repo->meta->manifests,
 		fd = pkg_repo_fetch_remote_tmp(repo, repo->meta->manifests,
 		    packing_format_to_string(repo->meta->packing_format), &prc->mtime, &rc, false);
 	}
 	if (fd == -1)

modified src/check.c

@@ -109,7 +109,7 @@ check_deps(struct pkgdb *db, struct pkg *p, deps_entries *dh, bool noinstall, xs

 		}
 		pkgdb_it_free(it);
 		if (quiet)
 			pkg_fprintf(out->fp, "%n\tS\n", p, buf);
 			pkg_fprintf(out->fp, "%n\t%S\n", p, buf);
 		else
 			pkg_fprintf(out->fp, "%n has a missing requirement: %S\n",
 			    p, buf);

@@ -246,9 +246,9 @@ void

 usage_check(void)
 {
 	fprintf(stderr,
 	    "Usage: pkg check -B|-d|-s|-r [-qvy] -a\n");
 	    "Usage: pkg check -B|-d[n]|-s|-r [-qvy] -a\n");
 	fprintf(stderr,
 	    "       pkg check -B|-d|-s|-r [-qvy] [-Cgix] <pattern>\n\n");
 	    "       pkg check -B|-d[n]|-s|-r [-qvy] [-Cgix] <pattern>\n\n");
 	fprintf(stderr, "For more information see 'pkg help check'.\n");
 }