# HG changeset patch
# User John Donoghue
# Date 1559570208 14400
# Node ID 62c18116dcb746240c670d9a581def047108aba2
# Parent  46d475763018722c45c7502448c6b983067bd343
gnutls: update to v3.6.8

* src/gnutls-1-fixes.patch: update patch from mxe.cc

* changed src/gnutls.mk: update version/checksum

diff -r 46d475763018 -r 62c18116dcb7 src/gnutls-1-fixes.patch
--- a/src/gnutls-1-fixes.patch	Mon Jun 03 09:29:37 2019 -0400
+++ b/src/gnutls-1-fixes.patch	Mon Jun 03 09:56:48 2019 -0400
@@ -13,11 +13,11 @@
 --- 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/
+ URL: https://www.gnutls.org/
  Version: @VERSION@
  Libs: -L${libdir} -lgnutls
--Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@
-+Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ -lcrypt32
+-Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@
++Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ -lcrypt32
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
 
@@ -30,25 +30,25 @@
 
 Signed-off-by: Mark Brand <mabrand@mabrand.nl>
 
-taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html
+taken from: https://lists.gnupg.org/pipermail/gnutls-devel/2014-November/007250.html
 
 diff --git a/lib/x509/ip.c b/lib/x509/ip.c
 index 1111111..2222222 100644
 --- a/lib/x509/ip.c
 +++ b/lib/x509/ip.c
-@@ -26,7 +26,11 @@
+@@ -24,7 +24,11 @@
+ #include "gnutls_int.h"
+ #include "ip.h"
  #include <gnutls/x509.h>
- 
- #ifdef HAVE_INET_NTOP
--# include <arpa/inet.h>
-+# ifdef _WIN32
-+#  include <ws2tcpip.h>
-+# else
-+#  include <arpa/inet.h>
-+# endif
- #endif
+-#include <arpa/inet.h>
++#ifdef _WIN32
++# include <ws2tcpip.h>
++#else
++# include <arpa/inet.h>
++#endif
  
  /*-
+  * _gnutls_mask_to_prefix:
 
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
@@ -60,11 +60,12 @@
 index 1111111..2222222 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -509,24 +509,19 @@ idna_support=no
+@@ -511,26 +511,19 @@ idna_support=no
  with_libidn2=no
  
  if test "$try_libidn2" = yes;then
--  AC_SEARCH_LIBS(idn2_lookup_u8, idn2, [
+-    save_LIBS=$LIBS
+-    AC_SEARCH_LIBS(idn2_lookup_u8, idn2, [
 -      with_libidn2=yes;
 -      idna_support="IDNA 2008 (libidn2)"
 -      AC_DEFINE([HAVE_LIBIDN2], 1, [Define if IDNA 2008 support is enabled.])
@@ -80,8 +81,9 @@
 -      with_libidn2=no;
 -      AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support)
 -    ])
+-    LIBS=$save_LIBS
 -else
--    with_libidn2=no
+-  with_libidn2=no
 +  PKG_CHECK_MODULES(LIBIDN2, libidn2, [with_libidn2=yes], [with_libidn2=no])
 +  if test "$with_libidn2" != "no";then
 +    idna_support="IDNA 2008 (libidn2)"
@@ -103,11 +105,11 @@
 --- 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/
+ URL: https://www.gnutls.org/
  Version: @VERSION@
  Libs: -L${libdir} -lgnutls
--Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ -lcrypt32
-+Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ -lcrypt32
+-Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ -lcrypt32
++Libs.private: @LIBINTL@ @LIBSOCKET@ @INET_PTON_LIB@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ -lcrypt32
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
 
@@ -121,7 +123,7 @@
 index 1111111..2222222 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -947,18 +947,6 @@ AC_SUBST([YEAR], $YEAR)
+@@ -946,17 +946,6 @@ AC_SUBST([YEAR], $YEAR)
  AC_CONFIG_FILES([guile/pre-inst-guile], [chmod +x guile/pre-inst-guile])
  AC_CONFIG_FILES([
    Makefile
@@ -129,7 +131,6 @@
 -  doc/credentials/Makefile
 -  doc/credentials/srp/Makefile
 -  doc/credentials/x509/Makefile
--  doc/cyclo/Makefile
 -  doc/doxygen/Doxyfile
 -  doc/examples/Makefile
 -  doc/latex/Makefile
diff -r 46d475763018 -r 62c18116dcb7 src/gnutls.mk
--- a/src/gnutls.mk	Mon Jun 03 09:29:37 2019 -0400
+++ b/src/gnutls.mk	Mon Jun 03 09:56:48 2019 -0400
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := gnutls
-$(PKG)_VERSION  := 3.6.6
-$(PKG)_CHECKSUM := d094f3c554b40d76dac2d2d75a8a141c008dc6c4
+$(PKG)_VERSION  := 3.6.8
+$(PKG)_CHECKSUM := e1243188791af409bca118d31faf3ec3d5f0a5ab
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/$($(PKG)_FILE)