3bf1815 Fix compilation and deactivate shlibs collection for now, need more testings — HardenedBSD-pkg

HardenedBSD Package Manager

Fix compilation and deactivate shlibs collection for now, need more testings

Baptiste Daroussin committed 14 years ago

commit 3bf1815f99dfd0e9e9c2597380cf1c483ba42c36
parent 48c36b97a5698da856ce6c80cfa505b610d10fcb

4 files changed +16 -15

modified libpkg/pkg_create.c

@@ -67,8 +67,8 @@ pkg_create_from_dir(struct pkg *pkg, const char *root, struct packing *pkg_archi

 			strlcpy(file->sum, sha256, sizeof(file->sum));
 		}
 		if (pkg_register_shlibs_for_file(pkg, fpath) != EPKG_OK)
 			return (EPKG_FATAL);
 /*		if (pkg_register_shlibs_for_file(pkg, fpath) != EPKG_OK)
 			return (EPKG_FATAL);*/
 	}
 	pkg_emit_manifest(pkg, &m);

modified libpkg/pkg_elf.c

@@ -132,6 +132,7 @@ analyse_elf(const char *fpath, const char ***namelist)

 	Elf_Data *data;
 	GElf_Dyn *dyn, dyn_mem;
 	struct stat sb;
 	int ret = EPKG_OK;
 	size_t numdyn;
 	size_t dynidx;

@@ -140,7 +141,7 @@ analyse_elf(const char *fpath, const char ***namelist)

 	int fd;
 	if ((fd = open(fpath, O_RDONLY, 0)) < 0)
 	if ((fd = open(fpath, O_RDONLY, 0)) < 0) {
 		return (EPKG_FATAL);
 	}
 	if (fstat(fd, &sb) != 0)

@@ -229,7 +230,7 @@ cleanup:

 		elf_end(e);
 	close(fd);
 	return (EPKG_OK);
 	return (ret);
 }
 int

modified libpkg/pkgdb.c

@@ -1860,21 +1860,21 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 	 * Insert shlibs
 	 */
 	if (sqlite3_prepare_v2(s, sql_shlib, -1, &stmt_shlib, NULL) != SQLITE_OK) {
 	if (sqlite3_prepare_v2(s, sql_shlib, -1, &stmt, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(s);
 		goto cleanup;
 	}
 	if (sqlite3_prepare_v2(s, sql_shlibs, -1, &stmt_shlibs, NULL) != SQLITE_OK) {
 	if (sqlite3_prepare_v2(s, sql_shlibs, -1, &stmt2, NULL) != SQLITE_OK) {
 		ERROR_SQLITE(s);
 		goto cleanup;
 	}
 	while (pkg_shlibs(pkg, &shlib) == EPKG_OK) {
 		sqlite3_bind_text(stmt_shlib, 1, pkg_shlib_name(shlib), -1, SQLITE_STATIC);
 		sqlite3_bind_int64(stmt_shlibs, 1, package_id);
 		sqlite3_bind_text(stmt_shlibs, 2, pkg_shlib_name(shlib), -1, SQLITE_STATIC);
 		sqlite3_bind_text(stmt, 1, pkg_shlib_name(shlib), -1, SQLITE_STATIC);
 		sqlite3_bind_int64(stmt2, 1, package_id);
 		sqlite3_bind_text(stmt2, 2, pkg_shlib_name(shlib), -1, SQLITE_STATIC);
 		if ((ret = sqlite3_step(stmt_shlib)) != SQLITE_DONE) {
 		if ((ret = sqlite3_step(stmt)) != SQLITE_DONE) {
 			if (ret == SQLITE_CONSTRAINT) {
 				pkg_emit_error("sqlite: constraint violation on shlibs.name: %s",
 						pkg_shlib_name(shlib));

@@ -1882,12 +1882,12 @@ pkgdb_register_pkg(struct pkgdb *db, struct pkg *pkg, int complete)

 				ERROR_SQLITE(s);
 			goto cleanup;
 		}
 		if (( ret = sqlite3_step(stmt_shlibs)) != SQLITE_DONE) {
 		if (( ret = sqlite3_step(stmt2)) != SQLITE_DONE) {
 			ERROR_SQLITE(s);
 			goto cleanup;
 		}
 		sqlite3_reset(stmt_shlib);
 		sqlite3_reset(stmt_shlibs);
 		sqlite3_reset(stmt);
 		sqlite3_reset(stmt2);
 	}
 	retcode = EPKG_OK;

modified pkg/register.c

@@ -199,9 +199,9 @@ exec_register(int argc, char **argv)

 	if (plist != NULL)
 		free(plist);
 	if (pkg_register_shlibs(pkg) != EPKG_OK) {
 /*	if (pkg_register_shlibs(pkg) != EPKG_OK) {
 		return (EX_IOERR);
 	}
 	}*/
 	if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK) {
 		return (EX_IOERR);