Mercurial > mxe-octave

comparison src/gnutls-1-fixes.patch @ 3595:fc2b5e19d737

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnutls: update to 3.2.14 * src/gnutls.mk: update to version 3.2.14 * src/gnutls-1-fixes.patch: update to latest mxe_devel patch. * src/gnutls-2-ldadd.patch: remove patch file. * dist-files.mk: remove gnutls-2-ldadd.patch.
author John Donoghue
date Mon, 12 May 2014 15:59:57 -0400
parents cce4bedf4c3d
children 9d1dbbcac6ea
comparison
equal deleted inserted replaced
3594:30f4b78227af 3595:fc2b5e19d737
1 This file is part of MXE. 1 This file is part of MXE.
2 See index.html for further information. 2 See index.html for further information.
3 3
4 From 05cd16c35674665009d16f2469b9124c16638237 Mon Sep 17 00:00:00 2001 4 From dbae911f9d1b79fde473c1ca23e5535c7d1db39c Mon Sep 17 00:00:00 2001
5 From: Mark Brand <mabrand@mabrand.nl> 5 From: Mark Brand <mabrand@mabrand.nl>
6 Date: Tue, 3 Apr 2012 13:58:42 +0200 6 Date: Tue, 3 Apr 2012 13:58:42 +0200
7 Subject: [PATCH 1/4] Revert "make dist will also make lzip compressed tarball" 7 Subject: [PATCH 1/5] Revert "make dist will also make lzip compressed tarball"
8 8
9 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f. 9 This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
10 10
11 diff --git a/configure.ac b/configure.ac 11 diff --git a/configure.ac b/configure.ac
12 index 6459403..f8dd727 100644 12 index a81d85f..44fe48a 100644
13 --- a/configure.ac 13 --- a/configure.ac
14 +++ b/configure.ac 14 +++ b/configure.ac
15 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) 15 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
16 AC_CONFIG_MACRO_DIR([m4]) 16 AC_CONFIG_MACRO_DIR([m4])
17 AC_CANONICAL_HOST 17 AC_CANONICAL_HOST
18 18
19 -AM_INIT_AUTOMAKE([1.12.2 no-dist-gzip dist-xz dist-lzip -Wall -Wno-override]) 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 no-dist-gzip dist-xz -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])]) 21 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
22 AC_CONFIG_HEADERS([config.h]) 22 AC_CONFIG_HEADERS([config.h])
23 23
24 -- 24 --
25 1.8.1.4 25 1.8.4.5
26 26
27 27
28 From 6d7644c82de49b38afda2a171d1195861ebd9db0 Mon Sep 17 00:00:00 2001 28 From 951caab5f444f0c90cb43b5937c7273963e443d8 Mon Sep 17 00:00:00 2001
29 From: Mark Brand <mabrand@mabrand.nl> 29 From: Mark Brand <mabrand@mabrand.nl>
30 Date: Wed, 6 Jun 2012 09:57:24 +0200 30 Date: Wed, 6 Jun 2012 09:57:24 +0200
31 Subject: [PATCH 2/4] AM_PROG_AR for automake 1.12 compatibility 31 Subject: [PATCH 2/5] AM_PROG_AR for automake 1.12 compatibility
32 32
33 Taken from 33 Taken from
34 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html 34 http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
35 35
36 diff --git a/configure.ac b/configure.ac 36 diff --git a/configure.ac b/configure.ac
37 index f8dd727..2c05458 100644 37 index 44fe48a..1e80e23 100644
38 --- a/configure.ac 38 --- a/configure.ac
39 +++ b/configure.ac 39 +++ b/configure.ac
40 @@ -40,6 +40,7 @@ gl_EARLY 40 @@ -41,6 +41,7 @@ ggl_EARLY
41 AM_PROG_AS 41 AM_PROG_AS
42 AM_PROG_AR 42 AM_PROG_AR
43 AC_PROG_CXX 43 AC_PROG_CXX
44 +m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) 44 +m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
45 45 AM_PROG_CC_C_O
46 # For includes/gnutls/gnutls.h.in. 46 AC_PROG_YACC
47 AC_SUBST(MAJOR_VERSION, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`) 47 AC_CHECK_PROG([AUTOGEN], [autogen], [autogen], [/bin/true])
48 -- 48 --
49 1.8.1.4 49 1.8.4.5
50 50
51 51
52 From 7afa4d386bb2076890113a5d4e665c39583ff025 Mon Sep 17 00:00:00 2001 52 From ade9bae0c0af5b6eec402c228c8d048e8a7b5ce6 Mon Sep 17 00:00:00 2001
53 From: Mark Brand <mabrand@mabrand.nl> 53 From: Mark Brand <mabrand@mabrand.nl>
54 Date: Mon, 4 Feb 2013 16:11:12 +0100 54 Date: Mon, 4 Feb 2013 16:11:12 +0100
55 Subject: [PATCH 3/4] add missing private lib to pc file 55 Subject: [PATCH 3/5] add missing private lib to pc file
56 56
57 57
58 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in 58 diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
59 index a25fcdf..3860c68 100644 59 index a25fcdf..3860c68 100644
60 --- a/lib/gnutls.pc.in 60 --- a/lib/gnutls.pc.in
66 -Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ 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 67 +Libs.private: @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @GMP_LIBS@ -lcrypt32
68 @GNUTLS_REQUIRES_PRIVATE@ 68 @GNUTLS_REQUIRES_PRIVATE@
69 Cflags: -I${includedir} 69 Cflags: -I${includedir}
70 -- 70 --
71 1.8.1.4 71 1.8.4.5
72 72
73 73
74 From 903e858e59718f03fd3b3bef00fab897b0313007 Mon Sep 17 00:00:00 2001 74 From 36afa9bd2427b6c71c49c832d8a06686920ac8c9 Mon Sep 17 00:00:00 2001
75 From: Tony Theodore <tonyt@logyst.com> 75 From: Tony Theodore <tonyt@logyst.com>
76 Date: Wed, 6 Feb 2013 08:43:43 +0100 76 Date: Wed, 6 Feb 2013 08:43:43 +0100
77 Subject: [PATCH 4/4] relax automake version check 77 Subject: [PATCH 4/5] relax automake version check
78 78
79 79
80 diff --git a/configure.ac b/configure.ac 80 diff --git a/configure.ac b/configure.ac
81 index 2c05458..dd45228 100644 81 index 1e80e23..0415ead 100644
82 --- a/configure.ac 82 --- a/configure.ac
83 +++ b/configure.ac 83 +++ b/configure.ac
84 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux]) 84 @@ -26,7 +26,7 @@ AC_CONFIG_AUX_DIR([build-aux])
85 AC_CONFIG_MACRO_DIR([m4]) 85 AC_CONFIG_MACRO_DIR([m4])
86 AC_CANONICAL_HOST 86 AC_CANONICAL_HOST
87 87
88 -AM_INIT_AUTOMAKE([1.12.2 no-dist-gzip dist-xz -Wall -Wno-override]) 88 -AM_INIT_AUTOMAKE([1.12.2 subdir-objects no-dist-gzip dist-xz -Wall -Wno-override])
89 +AM_INIT_AUTOMAKE([1.11.1 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])]) 90 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
91 AC_CONFIG_HEADERS([config.h]) 91 AC_CONFIG_HEADERS([config.h])
92 92
93 -- 93 --
94 1.8.1.4 94 1.8.4.5
95 95
96
97 From fc0b1030e357d2de86417a1a442d5ef3643e6fc0 Mon Sep 17 00:00:00 2001
98 From: Mark Brand <mabrand@mabrand.nl>
99 Date: Wed, 5 Feb 2014 09:42:41 +0100
100 Subject: [PATCH 5/5] gnulib fix-ups for error, setenv, unsetenv
101
102
103 diff --git a/src/gl/Makefile.am b/src/gl/Makefile.am
104 index c25328d..14d592b 100644
105 --- a/src/gl/Makefile.am
106 +++ b/src/gl/Makefile.am
107 @@ -121,7 +121,7 @@ EXTRA_DIST += errno.in.h
108
109 EXTRA_DIST += error.c error.h
110
111 -EXTRA_libgnu_gpl_la_SOURCES += error.c
112 +libgnu_gpl_la_SOURCES += error.c
113
114 ## end gnulib module error
115
116 @@ -230,7 +230,7 @@ libgnu_gpl_la_SOURCES += progname.h progname.c
117
118 EXTRA_DIST += setenv.c
119
120 -EXTRA_libgnu_gpl_la_SOURCES += setenv.c
121 +libgnu_gpl_la_SOURCES += setenv.c
122
123 ## end gnulib module setenv
124
125 @@ -914,7 +914,7 @@ EXTRA_DIST += unistd.in.h
126
127 EXTRA_DIST += unsetenv.c
128
129 -EXTRA_libgnu_gpl_la_SOURCES += unsetenv.c
130 +libgnu_gpl_la_SOURCES += unsetenv.c
131
132 ## end gnulib module unsetenv
133
134 --
135 1.8.4.5
136