3857c22 Finish changing uniqueid to pkgname — HardenedBSD-pkg

modified libpkg/pkg.c

@@ -676,7 +676,7 @@ pkg_adddep(struct pkg *pkg, const char *name, const char *origin, const char *ve

 	sbuf_set(&d->origin, origin);
 	sbuf_set(&d->name, name);
 	sbuf_set(&d->version, version);
 	asprintf(&d->uid, "%s~%s", name, origin);
 	d->uid = strdup(name);
 	d->locked = locked;
 	HASH_ADD_KEYPTR(hh, pkg->deps, pkg_dep_get(d, PKG_DEP_ORIGIN),

@@ -701,7 +701,7 @@ pkg_addrdep(struct pkg *pkg, const char *name, const char *origin, const char *v

 	sbuf_set(&d->origin, origin);
 	sbuf_set(&d->name, name);
 	sbuf_set(&d->version, version);
 	asprintf(&d->uid, "%s~%s", name, origin);
 	d->uid = strdup(name);
 	d->locked = locked;
 	HASH_ADD_KEYPTR(hh, pkg->rdeps, pkg_dep_get(d, PKG_DEP_ORIGIN),

modified libpkg/pkg_jobs.c

@@ -707,7 +707,7 @@ static bool

 new_pkg_version(struct pkg_jobs *j)
 {
 	struct pkg *p;
 	const char *uid = "pkg~ports-mgmt/pkg";
 	const char *uid = "pkg";
 	pkg_flags old_flags;
 	bool ret = false;

@@ -719,12 +719,7 @@ new_pkg_version(struct pkg_jobs *j)

 	p = pkg_jobs_universe_get_local(j->universe, uid, 0);
 	if (p == NULL) {
 		uid = "pkg~ports-mgmt/pkg-devel";
 		p = pkg_jobs_universe_get_local(j->universe, uid, 0);
 	}
 	if (p == NULL) {
 		uid = "pkg-devel~ports-mgmt/pkg-devel";
 		uid = "pkg-devel";
 		p = pkg_jobs_universe_get_local(j->universe, uid, 0);
 	}

modified libpkg/pkgdb.c

@@ -2059,7 +2059,7 @@ pkgdb_reanalyse_shlibs(struct pkgdb *db, struct pkg *pkg)

 int
 pkgdb_add_annotation(struct pkgdb *db, struct pkg *pkg, const char *tag,
         const char *value)
     const char *value)
 {
 	int		 rows_changed;
 	const char	*uniqueid;

modified libpkg/pkgdb_query.c

@@ -145,7 +145,7 @@ pkgdb_query(struct pkgdb *db, const char *pattern, match_t match)

 	comp = pkgdb_get_pattern_query(pattern, match);
 	sqlite3_snprintf(sizeof(sql), sql,
 			"SELECT id, origin, name, name || '~' || origin as uniqueid, "
 			"SELECT id, origin, name, name as uniqueid, "
 				"version, comment, desc, "
 				"message, arch, maintainer, www, "
 				"prefix, flatsize, licenselogic, automatic, "

@@ -177,7 +177,7 @@ pkgdb_query_which(struct pkgdb *db, const char *path, bool glob)

 		return (NULL);
 	sqlite3_snprintf(sizeof(sql), sql,
 			"SELECT p.id, p.origin, p.name, p.name || '~' || p.origin as uniqueid, "
 			"SELECT p.id, p.origin, p.name, p.name as uniqueid, "
 			"p.version, p.comment, p.desc, "
 			"p.message, p.arch, p.maintainer, p.www, "
 			"p.prefix, p.flatsize, p.time "

@@ -201,7 +201,7 @@ pkgdb_query_shlib_require(struct pkgdb *db, const char *shlib)

 {
 	sqlite3_stmt	*stmt;
 	const char	 sql[] = ""
 		"SELECT p.id, p.origin, p.name, p.name || '~' || p.origin as uniqueid, "
 		"SELECT p.id, p.origin, p.name, p.name as uniqueid, "
 			"p.version, p.comment, p.desc, "
 			"p.message, p.arch, p.maintainer, p.www, "
 			"p.prefix, p.flatsize, p.time "

@@ -228,7 +228,7 @@ pkgdb_query_shlib_provide(struct pkgdb *db, const char *shlib)

 {
 	sqlite3_stmt	*stmt;
 	const char	 sql[] = ""
 		"SELECT p.id, p.origin, p.name, p.name || '~' || p.origin as uniqueid, "
 		"SELECT p.id, p.origin, p.name, p.name p.origin as uniqueid, "
 			"p.version, p.comment, p.desc, "
 			"p.message, p.arch, p.maintainer, p.www, "
 			"p.prefix, p.flatsize, p.time "

modified libpkg/repo/binary/query.c

@@ -109,7 +109,7 @@ pkg_repo_binary_query(struct pkg_repo *repo, const char *pattern, match_t match)

 	const char	*comp = NULL;
 	int		 ret;
 	char		 basesql[BUFSIZ] = ""
 		"SELECT id, origin, name, name || '~' || origin as uniqueid, version, comment, "
 		"SELECT id, origin, name, name as uniqueid, version, comment, "
 		"prefix, desc, arch, maintainer, www, "
 		"licenselogic, flatsize, pkgsize, "
 		"cksum, manifestdigest, path AS repopath, '%s' AS dbname "

@@ -153,7 +153,7 @@ pkg_repo_binary_shlib_provide(struct pkg_repo *repo, const char *require)

 	int		 ret;
 	const char	 basesql[] = ""
 			"SELECT p.id, p.origin, p.name, p.version, p.comment, "
 			"p.name || '~' || p.origin as uniqueid, "
 			"p.name as uniqueid, "
 			"p.prefix, p.desc, p.arch, p.maintainer, p.www, "
 			"p.licenselogic, p.flatsize, p.pkgsize, "
 			"p.cksum, p.manifestdigest, p.path AS repopath, '%s' AS dbname "

@@ -191,7 +191,7 @@ pkg_repo_binary_shlib_require(struct pkg_repo *repo, const char *provide)

 	int		 ret;
 	const char	 basesql[] = ""
 			"SELECT p.id, p.origin, p.name, p.version, p.comment, "
 			"p.name || '~' || p.origin as uniqueid, "
 			"p.name as uniqueid, "
 			"p.prefix, p.desc, p.arch, p.maintainer, p.www, "
 			"p.licenselogic, p.flatsize, p.pkgsize, "
 			"p.cksum, p.manifestdigest, p.path AS repopath, '%s' AS dbname "

modified libpkg/repo/binary/update.c

@@ -540,7 +540,7 @@ pkg_repo_binary_get_origins(sqlite3 *sqlite)

 	sqlite3_stmt *stmt = NULL;
 	int ret;
 	const char query_sql[] = ""
 		"SELECT id, origin, name, name || '~' || origin as uniqueid, version, comment, "
 		"SELECT id, origin, name, name as uniqueid, version, comment, "
 		"prefix, desc, arch, maintainer, www, "
 		"licenselogic, flatsize, pkgsize, "
 		"cksum, path AS repopath, manifestdigest "