[oe-commits] org.oe.oz354x gnutls: added 1.6.0 from .dev, dropped older
hrw commit
openembedded-commits at lists.openembedded.org
Wed Dec 13 10:32:54 UTC 2006
gnutls: added 1.6.0 from .dev, dropped older
Author: hrw at openembedded.org
Branch: org.openembedded.oz354x
Revision: 096afe740ffd6b461ef6f936895a3fa7dbfb5c48
ViewMTN: http://monotone.openembedded.org/revision.psp?id=096afe740ffd6b461ef6f936895a3fa7dbfb5c48
Files:
1
packages/gnutls/gnutls-1.0.23
packages/gnutls/gnutls-1.0.23/export-symbols.patch
packages/gnutls/gnutls-1.0.23/gnutls-openssl.patch
packages/gnutls/gnutls-1.0.25
packages/gnutls/gnutls-1.0.25/export-symbols.patch
packages/gnutls/gnutls-1.0.25/gnutls-openssl.patch
packages/gnutls/gnutls_1.0.23.bb
packages/gnutls/gnutls_1.0.25.bb
packages/gnutls/gnutls
packages/gnutls/gnutls/gnutls-openssl.patch
packages/gnutls/gnutls/gnutls-texinfo-euro.patch
packages/gnutls/gnutls/onceonly.m4
packages/gnutls/gnutls.inc
packages/gnutls/gnutls_1.6.0.bb
Diffs:
#
# mt diff -r94c88b017c30d8c0a897f48d2666d6020469772b -r096afe740ffd6b461ef6f936895a3fa7dbfb5c48
#
#
#
# delete "packages/gnutls/gnutls-1.0.23"
#
# delete "packages/gnutls/gnutls-1.0.23/export-symbols.patch"
#
# delete "packages/gnutls/gnutls-1.0.23/gnutls-openssl.patch"
#
# delete "packages/gnutls/gnutls-1.0.25"
#
# delete "packages/gnutls/gnutls-1.0.25/export-symbols.patch"
#
# delete "packages/gnutls/gnutls-1.0.25/gnutls-openssl.patch"
#
# delete "packages/gnutls/gnutls_1.0.23.bb"
#
# delete "packages/gnutls/gnutls_1.0.25.bb"
#
# add_dir "packages/gnutls/gnutls"
#
# add_file "packages/gnutls/gnutls/gnutls-openssl.patch"
# content [57a45f0b716c1b48f686d3f43aa68dd3e5f3ceb6]
#
# add_file "packages/gnutls/gnutls/gnutls-texinfo-euro.patch"
# content [550b1a57676f820d61f440a7adc68aa9f3d70b3c]
#
# add_file "packages/gnutls/gnutls/onceonly.m4"
# content [69e404272e41c22d678b6f84de2f8fff23347fcc]
#
# add_file "packages/gnutls/gnutls.inc"
# content [f380f8df5e37d7c2a568b26a935b6bdfd7740624]
#
# add_file "packages/gnutls/gnutls_1.6.0.bb"
# content [13b3bb79cebab1435aa13c20342a5aeb539dc011]
#
============================================================
--- packages/gnutls/gnutls/gnutls-openssl.patch 57a45f0b716c1b48f686d3f43aa68dd3e5f3ceb6
+++ packages/gnutls/gnutls/gnutls-openssl.patch 57a45f0b716c1b48f686d3f43aa68dd3e5f3ceb6
@@ -0,0 +1,124 @@
+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/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;
+ gnutls_transport_ptr_t wfd;
++
++ char *ssl_peek_buffer;
++ size_t ssl_peek_buffer_size;
++ size_t ssl_peek_avail;
++
+ };
+
+ #define rbio gnutls_state
============================================================
--- packages/gnutls/gnutls/gnutls-texinfo-euro.patch 550b1a57676f820d61f440a7adc68aa9f3d70b3c
+++ packages/gnutls/gnutls/gnutls-texinfo-euro.patch 550b1a57676f820d61f440a7adc68aa9f3d70b3c
@@ -0,0 +1,16 @@
+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/signatures.texi.orig 2006-04-26 08:06:40.918268000 +0930
++++ gnutls-1.3.5/doc/signatures.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
============================================================
--- packages/gnutls/gnutls/onceonly.m4 69e404272e41c22d678b6f84de2f8fff23347fcc
+++ packages/gnutls/gnutls/onceonly.m4 69e404272e41c22d678b6f84de2f8fff23347fcc
@@ -0,0 +1,63 @@
+# onceonly.m4 serial 3
+dnl Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+dnl This file is free software, distributed under the terms of the GNU
+dnl General Public License. As a special exception to the GNU General
+dnl Public License, this file may be distributed as part of a program
+dnl that contains a configuration script generated by Autoconf, under
+dnl the same distribution terms as the rest of that program.
+
+dnl This file defines some "once only" variants of standard autoconf macros.
+dnl AC_CHECK_HEADERS_ONCE like AC_CHECK_HEADERS
+dnl AC_CHECK_FUNCS_ONCE like AC_CHECK_FUNCS
+dnl AC_CHECK_DECLS_ONCE like AC_CHECK_DECLS
+dnl AC_REQUIRE([AC_HEADER_STDC]) like AC_HEADER_STDC
+dnl The advantage is that the check for each of the headers/functions/decls
+dnl will be put only once into the 'configure' file. It keeps the size of
+dnl the 'configure' file down, and avoids redundant output when 'configure'
+dnl is run.
+dnl The drawback is that the checks cannot be conditionalized. If you write
+dnl if some_condition; then gl_CHECK_HEADERS(stdlib.h); fi
+dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
+dnl empty, and the check will be inserted before the body of the AC_DEFUNed
+dnl function.
+
+dnl Autoconf version 2.57 or newer is recommended.
+AC_PREREQ(2.54)
+
+# AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
+# AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
+AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
+ :
+ AC_FOREACH([gl_HEADER_NAME], [$1], [
+ AC_DEFUN([gl_CHECK_HEADER_]m4_quote(translit(defn([gl_HEADER_NAME]),
+ [-./], [___])), [
+ AC_CHECK_HEADERS(gl_HEADER_NAME)
+ ])
+ AC_REQUIRE([gl_CHECK_HEADER_]m4_quote(translit(gl_HEADER_NAME,
+ [-./], [___])))
+ ])
+])
+
+# AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
+# AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
+AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
+ :
+ AC_FOREACH([gl_FUNC_NAME], [$1], [
+ AC_DEFUN([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]), [
+ AC_CHECK_FUNCS(defn([gl_FUNC_NAME]))
+ ])
+ AC_REQUIRE([gl_CHECK_FUNC_]defn([gl_FUNC_NAME]))
+ ])
+])
+
+# AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
+# AC_CHECK_DECLS(DECL1, DECL2, ...).
+AC_DEFUN([AC_CHECK_DECLS_ONCE], [
+ :
+ AC_FOREACH([gl_DECL_NAME], [$1], [
+ AC_DEFUN([gl_CHECK_DECL_]defn([gl_DECL_NAME]), [
+ AC_CHECK_DECLS(defn([gl_DECL_NAME]))
+ ])
+ AC_REQUIRE([gl_CHECK_DECL_]defn([gl_DECL_NAME]))
+ ])
+])
============================================================
--- packages/gnutls/gnutls.inc f380f8df5e37d7c2a568b26a935b6bdfd7740624
+++ packages/gnutls/gnutls.inc f380f8df5e37d7c2a568b26a935b6bdfd7740624
@@ -0,0 +1,43 @@
+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
+
+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/
+}
+
+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.*"
============================================================
--- packages/gnutls/gnutls_1.6.0.bb 13b3bb79cebab1435aa13c20342a5aeb539dc011
+++ packages/gnutls/gnutls_1.6.0.bb 13b3bb79cebab1435aa13c20342a5aeb539dc011
@@ -0,0 +1,7 @@
+require gnutls.inc
+
+PR = "r2"
+
+do_configure_prepend() {
+ sed -i "s/2.60/2.59/" ${S}/configure.in
+}
More information about the Openembedded-commits
mailing list