Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › f3678e4
linux: change ABI version to use only major.minor
Baptiste Daroussin committed 1 year ago
commit f3678e4369c0b2b84e3a29aab1b0106193b140e0
parent 3f045bf
2 files changed +9 -4
modified libpkg/pkg_elf.c
@@ -709,8 +709,13 @@ elf_note_analyse(Elf_Data *data, GElf_Ehdr *elfhdr, struct os_info *oi)


	free(oi->version);

	if (version_style == 2) {
- 
		xasprintf(&oi->version, "%d.%d.%d", gnu_abi_tag[1],
- 
		    gnu_abi_tag[2], gnu_abi_tag[3]);
+ 
		if (oi->ostype == OS_LINUX) {
+ 
			xasprintf(&oi->version, "%d.%d", gnu_abi_tag[1],
+ 
			    gnu_abi_tag[2]);
+ 
		} else {
+ 
			xasprintf(&oi->version, "%d.%d.%d", gnu_abi_tag[1],
+ 
			    gnu_abi_tag[2], gnu_abi_tag[3]);
+ 
		}

	} else {

		if (oi->osversion == 0) {

			oi->osversion = version;
modified tests/frontend/abi.sh
@@ -55,12 +55,12 @@ elfparse_body() {
		-o inline:"${_expected}" \

		pkg -o IGNORE_OSMAJOR=1 -o ABI_FILE=$(atf_get_srcdir)/dfly.bin config altabi
- 
	_expected="Linux:3.2.0:amd64\n"
+ 
	_expected="Linux:3.2:amd64\n"

	atf_check \

		-o inline:"${_expected}" \

		pkg -o IGNORE_OSMAJOR=1 -o ABI_FILE=$(atf_get_srcdir)/linux.bin config abi
- 
	_expected="linux:3.2.0:x86:64\n"
+ 
	_expected="linux:3.2:x86:64\n"

	atf_check \

		-o inline:"${_expected}" \

		pkg -o IGNORE_OSMAJOR=1 -o ABI_FILE=$(atf_get_srcdir)/linux.bin config altabi