7624b78 Cleanup. — HardenedBSD-pkg

modified libpkg/libpkg.ver

@@ -355,6 +355,10 @@ global:

 	pkgdb_upgrade_lock;
 	pkgshell_open;
 	ports_parse_plist;
 	pkgdb_repo_search;
 	pkgdb_repo_query;
 	pkgdb_query_shlib_provide;
 	pkgdb_query_shlib_require;
 local:
 	*;
 };

modified libpkg/pkg.h.in

@@ -1049,7 +1049,7 @@ struct pkgdb_it * pkgdb_query(struct pkgdb *db, const char *pattern,

     match_t type);
 struct pkgdb_it * pkg_repo_query(struct pkgdb *db, const char *pattern,
     match_t type, const char *reponame);
 struct pkgdb_it * pkg_repo_search(struct pkgdb *db, const char *pattern,
 struct pkgdb_it * pkgdb_repo_search(struct pkgdb *db, const char *pattern,
     match_t type, pkgdb_field field, pkgdb_field sort, const char *reponame);
 /**

@@ -1057,8 +1057,8 @@ struct pkgdb_it * pkg_repo_search(struct pkgdb *db, const char *pattern,

  */
 struct pkgdb_it * pkgdb_query_which(struct pkgdb *db, const char *path, bool glob);
 struct pkgdb_it * pkgdb_query_shlib_required(struct pkgdb *db, const char *shlib);
 struct pkgdb_it * pkgdb_query_shlib_provided(struct pkgdb *db, const char *shlib);
 struct pkgdb_it * pkgdb_query_shlib_require(struct pkgdb *db, const char *shlib);
 struct pkgdb_it * pkgdb_query_shlib_provide(struct pkgdb *db, const char *shlib);
 struct pkgdb_it * pkgdb_rquery_provide(struct pkgdb *db,
     const char *provide, const char *repo);

modified libpkg/pkg_delete.c

@@ -50,6 +50,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)

 	assert(pkg != NULL);
 	assert(db != NULL);
 #if 0
 	/*
 	 * Do not trust the existing entries as it may have changed if we
 	 * delete packages in batch.

@@ -70,6 +71,7 @@ pkg_delete(struct pkg *pkg, struct pkgdb *db, unsigned flags)

 		return (ret);
 	if ((ret = pkgdb_load_annotations(db, pkg)) != EPKG_OK)
 		return (ret);
 #endif
 	if ((flags & PKG_DELETE_UPGRADE) == 0)
 		pkg_emit_deinstall_begin(pkg);

modified libpkg/pkg_jobs.c

@@ -998,7 +998,7 @@ pkg_jobs_try_remote_candidate(struct pkg_jobs *j, const char *pattern,

 	const char *fuid;
 	struct pkg_job_universe_item *unit;
 	if ((it = pkg_repo_query(j->db, pattern, m, j->reponame)) == NULL)
 	if ((it = pkgdb_repo_query(j->db, pattern, m, j->reponame)) == NULL)
 		return (EPKG_FATAL);
 	qmsg = sbuf_new_auto();

@@ -1103,7 +1103,7 @@ pkg_jobs_find_remote_pkg(struct pkg_jobs *j, const char *pattern,

 	if (j->type == PKG_JOBS_UPGRADE && (j->flags & PKG_FLAG_FORCE) == PKG_FLAG_FORCE)
 		force = true;
 	if ((it = pkg_repo_query(j->db, pattern, m, j->reponame)) == NULL)
 	if ((it = pkgdb_repo_query(j->db, pattern, m, j->reponame)) == NULL)
 		rc = EPKG_FATAL;
 	while (it != NULL && pkgdb_it_next(it, &p, flags) == EPKG_OK) {

@@ -1264,7 +1264,7 @@ get_remote_pkg(struct pkg_jobs *j, const char *uid, unsigned flag)

 				PKG_LOAD_ANNOTATIONS|PKG_LOAD_CONFLICTS;
 	}
 	if ((it = pkg_repo_query(j->db, uid, MATCH_EXACT, j->reponame)) == NULL)
 	if ((it = pkgdb_repo_query(j->db, uid, MATCH_EXACT, j->reponame)) == NULL)
 		return (NULL);
 	if (pkgdb_it_next(it, &pkg, flag) != EPKG_OK)

@@ -1898,7 +1898,7 @@ pkg_jobs_check_remote_candidate(struct pkg_jobs *j, struct pkg *pkg)

 	sqlite3_snprintf(sizeof(sqlbuf), sqlbuf, " WHERE manifestdigest=%Q", digest);
 	it = pkg_repo_query(j->db, sqlbuf, MATCH_CONDITION, j->reponame);
 	it = pkgdb_repo_query(j->db, sqlbuf, MATCH_CONDITION, j->reponame);
 	if (it != NULL) {
 		/*
 		 * If we have the same package in a remote repo, it is not an

modified libpkg/pkgdb_query.c

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

 struct pkgdb_it *
 pkg_repo_query(struct pkgdb *db, const char *pattern, match_t match,
 pkgdb_repo_query(struct pkgdb *db, const char *pattern, match_t match,
     const char *repo)
 {
 	struct pkgdb_it *it;

modified src/rquery.c

@@ -232,7 +232,7 @@ exec_rquery(int argc, char **argv)

 		const char *condition_sql = NULL;
 		if (match == MATCH_CONDITION && sqlcond)
 			condition_sql = sbuf_data(sqlcond);
 		if ((it = pkg_repo_query(db, condition_sql, match, reponame)) == NULL)
 		if ((it = pkgdb_repo_query(db, condition_sql, match, reponame)) == NULL)
 			return (EX_IOERR);
 		while ((ret = pkgdb_it_next(it, &pkg, query_flags)) == EPKG_OK) {

@@ -250,7 +250,7 @@ exec_rquery(int argc, char **argv)

 		for (i = (index_output ? 0 : 1); i < argc; i++) {
 			pkgname = argv[i];
 			if ((it = pkg_repo_query(db, pkgname, match, reponame)) == NULL)
 			if ((it = pkgdb_repo_query(db, pkgname, match, reponame)) == NULL)
 				return (EX_IOERR);
 			while ((ret = pkgdb_it_next(it, &pkg, query_flags)) == EPKG_OK) {

modified src/version.c

@@ -476,7 +476,7 @@ do_source_remote(unsigned int opt, char limchar, char *pattern, match_t match,

 		    strcmp(origin, matchorigin) != 0)
 			continue;
 		it_remote = pkg_repo_query(db, origin, MATCH_EXACT, reponame);
 		it_remote = pkgdb_repo_query(db, origin, MATCH_EXACT, reponame);
 		if (it_remote == NULL) {
 			retcode = EX_IOERR;
 			goto cleanup;