3945b38 Remove from from shlib_required files not provided (because without a SONAME) but listed in files — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Remove from from shlib_required files not provided (because without a SONAME) but listed in files

Baptiste Daroussin committed 10 years ago

commit 3945b38cd2817a63669c5dcaa00d2e0cc20d1cd1
parent 5fb7892

1 file changed +13 -0

modified libpkg/pkg_elf.c

@@ -442,6 +442,7 @@ pkg_analyse_files(struct pkgdb *db, struct pkg *pkg, const char *stage)

 	struct pkg_shlib *sh, *shtmp, *found;
 	int ret = EPKG_OK;
 	char fpath[MAXPATHLEN];
 	const char *lib;
 	bool failures = false;
 	pkg_list_free(pkg, PKG_SHLIBS_REQUIRED);

@@ -488,6 +489,18 @@ pkg_analyse_files(struct pkgdb *db, struct pkg *pkg, const char *stage)

 			    "package %s provides this library itself",
 			    sh->name, pkg->name);
 			HASH_DEL(pkg->shlibs_required, sh);
 			continue;
 		}
 		file = NULL;
 		while (pkg_files(pkg, &file) == EPKG_OK) {
 			if ((lib = strstr(file->path, sh->name)) != NULL &&
 			    strlen(lib) == strlen(sh->name) && lib[-1] == '/') {
 				pkg_debug(2, "remove %s from required shlibs as "
 				    "the package %s provides this library itself",
 				    sh->name, pkg->name);
 				HASH_DEL(pkg->shlibs_required, sh);
 				break;
 			}
 		}
 	}