diff options
author | Qing He <qing.he@intel.com> | 2010-12-30 14:48:31 +0800 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2011-01-02 01:25:40 -0800 |
commit | 6db06e1384a797fadda3e99648f07c6ee8e72844 (patch) | |
tree | 8dd69a6e58e573be46b84c607a6f1b5df88d1865 /meta/recipes-support/gnutls/gnutls-2.8.6 | |
parent | a3a94a90fdb2d439f840f0f1b151b51f54685dbd (diff) | |
download | poky-6db06e1384a797fadda3e99648f07c6ee8e72844.tar.gz |
gnutls: upgrade to version 2.10.4
from 2.8.6
Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls-2.8.6')
3 files changed, 0 insertions, 204 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.8.6/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.8.6/configure-fix.patch deleted file mode 100644 index 247e324564..0000000000 --- a/meta/recipes-support/gnutls/gnutls-2.8.6/configure-fix.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | rebased from original configure_madness.patch | ||
2 | |||
3 | libtasn1 provides an .pc file in upstream, | ||
4 | and a libgcrypt.pc is added in libgcrypt recipe, | ||
5 | so use Requires.private for these two. | ||
6 | |||
7 | against 2.8.6 | ||
8 | |||
9 | 07/02/2010 - qhe | ||
10 | |||
11 | --- | ||
12 | diff --git a/lib/configure.ac b/lib/configure.ac | ||
13 | index 80d3375..1a486f7 100644 | ||
14 | --- a/lib/configure.ac | ||
15 | +++ b/lib/configure.ac | ||
16 | @@ -81,8 +81,8 @@ fi | ||
17 | |||
18 | lgl_INIT | ||
19 | |||
20 | -LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS" | ||
21 | -LIBGNUTLS_CFLAGS="-I${includedir}" | ||
22 | +LIBGNUTLS_LIBS="-lgnutls $LIBS" | ||
23 | +LIBGNUTLS_CFLAGS="" | ||
24 | AC_SUBST(LIBGNUTLS_LIBS) | ||
25 | AC_SUBST(LIBGNUTLS_CFLAGS) | ||
26 | |||
27 | diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in | ||
28 | index 3b01c17..de31469 100644 | ||
29 | --- a/lib/gnutls.pc.in | ||
30 | +++ b/lib/gnutls.pc.in | ||
31 | @@ -20,6 +20,6 @@ Name: GnuTLS | ||
32 | Description: Transport Security Layer implementation for the GNU system | ||
33 | URL: http://www.gnu.org/software/gnutls/ | ||
34 | Version: @VERSION@ | ||
35 | +Requires.private: libgcrypt, libtasn1 | ||
36 | Libs: -L${libdir} -lgnutls | ||
37 | -Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@ | ||
38 | Cflags: -I${includedir} | ||
39 | diff --git a/libextra/configure.ac b/libextra/configure.ac | ||
40 | index c08e73f..3313886 100644 | ||
41 | --- a/libextra/configure.ac | ||
42 | +++ b/libextra/configure.ac | ||
43 | @@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS | ||
44 | |||
45 | xgl_INIT | ||
46 | |||
47 | -LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" | ||
48 | -LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}" | ||
49 | +LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" | ||
50 | +LIBGNUTLS_EXTRA_CFLAGS="" | ||
51 | AC_SUBST(LIBGNUTLS_EXTRA_LIBS) | ||
52 | AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) | ||
53 | |||
54 | diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in | ||
55 | index 9e7b8f6..e228ec9 100644 | ||
56 | --- a/libextra/gnutls-extra.pc.in | ||
57 | +++ b/libextra/gnutls-extra.pc.in | ||
58 | @@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/ | ||
59 | Requires: gnutls | ||
60 | Version: @VERSION@ | ||
61 | Libs: -L${libdir} -lgnutls-extra | ||
62 | -Libs.private: @LIBGNUTLS_EXTRA_LIBS@ | ||
63 | +Libs.private: -llzo2 | ||
64 | Cflags: -I${includedir} | ||
diff --git a/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-openssl.patch deleted file mode 100644 index 413de06472..0000000000 --- a/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-openssl.patch +++ /dev/null | |||
@@ -1,124 +0,0 @@ | |||
1 | Index: gnutls-1.6.0/libextra/gnutls_openssl.c | ||
2 | =================================================================== | ||
3 | --- gnutls-1.6.0.orig/libextra/gnutls_openssl.c 2006-08-13 22:34:09.000000000 +0200 | ||
4 | +++ gnutls-1.6.0/libextra/gnutls_openssl.c 2006-12-12 15:07:59.002227000 +0100 | ||
5 | @@ -256,12 +256,17 @@ | ||
6 | ssl->rfd = (gnutls_transport_ptr_t) - 1; | ||
7 | ssl->wfd = (gnutls_transport_ptr_t) - 1; | ||
8 | |||
9 | + ssl->ssl_peek_buffer = NULL; | ||
10 | + ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0; | ||
11 | + | ||
12 | return ssl; | ||
13 | } | ||
14 | |||
15 | void | ||
16 | SSL_free (SSL * ssl) | ||
17 | { | ||
18 | + if (ssl->ssl_peek_buffer) | ||
19 | + free(ssl->ssl_peek_buffer); | ||
20 | gnutls_certificate_free_credentials (ssl->gnutls_cred); | ||
21 | gnutls_deinit (ssl->gnutls_state); | ||
22 | free (ssl); | ||
23 | @@ -285,6 +290,7 @@ | ||
24 | SSL_set_fd (SSL * ssl, int fd) | ||
25 | { | ||
26 | gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd)); | ||
27 | + ssl->rfd = ssl->wfd = fd; | ||
28 | return 1; | ||
29 | } | ||
30 | |||
31 | @@ -310,6 +316,17 @@ | ||
32 | return 1; | ||
33 | } | ||
34 | |||
35 | +int SSL_get_rfd(SSL *ssl) | ||
36 | +{ | ||
37 | + return ssl->rfd; | ||
38 | +} | ||
39 | + | ||
40 | +int SSL_get_wfd(SSL *ssl) | ||
41 | +{ | ||
42 | + return ssl->wfd; | ||
43 | +} | ||
44 | + | ||
45 | + | ||
46 | void | ||
47 | SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio) | ||
48 | { | ||
49 | @@ -325,6 +342,8 @@ | ||
50 | int | ||
51 | SSL_pending (SSL * ssl) | ||
52 | { | ||
53 | + if (ssl->ssl_peek_avail) | ||
54 | + return ssl->ssl_peek_avail; | ||
55 | return gnutls_record_check_pending (ssl->gnutls_state); | ||
56 | } | ||
57 | |||
58 | @@ -480,11 +499,50 @@ | ||
59 | return 1; | ||
60 | } | ||
61 | |||
62 | +int SSL_peek(SSL *ssl, void *buf, int len) | ||
63 | +{ | ||
64 | + if (len > ssl->ssl_peek_buffer_size) { | ||
65 | + ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len); | ||
66 | + ssl->ssl_peek_buffer_size = len; | ||
67 | + } | ||
68 | + | ||
69 | + if (ssl->ssl_peek_avail == 0) { | ||
70 | + | ||
71 | + int ret; | ||
72 | + | ||
73 | + ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len); | ||
74 | + ssl->last_error = ret; | ||
75 | + | ||
76 | + if (ret > 0) | ||
77 | + ssl->ssl_peek_avail += ret; | ||
78 | + } | ||
79 | + | ||
80 | + if (len > ssl->ssl_peek_avail) | ||
81 | + len = ssl->ssl_peek_avail; | ||
82 | + | ||
83 | + memcpy (buf, ssl->ssl_peek_buffer, len); | ||
84 | + | ||
85 | + return len; | ||
86 | +} | ||
87 | + | ||
88 | int | ||
89 | SSL_read (SSL * ssl, void *buf, int len) | ||
90 | { | ||
91 | int ret; | ||
92 | |||
93 | + if (ssl->ssl_peek_avail) { | ||
94 | + int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail; | ||
95 | + | ||
96 | + memcpy (buf, ssl->ssl_peek_buffer, n); | ||
97 | + | ||
98 | + if (ssl->ssl_peek_avail > n) | ||
99 | + memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n); | ||
100 | + | ||
101 | + ssl->ssl_peek_avail -= n; | ||
102 | + | ||
103 | + return n; | ||
104 | + } | ||
105 | + | ||
106 | ret = gnutls_record_recv (ssl->gnutls_state, buf, len); | ||
107 | ssl->last_error = ret; | ||
108 | |||
109 | Index: gnutls-1.6.0/includes/gnutls/openssl.h | ||
110 | =================================================================== | ||
111 | --- gnutls-1.6.0.orig/libextra/includes/gnutls/openssl.h 2006-03-08 11:44:58.000000000 +0100 | ||
112 | +++ gnutls-1.6.0/libextra/includes/gnutls/openssl.h 2006-12-12 15:07:26.032227000 +0100 | ||
113 | @@ -164,6 +164,11 @@ | ||
114 | |||
115 | gnutls_transport_ptr_t rfd; | ||
116 | gnutls_transport_ptr_t wfd; | ||
117 | + | ||
118 | + char *ssl_peek_buffer; | ||
119 | + size_t ssl_peek_buffer_size; | ||
120 | + size_t ssl_peek_avail; | ||
121 | + | ||
122 | }; | ||
123 | |||
124 | #define rbio gnutls_state | ||
diff --git a/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch deleted file mode 100644 index a2d2f03870..0000000000 --- a/meta/recipes-support/gnutls/gnutls-2.8.6/gnutls-texinfo-euro.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | The version of texinfo in Debian Sarge does not understand the @euro{} command. | ||
2 | This patch replaces the @euro{} command with the word "euro". | ||
3 | |||
4 | --- gnutls-1.3.5/doc/gnutls.texi.orig 2006-04-26 08:06:40.918268000 +0930 | ||
5 | +++ gnutls-1.3.5/doc/gnutls.texi 2006-04-26 08:06:52.446515440 +0930 | ||
6 | @@ -11,8 +11,8 @@ | ||
7 | long as it is difficult enough to generate two different messages with | ||
8 | the same hash algorithm output. In that case the same signature could | ||
9 | be used as a proof for both messages. Nobody wants to sign an innocent | ||
10 | -message of donating 1 @euro{} to Greenpeace and find out that he | ||
11 | -donated 1.000.000 @euro{} to Bad Inc. | ||
12 | +message of donating 1 euro to Greenpeace and find out that he | ||
13 | +donated 1.000.000 euro to Bad Inc. | ||
14 | |||
15 | For a hash algorithm to be called cryptographic the following three | ||
16 | requirements must hold | ||