From 1a9432d76e2dffc9c3ae7966cce50b2d5b76a6c3 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 26 Nov 2018 14:17:58 +0000
Subject: [PATCH] Annocheck: Add test for ENDBR instruction at entry address of
 x86/x86_64 executables.  (#1652925)

---
 .gitignore   |  1 +
 annobin.spec | 24 ++++++++++++++----------
 sources      |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ca2ca8..1289a2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,4 @@
 /annobin-8.59.tar.xz
 /annobin-8.60.tar.xz
 /annobin-8.61.tar.xz
+/annobin-8.62.tar.xz
diff --git a/annobin.spec b/annobin.spec
index 5777fc8..c27ee1e 100644
--- a/annobin.spec
+++ b/annobin.spec
@@ -15,7 +15,7 @@
 
 Name:    annobin
 Summary: Binary annotation plugin for GCC
-Version: 8.61
+Version: 8.62
 Release: 1%{?dist}
 
 License: GPLv3+
@@ -114,16 +114,8 @@ hardening options.
 # we can scrape out the "4.6.1" from the version line.
 #
 # The following implements the above:
-#
-# Note - gawk will emit a warning message saying:
-#
-#  gawk: cmd. line:1: warning: escape sequence `\)' treated as plain `)'
-#
-# I have not been able to work out how to remove this message, but still provide
-# sufficient escaping for the command line to survive intact as it is passed
-# down through the sub-shell.
 
-%global gcc_vr %(gcc --version | gawk 'match (\$0, ".*Red Hat \([^\\)-]*\)", a) { print a[1]; }')
+%global gcc_vr %(gcc --version | head -n 1 | sed -e 's|.*(Red\ Hat\ ||g' | sed -e 's|)$||g')
 
 # This is a gcc plugin, hence gcc is required.
 %if %{with_hard_gcc_version_requirement}
@@ -136,6 +128,12 @@ Requires: gcc
 #---------------------------------------------------------------------------------
 
 %prep
+
+if [ -z "%{gcc_vr}" ]; then
+    echo "*** Missing gcc_vr spec file macro, cannot continue." >&2
+    exit 1
+fi
+
 %autosetup -p1
 
 # The plugin has to be configured with the same arcane configure
@@ -202,6 +200,12 @@ make check
 #---------------------------------------------------------------------------------
 
 %changelog
+* Mon Nov 26 2018 Nick Clifton <nickc@redhat.com> - 8.62-1
+- Annocheck: Add test for ENDBR instruction at entry address of x86/x86_64 executables.  (#1652925)
+
+* Tue Nov 20 2018 David Cantrell <dcantrell@redhat.com> - 8.61-2
+- Adjust how the gcc_vr macro is set.
+
 * Mon Nov 19 2018 Nick Clifton <nickc@redhat.com> - 8.61-1
 - Fix building with gcc version 4.
 
diff --git a/sources b/sources
index 0afb427..51f8709 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (annobin-8.61.tar.xz) = fe2b49b04b6a0783c245a2e73fa260a19aa3206fce592c03421bab78374b7eab965b901bbad6e1e122623242c9f7a756b3ce40e651d6359540b83cfcb39b7d98
+SHA512 (annobin-8.62.tar.xz) = bb925631b3730880191cbe50077ec57e4ee572e0a140e512281bb51356215303f679aacd94f212bb357a28b5adfd149b0c32af14ba7d05e1597c583e179a7d7f