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
This commit is contained in:
parent
08065ff374
commit
3ad2090363
|
@ -0,0 +1,44 @@
|
|||
DESCRIPTION = "GNU Transport Layer Security Library"
|
||||
HOMEPAGE = "http://www.gnu.org/software/gnutls/"
|
||||
DEPENDS = "zlib libgcrypt lzo"
|
||||
|
||||
LICENSE = "LGPL"
|
||||
|
||||
SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
|
||||
file://gnutls-openssl.patch;patch=1 \
|
||||
file://onceonly.m4 \
|
||||
file://gnutls-texinfo-euro.patch;patch=1"
|
||||
|
||||
inherit autotools binconfig pkgconfig
|
||||
|
||||
EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1"
|
||||
|
||||
do_configure_prepend() {
|
||||
cp ${WORKDIR}/onceonly.m4 ${S}/m4/
|
||||
}
|
||||
|
||||
do_stage() {
|
||||
oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
|
||||
oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
|
||||
oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
|
||||
autotools_stage_includes
|
||||
|
||||
install -d ${STAGING_DATADIR}/aclocal
|
||||
cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
|
||||
cp ${S}/libextra/libgnutls-extra.m4 ${STAGING_DATADIR}/aclocal/
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin ${PN}-xx"
|
||||
|
||||
FILES_${PN} = "${libdir}/libgnutls.so.*"
|
||||
FILES_${PN}-bin = "${bindir}/gnutls-serv \
|
||||
${bindir}/gnutls-cli \
|
||||
${bindir}/srptool \
|
||||
${bindir}/psktool \
|
||||
${bindir}/certtool \
|
||||
${bindir}/gnutls-srpcrypt"
|
||||
|
||||
FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
|
||||
FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
|
||||
FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
|
||||
FILES_${PN}-xx = "${libdir}/libgnutlsxx.so.*"
|
|
@ -1,6 +1,8 @@
|
|||
--- gnutls-1.3.5/libextra/gnutls_openssl.c.orig 2006-04-28 20:01:40.000000000 +0100
|
||||
+++ gnutls-1.3.5/libextra/gnutls_openssl.c 2006-04-28 20:10:33.000000000 +0100
|
||||
@@ -252,12 +252,17 @@
|
||||
Index: gnutls-1.6.0/libextra/gnutls_openssl.c
|
||||
===================================================================
|
||||
--- gnutls-1.6.0.orig/libextra/gnutls_openssl.c 2006-08-13 22:34:09.000000000 +0200
|
||||
+++ gnutls-1.6.0/libextra/gnutls_openssl.c 2006-12-12 15:07:59.002227000 +0100
|
||||
@@ -256,12 +256,17 @@
|
||||
ssl->rfd = (gnutls_transport_ptr_t) - 1;
|
||||
ssl->wfd = (gnutls_transport_ptr_t) - 1;
|
||||
|
||||
|
@ -18,15 +20,15 @@
|
|||
gnutls_certificate_free_credentials (ssl->gnutls_cred);
|
||||
gnutls_deinit (ssl->gnutls_state);
|
||||
free (ssl);
|
||||
@@ -281,6 +286,7 @@
|
||||
@@ -285,6 +290,7 @@
|
||||
SSL_set_fd (SSL * ssl, int fd)
|
||||
{
|
||||
gnutls_transport_set_ptr (ssl->gnutls_state, (gnutls_transport_ptr_t) fd);
|
||||
gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd));
|
||||
+ ssl->rfd = ssl->wfd = fd;
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -306,6 +312,17 @@
|
||||
@@ -310,6 +316,17 @@
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -44,7 +46,7 @@
|
|||
void
|
||||
SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio)
|
||||
{
|
||||
@@ -321,6 +338,8 @@
|
||||
@@ -325,6 +342,8 @@
|
||||
int
|
||||
SSL_pending (SSL * ssl)
|
||||
{
|
||||
|
@ -53,7 +55,7 @@
|
|||
return gnutls_record_check_pending (ssl->gnutls_state);
|
||||
}
|
||||
|
||||
@@ -476,11 +495,50 @@
|
||||
@@ -480,11 +499,50 @@
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
@ -104,8 +106,10 @@
|
|||
ret = gnutls_record_recv (ssl->gnutls_state, buf, len);
|
||||
ssl->last_error = ret;
|
||||
|
||||
--- gnutls-1.3.5/includes/gnutls/openssl.h.orig 2006-04-28 20:10:55.000000000 +0100
|
||||
+++ gnutls-1.3.5/includes/gnutls/openssl.h 2006-04-28 20:11:52.000000000 +0100
|
||||
Index: gnutls-1.6.0/includes/gnutls/openssl.h
|
||||
===================================================================
|
||||
--- gnutls-1.6.0.orig/includes/gnutls/openssl.h 2006-03-08 11:44:58.000000000 +0100
|
||||
+++ gnutls-1.6.0/includes/gnutls/openssl.h 2006-12-12 15:07:26.032227000 +0100
|
||||
@@ -164,6 +164,11 @@
|
||||
|
||||
gnutls_transport_ptr_t rfd;
|
|
@ -1,41 +0,0 @@
|
|||
DESCRIPTION = "GNU Transport Layer Security Library"
|
||||
DEPENDS = "zlib libgcrypt lzo readline"
|
||||
HOMEPAGE = "http://www.gnu.org/software/gnutls/"
|
||||
LICENSE = "LGPL"
|
||||
|
||||
SRC_URI = "ftp://ftp.gnutls.org/pub/gnutls/gnutls-${PV}.tar.bz2 \
|
||||
file://onceonly.m4 \
|
||||
file://gnutls-openssl.patch;patch=1 \
|
||||
file://gnutls-texinfo-euro.patch;patch=1"
|
||||
|
||||
inherit autotools binconfig
|
||||
|
||||
do_configure_prepend() {
|
||||
cp ${WORKDIR}/onceonly.m4 ${S}/m4/
|
||||
}
|
||||
|
||||
PACKAGES =+ "${PN}-openssl ${PN}-extra ${PN}-bin"
|
||||
FILES_${PN}-openssl = "${libdir}/libgnutls-openssl.so.*"
|
||||
FILES_${PN}-extra = "${libdir}/libgnutls-extra.so.*"
|
||||
FILES_${PN} = "${libdir}/libgnutls.so.*"
|
||||
FILES_${PN}-bin = "${bindir}/gnutls-serv \
|
||||
${bindir}/gnutls-cli \
|
||||
${bindir}/srptool \
|
||||
${bindir}/certtool \
|
||||
${bindir}/gnutls-srpcrypt \
|
||||
${bindir}/psktool"
|
||||
|
||||
FILES_${PN}-dev += "${bindir}/*-config ${bindir}/gnutls-cli-debug"
|
||||
|
||||
EXTRA_OECONF="--with-included-opencdk --with-included-libtasn1 --with-libz-prefix=${STAGING_LIBDIR}/.. --with-libreadline-prefix=${STAGING_LIBDIR}/.."
|
||||
|
||||
do_stage() {
|
||||
oe_libinstall -C lib/.libs -so -a libgnutls ${STAGING_LIBDIR}
|
||||
oe_libinstall -C libextra/.libs -so -a libgnutls-extra ${STAGING_LIBDIR}
|
||||
oe_libinstall -C libextra/.libs -so -a libgnutls-openssl ${STAGING_LIBDIR}
|
||||
autotools_stage_includes
|
||||
|
||||
install -d ${STAGING_DATADIR}/aclocal
|
||||
cp ${S}/lib/libgnutls.m4 ${STAGING_DATADIR}/aclocal/
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
require gnutls.inc
|
||||
PR = "r1"
|
||||
|
||||
do_configure_prepend() {
|
||||
sed -i "s/2.60/2.59/" ${S}/configure.in
|
||||
}
|
Loading…
Reference in New Issue