From ffec47260adb74efefbd294f5ad0aae30a665619d17c86fd0406030ef37558f8 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 22 Feb 2017 12:50:20 +0000
Subject: [PATCH] Accepting request 459188 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/459188
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnutls?expand=0&rev=97
---
 gnutls-3.5.8.tar.xz          |   3 --
 gnutls-3.5.8.tar.xz.sig      | Bin 287 -> 0 bytes
 gnutls-3.5.9-pkgconfig.patch |  53 +++++++++++++++++++++++++++++++++++
 gnutls-3.5.9.tar.xz          |   3 ++
 gnutls-3.5.9.tar.xz.sig      | Bin 0 -> 310 bytes
 gnutls.changes               |  15 ++++++++++
 gnutls.spec                  |   6 ++--
 7 files changed, 75 insertions(+), 5 deletions(-)
 delete mode 100644 gnutls-3.5.8.tar.xz
 delete mode 100644 gnutls-3.5.8.tar.xz.sig
 create mode 100644 gnutls-3.5.9-pkgconfig.patch
 create mode 100644 gnutls-3.5.9.tar.xz
 create mode 100644 gnutls-3.5.9.tar.xz.sig

diff --git a/gnutls-3.5.8.tar.xz b/gnutls-3.5.8.tar.xz
deleted file mode 100644
index 4b7c9c6..0000000
--- a/gnutls-3.5.8.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff
-size 7264448
diff --git a/gnutls-3.5.8.tar.xz.sig b/gnutls-3.5.8.tar.xz.sig
deleted file mode 100644
index 1b78e439dd46a0c9f6f44865ac7f24eb282e4fff80aedecb9efe831b8ff26fb0..0000000000000000000000000000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 287
zcmV+)0pR|L0UQJX0SEvF1p-)eL}vgB2@suLs`ii*xI#mk2mpaMah~7aFfeU@6`j<H
zr5U?n1SyQ|9F~HSU7{`SVvnFyY46<yz(9R=JxYw-qx8gP2rDeC!#fewBF~QV2P}#l
z!XBfp#rgJ0*S`Ax$?T=fetIqs*^I~E{wVjP&Nal|ZxNT8VSYN^re(D~2d>EGLr4hC
z8+?<CR2W%)-fm;Yfz+%kTf87mZ5n}|=e_#vQy)(H4&s<|9*@EL^0Wc!){A5PezYGc
z|6HN1G5$FhabmYFvXzY=_H|41GZ#p)x4C~FwX-3?Q7*FpEqjUy_NbeT*#U<W;@9AM
l9bSmyjt2<l8kDP%J1_97cajNj3~@_3V#r}}2Wic_Uq~>si5ma_

diff --git a/gnutls-3.5.9-pkgconfig.patch b/gnutls-3.5.9-pkgconfig.patch
new file mode 100644
index 0000000..abbd4a5
--- /dev/null
+++ b/gnutls-3.5.9-pkgconfig.patch
@@ -0,0 +1,53 @@
+From 35c6a78f3b24bf4192e3f01ee6322b42b6fc27fb Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+Date: Wed, 15 Feb 2017 18:42:22 +0100
+Subject: [PATCH] gnutls.pc: do not include libidn2 in Requires.private
+
+The libidn2 versions available do not include libidn2.pc,
+thus the inclusion was causing problems when using pkg-config.
+Instead we include -lidn2 in Libs.private.
+
+Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
+---
+ configure.ac     | 12 +++++++-----
+ lib/gnutls.pc.in |  2 +-
+ 2 files changed, 8 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6907b215f..4cad4fa3a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -492,11 +492,13 @@ if test "$try_libidn" = yes;then
+       idna_support="IDNA 2008 (libidn2)"
+       AC_DEFINE([HAVE_LIBIDN2], 1, [Define if IDNA 2008 support is enabled.])
+       AC_SUBST([LIBIDN_LIBS], [-lidn2])
+-      if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
+-        GNUTLS_REQUIRES_PRIVATE="Requires.private: libidn2"
+-      else
+-        GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libidn2"
+-      fi
++      AC_SUBST([LIBIDN2_LIBS], [-lidn2]) dnl used in gnutls.pc.in
++dnl enable once libidn2.pc is widespread; and remove LIBIDN2_LIBS from gnutls.pc.in (Libs.private)
++dnl      if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
++dnl        GNUTLS_REQUIRES_PRIVATE="Requires.private: libidn2"
++dnl      else
++dnl        GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libidn2"
++dnl      fi
+     ],[
+       with_libidn2=no;
+       AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support)
+diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
+index 441b45db0..c03757928 100644
+--- a/lib/gnutls.pc.in
++++ b/lib/gnutls.pc.in
+@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
+ URL: http://www.gnutls.org/
+ Version: @VERSION@
+ Libs: -L${libdir} -lgnutls
+-Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@
++Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@ @LIBIDN2_LIBS@
+ @GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
+-- 
+2.11.1
+
diff --git a/gnutls-3.5.9.tar.xz b/gnutls-3.5.9.tar.xz
new file mode 100644
index 0000000..14aebef
--- /dev/null
+++ b/gnutls-3.5.9.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951
+size 7166932
diff --git a/gnutls-3.5.9.tar.xz.sig b/gnutls-3.5.9.tar.xz.sig
new file mode 100644
index 0000000000000000000000000000000000000000000000000000000000000000..dfb02626cfcde041d9299594e552b819da4331252371b69c9f08024582a5dc67
GIT binary patch
literal 310
zcmV-60m=S}0W$;u0SEvc79j+v63hMk+)WGTppz1vUaIzx6SzVJ0$89lQveDH5S?DC
z_K*{}LSu*r{0Q2FA^f>%v`Q+{!o_;JZMVfXHej35GotG_2RS=i$YM)l40lWmi-S69
zblRF$YoiC1WCCif4g9^_p-<zm1~o11?ugy8uU$OTPL&i2uVxH!%kam{;J{_yw#wt)
z9&Jgu%$oM3_{DM0-w$57XgV7_+&G6Cw=tz<E0<H~IPg@jaYKt(P)F;#Cq=L=U6no7
zM?X$|ym9qzO#)6j84Mpj2s&bZ>IO7&NbwXcW`Tt~#J%vFr-;`OT`C4Fvapi`OqTXL
zNq9<u#P!DlrE1-~ypEZ)A+e^!gr!h}Zh@9gmj(1(7E&^BP3U#fyycT!T#Gmjv1;3&
I4c4pdboGCcHvj+t

literal 0
HcmV?d00001

diff --git a/gnutls.changes b/gnutls.changes
index d13e020..6b6031a 100644
--- a/gnutls.changes
+++ b/gnutls.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Feb 20 09:52:38 UTC 2017 - astieger@suse.com
+
+- GnuTLS 3.5.9:
+  * libgnutls: OpenPGP references removed, functionality deprecated
+  * libgnutls: Improve detection of AVX support
+  * libgnutls: Add support for IDNA2008 with libidn2 FATE#321897
+  * p11tool: re-use ID from corresponding objects when writing
+    certificates.
+  * API and ABI modifications:
+    gnutls_idna_map: Added
+    gnutls_idna_reverse_map: Added
+- prevent pkgconfig issues due to libidn2 when building with GnuTLS
+  add gnutls-3.5.9-pkgconfig.patch
+
 -------------------------------------------------------------------
 Mon Jan  9 10:07:19 UTC 2017 - meissner@suse.com
 
diff --git a/gnutls.spec b/gnutls.spec
index 7086447..00072a8 100644
--- a/gnutls.spec
+++ b/gnutls.spec
@@ -29,7 +29,7 @@
 %define gnutls_dane_sover 0
 %endif
 Name:           gnutls
-Version:        3.5.8
+Version:        3.5.9
 Release:        0
 Summary:        The GNU Transport Layer Security Library
 License:        LGPL-2.1+ and GPL-3.0+
@@ -40,12 +40,13 @@ Source0:        ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/%{name}-%{version}.tar.x
 Source1:        ftp://ftp.gnutls.org/gcrypt/gnutls/v3.5/%{name}-%{version}.tar.xz.sig
 Source2:        %{name}.keyring
 Source3:        baselibs.conf
+Patch0:         gnutls-3.5.9-pkgconfig.patch
 BuildRequires:  autogen
 BuildRequires:  automake
 BuildRequires:  datefudge
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  libidn-devel
+BuildRequires:  libidn2-devel
 BuildRequires:  libnettle-devel >= 3.1
 BuildRequires:  libtasn1-devel >= 4.9
 BuildRequires:  libtool
@@ -197,6 +198,7 @@ GnuTLS Wrappers for GNU Guile - dialect of scheme.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 export LDFLAGS="-pie"