78fee45 cleanup: in preparation for pkg 2.0 remove deprecated functions — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

cleanup: in preparation for pkg 2.0 remove deprecated functions

Baptiste Daroussin committed 1 year ago

commit 78fee453c87e122e9aae9410c66b6711d90f0bac
parent 9ca3a1b

4 files changed +0 -76

modified libpkg/libpkg.ver

@@ -27,9 +27,7 @@ global:

 	pkg_copy_file;
 	pkg_create;
 	pkg_create_free;
 	pkg_create_from_manifest;
 	pkg_create_i;
 	pkg_create_installed;
 	pkg_create_new;
 	pkg_create_repo;
 	pkg_create_set_compression_level;

@@ -40,7 +38,6 @@ global:

 	pkg_create_set_overwrite;
 	pkg_create_set_rootdir;
 	pkg_create_set_timestamp;
 	pkg_create_staged;
 	pkg_dep_get;
 	pkg_dep_is_locked;
 	pkg_deps;

@@ -232,7 +229,6 @@ global:

 	pkgdb_query_shlib_provide;
 	pkgdb_query_shlib_require;
 	pkgdb_query_which;
 	pkgdb_register_ports;
 	pkgdb_release_lock;
 	pkgdb_repo_query;
 	pkgdb_repo_query2;

modified libpkg/pkg.h.in

@@ -1722,12 +1722,6 @@ void pkg_create_set_timestamp(struct pkg_create *, time_t);

 void pkg_create_set_expand_manifest(struct pkg_create *, bool);
 int pkg_create(struct pkg_create *, const char *, const char *, bool);
 int pkg_create_i(struct pkg_create *, struct pkg *, bool);
 /* deprecated */
 int pkg_create_from_manifest(const char *, pkg_formats, const char *,
     const char *, const char *) __attribute__((deprecated));
 int pkg_create_staged(const char *, pkg_formats, const char *, const char *, char *, bool) __attribute__((deprecated));
 int pkg_create_installed(const char *, pkg_formats, struct pkg *) __attribute__((deprecated));
 int pkgdb_register_ports(struct pkgdb *db, struct pkg *pkg) __attribute__((deprecated));;
 int pkg_execute_deferred_triggers(void);
 int pkg_add_triggers(void);

modified libpkg/pkg_create.c

@@ -433,25 +433,6 @@ pkg_create(struct pkg_create *pc, const char *metadata, const char *plist,

 	return (ret);
 }
 /* The "no concessions to old pkg_tools" variant: just get everything
  * from the manifest */
 int
 pkg_create_from_manifest(const char *outdir, pkg_formats format,
     const char *rootdir, const char *manifest, const char *plist)
 {
 	struct pkg_create *pc;
 	int ret;
 	pc = pkg_create_new();
 	pc->format = format;
 	pkg_create_set_rootdir(pc, rootdir);
 	pkg_create_set_output_dir(pc, outdir);
 	ret = pkg_create(pc, manifest, plist, false);
 	pkg_create_free(pc);
 	return (ret);
 }
 static int
 pkg_load_message_from_file(int fd, struct pkg *pkg, const char *path)
 {

@@ -598,38 +579,6 @@ pkg_load_metadata(struct pkg *pkg, const char *mfile, const char *md_dir,

 	return (ret);
 }
 int
 pkg_create_staged(const char *outdir, pkg_formats format, const char *rootdir,
     const char *md_dir, char *plist, bool hash)
 {
 	struct pkg_create *pc;
 	int ret;
 	pc = pkg_create_new();
 	pc->format = format;
 	pkg_create_set_rootdir(pc, rootdir);
 	pkg_create_set_output_dir(pc, outdir);
 	ret = pkg_create(pc, md_dir, plist, hash);
 	pkg_create_free(pc);
 	return (ret);
 }
 int
 pkg_create_installed(const char *outdir, pkg_formats format, struct pkg *pkg)
 {
 	struct pkg_create *pc;
 	int ret;
 	pc = pkg_create_new();
 	pc->format = format;
 	pkg_create_set_output_dir(pc, outdir);
 	ret = pkg_create_i(pc, pkg, false);
 	pkg_create_free(pc);
 	return (ret);
 }
 static int64_t	count;
 static int64_t  maxcount;
 static const char *what;

modified libpkg/pkgdb.c

@@ -2230,21 +2230,6 @@ pkgdb_register_finale(struct pkgdb *db, int retcode, const char *savepoint)

 }
 int
 pkgdb_register_ports(struct pkgdb *db, struct pkg *pkg)
 {
 	int	ret;
 	pkg_emit_install_begin(pkg);
 	ret = pkgdb_register_pkg(db, pkg, 0, NULL);
 	if (ret == EPKG_OK) {
 		pkg_emit_install_finished(pkg, NULL);
 		pkgdb_register_finale(db, ret, NULL);
 	}
 	return (ret);
 }
 int
 pkgdb_unregister_pkg(struct pkgdb *db, int64_t id)
 {
 	sqlite3_stmt	*stmt_del;