summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2017-03-09 12:31:09 (GMT)
committerMark Brand <mabrand@mabrand.nl>2017-03-09 13:49:34 (GMT)
commitce792e28b8551651911a830d9f4829b456e1e242 (patch)
tree6c2afb63ad46099c79242bcac1c5f73ed020ec6a
parent700f5c841fc1aa2b7bc15c317fd8f13c7e491e74 (diff)
downloadmxe-ce792e28b8551651911a830d9f4829b456e1e242.zip
mxe-ce792e28b8551651911a830d9f4829b456e1e242.tar.gz
mxe-ce792e28b8551651911a830d9f4829b456e1e242.tar.bz2
update gnutls
-rw-r--r--src/gnutls-1-fixes.patch10
-rw-r--r--src/gnutls.mk4
2 files changed, 7 insertions, 7 deletions
diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch
index 17c0164..e115070 100644
--- a/src/gnutls-1-fixes.patch
+++ b/src/gnutls-1-fixes.patch
@@ -1,28 +1,28 @@
This file is part of MXE. See LICENSE.md for licensing information.
-From 7b62567c0820dd34afc177502638c702177dac39 Mon Sep 17 00:00:00 2001
+From 3f039a0fed396f006a82ff66b30879450f7942c8 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 4 Feb 2013 16:11:12 +0100
Subject: [PATCH 1/2] add missing private lib to pc file
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
-index 441b45d..9e2880a 100644
+index c037579..6e71622 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@ -lcrypt32
+-Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@ @LIBIDN2_LIBS@
++Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@ @LIBIDN2_LIBS@ -lcrypt32
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--
2.9.3
-From ed39e9884ea4a2ce8bd76e66d85d0579312517cd Mon Sep 17 00:00:00 2001
+From 23f9d7800413bb00a14dcbe55afb61d1272eb448 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 24 Nov 2014 08:56:48 +0100
Subject: [PATCH 2/2] windows build fix: ws2tcpip.h supplies inet_ntop
diff --git a/src/gnutls.mk b/src/gnutls.mk
index 55dbb34..11066d6 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -3,8 +3,8 @@
PKG := gnutls
$(PKG)_WEBSITE := https://www.gnu.org/software/gnutls/
$(PKG)_DESCR := GnuTLS
-$(PKG)_VERSION := 3.5.9
-$(PKG)_CHECKSUM := 82b10f0c4ef18f4e64ad8cef5dbaf14be732f5095a41cf366b4ecb4050382951
+$(PKG)_VERSION := 3.5.10
+$(PKG)_CHECKSUM := af443e86ba538d4d3e37c4732c00101a492fe4b56a55f4112ff0ab39dbe6579d
$(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION)
$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.5/$($(PKG)_FILE)