Mercurial > mxe-octave

changeset 4989:0cf6aa8f90de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update libidn2 to v2.1.1a, gnutls to v3.6.6, nettle v3.4.1 * src/libidn2.mk: update to v2.1.1a * src/gnutls.mk: update to v3.6.6 * src/gnutls-1-fixes.patch: update patch * src/nettle.mk: update version v3.4.1
author John Donoghue
date Fri, 01 Mar 2019 12:46:50 -0500
parents 8fd7e6b01ee3
children a059052f4807
files src/gnutls-1-fixes.patch src/gnutls.mk src/libidn2.mk src/nettle.mk
diffstat 4 files changed, 116 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/src/gnutls-1-fixes.patch	Thu Feb 28 13:34:20 2019 -0500
+++ b/src/gnutls-1-fixes.patch	Fri Mar 01 12:46:50 2019 -0500
@@ -2,32 +2,29 @@
 
 Contains ad hoc patches for cross building.
 
-From a769aa5f4edb5a4a7b6dc36d5d9a889f2249a48f Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 4 Feb 2013 16:11:12 +0100
-Subject: [PATCH 1/3] add missing private lib to pc file
+Subject: [PATCH 1/4] add missing private lib to pc file
 
 
 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
-index f1a4157..9b1ed59 100644
+index 1111111..2222222 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: @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
+-Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@
++Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ -lcrypt32
  @GNUTLS_REQUIRES_PRIVATE@
  Cflags: -I${includedir}
--- 
-2.5.0
 
-
-From 8afb001057028f6a3c671406c8914540c3b9b6e6 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Mark Brand <mabrand@mabrand.nl>
 Date: Mon, 24 Nov 2014 08:56:48 +0100
-Subject: [PATCH 2/3] windows build fix: ws2tcpip.h supplies inet_ntop
+Subject: [PATCH 2/4] windows build fix: ws2tcpip.h supplies inet_ntop
 
 Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a
 
@@ -35,12 +32,12 @@
 
 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 b126c30..a97d445 100644
---- a/lib/x509/output.c
-+++ b/lib/x509/output.c
-@@ -34,7 +34,11 @@
- #include <gnutls-idna.h>
+diff --git a/lib/x509/ip.c b/lib/x509/ip.c
+index 1111111..2222222 100644
+--- a/lib/x509/ip.c
++++ b/lib/x509/ip.c
+@@ -26,7 +26,11 @@
+ #include <gnutls/x509.h>
  
  #ifdef HAVE_INET_NTOP
 -# include <arpa/inet.h>
@@ -51,20 +48,95 @@
 +# endif
  #endif
  
