# HG changeset patch # User John D # Date 1483536740 18000 # Node ID 0a747a64a7908f96452ecf8e8b768045fb6870d7 # Parent dbe6064ffb0f2a82b4b84d413c28a60eb9800cc3 gnutls: update to 3.4.17 * src/gnutls-1-fixes.patch: update patch from mxe.cc * src/gnutls.mk: update version, cheksum * src/nettle-1-fixes.patch: update patch from mxe.cc * src/nettle.mk: update version checksum v3.3 diff -r dbe6064ffb0f -r 0a747a64a790 src/gnutls-1-fixes.patch --- a/src/gnutls-1-fixes.patch Wed Jan 04 08:32:18 2017 -0500 +++ b/src/gnutls-1-fixes.patch Wed Jan 04 08:32:20 2017 -0500 @@ -1,103 +1,33 @@ -This file is part of MXE. -See index.html for further information. - -From 9b8bd267588f9c7e15b50bf6f7754837deb8b301 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Tue, 3 Apr 2012 13:58:42 +0200 -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 3e5b79d..99f3636 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CANONICAL_HOST - --AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz dist-lzip -Wall -Wno-override]) -+AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - AC_CONFIG_HEADERS([config.h]) - --- -2.1.2 +This file is part of MXE. See LICENSE.md for licensing information. - -From da0afaf172601c7bc434f35a4d02c13811fcaee7 Mon Sep 17 00:00:00 2001 -From: Mark Brand -Date: Wed, 6 Jun 2012 09:57:24 +0200 -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 +Contains ad hoc patches for cross building. -diff --git a/configure.ac b/configure.ac -index 99f3636..8c1b4fd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -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_PROG_SED --- -2.1.2 - - -From 4a98dd8e1a9c6d2d1f1e190f94582ab259435c84 Mon Sep 17 00:00:00 2001 +From a769aa5f4edb5a4a7b6dc36d5d9a889f2249a48f Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Mon, 4 Feb 2013 16:11:12 +0100 -Subject: [PATCH 3/5] add missing private lib to pc file +Subject: [PATCH 1/3] add missing private lib to pc file diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in -index a25fcdf..3860c68 100644 +index f1a4157..9b1ed59 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@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32 +-Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ ++Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- -2.1.2 - - -From 57ffca60a0d61c4b58e27f6ee7f9b2770b0011b6 Mon Sep 17 00:00:00 2001 -From: Tony Theodore -Date: Wed, 6 Feb 2013 08:43:43 +0100 -Subject: [PATCH 4/5] relax automake version check +2.5.0 -diff --git a/configure.ac b/configure.ac -index 8c1b4fd..efa13e8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - AC_CANONICAL_HOST - --AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) -+AM_INIT_AUTOMAKE([1.11.1 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - AC_CONFIG_HEADERS([config.h]) - --- -2.1.2 - - -From e6872f0073970fabe4cc267feebb8bad98756f72 Mon Sep 17 00:00:00 2001 +From 8afb001057028f6a3c671406c8914540c3b9b6e6 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 +Subject: [PATCH 2/3] windows build fix: ws2tcpip.h supplies inet_ntop Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a @@ -106,11 +36,11 @@ 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 +index b126c30..a97d445 100644 --- a/lib/x509/output.c +++ b/lib/x509/output.c -@@ -32,7 +32,11 @@ - #include +@@ -34,7 +34,11 @@ + #include #ifdef HAVE_INET_NTOP -# include @@ -123,5 +53,18 @@ #define addf _gnutls_buffer_append_printf -- -2.1.2 +2.5.0 + +diff -ur gnutls-3.4.17.orig/configure.ac gnutls-3.4.17/configure.ac +--- gnutls-3.4.17.orig/configure.ac 2017-01-02 10:05:15.291188739 -0500 ++++ gnutls-3.4.17/configure.ac 2017-01-02 10:06:04.003488874 -0500 +@@ -26,7 +26,7 @@ + AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_HOST + +-AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) ++AM_INIT_AUTOMAKE([1.11.6 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) + m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) + AC_CONFIG_HEADERS([config.h]) + diff -r dbe6064ffb0f -r 0a747a64a790 src/gnutls.mk --- a/src/gnutls.mk Wed Jan 04 08:32:18 2017 -0500 +++ b/src/gnutls.mk Wed Jan 04 08:32:20 2017 -0500 @@ -2,12 +2,12 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.3.15 -$(PKG)_CHECKSUM := d7f66b0aeaf48ff8621cc1913230635ef672f0a4 +$(PKG)_VERSION := 3.4.17 +$(PKG)_CHECKSUM := 52dab0301022199a34888fa6ed97d92e602ccd60 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz -$(PKG)_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.3/$($(PKG)_FILE) -$(PKG)_URL_2 := http://mirrors.dotsrc.org/gnupg/gnutls/v3.3/$($(PKG)_FILE) +$(PKG)_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.4/$($(PKG)_FILE) +$(PKG)_URL_2 := http://mirrors.dotsrc.org/gnupg/gnutls/v3.4/$($(PKG)_FILE) $(PKG)_DEPS := gettext nettle pcre zlib define $(PKG)_UPDATE @@ -32,7 +32,6 @@ define $(PKG)_BUILD $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am' - rm '$(1)/ltmain.sh' cd '$(1)' && autoreconf -fi -I m4 -I gl/m4 -I src/libopts/m4 if [ "$(MXE_NATIVE_BUILD)" = no ]; then \ $(SED) -i 's/libopts_cv_with_libregex=no/libopts_cv_with_libregex=yes/g;' '$(1)/configure'; \ diff -r dbe6064ffb0f -r 0a747a64a790 src/nettle-1-fixes.patch --- a/src/nettle-1-fixes.patch Wed Jan 04 08:32:18 2017 -0500 +++ b/src/nettle-1-fixes.patch Wed Jan 04 08:32:20 2017 -0500 @@ -1,87 +1,30 @@ -diff -ur a/examples/Makefile.in b/examples/Makefile.in ---- a/examples/Makefile.in 2013-04-24 09:26:53.000000000 -0400 -+++ b/examples/Makefile.in 2013-10-16 18:30:20.579120010 -0400 -@@ -117,8 +117,8 @@ - -lhogweed -lnettle $(BENCH_LIBS) $(LIBS) $(OPENSSL_LIBFLAGS) \ - -o hogweed-benchmark$(EXEEXT) - --$(TARGETS) : io.$(OBJEXT) ../libnettle.a --$(HOGWEED_TARGETS): ../libhogweed.a -+$(TARGETS) : io.$(OBJEXT) ../libnettle.stamp -+$(HOGWEED_TARGETS): ../libhogweed.stamp - - check: $(TS_ALL) - LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \ -diff -ur a/Makefile.in b/Makefile.in ---- a/Makefile.in 2013-04-24 09:26:53.000000000 -0400 -+++ b/Makefile.in 2013-10-16 18:48:59.141790433 -0400 -@@ -22,8 +22,19 @@ - - PRE_CPPFLAGS = -I. - # FIXME: Add configuration of LIBEXT? --LIBTARGETS = @IF_STATIC@ libnettle.a @IF_HOGWEED@ libhogweed.a --SHLIBTARGETS = @IF_SHARED@ $(LIBNETTLE_FORLINK) @IF_HOGWEED@ $(LIBHOGWEED_FORLINK) -+LIBTARGETS = libnettle.stamp libhogweed.stamp -+ -+LIBNETTLE_STATIC = @IF_STATIC@ libnettle.a -+LIBNETTLE_SHARED = @IF_SHARED@ $(LIBNETTLE_FORLINK) -+ -+LIBHOGWEED_STATIC = @IF_STATIC@ libhogweed.a -+LIBHOGWEED_SHARED = @IF_SHARED@ $(LIBHOGWEED_FORLINK) -+ -+libnettle.stamp: $(LIBNETTLE_STATIC) $(LIBNETTLE_SHARED) -+ touch $@ -+ -+libhogweed.stamp: $(LIBHOGWEED_STATIC) $(LIBHOGWEED_SHARED) -+ touch $@ +This file is part of MXE. See LICENSE.md for licensing information. + +From c5836bef883966beb9b5be562ef0a6d0c6048879 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sun, 12 Apr 2015 10:07:58 +0200 +Subject: [PATCH] Revert "Include private dependencies automatically in + pkg-config for non-shared builds" + +This reverts commit c8b1d2fafff16c57ec50d413c999796ec2085413. + +diff --git a/hogweed.pc.in b/hogweed.pc.in +index 97fb9d4..839f7d0 100644 +--- a/hogweed.pc.in ++++ b/hogweed.pc.in +@@ -11,9 +11,8 @@ Name: Hogweed + Description: Nettle low-level cryptographic library (public-key algorithms) + URL: http://www.lysator.liu.se/~nisse/nettle + Version: @PACKAGE_VERSION@ +-Requires: @IF_NOT_SHARED@ nettle +-Requires.private: @IF_SHARED@ nettle +-Libs: -L${libdir} -lhogweed @IF_NOT_SHARED@ @LIBS@ +-Libs.private: @IF_SHARED@ @LIBS@ ++Requires.private: nettle ++Libs: -L${libdir} -lhogweed ++Libs.private: @LIBS@ + Cflags: -I${includedir} - getopt_SOURCES = getopt.c getopt1.c - getopt_TARGETS = $(getopt_SOURCES:.c=.$(OBJEXT)) -@@ -35,7 +46,7 @@ - twofishdata$(EXEEXT_FOR_BUILD) shadata$(EXEEXT_FOR_BUILD) \ - gcmdata$(EXEEXT_FOR_BUILD) \ - $(getopt_TARGETS) $(internal_TARGETS) \ -- $(LIBTARGETS) $(SHLIBTARGETS) -+ $(LIBTARGETS) - IMPLICIT_TARGETS = @IF_DLL@ $(LIBNETTLE_FILE) $(LIBHOGWEED_FILE) - - DOCTARGETS = @IF_DOCUMENTATION@ nettle.info nettle.html nettle.pdf -diff -ur a/testsuite/Makefile.in b/testsuite/Makefile.in ---- a/testsuite/Makefile.in 2013-04-24 09:26:53.000000000 -0400 -+++ b/testsuite/Makefile.in 2013-10-16 18:29:47.328230002 -0400 -@@ -96,7 +96,7 @@ - include $(srcdir)/.test-rules.make - - $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \ -- ../libnettle.a @IF_HOGWEED@ ../libhogweed.a -+ ../libnettle.stamp @IF_HOGWEED@ ../libhogweed.stamp - - # For use as, e.g., - # -diff -ur a/tools/Makefile.in b/tools/Makefile.in ---- a/tools/Makefile.in 2013-04-24 09:26:53.000000000 -0400 -+++ b/tools/Makefile.in 2013-10-16 18:44:52.366014240 -0400 -@@ -34,19 +34,19 @@ - DISTFILES = $(SOURCES) Makefile.in input.h misc.h output.h parse.h - - sexp_conv_OBJS = $(sexp_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS) --sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.a -+sexp-conv$(EXEEXT): $(sexp_conv_OBJS) ../libnettle.stamp - $(LINK) $(sexp_conv_OBJS) -lnettle $(LIBS) -o $@ - --nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.a -+nettle-lfib-stream$(EXEEXT): nettle-lfib-stream.$(OBJEXT) ../libnettle.stamp - $(LINK) nettle-lfib-stream.$(OBJEXT) -lnettle $(LIBS) -o $@ - - pkcs1_conv_OBJS = $(pkcs1_conv_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS) --pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.a ../libhogweed.a -+pkcs1-conv$(EXEEXT): $(pkcs1_conv_OBJS) ../libnettle.stamp ../libhogweed.stamp - $(LINK) $(pkcs1_conv_OBJS) -lhogweed -lnettle $(LIBS) -o $@ - - # FIXME: Avoid linking with gmp - nettle_hash_OBJS = $(nettle_hash_SOURCES:.c=.$(OBJEXT)) $(getopt_OBJS) --nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.a -+nettle-hash$(EXEEXT): $(nettle_hash_OBJS) ../libnettle.stamp - $(LINK) $(nettle_hash_OBJS) -lnettle $(LIBS) -o $@ - - +-- +2.5.0 + diff -r dbe6064ffb0f -r 0a747a64a790 src/nettle.mk --- a/src/nettle.mk Wed Jan 04 08:32:18 2017 -0500 +++ b/src/nettle.mk Wed Jan 04 08:32:20 2017 -0500 @@ -3,8 +3,8 @@ PKG := nettle $(PKG)_IGNORE := -$(PKG)_VERSION := 2.7.1 -$(PKG)_CHECKSUM := e7477df5f66e650c4c4738ec8e01c2efdb5d1211 +$(PKG)_VERSION := 3.3 +$(PKG)_CHECKSUM := bf2b4d3a41192ff6177936d7bc3bee4cebeb86c4 $(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION) $(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz $(PKG)_URL := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)