d3f3903 Add runtime library version information to verbose pkg -vv — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Add runtime library version information to verbose pkg -vv

Keve committed 1 year ago

commit d3f390389c53b065d98a03e537a0e7869ef24781
parent f600043

3 files changed +18 -0

modified libpkg/pkg.h.in

@@ -1484,6 +1484,7 @@ void pkg_event_register(pkg_event_cb cb, void *data);

 bool pkg_compiled_for_same_os_major(void);
 int pkg_ini(const char *, const char *, pkg_init_flags);
 int pkg_init(const char *, const char *);
 const char *pkg_libversion(void);
 int pkg_initialized(void);
 void pkg_shutdown(void);

modified libpkg/pkg_config.c

@@ -593,6 +593,12 @@ connect_evpipe(const char *evpipe) {

 }
 const char *
 pkg_libversion(void)
 {
 	return PKGVERSION;
 }
 int
 pkg_initialized(void)
 {

modified src/main.c

@@ -58,6 +58,11 @@

 #include <pkg.h>
 #include <tllist.h>
 #include <xmalloc.h>
 #include <curl/curl.h>
 #include <archive.h>
 #include <sqlite3.h>
 #include <openssl/crypto.h>
 #include "pkgcli.h"

@@ -374,6 +379,12 @@ show_version_info(int version)

 	if (version == 1)
 		exit(EXIT_SUCCESS);
 	printf("%-24s: %s\n", "libpkg", pkg_libversion());
 	printf("%-24s: %s\n", "libcurl", curl_version());
 	printf("%-24s: %s\n", "libarchive", archive_version_string());
 	printf("%-24s: %s\n", "sqlite", sqlite3_libversion());
 	printf("%-24s: %s\n", "openssl", OpenSSL_version(OPENSSL_VERSION));
 	config = pkg_config_dump();
 	printf("%s\n", config);
 	free(config);