From 057512f2a9f7d4a6df9c9924788fabc23dc188a3 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 24 May 2011 16:23:32 -0700 Subject: gnutls: update to 2.12.5 (From OE-Core rev: ad52eacebdc413aa351de078ee878182a9c71e16) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../gnutls/gnutls-2.10.4/configure-fix.patch | 66 ----------- .../gnutls/gnutls-2.10.4/gnutls-openssl.patch | 126 --------------------- .../gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch | 18 --- .../gnutls/gnutls-2.12.5/configure-fix.patch | 67 +++++++++++ .../gnutls/gnutls-2.12.5/gnutls-openssl.patch | 126 +++++++++++++++++++++ .../gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch | 18 +++ meta/recipes-support/gnutls/gnutls.inc | 6 +- meta/recipes-support/gnutls/gnutls_2.10.4.bb | 10 -- meta/recipes-support/gnutls/gnutls_2.12.5.bb | 9 ++ 9 files changed, 223 insertions(+), 223 deletions(-) delete mode 100644 meta/recipes-support/gnutls/gnutls-2.10.4/configure-fix.patch delete mode 100644 meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-openssl.patch delete mode 100644 meta/recipes-support/gnutls/gnutls-2.10.4/gnutls-texinfo-euro.patch create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch create mode 100644 meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch delete mode 100644 meta/recipes-support/gnutls/gnutls_2.10.4.bb create mode 100644 meta/recipes-support/gnutls/gnutls_2.12.5.bb (limited to 'meta/recipes-support/gnutls') 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 @@ -Upstream-Status: Inappropriate [distribution] - -rebased from original configure_madness.patch - -libtasn1 provides an .pc file in upstream, -and a libgcrypt.pc is added in libgcrypt recipe, -so use Requires.private for these two. - -against 2.8.6 - -07/02/2010 - qhe - ---- -diff --git a/lib/configure.ac b/lib/configure.ac -index 80d3375..1a486f7 100644 ---- a/lib/configure.ac -+++ b/lib/configure.ac -@@ -81,8 +81,8 @@ fi - - lgl_INIT - --LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS" --LIBGNUTLS_CFLAGS="-I${includedir}" -+LIBGNUTLS_LIBS="-lgnutls $LIBS" -+LIBGNUTLS_CFLAGS="" - AC_SUBST(LIBGNUTLS_LIBS) - AC_SUBST(LIBGNUTLS_CFLAGS) - -diff --git a/lib/gnutls.pc.in b/lib/gnutls.pc.in -index 3b01c17..de31469 100644 ---- a/lib/gnutls.pc.in -+++ b/lib/gnutls.pc.in -@@ -20,6 +20,6 @@ Name: GnuTLS - Description: Transport Security Layer implementation for the GNU system - URL: http://www.gnu.org/software/gnutls/ - Version: @VERSION@ -+Requires.private: libgcrypt, libtasn1 - Libs: -L${libdir} -lgnutls --Libs.private: @LIBGNUTLS_LIBS@ @LTLIBTASN1@ - Cflags: -I${includedir} -diff --git a/libextra/configure.ac b/libextra/configure.ac -index c08e73f..3313886 100644 ---- a/libextra/configure.ac -+++ b/libextra/configure.ac -@@ -40,8 +40,8 @@ LIBGNUTLS_EXTRA_HOOKS - - xgl_INIT - --LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" --LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}" -+LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" -+LIBGNUTLS_EXTRA_CFLAGS="" - AC_SUBST(LIBGNUTLS_EXTRA_LIBS) - AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) - -diff --git a/libextra/gnutls-extra.pc.in b/libextra/gnutls-extra.pc.in -index 9e7b8f6..e228ec9 100644 ---- a/libextra/gnutls-extra.pc.in -+++ b/libextra/gnutls-extra.pc.in -@@ -21,5 +21,5 @@ URL: http://www.gnu.org/software/gnutls/ - Requires: gnutls - Version: @VERSION@ - Libs: -L${libdir} -lgnutls-extra --Libs.private: @LIBGNUTLS_EXTRA_LIBS@ -+Libs.private: -llzo2 - 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 @@ -Upstream-Status: Backport - -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; - -+ ssl->ssl_peek_buffer = NULL; -+ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0; -+ - return ssl; - } - - void - SSL_free (SSL * ssl) - { -+ if (ssl->ssl_peek_buffer) -+ free(ssl->ssl_peek_buffer); - gnutls_certificate_free_credentials (ssl->gnutls_cred); - gnutls_deinit (ssl->gnutls_state); - free (ssl); -@@ -285,6 +290,7 @@ - SSL_set_fd (SSL * ssl, int fd) - { - gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd)); -+ ssl->rfd = ssl->wfd = fd; - return 1; - } - -@@ -310,6 +316,17 @@ - return 1; - } - -+int SSL_get_rfd(SSL *ssl) -+{ -+ return ssl->rfd; -+} -+ -+int SSL_get_wfd(SSL *ssl) -+{ -+ return ssl->wfd; -+} -+ -+ - void - SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio) - { -@@ -325,6 +342,8 @@ - int - SSL_pending (SSL * ssl) - { -+ if (ssl->ssl_peek_avail) -+ return ssl->ssl_peek_avail; - return gnutls_record_check_pending (ssl->gnutls_state); - } - -@@ -480,11 +499,50 @@ - return 1; - } - -+int SSL_peek(SSL *ssl, void *buf, int len) -+{ -+ if (len > ssl->ssl_peek_buffer_size) { -+ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len); -+ ssl->ssl_peek_buffer_size = len; -+ } -+ -+ if (ssl->ssl_peek_avail == 0) { -+ -+ int ret; -+ -+ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len); -+ ssl->last_error = ret; -+ -+ if (ret > 0) -+ ssl->ssl_peek_avail += ret; -+ } -+ -+ if (len > ssl->ssl_peek_avail) -+ len = ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, len); -+ -+ return len; -+} -+ - int - SSL_read (SSL * ssl, void *buf, int len) - { - int ret; - -+ if (ssl->ssl_peek_avail) { -+ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail; -+ -+ memcpy (buf, ssl->ssl_peek_buffer, n); -+ -+ if (ssl->ssl_peek_avail > n) -+ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n); -+ -+ ssl->ssl_peek_avail -= n; -+ -+ return n; -+ } -+ - ret = gnutls_record_recv (ssl->gnutls_state, buf, len); - ssl->last_error = ret; - -Index: gnutls-1.6.0/includes/gnutls/openssl.h -=================================================================== ---- gnutls-1.6.0.orig/libextra/includes/gnutls/openssl.h 2006-03-08 11:44:58.000000000 +0100 -+++ gnutls-1.6.0/libextra/includes/gnutls/openssl.h 2006-12-12 15:07:26.032227000 +0100 -@@ -164,6 +164,11 @@ - - gnutls_transport_ptr_t rfd; - gnutls_transport_ptr_t wfd; -+ -+ char *ssl_peek_buffer; -+ size_t ssl_peek_buffer_size; -+ size_t ssl_peek_avail; -+ - }; - - #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 @@ -Upstream-Status: Backport - -The version of texinfo in Debian Sarge does not understand the @euro{} command. -This patch replaces the @euro{} command with the word "euro". - ---- gnutls-1.3.5/doc/gnutls.texi.orig 2006-04-26 08:06:40.918268000 +0930 -+++ gnutls-1.3.5/doc/gnutls.texi 2006-04-26 08:06:52.446515440 +0930 -@@ -11,8 +11,8 @@ - long as it is difficult enough to generate two different messages with - the same hash algorithm output. In that case the same signature could - be used as a proof for both messages. Nobody wants to sign an innocent --message of donating 1 @euro{} to Greenpeace and find out that he --donated 1.000.000 @euro{} to Bad Inc. -+message of donating 1 euro to Greenpeace and find out that he -+donated 1.000.000 euro to Bad Inc. - - For a hash algorithm to be called cryptographic the following three - requirements must hold diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch new file mode 100644 index 0000000000..e6f9785a99 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls-2.12.5/configure-fix.patch @@ -0,0 +1,67 @@ +Upstream-Status: Inappropriate [distribution] + +rebased from original configure_madness.patch + +libtasn1 provides an .pc file in upstream, +and a libgcrypt.pc is added in libgcrypt recipe, +so use Requires.private for these two. + +against 2.8.6 + +07/02/2010 - qhe + +--- +Index: gnutls-2.12.5/lib/configure.ac +=================================================================== +--- gnutls-2.12.5.orig/lib/configure.ac 2011-05-11 00:05:33.000000000 -0700 ++++ gnutls-2.12.5/lib/configure.ac 2011-05-25 19:45:23.721180103 -0700 +@@ -96,8 +96,8 @@ + dnl for pakchois + AC_LIB_HAVE_LINKFLAGS(dl,, [#include ], [dlclose (0);]) + +-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBS" +-LIBGNUTLS_CFLAGS="-I${includedir}" ++LIBGNUTLS_LIBS="-lgnutls $LIBS" ++LIBGNUTLS_CFLAGS="" + AC_SUBST(LIBGNUTLS_LIBS) + AC_SUBST(LIBGNUTLS_CFLAGS) + +Index: gnutls-2.12.5/lib/gnutls.pc.in +=================================================================== +--- gnutls-2.12.5.orig/lib/gnutls.pc.in 2011-04-23 08:00:07.000000000 -0700 ++++ gnutls-2.12.5/lib/gnutls.pc.in 2011-05-25 19:50:11.926102288 -0700 +@@ -19,7 +19,6 @@ + Description: Transport Security Layer implementation for the GNU system + URL: http://www.gnu.org/software/gnutls/ + Version: @VERSION@ ++Requires.private: libgcrypt, libtasn1 + Libs: -L${libdir} -lgnutls +-Libs.private: @LTLIBGCRYPT@ @NETTLE_LIBS@ +-@GNUTLS_REQUIRES_PRIVATE@ + Cflags: -I${includedir} +Index: gnutls-2.12.5/libextra/configure.ac +=================================================================== +--- gnutls-2.12.5.orig/libextra/configure.ac 2011-05-11 00:05:31.000000000 -0700 ++++ gnutls-2.12.5/libextra/configure.ac 2011-05-25 19:45:23.722186801 -0700 +@@ -41,8 +41,8 @@ + + xgl_INIT + +-LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" +-LIBGNUTLS_EXTRA_CFLAGS="-I${includedir}" ++LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LZO_LIBS $LIBGNUTLS_LIBS" ++LIBGNUTLS_EXTRA_CFLAGS="" + AC_SUBST(LIBGNUTLS_EXTRA_LIBS) + AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS) + +Index: gnutls-2.12.5/libextra/gnutls-extra.pc.in +=================================================================== +--- gnutls-2.12.5.orig/libextra/gnutls-extra.pc.in 2011-04-07 17:30:45.000000000 -0700 ++++ gnutls-2.12.5/libextra/gnutls-extra.pc.in 2011-05-25 19:45:23.722186801 -0700 +@@ -22,5 +22,5 @@ + Requires: gnutls + Version: @VERSION@ + Libs: -L${libdir} -lgnutls-extra +-Libs.private: @LIBGNUTLS_EXTRA_LIBS@ ++Libs.private: -llzo2 + Cflags: -I${includedir} diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch new file mode 100644 index 0000000000..ef70674881 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-openssl.patch @@ -0,0 +1,126 @@ +Upstream-Status: Backport + +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; + ++ ssl->ssl_peek_buffer = NULL; ++ ssl->ssl_peek_buffer_size = ssl->ssl_peek_avail = 0; ++ + return ssl; + } + + void + SSL_free (SSL * ssl) + { ++ if (ssl->ssl_peek_buffer) ++ free(ssl->ssl_peek_buffer); + gnutls_certificate_free_credentials (ssl->gnutls_cred); + gnutls_deinit (ssl->gnutls_state); + free (ssl); +@@ -285,6 +290,7 @@ + SSL_set_fd (SSL * ssl, int fd) + { + gnutls_transport_set_ptr (ssl->gnutls_state, GNUTLS_INT_TO_POINTER (fd)); ++ ssl->rfd = ssl->wfd = fd; + return 1; + } + +@@ -310,6 +316,17 @@ + return 1; + } + ++int SSL_get_rfd(SSL *ssl) ++{ ++ return ssl->rfd; ++} ++ ++int SSL_get_wfd(SSL *ssl) ++{ ++ return ssl->wfd; ++} ++ ++ + void + SSL_set_bio (SSL * ssl, BIO * rbio, BIO * wbio) + { +@@ -325,6 +342,8 @@ + int + SSL_pending (SSL * ssl) + { ++ if (ssl->ssl_peek_avail) ++ return ssl->ssl_peek_avail; + return gnutls_record_check_pending (ssl->gnutls_state); + } + +@@ -480,11 +499,50 @@ + return 1; + } + ++int SSL_peek(SSL *ssl, void *buf, int len) ++{ ++ if (len > ssl->ssl_peek_buffer_size) { ++ ssl->ssl_peek_buffer = realloc (ssl->ssl_peek_buffer, len); ++ ssl->ssl_peek_buffer_size = len; ++ } ++ ++ if (ssl->ssl_peek_avail == 0) { ++ ++ int ret; ++ ++ ret = gnutls_record_recv(ssl->gnutls_state, ssl->ssl_peek_buffer, len); ++ ssl->last_error = ret; ++ ++ if (ret > 0) ++ ssl->ssl_peek_avail += ret; ++ } ++ ++ if (len > ssl->ssl_peek_avail) ++ len = ssl->ssl_peek_avail; ++ ++ memcpy (buf, ssl->ssl_peek_buffer, len); ++ ++ return len; ++} ++ + int + SSL_read (SSL * ssl, void *buf, int len) + { + int ret; + ++ if (ssl->ssl_peek_avail) { ++ int n = (ssl->ssl_peek_avail > len) ? len : ssl->ssl_peek_avail; ++ ++ memcpy (buf, ssl->ssl_peek_buffer, n); ++ ++ if (ssl->ssl_peek_avail > n) ++ memmove (ssl->ssl_peek_buffer, ssl->ssl_peek_buffer + n, ssl->ssl_peek_avail - n); ++ ++ ssl->ssl_peek_avail -= n; ++ ++ return n; ++ } ++ + ret = gnutls_record_recv (ssl->gnutls_state, buf, len); + ssl->last_error = ret; + +Index: gnutls-1.6.0/includes/gnutls/openssl.h +=================================================================== +--- gnutls-1.6.0.orig/libextra/includes/gnutls/openssl.h 2006-03-08 11:44:58.000000000 +0100 ++++ gnutls-1.6.0/libextra/includes/gnutls/openssl.h 2006-12-12 15:07:26.032227000 +0100 +@@ -164,6 +164,11 @@ + + gnutls_transport_ptr_t rfd; + gnutls_transport_ptr_t wfd; ++ ++ char *ssl_peek_buffer; ++ size_t ssl_peek_buffer_size; ++ size_t ssl_peek_avail; ++ + }; + + #define rbio gnutls_state diff --git a/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch new file mode 100644 index 0000000000..10e377407a --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls-2.12.5/gnutls-texinfo-euro.patch @@ -0,0 +1,18 @@ +Upstream-Status: Backport + +The version of texinfo in Debian Sarge does not understand the @euro{} command. +This patch replaces the @euro{} command with the word "euro". + +--- gnutls-1.3.5/doc/gnutls.texi.orig 2006-04-26 08:06:40.918268000 +0930 ++++ gnutls-1.3.5/doc/gnutls.texi 2006-04-26 08:06:52.446515440 +0930 +@@ -11,8 +11,8 @@ + long as it is difficult enough to generate two different messages with + the same hash algorithm output. In that case the same signature could + be used as a proof for both messages. Nobody wants to sign an innocent +-message of donating 1 @euro{} to Greenpeace and find out that he +-donated 1.000.000 @euro{} to Bad Inc. ++message of donating 1 euro to Greenpeace and find out that he ++donated 1.000.000 euro to Bad Inc. + + For a hash algorithm to be called cryptographic the following three + requirements must hold diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index fd77af4c84..9f8d81b3bb 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -21,9 +21,9 @@ inherit autotools binconfig pkgconfig gettext EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ --with-libtasn1-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \ - --with-libz-prefix=${STAGING_DIR_HOST}${prefix} --with-lzo --disable-guile" - + --with-libgcrypt --with-libgcrypt-prefix=${STAGING_DIR_HOST}${prefix} \ + --with-lzo --disable-guile \ + " do_configure_prepend() { for dir in . lib libextra; do rm ${dir}/aclocal.m4 ${dir}/m4/libtool.m4 ${dir}/m4/lt*.m4 diff --git a/meta/recipes-support/gnutls/gnutls_2.10.4.bb b/meta/recipes-support/gnutls/gnutls_2.10.4.bb deleted file mode 100644 index cc2fa27894..0000000000 --- a/meta/recipes-support/gnutls/gnutls_2.10.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require gnutls.inc - -PR = "${INC_PR}.0" - -SRC_URI += "file://gnutls-openssl.patch \ - file://gnutls-texinfo-euro.patch \ - file://configure-fix.patch" - -SRC_URI[md5sum] = "4e1517084018a8b1fdc96daabea40528" -SRC_URI[sha256sum] = "b8bfe36450fe671e99db5ff1e44e6b65fda8a79cacd9e77d550eff7da3745fc8" diff --git a/meta/recipes-support/gnutls/gnutls_2.12.5.bb b/meta/recipes-support/gnutls/gnutls_2.12.5.bb new file mode 100644 index 0000000000..b27a06506a --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls_2.12.5.bb @@ -0,0 +1,9 @@ +require gnutls.inc + +PR = "r0" + +SRC_URI += "file://gnutls-openssl.patch \ + file://configure-fix.patch" + +SRC_URI[md5sum] = "2d0bd5ae11534074fcd78da6ea384e64" +SRC_URI[sha256sum] = "bf263880f327ac34a561d8e66b5a729cbe33eea56728bfed3406ff2898448b60" -- cgit v1.2.3-54-g00ecf