From ef781616c5dbc296c51ad5ce37f41d5c6966d68e Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Nov 06 2023 16:34:57 +0000
Subject: Fix another atexit test failure.  (#2247481)

Fix atexit test failure.
Notes: Add support for string format notes.

---

diff --git a/annobin.spec b/annobin.spec
index d2379a2..4ab5d54 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 12.28
+Version: 12.30
 Release: 1%{?dist}
 License: GPL-3.0-or-later AND LGPL-2.0-or-later AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND GFDL-1.3-or-later
 URL: https://sourceware.org/annobin/
@@ -67,7 +67,7 @@ Source: https://nickc.fedorapeople.org/%{annobin_sources}
 %global annobin_source_dir %{_usrsrc}/annobin
 
 # Insert patches here, if needed.  Eg:
-# Patch01: annobin-foo.patch
+# Patch01: annobin-plugin-default-string-notes.patch
 
 #---------------------------------------------------------------------------------
 
@@ -139,17 +139,15 @@ Provides the documentation files and example shell scripts for use with annobin.
 %package tests
 Summary: Test scripts and binaries for checking the behaviour and output of the annobin plugin
 Requires: %{name}-docs = %{version}-%{release}
+BuildRequires: make sharutils
+%if %{with debuginfod}
+BuildRequires: elfutils-debuginfod-client-devel
+%endif
 
 %description tests
 Provides a means to test the generation of annotated binaries and the parsing
 of the resulting files.
 
-BuildRequires: make
-
-%if %{with debuginfod}
-BuildRequires: elfutils-debuginfod-client-devel
-%endif
-
 %endif
 
 #----------------------------------------------------------------------------
@@ -158,7 +156,7 @@ BuildRequires: elfutils-debuginfod-client-devel
 %package annocheck
 Summary: A tool for checking the security hardening status of binaries
 
-BuildRequires: gcc elfutils elfutils-devel elfutils-libelf-devel rpm-devel binutils-devel make
+BuildRequires: gcc elfutils elfutils-devel elfutils-libelf-devel rpm-devel make
 
 %if %{with debuginfod}
 BuildRequires: elfutils-debuginfod-client-devel
@@ -175,14 +173,13 @@ 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
+BuildRequires: gcc elfutils elfutils-devel elfutils-libelf-devel rpm-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
@@ -464,12 +461,17 @@ rm -f %{buildroot}%{_infodir}/dir
 
 %if %{with tests}
 %check
-# Change the following line to "make check || :" on RHEL7 or if you need to see the
-# test suite logs in order to diagnose a test failure.
-make check
+# The first "make check" is run with "|| :" so that we can capture any logs
+# from failed tests.  The second "make check" is there so that the build
+# will fail if any of the tests fail.
+make check || :
 if [ -f tests/test-suite.log ]; then
     cat tests/test-suite.log
 fi
+# If necessary use uuencode to preserve test binaries here.  For example:
+#   uuencode tests/tmp_atexit/atexit.strip atexit.strip
+
+make check
 %endif
 
 #---------------------------------------------------------------------------------
@@ -522,6 +524,11 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Mon Nov 06 2023 Nick Clifron  <nickc@redhat.com> - 12.30-1
+- Fix another atexit test failure.  (#2247481)
+- Fix atexit test failure.
+- Notes: Add support for string format notes.
+
 * Tue Oct 10 2023 Yara Ahmad <yahmad@redhat.com> - 12.28-1
 - GCC Plugin: Record settings of -Wstrict-flex-arrays and -fstrict-flex-arrays
 - Annobin: Add future test of these options.
diff --git a/sources b/sources
index 46c32fe..a37e1bd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-12.28.tar.xz) = 624373d1eba36bc7a0804e0b33dfcb9a8c2415047329c5b96fd6cc2d88cbc9a355bd36ecb00214c4928f6fb4968ec910d76c8ca361b1c13584d4a06f3ee97b05
+SHA512 (annobin-12.30.tar.xz) = 57516fa066fe9f34c31fd3fb55b57246f2d1e33c5029a7396ec565682c16f7b2a7d9d73e2709769db9c29d6618e6415c240435350c98394aec5493a1e3410206