Mercurial > mxe-octave

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
4314:dbe6064ffb0f 4315:0a747a64a790
1 This file is part of MXE. 1 This file is part of MXE. See LICENSE.md for licensing information.
2 See index.html for further information.
3 2
4 From 9b8bd267588f9c7e15b50bf6f7754837deb8b301 Mon Sep 17 00:00:00 2001 3 Contains ad hoc patches for cross building.
5 From: Mark Brand <mabrand@mabrand.nl>
6 Date: Tue, 3 Apr 2012 13:58:42 +0200
7 Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball"
8 4
9 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. 5 From a769aa5f4edb5a4a7b6dc36d5d9a889f2249a48f Mon Sep 17 00:00:00 2001
10
11 diff --git a/configure.ac b/configure.ac
12 index 3e5b79d..99f3636 100644
13 --- a/configure.ac
14 +++ b/configure.ac
15 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
16 AC_CONFIG_MACRO_DIR([m4])
17 AC_CANONICAL_HOST
18
19 -AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz dist-lzip -Wall -Wno-override])
20 +AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override])
21 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
22 AC_CONFIG_HEADERS([config.h])
23
24 --
25 2.1.2
26
27
28 From da0afaf172601c7bc434f35a4d02c13811fcaee7 Mon Sep 17 00:00:00 2001
29 From: Mark Brand <mabrand@mabrand.nl>
30 Date: Wed, 6 Jun 2012 09:57:24 +0200
31 Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility
32
33 Taken from
34 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
35
36 diff --git a/configure.ac b/configure.ac
37 index 99f3636..8c1b4fd 100644
38 --- a/configure.ac
39 +++ b/configure.ac
40 @@ -42,6 +42,7 @@ ggl_EARLY
41 AM_PROG_AS
42 AM_PROG_AR
43 AC_PROG_CXX
44 +m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
45 AM_PROG_CC_C_O
46 AC_PROG_YACC
47 AC_PROG_SED
48 --
49 2.1.2
50
51
52 From 4a98dd8e1a9c6d2d1f1e190f94582ab259435c84 Mon Sep 17 00:00:00 2001
53 From: Mark Brand <mabrand@mabrand.nl> 6 From: Mark Brand <mabrand@mabrand.nl>
54 Date: Mon, 4 Feb 2013 16:11:12 +0100 7 Date: Mon, 4 Feb 2013 16:11:12 +0100
55 Subject: [PATCH 3/5] add missing private lib to pc file 8 Subject: [PATCH 1/3] add missing private lib to pc file
56 9
57 10
58 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in 11 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
59 index a25fcdf..3860c68 100644 12 index f1a4157..9b1ed59 100644
60 --- a/lib/gnutls.pc.in 13 --- a/lib/gnutls.pc.in
61 +++ b/lib/gnutls.pc.in 14 +++ b/lib/gnutls.pc.in
62 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system 15 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
63 URL: http://www.gnutls.org/ 16 URL: http://www.gnutls.org/
64 Version: @VERSION@ 17 Version: @VERSION@
65 Libs: -L${libdir} -lgnutls 18 Libs: -L${libdir} -lgnutls
66 -Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ 19 -Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@
67 +Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32 20 +Libs.private: @LIBZ@ @LIBINTL@ @LIBSOCKET@ @LIBPTHREAD@ @LIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32
68 @GNUTLS_REQUIRES_PRIVATE@ 21 @GNUTLS_REQUIRES_PRIVATE@
69 Cflags: -I${includedir} 22 Cflags: -I${includedir}
70 -- 23 --
71 2.1.2 24 2.5.0
72 25
73 26
74 From 57ffca60a0d61c4b58e27f6ee7f9b2770b0011b6 Mon Sep 17 00:00:00 2001 27 From 8afb001057028f6a3c671406c8914540c3b9b6e6 Mon Sep 17 00:00:00 2001
75 From: Tony Theodore <tonyt@logyst.com>
76 Date: Wed, 6 Feb 2013 08:43:43 +0100
77 Subject: [PATCH 4/5] relax automake version check
78
79
80 diff --git a/configure.ac b/configure.ac
81 index 8c1b4fd..efa13e8 100644
82 --- a/configure.ac
83 +++ b/configure.ac
84 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
85 AC_CONFIG_MACRO_DIR([m4])
86 AC_CANONICAL_HOST
87
88 -AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override])
89 +AM_INIT_AUTOMAKE([1.11.1 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override])
90 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
91 AC_CONFIG_HEADERS([config.h])
92
93 --
94 2.1.2
95
96
97 From e6872f0073970fabe4cc267feebb8bad98756f72 Mon Sep 17 00:00:00 2001
98 From: Mark Brand <mabrand@mabrand.nl> 28 From: Mark Brand <mabrand@mabrand.nl>
99 Date: Mon, 24 Nov 2014 08:56:48 +0100 29 Date: Mon, 24 Nov 2014 08:56:48 +0100
100 Subject: [PATCH 5/5] windows build fix: ws2tcpip.h supplies inet_ntop 30 Subject: [PATCH 2/3] windows build fix: ws2tcpip.h supplies inet_ntop
101 31
102 Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a 32 Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a
103 33
104 Signed-off-by: Mark Brand <mabrand@mabrand.nl> 34 Signed-off-by: Mark Brand <mabrand@mabrand.nl>
105 35
106 taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html 36 taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html
107 37
108 diff --git a/lib/x509/output.c b/lib/x509/output.c 38 diff --git a/lib/x509/output.c b/lib/x509/output.c
109 index bf01834..1ec18de 100644 39 index b126c30..a97d445 100644
110 --- a/lib/x509/output.c 40 --- a/lib/x509/output.c
111 +++ b/lib/x509/output.c 41 +++ b/lib/x509/output.c
112 @@ -32,7 +32,11 @@ 42 @@ -34,7 +34,11 @@
113 #include <extras/randomart.h> 43 #include <gnutls-idna.h>
114 44
115 #ifdef HAVE_INET_NTOP 45 #ifdef HAVE_INET_NTOP
116 -# include <arpa/inet.h> 46 -# include <arpa/inet.h>
117 +# ifdef _WIN32 47 +# ifdef _WIN32
118 +# include <ws2tcpip.h> 48 +# include <ws2tcpip.h>
121 +# endif 51 +# endif
122 #endif 52 #endif
123 53
124 #define addf _gnutls_buffer_append_printf 54 #define addf _gnutls_buffer_append_printf
125 -- 55 --
126 2.1.2 56 2.5.0
127 57
58
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