Mercurial > mxe-octave
annotate src/gnutls-1-fixes.patch @ 3824:9d1dbbcac6ea
gnutls: update gnutls from mxe.cc
* src/gnutls.mk: update checksum, version, autoreconf
* src/gnutls-1-fixes.patch: update patch from mxe.cc (devel)
| author | John Donoghue |
|---|---|
| date | Tue, 03 Mar 2015 12:15:18 -0500 |
| parents | fc2b5e19d737 |
| children | 0a747a64a790 |
| rev | line source |
|---|---|
|
2333
f653602a0500
Rebrand to new project name MXE
Volker Grabsch <vog@notjusthosting.com>
parents:
2285
diff
changeset
|
1 This file is part of MXE. |
|
2353
99516e73b368
Move doc/index.html -> index.html
Volker Grabsch <vog@notjusthosting.com>
parents:
2333
diff
changeset
|
2 See index.html for further information. |
| 1923 | 3 |
| 3824 | 4 From 9b8bd267588f9c7e15b50bf6f7754837deb8b301 Mon Sep 17 00:00:00 2001 |
| 2389 | 5 From: Mark Brand <mabrand@mabrand.nl> |
| 6 Date: Tue, 3 Apr 2012 13:58:42 +0200 | |
| 3595 | 7 Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball" |
| 2389 | 8 |
| 9 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. | |
| 10 | |
| 11 diff --git a/configure.ac b/configure.ac | |
| 3824 | 12 index 3e5b79d..99f3636 100644 |
| 2389 | 13 --- a/configure.ac |
| 14 +++ b/configure.ac | |
| 3267 | 15 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) |
| 2389 | 16 AC_CONFIG_MACRO_DIR([m4]) |
| 3267 | 17 AC_CANONICAL_HOST |
| 2389 | 18 |
| 3595 | 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]) | |
| 2389 | 21 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
| 3267 | 22 AC_CONFIG_HEADERS([config.h]) |
| 2389 | 23 |
| 24 -- | |
| 3824 | 25 2.1.2 |
| 2389 | 26 |
| 2570 | 27 |
| 3824 | 28 From da0afaf172601c7bc434f35a4d02c13811fcaee7 Mon Sep 17 00:00:00 2001 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
29 From: Mark Brand <mabrand@mabrand.nl> |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
30 Date: Wed, 6 Jun 2012 09:57:24 +0200 |
| 3595 | 31 Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
32 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
33 Taken from |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
34 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html |
| 2264 | 35 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
36 diff --git a/configure.ac b/configure.ac |
| 3824 | 37 index 99f3636..8c1b4fd 100644 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
38 --- a/configure.ac |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
39 +++ b/configure.ac |
| 3824 | 40 @@ -42,6 +42,7 @@ ggl_EARLY |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
41 AM_PROG_AS |
| 3267 | 42 AM_PROG_AR |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
43 AC_PROG_CXX |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
44 +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) |
| 3595 | 45 AM_PROG_CC_C_O |
| 46 AC_PROG_YACC | |
| 3824 | 47 AC_PROG_SED |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
48 -- |
| 3824 | 49 2.1.2 |
| 3267 | 50 |
| 51 | |
| 3824 | 52 From 4a98dd8e1a9c6d2d1f1e190f94582ab259435c84 Mon Sep 17 00:00:00 2001 |
| 3267 | 53 From: Mark Brand <mabrand@mabrand.nl> |
| 54 Date: Mon, 4 Feb 2013 16:11:12 +0100 | |
| 3595 | 55 Subject: [PATCH 3/5] add missing private lib to pc file |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
56 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
57 |
| 3267 | 58 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in |
| 59 index a25fcdf..3860c68 100644 | |
| 60 --- a/lib/gnutls.pc.in | |
| 61 +++ b/lib/gnutls.pc.in | |
| 62 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system | |
| 63 URL: http://www.gnutls.org/ | |
| 64 Version: @VERSION@ | |
| 65 Libs: -L${libdir} -lgnutls | |
| 66 -Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @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 | |
| 68 @GNUTLS_REQUIRES_PRIVATE@ | |
| 69 Cflags: -I${includedir} | |
| 70 -- | |
| 3824 | 71 2.1.2 |
| 3267 | 72 |
| 73 | |
| 3824 | 74 From 57ffca60a0d61c4b58e27f6ee7f9b2770b0011b6 Mon Sep 17 00:00:00 2001 |
| 3267 | 75 From: Tony Theodore <tonyt@logyst.com> |
| 76 Date: Wed, 6 Feb 2013 08:43:43 +0100 | |
| 3595 | 77 Subject: [PATCH 4/5] relax automake version check |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
78 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
79 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
80 diff --git a/configure.ac b/configure.ac |
| 3824 | 81 index 8c1b4fd..efa13e8 100644 |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
82 --- a/configure.ac |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
83 +++ b/configure.ac |
| 3267 | 84 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
85 AC_CONFIG_MACRO_DIR([m4]) |
| 3267 | 86 AC_CANONICAL_HOST |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
87 |
| 3595 | 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]) | |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
90 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) |
| 3267 | 91 AC_CONFIG_HEADERS([config.h]) |
|
2748
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
92 |
|
3dc2260fa84d
package gnutls: automake 1.12 compatibility
Mark Brand <mabrand@mabrand.nl>
parents:
2353
diff
changeset
|
93 -- |
| 3824 | 94 2.1.2 |
| 3595 | 95 |
| 2768 | 96 |
| 3824 | 97 From e6872f0073970fabe4cc267feebb8bad98756f72 Mon Sep 17 00:00:00 2001 |
| 98 From: Mark Brand <mabrand@mabrand.nl> | |
| 99 Date: Mon, 24 Nov 2014 08:56:48 +0100 | |
| 100 Subject: [PATCH 5/5] windows build fix: ws2tcpip.h supplies inet_ntop | |
| 101 | |
| 102 Follow-up to 492c2b937ab66134d0b37499a6f3a747e19bc31a | |
| 103 | |
| 104 Signed-off-by: Mark Brand <mabrand@mabrand.nl> | |
| 105 | |
| 106 taken from: http://lists.gnutls.org/pipermail/gnutls-devel/2014-November/007250.html | |
| 107 | |
| 108 diff --git a/lib/x509/output.c b/lib/x509/output.c | |
| 109 index bf01834..1ec18de 100644 | |
| 110 --- a/lib/x509/output.c | |
| 111 +++ b/lib/x509/output.c | |
| 112 @@ -32,7 +32,11 @@ | |
| 113 #include <extras/randomart.h> | |
| 3595 | 114 |
| 3824 | 115 #ifdef HAVE_INET_NTOP |
| 116 -# include <arpa/inet.h> | |
| 117 +# ifdef _WIN32 | |
| 118 +# include <ws2tcpip.h> | |
| 119 +# else | |
| 120 +# include <arpa/inet.h> | |
| 121 +# endif | |
| 122 #endif | |
| 3595 | 123 |
| 3824 | 124 #define addf _gnutls_buffer_append_printf |
| 3595 | 125 -- |
| 3824 | 126 2.1.2 |
| 3595 | 127 |