diff options
Diffstat (limited to 'meta/recipes-support/gnutls/gnutls-2.10.4')
3 files changed, 0 insertions, 210 deletions
diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch deleted file mode 100644 index 2ce3f55670..0000000000 --- a/meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch +++ /dev/null | |||
@@ -1,66 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [distribution] | ||
2 | |||
3 | rebased from original configure_madness.patch | ||
4 | |||
5 | libtasn1 provides an .pc file in upstream, | ||
6 | and a libgcrypt.pc is added in libgcrypt recipe, | ||
7 | so use Requires.private for these two. | ||
8 | |||
9 | against 2.8.6 | ||
10 | |||
11 | 07/02/2010 - qhe | ||
12 | |||
13 | --- | ||
14 | diff --git a/lib/configure.ac b/lib/configure.ac | ||
15 | index 80d3375..1a486f7 100644 | ||
16 | --- a/lib/configure.ac | ||
17 | +++ b/lib/configure.ac | ||
18 | @@ -81,8 +81,8 @@ fi | ||
19 | |||
20 | lgl_INIT | ||
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 | |||
29 | diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in | ||
30 | index 3b01c17..de31469 100644 | ||
31 | --- a/lib/gnutls.pc.in | ||
32 | +++ b/lib/gnutls.pc.in | ||
33 | @@ -20,6 +20,6 @@ Name: GnuTLS | ||
34 | Description: Transport Security Layer implementation for the GNU system | ||
35 | URL: http://www.gnu.org/software/gnutls/ | ||
36 | Version: @VERSION@ | ||
37 | +Requires.private: libgcrypt, libtasn1 | ||
38 | Libs: -L${libdir} -lgnutls | ||
39 | -Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@ | ||
40 | Cflags: -I${includedir} | ||
41 | diff --git a/libextra/configure.ac b/libextra/configure.ac | ||
42 | index c08e73f..3313886 100644 | ||
43 | --- a/libextra/configure.ac | ||
44 | +++ b/libextra/configure.ac | ||
45 | @@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS | ||
46 | |||
47 | xgl_INIT | ||
48 | |||
49 | -LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" | ||
50 | -LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}" | ||
51 | +LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" | ||
52 | +LIBGNUTLS_EXTRA_CFLAGS="" | ||
53 | AC_SUBST(LIBGNUTLS_EXTRA_LIBS) | ||
54 | AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) | ||
55 | |||
56 | diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in | ||
57 | index 9e7b8f6..e228ec9 100644 | ||
58 | --- a/libextra/gnutls-extra.pc.in | ||
59 | +++ b/libextra/gnutls-extra.pc.in | ||
60 | @@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/ | ||
61 | Requires: gnutls | ||
62 | Version: @VERSION@ | ||
63 | Libs: -L${libdir} -lgnutls-extra | ||
64 | -Libs.private: @LIBGNUTLS_EXTRA_LIBS@ | ||
65 | +Libs.private: -llzo2 | ||
66 | Cflags: -I${includedir} | ||
diff --git a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch deleted file mode 100644 index ef70674881..0000000000 --- a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch +++ /dev/null | |||
@@ -1,126 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | Index: 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 | |||
111 | Index: 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.10.4/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch deleted file mode 100644 index 10e377407a..0000000000 --- a/meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | Upstream-Status: Backport | ||
2 | |||
3 | The version of texinfo in Debian Sarge does not understand the @euro{} command. | ||
4 | This 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 | ||