contrib: gnutls: Update to gnutls 3.6.7.1
authorMartin Storsjö <martin@martin.st>
Tue, 16 Apr 2019 11:46:39 +0000 (14:46 +0300)
committerMartin Storsjö <martin@martin.st>
Tue, 16 Apr 2019 11:46:39 +0000 (14:46 +0300)
This was a stealth release to fix packaging issues (relevant for
building on windows) in the 3.6.7 tarball, see
https://lists.gnupg.org/pipermail/gnutls-help/2019-April/004506.html.

Remove the gnutls-winstore-ntop patch which conflicts with how
upstream now handles the inet_pton function.

contrib/src/gnutls/SHA512SUMS
contrib/src/gnutls/gnutls-winstore-ntop.patch [deleted file]
contrib/src/gnutls/rules.mak

index 4d9c793..4dc1221 100644 (file)
@@ -1 +1 @@
-ae9b8996eb9b7269d28213f0aca3a4a17890ba8d47e3dc3b8e754ab8e2b4251e9412aaaa161a8bf56167f04cc169b4cada46f55a7bde92b955eb36cd717a99f3  gnutls-3.6.7.tar.xz
+c3c4178c8663e3d1207aaf771ceb43e7e75a9f11b4ea3a26fde9d04a23762b05bac8fe290b74d63b815a354b79fc3557cfc218c196e1f80eb1fbce762948a926  gnutls-3.6.7.1.tar.xz
diff --git a/contrib/src/gnutls/gnutls-winstore-ntop.patch b/contrib/src/gnutls/gnutls-winstore-ntop.patch
deleted file mode 100644 (file)
index a6995ea..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
---- gnutls/lib/x509/ip.c.ntop_win32    2019-03-05 11:21:25.250954200 +0100
-+++ gnutls/lib/x509/ip.c       2019-03-05 11:21:31.651380300 +0100
-@@ -26,5 +26,7 @@
- #include <gnutls/x509.h>
-+#ifndef _WIN32
- #include <arpa/inet.h>
-+#endif
- /*-
-  * _gnutls_mask_to_prefix:
index 4ae15da..8e51012 100644 (file)
@@ -1,6 +1,6 @@
 # GnuTLS
 
-GNUTLS_VERSION := 3.6.7
+GNUTLS_VERSION := 3.6.7.1
 GNUTLS_URL := https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-$(GNUTLS_VERSION).tar.xz
 
 ifdef BUILD_NETWORK
@@ -17,12 +17,13 @@ $(TARBALLS)/gnutls-$(GNUTLS_VERSION).tar.xz:
 
 .sum-gnutls: gnutls-$(GNUTLS_VERSION).tar.xz
 
+# gnutls 3.6.7.1 unpacks into a dir named 3.6.7
+gnutls: UNPACK_DIR=gnutls-3.6.7
 gnutls: gnutls-$(GNUTLS_VERSION).tar.xz .sum-gnutls
        $(UNPACK)
        $(APPLY) $(SRC)/gnutls/gnutls-pkgconfig-static.patch
 ifdef HAVE_WIN32
        $(APPLY) $(SRC)/gnutls/gnutls-win32.patch
-       $(APPLY) $(SRC)/gnutls/gnutls-winstore-ntop.patch
 endif
 ifdef HAVE_ANDROID
        $(APPLY) $(SRC)/gnutls/no-create-time-h.patch