diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2017-01-14 09:35:17 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2017-01-14 09:45:51 (GMT) |
| commit | 8296c6236417141eb5f885280e1104bfd71b37c8 (patch) | |
| tree | b63adff381f81bbfe09a31f949f6d8325bf2d0be /src/gnutls-1-fixes.patch | |
| parent | f4ffc90ba5dabb3166f87d3343208fc4b58cf4a7 (diff) | |
| download | mxe-8296c6236417141eb5f885280e1104bfd71b37c8.zip mxe-8296c6236417141eb5f885280e1104bfd71b37c8.tar.gz mxe-8296c6236417141eb5f885280e1104bfd71b37c8.tar.bz2 | |
update gnutls (new stable branch 3.5)
Diffstat (limited to 'src/gnutls-1-fixes.patch')
| -rw-r--r-- | src/gnutls-1-fixes.patch | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index 33f4822..17c0164 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -1,33 +1,31 @@ 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 7b62567c0820dd34afc177502638c702177dac39 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/2] add missing private lib to pc file diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in -index f1a4157..9b1ed59 100644 +index 441b45d..9e2880a 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: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@ ++Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBNSL@ @LTLIBPTHREAD@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ @LTLIBUNISTRING@ -lcrypt32 @GNUTLS_REQUIRES_PRIVATE@ Cflags: -I${includedir} -- -2.5.0 +2.9.3 -From 8afb001057028f6a3c671406c8914540c3b9b6e6 Mon Sep 17 00:00:00 2001 +From ed39e9884ea4a2ce8bd76e66d85d0579312517cd 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/2] windows build fix: ws2tcpip.h supplies inet_ntop Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a @@ -35,12 +33,12 @@ 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> +diff --git a/lib/x509/ip.c b/lib/x509/ip.c +index b4b31a4..85f1300 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,8 +49,7 @@ index b126c30..a97d445 100644 +# endif #endif - #define addf _gnutls_buffer_append_printf + /*- -- -2.5.0 - +2.9.3 |