4 changed files with 71 additions and 35 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1 +1 @@
-SOURCES/kabi-dw-bd56a6004d5d409d7d03c386400da3f49a8c4c03.tar.gz
+SOURCES/kabi-dw-973fee0f575cc530347bac7f906e7967d4399735.tar.gz
--- a/.kabi-dw.metadata
+++ b/.kabi-dw.metadata
@ -1 +1 @@
-24b70789d5736274b95cad202cc6c46787d11319 SOURCES/kabi-dw-bd56a6004d5d409d7d03c386400da3f49a8c4c03.tar.gz
+d908e6e10c1e4b8c815ca3fa0247a6a76c849640 SOURCES/kabi-dw-973fee0f575cc530347bac7f906e7967d4399735.tar.gz
--- a/SOURCES/fix-ns-on-ET_DYN.patch
+++ b/SOURCES/fix-ns-on-ET_DYN.patch
@ -0,0 +1,35 @@
+--- kabi-dw-973fee0f575cc530347bac7f906e7967d4399735.orig/ksymtab.c	2022-01-10 16:09:27.000000000 +0100
+++ kabi-dw-973fee0f575cc530347bac7f906e7967d4399735.new/ksymtab.c	2022-01-31 17:34:13.122000000 +0100
+@@ -155,6 +155,20 @@
+ 		goto out;
+ 	}
+ 
+	switch (ehdr->e_type) {
+	case ET_EXEC:
+	case ET_DYN:
+	case ET_REL:
+		break;
+	default:
+		printf("Unsupported object filetype of %s: %d\n", filename,
+		       ehdr->e_type);
+		free(ehdr);
+		(void) elf_end(elf);
+		(void) close(fd);
+		goto out;
+	}
+
+ 	/*
+ 	 * Get section index of the string table associated with the section
+ 	 * headers in the ELF file.
+@@ -427,7 +441,10 @@
+ 
+ 	name += strlen(STRTAB_NS_PREFIX);
+ 	ns = (char *) ctx->ksymtab_raw;
+-	ns += (ctx->e_type == ET_EXEC) ? value - ctx->sh_addr : value;
+	if (ctx->e_type == ET_EXEC || ctx->e_type == ET_DYN)
+		ns += value - ctx->sh_addr;
+	else if (ctx->e_type == ET_REL)
+		ns += value;
+ 
+ 	if (!strlen(ns))
+ 		return;
--- a/SPECS/kabi-dw.spec
+++ b/SPECS/kabi-dw.spec
@ -1,17 +1,18 @@
 %global forgeurl https://github.com/skozina/kabi-dw
-%global commitdate 20190729
-%global commit bd56a6004d5d409d7d03c386400da3f49a8c4c03
+%global commitdate 20220110
+%global commit 973fee0f575cc530347bac7f906e7967d4399735
 %global shortcommit %(c=%{commit}; echo ${c:0:7})

 %forgemeta -i

 Name:           kabi-dw
 Version:        0
-Release:        0.27%{?dist}
+Release:        0.24%{?dist}
 Summary:        Detect changes in the ABI between kernel builds
-License:        GPL-3.0-or-later
+License:        GPLv3+
 URL:            %{forgeurl}
 Source0:        %{forgesource}
+Patch0:         fix-ns-on-ET_DYN.patch

 BuildRequires:  elfutils-devel
 BuildRequires:  gcc
@ -29,14 +30,14 @@ later comparing the text files.

 %prep
 %forgesetup
+%patch0 -p1

 %build
-#CFLAGS=$RPM_OPT_FLAGS LDFLAGS=$RPM_LD_FLAGS make debug
-
-# The following option need to be removed once fixed upstream
-# https://github.com/skozina/kabi-dw/issues/17
-LDFLAGS+=" -z muldefs "
-
+LDFLAGS+=" -pie "
+%ifarch x86_64
+CFLAGS+=" -fcf-protection=full "
+%endif
+CFLAGS+=" -fPIE -D_GLIBCXX_ASSERTIONS -fstack-clash-protection -g"
 %set_build_flags
 %make_build

@ -50,29 +51,29 @@ install -m 0755 %{name} %{buildroot}%{_bindir}/
 %license COPYING

 %changelog
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - Packaging variables read or set by %forgemeta
- Bump release for June 2024 mass rebuild
-
-* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - Packaging variables read or set by %forgemeta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - Packaging variables read or set by %forgemeta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jun 19 2023 Čestmír Kalina <ckalina@redhat.com> - 0.24.20191127gitbd56a60
- Migrate license to SPDX
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - Packaging variables read or set by %forgemeta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - Packaging variables read or set by %forgemeta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - Packaging variables read or set by %forgemeta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - Packaging variables read or set by %forgemeta
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* Tue Jan 18 2022 Cestmir Kalina <ckalina@redhat.com> - 0.24
+- Fix annocheck failures
+- Fix osci tier0 test reference
+- Fix ET_DYN vmlinux namespace support
+- Resolves: rhbz#2038913
+- Resolves: rhbz#2045976
+- Resolves: rhbz#2038892
+
+* Mon Jan 10 2022 Cestmir Kalina <ckalina@redhat.com> - 0.23
+- Add support for ET_EXEC
+- Add support for DW_TAG_restrict_type
+- Resolves: rhbz#1761409
+
+* Mon Nov 22 2021 Cestmir Kalina <ckalina@redhat.com> - 0.22
+- Add support for symbol namespaces
+- Resolves: rhbz#1761409
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - Forge-specific packaging variables
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - Forge-specific packaging variables
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937

 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - Packaging variables read or set by %forgemeta
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild