From 03aecabbfbc6bf44d5809bffb4dca9bc641e3071 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 24 Jun 2019 14:22:11 +0100
Subject: [PATCH] Another attempt at fixing the detection and reporting of
 missing -D_FORTIFY_SOURCE options.

---
 .gitignore   |  1 +
 annobin.spec | 41 +++++++++++++++++++++++++----------------
 sources      |  2 +-
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index fde01e6..c3c88dc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,4 @@
 /annobin-8.73.tar.xz
 /annobin-8.74.tar.xz
 /annobin-8.76.tar.xz
+/annobin-8.77.tar.xz
diff --git a/annobin.spec b/annobin.spec
index 12cc8d9..625e27c 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -1,8 +1,14 @@
 
-# Suppress this for BZ 1630550.
-# The problem should now only arise when rebasing to a new major version
-# of gcc, in which case the undefine below can be temporarily reinstated.
-#
+Name:    annobin
+Summary: Binary annotation plugin for GCC
+Version: 8.77
+Release: 1%{?dist}
+
+License: GPLv3+
+URL:     https://fedoraproject.org/wiki/Toolchain/Watermark
+# Maintainer: nickc@redhat.com
+
+
 # # Do not build the annobin plugin with annotation enabled.
 # # 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.
@@ -11,16 +17,13 @@
 # # version, the old plugin will complain that version of gcc for which it
 # # was built is different from the version of gcc that is now being used, and
 # # then it will abort.
+#
+# Suppress this for BZ 1630550.
+# The problem should now only arise when rebasing to a new major version
+# of gcc, in which case the undefine below can be temporarily reinstated.
+#
 # %%undefine _annotated_build
 
-Name:    annobin
-Summary: Binary annotation plugin for GCC
-Version: 8.76
-Release: 3%{?dist}
-
-License: GPLv3+
-URL:     https://fedoraproject.org/wiki/Toolchain/Watermark
-
 # Use "--without tests" to disable the testsuite.  The default is to run them.
 %bcond_without tests
 
@@ -29,7 +32,7 @@ URL:     https://fedoraproject.org/wiki/Toolchain/Watermark
 
 # Set this to zero to disable the requirement for a specific version of gcc.
 # This should only be needed if there is some kind of problem with the version
-# checking logic.
+# checking logic or when building on RHEL-7 or earlier.
 %global with_hard_gcc_version_requirement 1
 
 #---------------------------------------------------------------------------------
@@ -97,8 +100,7 @@ BuildRequires: gcc gcc-plugin-devel gcc-c++
 
 %description
 Provides a plugin for GCC that records extra information in the files
-that it compiles and a set of scripts that can analyze the recorded
-information.
+that it compiles.
 
 Note - the plugin is automatically enabled in gcc builds via flags
 provided by the redhat-rpm-macros package.
@@ -167,7 +169,10 @@ touch doc/annobin.info
 # that it should be OK.
 cp plugin/.libs/annobin.so.0.0.0 %{_tmppath}/tmp_annobin.so
 make -C plugin clean
-make -C plugin CXXFLAGS="%{optflags} -fplugin=%{_tmppath}/tmp_annobin.so -fplugin-arg-tmp_annobin-rename"
+BUILD_FLAGS="-fplugin=%{_tmppath}/tmp_annobin.so -fplugin-arg-tmp_annobin-rename"
+# If building on RHEL7, enable the next option as the .attach_to_group assembler pseudo op is not available in the assembler.
+# BUILD_FLAGS="$BUILD_FLAGS -fplugin-arg-tmp_annobin-no-attach"
+make -C plugin CXXFLAGS="%{optflags} $BUILD_FLAGS"
 rm %{_tmppath}/tmp_annobin.so
 
 #---------------------------------------------------------------------------------
@@ -180,6 +185,7 @@ rm %{_tmppath}/tmp_annobin.so
 
 %if %{with tests}
 %check
+# On RHEL7 the assembler does not support all of the annobin tests.
 make check
 if [ -f tests/test-suite.log ]; then
     cat tests/test-suite.log
@@ -214,6 +220,9 @@ fi
 #---------------------------------------------------------------------------------
 
 %changelog
+* Mon Jun 24 2019 Nick Clifton <nickc@redhat.com> - 8.77-1
+- Another attempt at fixing the detection and reporting of missing -D_FORTIFY_SOURCE options.  (#1703500)
+
 * Mon Jun 10 15:42:00 CET 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 8.76-3
 - Rebuild for RPM 4.15
 
diff --git a/sources b/sources
index b0e73ee..d26a196 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-8.76.tar.xz) = f645258802d1d2a41cea2a41d62f382b9638bcfc2dc136d7204ebeb087a5624e199b780b8faf08447fa3686372fdd783c095cafff29b5fce6c18aed64eb53d56
+SHA512 (annobin-8.77.tar.xz) = d9d393aa359ab58a24d295dd4108b0255e39cf9210ec99125ce3f3589adff795aba50234817b38134964caa2fc92cf04d6c6e2945ae6cc2e1145033383cc58cb