f88eb14 libpkg: fix a few tests for Debian CI — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

libpkg: fix a few tests for Debian CI

Isaac Freund committed 1 year ago

commit f88eb14f094fd76c4a78022ad66f4ce847c290dd
parent 16937e4

2 files changed +1 -5

modified libpkg/pkg_elf.c

@@ -60,7 +60,6 @@

 static enum pkg_arch elf_parse_arch(Elf *elf, GElf_Ehdr *ehdr);
 #ifdef __FreeBSD__
 static bool
 is_old_freebsd_armheader(const GElf_Ehdr *e)
 {

@@ -79,7 +78,6 @@ is_old_freebsd_armheader(const GElf_Ehdr *e)

 	}
 	return (false);
 }
 #endif
 #ifndef HAVE_ELF_NOTE
 typedef Elf32_Nhdr Elf_Note;

@@ -201,13 +199,11 @@ analyse_elf(struct pkg *pkg, const char *fpath)

 		goto cleanup; /* Invalid ABI */
 	}
 #ifdef __FreeBSD__
 	if (ctx.abi.os == PKG_OS_FREEBSD && elfhdr.e_ident[EI_OSABI] != ELFOSABI_FREEBSD &&
 	    !is_old_freebsd_armheader(&elfhdr)) {
 		ret = EPKG_END;
 		goto cleanup;
 	}
 #endif
 	if ((data = elf_getdata(dynamic, NULL)) == NULL) {
 		ret = EPKG_END; /* Some error occurred, ignore this file */

modified tests/frontend/pkg.sh

@@ -30,7 +30,7 @@ pkg_config_defaults_body()

 	    -o match:'^ *ASSUME_ALWAYS_YES = false;$' \
 	    -o match:'^ *PLIST_KEYWORDS_DIR = "";$' \
 	    -o match:'^ *SYSLOG = true;$' \
 	    -o match:'^ *ABI = "[a-zA-Z0-9]+:[a-z\.A-Z0-9]+:[a-zA-Z0-9]+";$'\
 	    -o match:'^ *ABI = "[a-zA-Z0-9]+:[a-z\.A-Z0-9]+:[a-zA-Z0-9_]+";$'\
 	    -o match:'^ *DEVELOPER_MODE = false;$' \
 	    -o match:'^ *VULNXML_SITE = "https://vuxml.freebsd.org/freebsd/vuln.xml.xz";$' \
 	    -o match:'^ *FETCH_RETRY = 3;$' \