From 20b2c3747873b3f83c2c35fea52a0c442065f07d Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Wed, 5 Feb 2014 09:48:01 +0100 Subject: update package gnutls --- src/gnutls-1-fixes.patch | 87 +++++++++++++++++++++++++++++++++++------------- src/gnutls.mk | 4 +-- 2 files changed, 66 insertions(+), 25 deletions(-) diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index 54bdd70..c30b290 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -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 @@ index a25fcdf..3860c68 100644 @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 --git a/src/gnutls.mk b/src/gnutls.mk index f50558e..bbb8551 100644 --- a/src/gnutls.mk +++ b/src/gnutls.mk @@ -2,8 +2,8 @@ # See index.html for further information. PKG := gnutls -$(PKG)_VERSION := 3.2.6 -$(PKG)_CHECKSUM := eb5a404d297e8ee2f344bcd9cdeea86fe8977287 +$(PKG)_VERSION := 3.2.10 +$(PKG)_CHECKSUM := 043d496770322b8d3af3ac4b94642a4770bd5a87 $(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION) $(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz $(PKG)_URL := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2//$($(PKG)_FILE) -- cgit v0.12