view src/gnutls-1-fixes.patch @ 4315:0a747a64a790

gnutls: update to 3.4.17 * src/gnutls-1-fixes.patch: update patch from mxe.cc * src/gnutls.mk: update version, cheksum * src/nettle-1-fixes.patch: update patch from mxe.cc * src/nettle.mk: update version checksum v3.3
author John D
date Wed, 04 Jan 2017 08:32:20 -0500
parents 9d1dbbcac6ea
children 0cf6aa8f90de
line wrap: on
line source

This file is part of MXE. See LICENSE.md for licensing information.

Contains ad hoc patches for cross building.

From a769aa5f4edb5a4a7b6dc36d5d9a889f2249a48f 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


diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index f1a4157..9b1ed59 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
 @GNUTLS_REQUIRES_PRIVATE@
 Cflags: -I${includedir}
-- 
2.5.0


From 8afb001057028f6a3c671406c8914540c3b9b6e6 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

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 b126c30..a97d445 100644
--- a/lib/x509/output.c
+++ b/lib/x509/output.c
@@ -34,7 +34,11 @@
 #include <gnutls-idna.h>
 
 #ifdef HAVE_INET_NTOP
-# include <arpa/inet.h>
+# ifdef _WIN32
+#  include <ws2tcpip.h>
+# else
+#  include <arpa/inet.h>
+# endif
 #endif
 
 #define addf _gnutls_buffer_append_printf
-- 
2.5.0


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
 
-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])