From 6a1c7fdc02b684005c1045fe99305e0d25de4818 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 24 Nov 2014 09:13:51 +0100 Subject: gnutls: update 3.3 is now the stable branch. --- src/gnutls-1-fixes.patch | 66 +++++++++++++++++++++++++++++++++++------------- src/gnutls.mk | 10 ++++---- 2 files changed, 54 insertions(+), 22 deletions(-) diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index c43efbd..eae67a9 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -1,15 +1,15 @@ This file is part of MXE. See index.html for further information. -From b4e25d3d5b94f99a3eb754fadd271eb881e03515 Mon Sep 17 00:00:00 2001 +From 9b8bd267588f9c7e15b50bf6f7754837deb8b301 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 3 Apr 2012 13:58:42 +0200 -Subject: [PATCH 1/4] Revert "make dist will also make lzip compressed tarball" +Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball" This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. diff --git a/configure.ac b/configure.ac -index b082047..02a6d5f 100644 +index 3e5b79d..99f3636 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) @@ -22,37 +22,37 @@ index b082047..02a6d5f 100644 AC_CONFIG_HEADERS([config.h]) -- -1.8.4.5 +2.1.2 -From 7031296f8bbb2fe4bea63616045862bc234ad9c7 Mon Sep 17 00:00:00 2001 +From da0afaf172601c7bc434f35a4d02c13811fcaee7 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 6 Jun 2012 09:57:24 +0200 -Subject: [PATCH 2/4] AM_PROG_AR for automake 1.12 compatibility +Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility Taken from http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html diff --git a/configure.ac b/configure.ac -index 02a6d5f..789db75 100644 +index 99f3636..8c1b4fd 100644 --- a/configure.ac +++ b/configure.ac -@@ -41,6 +41,7 @@ ggl_EARLY +@@ -42,6 +42,7 @@ ggl_EARLY AM_PROG_AS AM_PROG_AR AC_PROG_CXX +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) AM_PROG_CC_C_O AC_PROG_YACC - AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [/bin/true]) + AC_PROG_SED -- -1.8.4.5 +2.1.2 -From 14a3e086bb17c031c650775d89550b184dd564e5 Mon Sep 17 00:00:00 2001 +From 4a98dd8e1a9c6d2d1f1e190f94582ab259435c84 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 4 Feb 2013 16:11:12 +0100 -Subject: [PATCH 3/4] add missing private lib to pc file +Subject: [PATCH 3/5] add missing private lib to pc file diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in @@ -68,17 +68,17 @@ index a25fcdf..3860c68 100644 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- -1.8.4.5 +2.1.2 -From e0b47757e468049c0c30dfc54f6b6003fe036add Mon Sep 17 00:00:00 2001 +From 57ffca60a0d61c4b58e27f6ee7f9b2770b0011b6 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 6 Feb 2013 08:43:43 +0100 -Subject: [PATCH 4/4] relax automake version check +Subject: [PATCH 4/5] relax automake version check diff --git a/configure.ac b/configure.ac -index 789db75..54f2232 100644 +index 8c1b4fd..efa13e8 100644 --- a/configure.ac +++ b/configure.ac @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) @@ -91,5 +91,37 @@ index 789db75..54f2232 100644 AC_CONFIG_HEADERS([config.h]) -- -1.8.4.5 +2.1.2 + + +From e6872f0073970fabe4cc267feebb8bad98756f72 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Mon, 24 Nov 2014 08:56:48 +0100 +Subject: [PATCH 5/5] windows build fix: ws2tcpip.h supplies inet_ntop + +Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a + +Signed-off-by: Mark Brand + +taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html + +diff --git a/lib/x509/output.c b/lib/x509/output.c +index bf01834..1ec18de 100644 +--- a/lib/x509/output.c ++++ b/lib/x509/output.c +@@ -32,7 +32,11 @@ + #include + + #ifdef HAVE_INET_NTOP +-# include ++# ifdef _WIN32 ++# include ++# else ++# include ++# endif + #endif + + #define addf _gnutls_buffer_append_printf +-- +2.1.2 diff --git a/src/gnutls.mk b/src/gnutls.mk index 279529f..ffa6f58 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,16 +2,16 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.2.20 -$(PKG)_CHECKSUM := 6b104f737330ff2f6833b8c5d80e1cd2c3fcfb66 +$(PKG)_VERSION := 3.3.10 +$(PKG)_CHECKSUM := b47af4ee116ba2099a24ff7a8e686079f80ec23a $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.2/$($(PKG)_FILE) -$(PKG)_URL_2 := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2//$($(PKG)_FILE) +$(PKG)_URL := http://mirrors.dotsrc.org/gnupg/gnutls/v3.3/$($(PKG)_FILE) +$(PKG)_URL_2 := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3//$($(PKG)_FILE) $(PKG)_DEPS := gcc gettext gmp libgnurx nettle zlib define $(PKG)_UPDATE - $(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/ | \ + $(WGET) -q -O- ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/ | \ $(SED) -n 's,.*gnutls-\([1-9]\+\.[0-9]\+.[0-9]\+\)\..*,\1,p' | \ $(SORT) -V | \ tail -1 -- cgit v0.12