From 491a0e733e7d8fe5f393c1846b247c214c8101e1 Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
Date: Tue, 14 Jun 2022 17:03:49 +0200
Subject: [PATCH] Fix annobin flags (#2016349)

---
 libgcrypt-1.10.1-annobin.patch | 22 ++++++++++++++++++++++
 libgcrypt.spec                 |  4 ++++
 2 files changed, 26 insertions(+)
 create mode 100644 libgcrypt-1.10.1-annobin.patch

diff --git a/libgcrypt-1.10.1-annobin.patch b/libgcrypt-1.10.1-annobin.patch
new file mode 100644
index 0000000..c333c4e
--- /dev/null
+++ b/libgcrypt-1.10.1-annobin.patch
@@ -0,0 +1,22 @@
+diff -rup libgcrypt.orig/src/Makefile.am libgcrypt-1.8.3/src/Makefile.am
+--- libgcrypt.orig/src/Makefile.am	2021-10-18 16:36:20.914025497 +0100
++++ libgcrypt-1.8.3/src/Makefile.am	2021-10-19 12:23:08.652960618 +0100
+@@ -108,6 +108,7 @@ endif !HAVE_W32_SYSTEM
+ 
+ 
+ libgcrypt_la_LDFLAGS = $(no_undefined) $(export_symbols) $(extra_ltoptions) \
++	-Wc,-fplugin=annobin \
+ 	$(libgcrypt_version_script_cmd) -version-info \
+ 	@LIBGCRYPT_LT_CURRENT@:@LIBGCRYPT_LT_REVISION@:@LIBGCRYPT_LT_AGE@
+ libgcrypt_la_DEPENDENCIES = \
+Only in libgcrypt-1.8.3/src: Makefile.am.annobin
+diff -rup libgcrypt.orig/src/Makefile.in libgcrypt-1.8.3/src/Makefile.in
+--- libgcrypt.orig/src/Makefile.in	2021-10-18 16:36:20.914025497 +0100
++++ libgcrypt-1.8.3/src/Makefile.in	2021-10-19 12:23:37.791875325 +0100
+@@ -483,6 +483,7 @@ gcrypt_hwf_modules = @GCRYPT_HWF_MODULES
+ @HAVE_W32_SYSTEM_TRUE@gcrypt_deps = $(gcrypt_res) libgcrypt.def
+ @HAVE_W32_SYSTEM_FALSE@gcrypt_res_ldflag = 
+ libgcrypt_la_LDFLAGS = $(no_undefined) $(export_symbols) $(extra_ltoptions) \
++	-Wc,-fplugin=annobin \
+ 	$(libgcrypt_version_script_cmd) -version-info \
+ 	@LIBGCRYPT_LT_CURRENT@:@LIBGCRYPT_LT_REVISION@:@LIBGCRYPT_LT_AGE@
diff --git a/libgcrypt.spec b/libgcrypt.spec
index 5ed4f4c..cd321d7 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -23,7 +23,10 @@ URL: https://www.gnupg.org/
 Source0: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2
 Source1: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2.sig
 Source2: wk@g10code.com
+# brainpool curves are still not allowed to be shipped in Fedora
 Patch1: libgcrypt-1.10.0-disable-brainpool.patch
+# Pass the annobin flags to the libgcrypt.so (#2016349)
+Patch2: libgcrypt-1.10.1-annobin.patch
 
 %global gcrylibdir %{_libdir}
 %global gcrysoname libgcrypt.so.20
@@ -60,6 +63,7 @@ applications using libgcrypt.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 
 %build
 # This package has a configure test which uses ASMs, but does not link the