16937e4 libpkg: add options to ignore required shlibs — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

libpkg: add options to ignore required shlibs

Isaac Freund committed 1 year ago

commit 16937e4c764062dd02579989b09792fbe8ea0109
parent 6462d8a

2 files changed +17 -0

modified libpkg/pkg.c

@@ -904,6 +904,13 @@ pkg_addshlib_required(struct pkg *pkg, const char *name)

 	assert(pkg != NULL);
 	assert(name != NULL && name[0] != '\0');
 	if (match_ucl_lists(name,
 	    pkg_config_get("SHLIB_REQUIRE_IGNORE_GLOB"),
 	    pkg_config_get("SHLIB_REQUIRE_IGNORE_REGEX"))) {
 		dbg(3, "ignoring shlib %s required by package %s", name, pkg->name);
 		return (EPKG_OK);
 	}
 	/* silently ignore duplicates in case of shlibs */
 	tll_foreach(pkg->shlibs_required, s) {
 		if (STREQ(s->item, name))

modified libpkg/pkg_config.c

@@ -431,6 +431,16 @@ static struct config_entry c[] = {

 	},
 	{
 		PKG_ARRAY,
 		"SHLIB_REQUIRE_IGNORE_GLOB",
 		NULL,
 	},
 	{
 		PKG_ARRAY,
 		"SHLIB_REQUIRE_IGNORE_REGEX",
 		NULL,
 	},
 	{
 		PKG_ARRAY,
 		"PKG_DEBUG_FLAGS",
 		"all",
 	},