diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-12-13 09:05:13 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-12-13 09:05:13 (GMT) |
| commit | 546676a245ab482be9663a9f60585c7775b33fce (patch) | |
| tree | 412c8bab3220f97d024a188e1aad46b15f29d228 /src/gnutls-1-fixes.patch | |
| parent | 62906f9c9d5749ec78cac06e1687b48bd6b6f9ac (diff) | |
| download | mxe-546676a245ab482be9663a9f60585c7775b33fce.zip mxe-546676a245ab482be9663a9f60585c7775b33fce.tar.gz mxe-546676a245ab482be9663a9f60585c7775b33fce.tar.bz2 | |
update freetds, gnutls, libgpg_error
Diffstat (limited to 'src/gnutls-1-fixes.patch')
| -rw-r--r-- | src/gnutls-1-fixes.patch | 52 |
1 files changed, 40 insertions, 12 deletions
diff --git a/src/gnutls-1-fixes.patch b/src/gnutls-1-fixes.patch index d8f1bca..a79b295 100644 --- a/src/gnutls-1-fixes.patch +++ b/src/gnutls-1-fixes.patch @@ -3,32 +3,32 @@ See index.html for further information. Contains ad hoc patches for cross building. -From 239dc102017197025ef37cda8fa26b3750f18fb9 Mon Sep 17 00:00:00 2001 -From: MXE +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/2] add missing private lib to pc file +Subject: [PATCH 1/3] add missing private lib to pc file diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in -index a25fcdf..3860c68 100644 +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: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -+Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32 +-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.3.2 (Apple Git-55) +2.5.0 -From 02e79ee0c18ff148e315c223675370ad11673bf6 Mon Sep 17 00:00:00 2001 -From: MXE +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/2] windows build fix: ws2tcpip.h supplies inet_ntop +Subject: [PATCH 2/3] windows build fix: ws2tcpip.h supplies inet_ntop Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a @@ -37,7 +37,7 @@ 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 e82fe84..2e62418 100644 +index b126c30..a97d445 100644 --- a/lib/x509/output.c +++ b/lib/x509/output.c @@ -34,7 +34,11 @@ @@ -54,5 +54,33 @@ index e82fe84..2e62418 100644 #define addf _gnutls_buffer_append_printf -- -2.3.2 (Apple Git-55) +2.5.0 + + +From 46316cbe2097bfebc0681819ae11df4b77a1315d Mon Sep 17 00:00:00 2001 +From: Nikos Mavrogiannopoulos <nmav@redhat.com> +Date: Tue, 24 Nov 2015 12:54:32 +0100 +Subject: [PATCH 3/3] tools: don't call endservent in windows + + +diff --git a/src/socket.c b/src/socket.c +index 8991089..be8a4a1 100644 +--- a/src/socket.c ++++ b/src/socket.c +@@ -33,8 +33,11 @@ + #include <stdlib.h> + #include <unistd.h> + #ifndef _WIN32 +-#include <arpa/inet.h> +-#include <signal.h> ++# include <arpa/inet.h> ++# include <signal.h> ++#else ++# undef endservent ++# define endservent() + #endif + #include <socket.h> + #include <c-ctype.h> +-- +2.5.0 |