From patchwork Sat Oct 5 18:24:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Kjaergaard X-Patchwork-Id: 280782 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 [IPv6:2001:878:346::102]) by ozlabs.org (Postfix) with ESMTP id 1C38C2C00CD for ; Sun, 6 Oct 2013 05:25:03 +1100 (EST) Received: from hugin.dotsrc.org (localhost [127.0.0.1]) by hugin.dotsrc.org (Postfix) with ESMTP id D869C447E6 for ; Sat, 5 Oct 2013 20:25:01 +0200 (CEST) X-Original-To: dev@oe-lite.org Delivered-To: dev@oe-lite.org Received: from mail02.prevas.se (mail02.prevas.se [62.95.78.10]) by hugin.dotsrc.org (Postfix) with ESMTPS id 5D8F6447E6 for ; Sat, 5 Oct 2013 20:25:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=2901; q=dns/txt; s=ironport2; t=1380997500; x=1412533500; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=Svu3F9sJkucZxmT605pbbnb6xMBuz+QGMiNtMVlgSfQ=; b=aTEHmruXgwKiNgegCo/jmD6oNQmzUR3WcuMwfuio93yWm6BnT+oLXO9l D7808ZHUhjeyrkeCM+5MjOLPcgQaOiRXyxshXDFxJYKDZrJr6k+6Rz4/Y 2YZrIWMAuUbcwB0OD+LLG/9ykH//7fC8V2S3/qCI1P/CNXBQu169q8bvf M=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: Ao4FAKdXUFJauQtd/2dsb2JhbABZgz+tYod5jBGBLHSCJQEBBXkQIDFXGQmIAQiuUI0nj1EHFoQNA5gBkgCDJjo X-IPAS-Result: Ao4FAKdXUFJauQtd/2dsb2JhbABZgz+tYod5jBGBLHSCJQEBBXkQIDFXGQmIAQiuUI0nj1EHFoQNA5gBkgCDJjo X-IronPort-AV: E=Sophos;i="4.90,1039,1371074400"; d="scan'208";a="3750599" Received: from 0117800685.0.fullrate.dk (HELO localhost.localdomain) ([90.185.11.93]) by mail02.prevas.se with ESMTP/TLS/DHE-RSA-AES256-SHA; 05 Oct 2013 20:24:59 +0200 From: jabk@prevas.dk To: dev@oe-lite.org Subject: [base 3/3] gnutls: fix build against eglibc216 Date: Sat, 5 Oct 2013 20:24:49 +0200 Message-Id: <1380997489-21879-3-git-send-email-jabk@prevas.dk> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380997489-21879-1-git-send-email-jabk@prevas.dk> References: <1380997489-21879-1-git-send-email-jabk@prevas.dk> Cc: Jacob Kjaergaard 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: , MIME-Version: 1.0 Sender: dev-bounces@oe-lite.org Errors-To: dev-bounces@oe-lite.org From: Jacob Kjaergaard --- recipes/gnutls/gnutls.inc | 5 +-- .../gets-no-longer-existin-e-glibc-2.16.patch | 34 ++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 recipes/gnutls/gnutls/gets-no-longer-existin-e-glibc-2.16.patch diff --git a/recipes/gnutls/gnutls.inc b/recipes/gnutls/gnutls.inc index 1a78472..207cbda 100644 --- a/recipes/gnutls/gnutls.inc +++ b/recipes/gnutls/gnutls.inc @@ -2,7 +2,7 @@ DESCRIPTION = "GNU Transport Layer Security Library" HOMEPAGE = "http://www.gnu.org/software/gnutls/" BUGTRACKER = "https://savannah.gnu.org/support/?group=gnutls" -inherit c++ autotools-autoreconf binconfig pkgconfig gettext +inherit c++ autotools binconfig pkgconfig gettext DEPENDS += "libz liblzo libtasn1 libgcrypt libreadline" DEPENDS_${PN} += "libz liblzo libtasn1 libgcrypt libreadline" @@ -10,7 +10,8 @@ RDEPENDS_${PN} += "gnutls-extra liblzo libtasn1" require conf/fetch/gnu.conf -SRC_URI = "${GNU_MIRROR}/gnutls/gnutls-${PV}.tar.bz2" +SRC_URI = "${GNU_MIRROR}/gnutls/gnutls-${PV}.tar.bz2 \ + file://gets-no-longer-existin-e-glibc-2.16.patch" EXTRA_OECONF="--with-included-opencdk --with-included-libcfg --disable-rpath \ --with-libtasn1-prefix=${HOST_SYSROOT} \ diff --git a/recipes/gnutls/gnutls/gets-no-longer-existin-e-glibc-2.16.patch b/recipes/gnutls/gnutls/gets-no-longer-existin-e-glibc-2.16.patch new file mode 100644 index 0000000..db86b7d --- /dev/null +++ b/recipes/gnutls/gnutls/gets-no-longer-existin-e-glibc-2.16.patch @@ -0,0 +1,34 @@ +diff --git a/gl/stdio.in.h b/gl/stdio.in.h +index 9dc7c4a..8cb19d7 100644 +--- a/gl/stdio.in.h ++++ b/gl/stdio.in.h +@@ -710,9 +710,11 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s)); + _GL_CXXALIAS_SYS (gets, char *, (char *s)); + # undef gets + # endif ++# if defined gets + _GL_CXXALIASWARN (gets); + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++# endif + #endif + + +diff --git a/lib/gl/stdio.in.h b/lib/gl/stdio.in.h +index 03bea2a..cb6483b 100644 +--- a/lib/gl/stdio.in.h ++++ b/lib/gl/stdio.in.h +@@ -710,9 +710,11 @@ _GL_CXXALIAS_RPL (gets, char *, (char *s)); + _GL_CXXALIAS_SYS (gets, char *, (char *s)); + # undef gets + # endif ++# if defined gets + _GL_CXXALIASWARN (gets); + /* It is very rare that the developer ever has full control of stdin, + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++# endif + #endif