Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › dfee49c
libpkg: only filter provided shlibs without lib prefix in analyze_elf()
Isaac Freund committed 1 year ago
commit dfee49ceb8ea022a397077e90ab903c260527801
parent 2de6afe
2 files changed +3 -7
modified libpkg/pkg.c
@@ -996,10 +996,6 @@ pkg_addshlib_provided(struct pkg *pkg, const char *name,
	assert(pkg != NULL);

	assert(name != NULL && name[0] != '\0');
- 
	/* ignore files which are not starting with lib */
- 
	if (strncmp(name, "lib", 3) != 0)
- 
		return (EPKG_OK);
- 


	char *full_name = pkg_shlib_name_with_flags(name, flags);



	/* silently ignore duplicates in case of shlibs */
modified libpkg/pkg_elf.c
@@ -227,7 +227,9 @@ analyse_elf(struct pkg *pkg, const char *fpath)
			continue;

		}
-
+ 
		if (strncmp(shlib, "lib", 3) != 0) {
+ 
			continue;
+ 
		}



		if (dyn->d_tag == DT_SONAME) {

			pkg_addshlib_provided(pkg, shlib, flags);
@@ -238,8 +240,6 @@ analyse_elf(struct pkg *pkg, const char *fpath)
			 */

			if (*shlib == '/')

				continue;
- 
			if (strncmp(shlib, "lib", 3) != 0)
- 
				continue;

			pkg_addshlib_required(pkg, shlib, flags);

		}

	}