From c86583e001d70c292d5768e31bb2039cc31997b1 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 6 Sep 2022 16:01:29 +0100 Subject: [PATCH 01/39] NVR Bump in order to trigger a rebuild for ELN. (#2124562) --- annobin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/annobin.spec b/annobin.spec index 8114044..0c158cc 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.81 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -488,6 +488,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Tue Sep 06 2022 Nick Clifton - 10.81-2 +- NVR Bump in order to trigger a rebuild for ELN. (#2124562) + * Thu Aug 11 2022 Nick Clifton - 10.81-1 - Plugin: Fix top level configuration support for RiscV. From 689378de5212dcf07ff96a8c8f646449024f5dea Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 9 Sep 2022 13:47:09 +0100 Subject: [PATCH 02/39] Annocheck: Add a test for the inconsistent use of -Ofast. (#1248744) --- annobin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/annobin.spec b/annobin.spec index 0c158cc..3bce773 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,8 +1,8 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.81 -Release: 2%{?dist} +Version: 10.82 +Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -488,6 +488,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Sep 09 2022 Nick Clifton - 10.82-1 +- Annocheck: Add a test for the inconsistent use of -Ofast. (#1248744) + * Tue Sep 06 2022 Nick Clifton - 10.81-2 - NVR Bump in order to trigger a rebuild for ELN. (#2124562) diff --git a/sources b/sources index 5b4476b..b36bb9c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.81.tar.xz) = e62098c3537fd4d5be4d8219f9ab6e5305d49f350c659f669851181333944676c4f3c7b2075fef2b8c652c1617095e5462c88aa4aeb5851c1e18c4bd182f51bb +SHA512 (annobin-10.82.tar.xz) = 5eb3e8a9e71358da25e4b05238d2a52bd6fdc3585b119a22fb59f9ddac45054a72e10d943e5e40ffd6758b6da55a7b09041388bd660e2eaf9c77150c66a23c66 From 0b1b4157b392888423d6655fa922cfd8717a6008 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 9 Sep 2022 14:51:52 +0100 Subject: [PATCH 03/39] Annocheck: Add a test for the inconsistent use of -Ofast. (#1248744) --- annobin.spec | 4 ++-- sources | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/annobin.spec b/annobin.spec index 3bce773..686b87c 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.82 +Version: 10.83 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -488,7 +488,7 @@ fi #--------------------------------------------------------------------------------- %changelog -* Fri Sep 09 2022 Nick Clifton - 10.82-1 +* Fri Sep 09 2022 Nick Clifton - 10.83-1 - Annocheck: Add a test for the inconsistent use of -Ofast. (#1248744) * Tue Sep 06 2022 Nick Clifton - 10.81-2 diff --git a/sources b/sources index b36bb9c..70a6cea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.82.tar.xz) = 5eb3e8a9e71358da25e4b05238d2a52bd6fdc3585b119a22fb59f9ddac45054a72e10d943e5e40ffd6758b6da55a7b09041388bd660e2eaf9c77150c66a23c66 +SHA512 (annobin-10.83.tar.xz) = 45bdcd24f055aa016846bf12fad0e602e79ffd85b9fce2fce3175d2a1c2f941ce4e125c9bd13929a777bd47dea153e0dbe19fd23c9a122df318b0c126cab89bb From 867bb75b555eb410ad9da055f1d02d5bc7901ae4 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 20 Sep 2022 13:17:11 +0100 Subject: [PATCH 04/39] Clang Plugin: Fix for building with Clang-15. (#2125875) --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 686b87c..5140619 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.83 +Version: 10.84 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -488,6 +488,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Tue Sep 20 2022 Serge Guelton - 10.84-1 +- Clang Plugin: Fix for building with Clang-15. (#2125875) + * Fri Sep 09 2022 Nick Clifton - 10.83-1 - Annocheck: Add a test for the inconsistent use of -Ofast. (#1248744) diff --git a/sources b/sources index 70a6cea..1a165a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.83.tar.xz) = 45bdcd24f055aa016846bf12fad0e602e79ffd85b9fce2fce3175d2a1c2f941ce4e125c9bd13929a777bd47dea153e0dbe19fd23c9a122df318b0c126cab89bb +SHA512 (annobin-10.84.tar.xz) = bb510bf7a66f648f869a710ed14303fa856cb061b2493a17bca24e40de18d3b52428e47910e005f90791ac26199883cf07e683299b92fb83a8f40afeab759952 From 157ed58dcec92db72bf6777bb71e5ed6d3d8698d Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 22 Sep 2022 16:30:48 +0100 Subject: [PATCH 05/39] GCC Plugin: Record -ftrivial-auto-var-init and -fzero-call-used-regs. Annocheck: Add future tests for -ftrivial-auto-var-init and -fzero-call-used-regs. --- annobin.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 5140619..9a7062a 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.84 +Version: 10.85 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -488,6 +488,10 @@ fi #--------------------------------------------------------------------------------- %changelog +* Thu Sep 22 2022 Serge Guelton - 10.85-1 +- GCC Plugin: Record -ftrivial-auto-var-init and -fzero-call-used-regs. +- Annocheck: Add future tests for -ftrivial-auto-var-init and -fzero-call-used-regs. + * Tue Sep 20 2022 Serge Guelton - 10.84-1 - Clang Plugin: Fix for building with Clang-15. (#2125875) diff --git a/sources b/sources index 1a165a4..5c328f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.84.tar.xz) = bb510bf7a66f648f869a710ed14303fa856cb061b2493a17bca24e40de18d3b52428e47910e005f90791ac26199883cf07e683299b92fb83a8f40afeab759952 +SHA512 (annobin-10.85.tar.xz) = 79e490d9507cc39f3eae8a3d9b5dfda37501079c7201f95eae3b17976137160e2fb02ee80d9465fc6b4179c7233b0d574024d1c8870ed6914b8fe962a54b35b0 From b37411288938bea05d24f13f6885c4cdc883ea33 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 30 Sep 2022 15:35:19 +0100 Subject: [PATCH 06/39] Libannocheck: Add libannocheck_reinit(). --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 9a7062a..aebfd69 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.85 +Version: 10.86 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -488,6 +488,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Sep 30 2022 Serge Guelton - 10.86-1 +- Libannocheck: Add libannocheck_reinit(). + * Thu Sep 22 2022 Serge Guelton - 10.85-1 - GCC Plugin: Record -ftrivial-auto-var-init and -fzero-call-used-regs. - Annocheck: Add future tests for -ftrivial-auto-var-init and -fzero-call-used-regs. diff --git a/sources b/sources index 5c328f3..5113da1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.85.tar.xz) = 79e490d9507cc39f3eae8a3d9b5dfda37501079c7201f95eae3b17976137160e2fb02ee80d9465fc6b4179c7233b0d574024d1c8870ed6914b8fe962a54b35b0 +SHA512 (annobin-10.86.tar.xz) = 29784acf6d312bb98514c429d2f09cebc8d225c6b056558b3de86d38c3b774b8ae58b4c012e8e1cd7dc6704e0a381083c296ec31877371733cf3bbe94e7fe1a4 From 5967b158252d77c65b9e6e55d6bf44fa52a857fd Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 4 Oct 2022 14:05:30 +0100 Subject: [PATCH 07/39] libannocheck: Add pkgconfig file --- annobin.spec | 12 +++++++++--- sources | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/annobin.spec b/annobin.spec index aebfd69..ebcfcd7 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.86 +Version: 10.87 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -165,6 +165,8 @@ BuildRequires: elfutils-debuginfod-client-devel Requires: %{name}-docs = %{version}-%{release} Requires: cpio rpm +# The libannocheck library needs libiberty which is provided by binutils-devel +Requires: binutils-devel %description annocheck Installs the annocheck program which uses the notes generated by annobin to @@ -481,6 +483,7 @@ fi %files annocheck %{_includedir}/libannocheck.h %{_libdir}/libannocheck.* +%{_libdir}/pkgconfig/libannocheck.pc %{_bindir}/annocheck %{_mandir}/man1/annocheck.1* %endif @@ -488,10 +491,13 @@ fi #--------------------------------------------------------------------------------- %changelog -* Fri Sep 30 2022 Serge Guelton - 10.86-1 +* Fri Sep 30 2022 Nick Clifton - 10.87-1 +- Libannocheck: Add libannocheck.pc pkgconfig file. + +* Fri Sep 30 2022 Nick Clifton - 10.86-1 - Libannocheck: Add libannocheck_reinit(). -* Thu Sep 22 2022 Serge Guelton - 10.85-1 +* Thu Sep 22 2022 Nick Clifton - 10.85-1 - GCC Plugin: Record -ftrivial-auto-var-init and -fzero-call-used-regs. - Annocheck: Add future tests for -ftrivial-auto-var-init and -fzero-call-used-regs. diff --git a/sources b/sources index 5113da1..f984e52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.86.tar.xz) = 29784acf6d312bb98514c429d2f09cebc8d225c6b056558b3de86d38c3b774b8ae58b4c012e8e1cd7dc6704e0a381083c296ec31877371733cf3bbe94e7fe1a4 +SHA512 (annobin-10.87.tar.xz) = 231bd9e108719261ea6cac52f9f035f586e3123d870973813f1c5ac43545ab61dc2c8a0bf048141c9587c5028accf238c39344165eab1b2a3db7d55380b31e65 From 47ea3304266b89efc0b55b9189a0817bb829d9ee Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 5 Oct 2022 11:37:21 +0100 Subject: [PATCH 08/39] Libannocheck: Move into separate sub-package. --- annobin.spec | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/annobin.spec b/annobin.spec index ebcfcd7..8a461b1 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.87 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -165,14 +165,29 @@ BuildRequires: elfutils-debuginfod-client-devel Requires: %{name}-docs = %{version}-%{release} Requires: cpio rpm -# The libannocheck library needs libiberty which is provided by binutils-devel -Requires: binutils-devel %description annocheck Installs the annocheck program which uses the notes generated by annobin to check that the specified files were compiled with the correct security hardening options. +%package libannocheck +Summary: A library for checking the security hardening status of binaries + +BuildRequires: gcc elfutils elfutils-devel elfutils-libelf-devel rpm-devel binutils-devel make + +%if %{with debuginfod} +BuildRequires: elfutils-debuginfod-client-devel +%endif + +Requires: %{name}-docs = %{version}-%{release} +Requires: binutils-devel + +%description libannocheck +Installs the libannocheck library which uses the notes generated by the +annobin plugins to check that the specified files were compiled with the +correct security hardening options. + %endif #---------------------------------------------------------------------------- @@ -481,16 +496,21 @@ fi %if %{with annocheck} %files annocheck +%{_bindir}/annocheck +%{_mandir}/man1/annocheck.1* + +%files libannocheck %{_includedir}/libannocheck.h %{_libdir}/libannocheck.* %{_libdir}/pkgconfig/libannocheck.pc -%{_bindir}/annocheck -%{_mandir}/man1/annocheck.1* %endif #--------------------------------------------------------------------------------- %changelog +* Wed Oct 05 2022 Nick Clifton - 10.87-2 +- Libannocheck: Move into separate sub-package. + * Fri Sep 30 2022 Nick Clifton - 10.87-1 - Libannocheck: Add libannocheck.pc pkgconfig file. From 0062e138c986a270c44e4018aac4423f2b23f7e3 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 11 Oct 2022 12:24:53 +0100 Subject: [PATCH 09/39] Libannocheck: Remove 'Requires binutils-devel' from libannocheck.pc. --- annobin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/annobin.spec b/annobin.spec index 8a461b1..17ec602 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,8 +1,8 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.87 -Release: 2%{?dist} +Version: 10.88 +Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -508,6 +508,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Tue Oct 11 2022 Nick Clifton - 10.88-1 +- Libannocheck: Remove 'Requires binutils-devel' from libannocheck.pc. + * Wed Oct 05 2022 Nick Clifton - 10.87-2 - Libannocheck: Move into separate sub-package. diff --git a/sources b/sources index f984e52..cf94be5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.87.tar.xz) = 231bd9e108719261ea6cac52f9f035f586e3123d870973813f1c5ac43545ab61dc2c8a0bf048141c9587c5028accf238c39344165eab1b2a3db7d55380b31e65 +SHA512 (annobin-10.88.tar.xz) = 30fdedc624a138d95f48eca5957b74da9a1289eac7c2a513084162ab34369badae63e3fa31d45ed968c529415e968f51fef4b37a251d633a48160ebe53df2e7f From f85d35312bb29ae0f444430cdef0c8fd883e5b4d Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 17 Oct 2022 14:45:49 +0100 Subject: [PATCH 10/39] Libannocheck: Replace libannocheck_version variable with LIBANNOCHECK_VERSION define. --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 17ec602..dcd719c 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.88 +Version: 10.89 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -508,6 +508,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Tue Oct 11 2022 Nick Clifton - 10.89-1 +- Libannocheck: Replace libannocheck_version variable with LIBANNOCHECK_VERSION define. + * Tue Oct 11 2022 Nick Clifton - 10.88-1 - Libannocheck: Remove 'Requires binutils-devel' from libannocheck.pc. diff --git a/sources b/sources index cf94be5..ef20e60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.88.tar.xz) = 30fdedc624a138d95f48eca5957b74da9a1289eac7c2a513084162ab34369badae63e3fa31d45ed968c529415e968f51fef4b37a251d633a48160ebe53df2e7f +SHA512 (annobin-10.89.tar.xz) = 437a53f48ba49e055a96e71fe586a81335a8825c9e54d3fc76429d340f4c0308adc70aa600af7c11523abe6e261a70dc0bd1f2e89658f37fba19739574fd17a0 From 3ce07632bf1dc0b5b9804c0ed4adc8b0bd1f9cbf Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 19 Oct 2022 16:11:48 +0100 Subject: [PATCH 11/39] Libannocheck: Actually set result fields after tests are run. --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index dcd719c..6484b90 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.89 +Version: 10.90 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -508,6 +508,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Oct 19 2022 Nick Clifton - 10.90-1 +- Libannocheck: Actually set result fields after tests are run. + * Tue Oct 11 2022 Nick Clifton - 10.89-1 - Libannocheck: Replace libannocheck_version variable with LIBANNOCHECK_VERSION define. diff --git a/sources b/sources index ef20e60..537ade8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.89.tar.xz) = 437a53f48ba49e055a96e71fe586a81335a8825c9e54d3fc76429d340f4c0308adc70aa600af7c11523abe6e261a70dc0bd1f2e89658f37fba19739574fd17a0 +SHA512 (annobin-10.90.tar.xz) = 42a7b438eccdf81792f4452d57af619a966f436f8745bfaf05dc47f11ee9d337ffd0a2ea93ff86828053a57029a6cb74e473d19d454ddc4c4d778014c75f6c5c From 48b426400284ebed64eaa0131ad17ba6c0903de4 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 21 Oct 2022 12:41:20 +0100 Subject: [PATCH 12/39] Tests: Fix future-test so that it properly handles the situation where the compiler does not support the new options. --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 6484b90..6792460 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.90 +Version: 10.91 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -508,6 +508,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Oct 21 2022 Nick Clifton - 10.91-1 +- Tests: Fix future-test so that it properly handles the situation where the compiler does not support the new options. + * Wed Oct 19 2022 Nick Clifton - 10.90-1 - Libannocheck: Actually set result fields after tests are run. diff --git a/sources b/sources index 537ade8..ea31ce3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.90.tar.xz) = 42a7b438eccdf81792f4452d57af619a966f436f8745bfaf05dc47f11ee9d337ffd0a2ea93ff86828053a57029a6cb74e473d19d454ddc4c4d778014c75f6c5c +SHA512 (annobin-10.91.tar.xz) = d7c6e77f3e0385dccf1bb3fba4804675a679ec02a192768974ccad22350dcf6858232708189615ee3063da83b0372afca5b66d82282df49903cd4178913fa9d2 From e1f5135ff6fc7c3a3121746212b7090330ce8258 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 7 Nov 2022 18:00:03 +0000 Subject: [PATCH 13/39] Annocheck: Try harder not to run mutually exclusive tests. --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 6792460..0ddc593 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.91 +Version: 10.92 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -508,6 +508,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Mon Nov 07 2022 Nick Clifton - 10.92-1 +- Annocheck: Try harder not to run mutually exclusive tests. + * Fri Oct 21 2022 Nick Clifton - 10.91-1 - Tests: Fix future-test so that it properly handles the situation where the compiler does not support the new options. diff --git a/sources b/sources index ea31ce3..7cef5c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.91.tar.xz) = d7c6e77f3e0385dccf1bb3fba4804675a679ec02a192768974ccad22350dcf6858232708189615ee3063da83b0372afca5b66d82282df49903cd4178913fa9d2 +SHA512 (annobin-10.92.tar.xz) = 302c6f088953ef1f0b9bf69f4fbc3c26bb60ffc5a03e19acf7584494b92184bac34c3bb8d7c43fe7915fb60efb806ed81f09b6567abd80ba6f0fedb267240ce0 From 5ed44f97c80eda2c9ed88f6185a44f52fd85809e Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 23 Nov 2022 14:07:59 +0000 Subject: [PATCH 14/39] Annocheck: Provide more information when a test is skipped because the file being tested was not compiled. --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 0ddc593..1ad07a2 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.92 +Version: 10.93 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -508,6 +508,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Nov 23 2022 Nick Clifton - 10.93-1 +- Annocheck: Provide more information when a test is skipped because the file being tested was not compiled. + * Mon Nov 07 2022 Nick Clifton - 10.92-1 - Annocheck: Try harder not to run mutually exclusive tests. diff --git a/sources b/sources index 7cef5c7..3a0cccf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.92.tar.xz) = 302c6f088953ef1f0b9bf69f4fbc3c26bb60ffc5a03e19acf7584494b92184bac34c3bb8d7c43fe7915fb60efb806ed81f09b6567abd80ba6f0fedb267240ce0 +SHA512 (annobin-10.93.tar.xz) = e07ed578379372057574c5cb3737fd3105a032131761c9ca8b15be693109fa1953c78ff5302c5db22b5f48e41477ea3fb4ff10dc1d5d3d4f932838099bd48b8e From a943824136cf9b627e6627ccc87a6145d00d09cb Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 30 Nov 2022 10:02:01 +0000 Subject: [PATCH 15/39] Annocheck: Better detection of binaries which do not contain code. (#2144533) --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 1ad07a2..5724e2b 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.93 +Version: 10.94 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -508,6 +508,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Nov 30 2022 Nick Clifton - 10.94-1 +- Annocheck: Better detection of binaries which do not contain code. (#2144533) + * Wed Nov 23 2022 Nick Clifton - 10.93-1 - Annocheck: Provide more information when a test is skipped because the file being tested was not compiled. diff --git a/sources b/sources index 3a0cccf..a22ea39 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.93.tar.xz) = e07ed578379372057574c5cb3737fd3105a032131761c9ca8b15be693109fa1953c78ff5302c5db22b5f48e41477ea3fb4ff10dc1d5d3d4f932838099bd48b8e +SHA512 (annobin-10.94.tar.xz) = da6cee60c5640ed30ee8c359e0f0450cafd41164a0136144350216403347de90e8ed417b370007f444eba202dcd45e13639c4defcf4e6da90337d4d65f3e2187 From 79c88cf6699b5a170f76d6d8702cea3f1d5d60e7 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 12 Dec 2022 13:36:29 +0000 Subject: [PATCH 16/39] Avoid using debug filename when parsing notes in a debuginfo file. (#2152280) --- annobin.spec | 6 +++++- sources | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 5724e2b..c9d6ff9 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,11 +1,12 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.94 +Version: 10.95 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com +# Web Page: https://sourceware.org/annobin/ # Watermark Protocol: https://fedoraproject.org/wiki/Toolchain/Watermark #--------------------------------------------------------------------------------- @@ -508,6 +509,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Mon Dec 12 2022 Nick Clifton - 10.95-1 +- Annocheck: Avoid using debug filename when parsing notes in a debuginfo file. (#2152280) + * Wed Nov 30 2022 Nick Clifton - 10.94-1 - Annocheck: Better detection of binaries which do not contain code. (#2144533) diff --git a/sources b/sources index a22ea39..a3f4526 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.94.tar.xz) = da6cee60c5640ed30ee8c359e0f0450cafd41164a0136144350216403347de90e8ed417b370007f444eba202dcd45e13639c4defcf4e6da90337d4d65f3e2187 +SHA512 (annobin-10.95.tar.xz) = d37513de7b7cf83b0a1680fcf354ce2efbf21384f509339b572ea3cc332a718d5f6a2fbc2037cec25863dc369a201d00ff7e7aef1a05f1a5f6b94ef2c6c5e74e From c30926d7506bea0cd98bad05dc531dafb15d23c8 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 15 Dec 2022 11:21:15 +0000 Subject: [PATCH 17/39] Annocheck: Improve heuristic used to detect binaries without code. (#2144533) --- annobin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/annobin.spec b/annobin.spec index c9d6ff9..dcf8506 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.95 +Version: 10.96 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -509,6 +509,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Thu Dec 15 2022 Nick Clifton - 10.96-1 +- Annocheck: Improve heuristic used to detect binaries without code. (#2144533) + * Mon Dec 12 2022 Nick Clifton - 10.95-1 - Annocheck: Avoid using debug filename when parsing notes in a debuginfo file. (#2152280) From 567f2c40ba0f502d0b6bfcc3609fee4a0174f695 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Thu, 15 Dec 2022 11:30:58 +0000 Subject: [PATCH 18/39] Add new sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index a3f4526..bc474c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.95.tar.xz) = d37513de7b7cf83b0a1680fcf354ce2efbf21384f509339b572ea3cc332a718d5f6a2fbc2037cec25863dc369a201d00ff7e7aef1a05f1a5f6b94ef2c6c5e74e +SHA512 (annobin-10.96.tar.xz) = b2629aa48004db79d9a69812df63bee8c2b1b0d5ab04140b253b94f4a607962693b43e0dc9d933b1a9b21163c64b2b20b836c22085bf844a3a72d763aeea9492 From 2f21168d4c1a5810c4b1bde06da6c06514300b2b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 16 Dec 2022 08:48:26 +0000 Subject: [PATCH 19/39] Annocheck: Add test for binaries built by cross compilers --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index dcf8506..6469110 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.96 +Version: 10.97 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -509,6 +509,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Dec 16 2022 Nick Clifton - 10.97-1 +- Annocheck: Add test for binaries built by cross compilers. + * Thu Dec 15 2022 Nick Clifton - 10.96-1 - Annocheck: Improve heuristic used to detect binaries without code. (#2144533) diff --git a/sources b/sources index bc474c0..2982247 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.96.tar.xz) = b2629aa48004db79d9a69812df63bee8c2b1b0d5ab04140b253b94f4a607962693b43e0dc9d933b1a9b21163c64b2b20b836c22085bf844a3a72d763aeea9492 +SHA512 (annobin-10.97.tar.xz) = 3d9f302fbf69c388c760e67c953464b36410d3ad10cd489e5eb15ec5c9d1272775a9a8ac6ded4a89807b5d651e765ae2782143113de878eb525c562250039a4e From 072153ed0c6aabd333a7b1c141ae33efabfe493a Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 16 Dec 2022 11:29:52 +0000 Subject: [PATCH 20/39] GCC plugin: Fix building with gcc-13. --- annobin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/annobin.spec b/annobin.spec index 6469110..9763de8 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.97 +Version: 10.98 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -509,6 +509,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Dec 16 2022 Nick Clifton - 10.98-1 +- GCC plugin: Fix building with gcc-13. + * Fri Dec 16 2022 Nick Clifton - 10.97-1 - Annocheck: Add test for binaries built by cross compilers. From be2978da15a2b4252f4f7c3f555c405d43b571c7 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 16 Dec 2022 11:36:22 +0000 Subject: [PATCH 21/39] add new sources --- sources | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sources b/sources index 2982247..f68617a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.97.tar.xz) = 3d9f302fbf69c388c760e67c953464b36410d3ad10cd489e5eb15ec5c9d1272775a9a8ac6ded4a89807b5d651e765ae2782143113de878eb525c562250039a4e +SHA512 (annobin-10.98.tar.xz) = 523651275dd99e45d1611acdb1196948de034354730d07d7d5fe1f8946647b296532bcef1a3f1d18b7759a7bdf1c33c7574b3073eb7682696527ab67da95caa2 From 5271f2bc79fa5a42fe0ca42bcac025dcde79d6fc Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 20 Dec 2022 11:00:37 +0000 Subject: [PATCH 22/39] Spec File: Fix building with plugin_rebuild enabled. --- annobin.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/annobin.spec b/annobin.spec index 9763de8..a370f9a 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.98 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -38,7 +38,7 @@ URL: https://sourceware.org/annobin/ # checking logic or when building on RHEL-7 or earlier. %global with_hard_gcc_version_requirement 1 -%bcond_with plugin_rebuild +%bcond_without plugin_rebuild # Allow the building of annobin without using annobin itself. # This is because if we are bootstrapping a new build environment we can have # a new version of gcc installed, but without a new of annobin installed. @@ -396,8 +396,12 @@ cp gcc-plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so make -C gcc-plugin clean BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so" -# Disable the standard annobin plugin so that we do get conflicts. -OPTS="$(rpm --eval '%undefine _annotated_build %build_cflags %build_ldflags')" +%if 0%{?_annotated_build} == 0 +OPTS="$(rpm --eval '%build_cflags %build_ldflags')" +%else +# Disable the standard annobin plugin so that we do not get conflicts. +OPTS="$(rpm --eval '%undefine _annotated_build %%build_cflags %build_ldflags')" +%endif # If building on systems with an assembler that does not support the # .attach_to_group pseudo op (eg RHEL-7) then enable the next line. @@ -509,6 +513,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Tue Dec 20 2022 Nick Clifton - 10.98-2 +- Spec File: Fix building with plugin_rebuild enabled. + * Fri Dec 16 2022 Nick Clifton - 10.98-1 - GCC plugin: Fix building with gcc-13. From c1204cc8ac0179fdafbff9ed983b160e0d371db9 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 20 Dec 2022 11:33:24 +0000 Subject: [PATCH 23/39] Spec File: Fix rebuilding plugins (better version). --- annobin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index a370f9a..1d3c25c 100644 --- a/annobin.spec +++ b/annobin.spec @@ -400,7 +400,7 @@ BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so" OPTS="$(rpm --eval '%build_cflags %build_ldflags')" %else # Disable the standard annobin plugin so that we do not get conflicts. -OPTS="$(rpm --eval '%undefine _annotated_build %%build_cflags %build_ldflags')" +OPTS="$(rpm --undefine=_annotated_build --eval '%build_cflags %build_ldflags')" %endif # If building on systems with an assembler that does not support the @@ -513,7 +513,7 @@ fi #--------------------------------------------------------------------------------- %changelog -* Tue Dec 20 2022 Nick Clifton - 10.98-2 +* Tue Dec 20 2022 Nick Clifton - 10.98-3 - Spec File: Fix building with plugin_rebuild enabled. * Fri Dec 16 2022 Nick Clifton - 10.98-1 From 2bb2ec5d78dbc77c339d95d91cacdc50a267f53c Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 20 Dec 2022 13:11:50 +0000 Subject: [PATCH 24/39] NVR bump to allow rebuild --- annobin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/annobin.spec b/annobin.spec index 1d3c25c..f370402 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 10.98 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com From 8749815a7692c68ffdd32af3d933ae3d60697cc0 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 21 Dec 2022 16:30:12 +0000 Subject: [PATCH 25/39] Improve handling of tool versions --- annobin.spec | 14 +++++++++----- sources | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/annobin.spec b/annobin.spec index f370402..f01e281 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,8 +1,8 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.98 -Release: 3%{?dist} +Version: 10.99 +Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -396,10 +396,11 @@ cp gcc-plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so make -C gcc-plugin clean BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so" -%if 0%{?_annotated_build} == 0 -OPTS="$(rpm --eval '%build_cflags %build_ldflags')" +# Disable the standard annobin plugin so that we do get conflicts. +# Note - Fedora's rpm uses a different way of evaluating macros. +%if 0%{?fedora} == 0 +OPTS="$(rpm --eval '%undefine _annotated_build %build_cflags %build_ldflags')" %else -# Disable the standard annobin plugin so that we do not get conflicts. OPTS="$(rpm --undefine=_annotated_build --eval '%build_cflags %build_ldflags')" %endif @@ -513,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Dec 21 2022 Nick Clifton - 10.99-1 +- Annocheck: Improve handling of tool versions. + * Tue Dec 20 2022 Nick Clifton - 10.98-3 - Spec File: Fix building with plugin_rebuild enabled. diff --git a/sources b/sources index f68617a..48309aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.98.tar.xz) = 523651275dd99e45d1611acdb1196948de034354730d07d7d5fe1f8946647b296532bcef1a3f1d18b7759a7bdf1c33c7574b3073eb7682696527ab67da95caa2 +SHA512 (annobin-10.99.tar.xz) = 601bd90aa4b6528f595efebf5b864aae5176e8e9d80c7f9cf77a1252b85a15c8440866a1f4881176f6bb50418c037e8924f32456533e90de473dae8abe92d53e From 2ec6c8b01cc00df0fc30153faa3d0e3a9723ab97 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 4 Jan 2023 11:56:35 +0000 Subject: [PATCH 26/39] annocheck: Add more special glibc files --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index f01e281..d7f6015 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 10.99 +Version: 11.01 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -514,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Jan 04 2023 Nick Clifton - 11.01-1 +- Annocheck: Add more special glibc filenames. + * Wed Dec 21 2022 Nick Clifton - 10.99-1 - Annocheck: Improve handling of tool versions. diff --git a/sources b/sources index 48309aa..495dc00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-10.99.tar.xz) = 601bd90aa4b6528f595efebf5b864aae5176e8e9d80c7f9cf77a1252b85a15c8440866a1f4881176f6bb50418c037e8924f32456533e90de473dae8abe92d53e +SHA512 (annobin-11.01.tar.xz) = e89eb27a5c8c08aaafecee1e341da8e0531300b890a6ae85712812bba9233834fe61b25b9836f4a61b9a91ce6ef59fde84a684434a14135131ee774795a7fc2a From afa3de1ef8956e64ff48be693c2f31a3786d78f8 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 4 Jan 2023 15:43:33 +0000 Subject: [PATCH 27/39] nnocheck: Do not assume that object files contain no code simply because they do not have an executable segment. (#2158182) --- annobin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/annobin.spec b/annobin.spec index d7f6015..47a1170 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 11.01 +Version: 11.02 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -514,8 +514,11 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Jan 04 2023 Nick Clifton - 11.02-1 +- Annocheck: Do not assume that object files contain no code simply because they do not have an executable segment. (#2158182) + * Wed Jan 04 2023 Nick Clifton - 11.01-1 -- Annocheck: Add more special glibc filenames. +- Annocheck: Add more special glibc filenames. (#2158100) * Wed Dec 21 2022 Nick Clifton - 10.99-1 - Annocheck: Improve handling of tool versions. diff --git a/sources b/sources index 495dc00..59592f6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-11.01.tar.xz) = e89eb27a5c8c08aaafecee1e341da8e0531300b890a6ae85712812bba9233834fe61b25b9836f4a61b9a91ce6ef59fde84a684434a14135131ee774795a7fc2a +SHA512 (annobin-11.02.tar.xz) = 18230eebd3e7dba3afbedec22c39daa0dd60f4ab0d0f558b15cbe5cfa078a7a67236553dce85ec04df98735e71b65a24be531f748a5f3d9e95b84c756b85cc06 From 4ff4a783cb550253806daa61d087e553184f4bc3 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 6 Jan 2023 09:51:48 +0000 Subject: [PATCH 28/39] Annocheck: Fix memory leaks --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 47a1170..99db5d0 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 11.02 +Version: 11.03 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -514,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Jan 06 2023 Nick Clifton - 11.03-1 +- Annocheck: Fix memory leaks. + * Wed Jan 04 2023 Nick Clifton - 11.02-1 - Annocheck: Do not assume that object files contain no code simply because they do not have an executable segment. (#2158182) diff --git a/sources b/sources index 59592f6..547464f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-11.02.tar.xz) = 18230eebd3e7dba3afbedec22c39daa0dd60f4ab0d0f558b15cbe5cfa078a7a67236553dce85ec04df98735e71b65a24be531f748a5f3d9e95b84c756b85cc06 +SHA512 (annobin-11.03.tar.xz) = 1044ee998247759e40a6db848dcfe87d13742c3a58253968c02d5a818e4fda13341ca6aea816d55179c33b432a9fc9f0924c486cc268ee1cfa497b9e255a65ef From ba8d65fa5bc53bd410fd0f7ed76545e96579130f Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 6 Jan 2023 13:50:48 +0000 Subject: [PATCH 29/39] Annocheck: Add crti.o and crtn.o to the list of known glibc special files. (#2158740) --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 99db5d0..6610397 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 11.03 +Version: 11.04 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -514,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Jan 06 2023 Nick Clifton - 11.04-1 +- Annocheck: Add crti.o and crtn.o to the list of known glibc special files. (#2158740) + * Fri Jan 06 2023 Nick Clifton - 11.03-1 - Annocheck: Fix memory leaks. diff --git a/sources b/sources index 547464f..aad349a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-11.03.tar.xz) = 1044ee998247759e40a6db848dcfe87d13742c3a58253968c02d5a818e4fda13341ca6aea816d55179c33b432a9fc9f0924c486cc268ee1cfa497b9e255a65ef +SHA512 (annobin-11.04.tar.xz) = 8b0b1f8a89b44a7191de414e161b787049aaff184c1aa40e515a27e765b96cee0dfd2120b6b645a9a82c385fee527772a757bb1d4f77495fbc96e4c77522eb49 From 357f81a176a51450e6038b02fcdfb02ee031b1bc Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 9 Jan 2023 15:03:04 +0000 Subject: [PATCH 30/39] Annocheck: Fix handling of empty files. (#2159292) --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 6610397..2f0ac78 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 11.04 +Version: 11.05 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -514,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Mon Jan 09 2023 Nick Clifton - 11.05-1 +- Annocheck: Fix handling of empty files. (#2159292) + * Fri Jan 06 2023 Nick Clifton - 11.04-1 - Annocheck: Add crti.o and crtn.o to the list of known glibc special files. (#2158740) diff --git a/sources b/sources index aad349a..a0870d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-11.04.tar.xz) = 8b0b1f8a89b44a7191de414e161b787049aaff184c1aa40e515a27e765b96cee0dfd2120b6b645a9a82c385fee527772a757bb1d4f77495fbc96e4c77522eb49 +SHA512 (annobin-11.05.tar.xz) = 1c533ffb525c0fd0e1faa6c471d8a7a029fe6dd1887dec275e7ccea5b28b5bb0194bcb11b3c7306d332e077fd15a24e784ca96336c1886dd07bfe9c9f9e5fb52 From 886835160dcccbf44e6544b267a858f80a9fad71 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 13 Jan 2023 16:17:24 +0000 Subject: [PATCH 31/39] Annocheck: Fix handling of file built by multiple versions of gcc. (#2160700) --- annobin.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index 2f0ac78..8c8eea5 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,7 +1,7 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 11.05 +Version: 11.06 Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ @@ -514,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Jan 13 2023 Nick Clifton - 11.06-1 +- Annocheck: Fix handling of file built by multiple versions of gcc. (#2160700) + * Mon Jan 09 2023 Nick Clifton - 11.05-1 - Annocheck: Fix handling of empty files. (#2159292) diff --git a/sources b/sources index a0870d5..b52267b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-11.05.tar.xz) = 1c533ffb525c0fd0e1faa6c471d8a7a029fe6dd1887dec275e7ccea5b28b5bb0194bcb11b3c7306d332e077fd15a24e784ca96336c1886dd07bfe9c9f9e5fb52 +SHA512 (annobin-11.06.tar.xz) = 0a1a8e02a4381229d788b05fb6819e6e78306e51383c5128b0f8796ab6b5cee6d8aa2e60dab87c109af64dcf788a6a129fe431d60016f1e7125207a6c1d8af92 From 4cdb52a0c258f1336a509178cbdf744721cf7fee Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 16 Jan 2023 13:06:48 +0100 Subject: [PATCH 32/39] Rebuilt against GCC 13. --- annobin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/annobin.spec b/annobin.spec index 8c8eea5..e567647 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 11.06 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -514,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Mon Jan 16 2023 Jakub Jelinek - 11.06-2 +- Rebuilt against GCC 13. + * Fri Jan 13 2023 Nick Clifton - 11.06-1 - Annocheck: Fix handling of file built by multiple versions of gcc. (#2160700) From d5c3f3f99c5635e9ba58b7359d9a2c0afe2bd85d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:45:12 +0000 Subject: [PATCH 33/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- annobin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/annobin.spec b/annobin.spec index e567647..41de040 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 11.06 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -514,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 11.06-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Jan 16 2023 Jakub Jelinek - 11.06-2 - Rebuilt against GCC 13. From 0dd004a8d87ecd97ef7c6edd399ee49736cee345 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 20 Jan 2023 16:38:35 +0000 Subject: [PATCH 34/39] Libannocheck: Fix bug causing infinite looping when running tests. --- annobin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/annobin.spec b/annobin.spec index 41de040..cfe7733 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,8 +1,8 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 11.06 -Release: 3%{?dist} +Version: 11.07 +Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -514,6 +514,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Fri Jan 20 2023 Nick Clifton - 11.07-1 +- Libannocheck: Fix bug causing infinite looping when running tests. + * Wed Jan 18 2023 Fedora Release Engineering - 11.06-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index b52267b..8421e41 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-11.06.tar.xz) = 0a1a8e02a4381229d788b05fb6819e6e78306e51383c5128b0f8796ab6b5cee6d8aa2e60dab87c109af64dcf788a6a129fe431d60016f1e7125207a6c1d8af92 +SHA512 (annobin-11.07.tar.xz) = 4875f4798c2303cf21e55dbd632acfc5c6e77f4769546b5a465be6777f0081317dc99a91b3da84e384724910d5e03a333b1237e248ce59bf85fa302ba7634f3a From 250db92462e43571e433383583613a2ac3f75c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Tue, 24 Jan 2023 15:05:19 +0100 Subject: [PATCH 35/39] Adapt to TMT 1.19+ The Fedora testing farm was updated to TMT 1.19 in December. "how: beakerlib" in our test metadata is no longer supported, this commit fixes it. --- plans/ci.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..85710d6 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -3,4 +3,4 @@ discover: how: fmf directory: tests execute: - how: beakerlib + how: tmt From bc0466b88d24c1118209f3835d4acf35b3de635a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Tue, 24 Jan 2023 15:09:53 +0100 Subject: [PATCH 36/39] Make requirements in gating tests more explicit Make requirements stricter (required packages instead of recommended packages) and remove requirements that are no longer needed. The previous requirements caused failures in manual testing and possibly some gating failures as well. --- .../main.fmf | 4 +++- tests/Regression/identify/main.fmf | 11 ++--------- .../Regression/lto-preprocessor-options/main.fmf | 7 ++++--- .../main.fmf | 4 ++-- .../processing-params-in-reverse-order/main.fmf | 4 ++-- .../main.fmf | 5 +++-- tests/Regression/testsuite/main.fmf | 16 ++++++---------- .../main.fmf | 5 +++-- tests/Sanity/smoke/main.fmf | 6 +++--- 9 files changed, 28 insertions(+), 34 deletions(-) diff --git a/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf b/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf index 435d7ff..e0cbc5d 100644 --- a/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf +++ b/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf @@ -8,9 +8,11 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: +require: - annobin-annocheck +- annobin-plugin-gcc - gcc +- redhat-rpm-config duration: 48h extra-summary: /tools/annobin/Regression/annobin-fails-to-skip-endbr64-entry-point-check extra-task: /tools/annobin/Regression/annobin-fails-to-skip-endbr64-entry-point-check diff --git a/tests/Regression/identify/main.fmf b/tests/Regression/identify/main.fmf index a10e87d..674544e 100644 --- a/tests/Regression/identify/main.fmf +++ b/tests/Regression/identify/main.fmf @@ -7,15 +7,8 @@ component: test: ./runtest.sh framework: beakerlib recommend: -- annobin -- devtoolset-10 -- devtoolset-10-annocheck -- devtoolset-11 -- devtoolset-11-annocheck -- gcc-toolset-10 -- gcc-toolset-10-annocheck -- gcc-toolset-11 -- gcc-toolset-11-annocheck +- annobin-plugin-gcc +- annobin-annocheck duration: 48h extra-summary: /tools/annobin/Regression/identify extra-task: /tools/annobin/Regression/identify diff --git a/tests/Regression/lto-preprocessor-options/main.fmf b/tests/Regression/lto-preprocessor-options/main.fmf index 03e6b88..2a3e56a 100644 --- a/tests/Regression/lto-preprocessor-options/main.fmf +++ b/tests/Regression/lto-preprocessor-options/main.fmf @@ -6,11 +6,12 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- gcc -- annobin +require: +- annobin-plugin-gcc - annobin-annocheck - redhat-rpm-config +- gcc +- redhat-rpm-config duration: 48h extra-summary: /tools/annobin/Regression/lto-preprocessor-options extra-task: /tools/annobin/Regression/lto-preprocessor-options diff --git a/tests/Regression/missing-check-for-x86-property-note-content/main.fmf b/tests/Regression/missing-check-for-x86-property-note-content/main.fmf index a7afb11..b4ab7fd 100644 --- a/tests/Regression/missing-check-for-x86-property-note-content/main.fmf +++ b/tests/Regression/missing-check-for-x86-property-note-content/main.fmf @@ -7,8 +7,8 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-annocheck duration: 48h link: - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1991931 diff --git a/tests/Regression/processing-params-in-reverse-order/main.fmf b/tests/Regression/processing-params-in-reverse-order/main.fmf index 19b497d..99adc08 100644 --- a/tests/Regression/processing-params-in-reverse-order/main.fmf +++ b/tests/Regression/processing-params-in-reverse-order/main.fmf @@ -7,8 +7,8 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-annocheck duration: 48h link: - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1988714 diff --git a/tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf b/tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf index bd8362f..07395fa 100644 --- a/tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf +++ b/tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf @@ -7,8 +7,9 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-plugin-gcc +- annobin-annocheck - libstdc++ duration: 48h link: diff --git a/tests/Regression/testsuite/main.fmf b/tests/Regression/testsuite/main.fmf index 7352f78..f117f62 100644 --- a/tests/Regression/testsuite/main.fmf +++ b/tests/Regression/testsuite/main.fmf @@ -6,23 +6,19 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-plugin-gcc - annobin-annocheck - binutils-devel -- gcc -- gcc-c++ +- bzip2-devel +- dnf - elfutils - elfutils-devel +- gcc-c++ +- gcc-plugin-devel - make - rpm-build - rpm-devel -- gcc-plugin-devel -- yum -- dnf -- yum-utils -- bzip2-devel -- rpm-build duration: 48h extra-summary: /tools/annobin/Regression/testsuite extra-task: /tools/annobin/Regression/testsuite diff --git a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf b/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf index 9aea593..9ece622 100644 --- a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf +++ b/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf @@ -7,8 +7,9 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: -- annobin +require: +- annobin-plugin-gcc +- annobin-annocheck duration: 48h link: - relates: https://bugzilla.redhat.com/show_bug.cgi?id=1973981 diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf index 49d2862..fca8ae4 100644 --- a/tests/Sanity/smoke/main.fmf +++ b/tests/Sanity/smoke/main.fmf @@ -6,11 +6,11 @@ component: - annobin test: ./runtest.sh framework: beakerlib -recommend: +require: +- annobin-plugin-gcc +- annobin-annocheck - man-db - gcc -- annobin -- annobin-annocheck duration: 48h extra-summary: /tools/annobin/Sanity/smoke extra-task: /tools/annobin/Sanity/smoke From f45bd71eb38d48872e9706c6eafeaa89a23e95e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Tue, 24 Jan 2023 15:15:39 +0100 Subject: [PATCH 37/39] Adapt test scripts to newest annobin versions --- .../runtest.sh | 5 +---- tests/Regression/testsuite/runtest.sh | 2 +- .../runtest.sh | 7 ++++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/runtest.sh b/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/runtest.sh index 41312a4..91fa544 100755 --- a/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/runtest.sh +++ b/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/runtest.sh @@ -28,13 +28,10 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh || exit 1 -PACKAGE="annobin" - rlJournalStart rlPhaseStartSetup rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory" rlRun "pushd $TmpDir" - rlRun "rpm -q annobin-annocheck gcc" rlPhaseEnd rlPhaseStartTest @@ -43,7 +40,7 @@ rlJournalStart rlRun "gcc `rpm --eval %build_cflags` -fpic -c f1.c" rlRun "gcc `rpm --eval %build_cflags` -fpic -c f2.c" rlRun "gcc `rpm --eval %build_ldflags` -shared f1.o f2.o" - rlRun "annocheck -v a.out" + rlRun "annocheck -v --skip-lto a.out" rlPhaseEnd rlPhaseStartCleanup diff --git a/tests/Regression/testsuite/runtest.sh b/tests/Regression/testsuite/runtest.sh index c8016ad..1507c45 100755 --- a/tests/Regression/testsuite/runtest.sh +++ b/tests/Regression/testsuite/runtest.sh @@ -62,7 +62,7 @@ rlJournalStart rlRun "pushd $TMP" rlFetchSrcForInstalled $PACKAGE - rlRun "yum-builddep -y *src.rpm" + rlRun "dnf builddep -y *src.rpm" rlRun "rpm --define='_topdir $TMP' -Uvh *src.rpm" rlRun "rpmbuild --define='_topdir $TMP' -bc SPECS/annobin.spec" rlPhaseEnd diff --git a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/runtest.sh b/tests/Sanity/annocheck-silently-ignores-any-file-parameter/runtest.sh index ca991af..bb1a436 100755 --- a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/runtest.sh +++ b/tests/Sanity/annocheck-silently-ignores-any-file-parameter/runtest.sh @@ -28,8 +28,6 @@ # Include Beaker environment . /usr/share/beakerlib/beakerlib.sh || exit 1 -PACKAGE="annobin" - rlJournalStart rlPhaseStartSetup rlRun "TMP=$(mktemp -d)" @@ -41,7 +39,10 @@ rlJournalStart samplecnt=$(ls *.sample | wc -l) testcnt=$(ls *.sample | \ xargs annocheck |& \ - fgrep '.sample: is not an ELF format file' | wc -l) + grep -F \ + -e '.sample: unable to read magic number' \ + -e '.sample: is not an ELF format file' \ + | wc -l) rlRun "test $samplecnt -eq 300" rlRun "test $testcnt -eq 300" rlPhaseEnd From fff7a227998e049f55b626915516d48c73b804c7 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 25 Jan 2023 12:43:46 +0000 Subject: [PATCH 38/39] LLVM & Clang Plugins: Build with branch protection on AArch64. (#2164364) Fix gating tests. --- annobin.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/annobin.spec b/annobin.spec index cfe7733..925c8a9 100644 --- a/annobin.spec +++ b/annobin.spec @@ -2,7 +2,7 @@ Name: annobin Summary: Annotate and examine compiled binary files Version: 11.07 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -372,11 +372,19 @@ export CFLAGS="$CFLAGS -DAARCH64_BRANCH_PROTECTION_SUPPORTED=1" export CFLAGS="$CFLAGS $RPM_OPT_FLAGS %build_cflags" export LDFLAGS="$LDFLAGS %build_ldflags" +# Set target-specific security options to be used when building the +# Clang and LLVM plugins. FIXME: There should be a better way to do +# this. %ifarch %{ix86} x86_64 -# FIXME: There should be a better way to do this. export CLANG_TARGET_OPTIONS="-fcf-protection" %endif +%ifarch aarch64 +%if 0%{?fedora} != 0 +export CLANG_TARGET_OPTIONS="-mbranch-protection=standard" +%endif +%endif + %ifarch ppc ppc64 ppc64le # FIXME: This is a workaround for a problem with the Clang C++ headers. It should not be needed. export CLANG_TARGET_OPTIONS="-mabi=ibmlongdouble" @@ -514,6 +522,10 @@ fi #--------------------------------------------------------------------------------- %changelog +* Wed Jan 25 2023 Nick Clifton - 11.07-2 +- LLVM & Clang Plugins: Build with branch protection on AArch64. (#2164364) +- Fix gating tests. + * Fri Jan 20 2023 Nick Clifton - 11.07-1 - Libannocheck: Fix bug causing infinite looping when running tests. From b9a468338714b32b7f6a04f4645d2eeaa5b13a33 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Tue, 31 Jan 2023 08:22:35 +0000 Subject: [PATCH 39/39] Annocheck: Fix atexit test. Fix recording of version numbers. (#2165528) --- annobin.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/annobin.spec b/annobin.spec index 925c8a9..e32c324 100644 --- a/annobin.spec +++ b/annobin.spec @@ -1,8 +1,8 @@ Name: annobin Summary: Annotate and examine compiled binary files -Version: 11.07 -Release: 2%{?dist} +Version: 11.08 +Release: 1%{?dist} License: GPLv3+ URL: https://sourceware.org/annobin/ # Maintainer: nickc@redhat.com @@ -522,6 +522,9 @@ fi #--------------------------------------------------------------------------------- %changelog +* Tue Jan 31 2023 Nick Clifton - 11.08-1 +- Annocheck: Fix atexit test. Fix recording of version numbers. (#2165528) + * Wed Jan 25 2023 Nick Clifton - 11.07-2 - LLVM & Clang Plugins: Build with branch protection on AArch64. (#2164364) - Fix gating tests. diff --git a/sources b/sources index 8421e41..98d9553 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (annobin-11.07.tar.xz) = 4875f4798c2303cf21e55dbd632acfc5c6e77f4769546b5a465be6777f0081317dc99a91b3da84e384724910d5e03a333b1237e248ce59bf85fa302ba7634f3a +SHA512 (annobin-11.08.tar.xz) = 233e0314648b3577bd3e8f977b7da523e3c1770664dd0ade10e97fa251aa00fe1e02fb3104973bf5f6a30b1acb21772a3d9ba05c89bf1edf2feb665f88000fee