From ee2705ccbc7bf27c4e7accb4aeada1da4223b23a Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 6 Dec 2018 10:42:37 +0100
Subject: update: gnutls, nettle
---
src/gnutls-1-fixes.patch | 101 ++++++++++++++++++++++++++---------------------
src/gnutls.mk | 8 ++--
src/nettle.mk | 5 ++-
3 files changed, 64 insertions(+), 50 deletions(-)
diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch
index 1fb8372..94ffe76 100644
--- a/src/gnutls-1-fixes.patch
+++ b/src/gnutls-1-fixes.patch
@@ -16,8 +16,8 @@ index 1111111..2222222 100644
URL: http://www.gnutls.org/
Version: @VERSION@
Libs: -L${libdir} -lgnutls
--Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@
-+Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ -lcrypt32
+-Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@
++Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ -lcrypt32
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
@@ -51,47 +51,24 @@ index 1111111..2222222 100644
/*-
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Boris Nagaev <bnagaev@gmail.com>
-Date: Tue, 2 May 2017 23:52:16 +0200
-Subject: [PATCH 3/4] gnutls.pc: hardcode -lunistring -liconv
-
-See https://github.com/mxe/mxe/issues/1753#issuecomment-298772548
-
-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: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ -lcrypt32
-+Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lunistring -liconv @LIBIDN2_LIBS@ -lcrypt32
- @GNUTLS_REQUIRES_PRIVATE@
- Cflags: -I${includedir}
-
-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 4/4] let gnutls configure detect libidn2
+Subject: [PATCH 3/4] let gnutls configure detect libidn2
diff --git a/configure.ac b/configure.ac
index 1111111..2222222 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -489,24 +489,19 @@ with_libidn=no
- if test "$try_libidn" = yes;then
+@@ -517,24 +517,19 @@ idna_support=no
+ with_libidn2=no
- if test "$try_libidn2" = yes;then
+ if test "$try_libidn2" = yes;then
- AC_SEARCH_LIBS(idn2_lookup_u8, idn2, [
- with_libidn2=yes;
-+ 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.])
-- AC_SUBST([LIBIDN_LIBS], [-lidn2])
+- 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
@@ -101,20 +78,26 @@ index 1111111..2222222 100644
-dnl fi
- ],[
- with_libidn2=no;
-+ 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)
+- AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support)
- ])
-- else
+-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
- fi
++ else
++ AC_MSG_WARN(*** LIBIDN2 was not found. You will not be able to use IDN2008 support)
++ fi
+ fi
- if test "$with_libidn2" = "no"; then
+ 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
@@ -123,7 +106,37 @@ index 1111111..2222222 100644
URL: http://www.gnutls.org/
Version: @VERSION@
Libs: -L${libdir} -lgnutls
--Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lunistring -liconv @LIBIDN2_LIBS@ -lcrypt32
-+Libs.private: @LIBZ_PC@ @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lunistring -liconv -lcrypt32
+-Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ @LIBIDN2_LIBS@ -lcrypt32
++Libs.private: @LIBINTL@ @LIBSOCKET@ @LIBNSL@ @LIBPTHREAD@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LIBUNISTRING@ -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
+@@ -955,18 +955,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
diff --git a/src/gnutls.mk b/src/gnutls.mk
index f8198d6..41ffeb5 100644
--- a/src/gnutls.mk
+++ b/src/gnutls.mk
@@ -3,16 +3,16 @@
PKG := gnutls
$(PKG)_WEBSITE := https://www.gnu.org/software/gnutls/
$(PKG)_DESCR := GnuTLS
-$(PKG)_VERSION := 3.5.19
-$(PKG)_CHECKSUM := 1936eb64f03aaefd6eb16cef0567457777618573826b94d03376bb6a4afadc44
+$(PKG)_VERSION := 3.6.5
+$(PKG)_CHECKSUM := 073eced3acef49a3883e69ffd5f0f0b5f46e2760ad86eddc6c0866df4e7abb35
$(PKG)_SUBDIR := gnutls-$($(PKG)_VERSION)
$(PKG)_FILE := gnutls-$($(PKG)_VERSION).tar.xz
-$(PKG)_URL := https://gnupg.org/ftp/gcrypt/gnutls/v3.5/$($(PKG)_FILE)
+$(PKG)_URL := https://gnupg.org/ftp/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 := cc gettext gmp libgnurx libidn2 libunistring nettle 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
diff --git a/src/nettle.mk b/src/nettle.mk
index 6f59aca..4c35f0f 100644
--- a/src/nettle.mk
+++ b/src/nettle.mk
@@ -3,8 +3,8 @@
PKG := nettle
$(PKG)_WEBSITE := https://www.lysator.liu.se/~nisse/nettle/
$(PKG)_IGNORE :=
-$(PKG)_VERSION := 3.4
-$(PKG)_CHECKSUM := ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94
+$(PKG)_VERSION := 3.4.1
+$(PKG)_CHECKSUM := f941cf1535cd5d1819be5ccae5babef01f6db611f9b5a777bae9c7604b8a92ad
$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://www.lysator.liu.se/~nisse/archive/$($(PKG)_FILE)
@@ -15,6 +15,7 @@ define $(PKG)_UPDATE
$(SED) -n 's,.*nettle-\([0-9][^>]*\)\.tar.*,\1,p' | \
grep -v 'pre' | \
grep -v 'rc' | \
+ sort | \
tail -1
endef
--
cgit v0.12