From patchwork Thu Apr 10 08:09:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: christian.braunersorensen@prevas.dk X-Patchwork-Id: 338018 X-Patchwork-Delegate: esben@haabendal.dk Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hugin.dotsrc.org (hugin.dotsrc.org [130.225.254.102]) by ozlabs.org (Postfix) with ESMTP id 255461400DB for ; Thu, 10 Apr 2014 18:18:53 +1000 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id 8A94B3FFF9 for ; Thu, 10 Apr 2014 10:10:09 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail01.prevas.se (mail01.prevas.se [62.95.78.3]) by hugin.dotsrc.org (Postfix) with ESMTPS id 2977A3FFCC for ; Thu, 10 Apr 2014 10:09:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=8839; q=dns/txt; s=ironport1; t=1397117395; x=1428653395; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=6n1fxOXp9ApxnQqSi5stl6rsBRDXmOR4f0CdBYgeW2k=; b=a+tgZz5+s0uj04yGtEfjIm1yuG4Cint6haANesTQWJe3D+3Qc//PJjSy 14wrHSW2oiY0R2KI0zk0b/DIbnL1Pc56MZJSLopL1OrGZGuJ7K/3YWzpd FC0EuXe0OF+oTL9G7RJzgh5Uo+USjn7woQf5FA3yv+ltpKTcNx36DKgXO w=; X-IronPort-AV: E=Sophos;i="4.97,833,1389740400"; d="scan'208";a="4590603" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport1.prevas.se with ESMTP/TLS/AES128-SHA; 10 Apr 2014 10:09:52 +0200 Received: from localhost (172.16.10.102) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server id 14.2.347.0; Thu, 10 Apr 2014 10:09:51 +0200 Received: by localhost (Postfix, from userid 30007) id E9269682316; Thu, 10 Apr 2014 08:09:51 +0000 (UTC) From: To: Subject: [PATCH 26/28] gnutls: Remove version 3.1.5 Date: Thu, 10 Apr 2014 08:09:46 +0000 Message-ID: X-Mailer: git-send-email 1.8.4 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: dev@oe-lite.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: OE-lite development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Christian Sørensen Signed-off-by: Christian Sørensen --- .../correct_rpl_gettimeofday_signature.patch | 57 ---------- recipes/gnutls/gnutls-3.1.5/gnutls-openssl.patch | 126 --------------------- recipes/gnutls/gnutls_3.1.5.oe | 29 ----- recipes/gnutls/gnutls_3.1.5.oe.sig | 2 - 4 files changed, 214 deletions(-) delete mode 100644 recipes/gnutls/gnutls-3.1.5/correct_rpl_gettimeofday_signature.patch delete mode 100644 recipes/gnutls/gnutls-3.1.5/gnutls-openssl.patch delete mode 100644 recipes/gnutls/gnutls_3.1.5.oe delete mode 100644 recipes/gnutls/gnutls_3.1.5.oe.sig diff --git a/recipes/gnutls/gnutls-3.1.5/correct_rpl_gettimeofday_signature.patch b/recipes/gnutls/gnutls-3.1.5/correct_rpl_gettimeofday_signature.patch deleted file mode 100644 index b8f0d72..0000000 --- a/recipes/gnutls/gnutls-3.1.5/correct_rpl_gettimeofday_signature.patch +++ /dev/null @@ -1,57 +0,0 @@ -Currently we fail on uclibc like below - -| In file included from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/procfs.h:32:0, -| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/ucontext.h:26, -| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/signal.h:392, -| from ../../gl/signal.h:52, -| from ../../gl/sys/select.h:58, -| from /home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/sysroots/qemuarm/usr/include/sys/types.h:220, -| from ../../gl/sys/types.h:28, -| from ../../lib/includes/gnutls/gnutls.h:46, -| from ex-cxx.cpp:3: -| ../../gl/sys/time.h:396:66: error: conflicting declaration 'void* restrict' -| ../../gl/sys/time.h:396:50: error: 'restrict' has a previous declaration as 'timeval* restrict' -| make[4]: *** [ex-cxx.o] Error 1 -| make[4]: *** Waiting for unfinished jobs.... - - -GCC detects that we call 'restrict' as param name in function -signatures and complains since both params are called 'restrict' -therefore we use __restrict to denote the C99 keywork - -This only happens of uclibc since this code is not excercised with -eglibc otherwise we will have same issue there too - -Signed-off-by: Khem Raj - -Upstream-Status: Pending - -Index: gnutls-2.12.14/gl/sys_time.in.h -=================================================================== ---- gnutls-2.12.14.orig/gl/sys_time.in.h 2012-01-15 10:54:39.517285351 -0800 -+++ gnutls-2.12.14/gl/sys_time.in.h 2012-01-15 10:59:23.773299108 -0800 -@@ -82,20 +82,20 @@ - # define gettimeofday rpl_gettimeofday - # endif - _GL_FUNCDECL_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); - _GL_CXXALIAS_RPL (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); -+ (struct timeval *__restrict, void *__restrict)); - # else - # if !@HAVE_GETTIMEOFDAY@ - _GL_FUNCDECL_SYS (gettimeofday, int, -- (struct timeval *restrict, void *restrict) -+ (struct timeval *__restrict, void *__restrict) - _GL_ARG_NONNULL ((1))); - # endif - /* Need to cast, because on glibc systems, by default, the second argument is - struct timezone *. */ - _GL_CXXALIAS_SYS_CAST (gettimeofday, int, -- (struct timeval *restrict, void *restrict)); -+ (struct timeval *__restrict, void *__restrict)); - # endif - _GL_CXXALIASWARN (gettimeofday); - # elif defined GNULIB_POSIXCHECK diff --git a/recipes/gnutls/gnutls-3.1.5/gnutls-openssl.patch b/recipes/gnutls/gnutls-3.1.5/gnutls-openssl.patch deleted file mode 100644 index ea6f793..0000000 --- a/recipes/gnutls/gnutls-3.1.5/gnutls-openssl.patch +++ /dev/null @@ -1,126 +0,0 @@ -Upstream-Status: Backport - -Index: gnutls-1.6.0/extra/gnutls_openssl.c -=================================================================== ---- gnutls-1.6.0.orig/extra/gnutls_openssl.c 2006-08-13 22:34:09.000000000 +0200 -+++ gnutls-1.6.0/extra/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/extra/includes/gnutls/openssl.h 2006-03-08 11:44:58.000000000 +0100 -+++ gnutls-1.6.0/extra/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/recipes/gnutls/gnutls_3.1.5.oe b/recipes/gnutls/gnutls_3.1.5.oe deleted file mode 100644 index fbb38d9..0000000 --- a/recipes/gnutls/gnutls_3.1.5.oe +++ /dev/null @@ -1,29 +0,0 @@ -require gnutls.inc - -DEPENDS += "libnettle libhogweed" - -LICENSE = "GPLv3+ & LGPLv2.1+" -LICENSE_${PN} = "LGPLv2.1+" -LICENSE_${PN}-xx = "LGPLv2.1+" -LICENSE_${PN}-bin = "GPLv3+" -LICENSE_${PN}-extra = "GPLv3+" -LICENSE_${PN}-openssl = "GPLv3+" - -require conf/fetch/gnu.conf -SRC_URI = "${GNU_MIRROR}/gnutls/gnutls-${PV}.tar.xz" - -SRC_URI += "file://gnutls-openssl.patch" -SRC_URI += "file://correct_rpl_gettimeofday_signature.patch" - -PARALLEL_MAKE = "" - -AUTO_PACKAGE_LIBS = "gnutls gnutlsxx gnutls-openssl" -DEPENDS_${PN}-libgnutls += "libgmp libhogweed libnettle" -RDEPENDS_${PN}-libgnutls += "libgmp libhogweed libnettle" - -AUTO_PACKAGE_UTILS += "danetool ocsptool" -DEPENDS_${PN}-certtool += "libgmp libhogweed libnettle" -RDEPENDS_${PN}-certtool += "libgmp libhogweed libnettle" - -LIBRARY_VERSION = "28" -LIBRARY_VERSION_${PN}-libgnutls-openssl = "27" diff --git a/recipes/gnutls/gnutls_3.1.5.oe.sig b/recipes/gnutls/gnutls_3.1.5.oe.sig deleted file mode 100644 index f015d62..0000000 --- a/recipes/gnutls/gnutls_3.1.5.oe.sig +++ /dev/null @@ -1,2 +0,0 @@ -da39a3ee5e6b4b0d3255bfef95601890afd80709 gnutls-3.1.5.tar.bz2 -93efeab75cad6f656eae1123c10e3692db727bd5 gnutls-3.1.5.tar.xz