libpkg: fix a few tests for Debian CI

Sponsored by: The FreeBSD Foundation
freebsd · Dec 11, 2024 · f88eb14 · f88eb14
1 parent 16937e4
commit f88eb14
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/libpkg/pkg_elf.c b/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 */

diff --git a/tests/frontend/pkg.sh b/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;$' \