# HG changeset patch # User John Donoghue # Date 1399924797 14400 # Node ID fc2b5e19d7377ce5684f9347d0fd0001ee8b7219 # Parent 30f4b78227af8d26bc9165de5be556220b3956c2 gnutls: update to 3.2.14 * src/gnutls.mk: update to version 3.2.14 * src/gnutls-1-fixes.patch: update to latest mxe_devel patch. * src/gnutls-2-ldadd.patch: remove patch file. * dist-files.mk: remove gnutls-2-ldadd.patch. diff -r 30f4b78227af -r fc2b5e19d737 dist-files.mk --- a/dist-files.mk Tue May 13 16:52:21 2014 -0400 +++ b/dist-files.mk Mon May 12 15:59:57 2014 -0400 @@ -122,7 +122,6 @@ gnuplot-2-win64.patch \ gnuplot.mk \ gnutls-1-fixes.patch \ - gnutls-2-ldadd.patch \ gnutls-test.c \ gnutls.mk \ graphicsmagick-1-fix-xml2-config.patch \ diff -r 30f4b78227af -r fc2b5e19d737 src/gnutls-1-fixes.patch --- a/src/gnutls-1-fixes.patch Tue May 13 16:52:21 2014 -0400 +++ b/src/gnutls-1-fixes.patch Mon May 12 15:59:57 2014 -0400 @@ -1,58 +1,58 @@ This file is part of MXE. See index.html for further information. -From 05cd16c35674665009d16f2469b9124c16638237 Mon Sep 17 00:00:00 2001 +From dbae911f9d1b79fde473c1ca23e5535c7d1db39c 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 6459403..f8dd727 100644 +index a81d85f..44fe48a 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 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override]) -+AM_INIT_AUTOMAKE([1.12.2 no-dist-gzip dist-xz -Wall -Wno-override]) +-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]) -- -1.8.1.4 +1.8.4.5 -From 6d7644c82de49b38afda2a171d1195861ebd9db0 Mon Sep 17 00:00:00 2001 +From 951caab5f444f0c90cb43b5937c7273963e443d8 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 f8dd727..2c05458 100644 +index 44fe48a..1e80e23 100644 --- a/configure.ac +++ b/configure.ac -@@ -40,6 +40,7 @@ gl_EARLY +@@ -41,6 +41,7 @@ ggl_EARLY AM_PROG_AS AM_PROG_AR AC_PROG_CXX +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - - # For includes/gnutls/gnutls.h.in. - AC_SUBST(MAJOR_VERSION, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`) + AM_PROG_CC_C_O + AC_PROG_YACC + AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [/bin/true]) -- -1.8.1.4 +1.8.4.5 -From 7afa4d386bb2076890113a5d4e665c39583ff025 Mon Sep 17 00:00:00 2001 +From ade9bae0c0af5b6eec402c228c8d048e8a7b5ce6 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,28 +68,69 @@ @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- -1.8.1.4 +1.8.4.5 -From 903e858e59718f03fd3b3bef00fab897b0313007 Mon Sep 17 00:00:00 2001 +From 36afa9bd2427b6c71c49c832d8a06686920ac8c9 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 2c05458..dd45228 100644 +index 1e80e23..0415ead 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 no-dist-gzip dist-xz -Wall -Wno-override]) -+AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz -Wall -Wno-override]) +-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]) -- -1.8.1.4 +1.8.4.5 + + +From fc0b1030e357d2de86417a1a442d5ef3643e6fc0 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Wed, 5 Feb 2014 09:42:41 +0100 +Subject: [PATCH 5/5] gnulib fix-ups for error, setenv, unsetenv + +diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am +index c25328d..14d592b 100644 +--- a/src/gl/Makefile.am ++++ b/src/gl/Makefile.am +@@ -121,7 +121,7 @@ EXTRA_DIST += errno.in.h + + EXTRA_DIST += error.c error.h + +-EXTRA_libgnu_gpl_la_SOURCES += error.c ++libgnu_gpl_la_SOURCES += error.c + + ## end gnulib module error + +@@ -230,7 +230,7 @@ libgnu_gpl_la_SOURCES += progname.h progname.c + + EXTRA_DIST += setenv.c + +-EXTRA_libgnu_gpl_la_SOURCES += setenv.c ++libgnu_gpl_la_SOURCES += setenv.c + + ## end gnulib module setenv + +@@ -914,7 +914,7 @@ EXTRA_DIST += unistd.in.h + + EXTRA_DIST += unsetenv.c + +-EXTRA_libgnu_gpl_la_SOURCES += unsetenv.c ++libgnu_gpl_la_SOURCES += unsetenv.c + + ## end gnulib module unsetenv + +-- +1.8.4.5 + diff -r 30f4b78227af -r fc2b5e19d737 src/gnutls-2-ldadd.patch --- a/src/gnutls-2-ldadd.patch Tue May 13 16:52:21 2014 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,93 +0,0 @@ -diff -ur a/src/Makefile.am b/src/Makefile.am ---- a/src/Makefile.am 2013-03-03 04:04:09.000000000 -0500 -+++ b/src/Makefile.am 2013-10-16 23:34:43.999201873 -0400 -@@ -67,7 +67,7 @@ - if ENABLE_SRP - srptool_SOURCES = srptool.c - srptool_LDADD = ../lib/libgnutls.la libcmd-srp.la ../gl/libgnu.la --srptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -+srptool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) - noinst_LTLIBRARIES += libcmd-srp.la - libcmd_srp_la_CFLAGS = - libcmd_srp_la_SOURCES = srptool-args.def srptool-args.c srptool-args.h -@@ -75,7 +75,7 @@ - - psktool_SOURCES = psk.c - psktool_LDADD = ../lib/libgnutls.la libcmd-psk.la ../gl/libgnu.la --psktool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -+psktool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) - noinst_LTLIBRARIES += libcmd-psk.la - libcmd_psk_la_CFLAGS = - libcmd_psk_la_SOURCES = psk-args.def psk-args.c psk-args.h -@@ -86,7 +86,7 @@ - ocsptool_SOURCES = ocsptool.c ocsptool-common.h ocsptool-common.c \ - socket.c socket.h - ocsptool_LDADD = ../lib/libgnutls.la libcmd-ocsp.la ../gl/libgnu.la --ocsptool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) $(GETADDRINFO_LIB) -+ocsptool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) $(GETADDRINFO_LIB) - noinst_LTLIBRARIES += libcmd-ocsp.la - libcmd_ocsp_la_CFLAGS = - libcmd_ocsp_la_SOURCES = ocsptool-args.def ocsptool-args.h ocsptool-args.c -@@ -99,7 +99,7 @@ - certtool-common.h - gnutls_serv_LDADD = ../lib/libgnutls.la - gnutls_serv_LDADD += libcmd-serv.la ../gl/libgnu.la --gnutls_serv_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -+gnutls_serv_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) - gnutls_serv_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) - noinst_LTLIBRARIES += libcmd-serv.la - libcmd_serv_la_CFLAGS = -@@ -116,7 +116,7 @@ - if ENABLE_DANE - gnutls_cli_LDADD += ../libdane/libgnutls-dane.la - endif --gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBOPTS_LDADD) $(LTLIBINTL) -+gnutls_cli_LDADD += libcmd-cli.la ../gl/libgnu.la $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) - gnutls_cli_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) $(LIB_CLOCK_GETTIME) \ - $(SERVENT_LIB) - noinst_LTLIBRARIES += libcmd-cli.la -@@ -129,7 +129,7 @@ - socket.c socket.h common.h common.c - gnutls_cli_debug_LDADD = ../lib/libgnutls.la libcmd-cli-debug.la - gnutls_cli_debug_LDADD += ../gl/libgnu.la --gnutls_cli_debug_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -+gnutls_cli_debug_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) - gnutls_cli_debug_LDADD += $(LIBSOCKET) $(GETADDRINFO_LIB) - noinst_LTLIBRARIES += libcmd-cli-debug.la - libcmd_cli_debug_la_CFLAGS = -@@ -146,7 +146,7 @@ - libcmd_certtool_la_SOURCES = certtool-args.c certtool-args.def certtool-args.h \ - certtool-cfg.h certtool-cfg.c - libcmd_certtool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la --libcmd_certtool_la_LIBADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -+libcmd_certtool_la_LIBADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) - libcmd_certtool_la_LIBADD += $(LTLIBREADLINE) - libcmd_certtool_la_LIBADD += $(INET_PTON_LIB) - -@@ -162,7 +162,7 @@ - libcmd_danetool_la_SOURCES = danetool-args.c danetool-args.def danetool-args.h \ - certtool-cfg.h certtool-cfg.c - libcmd_danetool_la_LIBADD = ../gl/libgnu.la ../lib/libgnutls.la --libcmd_danetool_la_LIBADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -+libcmd_danetool_la_LIBADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) - libcmd_danetool_la_LIBADD += $(LTLIBREADLINE) - libcmd_danetool_la_LIBADD += $(INET_PTON_LIB) - -@@ -173,7 +173,7 @@ - certtool-extras.c p11tool.h common.c - p11tool_LDADD = ../lib/libgnutls.la - p11tool_LDADD += libcmd-p11tool.la ../gl/libgnu.la --p11tool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -+p11tool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) - - noinst_LTLIBRARIES += libcmd-p11tool.la - libcmd_p11tool_la_CFLAGS = -@@ -189,7 +189,7 @@ - tpmtool_SOURCES = tpmtool-args.def tpmtool.c certtool-common.c certtool-extras.c common.c - tpmtool_LDADD = ../lib/libgnutls.la - tpmtool_LDADD += libcmd-tpmtool.la ../gl/libgnu.la --tpmtool_LDADD += $(LIBOPTS_LDADD) $(LTLIBINTL) -+tpmtool_LDADD += $(LIBOPTS_LDADD) ../gl/libgnu.la $(LTLIBINTL) - - noinst_LTLIBRARIES += libcmd-tpmtool.la - libcmd_tpmtool_la_CFLAGS = diff -r 30f4b78227af -r fc2b5e19d737 src/gnutls.mk --- a/src/gnutls.mk Tue May 13 16:52:21 2014 -0400 +++ b/src/gnutls.mk Mon May 12 15:59:57 2014 -0400 @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.2.3 -$(PKG)_CHECKSUM := 18f5fffd1a0384944cb76cbedc0720c4726470f4 +$(PKG)_VERSION := 3.2.14 +$(PKG)_CHECKSUM := a660dfb59bd6f907eeb5c73c540cdddeb51bf8ae $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := http://ftp.gnu.org/gnu/gnutls/$($(PKG)_FILE)