1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
|
This file is part of MXE.
See index.html for further information.
Contains ad hoc patches for cross building.
From 36503de724d45b8c5dc9ea06a306d6648cf444aa Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 24 Nov 2011 15:06:06 +0100
Subject: [PATCH 1/6] disable doc and test (mingw-cross-env specific)
diff --git a/Makefile.am b/Makefile.am
index c4a4bfa..78943a7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --disable-valgrind-tests
SUBDIRS = gl lib extra libdane po
-SUBDIRS += src doc tests
+SUBDIRS += src
if HAVE_GUILE
SUBDIRS += guile
--
1.7.10.4
From 53dee0b90e8018b27ebd91ce44606d69ad18eb97 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Tue, 3 Apr 2012 13:58:42 +0200
Subject: [PATCH 2/6] Revert "make dist will also make lzip compressed
tarball"
This reverts commit 97ac1bc58274f651338444693bd75441ba12f46f.
diff --git a/configure.ac b/configure.ac
index 1047442..cff91bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.7], [bug-gnutls@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz dist-lzip -Wall -Werror -Wno-override])
+AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Werror -Wno-override])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([config.h])
--
1.7.10.4
From ec72b114f6a07986a71880707cb6cc197e7ed674 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 6 Jun 2012 09:57:24 +0200
Subject: [PATCH 3/6] AM_PROG_AR for automake 1.12 compatibility
Taken from
http://lists.gnu.org/archive/html/automake/2012-05/msg00014.html
diff --git a/configure.ac b/configure.ac
index cff91bb..847bcdb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ dnl Checks for programs.
AC_PROG_CC
AM_PROG_AS
AC_PROG_CXX
+m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
gl_EARLY
# For includes/gnutls/gnutls.h.in.
--
1.7.10.4
From 2d8e156262d39aa281988f844f40d3f006b12e63 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 16 Aug 2012 11:13:47 +0200
Subject: [PATCH 4/6] allow automake warnings not to be errors
diff --git a/configure.ac b/configure.ac
index 847bcdb..38465c4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_INIT([GnuTLS], [3.1.7], [bug-gnutls@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Werror -Wno-override])
+AM_INIT_AUTOMAKE([1.11.3 no-dist-gzip dist-xz -Wall -Wno-override])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_HEADERS([config.h])
--
1.7.10.4
From 4376d4f5bc04f3118babb5eed7c4bb67fd2d8c1b Mon Sep 17 00:00:00 2001
From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Mon, 4 Feb 2013 18:12:31 +0100
Subject: [PATCH 5/6] Corrected typo. Reported by Mark Brand. (cherry picked
from commit b94c3e7c6e8fba6a66a83efabd6376726eac3ba6)
diff --git a/lib/nettle/rnd.c b/lib/nettle/rnd.c
index 4c91827..b2883ee 100644
--- a/lib/nettle/rnd.c
+++ b/lib/nettle/rnd.c
@@ -164,7 +164,7 @@ do_device_source (int init)
}
if ((device_fd != 0)
- && (init || timespec_sub_sec(¤t_time, &device_last_read) > DEVICE_READ_INTERVAL)))
+ && (init || timespec_sub_sec(¤t_time, &device_last_read) > DEVICE_READ_INTERVAL))
{
/* More than 20 minutes since we last read the device */
--
1.7.10.4
From 5a063bc916d00fc40d2f3f53a76d78e5ac638cba Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 4 Feb 2013 16:11:12 +0100
Subject: [PATCH 6/6] add missing private lib to pc file
diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in
index 5e2ae11..1b9952a 100644
--- a/lib/gnutls.pc.in
+++ b/lib/gnutls.pc.in
@@ -19,6 +19,6 @@ Description: Transport Security Layer implementation for the GNU system
URL: http://www.gnu.org/software/gnutls/
Version: @VERSION@
Libs: -L${libdir} -lgnutls
-Libs.private: @LTLIBNETTLE@ @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @LIB_CLOCK_GETTIME@
+Libs.private: @LTLIBNETTLE@ @LTLIBZ@ @LTLIBINTL@ @LIBSOCKET@ @LTLIBPTHREAD@ @LTLIBICONV@ @P11_KIT_LIBS@ @LIB_SELECT@ @TSS_LIBS@ @LIB_CLOCK_GETTIME@ -lcrypt32
@GNUTLS_REQUIRES_PRIVATE@
Cflags: -I${includedir}
--
1.7.10.4
|
