From 9c69e1900630c52d29f861b213a852cb2686a2bf Mon Sep 17 00:00:00 2001
From: fbrosson <fbrosson@users.noreply.github.com>
Date: Thu, 18 Jan 2018 14:19:17 +0000
Subject: [PATCH] gnutls: bump to 3.5.17, use libidn2, add debuginfo. (#2136)

---
 ...5-3.5.15.recipe => gnutls35-3.5.17.recipe} | 33 ++++++++++++++-----
 ...3.5.15.patchset => gnutls-3.5.17.patchset} |  0
 2 files changed, 25 insertions(+), 8 deletions(-)
 rename net-libs/gnutls/{gnutls35-3.5.15.recipe => gnutls35-3.5.17.recipe} (74%)
 rename net-libs/gnutls/patches/{gnutls-3.5.15.patchset => gnutls-3.5.17.patchset} (100%)

diff --git a/net-libs/gnutls/gnutls35-3.5.15.recipe b/net-libs/gnutls/gnutls35-3.5.17.recipe
similarity index 74%
rename from net-libs/gnutls/gnutls35-3.5.15.recipe
rename to net-libs/gnutls/gnutls35-3.5.17.recipe
index bd6f5317f..44998b561 100644
--- a/net-libs/gnutls/gnutls35-3.5.15.recipe
+++ b/net-libs/gnutls/gnutls35-3.5.17.recipe
@@ -6,24 +6,32 @@ communications protocols as well as APIs to parse and write X.509, PKCS #12, \
 OpenPGP and other required structures. It is aimed to be portable and \
 efficient with focus on security and interoperability."
 HOMEPAGE="https://www.gnutls.org/"
-COPYRIGHT="2000-2017 Free Software Fundation Inc.
+COPYRIGHT="2000-2018 Free Software Fundation Inc.
 	2004-2008 Simon Josefsson
 	2000-2004 Nikos Mavrogiannopoulos"
 LICENSE="GNU LGPL v2.1"
 REVISION="1"
 SOURCE_URI="ftp://ftp.gnutls.org/gcrypt/gnutls/v${portVersion%\.*}/gnutls-$portVersion.tar.xz"
-CHECKSUM_SHA256="046081108b8b1fe455a13a4c5a4eaa0368e185b678f1670fe09a11a2d7ecfad5"
+CHECKSUM_SHA256="86b142afef587c118d63f72ccf307f3321dbc40357aae528202b65d913d20919"
 SOURCE_DIR="gnutls-$portVersion"
 PATCHES="gnutls-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm ?ppc"
 SECONDARY_ARCHITECTURES="!x86_gcc2 x86"
 
+libgnutls_opensslVersion="27.0.2"
+libgnutlsVersion="30.14.9"
+libgnutlsxxVersion="28.1.0"
+
+libgnutls_opensslVersionCompat="$libgnutls_opensslVersion compat >= ${libgnutls_opensslVersion%%.*}"
+libgnutlsVersionCompat="$libgnutlsVersion compat >= ${libgnutlsVersion%%.*}"
+libgnutlsxxVersionCompat="$libgnutlsxxVersion compat >= ${libgnutlsxxVersion%%.*}"
+
 PROVIDES="
 	gnutls35$secondaryArchSuffix = $portVersion
-	lib:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	lib:libgnutls$secondaryArchSuffix = 30.14.7 compat >= 30
-	lib:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
+	lib:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat
+	lib:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat
+	lib:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -32,6 +40,7 @@ REQUIRES="
 	lib:libnettle$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libidn2$secondaryArchSuffix
 	lib:libtasn1$secondaryArchSuffix
 	lib:libunistring$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -59,6 +68,7 @@ REQUIRES_bin="
 	lib:libnettle$secondaryArchSuffix
 	lib:libgmp$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libidn2$secondaryArchSuffix
 	lib:libtasn1$secondaryArchSuffix
 	lib:libunistring$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
@@ -71,9 +81,9 @@ CONFLICTS_bin="
 
 PROVIDES_devel="
 	gnutls35${secondaryArchSuffix}_devel = $portVersion
-	devel:libgnutls_openssl$secondaryArchSuffix = 27.0.2 compat >= 27
-	devel:libgnutls$secondaryArchSuffix = 30.14.7 compat >= 30
-	devel:libgnutlsxx$secondaryArchSuffix = 28.1.0 compat >= 28
+	devel:libgnutls_openssl$secondaryArchSuffix = $libgnutls_opensslVersionCompat
+	devel:libgnutls$secondaryArchSuffix = $libgnutlsVersionCompat
+	devel:libgnutlsxx$secondaryArchSuffix = $libgnutlsxxVersionCompat
 	"
 REQUIRES_devel="
 	gnutls35$secondaryArchSuffix == $portVersion base
@@ -96,6 +106,7 @@ BUILD_REQUIRES="
 	devel:libnettle$secondaryArchSuffix
 	devel:libgmp$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libidn2$secondaryArchSuffix
 	devel:libtasn1$secondaryArchSuffix
 	devel:libunistring$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
@@ -116,6 +127,11 @@ BUILD_PREREQUIRES="
 	cmd:pkg_config$secondaryArchSuffix
 	"
 
+defineDebugInfoPackage gnutls35$secondaryArchSuffix \
+	$libDir/libgnutls-openssl.so.$libgnutls_opensslVersion \
+	$libDir/libgnutls.so.$libgnutlsVersion \
+	$libDir/libgnutlsxx.so.$libgnutlsxxVersion
+
 BUILD()
 {
 	runConfigure ./configure --without-p11-kit --disable-nls \
@@ -127,6 +143,7 @@ INSTALL()
 {
 	make install
 
+	rm -f $infoDir/dir
 	rm -f $libDir/libgnutls*.la
 
 	prepareInstalledDevelLibs libgnutls-openssl libgnutls libgnutlsxx
diff --git a/net-libs/gnutls/patches/gnutls-3.5.15.patchset b/net-libs/gnutls/patches/gnutls-3.5.17.patchset
similarity index 100%
rename from net-libs/gnutls/patches/gnutls-3.5.15.patchset
rename to net-libs/gnutls/patches/gnutls-3.5.17.patchset