- #define addf _gnutls_buffer_append_printf
--- 
-2.5.0
+ /*-
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Sun, 7 May 2017 20:17:13 +0200
+Subject: [PATCH 3/4] let gnutls configure detect libidn2
 
 
-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
+diff --git a/configure.ac b/configure.ac
+index 1111111..2222222 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -509,24 +509,19 @@ idna_support=no
+ with_libidn2=no
+ 
+ if test "$try_libidn2" = yes;then
+-  AC_SEARCH_LIBS(idn2_lookup_u8, idn2, [
+-      with_libidn2=yes;
+-      idna_support="IDNA 2008 (libidn2)"
+-      AC_DEFINE([HAVE_LIBIDN2], 1, [Define if IDNA 2008 support is enabled.])
+-      AC_SUBST([LIBIDN2_CFLAGS], [])
+-      AC_SUBST([LIBIDN2_LIBS], [-lidn2]) dnl used in gnutls.pc.in
+-dnl enable once libidn2.pc is widespread; and remove LIBIDN2_LIBS from gnutls.pc.in (Libs.private)
+-dnl      if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
+-dnl        GNUTLS_REQUIRES_PRIVATE="Requires.private: libidn2"
+-dnl      else
+-dnl        GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libidn2"
+-dnl      fi
+-    ],[
+-      with_libidn2=no;
+-      AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support)
+-    ])
+-else
+-    with_libidn2=no
++  PKG_CHECK_MODULES(LIBIDN2, libidn2, [with_libidn2=yes], [with_libidn2=no])
++  if test "$with_libidn2" != "no";then
++    idna_support="IDNA 2008 (libidn2)"
++
++    AC_DEFINE([HAVE_LIBIDN2], 1, [Define if IDNA 2008 support is enabled.])
++    if test "x$GNUTLS_REQUIRES_PRIVATE" = "x"; then
++      GNUTLS_REQUIRES_PRIVATE="Requires.private: libidn2"
++    else
++      GNUTLS_REQUIRES_PRIVATE="${GNUTLS_REQUIRES_PRIVATE}, libidn2"
++    fi
++  else
++    AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support)
++ fi
+ fi
  
--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])
- 
+ AM_CONDITIONAL(HAVE_LIBIDN2, test "$with_libidn2" != "no")
+diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
+index 1111111..2222222 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: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ @LIBATOMIC_LIBS@ -lcrypt32
++Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBATOMIC_LIBS@ -lcrypt32
+ @GNUTLS_REQUIRES_PRIVATE@
+ Cflags: -I${includedir}
+
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Mark Brand <mabrand@mabrand.nl>
+Date: Thu, 6 Dec 2018 10:36:30 +0100
+Subject: [PATCH 4/4] remove docs from configure.ac: avoid GTK_DOC dependencies
+
+
+diff --git a/configure.ac b/configure.ac
+index 1111111..2222222 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -947,18 +947,6 @@ AC_SUBST([YEAR], $YEAR)
+ AC_CONFIG_FILES([guile/pre-inst-guile], [chmod +x guile/pre-inst-guile])
+ AC_CONFIG_FILES([
+   Makefile
+-  doc/Makefile
+-  doc/credentials/Makefile
+-  doc/credentials/srp/Makefile
+-  doc/credentials/x509/Makefile
+-  doc/cyclo/Makefile
+-  doc/doxygen/Doxyfile
+-  doc/examples/Makefile
+-  doc/latex/Makefile
+-  doc/manpages/Makefile
+-  doc/reference/Makefile
+-  doc/reference/version.xml
+-  doc/scripts/Makefile
+   extra/Makefile
+   extra/includes/Makefile
+   libdane/Makefile
--- a/src/gnutls.mk	Thu Feb 28 13:34:20 2019 -0500
+++ b/src/gnutls.mk	Fri Mar 01 12:46:50 2019 -0500
@@ -2,16 +2,16 @@
 # See index.html for further information.
 
 PKG             := gnutls
-$(PKG)_VERSION  := 3.4.17
-$(PKG)_CHECKSUM := 52dab0301022199a34888fa6ed97d92e602ccd60
+$(PKG)_VERSION  := 3.6.6
+$(PKG)_CHECKSUM := d094f3c554b40d76dac2d2d75a8a141c008dc6c4
 $(PKG)_SUBDIR   := gnutls-$($(PKG)_VERSION)
 $(PKG)_FILE     := gnutls-$($(PKG)_VERSION).tar.xz
-$(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
+$(PKG)_URL      := ftp://ftp.gnutls.org/gcrypt/gnutls/v3.6/$($(PKG)_FILE)
+$(PKG)_URL_2    := https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnutls/v3.5/$($(PKG)_FILE)
+$(PKG)_DEPS     := gettext libidn2 libunistring nettle pcre zlib
 
 define $(PKG)_UPDATE
-    $(WGET) -q -O- https://gnupg.org/ftp/gcrypt/gnutls/v3.5/ | \
+    $(WGET) -q -O- https://gnupg.org/ftp/gcrypt/gnutls/v3.6/ | \
     $(SED) -n 's,.*gnutls-\([1-9]\+\.[0-9]\+.[0-9]\+\)\..*,\1,p' | \
     $(SORT) -V | \
     tail -1
@@ -30,7 +30,7 @@
 
 define $(PKG)_BUILD
     $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am'
-    cd '$(1)' && autoreconf -fi  -I m4 -I gl/m4 -I src/libopts/m4
+    cd '$(1)' && autoreconf -fi  -I 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
@@ -44,6 +44,7 @@
         --disable-nls \
         --disable-guile \
         --disable-doc \
+        --disable-tests \
         --with-included-libtasn1 \
         --with-libregex='$(HOST_PREFIX)' \
         --with-regex-header=pcreposix.h \
--- a/src/libidn2.mk	Thu Feb 28 13:34:20 2019 -0500
+++ b/src/libidn2.mk	Fri Mar 01 12:46:50 2019 -0500
@@ -3,9 +3,9 @@
 
 PKG             := libidn2
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 2.1.0
-$(PKG)_CHECKSUM := dffdab4dd69ad39f6a65cebc464c2603a136f074
-$(PKG)_SUBDIR   := libidn2-$($(PKG)_VERSION)
+$(PKG)_VERSION  := 2.1.1a
+$(PKG)_CHECKSUM := 3a668f43efb6c36e32e9841775efff04aef18c0b
+$(PKG)_SUBDIR   := libidn2-2.1.1
 $(PKG)_FILE     := libidn2-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://ftp.gnu.org/gnu/libidn/$($(PKG)_FILE)
 $(PKG)_DEPS     := gettext libiconv libunistring
--- a/src/nettle.mk	Thu Feb 28 13:34:20 2019 -0500
+++ b/src/nettle.mk	Fri Mar 01 12:46:50 2019 -0500
@@ -3,8 +3,8 @@
 
 PKG             := nettle
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 3.4
-$(PKG)_CHECKSUM := f3c8495b7c43cba9cdd19503e7567095c680b490
+$(PKG)_VERSION  := 3.4.1
+$(PKG)_CHECKSUM := 56a81ed4a8d35489d8bddd99d5262fe3958a52b4
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := http://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)
@@ -15,6 +15,7 @@
     $(SED) -n 's,.*nettle-\([0-9][^>]*\)\.tar.*,\1,p' | \
     grep -v 'pre' | \
     grep -v 'rc' | \
+    $(SORT) |
     tail -1
 endef