summaryrefslogtreecommitdiffstats
path: root/meta/packages/gnutls
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-06-04 11:23:39 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-06-04 11:23:39 +0000
commit3ad20903639119aaa70d6be597081a8f758fec40 (patch)
tree5557a6d702c43133e82056eeee48b081f0ccbf24 /meta/packages/gnutls
parent08065ff374f439bb81db7800d93efa2c5cd4c212 (diff)
downloadpoky-3ad20903639119aaa70d6be597081a8f758fec40.tar.gz
gnutls: update to 1.6.3 (upstream recommended stable version)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1852 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gnutls')
-rw-r--r--meta/packages/gnutls/gnutls.inc44
-rw-r--r--meta/packages/gnutls/gnutls/gnutls-openssl.patch (renamed from meta/packages/gnutls/gnutls-1.4.4/gnutls-openssl.patch)24
-rw-r--r--meta/packages/gnutls/gnutls/gnutls-texinfo-euro.patch (renamed from meta/packages/gnutls/gnutls-1.4.4/gnutls-texinfo-euro.patch)0
-rw-r--r--meta/packages/gnutls/gnutls/onceonly.m4 (renamed from meta/packages/gnutls/gnutls-1.4.4/onceonly.m4)0
-rw-r--r--meta/packages/gnutls/gnutls_1.4.4.bb41
-rw-r--r--meta/packages/gnutls/gnutls_1.6.3.bb6
6 files changed, 64 insertions, 51 deletions
diff --git a/meta/packages/gnutls/gnutls.inc b/meta/packages/gnutls/gnutls.inc
new file mode 100644
index 0000000000..ed96e3f588
--- /dev/null
+++ b/meta/packages/gnutls/gnutls.inc
@@ -0,0 +1,44 @@
1DESCRIPTION = "GNU Transport Layer Security Library"
2HOMEPAGE = "http://www.gnu.org/software/gnutls/"
3DEPENDS = "zlib libgcrypt lzo"
4
5LICENSE = "LGPL"
6
7SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
8 file://gnutls-openssl.patch;patch=1 \
9 file://onceonly.m4 \
10 file://gnutls-texinfo-euro.patch;patch=1"
11
12inherit autotools binconfig pkgconfig
13
14EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
15
16do_configure_prepend() {
17 cp ${WORKDIR}/onceonly.m4 ${S}/m4/
18}
19
20do_stage() {
21 oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
22 oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
23 oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
24 autotools_stage_includes
25
26 install -d ${STAGING_DATADIR}/aclocal
27 cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
28 cp ${S}/libextra/libgnutls-extra.m4 ${STAGING_DATADIR}/aclocal/
29}
30
31PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin ${PN}-xx"
32
33FILES_${PN} = "${libdir}/libgnutls.so.*"
34FILES_${PN}-bin = "${bindir}/gnutls-serv \
35 ${bindir}/gnutls-cli \
36 ${bindir}/srptool \
37 ${bindir}/psktool \
38 ${bindir}/certtool \
39 ${bindir}/gnutls-srpcrypt"
40
41FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
42FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
43FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
44FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"
diff --git a/meta/packages/gnutls/gnutls-1.4.4/gnutls-openssl.patch b/meta/packages/gnutls/gnutls/gnutls-openssl.patch
index 6eca97efd7..e2c189592f 100644
--- a/meta/packages/gnutls/gnutls-1.4.4/gnutls-openssl.patch
+++ b/meta/packages/gnutls/gnutls/gnutls-openssl.patch
@@ -1,6 +1,8 @@
1--- gnutls-1.3.5/libextra/gnutls_openssl.c.orig 2006-04-28 20:01:40.000000000 +0100 1Index: gnutls-1.6.0/libextra/gnutls_openssl.c
2+++ gnutls-1.3.5/libextra/gnutls_openssl.c 2006-04-28 20:10:33.000000000 +0100 2===================================================================
3@@ -252,12 +252,17 @@ 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 @@
4 ssl->rfd = (gnutls_transport_ptr_t) - 1; 6 ssl->rfd = (gnutls_transport_ptr_t) - 1;
5 ssl->wfd = (gnutls_transport_ptr_t) - 1; 7 ssl->wfd = (gnutls_transport_ptr_t) - 1;
6 8
@@ -18,15 +20,15 @@
18 gnutls_certificate_free_credentials (ssl->gnutls_cred); 20 gnutls_certificate_free_credentials (ssl->gnutls_cred);
19 gnutls_deinit (ssl->gnutls_state); 21 gnutls_deinit (ssl->gnutls_state);
20 free (ssl); 22 free (ssl);
21@@ -281,6 +286,7 @@ 23@@ -285,6 +290,7 @@
22 SSL_set_fd (SSL * ssl, int fd) 24 SSL_set_fd (SSL * ssl, int fd)
23 { 25 {
24 gnutls_transport_set_ptr (ssl->gnutls_state, (gnutls_transport_ptr_t) fd); 26 gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd));
25+ ssl->rfd = ssl->wfd = fd; 27+ ssl->rfd = ssl->wfd = fd;
26 return 1; 28 return 1;
27 } 29 }
28 30
29@@ -306,6 +312,17 @@ 31@@ -310,6 +316,17 @@
30 return 1; 32 return 1;
31 } 33 }
32 34
@@ -44,7 +46,7 @@
44 void 46 void
45 SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio) 47 SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio)
46 { 48 {
47@@ -321,6 +338,8 @@ 49@@ -325,6 +342,8 @@
48 int 50 int
49 SSL_pending (SSL * ssl) 51 SSL_pending (SSL * ssl)
50 { 52 {
@@ -53,7 +55,7 @@
53 return gnutls_record_check_pending (ssl->gnutls_state); 55 return gnutls_record_check_pending (ssl->gnutls_state);
54 } 56 }
55 57
56@@ -476,11 +495,50 @@ 58@@ -480,11 +499,50 @@
57 return 1; 59 return 1;
58 } 60 }
59 61
@@ -104,8 +106,10 @@
104 ret = gnutls_record_recv (ssl->gnutls_state, buf, len); 106 ret = gnutls_record_recv (ssl->gnutls_state, buf, len);
105 ssl->last_error = ret; 107 ssl->last_error = ret;
106 108
107--- gnutls-1.3.5/includes/gnutls/openssl.h.orig 2006-04-28 20:10:55.000000000 +0100 109Index: gnutls-1.6.0/includes/gnutls/openssl.h
108+++ gnutls-1.3.5/includes/gnutls/openssl.h 2006-04-28 20:11:52.000000000 +0100 110===================================================================
111--- gnutls-1.6.0.orig/includes/gnutls/openssl.h 2006-03-08 11:44:58.000000000 +0100
112+++ gnutls-1.6.0/includes/gnutls/openssl.h 2006-12-12 15:07:26.032227000 +0100
109@@ -164,6 +164,11 @@ 113@@ -164,6 +164,11 @@
110 114
111 gnutls_transport_ptr_t rfd; 115 gnutls_transport_ptr_t rfd;
diff --git a/meta/packages/gnutls/gnutls-1.4.4/gnutls-texinfo-euro.patch b/meta/packages/gnutls/gnutls/gnutls-texinfo-euro.patch
index e2a2762424..e2a2762424 100644
--- a/meta/packages/gnutls/gnutls-1.4.4/gnutls-texinfo-euro.patch
+++ b/meta/packages/gnutls/gnutls/gnutls-texinfo-euro.patch
diff --git a/meta/packages/gnutls/gnutls-1.4.4/onceonly.m4 b/meta/packages/gnutls/gnutls/onceonly.m4
index f6fec37cbf..f6fec37cbf 100644
--- a/meta/packages/gnutls/gnutls-1.4.4/onceonly.m4
+++ b/meta/packages/gnutls/gnutls/onceonly.m4
diff --git a/meta/packages/gnutls/gnutls_1.4.4.bb b/meta/packages/gnutls/gnutls_1.4.4.bb
deleted file mode 100644
index 021bf9e416..0000000000
--- a/meta/packages/gnutls/gnutls_1.4.4.bb
+++ /dev/null
@@ -1,41 +0,0 @@
1DESCRIPTION = "GNU Transport Layer Security Library"
2DEPENDS = "zlib libgcrypt lzo readline"
3HOMEPAGE = "http://www.gnu.org/software/gnutls/"
4LICENSE = "LGPL"
5
6SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
7 file://onceonly.m4 \
8 file://gnutls-openssl.patch;patch=1 \
9 file://gnutls-texinfo-euro.patch;patch=1"
10
11inherit autotools binconfig
12
13do_configure_prepend() {
14 cp ${WORKDIR}/onceonly.m4 ${S}/m4/
15}
16
17PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
18FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
19FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
20FILES_${PN} = "${libdir}/libgnutls.so.*"
21FILES_${PN}-bin = "${bindir}/gnutls-serv \
22 ${bindir}/gnutls-cli \
23 ${bindir}/srptool \
24 ${bindir}/certtool \
25 ${bindir}/gnutls-srpcrypt \
26 ${bindir}/psktool"
27
28FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
29
30EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-libz-prefix=${STAGING_LIBDIR}/.. --with-libreadline-prefix=${STAGING_LIBDIR}/.."
31
32do_stage() {
33 oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
34 oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
35 oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
36 autotools_stage_includes
37
38 install -d ${STAGING_DATADIR}/aclocal
39 cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
40}
41
diff --git a/meta/packages/gnutls/gnutls_1.6.3.bb b/meta/packages/gnutls/gnutls_1.6.3.bb
new file mode 100644
index 0000000000..68077c0c5a
--- /dev/null
+++ b/meta/packages/gnutls/gnutls_1.6.3.bb
@@ -0,0 +1,6 @@
1require gnutls.inc
2PR = "r1"
3
4do_configure_prepend() {
5 sed -i "s/2.60/2.59/" ${S}/configure.in
6}