From patchwork Sat Sep 8 07:11:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146227 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp310973ljw; Sat, 8 Sep 2018 00:11:39 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ0UO4arcPs4HS/a65bC+YuWk42vFjUY4myBTr+/cNDEin5pXfJV/NJUO26qyGKUFVXGBqK X-Received: by 2002:a62:f0d:: with SMTP id x13-v6mr12444620pfi.221.1536390699065; Sat, 08 Sep 2018 00:11:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536390699; cv=none; d=google.com; s=arc-20160816; b=V+7curkOpRQHnUInmfSIno2oLkfA6lB7Z0Il3c2d3sU5RbzVRllt87gh1SMFrz5YBv NkrTEfVwFDCIzIQYYbvWlcuLXIxzA1NNK2B0IN7xNlOIPHqPGAUTDj84pKkBmX02Ucnk F9A6SV3bNG8gSTfeva5RHV/ktpyd7yJZwjRMyLD/6KZo0rN/C7EZAIzn9+aX5+KoJ3CQ MPAXoManOqPVOqo3AjSGPwl/z7jZZ+6U1eSfEQ+Dgf2P9L2XxgzmvGkTrVrRcokdM8Xu +Gw+GdX5Yx70BMJeH2ovyrgYODLjEWKtimaTBvLov/A9Gkzih+2fLKIhaP+kTglu5e+v dAAA== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=KEPmgO+keQZZEFBwhuVqCxJ0S4MSCNodaj7y0d9uAtQ=; b=cK4ulbqyKcbIB4xKFnKHjprFw5gqxYokiHyUvN2+LQPvNGF9+Lk+9+UE2YT9jskPaJ kNDTM0K4NLbVNlrx+wTKwBDcmaPYLE4sv12bA/gAdYFJkzCGxn90PaoMVU5aF8u08mIv 6l1vTTM/2YRaofl5c7/Uu4qg2X45DjcfsPc9o+uilRooOeF3a9rspVFw2yEhcEJnk2zb FLFqUutO5UrIkAaBu7p90mueNaShPNg0/zK4ZysBy5OzRFJHWiDdoMrCPecc3Q1fl0JP PTP/+6Ml8slQ79XI1wpPB4ig9lpre3UF9oOqzpoHGyrJtpwpfBMbVOxCmFV+aSp2F+v0 ZNrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=htqLBFr7; 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 h17-v6si11070231pgj.214.2018.09.08.00.11.38; Sat, 08 Sep 2018 00:11:39 -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=htqLBFr7; 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 4F64479806; Sat, 8 Sep 2018 07:11:36 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mail.openembedded.org (Postfix) with ESMTP id 8704171C9B for ; Sat, 8 Sep 2018 07:11:35 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id s17-v6so7530771plp.7 for ; Sat, 08 Sep 2018 00:11:36 -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; bh=brHDaFK+FDxXHhPaV1QYJMbU/l3xS12CfIIiYkXBnDY=; b=htqLBFr7JCEbR5ESPqOiHfw9W5LEF5LbP/gPT167zXWmuFqoyLqMCYW4V1Hptnh7mv OBGM6tAmr0qjpMRGLUR6SajYaZD+PPmCIIxJY7TTockRiNhgykluxt9FP+GKRlHSTDq+ prxM5YUg79hY7Ccy2Atmms1NwNmF+vMF2nDyKEB5VBckXRTrdLYcSNQRBMBitfUXYKKV WFtJaXFx8hIfJlCCk/beeFGf6te7nTco7aQ0dE3ZFOfWK3Vqy8SbS18ZDEAA8GzX5/OK ywiU/RyOUPaZHaXT7/lx+Z0FtttXXkHuw2a00LRqPY3rW5K8oC7TvZadh+7HsZC7HCkW WyOw== 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; bh=brHDaFK+FDxXHhPaV1QYJMbU/l3xS12CfIIiYkXBnDY=; b=UCNl/ekLM6p5xwjUxIcgD5na4vLxpsFae9l81FRffrr12DM8qkQ9eKMRMmSmb6EAYq KbFr0vsbYWorqHzO9cySKwkwDyG6pNGObHp9b/BYrvMv1+4RmkErdyN5GH5agAFcO/C3 OTgdqojZTc8JiWVy6hmM3TkZP255DI4PFYz/jmeEV5uWXi/xRPKolCgWR0tHPaGKe7Gj PAhygxBLYeJ9jGgzqrRHELBYejjFXWiNe0m8gtUbVDf+mM9oERgR7RQ/xWU2t6wFkHBI XIC8vC6JCmer98bKqENXs5ZyEY3bMnEql3U2giz0bRRhOJXC3Nfr/OoTT4iXcquiXy5/ LzKA== X-Gm-Message-State: APzg51Cu1anRbiQMp+b6+AvUj0PR2lJ6kQG07jV7mS6HmJ9wyYkIyJNs okraxlWNDwKPHp0tqQlvi3upRzZ9 X-Received: by 2002:a17:902:c7:: with SMTP id a65-v6mr11523105pla.264.1536390695755; Sat, 08 Sep 2018 00:11:35 -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.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Sep 2018 00:11:34 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 8 Sep 2018 00:11:21 -0700 Message-Id: <20180908071125.28282-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.18.0 Subject: [oe] [meta-networking][PATCH 1/5] openhpi: Upgrade to 3.8.0 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 * Add patches to fix build with OpenSSL 1.1.x * Forward patches and drop ones not needed anymore Signed-off-by: Khem Raj --- ...-poke-at-build-host-s-etc-os-release.patch | 27 +++++ .../0001-Fix-build-failures-with-gcc7.patch | 49 ---------- .../0001-ipmidirect-Replace-__STRING.patch | 31 ------ ...r-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch | 47 --------- .../recipes-daemons/openhpi/files/c++11.patch | 24 +++-- .../openhpi/files/clang-c++11.patch | 17 +--- .../openhpi/files/cross_899198.patch | 98 +++++++++++++++++++ .../openhpi/files/no-md2.patch | 37 +++++++ .../openhpi/files/openhpi-3.6.1-ssl.patch | 20 ++++ .../files/openhpi-hpi-shell-thread-fix.patch | 29 ------ .../files/openhpi-libxml2-cross-compile.patch | 23 +++-- .../files/openhpi-netsnmp-cross-compile.patch | 25 +++-- ...-serial-tests-config-needed-by-ptest.patch | 19 ++-- .../{openhpi_3.6.1.bb => openhpi_3.8.0.bb} | 18 ++-- 14 files changed, 249 insertions(+), 215 deletions(-) create mode 100644 meta-networking/recipes-daemons/openhpi/files/0001-Do-not-poke-at-build-host-s-etc-os-release.patch delete mode 100644 meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch delete mode 100644 meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch delete mode 100644 meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch create mode 100644 meta-networking/recipes-daemons/openhpi/files/cross_899198.patch create mode 100644 meta-networking/recipes-daemons/openhpi/files/no-md2.patch create mode 100644 meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch delete mode 100644 meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch rename meta-networking/recipes-daemons/openhpi/{openhpi_3.6.1.bb => openhpi_3.8.0.bb} (91%) -- 2.18.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-Do-not-poke-at-build-host-s-etc-os-release.patch b/meta-networking/recipes-daemons/openhpi/files/0001-Do-not-poke-at-build-host-s-etc-os-release.patch new file mode 100644 index 0000000000..ab9b25fed0 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/0001-Do-not-poke-at-build-host-s-etc-os-release.patch @@ -0,0 +1,27 @@ +From 2bc5c6367a7f70ca5bff177ec95bcad3b1c2b66b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 6 Sep 2018 18:15:10 -0700 +Subject: [PATCH] Do not poke at build host's /etc/os-release + +During cross compile we are interested in target distro and not host +distro therefore do not check for it. + +Upstream-Status: Inappropriate [Cross compile specific] + +Signed-off-by: Khem Raj +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: openhpi-3.8.0/configure.ac +=================================================================== +--- openhpi-3.8.0.orig/configure.ac ++++ openhpi-3.8.0/configure.ac +@@ -194,7 +194,6 @@ AC_SUBST(JSON_C_LIB) + AC_SUBST(JSON_C_INCLUDE) + AC_CHECK_LIB([rabbitmq],[amqp_new_connection],[RABBITMQ_LIB=-lrabbitmq],[RABBITMQ_LIB=]) + AC_SUBST(RABBITMQ_LIB) +-AC_CHECK_FILE([/etc/os-release],[DISTRO=`grep "^ID=" /etc/os-release | awk -F"\"" '{ print $2 }'`]) + + AC_CHECK_HEADERS([amqp.h],[have_rabbitmq=yes],[have_rabbitmq=no]) + diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch b/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch deleted file mode 100644 index 4f493f7b8f..0000000000 --- a/meta-networking/recipes-daemons/openhpi/files/0001-Fix-build-failures-with-gcc7.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 398c6db66c643ed6133cc2b028ab1e27a17c5295 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 1 May 2017 19:10:09 +0000 -Subject: [PATCH] Fix build failures with gcc7 - -Signed-off-by: Khem Raj ---- - plugins/ipmidirect/ipmi_mc_vendor.cpp | 2 +- - plugins/ipmidirect/ipmi_resource.cpp | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugins/ipmidirect/ipmi_mc_vendor.cpp b/plugins/ipmidirect/ipmi_mc_vendor.cpp -index 2c6c090..557771c 100644 ---- a/plugins/ipmidirect/ipmi_mc_vendor.cpp -+++ b/plugins/ipmidirect/ipmi_mc_vendor.cpp -@@ -322,7 +322,7 @@ cIpmiMcVendor::CreateResources( cIpmiDomain *domain, cIpmiMc *source_mc, cIpmiSd - if ( addr.m_channel != source_mc->GetChannel() ) - stdlog << "WARNING : SDR channel " << addr.m_channel << " NOT equal to MC channel " << source_mc->GetChannel() << "\n"; - -- if ( FindOrCreateResource( domain, source_mc, fru_id, sdr, sdrs ) == false ) { -+ if ( !FindOrCreateResource( domain, source_mc, fru_id, sdr, sdrs ) ) { - return false; - } - } -diff --git a/plugins/ipmidirect/ipmi_resource.cpp b/plugins/ipmidirect/ipmi_resource.cpp -index c438e74..2552673 100644 ---- a/plugins/ipmidirect/ipmi_resource.cpp -+++ b/plugins/ipmidirect/ipmi_resource.cpp -@@ -73,7 +73,7 @@ cIpmiResource::SendCommandReadLock( const cIpmiMsg &msg, cIpmiMsg &rsp, - - domain->ReadLock(); - -- if ( domain->VerifyResource( resource ) == false ) -+ if ( !domain->VerifyResource( resource ) ) - return SA_ERR_HPI_NOT_PRESENT; - - return rv; -@@ -91,7 +91,7 @@ cIpmiResource::SendCommandReadLock( cIpmiRdr *rdr, const cIpmiMsg &msg, cIpmiMsg - - domain->ReadLock(); - -- if ( domain->VerifyRdr( rdr ) == false ) -+ if ( !domain->VerifyRdr( rdr ) ) - return SA_ERR_HPI_NOT_PRESENT; - - return rv; --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch b/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch deleted file mode 100644 index 4d56f6535c..0000000000 --- a/meta-networking/recipes-daemons/openhpi/files/0001-ipmidirect-Replace-__STRING.patch +++ /dev/null @@ -1,31 +0,0 @@ -From be40b3f11460cf495bbbef45692e7763afda0c2b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 14 Sep 2017 17:56:31 -0700 -Subject: [PATCH] ipmidirect: Replace __STRING - -__STRING is not universally available e.g. -musl does not define it - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - plugins/ipmidirect/t/test.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/plugins/ipmidirect/t/test.h b/plugins/ipmidirect/t/test.h -index 8d71381..978d5ff 100644 ---- a/plugins/ipmidirect/t/test.h -+++ b/plugins/ipmidirect/t/test.h -@@ -22,7 +22,7 @@ TestFunction( const char *str, const char *file, int line, bool expr ) - } - - --#define Test(expr) TestFunction( __STRING(expr), __FILE__, __LINE__, expr ) -+#define Test(expr) TestFunction( #expr, __FILE__, __LINE__, expr ) - - - static int --- -2.14.1 - diff --git a/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch b/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch deleted file mode 100644 index 0f033ac855..0000000000 --- a/meta-networking/recipes-daemons/openhpi/files/0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch +++ /dev/null @@ -1,47 +0,0 @@ -From be665d9513cca7e8b64c79ae424cf44ac166b052 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 14 Sep 2017 17:07:58 -0700 -Subject: [PATCH] plugins: Check for PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP - before use - -musl does not define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -so we can not assume that all Linux systems support PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP -its a glibc specific define so check for it being defined before using it - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - plugins/dynamic_simulator/thread.cpp | 2 +- - plugins/ipmidirect/thread.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/plugins/dynamic_simulator/thread.cpp b/plugins/dynamic_simulator/thread.cpp -index d663be0..9210fd7 100644 ---- a/plugins/dynamic_simulator/thread.cpp -+++ b/plugins/dynamic_simulator/thread.cpp -@@ -229,7 +229,7 @@ cThread::Exit( void *rv ) - /** - * Constructor - **/ --#if ( defined(__sun) && defined(__SVR4) ) || defined(__FreeBSD__) -+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP - cThreadLock::cThreadLock() - { - pthread_mutexattr_t attr; -diff --git a/plugins/ipmidirect/thread.cpp b/plugins/ipmidirect/thread.cpp -index 5c52557..48e83fa 100644 ---- a/plugins/ipmidirect/thread.cpp -+++ b/plugins/ipmidirect/thread.cpp -@@ -167,7 +167,7 @@ cThread::Exit( void *rv ) - // cThreadLock - ////////////////////////////////////////////////// - --#if ( defined(__sun) && defined(__SVR4) ) || defined(__FreeBSD__) -+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP - cThreadLock::cThreadLock() - { - pthread_mutexattr_t attr; --- -2.14.1 - diff --git a/meta-networking/recipes-daemons/openhpi/files/c++11.patch b/meta-networking/recipes-daemons/openhpi/files/c++11.patch index 0549d59777..5eff86b4d5 100644 --- a/meta-networking/recipes-daemons/openhpi/files/c++11.patch +++ b/meta-networking/recipes-daemons/openhpi/files/c++11.patch @@ -1,11 +1,21 @@ -Index: openhpi-3.6.1/configure.ac -=================================================================== ---- openhpi-3.6.1.orig/configure.ac -+++ openhpi-3.6.1/configure.ac -@@ -44,6 +44,7 @@ AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_LN_S +From ed51168dfd6844deeaebf7d5f6c65898aafb6299 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 27 Aug 2017 12:12:04 -0700 + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index c29a31f..f7fe0f7 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -46,6 +46,7 @@ AC_PROG_LN_S AC_PROG_MAKE_SET + AC_PROG_AWK + AC_PROG_GREP +AX_CXX_COMPILE_STDCXX_11([noext],[mandatory]) enabled_non32bit="no" diff --git a/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch b/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch index 9b35a0cced..7958a07c67 100644 --- a/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch +++ b/meta-networking/recipes-daemons/openhpi/files/clang-c++11.patch @@ -1,3 +1,7 @@ +Support build with Clang + +Upstream-Status: Pending +Signed-off-by: Khem Raj Index: openhpi-3.6.1/plugins/dynamic_simulator/new_sim.cpp =================================================================== --- openhpi-3.6.1.orig/plugins/dynamic_simulator/new_sim.cpp @@ -1273,16 +1277,3 @@ Index: openhpi-3.6.1/plugins/ipmidirect/ipmi.cpp static SaErrorT IpmiResetWatchdog(void *hnd, -Index: openhpi-3.6.1/plugins/ipmidirect/ipmi_auth.h -=================================================================== ---- openhpi-3.6.1.orig/plugins/ipmidirect/ipmi_auth.h -+++ openhpi-3.6.1/plugins/ipmidirect/ipmi_auth.h -@@ -32,7 +32,7 @@ class cIpmiAuthSg - { - public: - void *data; /* NULL to terminate. */ -- int len; -+ unsigned int len; - }; - - diff --git a/meta-networking/recipes-daemons/openhpi/files/cross_899198.patch b/meta-networking/recipes-daemons/openhpi/files/cross_899198.patch new file mode 100644 index 0000000000..3161140df9 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/cross_899198.patch @@ -0,0 +1,98 @@ +From: Helmut Grohne +Subject: fix cross compilation + +The OH_SET_SIZES macro relies on the usual autoconf sizeof cache variables +during cross compilation, but it never ensure that they are initialized. + +pkg-config must be called with $ac_tool_prefix and PKG_PROG_PKG_CONFIG takes +care of that. Setting PKG_CONFIG_PATH breaks the pkg-config-cross-wrapper. +Don't do that. + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Index: openhpi-3.8.0/acinclude.m4 +=================================================================== +--- openhpi-3.8.0.orig/acinclude.m4 ++++ openhpi-3.8.0/acinclude.m4 +@@ -22,30 +22,39 @@ AC_DEFUN([OH_SET_SIZES], + + if test "x$cross_compiling" != "xno"; then + if test "x$OH_SIZEOF_UCHAR" = x; then ++ AC_CHECK_SIZEOF([unsigned char]) + OH_SIZEOF_UCHAR=$ac_cv_sizeof_uchar + fi + if test "x$OH_SIZEOF_USHORT" = x; then ++ AC_CHECK_SIZEOF([unsigned short]) + OH_SIZEOF_USHORT=$ac_cv_sizeof_ushort + fi + if test "x$OH_SIZEOF_UINT" = x; then ++ AC_CHECK_SIZEOF([unsigned int]) + OH_SIZEOF_UINT=$ac_cv_sizeof_uint + fi + if test "x$OH_SIZEOF_CHAR" = x; then ++ AC_CHECK_SIZEOF([char]) + OH_SIZEOF_CHAR=$ac_cv_sizeof_char + fi + if test "x$OH_SIZEOF_SHORT" = x; then ++ AC_CHECK_SIZEOF([short]) + OH_SIZEOF_SHORT=$ac_cv_sizeof_short + fi + if test "x$OH_SIZEOF_INT" = x; then ++ AC_CHECK_SIZEOF([int]) + OH_SIZEOF_INT=$ac_cv_sizeof_int + fi + if test "x$OH_SIZEOF_LLONG" = x; then ++ AC_CHECK_SIZEOF([long long]) + OH_SIZEOF_LLONG=$ac_cv_sizeof_longlong + fi + if test "x$OH_SIZEOF_FLOAT" = x; then ++ AC_CHECK_SIZEOF([float]) + OH_SIZEOF_FLOAT=$ac_cv_sizeof_float + fi + if test "x$OH_SIZEOF_DOUBLE" = x; then ++ AC_CHECK_SIZEOF([double]) + OH_SIZEOF_DOUBLE=$ac_cv_sizeof_double + fi + else +Index: openhpi-3.8.0/configure.ac +=================================================================== +--- openhpi-3.8.0.orig/configure.ac ++++ openhpi-3.8.0/configure.ac +@@ -87,9 +87,9 @@ have_rtas_lib=no + + dnl Check for GLIB + +-AC_CHECK_PROG([found_pkg_config],[pkg-config],[yes]) ++PKG_PROG_PKG_CONFIG + +-if test "x$found_pkg_config" != "xyes"; then ++if test "x$PKG_CONFIG" = "x"; then + OH_CHECK_FAIL(pkg-config,pkg-config) + fi + PKG_CFG_SETPATH +@@ -105,7 +105,7 @@ GLIB=glib-2.0 + GTHREAD=gthread-2.0 + GMODULE=gmodule-2.0 + +-if pkg-config --atleast-version $GLIB_REQUIRED_VERSION $GLIB; then ++if $PKG_CONFIG --atleast-version $GLIB_REQUIRED_VERSION $GLIB; then + : + else + AC_MSG_ERROR([ +@@ -268,12 +268,12 @@ dnl + dnl We really need to make ipmi enablement be contigent on OpenIPMI + dnl + +-if PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig pkg-config --atleast-version 1.4.20 OpenIPMI; then ++if $PKG_CONFIG --atleast-version 1.4.20 OpenIPMI; then + have_openipmi=yes + AC_CHECK_LIB([OpenIPMI], [ipmi_smi_setup_con], [have_openipmi=yes]) +- OPENIPMI_CFLAGS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig pkg-config --cflags OpenIPMI` ++ OPENIPMI_CFLAGS=`$PKG_CONFIG --cflags OpenIPMI` + AC_SUBST(OPENIPMI_CFLAGS) +- OPENIPMI_LIBS=`PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig pkg-config --libs OpenIPMI` ++ OPENIPMI_LIBS=`$PKG_CONFIG --libs OpenIPMI` + AC_SUBST(OPENIPMI_LIBS) + fi + diff --git a/meta-networking/recipes-daemons/openhpi/files/no-md2.patch b/meta-networking/recipes-daemons/openhpi/files/no-md2.patch new file mode 100644 index 0000000000..c4dd23e790 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/no-md2.patch @@ -0,0 +1,37 @@ +Description: Fix FTBFS with OpenSSL 1.1 by honouring OPENSSL_NO_MD2 +Author: Adrian Bunk +Bug-Debian: https://bugs.debian.org/859543 + +Upstream-Status: Pending +Signed-off-by: Khem Raj + +Index: openhpi-3.8.0/plugins/ipmidirect/ipmi_auth.cpp +=================================================================== +--- openhpi-3.8.0.orig/plugins/ipmidirect/ipmi_auth.cpp ++++ openhpi-3.8.0/plugins/ipmidirect/ipmi_auth.cpp +@@ -21,6 +21,7 @@ + #include "ipmi_auth.h" + #include + #include ++#include + + + cIpmiAuth * +@@ -32,7 +33,7 @@ IpmiAuthFactory( tIpmiAuthType type ) + return new cIpmiAuthNone; + + case eIpmiAuthTypeMd2: +-#ifdef HAVE_OPENSSL_MD2_H ++#if defined(HAVE_OPENSSL_MD2_H) && !defined(OPENSSL_NO_MD2) + return new cIpmiAuthMd2; + #else + break; +@@ -78,7 +79,7 @@ cIpmiAuthNone::Check( cIpmiAuthSg /*d*/[ + } + + +-#ifdef HAVE_OPENSSL_MD2_H ++#if defined(HAVE_OPENSSL_MD2_H) && !defined(OPENSSL_NO_MD2) + #include + + diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch new file mode 100644 index 0000000000..ca522bcc67 --- /dev/null +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-3.6.1-ssl.patch @@ -0,0 +1,20 @@ +Link with libssl + +fixed build with openssl-1.1.x + +Taken from Fedora +https://src.fedoraproject.org/rpms/openhpi/c/be77f5484b0206f8946a85b29424ea10bf863063 + +Signed-off-by: Khem Raj +Upstream-Status: Unknown + +diff -up openhpi-3.6.1/ssl/Makefile.am.than openhpi-3.6.1/ssl/Makefile.am +--- openhpi-3.6.1/ssl/Makefile.am.than 2017-02-21 12:21:12.114814698 -0500 ++++ openhpi-3.6.1/ssl/Makefile.am 2017-02-21 12:22:44.576454262 -0500 +@@ -19,5 +19,5 @@ lib_LTLIBRARIES = libopenhpi_ssl.la + libopenhpi_ssl_la_SOURCES = oh_ssl.c oh_ssl.h + + libopenhpi_ssl_la_LDFLAGS = -version-info @HPI_LIB_VERSION@ +-libopenhpi_ssl_la_LIBADD = @CRYPTO_LIB@ ++libopenhpi_ssl_la_LIBADD = -lssl @CRYPTO_LIB@ + diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch deleted file mode 100644 index cc21ff8c79..0000000000 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-hpi-shell-thread-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -commit e9f9a73c9dba8dd59f3d6c3acd9988ec8361d55a -Author: Aws Ismail -Date: Mon Dec 17 16:23:45 2012 -0500 - - Correct dangling g_thread_exit in session.c - - hpi_shell's session.c has its progress_bar - thread created using pthread_create but - exited using g_thread_exit. Use pthread_exit - instead to avoid unpredictable GLIB thread - errors. - - Upstream-Status: Pending - - Signed-off-by: Aws Ismail - -Index: openhpi-3.6.1/hpi_shell/session.c -=================================================================== ---- openhpi-3.6.1.orig/hpi_shell/session.c -+++ openhpi-3.6.1/hpi_shell/session.c -@@ -73,7 +73,7 @@ static void* progress_bar(void *unused) - if (i < (PROGRESS_BUF_SIZE - mes_len - 1)) i++; - t++; - }; -- g_thread_exit(0); -+ pthread_exit(0); - return (void *)1; - } - diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch index c848b35027..160eeede69 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-libxml2-cross-compile.patch @@ -1,4 +1,7 @@ -Fix libxml2 for cross-compiling +From afe545e77f9d841b7777d859e7e8108492fece96 Mon Sep 17 00:00:00 2001 +From: Jackie Huang +Date: Wed, 26 Apr 2017 16:22:00 +0800 +Subject: [PATCH] Fix libxml2 for cross-compiling Use proper XML2_INCLUDE path when cross-compiling @@ -6,16 +9,20 @@ Upstream-Status: Pending Signed-of-by: Aws Ismail -Index: openhpi-3.6.1/configure.ac -=================================================================== ---- openhpi-3.6.1.orig/configure.ac -+++ openhpi-3.6.1/configure.ac -@@ -177,7 +177,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/ +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 6242cbf..4fb6b69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -179,7 +179,7 @@ AC_CHECK_HEADERS([openssl/md2.h openssl/md5.h openssl/bio.h openssl/ssl.h openss dnl xml is used for XML-based communication in ilo2_ribcl and oa_soap AC_CHECK_LIB([xml2],[xmlParseMemory],[XML2_LIB=-lxml2],[XML2_LIB=]) --AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="-I/usr/include/libxml2"],[XML2_INCLUDE]) -+AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="$XML2_INCLUDE"],[XML2_INCLUDE]) +-AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="-I/usr/include/libxml2"],[XML2_INCLUDE=]) ++AC_CHECK_HEADERS([libxml2/libxml/xmlexports.h],[XML2_INCLUDE="$XML2_INCLUDE"],[XML2_INCLUDE=]) AC_SUBST(XML2_LIB) AC_SUBST(XML2_INCLUDE) diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch index 95b0abc913..293c8d91f5 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-netsnmp-cross-compile.patch @@ -13,36 +13,33 @@ Signed-off-by: Wenzong Fan configure | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/acinclude.m4 b/acinclude.m4 -index 82c33f6..727e461 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 +Index: openhpi-3.8.0/acinclude.m4 +=================================================================== +--- openhpi-3.8.0.orig/acinclude.m4 ++++ openhpi-3.8.0/acinclude.m4 @@ -160,8 +160,8 @@ AC_DEFUN([OH_CHECK_NETSNMP], ], [ have_netsnmp=yes -- SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | perl -p -e 's/-O\S*//g'` +- SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | perl -p -e 's/ -O\S*//g'` - SNMPLIBS=`${net_snmp_config:-net-snmp-config} --libs` + SNMPFLAGS="" + SNMPLIBS="" AC_MSG_RESULT(yes) ], [AC_MSG_RESULT(no. No SNMP based plugins can be built!)]) -diff --git a/configure b/configure -index 00067bc..36b913c 100755 ---- a/configure -+++ b/configure -@@ -15949,8 +15949,8 @@ _ACEOF +Index: openhpi-3.8.0/configure +=================================================================== +--- openhpi-3.8.0.orig/configure ++++ openhpi-3.8.0/configure +@@ -16062,8 +16062,8 @@ _ACEOF if ac_fn_c_try_link "$LINENO"; then : have_netsnmp=yes -- SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | perl -p -e 's/-O\S*//g'` +- SNMPFLAGS=`${net_snmp_config:-net-snmp-config} --cflags | perl -p -e 's/ -O\S*//g'` - SNMPLIBS=`${net_snmp_config:-net-snmp-config} --libs` + SNMPFLAGS="" + SNMPLIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch index 3e09180d4d..472318b808 100644 --- a/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch +++ b/meta-networking/recipes-daemons/openhpi/files/openhpi-use-serial-tests-config-needed-by-ptest.patch @@ -1,4 +1,4 @@ -From 36fbaa27e7299f63c1324b0ad22b970e9365d6a7 Mon Sep 17 00:00:00 2001 +From 5e0ae172586f5aeb270a8f9b012dd3e36536a2a9 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 24 Dec 2014 10:54:59 +0800 Subject: [PATCH] openhpi: use serial-tests config needed by ptest @@ -9,17 +9,18 @@ serial-tests is required to generate those targets. Upstream-Status: Inappropriate [default automake behavior incompatible with ptest] Signed-off-by: Jackie Huang + --- - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) -Index: openhpi-3.6.1/configure.ac -=================================================================== ---- openhpi-3.6.1.orig/configure.ac -+++ openhpi-3.6.1/configure.ac -@@ -7,7 +7,7 @@ dnl various hacks by Sean Dague 4/23/03 AC_PREREQ(2.57) - AC_INIT(openhpi, 3.6.1) + AC_INIT(openhpi, 3.8.0) AC_CONFIG_SRCDIR(openhpi.spec.in) -AM_INIT_AUTOMAKE([1.8]) +AM_INIT_AUTOMAKE([1.8 serial-tests]) diff --git a/meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb similarity index 91% rename from meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb rename to meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb index 596578e118..741b04cdd2 100644 --- a/meta-networking/recipes-daemons/openhpi/openhpi_3.6.1.bb +++ b/meta-networking/recipes-daemons/openhpi/openhpi_3.8.0.bb @@ -20,7 +20,8 @@ SECTION = "net" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=e3c772a32386888ccb5ae1c0ba95f1a4" -DEPENDS = "net-snmp libxml2 ncurses openssl glib-2.0 popt e2fsprogs autoconf-archive-native" +DEPENDS = "net-snmp libxml2 ncurses openssl glib-2.0 popt e2fsprogs \ + autoconf-archive-native os-release" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://openhpi.init \ @@ -32,23 +33,22 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://openhpi-glib-cross-compile.patch \ file://openhpi-linkfix.patch \ file://openhpi-fix-host-gcc.patch \ - file://openhpi-hpi-shell-thread-fix.patch \ file://openhpi-fix-testfail-errors.patch \ file://openhpi-add-libnetsnmp-when-link.patch \ file://openhpi-invalide-session.patch \ file://openhpi-use-serial-tests-config-needed-by-ptest.patch \ file://openhpi-fix-alignment-issue.patch \ - file://0001-Fix-build-failures-with-gcc7.patch \ file://c++11.patch \ file://clang-c++11.patch \ file://fix-narrowing-warning.patch \ - file://0001-plugins-Check-for-PTHREAD_RECURSIVE_MUTEX_INITIALIZE.patch \ - file://0001-ipmidirect-Replace-__STRING.patch \ file://0001-session-close-socket.patch \ + file://openhpi-3.6.1-ssl.patch \ + file://0001-Do-not-poke-at-build-host-s-etc-os-release.patch \ + file://cross_899198.patch \ + file://no-md2.patch \ " - -SRC_URI[md5sum] = "4718b16e0f749b5ad214a9b04f45dd23" -SRC_URI[sha256sum] = "e0a810cb401c4bdcfc9551f2e6afd5a8ca4b411f5ee3bc60c19f82fd6e84a3dc" +SRC_URI[md5sum] = "fffda3deea8a0d3671a72eea9d13a4df" +SRC_URI[sha256sum] = "c94332a29160dd75cb799c027e614690c00263b0fabed87417707bec04c38723" inherit autotools pkgconfig ptest update-rc.d systemd @@ -64,6 +64,8 @@ PACKAGECONFIG[sysfs] = "--enable-sysfs,--disable-sysfs,sysfsutils," PACKAGECONFIG[libgcrypt] = "--enable-encryption,--disable-encryption,libgcrypt," PACKAGECONFIG[non32bit] = "--enable-non32bit-int,--disable-non32bit-int,," +export DISTRO + do_install_append () { install -m 0755 -d ${D}${sysconfdir}/${BPN} install -m 0755 ${S}/openhpiclient.conf.example ${D}${sysconfdir}/${BPN}/openhpiclient.conf From patchwork Sat Sep 8 07:11:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146228 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp311067ljw; Sat, 8 Sep 2018 00:11:48 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdacfh0J8O2xLLiXpMGxa668Gz0uU+yY1S+AGDk1h/NtiXcFOHfN5jYiiez8oOE7+Mhk1cie X-Received: by 2002:a17:902:4324:: with SMTP id i33-v6mr11382986pld.43.1536390708705; Sat, 08 Sep 2018 00:11:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536390708; cv=none; d=google.com; s=arc-20160816; b=iZRDI4Q9RRgW35XXontNDRRvFRZgoXXrLmZK43F4VvEHRfazTTwiqm6aCm0OXCFXTK ikzPV3RTVoeltV0MBcc3sN/bkKKqKeQ5n+6tV8pvbNYMvR5yCDV3bVfMUeqRNExsi6Yp CGIcMgCQ79TbvjH1kstbl73f5hXe5sVx8WkYbB5ybC8dJ4aB6QQXoy2R51vZoWzGamsn yQuwq+YygLlL5AoDSzP40BQBBCrF9Q+BcS1oCYtSITADiBYXevO7E62ZIyRejNr7yw9v RR8laO/eORIgS2QJqVqpwswtMLjfJsXQR5OqZoTO+G2GeWaqaNOhfl2xOODeIexeVyN9 9udQ== 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=Cny1ya7hraPCKNPxVeVUkoRRXMqYAPNxDQ9Z92tTp+Y=; b=IC8pxyt0o/qX9ae95NXpH4XrZbl5yUiyD5Knrlh+imiRFXzPk3owyZqRhnadmd+tUi 0NfAJKpOsPgDDDnbxOPDTMpVlJJsUisTedMYZBnRls+KngwhUC4i3xaJ6kCBC0bMv4px /4gnHI4FD9YVoZ3gKSJJ23OMWerNHfMeV8IW2ZjIhQcWRGveTqu2mYpb1ywB0AVF96Df AM8tCb3G53wCrZ8cHhFXuPYM72cn/FKLTtC0xh6XME4j5NXaKL0eeWLpTnmvBYtIYHh/ wUK9JGIE9WuuoWIn2VK+Gu9dzfKjm7l8w1f9BimTnHtts8NFMK0+8aDIrTPBVPKY42k2 w7Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=MaRIwuAa; 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 31-v6si10352608plc.288.2018.09.08.00.11.48; Sat, 08 Sep 2018 00:11:48 -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=MaRIwuAa; 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 A64A87980B; Sat, 8 Sep 2018 07:11:46 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by mail.openembedded.org (Postfix) with ESMTP id E993979802 for ; Sat, 8 Sep 2018 07:11:35 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id f6-v6so7550787plo.1 for ; Sat, 08 Sep 2018 00:11:37 -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=FAu1Dv9BS8dGayQb73fVYu9eqA9QvS2nxdjsqnkK3yI=; b=MaRIwuAazGCZcq7nGd7MpCJqd5TbDCSNBA3yKfEWpabGNl/rIAdS7k48Wx0P69tb1g ylTzoS0tR45PHY26xAbSP55HT9c9uwe3mLUjhv1h+AEEvck4sQzsO5loT1qVz/W3g5y7 0KC6v6RKNc+msTfk5G/FZJY7R6GNvmDwLv4X2GBiGCAAlBLTfR/umGKNZoIpdLjVdgM0 aebnZrCR3WmGPd449Dwh1Je/Z2qKVYGKyP/MPHAihebiuLS9T2xTNyGmQ5xTRTQlx5dO mLA/VXEj5VGzmTSWLtlnVrEG6pROFTm9muZZKSPoZXNhQXl3biM/I/Yzc11IluBRZ+4B 8QHQ== 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=FAu1Dv9BS8dGayQb73fVYu9eqA9QvS2nxdjsqnkK3yI=; b=haTgCbcOTS6uOZGuZ0ZM9tUnf8pGfcoUBaDFiZSABMdlLfqlB/Hfl2k2OiF9zufrAo H+oti3+D5sHgZ8/LeEE5AuOxUvPB95uhvLTiTszMAyM5Fq1tCX2LthAE3Cy0Qvbz9aV6 kblwKe5du1qVdrnAQACGG3rbRrOwOTTHkuJPU2AfmkwUONyAGIj9O9XMqnn11vpVAT4J Z0NjidapVqzlF3o9mft7sGdXn91a3Hbe6CzoBXFMqnFGu//dVzlJJ8tqrQvFVWzUiJos 34hcCSYMIicY4EwTU5Y4Gwev1/O7VgXPIzGHTKMiJo+z+NuY426SIBVaYJy7kgyYWt8y 1D4Q== X-Gm-Message-State: APzg51B9fVKmqDJYRHn8wfZDYM9sOBNVZXKZ7XOShpG9K3D2q9nj1Khu y6VsVs9WF3fCNxCgGBJUWGEYf2F0 X-Received: by 2002:a17:902:1566:: with SMTP id b35-v6mr11621663plh.135.1536390696503; Sat, 08 Sep 2018 00:11:36 -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.35 (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:22 -0700 Message-Id: <20180908071125.28282-2-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 2/5] md5deep: Upgrade to latest master 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 * Add clang fix Signed-off-by: Khem Raj --- .../0001-Fix-errors-found-by-clang.patch | 32 ----- ...identifier-spacing-as-dictated-by-C-.patch | 128 ++++++++++++++++++ .../files/wrong-variable-expansion.patch | 26 +--- .../{md5deep_4.4.bb => md5deep_git.bb} | 12 +- 4 files changed, 140 insertions(+), 58 deletions(-) delete mode 100644 meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch create mode 100644 meta-oe/recipes-extended/md5deep/files/0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch rename meta-oe/recipes-extended/md5deep/{md5deep_4.4.bb => md5deep_git.bb} (71%) -- 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-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch b/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch deleted file mode 100644 index cc7cdc3364..0000000000 --- a/meta-oe/recipes-extended/md5deep/files/0001-Fix-errors-found-by-clang.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6ef69a26126ee4e69a25392fd456b8a66c51dffd Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 15 Nov 2016 02:46:55 +0000 -Subject: [PATCH] Fix errors found by clang - -Fixes errors like - -../../git/src/hash.cpp:282:19: error: ordered comparison between pointer and zero ('const unsigned char *' and 'int') - if(fdht->base>0){ - ~~~~~~~~~~^~ - -Signed-off-by: Khem Raj ---- - src/hash.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hash.cpp b/src/hash.cpp -index 4216157..52f419b 100644 ---- a/src/hash.cpp -+++ b/src/hash.cpp -@@ -279,7 +279,7 @@ void file_data_hasher_t::hash() - MAP_FILE| - #endif - MAP_SHARED,fd,0); -- if(fdht->base>0){ -+ if(fdht->base != (void *) -1){ - /* mmap is successful, so set the bounds. - * if it is not successful, we default to reading the fd - */ --- -1.9.1 - diff --git a/meta-oe/recipes-extended/md5deep/files/0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch b/meta-oe/recipes-extended/md5deep/files/0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch new file mode 100644 index 0000000000..69460b314b --- /dev/null +++ b/meta-oe/recipes-extended/md5deep/files/0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch @@ -0,0 +1,128 @@ +From 7d7b60e38ca701819d4d00b38161faddce01e2ae Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Thu, 6 Sep 2018 23:21:22 -0700 +Subject: [PATCH] Fix literal and identifier spacing as dictated by C++11 + +Fixes clang error like below + +error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal] +| status(" Known files not found: %"PRIu64, this->match.unused); + +Upstream-Status: Submitted [https://github.com/jessek/hashdeep/pull/385/commits/18a6b5d57f7a648d2b7dcc6e50ff00a1e4b05fcc] +Signed-off-by: Khem Raj +--- + src/display.cpp | 16 ++++++++-------- + src/files.cpp | 4 ++-- + src/hash.cpp | 2 +- + src/hashlist.cpp | 4 ++-- + src/xml.h | 2 +- + 5 files changed, 14 insertions(+), 14 deletions(-) + +diff --git a/src/display.cpp b/src/display.cpp +index b23335d..2eddc23 100644 +--- a/src/display.cpp ++++ b/src/display.cpp +@@ -311,7 +311,7 @@ void display::display_realtime_stats(const file_data_hasher_t *fdht, const hash_ + + ss << mb_read << "MB of " << fdht->stat_megs() << "MB done, "; + char msg[64]; +- snprintf(msg,sizeof(msg),"%02"PRIu64":%02"PRIu64":%02"PRIu64" left", hour, min, seconds); ++ snprintf(msg,sizeof(msg),"%02" PRIu64 ":%02" PRIu64 ":%02" PRIu64 " left", hour, min, seconds); + ss << msg; + } + ss << "\r"; +@@ -424,14 +424,14 @@ void display::display_audit_results() + + if (opt_verbose) { + if(opt_verbose >= MORE_VERBOSE){ +- status(" Input files examined: %"PRIu64, this->match.total); +- status(" Known files expecting: %"PRIu64, this->match.expect); ++ status(" Input files examined: %" PRIu64, this->match.total); ++ status(" Known files expecting: %" PRIu64, this->match.expect); + } +- status(" Files matched: %"PRIu64, this->match.exact); +- status("Files partially matched: %"PRIu64, this->match.partial); +- status(" Files moved: %"PRIu64, this->match.moved); +- status(" New files found: %"PRIu64, this->match.unknown); +- status(" Known files not found: %"PRIu64, this->match.unused); ++ status(" Files matched: %" PRIu64, this->match.exact); ++ status("Files partially matched: %" PRIu64, this->match.partial); ++ status(" Files moved: %" PRIu64, this->match.moved); ++ status(" New files found: %" PRIu64, this->match.unknown); ++ status(" Known files not found: %" PRIu64, this->match.unused); + } + } + +diff --git a/src/files.cpp b/src/files.cpp +index 89c6984..3dfd363 100644 +--- a/src/files.cpp ++++ b/src/files.cpp +@@ -509,7 +509,7 @@ int state::parse_encase_file(const char *fn, FILE *handle,uint32_t expected_hash + + // Users expect the line numbers to start at one, not zero. + if ((!ocb.opt_silent) || (mode_warn_only)) { +- ocb.error("%s: No hash found in line %"PRIu32, fn, count + 1); ++ ocb.error("%s: No hash found in line %" PRIu32, fn, count + 1); + ocb.error("%s: %s", fn, strerror(errno)); + return status_t::STATUS_USER_ERROR; + } +@@ -542,7 +542,7 @@ int state::parse_encase_file(const char *fn, FILE *handle,uint32_t expected_hash + } + + if (expected_hashes != count){ +- ocb.error("%s: Expecting %"PRIu32" hashes, found %"PRIu32"\n", ++ ocb.error("%s: Expecting %" PRIu32 " hashes, found %" PRIu32 "\n", + fn, expected_hashes, count); + } + return status_t::status_ok; +diff --git a/src/hash.cpp b/src/hash.cpp +index 52f419b..a4b3128 100644 +--- a/src/hash.cpp ++++ b/src/hash.cpp +@@ -124,7 +124,7 @@ bool file_data_hasher_t::compute_hash(uint64_t request_start,uint64_t request_le + + // If an error occured, display a message and see if we need to quit. + if ((current_read_bytes<0) || (this->handle && ferror(this->handle))){ +- ocb->error_filename(this->file_name,"error at offset %"PRIu64": %s", ++ ocb->error_filename(this->file_name,"error at offset %" PRIu64 ": %s", + request_start, strerror(errno)); + + if (file_fatal_error()){ +diff --git a/src/hashlist.cpp b/src/hashlist.cpp +index b5b275f..eb0d45a 100644 +--- a/src/hashlist.cpp ++++ b/src/hashlist.cpp +@@ -342,7 +342,7 @@ hashlist::load_hash_file(display *ocb,const std::string &fn) + file_data_t *t = new (std::nothrow) file_data_t(); + if (NULL == t) + { +- ocb->fatal_error("%s: Out of memory in line %"PRIu64, ++ ocb->fatal_error("%s: Out of memory in line %" PRIu64, + fn.c_str(), line_number); + } + +@@ -390,7 +390,7 @@ hashlist::load_hash_file(display *ocb,const std::string &fn) + if ( !algorithm_t::valid_hash(hash_column[column_number],word)) + { + if (ocb) +- ocb->error("%s: Invalid %s hash in line %"PRIu64, ++ ocb->error("%s: Invalid %s hash in line %" PRIu64, + fn.c_str(), + hashes[hash_column[column_number]].name.c_str(), + line_number); +diff --git a/src/xml.h b/src/xml.h +index bfe0c94..017dba7 100644 +--- a/src/xml.h ++++ b/src/xml.h +@@ -100,7 +100,7 @@ public: + void xmlout(const std::string &tag,const std::string &value){ xmlout(tag,value,"",true); } + void xmlout(const std::string &tag,const int value){ xmlprintf(tag,"","%d",value); } + void xmloutl(const std::string &tag,const long value){ xmlprintf(tag,"","%ld",value); } +- void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%"PRId64,value); } ++ void xmlout(const std::string &tag,const int64_t value){ xmlprintf(tag,"","%" PRId64,value); } + void xmlout(const std::string &tag,const double value){ xmlprintf(tag,"","%f",value); } + void xmlout(const std::string &tag,const struct timeval &ts){ + xmlprintf(tag,"","%d.%06d",(int)ts.tv_sec, (int)ts.tv_usec); +-- +2.18.0 + diff --git a/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch b/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch index 3a4c4f4c2c..73c6cb126a 100644 --- a/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch +++ b/meta-oe/recipes-extended/md5deep/files/wrong-variable-expansion.patch @@ -1,6 +1,8 @@ ---- a/configure.ac 2014-08-22 12:22:54.290884351 +0200 -+++ b/configure.ac 2014-08-22 12:23:15.822306295 +0200 -@@ -42,18 +42,6 @@ +Index: git/configure.ac +=================================================================== +--- git.orig/configure.ac ++++ git/configure.ac +@@ -42,18 +42,6 @@ case $host in ;; esac @@ -19,21 +21,3 @@ # # ################################################################ -@@ -71,7 +59,7 @@ - - if test $mingw = "no" ; then - # add the warnings we don't want to do on mingw -- $WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes -Weffc++" -+ WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Wall -Wstrict-prototypes -Weffc++" - fi - - for option in $WARNINGS_TO_TEST -@@ -105,7 +93,7 @@ - - if test $mingw = "no" ; then - # add the warnings we don't want to do on mingw -- $WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Weffc++" -+ WARNINGS_TO_TEST="$WARNINGS_TO_TEST -Weffc++" - fi - - for option in $WARNINGS_TO_TEST diff --git a/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb b/meta-oe/recipes-extended/md5deep/md5deep_git.bb similarity index 71% rename from meta-oe/recipes-extended/md5deep/md5deep_4.4.bb rename to meta-oe/recipes-extended/md5deep/md5deep_git.bb index bb30abedd9..e8c6864c1f 100644 --- a/meta-oe/recipes-extended/md5deep/md5deep_4.4.bb +++ b/meta-oe/recipes-extended/md5deep/md5deep_git.bb @@ -4,13 +4,15 @@ AUTHOR = "Jesse Kornblum, Simson L. Garfinkel" HOMEPAGE = "http://md5deep.sourceforge.net" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=9190f660105b9a56cdb272309bfd5491" -# Release 4.4 -SRCREV = "cd2ed7416685a5e83eb10bb659d6e9bec01244ae" + +PV = "4.4+git${SRCPV}" + +SRCREV = "877613493ff44807888ce1928129574be393cbb0" SRC_URI = "git://github.com/jessek/hashdeep.git \ - file://wrong-variable-expansion.patch \ - file://0001-Fix-errors-found-by-clang.patch \ - " + file://wrong-variable-expansion.patch \ + file://0001-Fix-literal-and-identifier-spacing-as-dictated-by-C-.patch \ + " S = "${WORKDIR}/git" 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" From patchwork Sat Sep 8 07:11:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146231 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp311292ljw; Sat, 8 Sep 2018 00:12:10 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdahv1aDyxX8MEozaPwa2YnHRkIsZueIXyvNW+V+QR37qDfHshtJFxafWJlEkzdiQOV+YvYk X-Received: by 2002:a17:902:b81:: with SMTP id 1-v6mr225994plr.319.1536390730623; Sat, 08 Sep 2018 00:12:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536390730; cv=none; d=google.com; s=arc-20160816; b=T2tfnP7N69tHWCzeTvRK/AWn7gOMQyA0k//ff8zLKPZbpjqAT+yWLWs5Kr0ucXHs2v f+IQtjLef9+UhA0Kuhal93kZ+QEHIgnSICijQDuAkAX+4TybhalrTRIN1S9EFq9JLU3Q QQm6V6+hb0oOM8l/mpeRoYsE/d/3lHtokXxYMcKsRLV7p8VfVOboDnMZt2XEN/vqWWhE Q88ZQSumqflAVeWUFmvqmcgGCd84nDBr6Wb1grCUCl2DdQmaTv4FurbhIHXh5f7LN0fI gfp0zJyJQS3zU0oqVYcmH51solavZ0mDN4UnYyY/cynRAhc8M9P9ae5EXbFf0vgPRdPI u6aQ== 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=V/NzS2b/DHGYqJD9BnDp+NWlR9H68l2fyCwgjw6QcME=; b=DB4tdHhJqqBVNaSxGr09tjOdGdUNykdjbNz6FL3nEg1YMHnQzS5mYNNDfz+wNiACNu wfqaikDxvGiqBsGLowETd2hGNDUt9dMA3cpFr+B2V7HDCbQ/cK/tN8ayFcZC7nuecJNM Hty0u/kqaAXayCuHgMtn0C1S0YQVhPEui1VR+AJPvjtx/Lodinp4WTi3wmUjsgENibcm Gh0oX4Xii9sAhmRa9iEoS80ldtCpynpwOKxHruWdSt2ooWmZpjviRWXxvk4BHcAT1Km0 pUpE1nHyamvzUNk7CTeSMWuLClndaUc7K/HW01WnW07Y30IcHzCHcat7HpBkyDS8TKPT yZiA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=EsAlYPuH; 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 f73-v6si11152588pfk.97.2018.09.08.00.12.10; Sat, 08 Sep 2018 00:12:10 -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=EsAlYPuH; 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 E73137982E; Sat, 8 Sep 2018 07:11:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mail.openembedded.org (Postfix) with ESMTP id A9C8479807 for ; Sat, 8 Sep 2018 07:11:39 +0000 (UTC) Received: by mail-pl1-f174.google.com with SMTP id f6-v6so7550827plo.1 for ; Sat, 08 Sep 2018 00:11:41 -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=CQmt2vpinaVyVSXuQW5pYO+AU7lvYJg8+XiSerDoMb8=; b=EsAlYPuHIPcTmOL93YHseoUOwrG02CHHzL3oK/Qj7e73KwHvie+Cz80cS4hwgf/Zwy YienpKUtHTZzx8iPLdwpHTwtdeXEwvIGSn8AkBateKbAjnB++YYbsEnvlclfYkNGEuKS j9cl+aIK3aWJu2KRUQQejJISTBhlOOCH5jMT5+PXzcdgWTi3bx9XXHVaKBq67VWzyFUi AcZwTvWL7ys33kTlSe2WGvGWAc+psoua8ZLgThvduIwB80+UxWPmzVOmCkcafD5N//Bq hSR93BEDsaJQdcYAIRkfneTV75VYSsU2ll3ofNnYrTNTqanN9oGJbG2rsGodyDg+a5Ym OrrQ== 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=CQmt2vpinaVyVSXuQW5pYO+AU7lvYJg8+XiSerDoMb8=; b=qOP2mcmtZsgYWmh3nM9an+79eonaJKRI8e6T9pyaXuokx3a9hhOOsSrSDTkjPcKwU9 iGLxP9DGrj0Ilz23g1d3iImjH0SWIVSF5i2eRzCUn164172uRPgUTxiReCuTRJiy4ABL JH/HY08rpahEwWnNUFmQeS9NrdnIZuaGwo3ZNDbcBQ4hPK60eS8QJkFlwqxpsaNcZg8r VMAp7N/uaVIq/VWBZJyWr5dv49BhwKjeitNOb3A5bkelDYYy8ZgKwVrh+2ec5QF+ANZh p9QL6e2+uWL5Xt8x9j95Kh2pYAKX0H2jwoVwBjZB2GCU67rNaBMwnHdMZFpk9l/NqjUg lwDg== X-Gm-Message-State: APzg51BuKgaH+7lDtC5p70u1u/v+0Z/+w/y2E3rvpZMpZck+veB0qirp IB+WcftSXApYrQ9+0hmIi5JeUFOT X-Received: by 2002:a17:902:5a3:: with SMTP id f32-v6mr11836345plf.286.1536390698306; Sat, 08 Sep 2018 00:11:38 -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.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Sep 2018 00:11:37 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 8 Sep 2018 00:11:24 -0700 Message-Id: <20180908071125.28282-4-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 4/5] umip: Fetch from git.umip.org 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 * Adjust patches * Depend on openssl10 * remove spurious dep on rpm Signed-off-by: Khem Raj --- ...with-SIGCHLD-and-include-sys-types.h.patch | 21 +++++-------------- meta-oe/recipes-connectivity/umip/umip_1.0.bb | 6 +++--- 2 files changed, 8 insertions(+), 19 deletions(-) -- 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/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch b/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch index 8192056d13..153bced396 100644 --- a/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch +++ b/meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch @@ -20,19 +20,11 @@ Upstream-Status: Pending src/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/src/main.c b/src/main.c -index 3cf4072..cd34196 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -126,9 +127,9 @@ static void daemon_start(int ignsigcld) +Index: git/src/main.c +=================================================================== +--- git.orig/src/main.c ++++ git/src/main.c +@@ -133,9 +133,9 @@ static void daemon_start(int ignsigcld) if (ignsigcld) { #ifdef SIGTSTP @@ -44,6 +36,3 @@ index 3cf4072..cd34196 100644 #endif } } --- -2.16.2 - diff --git a/meta-oe/recipes-connectivity/umip/umip_1.0.bb b/meta-oe/recipes-connectivity/umip/umip_1.0.bb index 8db252d237..cee44f6c76 100644 --- a/meta-oe/recipes-connectivity/umip/umip_1.0.bb +++ b/meta-oe/recipes-connectivity/umip/umip_1.0.bb @@ -7,9 +7,9 @@ HOMEPAGE = "http://umip.org/" SECTION = "System Environment/Base" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=073dc31ccb2ebed70db54f1e8aeb4c33" -DEPENDS = "rpm indent-native bison-native" +DEPENDS = "openssl10 ipsec-tools radvd indent-native bison-native" -SRC_URI = "git://github.com/jlanza/umip \ +SRC_URI = "git://git.umip.org/umip/umip.git \ file://add-dependency-to-support-parallel-compilation.patch \ file://mip6d \ file://mip6d.service \ @@ -17,7 +17,7 @@ SRC_URI = "git://github.com/jlanza/umip \ file://0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch \ file://0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch \ " -SRCREV = "7d67209cd1bba2dd0e183a0fa07eeef07964dd14" +SRCREV = "cbd441c5db719db554ff2b4fcb02fef88ae2f791" S = "${WORKDIR}/git" From patchwork Sat Sep 8 07:11:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 146230 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp311216ljw; Sat, 8 Sep 2018 00:12:03 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ6apQx6EXZeBhFOI3GtFssrENeHeoeMraqiDB51TyBHxE2ATvOHqBiyjLqbA21ymyGX3Lb X-Received: by 2002:a17:902:261:: with SMTP id 88-v6mr11585613plc.331.1536390723147; Sat, 08 Sep 2018 00:12:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536390723; cv=none; d=google.com; s=arc-20160816; b=qXK5sZpq0ugAeH4BLMJab9CD3MNWG5jVpQbg/ZWEWSa2fsgTy448doLwFPZMhDFWYT AXQMpitfrZz24Lx6DoP7vlIZ67salb1zt6DDqbBReVjjgSWeI4VIYtv2VTAz7cUDOgYT qrHP+bumAKk+9gB3H49GGJJBsCutCg0Oyr/rBtJFS/TcTtGBanBf1pp2YabmfPtagFKi LuNXozywrvwQGasG5Xu76dU4PtMkC5b1Q1KDm02fWeMbrABtme0UDGxd6+4oGd/DdNNs RoYXZ8HFFee/z5736fS3n1R1AMxhxfeRvqn3MPJfjfUa+X144b+AYxwdMer192ZxYNyr /pVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=nDhD2KpeS/kp7ot5iJyu80sMV57hr+AdPyRKNg0Ii2g=; b=KzGyBpr91ml7lI/8/8dpl3u3KS53hg1gjtZydggpsjrDJwFz+WekIlOOzvg9i9Lvbl 86EKaPvkqtHT1JtPgMqEzO4xC2CM/49DvT8oTHeBaRXo7WxHf/IAi0LHcFebBl8rDvKk HnbsXXWgbz8jlYAX2TaisdbkOGgNefVwUkVN40rYn5GWpklC0ZI+d7s0LBHaVQzs0yHp mo/4T60FetcS4EONeqVj1tbYTNIDdon5FZxkmisEKAyu32/hDQUhv1GTBi3+CISDNiUe Kr0BQWmHTh38S47J/C+zuJfylucOZciT/4PVLSjzZhim+07ewiP8REkTLS1XvEPZsAaz PCjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=pPYfsZ0u; 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 y9-v6si9826011plt.9.2018.09.08.00.12.02; Sat, 08 Sep 2018 00:12:03 -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=pPYfsZ0u; 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 D0F2679828; Sat, 8 Sep 2018 07:11:48 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mail.openembedded.org (Postfix) with ESMTP id CB93771C9B for ; Sat, 8 Sep 2018 07:11:38 +0000 (UTC) Received: by mail-pl1-f178.google.com with SMTP id b12-v6so7528932plr.8 for ; Sat, 08 Sep 2018 00:11:40 -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 :mime-version:content-transfer-encoding; bh=HAJuzSyM7BARGFgSLFGg5k/u7+Aj7bhqlnYgYcm9VNA=; b=pPYfsZ0uwUMDcz1CZ1NEYG6HPTaX3j0/o0G9idfPhprnQbih6YQBvWc6ACY+akD/qz PYgK7/KaSH5gzPECLZAYHQL+1cmafB7ZPiTyrJrIt3F7z/mfax1x4YeZqZdGogQGwd/0 wScnGbXxlO/RtgPXYklXpiDcMLlw0NZxMD+O4rx6joWYwi9qDyAPjJx2YFtKQe24Mzqm 2+N+06mDQ05oYZ5jyKhXdOmvHOgmM8XXgXV1s85ESihUayie8bNdoJ4UCAy6PUWShl3I 1HskB0R0v42An0RRzEoWMql06h2774gCZ+kJdigJzHFhtfKWbT5nAHqEdVTwOyzQ/Oo4 JXWA== 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:mime-version:content-transfer-encoding; bh=HAJuzSyM7BARGFgSLFGg5k/u7+Aj7bhqlnYgYcm9VNA=; b=ImEKFKq4bUI9r2+VM/9MAvattnwdWK5GGHvR30rzcl/m8R4ewKWf4qBx1ytN2ViUyJ XU/FxPjzCxre/H0+Wdrc+uiZn5ecBGYuY+iffgboZgcQmdu8O86Qz9wTJsNXSX2m7qfy mh/iaApc3o4GRvd+kwlH2OqkUqe98VI8b9hC9cksOF8+DKT2Pk9KjCQuPNJsTIHFoxU9 QeicMbP+3QlTHu5Cp7gG7Y9DqWb7lAu1pAZIvXB+gRv/v8Q6ATyQWavAUUxNqbRpQYnk 9FnVnmjMzdKsYN5Z/gQR2Qlis4TfuUrFFViKCMQTuHTGaCbxO3iwaOmMioEs7S+jpb4g VRaw== X-Gm-Message-State: APzg51AXtCIxB84yJryo95BFjCFgrYF/LfZQVbl5h6qjJMLxAWzXpI1i M7XyTdcaEgQ//lJk5WhsCPcEHzVL X-Received: by 2002:a17:902:bf46:: with SMTP id u6-v6mr11617121pls.85.1536390699455; Sat, 08 Sep 2018 00:11:39 -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.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Sep 2018 00:11:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sat, 8 Sep 2018 00:11:25 -0700 Message-Id: <20180908071125.28282-5-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> MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH 5/5] kea: Fix build with boost 1.68+ 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: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...-of-overloaded-distance-is-ambiguous.patch | 89 +++++++++++++++++++ .../recipes-connectivity/kea/kea_1.4.0.bb | 1 + 2 files changed, 90 insertions(+) create mode 100644 meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch diff --git a/meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch b/meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch new file mode 100644 index 0000000000..fb16ecbf99 --- /dev/null +++ b/meta-networking/recipes-connectivity/kea/files/0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch @@ -0,0 +1,89 @@ +From 8ea2ee451a1af7c5b5c8f4b36c1f77d44442064d Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 7 Sep 2018 13:02:35 -0700 +Subject: [PATCH] Fix error: call of overloaded distance is ambiguous +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The boost::iterators::distance function template is an adapted version +of std::distance for the Boost iterator traversal in 2.68 it has started +to fail with argument dependent lookup and compiler is erroring out + +with + +error: call of overloaded ‘distance' + +boost implementation of distance is protected against being found by ADL + +The way function is called in libdhcp means it will be found via ADL and +all namespaces will be considered which is providing problematic since +its getting it from both std:: and boost:: namespaces + +so let it not rely on ADL by qualifying then calls with std:: namespace + +Upstream-Status: Submitted [https://github.com/isc-projects/kea/pull/103] +Signed-off-by: Khem Raj +--- + src/lib/dhcp/libdhcp++.cc | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc +index 330c02b..ced705d 100644 +--- a/src/lib/dhcp/libdhcp++.cc ++++ b/src/lib/dhcp/libdhcp++.cc +@@ -419,14 +419,14 @@ size_t LibDHCP::unpackOptions6(const OptionBuffer& buf, + // We previously did the lookup only for dhcp6 option space, but with the + // addition of S46 options, we now do it for every space. + range = idx.equal_range(opt_type); +- num_defs = distance(range.first, range.second); ++ num_defs = std::distance(range.first, range.second); + + // Standard option definitions do not include the definition for + // our option or we're searching for non-standard option. Try to + // find the definition among runtime option definitions. + if (num_defs == 0) { + range = runtime_idx.equal_range(opt_type); +- num_defs = distance(range.first, range.second); ++ num_defs = std::distance(range.first, range.second); + } + + OptionPtr opt; +@@ -538,14 +538,14 @@ size_t LibDHCP::unpackOptions4(const OptionBuffer& buf, + // may be standard options in other spaces (e.g. radius). So we now do + // the lookup for every space. + range = idx.equal_range(opt_type); +- num_defs = distance(range.first, range.second); ++ num_defs = std::distance(range.first, range.second); + + // Standard option definitions do not include the definition for + // our option or we're searching for non-standard option. Try to + // find the definition among runtime option definitions. + if (num_defs == 0) { + range = runtime_idx.equal_range(opt_type); +- num_defs = distance(range.first, range.second); ++ num_defs = std::distance(range.first, range.second); + } + + // Check if option unpacking must be deferred +@@ -638,7 +638,7 @@ size_t LibDHCP::unpackVendorOptions6(const uint32_t vendor_id, + idx->equal_range(opt_type); + // Get the number of returned option definitions for the + // option code. +- size_t num_defs = distance(range.first, range.second); ++ size_t num_defs = std::distance(range.first, range.second); + + if (num_defs > 1) { + // Multiple options of the same code are not supported +@@ -746,7 +746,7 @@ size_t LibDHCP::unpackVendorOptions4(const uint32_t vendor_id, const OptionBuffe + idx->equal_range(opt_type); + // Get the number of returned option definitions for + // the option code. +- size_t num_defs = distance(range.first, range.second); ++ size_t num_defs = std::distance(range.first, range.second); + + if (num_defs > 1) { + // Multiple options of the same code are not +-- +2.18.0 + diff --git a/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb b/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb index ba01b8c1c9..67de07b31f 100644 --- a/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb +++ b/meta-networking/recipes-connectivity/kea/kea_1.4.0.bb @@ -10,6 +10,7 @@ DEPENDS += "kea-native" SRC_URI = "\ http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://0003-Makefile.am-update-hooksdir-for-lease_cmds.patch \ + file://0001-Fix-error-call-of-overloaded-distance-is-ambiguous.patch \ file://kea-dhcp4.service \ file://kea-dhcp6.service \ file://kea-dhcp-ddns.service \