summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMark Brand <mabrand@mabrand.nl>2017-04-30 13:51:29 (GMT)
committerMark Brand <mabrand@mabrand.nl>2017-04-30 14:04:42 (GMT)
commit745274400b22a5775def171c7172e81331b9665f (patch)
treeb679778207e52a0be21d2beac051b8b25b074f40 /src
parent9e5f267e02e3aaa676d910dde572c848650cc04e (diff)
downloadmxe-745274400b22a5775def171c7172e81331b9665f.zip
mxe-745274400b22a5775def171c7172e81331b9665f.tar.gz
mxe-745274400b22a5775def171c7172e81331b9665f.tar.bz2
update: gnutls, vmime
Diffstat (limited to 'src')
-rw-r--r--src/gnutls-1-fixes.patch16
-rw-r--r--src/gnutls.mk4
-rw-r--r--src/vmime.mk4
3 files changed, 12 insertions, 12 deletions
diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch
index e115070..597f1e5 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 3f039a0fed396f006a82ff66b30879450f7942c8 Mon Sep 17 00:00:00 2001
+From 2a80acdcd9ef656b3f6c3cd4193eb66f77d0aa5f 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 c037579..6e71622 100644
+index f656d12c4..03e8fd746 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@ @LIBIDN2_LIBS@
-+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@ @LIBIDN2_LIBS@ -lcrypt32
+-Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@
++Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ -lcrypt32
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--
-2.9.3
+2.11.0
-From 23f9d7800413bb00a14dcbe55afb61d1272eb448 Mon Sep 17 00:00:00 2001
+From d07dcbb72df78506d18fec9205d492b5bbd0399b 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
@@ -34,7 +34,7 @@ Signed-off-by: Mark Brand <mabrand@mabrand.nl>
taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html
diff --git a/lib/x509/ip.c b/lib/x509/ip.c
-index b4b31a4..85f1300 100644
+index b4b31a4f9..85f130036 100644
--- a/lib/x509/ip.c
+++ b/lib/x509/ip.c
@@ -26,7 +26,11 @@
@@ -51,5 +51,5 @@ index b4b31a4..85f1300 100644
/*-
--
-2.9.3
+2.11.0
diff --git a/src/gnutls.mk b/src/gnutls.mk
index 7fdba75..01167e0 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.10
-$(PKG)_CHECKSUM := af443e86ba538d4d3e37c4732c00101a492fe4b56a55f4112ff0ab39dbe6579d
+$(PKG)_VERSION := 3.5.11
+$(PKG)_CHECKSUM := 51765cc5579e250da77fbd7871507c517d01b15353cc40af7b67e9ec7b6fe28f
$(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION)
$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz
$(PKG)_URL := https://gnupg.org/ftp/gcrypt/gnutls/v3.5/$($(PKG)_FILE)
diff --git a/src/vmime.mk b/src/vmime.mk
index be53acf..91faae9 100644
--- a/src/vmime.mk
+++ b/src/vmime.mk
@@ -4,8 +4,8 @@ PKG := vmime
$(PKG)_WEBSITE := https://www.vmime.org/
$(PKG)_DESCR := VMime
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 8e6db1c
-$(PKG)_CHECKSUM := 63c90e7cb58ac4135f7caefe0a738089862137c167f79749a0ff8427af7c972f
+$(PKG)_VERSION := 8146d80
+$(PKG)_CHECKSUM := 57c6b53cbcd46beb8d31ec211de8648e9a0d1842d14da5a1621560954fd9dfcf
$(PKG)_GH_CONF := kisli/vmime/master
$(PKG)_DEPS := gcc gnutls libgsasl libiconv pthreads zlib