From e295d5946ac0a821731105befb1f14fa688aea39cefb72b93493753a6aa88447 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 17 Jul 2020 11:26:29 +0000
Subject: [PATCH] Accepting request 821490 from
 home:vitezslav_cizek:branches:security:tls

- Correctly detect gmp, nettle, and hogweed libraries (bsc#1172666)
  * add gnutls-detect_nettle_so.patch

  * add gnutls-temporarily_disable_broken_guile_reauth_test.patch

OBS-URL: https://build.opensuse.org/request/show/821490
OBS-URL: https://build.opensuse.org/package/show/security:tls/gnutls?expand=0&rev=37
---
 gnutls-detect_nettle_so.patch                 | 52 +++++++++++++++++++
 ...ily_disable_broken_guile_reauth_test.patch |  0
 gnutls.changes                                |  8 ++-
 gnutls.spec                                   |  3 +-
 4 files changed, 61 insertions(+), 2 deletions(-)
 create mode 100644 gnutls-detect_nettle_so.patch
 rename gnutls-temporarily_disable_broken_guile_reauth_test => gnutls-temporarily_disable_broken_guile_reauth_test.patch (100%)

diff --git a/gnutls-detect_nettle_so.patch b/gnutls-detect_nettle_so.patch
new file mode 100644
index 0000000..c766b03
--- /dev/null
+++ b/gnutls-detect_nettle_so.patch
@@ -0,0 +1,52 @@
+Index: gnutls-3.6.14/configure
+===================================================================
+--- gnutls-3.6.14.orig/configure	2020-06-09 11:01:15.306654318 +0200
++++ gnutls-3.6.14/configure	2020-06-09 12:40:08.262985909 +0200
+@@ -66054,12 +66054,12 @@ LIBS="$LIBS $GMP_LIBS"
+ $as_echo_n "checking gmp soname... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++#include <gmp.h>
+ int
+ main ()
+ {
+-
+-  ;
++  mpz_t n;
++  mpz_init(n);
+   return 0;
+ }
+ _ACEOF
+@@ -66088,12 +66088,12 @@ LIBS="$LIBS $NETTLE_LIBS"
+ $as_echo_n "checking nettle soname... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++#include <nettle/sha2.h>
+ int
+ main ()
+ {
+-
+-  ;
++  struct sha256_ctx ctx;
++  sha256_init (&ctx);
+   return 0;
+ }
+ _ACEOF
+@@ -66122,12 +66122,12 @@ LIBS="$LIBS $HOGWEED_LIBS"
+ $as_echo_n "checking hogweed soname... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-
++#include <nettle/rsa.h>
+ int
+ main ()
+ {
+-
+-  ;
++  struct rsa_private_key priv;
++  nettle_rsa_private_key_init(&priv);
+   return 0;
+ }
+ _ACEOF
diff --git a/gnutls-temporarily_disable_broken_guile_reauth_test b/gnutls-temporarily_disable_broken_guile_reauth_test.patch
similarity index 100%
rename from gnutls-temporarily_disable_broken_guile_reauth_test
rename to gnutls-temporarily_disable_broken_guile_reauth_test.patch
diff --git a/gnutls.changes b/gnutls.changes
index b87857e..8973036 100644
--- a/gnutls.changes
+++ b/gnutls.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jun  9 09:15:45 UTC 2020 - Vítězslav Čížek <vcizek@suse.com>
+
+- Correctly detect gmp, nettle, and hogweed libraries (bsc#1172666)
+  * add gnutls-detect_nettle_so.patch
+
 -------------------------------------------------------------------
 Mon Jun  8 15:41:46 UTC 2020 - Vítězslav Čížek <vcizek@suse.com>
 
@@ -5,7 +11,7 @@ Mon Jun  8 15:41:46 UTC 2020 - Vítězslav Čížek <vcizek@suse.com>
   servers (bsc#1172663)
   * add 0001-crypto-api-always-allocate-memory-when-serializing-i.patch
 - Temporarily disable broken guile reauth test (bsc#1171565)
-  * add gnutls-temporarily_disable_broken_guile_reauth_test
+  * add gnutls-temporarily_disable_broken_guile_reauth_test.patch
 
 -------------------------------------------------------------------
 Thu Jun  4 09:39:58 UTC 2020 - Vítězslav Čížek <vcizek@suse.com>
diff --git a/gnutls.spec b/gnutls.spec
index 4f4389e..abff270 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -41,7 +41,8 @@ Source3:        baselibs.conf
 Patch1:         gnutls-3.5.11-skip-trust-store-tests.patch
 Patch4:         gnutls-3.6.6-set_guile_site_dir.patch
 Patch5:         0001-crypto-api-always-allocate-memory-when-serializing-i.patch
-Patch6:         gnutls-temporarily_disable_broken_guile_reauth_test
+Patch6:         gnutls-temporarily_disable_broken_guile_reauth_test.patch
+Patch7:         gnutls-detect_nettle_so.patch
 BuildRequires:  autogen
 BuildRequires:  automake
 BuildRequires:  datefudge