Mercurial > mxe-octave

changeset 3824:9d1dbbcac6ea

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnutls: update gnutls from mxe.cc * src/gnutls.mk: update checksum, version, autoreconf * src/gnutls-1-fixes.patch: update patch from mxe.cc (devel)
author John Donoghue
date Tue, 03 Mar 2015 12:15:18 -0500
parents 49b6bc966f5d
children b6f31861c73e
files src/gnutls-1-fixes.patch src/gnutls.mk
diffstat 2 files changed, 44 insertions(+), 54 deletions(-) [+]
line wrap: on
line diff
--- a/src/gnutls-1-fixes.patch	Tue Mar 03 11:54:53 2015 -0500
+++ b/src/gnutls-1-fixes.patch	Tue Mar 03 12:15:18 2015 -0500
@@ -1,7 +1,7 @@
 This file is part of MXE.
 See index.html for further information.
 
-From dbae911f9d1b79fde473c1ca23e5535c7d1db39c Mon Sep 17 00:00:00 2001
+From 9b8bd267588f9c7e15b50bf6f7754837deb8b301 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Tue, 3 Apr 2012 13:58:42 +0200
 Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball"
@@ -9,7 +9,7 @@
 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
 
 diff --git a/configure.ac b/configure.ac
-index a81d85f..44fe48a 100644
+index 3e5b79d..99f3636 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
@@ -22,10 +22,10 @@
  AC_CONFIG_HEADERS([config.h])
  
 -- 
-1.8.4.5
+2.1.2
 
 
-From 951caab5f444f0c90cb43b5937c7273963e443d8 Mon Sep 17 00:00:00 2001
+From da0afaf172601c7bc434f35a4d02c13811fcaee7 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Wed, 6 Jun 2012 09:57:24 +0200
 Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility
@@ -34,22 +34,22 @@
 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
 
 diff --git a/configure.ac b/configure.ac
-index 44fe48a..1e80e23 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 ade9bae0c0af5b6eec402c228c8d048e8a7b5ce6 Mon Sep 17 00:00:00 2001
+From 4a98dd8e1a9c6d2d1f1e190f94582ab259435c84 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 4 Feb 2013 16:11:12 +0100
 Subject: [PATCH 3/5] add missing private lib to pc file
@@ -68,17 +68,17 @@
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
 -- 
-1.8.4.5
+2.1.2
 
 
-From 36afa9bd2427b6c71c49c832d8a06686920ac8c9 Mon Sep 17 00:00:00 2001
+From 57ffca60a0d61c4b58e27f6ee7f9b2770b0011b6 Mon Sep 17 00:00:00 2001
 From: Tony Theodore <tonyt@logyst.com>
 Date: Wed, 6 Feb 2013 08:43:43 +0100
 Subject: [PATCH 4/5] relax automake version check
 
 
 diff --git a/configure.ac b/configure.ac
-index 1e80e23..0415ead 100644
+index 8c1b4fd..efa13e8 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
@@ -91,46 +91,37 @@
  AC_CONFIG_HEADERS([config.h])
  
 -- 
-1.8.4.5
-
-
-From fc0b1030e357d2de86417a1a442d5ef3643e6fc0 Mon Sep 17 00:00:00 2001
-From: Mark Brand <mabrand@mabrand.nl>
-Date: Wed, 5 Feb 2014 09:42:41 +0100
-Subject: [PATCH 5/5] gnulib fix-ups for error, setenv, unsetenv
+2.1.2
 
 
-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
+From e6872f0073970fabe4cc267feebb8bad98756f72 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+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 <mabrand@mabrand.nl>
+
+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 <extras/randomart.h>
  
--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
+ #ifdef HAVE_INET_NTOP
+-# include <arpa/inet.h>
++# ifdef _WIN32
++#  include <ws2tcpip.h>
++# else
++#  include <arpa/inet.h>
++# endif
+ #endif
  
--EXTRA_libgnu_gpl_la_SOURCES += unsetenv.c
-+libgnu_gpl_la_SOURCES += unsetenv.c
- 
- ## end   gnulib module unsetenv
- 
+ #define addf _gnutls_buffer_append_printf
 -- 
-1.8.4.5
+2.1.2
 
--- a/src/gnutls.mk	Tue Mar 03 11:54:53 2015 -0500
+++ b/src/gnutls.mk	Tue Mar 03 12:15:18 2015 -0500
@@ -2,8 +2,8 @@
 # See index.html for further information.
 
 PKG             := gnutls
-$(PKG)_VERSION  := 3.2.20
-$(PKG)_CHECKSUM := 6b104f737330ff2f6833b8c5d80e1cd2c3fcfb66
+$(PKG)_VERSION  := 3.3.13
+$(PKG)_CHECKSUM := 644d9b886fa574a5f19869232078e6fd933f8022
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/$($(PKG)_FILE)
@@ -32,9 +32,8 @@
 
 define $(PKG)_BUILD
     $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am'
-    cd '$(1)' && aclocal -I m4 -I gl/m4 -I src/libopts/m4 --install
-    cd '$(1)' && autoconf
-    cd '$(1)' && automake --add-missing
+    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'; \
     fi