Mercurial > mxe-octave
annotate src/gnutls-1-fixes.patch @ 2641:832d15e602a6
package gnutls: revert to ver 3.0.19
3.0.20 uses CertEnumCRLsInStore which is missing from our winapi
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Thu, 21 Jun 2012 22:47:10 +0200 |
| parents | 94d12f0e052c |
| children | 185b0c693c77 |
| 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 |
| 4 Contains ad hoc patches for cross building. | |
| 5 | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
6 From 18aa82eb060ca9ded9720091300a6c31af8382a9 Mon Sep 17 00:00:00 2001 |
| 2389 | 7 From: Mark Brand <mabrand@mabrand.nl> |
| 2057 | 8 Date: Fri, 28 Oct 2011 09:23:41 +0200 |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
9 Subject: [PATCH 1/4] add missing static library linking |
| 1923 | 10 |
| 2389 | 11 --- |
| 12 lib/gnutls.pc.in | 2 +- | |
| 13 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 1923 | 14 |
| 15 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in | |
| 2246 | 16 index c45f8f3..57d0dbb 100644 |
| 1923 | 17 --- a/lib/gnutls.pc.in |
| 18 +++ b/lib/gnutls.pc.in | |
| 2246 | 19 @@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system |
| 1923 | 20 URL: http://www.gnu.org/software/gnutls/ |
| 21 Version: @VERSION@ | |
| 22 Libs: -L${libdir} -lgnutls | |
| 2057 | 23 -Libs.private: @LTLIBNETTLE@ |
| 2128 | 24 +Libs.private: @LTLIBNETTLE@ @LIBS@ |
| 1923 | 25 @GNUTLS_REQUIRES_PRIVATE@ |
| 26 Cflags: -I${includedir} | |
| 27 -- | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
28 1.7.10.4 |
| 2128 | 29 |
| 1923 | 30 |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
31 From bd254ee873a2f7d6027661beae5d88372f10aa93 Mon Sep 17 00:00:00 2001 |
| 2389 | 32 From: Mark Brand <mabrand@mabrand.nl> |
| 2128 | 33 Date: Thu, 24 Nov 2011 15:06:06 +0100 |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
34 Subject: [PATCH 2/4] disable doc and test (mingw-cross-env specific) |
| 2128 | 35 |
| 2389 | 36 --- |
| 37 Makefile.am | 2 +- | |
| 38 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 2128 | 39 |
| 40 diff --git a/Makefile.am b/Makefile.am | |
| 2264 | 41 index 0afe4bd..da7436a 100644 |
| 2128 | 42 --- a/Makefile.am |
| 43 +++ b/Makefile.am | |
| 2246 | 44 @@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests |
| 2128 | 45 |
| 2246 | 46 SUBDIRS = gl lib extra po |
| 2128 | 47 |
| 2246 | 48 -SUBDIRS += src doc tests |
| 49 +SUBDIRS += src | |
| 2128 | 50 |
| 51 if HAVE_GUILE | |
| 52 SUBDIRS += guile | |
| 53 -- | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
54 1.7.10.4 |
| 2264 | 55 |
| 2389 | 56 |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
57 From dce8795ce40246c87fc83d1879f02c9923dba2ed Mon Sep 17 00:00:00 2001 |
| 2389 | 58 From: Mark Brand <mabrand@mabrand.nl> |
| 59 Date: Tue, 3 Apr 2012 13:58:42 +0200 | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
60 Subject: [PATCH 3/4] Revert "make dist will also make lzip compressed |
| 2389 | 61 tarball" |
| 62 | |
| 63 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. | |
| 64 --- | |
| 65 configure.ac | 2 +- | |
| 66 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 67 | |
| 68 diff --git a/configure.ac b/configure.ac | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
69 index 0ad765c..74b778e 100644 |
| 2389 | 70 --- a/configure.ac |
| 71 +++ b/configure.ac | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
72 @@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.0.19], [bug-gnutls@gnu.org]) |
| 2389 | 73 AC_CONFIG_AUX_DIR([build-aux]) |
| 74 AC_CONFIG_MACRO_DIR([m4]) | |
| 75 | |
| 76 -AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override]) | |
| 77 +AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz -Wall -Werror -Wno-override]) | |
| 78 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) | |
| 79 AM_CONFIG_HEADER(config.h) | |
| 80 | |
| 81 -- | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
82 1.7.10.4 |
| 2389 | 83 |
| 2570 | 84 |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
85 From ae55a00b99a60b65e459ebe7ada215ace70b56db Mon Sep 17 00:00:00 2001 |
| 2570 | 86 From: Mark Brand <mabrand@mabrand.nl> |
| 87 Date: Wed, 6 Jun 2012 09:57:24 +0200 | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
88 Subject: [PATCH 4/4] AM_PROG_AR for automake 1.12 compatibility |
| 2570 | 89 |
| 90 Taken from | |
| 91 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html | |
| 92 --- | |
| 93 configure.ac | 1 + | |
| 94 1 file changed, 1 insertion(+) | |
| 95 | |
| 96 diff --git a/configure.ac b/configure.ac | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
97 index 74b778e..d045aaf 100644 |
| 2570 | 98 --- a/configure.ac |
| 99 +++ b/configure.ac | |
| 100 @@ -37,6 +37,7 @@ dnl Checks for programs. | |
| 101 AC_PROG_CC | |
| 102 AM_PROG_AS | |
| 103 AC_PROG_CXX | |
| 104 +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) | |
| 105 gl_EARLY | |
| 106 | |
| 107 # For includes/gnutls/gnutls.h.in. | |
| 108 -- | |
|
2641
832d15e602a6
package gnutls: revert to ver 3.0.19
Mark Brand <mabrand@mabrand.nl>
parents:
2570
diff
changeset
|
109 1.7.10.4 |
| 2570 | 110 |