Mercurial > mxe-octave
annotate 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 |
| rev | line source |
|---|---|
| 4315 | 1 This file is part of MXE. See LICENSE.md for licensing information. |
| 2389 | 2 |
| 4315 | 3 Contains ad hoc patches for cross building. |
| 2264 | 4 |
| 4315 | 5 From a769aa5f4edb5a4a7b6dc36d5d9a889f2249a48f Mon Sep 17 00:00:00 2001 |
| 3267 | 6 From: Mark Brand <mabrand@mabrand.nl> |
| 7 Date: Mon, 4 Feb 2013 16:11:12 +0100 | |
| 4315 | 8 Subject: [PATCH 1/3] add missing private lib to pc file |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
9 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
10 |
| 3267 | 11 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in |
| 4315 | 12 index f1a4157..9b1ed59 100644 |
| 3267 | 13 --- a/lib/gnutls.pc.in |
| 14 +++ b/lib/gnutls.pc.in | |
| 15 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system | |
| 16 URL: http://www.gnutls.org/ | |
| 17 Version: @VERSION@ | |
| 18 Libs: -L${libdir} -lgnutls | |
| 4315 | 19 -Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ |
| 20 +Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32 | |
| 3267 | 21 @GNUTLS_REQUIRES_PRIVATE@ |
| 22 Cflags: -I${includedir} | |
| 23 -- | |
| 4315 | 24 2.5.0 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
25 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
26 |
| 4315 | 27 From 8afb001057028f6a3c671406c8914540c3b9b6e6 Mon Sep 17 00:00:00 2001 |
| 3824 | 28 From: Mark Brand <mabrand@mabrand.nl> |
| 29 Date: Mon, 24 Nov 2014 08:56:48 +0100 | |
| 4315 | 30 Subject: [PATCH 2/3] windows build fix: ws2tcpip.h supplies inet_ntop |
| 3824 | 31 |
| 32 Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a | |
| 33 | |
| 34 Signed-off-by: Mark Brand <mabrand@mabrand.nl> | |
| 35 | |
| 36 taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html | |
| 37 | |
| 38 diff --git a/lib/x509/output.c b/lib/x509/output.c | |
| 4315 | 39 index b126c30..a97d445 100644 |
| 3824 | 40 --- a/lib/x509/output.c |
| 41 +++ b/lib/x509/output.c | |
| 4315 | 42 @@ -34,7 +34,11 @@ |
| 43 #include <gnutls-idna.h> | |
| 3595 | 44 |
| 3824 | 45 #ifdef HAVE_INET_NTOP |
| 46 -# include <arpa/inet.h> | |
| 47 +# ifdef _WIN32 | |
| 48 +# include <ws2tcpip.h> | |
| 49 +# else | |
| 50 +# include <arpa/inet.h> | |
| 51 +# endif | |
| 52 #endif | |
| 3595 | 53 |
| 3824 | 54 #define addf _gnutls_buffer_append_printf |
| 3595 | 55 -- |
| 4315 | 56 2.5.0 |
| 57 | |
| 3595 | 58 |
| 4315 | 59 diff -ur gnutls-3.4.17.orig/configure.ac gnutls-3.4.17/configure.ac |
| 60 --- gnutls-3.4.17.orig/configure.ac 2017-01-02 10:05:15.291188739 -0500 | |
| 61 +++ gnutls-3.4.17/configure.ac 2017-01-02 10:06:04.003488874 -0500 | |
| 62 @@ -26,7 +26,7 @@ | |
| 63 AC_CONFIG_MACRO_DIR([m4]) | |
| 64 AC_CANONICAL_HOST | |
| 65 | |
| 66 -AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) | |
| 67 +AM_INIT_AUTOMAKE([1.11.6 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override]) | |
| 68 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | |
| 69 AC_CONFIG_HEADERS([config.h]) | |
| 70 |