From 6206d10a84d0b0f4726e5bcd6f9d19a3b168355d Mon Sep 17 00:00:00 2001
From: Yara Ahmad <yahmad@redhat.com>
Date: Mon, 10 Jul 2023 15:49:21 +0200
Subject: [PATCH 1/4] - GCC Plugin: Suppress active checks for fortran sources.
  Improve scanning of COLLECT_GCC_OPTIONS. - Annocheck: Remove dependency upon
 binutils-devel. - Annocheck: Add detection of known parts of
 libstdc++-nonshared.a that contain gaps.  (#2217864) - Annocheck: Ignore
 weak/undef function symbols when checking to see if a binary contains code. 
 (#2217840) - Annocheck: Add --suppress-version-warnings option.

---
 annobin.spec | 9 ++++++++-
 sources      | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/annobin.spec b/annobin.spec
index 0f3b5ee..a7de7b7 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,7 +1,7 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 12.14
+Version: 12.19
 Release: 1%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/annobin/
@@ -522,6 +522,13 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Mon Jul 10 2023 Yara Ahmad <yahmad@redhat.com> - 12.19-1
+- GCC Plugin: Suppress active checks for fortran sources.  Improve scanning of COLLECT_GCC_OPTIONS.
+- Annocheck: Remove dependency upon binutils-devel.
+- Annocheck: Add detection of known parts of libstdc++-nonshared.a that contain gaps.  (#2217864)
+- Annocheck: Ignore weak/undef function symbols when checking to see if a binary contains code.  (#2217840)
+- Annocheck: Add --suppress-version-warnings option.
+
 * Fri Jun 23 2023 Yara Ahmad <yahmad@redhat.com> - 12.14-1
 - Annocheck: Do not ignore separate debuginfo files that do not contain any DWARF.  (#2144553)
 - Annocheck: Ignore /dev/null filename in string notes.
diff --git a/sources b/sources
index f9d2c1c..7eb3101 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-12.14.tar.xz) = 2adb057aefc7dc03cdef34f7d1054ead8f6cb6dabec88bd0e262357a0f456f9cb349b1eba238382cc5fa5f733e360f586282af9081178ff123e68518bb01c1be
+SHA512 (annobin-12.19.tar.xz) = 0ac445091952226e9ba77901de853ec0efafbe5696fabbcbff15f4a58394eb1a871aa2c52c3554935916584802eb80b7e4deed4f09b9f813b72df696484cf8f3

From 5bd179bd21810317779c1503bc53f65e72725356 Mon Sep 17 00:00:00 2001
From: Yara Ahmad <yahmad@redhat.com>
Date: Tue, 18 Jul 2023 10:31:58 +0200
Subject: [PATCH 2/4] - Spec File: Change License field to use SPDX notation. 
 (#2222112) - Annocheck: Ignore AArch64  and  symbols.  (#2221192)

---
 annobin.spec | 10 +++++++---
 sources      |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/annobin.spec b/annobin.spec
index a7de7b7..ca9cbe1 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,9 +1,9 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 12.19
-Release: 1%{?dist}
-License: GPLv3+
+Version: 12.20
+Release: 2%{?dist}
+License: GPL-3.0-or-later
 URL: https://sourceware.org/annobin/
 # Maintainer: nickc@redhat.com
 # Web Page: https://sourceware.org/annobin/
@@ -522,6 +522,10 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Tue Jul 18 2023 Yara Ahmad <yahmad@redhat.com> - 12.20-2
+- Spec File: Change License field to use SPDX notation.  (#2222112)
+- Annocheck: Ignore AArch64 $x and $d symbols.  (#2221192)
+
 * Mon Jul 10 2023 Yara Ahmad <yahmad@redhat.com> - 12.19-1
 - GCC Plugin: Suppress active checks for fortran sources.  Improve scanning of COLLECT_GCC_OPTIONS.
 - Annocheck: Remove dependency upon binutils-devel.
diff --git a/sources b/sources
index 7eb3101..876a6b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-12.19.tar.xz) = 0ac445091952226e9ba77901de853ec0efafbe5696fabbcbff15f4a58394eb1a871aa2c52c3554935916584802eb80b7e4deed4f09b9f813b72df696484cf8f3
+SHA512 (annobin-12.20.tar.xz) = cb7ff25b872a0840c4ac21f25217bbe5bd1fd13257097d2a11d8e92a696a5629580f3de99d6e973fbe33a8510aa94aa967f0f557ca3b57a4ea25f9ce35efe17b

From ec61de605c5239286cd149ee23d08457230c8315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= <vkadlcik@redhat.com>
Date: Thu, 30 Mar 2023 10:15:34 +0200
Subject: [PATCH 3/4] Move downstream tests to a separate repository

The tests have been moved to
  https://src.fedoraproject.org/tests/annobin
The move will enable more flexible downstream usage, namely
in RHEL testing.
---
 plans/ci.fmf                                  |   1 +
 tests/README                                  |   2 -
 .../main.fmf                                  |  18 ----
 .../runtest.sh                                |  51 -----------
 tests/Regression/identify/main.fmf            |  14 ---
 tests/Regression/identify/runtest.sh          |  43 ---------
 .../lto-preprocessor-options/main.fmf         |  17 ----
 .../lto-preprocessor-options/runtest.sh       |  44 ---------
 .../main                                      | Bin 27456 -> 0 bytes
 .../main.fmf                                  |  16 ----
 .../runtest.sh                                |  40 ---------
 .../main.fmf                                  |  16 ----
 .../runtest.sh                                |  42 ---------
 .../main.fmf                                  |  18 ----
 .../runtest.sh                                |  44 ---------
 tests/Regression/testsuite/main.fmf           |  24 -----
 tests/Regression/testsuite/runtest.sh         |  85 ------------------
 .../main.fmf                                  |  17 ----
 .../runtest.sh                                |  55 ------------
 tests/Sanity/gcc-fedora-flags/hello.c         |   5 --
 tests/Sanity/gcc-fedora-flags/hello.cpp       |   5 --
 tests/Sanity/gcc-fedora-flags/main.c          |   6 --
 tests/Sanity/gcc-fedora-flags/main.cpp        |   6 --
 tests/Sanity/gcc-fedora-flags/main.fmf        |  17 ----
 tests/Sanity/gcc-fedora-flags/runtest.sh      |  40 ---------
 tests/Sanity/smoke/main.fmf                   |  16 ----
 tests/Sanity/smoke/runtest.sh                 |  45 ----------
 27 files changed, 1 insertion(+), 686 deletions(-)
 delete mode 100644 tests/README
 delete mode 100644 tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf
 delete mode 100755 tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/runtest.sh
 delete mode 100644 tests/Regression/identify/main.fmf
 delete mode 100755 tests/Regression/identify/runtest.sh
 delete mode 100644 tests/Regression/lto-preprocessor-options/main.fmf
 delete mode 100755 tests/Regression/lto-preprocessor-options/runtest.sh
 delete mode 100644 tests/Regression/missing-check-for-x86-property-note-content/main
 delete mode 100644 tests/Regression/missing-check-for-x86-property-note-content/main.fmf
 delete mode 100755 tests/Regression/missing-check-for-x86-property-note-content/runtest.sh
 delete mode 100644 tests/Regression/processing-params-in-reverse-order/main.fmf
 delete mode 100755 tests/Regression/processing-params-in-reverse-order/runtest.sh
 delete mode 100644 tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf
 delete mode 100755 tests/Regression/segv-when-processing-multiple-params-incl-symlink/runtest.sh
 delete mode 100644 tests/Regression/testsuite/main.fmf
 delete mode 100755 tests/Regression/testsuite/runtest.sh
 delete mode 100644 tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf
 delete mode 100755 tests/Sanity/annocheck-silently-ignores-any-file-parameter/runtest.sh
 delete mode 100644 tests/Sanity/gcc-fedora-flags/hello.c
 delete mode 100644 tests/Sanity/gcc-fedora-flags/hello.cpp
 delete mode 100644 tests/Sanity/gcc-fedora-flags/main.c
 delete mode 100644 tests/Sanity/gcc-fedora-flags/main.cpp
 delete mode 100644 tests/Sanity/gcc-fedora-flags/main.fmf
 delete mode 100755 tests/Sanity/gcc-fedora-flags/runtest.sh
 delete mode 100644 tests/Sanity/smoke/main.fmf
 delete mode 100755 tests/Sanity/smoke/runtest.sh

diff --git a/plans/ci.fmf b/plans/ci.fmf
index 3fd3ab7..6ae9ce7 100644
--- a/plans/ci.fmf
+++ b/plans/ci.fmf
@@ -1,5 +1,6 @@
 summary: CI Gating Plan
 discover:
     how: fmf
+    url: https://src.fedoraproject.org/tests/annobin.git
 execute:
     how: tmt
diff --git a/tests/README b/tests/README
deleted file mode 100644
index 9ad59d4..0000000
--- a/tests/README
+++ /dev/null
@@ -1,2 +0,0 @@
-The test's Makefiles are not used in Fedora CI infrastructure.  But are kept here
-for backward compatibility with traditional beakerlib test harness in RHEL.
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
deleted file mode 100644
index e0cbc5d..0000000
--- a/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/main.fmf
+++ /dev/null
@@ -1,18 +0,0 @@
-summary: Test for BZ#1958954 (annobin fails to skip endbr64 entry point check)
-description: |
-    Bug summary: annobin fails to skip endbr64 entry point check for shared objects
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1958954
-contact:
-- Martin Cermak <mcermak@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-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/annobin-fails-to-skip-endbr64-entry-point-check/runtest.sh b/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/runtest.sh
deleted file mode 100755
index 91fa544..0000000
--- a/tests/Regression/annobin-fails-to-skip-endbr64-entry-point-check/runtest.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/annobin/Regression/annobin-fails-to-skip-endbr64-entry-point-check
-#   Description: Test for BZ#1958954 (annobin fails to skip endbr64 entry point check)
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlRun "TmpDir=\$(mktemp -d)" 0 "Creating tmp directory"
-        rlRun "pushd $TmpDir"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "echo 'void f1(void) {}' > f1.c"
-        rlRun "echo 'void f2(void) {}' > f2.c"
-        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 --skip-lto a.out"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/identify/main.fmf b/tests/Regression/identify/main.fmf
deleted file mode 100644
index 674544e..0000000
--- a/tests/Regression/identify/main.fmf
+++ /dev/null
@@ -1,14 +0,0 @@
-summary: identify
-description: ''
-contact:
-- Martin Cermak <mcermak@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- annobin-plugin-gcc
-- annobin-annocheck
-duration: 48h
-extra-summary: /tools/annobin/Regression/identify
-extra-task: /tools/annobin/Regression/identify
diff --git a/tests/Regression/identify/runtest.sh b/tests/Regression/identify/runtest.sh
deleted file mode 100755
index 7907036..0000000
--- a/tests/Regression/identify/runtest.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/annobin/Regression/identify
-#   Description: identify
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2019 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="annobin"
-
-rlJournalStart
-    rlPhaseStartTest
-        rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort"
-        rlRun "tool_v=$(annocheck --version | awk '/^annocheck: Version/ {print $3}')"
-        rlRun "__RPM=$(rpm --queryformat='%{name}\n' -qf $(man -w annobin))"
-        rlRun "rpm_v=$(rpm -q --queryformat='%{version}\n' $__RPM)"
-        # Following fails for annobin-8.89-2.el8
-        rlRun "[[ "x${tool_v}" == "x${rpm_v}." ]]"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/lto-preprocessor-options/main.fmf b/tests/Regression/lto-preprocessor-options/main.fmf
deleted file mode 100644
index 2a3e56a..0000000
--- a/tests/Regression/lto-preprocessor-options/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: lto-preprocessor-options
-description: ''
-contact:
-- Martin Cermak <mcermak@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-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/lto-preprocessor-options/runtest.sh b/tests/Regression/lto-preprocessor-options/runtest.sh
deleted file mode 100755
index 430d830..0000000
--- a/tests/Regression/lto-preprocessor-options/runtest.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/annobin/Regression/lto-preprocessor-options
-#   Description: lto-preprocessor-options
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2020 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="annobin"
-
-rlJournalStart
-    rlPhaseStartTest
-        b=`mktemp`
-        rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort"
-        rlRun "cflags=\"$(rpm --eval '%build_cflags')\""
-        rlRun "ldflags=\"$(rpm --eval '%build_ldflags')\""
-        rlRun "echo 'int main (void) { return 0; }' | gcc -xc -o $b $cflags $ldflags  -flto  - "
-        rlRun "annocheck -v $b"
-        rm $b
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/missing-check-for-x86-property-note-content/main b/tests/Regression/missing-check-for-x86-property-note-content/main
deleted file mode 100644
index b7f4983a4a9958c8cf33bb1a902848845794ec82..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 27456
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

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
deleted file mode 100644
index b4ab7fd..0000000
--- a/tests/Regression/missing-check-for-x86-property-note-content/main.fmf
+++ /dev/null
@@ -1,16 +0,0 @@
-summary: missing-check-for-x86-property-note-content
-description: |
-    Bug summary: annobin: Missing check for contents of x86 property note
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1991931
-contact: Martin Cermak <mcermak@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-require:
-- annobin-annocheck
-duration: 48h
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1991931
-extra-summary: /tools/annobin/Regression/missing-check-for-x86-property-note-content
-extra-task: /tools/annobin/Regression/missing-check-for-x86-property-note-content
diff --git a/tests/Regression/missing-check-for-x86-property-note-content/runtest.sh b/tests/Regression/missing-check-for-x86-property-note-content/runtest.sh
deleted file mode 100755
index 14392c0..0000000
--- a/tests/Regression/missing-check-for-x86-property-note-content/runtest.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/annobin/Regression/missing-check-for-x86-property-note-content
-#   Description: missing-check-for-x86-property-note-content
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="annobin"
-
-rlJournalStart
-    rlPhaseStartTest
-        rlRun "annocheck main" 1
-        rlRun "annocheck --fixed-format-messages  main | \
-               grep '^Hardened: FAIL: test: cf-protection file: main.$'"
-   rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/processing-params-in-reverse-order/main.fmf b/tests/Regression/processing-params-in-reverse-order/main.fmf
deleted file mode 100644
index 99adc08..0000000
--- a/tests/Regression/processing-params-in-reverse-order/main.fmf
+++ /dev/null
@@ -1,16 +0,0 @@
-summary: processing-params-in-reverse-order
-description: |
-    Bug summary: annocheck processes (reports) parameters in reverse order
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1988714
-contact: Martin Cermak <mcermak@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-require:
-- annobin-annocheck
-duration: 48h
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1988714
-extra-summary: /tools/annobin/Regression/processing-params-in-reverse-order
-extra-task: /tools/annobin/Regression/processing-params-in-reverse-order
diff --git a/tests/Regression/processing-params-in-reverse-order/runtest.sh b/tests/Regression/processing-params-in-reverse-order/runtest.sh
deleted file mode 100755
index 75b357e..0000000
--- a/tests/Regression/processing-params-in-reverse-order/runtest.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/annobin/Regression/processing-params-in-reverse-order
-#   Description: processing-params-in-reverse-order
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="annobin"
-
-rlJournalStart
-    rlPhaseStartTest
-        rlRun "TMP=$(mktemp)"
-        rlRun "annocheck --verbose --skip-all --test-stack-prot /bin/bash /bin/cat |& tee $TMP"
-        rlRun "fgrep -i /bin/ $TMP | head -1 | fgrep /bash"
-        rlRun "fgrep -i /bin/ $TMP | tail -1 | fgrep /cat"
-        rlRun "rm -f $TMP"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
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
deleted file mode 100644
index 07395fa..0000000
--- a/tests/Regression/segv-when-processing-multiple-params-incl-symlink/main.fmf
+++ /dev/null
@@ -1,18 +0,0 @@
-summary: segv-when-processing-multiple-params-incl-symlink
-description: |
-    Bug summary: annocheck segfaults sometimes when processing multiple parameters and symlink is involved
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1988715
-contact: Martin Cermak <mcermak@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-require:
-- annobin-plugin-gcc
-- annobin-annocheck
-- libstdc++
-duration: 48h
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1988715
-extra-summary: /tools/annobin/Regression/segv-when-processing-multiple-params-incl-symlink
-extra-task: /tools/annobin/Regression/segv-when-processing-multiple-params-incl-symlink
diff --git a/tests/Regression/segv-when-processing-multiple-params-incl-symlink/runtest.sh b/tests/Regression/segv-when-processing-multiple-params-incl-symlink/runtest.sh
deleted file mode 100755
index 6603c3c..0000000
--- a/tests/Regression/segv-when-processing-multiple-params-incl-symlink/runtest.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/annobin/Regression/segv-when-processing-multiple-params-incl-symlink
-#   Description: segv-when-processing-multiple-params-incl-symlink
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="annobin"
-
-rlJournalStart
-    rlPhaseStartTest
-        # This tries to test https://bugzilla.redhat.com/show_bug.cgi?id=1988715#c0
-        # keeping in mind that annocheck will evolve in the future, along its
-        # rules / policies, and the surrounding OS will evolve too.  This test
-        # shouldn't report false positives though.
-        rlRun "rpm -qf /usr/lib64/libstdc++.so*"
-        rlRun "annocheck --follow-links --skip-all /usr/lib64/libstdc++.so*"
-        rlRun "annocheck --ignore-links --skip-all /usr/lib64/libstdc++.so*"
-   rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Regression/testsuite/main.fmf b/tests/Regression/testsuite/main.fmf
deleted file mode 100644
index f117f62..0000000
--- a/tests/Regression/testsuite/main.fmf
+++ /dev/null
@@ -1,24 +0,0 @@
-summary: testsuite
-description: ''
-contact:
-- Martin Cermak <mcermak@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-require:
-- annobin-plugin-gcc
-- annobin-annocheck
-- binutils-devel
-- bzip2-devel
-- dnf
-- elfutils
-- elfutils-devel
-- gcc-c++
-- gcc-plugin-devel
-- make
-- rpm-build
-- rpm-devel
-duration: 48h
-extra-summary: /tools/annobin/Regression/testsuite
-extra-task: /tools/annobin/Regression/testsuite
diff --git a/tests/Regression/testsuite/runtest.sh b/tests/Regression/testsuite/runtest.sh
deleted file mode 100755
index 1507c45..0000000
--- a/tests/Regression/testsuite/runtest.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/annobin/Regression/testsuite
-#   Description: testsuite
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2018 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="${PACKAGE:-$(rpm -qf --queryformat=%{name} $(man -w annobin))}"
-export PACKAGE
-
-GCC="${GCC:-$(which gcc)}"
-
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlLogInfo "PACKAGES=$PACKAGES"
-        rlLogInfo "REQUIRES=$REQUIRES"
-        rlLogInfo "COLLECTIONS=$COLLECTIONS"
-        rlLogInfo "X_SCLS=$X_SCLS"
-        rlLogInfo "GCC=$GCC"
-
-        rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort"
-
-        # In case more than one devtoolset- or gcc-toolset -build package is
-        # installed (they can co-exist from the packaging persp, but their
-        # coexistence causes unexpected results with rpm macros), then we have
-        # a mess of defined rpm macros coming e.g. from
-        # /etc/rpm/macros.gcc-toolset-10-config
-        # /etc/rpm/macros.gcc-toolset-9-config etc.  To have just the needed
-        # macros (respective to given SCL under test) defined without
-        # uninstalling unneeded RPMs, we'll need an override mechanism. The
-        # following assumes just one SCL *enabled* (more than one installed),
-        # and doesn't care of a (useless) revert:
-        echo ${X_SCLS} | fgrep toolset && \
-            rlRun "cat /etc/rpm/*${X_SCLS%\ }* > ~/.rpmmacros"
-
-        rlAssertRpm $PACKAGE
-        rlRun "TMP=\$(mktemp -d)"
-        rlRun "pushd $TMP"
-
-	rlFetchSrcForInstalled $PACKAGE
-	rlRun "dnf builddep -y *src.rpm"
-	rlRun "rpm --define='_topdir $TMP' -Uvh *src.rpm"
-	rlRun "rpmbuild --define='_topdir $TMP' -bc SPECS/annobin.spec"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-	rlRun "pushd BUILD/annobin-*"
-	set -o pipefail
-	rlRun "make check |& tee $TMP/check.log"
-	rlRun -l "grep '^PASS:' $TMP/check.log" 0
-	rlRun -l "grep '^FAIL:' $TMP/check.log" 1
-	PASSCOUNT=$(grep '^PASS:' $TMP/check.log | wc -l)
-	rlRun "[[ $PASSCOUNT -ge 7 ]]"
-    rlPhaseEnd
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TMP"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf b/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf
deleted file mode 100644
index 9ece622..0000000
--- a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: Test for BZ#1973981 (annocheck silently ignores any file parameter)
-description: |
-    Bug summary: annocheck silently ignores any file parameter beyond 256
-    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=1973981
-contact: Martin Cermak <mcermak@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-require:
-- annobin-plugin-gcc
-- annobin-annocheck
-duration: 48h
-link:
--   relates: https://bugzilla.redhat.com/show_bug.cgi?id=1973981
-extra-summary: /tools/annobin/Sanity/annocheck-silently-ignores-any-file-parameter
-extra-task: /tools/annobin/Sanity/annocheck-silently-ignores-any-file-parameter
diff --git a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/runtest.sh b/tests/Sanity/annocheck-silently-ignores-any-file-parameter/runtest.sh
deleted file mode 100755
index bb1a436..0000000
--- a/tests/Sanity/annocheck-silently-ignores-any-file-parameter/runtest.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/annobin/Sanity/annocheck-silently-ignores-any-file-parameter
-#   Description: Test for BZ#1973981 (annocheck silently ignores any file parameter)
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2021 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlRun "TMP=$(mktemp -d)"
-        rlRun "pushd $TMP"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        for i in `seq 0 299`; do touch ${i}.sample; done
-        samplecnt=$(ls *.sample | wc -l)
-        testcnt=$(ls *.sample | \
-                  xargs annocheck |& \
-                  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
-
-    rlPhaseStartCleanup
-        rlRun "popd"
-        rlRun "rm -r $TMP"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Sanity/gcc-fedora-flags/hello.c b/tests/Sanity/gcc-fedora-flags/hello.c
deleted file mode 100644
index 51b259b..0000000
--- a/tests/Sanity/gcc-fedora-flags/hello.c
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <stdio.h>
-
-void hello() {
-  printf("Hello World\n");
-}
diff --git a/tests/Sanity/gcc-fedora-flags/hello.cpp b/tests/Sanity/gcc-fedora-flags/hello.cpp
deleted file mode 100644
index 400612b..0000000
--- a/tests/Sanity/gcc-fedora-flags/hello.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <iostream>
-
-void hello() {
-  std::cout << "Hello World\n";
-}
diff --git a/tests/Sanity/gcc-fedora-flags/main.c b/tests/Sanity/gcc-fedora-flags/main.c
deleted file mode 100644
index 1a3455d..0000000
--- a/tests/Sanity/gcc-fedora-flags/main.c
+++ /dev/null
@@ -1,6 +0,0 @@
-void hello();
-
-int main(int argc, char **argv) {
-  hello();
-  return 0;
-}
diff --git a/tests/Sanity/gcc-fedora-flags/main.cpp b/tests/Sanity/gcc-fedora-flags/main.cpp
deleted file mode 100644
index 1a3455d..0000000
--- a/tests/Sanity/gcc-fedora-flags/main.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-void hello();
-
-int main(int argc, char **argv) {
-  hello();
-  return 0;
-}
diff --git a/tests/Sanity/gcc-fedora-flags/main.fmf b/tests/Sanity/gcc-fedora-flags/main.fmf
deleted file mode 100644
index f053025..0000000
--- a/tests/Sanity/gcc-fedora-flags/main.fmf
+++ /dev/null
@@ -1,17 +0,0 @@
-summary: gcc-fedora-flags
-description: ''
-contact:
-- Tom Stellard <tstellar@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-recommend:
-- gcc
-- gcc-c++
-- annobin
-- annobin-annocheck
-- redhat-rpm-config
-duration: 1h
-extra-summary: /tools/annobin/Sanity/gcc-fedora-flags
-extra-task: /tools/annobin/Sanity/gcc-fedora-flags
diff --git a/tests/Sanity/gcc-fedora-flags/runtest.sh b/tests/Sanity/gcc-fedora-flags/runtest.sh
deleted file mode 100755
index 8ef829f..0000000
--- a/tests/Sanity/gcc-fedora-flags/runtest.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-set -x
-
-default_cflags=`rpm -E %{build_cflags}`
-default_cxxflags=`rpm -E %{build_cxxflags}`
-default_ldflags=`rpm -E %{build_ldflags}`
-
-cflags=`rpm -D '%toolchain gcc' -E %{build_cflags}`
-cxxflags=`rpm -D '%toolchain gcc' -E %{build_cxxflags}`
-ldflags=`rpm -D '%toolchain gcc' -E %{build_ldflags}`
-
-set +x
-
-rlJournalStart
-rlPhaseStartTest
-    rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort"
-
-    rlRun "test \"$default_cflags\" = \"$cflags\""
-    rlRun "test \"$default_cxxflags\" = \"$cxxflags\""
-    rlRun "test \"$default_ldflags\" = \"$ldflags\""
-
-    rlRun "gcc $cflags -o hello.o -c hello.c"
-    rlRun "annocheck hello.o"
-    rlRun "gcc $cflags -o main.o -c main.c"
-    rlRun "gcc $ldflags -o hello main.o hello.o"
-    rlRun "annocheck hello"
-    rlRun "./hello | grep \"Hello World\""
-
-    rlRun "g++ $cxxflags -o hello-cpp.o -c hello.cpp"
-    rlRun "annocheck hello-cpp.o"
-    rlRun "g++ $cxxflags -o main-cpp.o -c main.cpp"
-    rlRun "g++ $ldflags -o hello-cpp main-cpp.o hello-cpp.o"
-    rlRun "annocheck hello-cpp"
-    rlRun "./hello-cpp | grep \"Hello World\""
-rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd
diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf
deleted file mode 100644
index fca8ae4..0000000
--- a/tests/Sanity/smoke/main.fmf
+++ /dev/null
@@ -1,16 +0,0 @@
-summary: smoke test for annobin plugin
-description: ''
-contact:
-- Martin Cermak <mcermak@redhat.com>
-component:
-- annobin
-test: ./runtest.sh
-framework: beakerlib
-require:
-- annobin-plugin-gcc
-- annobin-annocheck
-- man-db
-- gcc
-duration: 48h
-extra-summary: /tools/annobin/Sanity/smoke
-extra-task: /tools/annobin/Sanity/smoke
diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh
deleted file mode 100755
index 566e571..0000000
--- a/tests/Sanity/smoke/runtest.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/bash
-# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   runtest.sh of /tools/annobin/Sanity/smoke
-#   Description: smoke test for annobin plugin
-#   Author: Martin Cermak <mcermak@redhat.com>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#   Copyright (c) 2019 Red Hat, Inc.
-#
-#   This program is free software: you can redistribute it and/or
-#   modify it under the terms of the GNU General Public License as
-#   published by the Free Software Foundation, either version 2 of
-#   the License, or (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be
-#   useful, but WITHOUT ANY WARRANTY; without even the implied
-#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#   PURPOSE.  See the GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program. If not, see http://www.gnu.org/licenses/.
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# Include Beaker environment
-. /usr/share/beakerlib/beakerlib.sh || exit 1
-
-PACKAGE="annobin"
-
-rlJournalStart
-    rlPhaseStartSetup
-        rlRun "which gcc"
-        rlRun "man -w annobin"
-        rlRun "echo $X_SCLS"
-    rlPhaseEnd
-
-    rlPhaseStartTest
-        rlRun "rpm -qa | fgrep -e redhat-rpm-config -e gcc -e annobin -e binutils | sort"
-        rlRun "echo 'int main() {return 0;}' | gcc -xc -fplugin=annobin -o /dev/null -"
-    rlPhaseEnd
-rlJournalPrintText
-rlJournalEnd

From 201159979b2829cd6daac2e96aeee09ee1f7f8b2 Mon Sep 17 00:00:00 2001
From: Yara Ahmad <yahmad@redhat.com>
Date: Tue, 1 Aug 2023 11:30:22 +0200
Subject: [PATCH 4/4] - Annocheck: Add test for FIPS compliant GO binaries. -
 Annocheck: Fix double free.  (#2226749) - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - Spec File: migrated
 to SPDX license.  (#2222112)

---
 annobin.spec | 12 +++++++++---
 sources      |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/annobin.spec b/annobin.spec
index ca9cbe1..8820cd9 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,9 +1,9 @@
 
 Name:    annobin
 Summary: Annotate and examine compiled binary files
-Version: 12.20
-Release: 2%{?dist}
-License: GPL-3.0-or-later
+Version: 12.23
+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/
 # Maintainer: nickc@redhat.com
 # Web Page: https://sourceware.org/annobin/
@@ -522,6 +522,12 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Tue Aug 01 2023 Yara Ahmad <yahmad@redhat.com> - 12.23-1
+- Annocheck: Add test for FIPS compliant GO binaries.
+- Annocheck: Fix double free.  (#2226749)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+- Spec File: migrated to SPDX license.  (#2222112)
+
 * Tue Jul 18 2023 Yara Ahmad <yahmad@redhat.com> - 12.20-2
 - Spec File: Change License field to use SPDX notation.  (#2222112)
 - Annocheck: Ignore AArch64 $x and $d symbols.  (#2221192)
diff --git a/sources b/sources
index 876a6b9..4d50c2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-12.20.tar.xz) = cb7ff25b872a0840c4ac21f25217bbe5bd1fd13257097d2a11d8e92a696a5629580f3de99d6e973fbe33a8510aa94aa967f0f557ca3b57a4ea25f9ce35efe17b
+SHA512 (annobin-12.23.tar.xz) = 6716d5525d77b39bce0f05158753e6badb8c27529f71d4f65d511ea6430dcd3e2efe88b711c7eebd8b840c2cbcfeed6877393a39f75f473812b99d6c2d927968