From patchwork Sun Dec 23 21:35:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 154448 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3270196ljp; Sun, 23 Dec 2018 13:36:43 -0800 (PST) X-Google-Smtp-Source: ALg8bN7T6siqG03LjBkrWvWTFtn8vKvwzikcFEk/x299jolHy5GW/DJm7hpAT3QLmku8IdvOq48z X-Received: by 2002:a63:b0a:: with SMTP id 10mr10357133pgl.423.1545601002916; Sun, 23 Dec 2018 13:36:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1545601002; cv=none; d=google.com; s=arc-20160816; b=zxNvNWi1vcObQ59twLLH2ZJnLOdBhSYnOpRLMoM6w2c3rODQjvh4GtATnWFoHVBlZb 78UH0h+Dym6FvV65tfy5Q4TTLu43Jy7EYPv/Azqg29wvEGhWygEesqSOlFRR0bKfs29s 6eSj1KqeZXhA8llQcWcsOgjomJp7sumXao6mEY+qPebIDeEhs77LO1OTcXzlu2ua/0I2 MuAyslt1fWRoJug47ocKjQq8LMO64DTFSOUtO+rrxsq+pixKewQeVwFjRNXcOC5nKMjP R+Xs2DM9v2AHD7k8BSqt/EJnDxqXK17UwKQ77FqTVz41OCwvl8Z448X9z/BdlPxHkOxf 7K8A== 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=q/GkEAcaIwLHhuKMb5J94nLd6CM4OJdeYP1eFPs1F9Q=; b=cONQx7OPvWwhog9WrHvLGzpMloA5kKIA+A+WMXICEKkSJkk1YzkQkCa6G7+ZRa40V4 ONBYFsNaooQjq5A9oBH/onsesybib39BgovHAZK6dJMTm0AebTA2HUAvZWVIb1xB9oPX utN09HFZ6F9nMU9peMDiqb8NHLbaspIdJI5DWwlypnKC/Fbjf2+1m6KNNIkMqZLjVTaP CtHqVioDDQrEX3yQGVh1+lxB94h24kNtfVPInwSm2tPKwdo943a0/YjL00iAeZs9sYHx iXy+VJDj1bHXlHP0N35/vkcj8K1EHac7ERNMQDHO9CkJlZmV2fvJ7ET1Gay6IucVyLga lv9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=tdzU9o0b; 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 33si7707219plt.228.2018.12.23.13.36.42; Sun, 23 Dec 2018 13:36:42 -0800 (PST) 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=tdzU9o0b; 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 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 82CE7745AE; Sun, 23 Dec 2018 21:36:32 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by mail.openembedded.org (Postfix) with ESMTP id ED4E16C50D for ; Sun, 23 Dec 2018 21:36:11 +0000 (UTC) Received: by mail-pl1-f180.google.com with SMTP id b5so4866785plr.4 for ; Sun, 23 Dec 2018 13:36:13 -0800 (PST) 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=7MjclzVablZNQanOpo2qCHcE1lj7csCm8BCyhXE44JE=; b=tdzU9o0bW4mg15qSmo3xUHQmFy9v81JpwvJiHnYI3sgdIykExcNKRhVrdzOp7NqPJa QWQkdKUV5seO2KR9zPwosUpCrgucHeZ9rdIj+6nnF7mu9vzr5GJKQ7LwZWZxglnJN3a3 aIKhHHL0R75B6nPOGQqNT0M1UGExr4RCylznxVsbswyQrkj/wR0Zhuc61sk3ByUAjS61 i/PAx7pHSTx/ITHs79tl53umScndVnStzYiPf4BTmXX/UJ2lsoIjNvBEYCnLc+cRhEEt z1s7EP8GbIahYcJdkIEZ+m09+LEo2P1kITOUYc2dvFec9T9GVlNGHzDGtmvcdu4EAGpJ EVyQ== 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=7MjclzVablZNQanOpo2qCHcE1lj7csCm8BCyhXE44JE=; b=qajPvoETaU8EJxPmv2tgmAga25zidEKqytsrcsbQUudW+LMyrMaGCvePcWb5SchJWD l0gPROgC4qRi7kdHOuUABPh0pOFNCtgl/s3NzmDMz6HL1I9ST0NR61puf1cABORjqhdr +hI0uZdJGMftlbzg81URiMTfQGp8CanQQMMobdXE+bMlmgIpLVzbKt8VRTtGpP7WD753 N2RVpKXmZl3UTzZC1C4DURb3owzmplmPnPxPKw9zZA2HFkUYvX9dPyyStiJG7MIhowHR VvKXWBcdFopfjhD2ZgWd7H9XgNus6OwOC3owrykPqxRGv9AVWx+m66OgKdchd7fSZ40t Xekw== X-Gm-Message-State: AJcUukeES5r30SJLBUzraj1NcZm+0cr4OAM685b8zkf92iwynlo+qk2L GJu9ztb0x7IWKVYeDj8eLtLHU0lvEuo= X-Received: by 2002:a17:902:a40f:: with SMTP id p15mr11112829plq.286.1545600972577; Sun, 23 Dec 2018 13:36:12 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:877f:9499::19ec]) by smtp.gmail.com with ESMTPSA id m9sm33340800pgd.32.2018.12.23.13.36.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Dec 2018 13:36:11 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 23 Dec 2018 13:35:43 -0800 Message-Id: <20181223213557.7834-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20181223213557.7834-1-raj.khem@gmail.com> References: <20181223213557.7834-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH 04/18] opensaf: Upgrade to 5.18.09 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 Degrade certain Werror into warnings to get it building with gcc >= 8 Signed-off-by: Khem Raj --- .../0001-Fix-string-overflow-in-snprintf.patch | 12 ++++++------ .../{opensaf_5.18.04.bb => opensaf_5.18.09.bb} | 7 ++++--- 2 files changed, 10 insertions(+), 9 deletions(-) rename meta-networking/recipes-daemons/opensaf/{opensaf_5.18.04.bb => opensaf_5.18.09.bb} (90%) -- 2.20.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch index db6796d05d..93c75777fe 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch +++ b/meta-networking/recipes-daemons/opensaf/opensaf/0001-Fix-string-overflow-in-snprintf.patch @@ -1,4 +1,4 @@ -From ae7178a78aba2e5766b70191617113487fd7ad0b Mon Sep 17 00:00:00 2001 +From 88661a60629894353512c53ed32f2b901f64149c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 16 Apr 2018 18:29:17 -0700 Subject: [PATCH] Fix string overflow in snprintf @@ -53,7 +53,7 @@ index 81e521e..d53cc48 100644 TRACE_ENTER(); diff --git a/src/smf/smfd/SmfUpgradeCampaign.cc b/src/smf/smfd/SmfUpgradeCampaign.cc -index 45cdce8..6761bcf 100644 +index c30ea14..098f17a 100644 --- a/src/smf/smfd/SmfUpgradeCampaign.cc +++ b/src/smf/smfd/SmfUpgradeCampaign.cc @@ -447,7 +447,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) { @@ -66,11 +66,11 @@ index 45cdce8..6761bcf 100644 /* Read the SmfCampRestartInfo object smfCampRestartCnt attr */ std::string obj = "smfRestartInfo=info," + @@ -473,7 +473,7 @@ SaAisErrorT SmfUpgradeCampaign::tooManyRestarts(bool *o_result) { - attrsmfCampRestartCnt.setName("smfCampRestartCnt"); - attrsmfCampRestartCnt.setType("SA_IMM_ATTR_SAUINT32T"); + attrsmfCampRestartCnt.SetAttributeName("smfCampRestartCnt"); + attrsmfCampRestartCnt.SetAttributeType("SA_IMM_ATTR_SAUINT32T"); char buf[5]; - snprintf(buf, 4, "%d", curCnt); + snprintf(buf, 4, "%hd", curCnt); - attrsmfCampRestartCnt.addValue(buf); - imoCampRestartInfo.addValue(attrsmfCampRestartCnt); + attrsmfCampRestartCnt.AddAttributeValue(buf); + imoCampRestartInfo.AddValue(attrsmfCampRestartCnt); diff --git a/meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.09.bb similarity index 90% rename from meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb rename to meta-networking/recipes-daemons/opensaf/opensaf_5.18.09.bb index c534c6206b..f1aedc4def 100644 --- a/meta-networking/recipes-daemons/opensaf/opensaf_5.18.04.bb +++ b/meta-networking/recipes-daemons/opensaf/opensaf_5.18.09.bb @@ -29,8 +29,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/releases/${BPN}-${PV}.tar.gz \ file://0001-Fix-string-overflow-in-snprintf.patch \ file://0008-check-for-size-before-using-strncpy.patch \ " -SRC_URI[md5sum] = "21836e43b13ad33bed9bd0ed391e5a6e" -SRC_URI[sha256sum] = "e55dc2645487fb22938e8386b99eef6eb7aff43a246ce3e92488daf6ee46247a" +SRC_URI[md5sum] = "45044fde0b35eac057a5fa05c27b8040" +SRC_URI[sha256sum] = "230a0ea628ba278170a913746c39b2c8cd529d7dc25326b2e17b5c095cf94025" inherit autotools useradd systemd pkgconfig @@ -48,7 +48,8 @@ PACKAGECONFIG[plm] = "--enable-ais-plm,--disable-ais-plm,libvirt openhpi" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', ' systemd', '', d)}" PKGLIBDIR="${libdir}" - +CPPFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation" +CXXFLAGS += "-Wno-error=stringop-overflow= -Wno-error=stringop-truncation -Wno-error=format-truncation=" LDFLAGS += "-Wl,--as-needed -latomic -Wl,--no-as-needed" do_install_append() {