From patchwork Sat Sep 8 07:11:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146229 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp311152ljw; Sat, 8 Sep 2018 00:11:56 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdbf8rDI8Q1Ay+jBUHRNytf2W9MB8Ny5iyBzzu8kMq12IC7oCAbO+VmYGzhBKRCd6CK5ZWSq X-Received: by 2002:a63:9e41:: with SMTP id r1-v6mr11833385pgo.362.1536390716086; Sat, 08 Sep 2018 00:11:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536390716; cv=none; d=google.com; s=arc-20160816; b=JLY0+eKCyi5jiv++JV16FKaTfRVAgjSj/zKIr1RD1uU2R853kSPDQBe4r17m9I7NEZ qtGdHrmBUlxFjgCp1pZ+PH6kiCKwsAQ7X4kIOToVb232pDR2qPp99x6fP8CLOtwUkk0b MGV1HkW3xWL0Yg2AbnPwSQJV3nRDwgiThCzySRvgg0bWKtVaBR+36sELgDH05sMWA0/9 j1qKTM3yZHEPSmw3Sg1ljHvAT8R3gD61xJWUpYXRXA/01rzrqP70u+gvx6sKwzJx5uvb TZhKDQKdI9hJdUwrU0guKNqoMhkYZg88jl0/9TqsvgCEqLQOKPCuCH6KN7kRTbicYn6k zWwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=nv2oDmSa4lNZWylqU4UA0tkbhIcIGJY1SEBN3EqV/5M=; b=bf3M2QLPIKx4IbkpOE+oZDZ7gsAZGtxDhhzQd6UjbYCV1dsKOEo9ek9Grkl0AdVabV ycdTXgJ3fhRIMJiCjhtvYAKbKKOa2egH4+u1QF6VQCdFFq9vN9wG4eUzhpA/FlkIuVP9 a+tP8moVxjW6CwLZuDBYJMd5G/peHCrB1kaB7aM/ydnTtvRIS2W3NTdaW8bAuLB0/BSJ voiaR+5FBch6WrECDGEK9yyTh4mI/ttpBKDH5skOZ6xnU1RL7v/3A7PXzPjIkwI2VWC3 dSiQ/b71DEmk5FiGVrrI0rssAVmenpWqtL9fk37yYsSbaRgtMFrvEPJJKRojddIpxnpB ze3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DpP4LdNu; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id o1-v6si10188101pld.223.2018.09.08.00.11.55; Sat, 08 Sep 2018 00:11:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=DpP4LdNu; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BA44E79821; Sat, 8 Sep 2018 07:11:47 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mail.openembedded.org (Postfix) with ESMTP id 949EA797FD for ; Sat, 8 Sep 2018 07:11:36 +0000 (UTC) Received: by mail-pg1-f179.google.com with SMTP id i190-v6so8036979pgc.6 for ; Sat, 08 Sep 2018 00:11:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nUbWpmiVlHDYhFg+iAqtCmK0VM7SYJF2s5AJYbNWOY4=; b=DpP4LdNuzfQFx5laiQeWrtTFxAZ5ZoXCBTDllpQ4XlwXqGJWpQE/5fF556fxnw7oJa dH0Xt0Zf8gfMkcaStaTBfx8Xh+U9jjci9noDxiIJYkrnK5u4KsZCdnPQHb5A0C+vruAq vPGPPqER6KDk6PiCevREESE+iu310G6qcalrCNV6AxJu04QpdcMYEjMM8sWw0lDUfTfO ggaGZcfY+lnpUQUDlJjLXpbct3bONZo4NIcPZZ1BK2rDBml+T6VM6N/j095WbtZw0zxe /HLCvQ7fa/dZ8Uxer07l4Uk045bqYpeq0R0Ymzhil2YVHaBtT939ViCc5aAMPxeuLxGy 7tJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nUbWpmiVlHDYhFg+iAqtCmK0VM7SYJF2s5AJYbNWOY4=; b=s+yIIyxcQzOpwgqQfQwOGMMrpDwRKO3WMwvz8Z4ternaL34eVGuxBUaMmPuJs8pe93 /Ytixa6F5KQJGPAl/rEgegwRow4oje3s+QUxYdj7nr5mdxbf7KSaBl9JPnGyOyP+Rzoy OAvo0xkMoYEd9Nb9PLtiEneBeTClXN5WS7a9Hz3VQ4OYYLzkSLIMU/HE09SeAyzKNG8s UYI9z3pwf+IY1HCO+5PRGJnlx1o71xknMbMC1EzX/kyqyQs+QCEQFZyM3DuU1ZlIBAS2 Nw5bOnh6SxbqpcQ09VUB9flTnQ7ZQBq7dT0OnJ5aOx5DQWb8W5Zc3WqQ70wKFuNxxbze 0D/A== X-Gm-Message-State: APzg51Cqk3H4KwqeNX31Ha+nWcz1p6ThgnO33UxNHa+j4qwNsMzEDg/x malavJTiRIBhu329TDecrvTwZjFi X-Received: by 2002:a62:4b14:: with SMTP id y20-v6mr12454502pfa.93.1536390697323; Sat, 08 Sep 2018 00:11:37 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::71e7]) by smtp.gmail.com with ESMTPSA id a15-v6sm18702212pfe.32.2018.09.08.00.11.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Sep 2018 00:11:36 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 8 Sep 2018 00:11:23 -0700 Message-Id: <20180908071125.28282-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180908071125.28282-1-raj.khem@gmail.com> References: <20180908071125.28282-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/5] wvstreams: Depend on openssl10 and add patch to build with openssl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- .../wvdial/wvstreams/05_gcc.diff | 13 ------------- .../wvdial/wvstreams/openssl-buildfix.patch | 16 ++++++++++++++++ .../wvdial/wvstreams_4.6.1.bb | 3 ++- 3 files changed, 18 insertions(+), 14 deletions(-) create mode 100644 meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff b/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff index 8e4fd03298..616843d4ae 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff @@ -1,16 +1,3 @@ -Index: wvstreams-4.6.1/crypto/wvx509.cc -=================================================================== ---- wvstreams-4.6.1.orig/crypto/wvx509.cc 2011-05-20 00:02:38.119136584 +0200 -+++ wvstreams-4.6.1/crypto/wvx509.cc 2011-05-20 00:02:26.035136589 +0200 -@@ -1157,7 +1157,7 @@ - - if (ext) - { -- X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); -+ X509V3_EXT_METHOD *method = (X509V3_EXT_METHOD *)X509V3_EXT_get(ext); - if (!method) - { - WvDynBuf buf; Index: wvstreams-4.6.1/ipstreams/wvunixdgsocket.cc =================================================================== --- wvstreams-4.6.1.orig/ipstreams/wvunixdgsocket.cc 2011-05-20 00:02:38.391136584 +0200 diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch b/meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch new file mode 100644 index 0000000000..1c7005c2fe --- /dev/null +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch @@ -0,0 +1,16 @@ +Index: wvstreams-4.6.1/crypto/wvx509.cc +=================================================================== +--- wvstreams-4.6.1.orig/crypto/wvx509.cc ++++ wvstreams-4.6.1/crypto/wvx509.cc +@@ -1157,7 +1157,11 @@ WvString WvX509::get_extension(int nid) + + if (ext) + { ++#if OPENSSL_VERSION_NUMBER >= 0x10000000L ++ const X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#else + X509V3_EXT_METHOD *method = X509V3_EXT_get(ext); ++#endif + if (!method) + { + WvDynBuf buf; diff --git a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index e3d5e7d20b..7c5e92fe5c 100644 --- a/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -4,7 +4,7 @@ SUMMARY = "WvStreams is a network programming library in C++" LICENSE = "LGPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=55ca817ccb7d5b5b66355690e9abc605" -DEPENDS = "zlib openssl (>= 0.9.8) dbus readline" +DEPENDS = "zlib openssl10 (>= 0.9.8) dbus readline" DEPENDS_append_libc-musl = " argp-standalone libexecinfo" SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ @@ -21,6 +21,7 @@ SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz \ file://0005-check-for-libexecinfo-during-configure.patch \ file://0001-build-fix-parallel-make.patch \ file://0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch \ + file://openssl-buildfix.patch \ " SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c"