59ee42f Remove pkg repo -L — HardenedBSD-pkg

modified docs/pkg-repo.8

@@ -14,7 +14,7 @@

 .\"
 .\"     @(#)pkg.8
 .\"
 .Dd May 9, 2016
 .Dd April 11, 2017
 .Dt PKG-REPO 8
 .Os
 .Sh NAME

@@ -22,13 +22,13 @@

 .Nd create a package repository catalogue
 .Sh SYNOPSIS
 .Nm
 .Op Fl lqL
 .Op Fl lq
 .Op Fl o Ar output-dir
 .Op Fl m Ar meta-file
 .Ao Ar repo-path Ac Op Ao Ar rsa-key Ac | signing_command: Ao Ar the command Ac
 .Pp
 .Nm
 .Op Cm --{list-files,quiet,legacy}
 .Op Cm --{list-files,quiet}
 .Op Cm --output-dir Ar output-dir
 .Op Cm --meta-file Ar meta-file
 .Ao Ar repo-path Ac Op Ao Ar rsa-key Ac | signing_command: Ao Ar the command Ac

@@ -185,11 +185,6 @@ The following options are supported by

 .Bl -tag -width quiet
 .It Fl q , Cm --quiet
 Force quiet output.
 .It Fl L , Cm --legacy
 Create a repository compatible with pkg 1.2. Note that this is only required if
 the repository clients will not be upgrading to pkg 1.3+. Older versions of pkg
 can upgrade themselves even from non-legacy. repositories, provided pkg itself
 is included in those repositories.
 .It Fl m Ar meta-file , Cm --meta-file Ar meta-file
 Use the specified file as repository meta file instead of the default settings.
 .It Fl l , Cm --list-files

modified libpkg/pkg.h.in

@@ -810,7 +810,7 @@ int pkg_is_installed(struct pkgdb *db, const char *name);

  */
 typedef int(pkg_password_cb)(char *, int, int, void*);
 int pkg_create_repo(char *path, const char *output_dir, bool filelist,
 	const char *metafile, bool legacy);
 	const char *metafile);
 int pkg_finish_repo(const char *output_dir, pkg_password_cb *cb, char **argv,
     int argc, bool filelist);

modified libpkg/pkg_repo_create.c

@@ -499,7 +499,7 @@ pkg_create_repo_read_pipe(int fd, struct digest_list_entry **dlist)

 int
 pkg_create_repo(char *path, const char *output_dir, bool filelist,
 	const char *metafile, bool legacy)
 	const char *metafile)
 {
 	FTS *fts = NULL;
 	struct pkg_fts_item *fts_items = NULL, *fts_cur, *fts_start;

@@ -511,6 +511,8 @@ pkg_create_repo(char *path, const char *output_dir, bool filelist,

 	int cur_pipe[2], fd;
 	struct pkg_repo_meta *meta = NULL;
 	int retcode = EPKG_OK;
 	ucl_object_t *meta_dump;
 	FILE *mfile;
 	char *repopath[2];
 	char packagesite[MAXPATHLEN],

@@ -638,7 +640,7 @@ pkg_create_repo(char *path, const char *output_dir, bool filelist,

 			if (pkg_create_repo_worker(fts_start, cur_jobs,
 					packagesite, (filelist ? filesite : NULL), cur_pipe[1],
 					(legacy ? NULL : meta)) == EPKG_FATAL) {
 					meta) == EPKG_FATAL) {
 				close(cur_pipe[0]);
 				close(cur_pipe[1]);
 				retcode = EPKG_FATAL;

@@ -726,21 +728,16 @@ pkg_create_repo(char *path, const char *output_dir, bool filelist,

 	DL_SORT(dlist, pkg_digest_sort_compare_func);
 	/* Write metafile */
 	if (!legacy) {
 		ucl_object_t *meta_dump;
 		FILE *mfile;
 		snprintf(repodb, sizeof(repodb), "%s/%s", output_dir,
 			"meta");
 		if ((mfile = fopen(repodb, "w")) != NULL) {
 			meta_dump = pkg_repo_meta_to_ucl(meta);
 			ucl_object_emit_file(meta_dump, UCL_EMIT_CONFIG, mfile);
 			ucl_object_unref(meta_dump);
 			fclose(mfile);
 		}
 		else {
 			pkg_emit_notice("cannot create metafile at %s", repodb);
 		}
 	snprintf(repodb, sizeof(repodb), "%s/%s", output_dir,
 		"meta");
 	if ((mfile = fopen(repodb, "w")) != NULL) {
 		meta_dump = pkg_repo_meta_to_ucl(meta);
 		ucl_object_emit_file(meta_dump, UCL_EMIT_CONFIG, mfile);
 		ucl_object_unref(meta_dump);
 		fclose(mfile);
 	}
 	else {
 		pkg_emit_notice("cannot create metafile at %s", repodb);
 	}
 cleanup:
 	HASH_ITER (hh, conflicts, curcb, tmpcb) {

modified src/repo.c

@@ -96,18 +96,16 @@ exec_repo(int argc, char **argv)

 	bool	 filelist = false;
 	char	*output_dir = NULL;
 	char	*meta_file = NULL;
 	bool	legacy = false;
 	struct option longopts[] = {
 		{ "list-files", no_argument,		NULL,	'l' },
 		{ "output-dir", required_argument,	NULL,	'o' },
 		{ "quiet",	no_argument,		NULL,	'q' },
 		{ "meta-file",	required_argument,	NULL,	'm' },
 		{ "legacy",	no_argument,	NULL,	'L' },
 		{ NULL,		0,			NULL,	0   },
 	};
 	while ((ch = getopt_long(argc, argv, "+lo:qm:L", longopts, NULL)) != -1) {
 	while ((ch = getopt_long(argc, argv, "+lo:qm:", longopts, NULL)) != -1) {
 		switch (ch) {
 		case 'l':
 			filelist = true;

@@ -121,9 +119,6 @@ exec_repo(int argc, char **argv)

 		case 'm':
 			meta_file = optarg;
 			break;
 		case 'L':
 			legacy = true;
 			break;
 		default:
 			usage_repo();
 			return (EX_USAGE);

@@ -145,7 +140,7 @@ exec_repo(int argc, char **argv)

 	if (output_dir == NULL)
 		output_dir = argv[0];
 	ret = pkg_create_repo(argv[0], output_dir, filelist, meta_file, legacy);
 	ret = pkg_create_repo(argv[0], output_dir, filelist, meta_file);
 	if (ret != EPKG_OK) {
 		printf("Cannot create repository catalogue\n");