summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnutls/gnutls-2.12.17
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls-2.12.17')
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.17/configure-fix.patch65
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.17/correct_rpl_gettimeofday_signature.patch57
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch46
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-openssl.patch126
-rw-r--r--meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-texinfo-euro.patch18
5 files changed, 312 insertions, 0 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.17/configure-fix.patch
new file mode 100644
index 0000000000..14f87e03d3
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.17/configure-fix.patch
@@ -0,0 +1,65 @@
1Upstream-Status: Inappropriate [distribution]
2
3rebased from original configure_madness.patch
4
5libtasn1 provides an .pc file in upstream,
6and a libgcrypt.pc is added in libgcrypt recipe,
7so use Requires.private for these two.
8
9against 2.8.6
10
1107/02/2010 - qhe
12
13---
14Index: gnutls-2.12.11/lib/configure.ac
15===================================================================
16--- gnutls-2.12.11.orig/lib/configure.ac
17+++ gnutls-2.12.11/lib/configure.ac
18@@ -126,8 +126,8 @@ lgl_INIT
19 AC_CHECK_FUNCS(getrusage,,)
20 AC_LIB_HAVE_LINKFLAGS(pthread,, [#include <pthread.h>], [pthread_mutex_lock (0);])
21
22-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS"
23-LIBGNUTLS_CFLAGS="-I${includedir}"
24+LIBGNUTLS_LIBS="-lgnutls $LIBS"
25+LIBGNUTLS_CFLAGS=""
26 AC_SUBST(LIBGNUTLS_LIBS)
27 AC_SUBST(LIBGNUTLS_CFLAGS)
28
29Index: gnutls-2.12.11/lib/gnutls.pc.in
30===================================================================
31--- gnutls-2.12.11.orig/lib/gnutls.pc.in
32+++ gnutls-2.12.11/lib/gnutls.pc.in
33@@ -20,6 +20,4 @@ Description: Transport Security Layer im
34 URL: http://www.gnu.org/software/gnutls/
35 Version: @VERSION@
36 Libs: -L${libdir} -lgnutls
37-Libs.private: @LTLIBGCRYPT@ @LTLIBNETTLE@ @NETTLE_LIBS@ @GNUTLS_ZLIB_LIBS_PRIVATE@
38-@GNUTLS_REQUIRES_PRIVATE@
39 Cflags: -I${includedir}
40Index: gnutls-2.12.11/libextra/configure.ac
41===================================================================
42--- gnutls-2.12.11.orig/libextra/configure.ac
43+++ gnutls-2.12.11/libextra/configure.ac
44@@ -41,8 +41,8 @@ LIBGNUTLS_EXTRA_HOOKS
45
46 xgl_INIT
47
48-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
49-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}"
50+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS"
51+LIBGNUTLS_EXTRA_CFLAGS=""
52 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
53 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
54
55Index: gnutls-2.12.11/libextra/gnutls-extra.pc.in
56===================================================================
57--- gnutls-2.12.11.orig/libextra/gnutls-extra.pc.in
58+++ gnutls-2.12.11/libextra/gnutls-extra.pc.in
59@@ -22,5 +22,5 @@ URL: http://www.gnu.org/software/gnutls/
60 Requires: gnutls
61 Version: @VERSION@
62 Libs: -L${libdir} -lgnutls-extra
63-Libs.private: @LIBGNUTLS_EXTRA_LIBS@
64+Libs.private: -llzo2
65 Cflags: -I${includedir}
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/correct_rpl_gettimeofday_signature.patch b/meta/recipes-support/gnutls/gnutls-2.12.17/correct_rpl_gettimeofday_signature.patch
new file mode 100644
index 0000000000..b8f0d727ab
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.17/correct_rpl_gettimeofday_signature.patch
@@ -0,0 +1,57 @@
1Currently we fail on uclibc like below
2
3| In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0,
4| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/ucontext.h:26,
5| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/signal.h:392,
6| from ../../gl/signal.h:52,
7| from ../../gl/sys/select.h:58,
8| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/types.h:220,
9| from ../../gl/sys/types.h:28,
10| from ../../lib/includes/gnutls/gnutls.h:46,
11| from ex-cxx.cpp:3:
12| ../../gl/sys/time.h:396:66: error: conflicting declaration 'void* restrict'
13| ../../gl/sys/time.h:396:50: error: 'restrict' has a previous declaration as 'timeval* restrict'
14| make[4]: *** [ex-cxx.o] Error 1
15| make[4]: *** Waiting for unfinished jobs....
16
17
18GCC detects that we call 'restrict' as param name in function
19signatures and complains since both params are called 'restrict'
20therefore we use __restrict to denote the C99 keywork
21
22This only happens of uclibc since this code is not excercised with
23eglibc otherwise we will have same issue there too
24
25Signed-off-by: Khem Raj <raj.khem@gmail.com>
26
27Upstream-Status: Pending
28
29Index: gnutls-2.12.14/gl/sys_time.in.h
30===================================================================
31--- gnutls-2.12.14.orig/gl/sys_time.in.h 2012-01-15 10:54:39.517285351 -0800
32+++ gnutls-2.12.14/gl/sys_time.in.h 2012-01-15 10:59:23.773299108 -0800
33@@ -82,20 +82,20 @@
34 # define gettimeofday rpl_gettimeofday
35 # endif
36 _GL_FUNCDECL_RPL (gettimeofday, int,
37- (struct timeval *restrict, void *restrict)
38+ (struct timeval *__restrict, void *__restrict)
39 _GL_ARG_NONNULL ((1)));
40 _GL_CXXALIAS_RPL (gettimeofday, int,
41- (struct timeval *restrict, void *restrict));
42+ (struct timeval *__restrict, void *__restrict));
43 # else
44 # if !@HAVE_GETTIMEOFDAY@
45 _GL_FUNCDECL_SYS (gettimeofday, int,
46- (struct timeval *restrict, void *restrict)
47+ (struct timeval *__restrict, void *__restrict)
48 _GL_ARG_NONNULL ((1)));
49 # endif
50 /* Need to cast, because on glibc systems, by default, the second argument is
51 struct timezone *. */
52 _GL_CXXALIAS_SYS_CAST (gettimeofday, int,
53- (struct timeval *restrict, void *restrict));
54+ (struct timeval *__restrict, void *__restrict));
55 # endif
56 _GL_CXXALIASWARN (gettimeofday);
57 # elif defined GNULIB_POSIXCHECK
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch b/meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch
new file mode 100644
index 0000000000..4c9137a657
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.17/fix-gettext-version.patch
@@ -0,0 +1,46 @@
1
2Upstream-Status: Inappropriate [configuration]
3
4Signed-off-by: Saul Wold <sgw@linux.intel.com>
5
6Index: gnutls-2.12.14/lib/po/Makefile.in.in
7===================================================================
8--- gnutls-2.12.14.orig/lib/po/Makefile.in.in
9+++ gnutls-2.12.14/lib/po/Makefile.in.in
10@@ -8,8 +8,8 @@
11 # Please note that the actual code of GNU gettext is covered by the GNU
12 # General Public License and is *not* in the public domain.
13 #
14-# Origin: gettext-0.17
15-GETTEXT_MACRO_VERSION = 0.17
16+# Origin: gettext-0.18
17+GETTEXT_MACRO_VERSION = 0.18
18
19 PACKAGE = @PACKAGE@
20 VERSION = @VERSION@
21Index: gnutls-2.12.14/lib/m4/po.m4
22===================================================================
23--- gnutls-2.12.14.orig/lib/m4/po.m4
24+++ gnutls-2.12.14/lib/m4/po.m4
25@@ -29,7 +29,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
26
27 dnl Release version of the gettext macros. This is used to ensure that
28 dnl the gettext macros and po/Makefile.in.in are in sync.
29- AC_SUBST([GETTEXT_MACRO_VERSION], [0.17])
30+ AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
31
32 dnl Perform the following tests also if --disable-nls has been given,
33 dnl because they are needed for "make dist" to work.
34Index: gnutls-2.12.14/lib/configure.ac
35===================================================================
36--- gnutls-2.12.14.orig/lib/configure.ac
37+++ gnutls-2.12.14/lib/configure.ac
38@@ -39,7 +39,7 @@ AC_PROG_LIBTOOL
39 LIBGNUTLS_HOOKS
40
41 AM_GNU_GETTEXT([external])
42-AM_GNU_GETTEXT_VERSION([0.17])
43+AM_GNU_GETTEXT_VERSION([0.18])
44
45 AC_C_BIGENDIAN
46
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-openssl.patch
new file mode 100644
index 0000000000..ef70674881
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-openssl.patch
@@ -0,0 +1,126 @@
1Upstream-Status: Backport
2
3Index: gnutls-1.6.0/libextra/gnutls_openssl.c
4===================================================================
5--- gnutls-1.6.0.orig/libextra/gnutls_openssl.c 2006-08-13 22:34:09.000000000 +0200
6+++ gnutls-1.6.0/libextra/gnutls_openssl.c 2006-12-12 15:07:59.002227000 +0100
7@@ -256,12 +256,17 @@
8 ssl->rfd = (gnutls_transport_ptr_t) - 1;
9 ssl->wfd = (gnutls_transport_ptr_t) - 1;
10
11+ ssl->ssl_peek_buffer = NULL;
12+ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0;
13+
14 return ssl;
15 }
16
17 void
18 SSL_free (SSL * ssl)
19 {
20+ if (ssl->ssl_peek_buffer)
21+ free(ssl->ssl_peek_buffer);
22 gnutls_certificate_free_credentials (ssl->gnutls_cred);
23 gnutls_deinit (ssl->gnutls_state);
24 free (ssl);
25@@ -285,6 +290,7 @@
26 SSL_set_fd (SSL * ssl, int fd)
27 {
28 gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd));
29+ ssl->rfd = ssl->wfd = fd;
30 return 1;
31 }
32
33@@ -310,6 +316,17 @@
34 return 1;
35 }
36
37+int SSL_get_rfd(SSL *ssl)
38+{
39+ return ssl->rfd;
40+}
41+
42+int SSL_get_wfd(SSL *ssl)
43+{
44+ return ssl->wfd;
45+}
46+
47+
48 void
49 SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio)
50 {
51@@ -325,6 +342,8 @@
52 int
53 SSL_pending (SSL * ssl)
54 {
55+ if (ssl->ssl_peek_avail)
56+ return ssl->ssl_peek_avail;
57 return gnutls_record_check_pending (ssl->gnutls_state);
58 }
59
60@@ -480,11 +499,50 @@
61 return 1;
62 }
63
64+int SSL_peek(SSL *ssl, void *buf, int len)
65+{
66+ if (len > ssl->ssl_peek_buffer_size) {
67+ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len);
68+ ssl->ssl_peek_buffer_size = len;
69+ }
70+
71+ if (ssl->ssl_peek_avail == 0) {
72+
73+ int ret;
74+
75+ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len);
76+ ssl->last_error = ret;
77+
78+ if (ret > 0)
79+ ssl->ssl_peek_avail += ret;
80+ }
81+
82+ if (len > ssl->ssl_peek_avail)
83+ len = ssl->ssl_peek_avail;
84+
85+ memcpy (buf, ssl->ssl_peek_buffer, len);
86+
87+ return len;
88+}
89+
90 int
91 SSL_read (SSL * ssl, void *buf, int len)
92 {
93 int ret;
94
95+ if (ssl->ssl_peek_avail) {
96+ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail;
97+
98+ memcpy (buf, ssl->ssl_peek_buffer, n);
99+
100+ if (ssl->ssl_peek_avail > n)
101+ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n);
102+
103+ ssl->ssl_peek_avail -= n;
104+
105+ return n;
106+ }
107+
108 ret = gnutls_record_recv (ssl->gnutls_state, buf, len);
109 ssl->last_error = ret;
110
111Index: gnutls-1.6.0/includes/gnutls/openssl.h
112===================================================================
113--- gnutls-1.6.0.orig/libextra/includes/gnutls/openssl.h 2006-03-08 11:44:58.000000000 +0100
114+++ gnutls-1.6.0/libextra/includes/gnutls/openssl.h 2006-12-12 15:07:26.032227000 +0100
115@@ -164,6 +164,11 @@
116
117 gnutls_transport_ptr_t rfd;
118 gnutls_transport_ptr_t wfd;
119+
120+ char *ssl_peek_buffer;
121+ size_t ssl_peek_buffer_size;
122+ size_t ssl_peek_avail;
123+
124 };
125
126 #define rbio gnutls_state
diff --git a/meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-texinfo-euro.patch
new file mode 100644
index 0000000000..10e377407a
--- /dev/null
+++ b/meta/recipes-support/gnutls/gnutls-2.12.17/gnutls-texinfo-euro.patch
@@ -0,0 +1,18 @@
1Upstream-Status: Backport
2
3The version of texinfo in Debian Sarge does not understand the @euro{} command.
4This patch replaces the @euro{} command with the word "euro".
5
6--- gnutls-1.3.5/doc/gnutls.texi.orig 2006-04-26 08:06:40.918268000 +0930
7+++ gnutls-1.3.5/doc/gnutls.texi 2006-04-26 08:06:52.446515440 +0930
8@@ -11,8 +11,8 @@
9 long as it is difficult enough to generate two different messages with
10 the same hash algorithm output. In that case the same signature could
11 be used as a proof for both messages. Nobody wants to sign an innocent
12-message of donating 1 @euro{} to Greenpeace and find out that he
13-donated 1.000.000 @euro{} to Bad Inc.
14+message of donating 1 euro to Greenpeace and find out that he
15+donated 1.000.000 euro to Bad Inc.
16
17 For a hash algorithm to be called cryptographic the following three
18 requirements must hold
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-02 23:56:10 +0000