From patchwork Tue Jun 19 05:06:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139077 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4758180lji; Mon, 18 Jun 2018 22:06:44 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKHOP3vhNl8WF0pVKUhSxaLfDwqMweTd/K91q1WrZboMuQ6HQ1dj1US7H57SjsUkDIp8AtO X-Received: by 2002:a62:1fd6:: with SMTP id l83-v6mr16651627pfj.182.1529384804783; Mon, 18 Jun 2018 22:06:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529384804; cv=none; d=google.com; s=arc-20160816; b=hUZoZXt/LpGtvfMHYtwuQCqxr2iIwAts5AgQCk6Ca/rYjPpM1o32RuM4L4bR5g2ZqX jcV9Nr4gUbk42TpMvduB9hTN5kXbYRVwJFm7zMMdnOjiRksT9A2uU4IGXA8lUGhsRQxD SpyF7fg5UdOAjh3nz+PTPrU9MFRu6dUEALraj6YD1+su2SDDbo1ckXiIviJn/JIb3/a9 w/5aSmhahmk+J8B/OopcxyLjzrwwcb9sfjxi8lZDqlOzKsJN3QzocGJMIv9YVinqludf AOcg4go8HBg7iicn9iknhc0/IYBZ8dmmxGm1Tvi/OjBbwZ6q+uHY9HlJv2FHEMOCVJqm FXlQ== 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:arc-authentication-results; bh=CEKcDcrnMYNjPKuv7ZeYkCWL74ZGWq90j12L2NN+eD0=; b=MC0HAO1ZdT0gWCWJIOxYNjiK4CMTOLf3EgNa92CvzaRJi7PB/L1TDMRS9XHe0FlidN sJSsF3DzeBn8w4BfeiDHEwJikSPiCeCDN6hIAp00dunn2lpDOWVi3Y6LunPnlGIgjdgi yzjWDJClzmoJo9vN+g9+tW1Bz+c1pconvG4MOIR/5HZUTGm4TCeoAwEXS2WX+2FWZ4ye hp6LfCBVOEILTbXf6R2xCX5aocGf4tR6Nv8Nrbj4SFnfaud1lJT6eNorEMfRkOYUiMvK 4n6I4mB+I8vc+MDk1ZxmVeFPwYaVlm40c/CxpsA54CzoFyjT8zFR7APOL1Hhz+MZsVdk 921Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ub3EOAMY; 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 j10-v6si17243865plg.396.2018.06.18.22.06.44; Mon, 18 Jun 2018 22:06:44 -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=ub3EOAMY; 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 8EC3E75409; Tue, 19 Jun 2018 05:06:39 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f67.google.com (mail-pl0-f67.google.com [209.85.160.67]) by mail.openembedded.org (Postfix) with ESMTP id 2DC6D75265 for ; Tue, 19 Jun 2018 05:06:38 +0000 (UTC) Received: by mail-pl0-f67.google.com with SMTP id k1-v6so10283905plt.2 for ; Mon, 18 Jun 2018 22:06:39 -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=5ohzQ17kOIVZeNRFuXN43gelK6l+tMi3wjY4ap7WF0o=; b=ub3EOAMYIAV4qQ3X416gj51b2HTgVoaivYVv89tpqtgolKjsTtzY8WxPjyE0xcL8l+ y00YS2DaxhDCB52N5QWiOUTyVy23Buaeh7UD8KNmkd+rze3QmTAREUQKO/EkZwZ3KLiM fVQNGqUGq0CN8tXjI1OFCMIGtvKC//DSQygTZftC16xlr+0xudZqvqM2CK5GkgZl5ppc t2voUk5KVuqkDrzp6k51J5SjLv613+NStC1JSIgUQnT3zbfiG1L6HhGatzfUrcvRxudj 6/+bQAkfo3VlS4hGDixLClWi7/49rl+nhpqxRE12q3j2X+BqddLXHY5wVPOkaz1f1+3D WTiQ== 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=5ohzQ17kOIVZeNRFuXN43gelK6l+tMi3wjY4ap7WF0o=; b=HwyqYoEsROQmgw1Lxoo4dnmd35C0XoAc+oKxGJCldfqW3Z387n62F3Q9f4S4A2linV xQiiqHixNuQYGHMMuD9CsZE1YKFrx56i4EMl9J2pWLNPa7zUbQ1fu8JEkobZv9L1FGg9 gAknTyHG+fKM3MChWX4HagC+qG7v2wh6b/7U1PL4AilIUZHicJ1SyRvQ3AgA6kCNOULp CQQFGnqsVrpzLKqFVhJ+ugdBREc3Ei82jiYTUERHcg1PWKw4euGsmG3FMoz5gZANARcQ QfGNJ6ErDmy8Ai2yPGOjX9+K7+tuvh8hcCQIc71Hbg2CNYGq02zM/aVUSMB5Y3+fw9o0 cbwQ== X-Gm-Message-State: APt69E1kqMtTImxfreytxyXLcluepiSwk+Lhy3XQ9+NMhDzSBeGbIo54 0s8TwtVDfly9tglIJp/3HW+hJQ== X-Received: by 2002:a17:902:a508:: with SMTP id s8-v6mr17364176plq.223.1529384798845; Mon, 18 Jun 2018 22:06:38 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id e189-v6sm28405430pfc.134.2018.06.18.22.06.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 22:06:38 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 18 Jun 2018 22:06:38 -0700 Message-Id: <20180619050639.4830-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [oe] [meta-oe][PATCH 1/2] minicoredumper: Update to latest 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 Drop upstreamed patch Signed-off-by: Khem Raj --- .../0001-fix-compile-error-on-arch-x32.patch | 32 ------------------- .../minicoredumper/minicoredumper_2.0.0.bb | 3 +- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch -- 2.17.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch b/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch deleted file mode 100644 index 6ba6ad4814..0000000000 --- a/meta-oe/recipes-kernel/minicoredumper/files/0001-fix-compile-error-on-arch-x32.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 883f53ee33eaef8aca1288a110857402ad362966 Mon Sep 17 00:00:00 2001 -From: John Ogness -Date: Fri, 8 Sep 2017 15:03:03 -0700 -Subject: [PATCH] fix compile error on arch=x32 - -On the x32 architecture time_t is a "long long int". By - typecasting time_t to "long long", this should work correctly - for all architectures. - -Signed-off-by: Khem Raj ---- -Upstream-Status: Pending - - src/minicoredumper/corestripper.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/minicoredumper/corestripper.c b/src/minicoredumper/corestripper.c -index fd39bfb..07dc318 100644 ---- a/src/minicoredumper/corestripper.c -+++ b/src/minicoredumper/corestripper.c -@@ -1241,7 +1241,7 @@ static int dump_compressed_tar(struct dump_info *di) - snprintf(hdr.mode, sizeof(hdr.mode), "%07o", 0644); - snprintf(hdr.uid, sizeof(hdr.uid), "%07o", 0); - snprintf(hdr.gid, sizeof(hdr.gid), "%07o", 0); -- snprintf(hdr.mtime, sizeof(hdr.mtime), "%011lo", -+ snprintf(hdr.mtime, sizeof(hdr.mtime), "%011llo", - (long long)time(NULL)); - memset(hdr.checksum, ' ', sizeof(hdr.checksum)); - hdr.type = 'S'; --- -2.14.1 - diff --git a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb index 0d3c66b07a..27348f750c 100644 --- a/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb +++ b/meta-oe/recipes-kernel/minicoredumper/minicoredumper_2.0.0.bb @@ -9,7 +9,7 @@ DEPENDS = "elfutils dbus dbus-glib-native glib-2.0 dbus-glib util-linux json-c" inherit autotools pkgconfig systemd update-rc.d -SRCREV = "cdc1faf1212a51e89b477468876e229223fceb9a" +SRCREV = "1c0d5960b0bb4bac7566e6afe8bc9705399cc76b" PR .= "+git${SRCPV}" @@ -17,7 +17,6 @@ SRC_URI = "git://git.linuxfoundation.org/diamon/minicoredumper.git;protocol=http file://minicoredumper.service \ file://minicoredumper.init \ file://0001-minicoredumper-Initialize-pointer-to-config-struct-t.patch \ - file://0001-fix-compile-error-on-arch-x32.patch \ " S = "${WORKDIR}/git" From patchwork Tue Jun 19 05:06:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 139078 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp4758323lji; Mon, 18 Jun 2018 22:06:56 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJwqWzm1OEclr0oU4J8ehgCcb/qDf2EjN7r0A0Czdej/KlZJ8Vnwng0/DoHV08SC9Qx7FzZ X-Received: by 2002:a63:ab45:: with SMTP id k5-v6mr13633013pgp.23.1529384816652; Mon, 18 Jun 2018 22:06:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529384816; cv=none; d=google.com; s=arc-20160816; b=fLrlb+bIs+F9ttcFH/3lnm34pbvRQJUkOs2rT617rDkqcmNw8xBoolElRscolbuOyt o1RtzJKcmbb627JfJC5EllqJBnvpTgfzR8t8VeEnze/nYcrzcVH7w44nZIPZvlrTVC9F beDvJDDO2FYr/ixlPsL39iO4tqACLkJYBf4Xn4zs/4/Qxr7mVsNRmZWMaseZMqzKiuis xDDDaWJWUnKnUAZemst/gCfrmU2LsJfvvGVo2hB/x+zo2gX0yGYKp6+OH3NT94t3lsto U8VHSZTxcbSk0eFmxUOw49z/DvLKPeCtYmvmc4JfTpPGajyXU75/SuQ/E7HO5hU3Tr0/ l9yg== 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:arc-authentication-results; bh=gnIHnBwY0ODIh/5j16/6l+zLdAcBGtoNSL21CvnRr+o=; b=BGbZI85O2297afx9e1tWUFAYl7StkiKw6mgpZFLwvs8EsQ9Slsvyusxf4uE38lIi5b PEWRwwQ/3I6i+x0k0PFRWHefex3dzhoZ4gwsTmf2EjKjEz7O6JGua7aFlWCWKmKi+XN5 DzgOR0mc7KZd0nWO/b/Gqkj8oHvk9YwoWYd2cmDhSZet6/4IGHNvP/Z6MkP30d8MF9DM sM43WbbbVyBBCaCGNSSWROJw4byHwwFfpd45R8oN01jEUBpsNdr3mJqlQhe41LBpRkk9 /RT5R8rIfc33He3D6CEtzcILsKwz0OE7QFme99I5Dkglu715hjzWg8SDyldGMYsyhxHa 7tDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HDvzVy0i; 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 j12-v6si13327028pgf.359.2018.06.18.22.06.56; Mon, 18 Jun 2018 22:06: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=HDvzVy0i; 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 8BE6175421; Tue, 19 Jun 2018 05:06:53 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg0-f54.google.com (mail-pg0-f54.google.com [74.125.83.54]) by mail.openembedded.org (Postfix) with ESMTP id C911375265 for ; Tue, 19 Jun 2018 05:06:38 +0000 (UTC) Received: by mail-pg0-f54.google.com with SMTP id m5-v6so8586936pgd.3 for ; Mon, 18 Jun 2018 22:06: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; bh=skNZ/rstchLUAlFP3YvwxFh5+7qmYHX6nFQy7IqZX30=; b=HDvzVy0i99zDKPGVxWmF7wUld9swWoo7fflUxUi3SNYMFltMJSJZU++25sjmbXQ8Gs AM252wh5O3RHmO06G2EXJCtOInwhyUxybGvwy8B8Kzzrk7SuQOLbu7/2fv3FDKNkVezW lexR33mBDtoO4m1IxMvaFOHRvMl8NSInzSjqqqjAMActpSFrYRStWQaH08n1LK0maETm uzpB1776n3h/NJjKbqmaA1EBpjbRI/i7YKiKJU4yFE/AhB1TXEW5G2kKt5nijY+ak+GN R4g+7vyxnSC3ckaVTQIFBcwfIU9ouFyZNmolapB03vW0LS0M3LrH1EK9tzJuheqIrFih TMjA== 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=skNZ/rstchLUAlFP3YvwxFh5+7qmYHX6nFQy7IqZX30=; b=OUSUzilAeqqBXfo02xfOAb2bZ3mOosH5nYOB3mmUVEPDtwq+IMY2N7SzheK+7EwId2 2pvaNYhBC0FCZXSErLCWtffWkSGZV1T4dKMzTKsHK9pvz3Lj0NtDQ6VRTo2eSTXisodZ jKqRR4no8UgHGlEFo0HFFrtwsuLLrNyrmD2LhZXpBcVqrBa1AsZeZeZWelCR+TkGhlDC GTkmX8L7D3wYJIqAw8CNlZ1kQx3wfYFn0XpWHN/GSRZl5f0wSE8zmB1wbBMRctxFZpKI MSmCUr1I9xoJU2mC7fWg1msHsOW3VsHKoiFjeBuIBEMS0QXklYYkoppHIMZXoEfizVeq TzlQ== X-Gm-Message-State: APt69E1gc1u+vxlHnr4DWvkSk94JrsNAA/DiI/qyY9kLp68L/SU6B3qW 2PySuIQCrPLnVks1tMCYQeVbnw== X-Received: by 2002:aa7:8004:: with SMTP id j4-v6mr16361726pfi.174.1529384799536; Mon, 18 Jun 2018 22:06:39 -0700 (PDT) Received: from localhost.localdomain ([2601:646:877f:9499::91a0]) by smtp.gmail.com with ESMTPSA id e189-v6sm28405430pfc.134.2018.06.18.22.06.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 22:06:39 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 18 Jun 2018 22:06:39 -0700 Message-Id: <20180619050639.4830-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619050639.4830-1-raj.khem@gmail.com> References: <20180619050639.4830-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 2/2] iscsi-initiator-utils: Update to latest 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 Remove patches for gcc8 issues which are now fixed upstream but differently Signed-off-by: Khem Raj --- .../0001-Include-limit.h-for-PATH_MAX.patch | 22 ---------- ...iface-Set-strncpy-bounds-to-not-over.patch | 41 ------------------- .../iscsi-initiator-utils_2.0.876.bb | 4 +- 3 files changed, 1 insertion(+), 66 deletions(-) delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Include-limit.h-for-PATH_MAX.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-iface-Set-strncpy-bounds-to-not-over.patch -- 2.17.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/iscsi-initiator-utils/files/0001-Include-limit.h-for-PATH_MAX.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Include-limit.h-for-PATH_MAX.patch deleted file mode 100644 index 074ea7565c..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Include-limit.h-for-PATH_MAX.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 782730a74dd453a3c9bd2b47b79b1797586871fa Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 1 Jun 2018 18:11:34 -0700 -Subject: [PATCH] Include limit.h for PATH_MAX - -Signed-off-by: Khem Raj ---- - libopeniscsiusr/node.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libopeniscsiusr/node.c b/libopeniscsiusr/node.c -index e82bb0d..3438a8f 100644 ---- a/libopeniscsiusr/node.c -+++ b/libopeniscsiusr/node.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include "libopeniscsiusr/libopeniscsiusr.h" - #include "misc.h" diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-iface-Set-strncpy-bounds-to-not-over.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-iface-Set-strncpy-bounds-to-not-over.patch deleted file mode 100644 index b7c87f4163..0000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-iface-Set-strncpy-bounds-to-not-over.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 56a56567d4f334b119e60c4ef0ad87edf7b77609 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 1 Jun 2018 18:46:19 -0700 -Subject: [PATCH] libopeniscsiusr/iface: Set strncpy bounds to not overflow - -Fixes warnings found by gcc8 - -iface.c:492:47: error: '%s' directive output may be truncated writing up to 4095 bytes into a region of size 4073 [-Werror=format-truncation=] - -iface.c:140:3: note: in expansion of macro '_strncpy' - _strncpy((*iface)->transport_name, proc_name + strlen("iscsi_"), - ^~~~~~~~ - -Signed-off-by: Khem Raj ---- - libopeniscsiusr/iface.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c -index 955395d..d33363e 100644 ---- a/libopeniscsiusr/iface.c -+++ b/libopeniscsiusr/iface.c -@@ -138,7 +138,7 @@ int _iscsi_iface_get_from_sysfs(struct iscsi_context *ctx, uint32_t host_id, - - if (strncmp(proc_name, "iscsi_", strlen("iscsi_")) == 0) - _strncpy((*iface)->transport_name, proc_name + strlen("iscsi_"), -- sizeof((*iface)->transport_name) / sizeof(char)); -+ sizeof((*iface)->transport_name) / sizeof(char) - 1); - else - _strncpy((*iface)->transport_name, proc_name, - sizeof((*iface)->transport_name) / sizeof(char)); -@@ -489,7 +489,8 @@ static int _fill_hw_iface_from_sys(struct iscsi_context *ctx, - - sysfs_iface_dir_path = malloc(PATH_MAX); - _alloc_null_check(ctx, sysfs_iface_dir_path, rc, out); -- snprintf(sysfs_iface_dir_path, PATH_MAX, "%s/%s", -+ sysfs_iface_dir_path[PATH_MAX+strlen(_ISCSI_SYS_IFACE_DIR)] = '\0'; -+ snprintf(sysfs_iface_dir_path, PATH_MAX+strlen(_ISCSI_SYS_IFACE_DIR)+1, "%s/%s", - _ISCSI_SYS_IFACE_DIR, iface_kern_id); - - _good(_sysfs_prop_get_str(ctx, sysfs_iface_dir_path, diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb index f61900d823..e6a87a38aa 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb @@ -11,7 +11,7 @@ DEPENDS = "openssl flex-native bison-native open-isns util-linux" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRCREV ?= "0cfebb10d29382ac1058c950a60a946c28b01e53" +SRCREV ?= "bd79e4ed1004a6035d2538a308c5930890421a22" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://initd.debian \ @@ -20,8 +20,6 @@ SRC_URI = "git://github.com/open-iscsi/open-iscsi \ file://iscsi-initiator.service \ file://iscsi-initiator-targets.service \ file://set_initiatorname \ - file://0001-Include-limit.h-for-PATH_MAX.patch \ - file://0002-libopeniscsiusr-iface-Set-strncpy-bounds-to-not-over.patch \ " S = "${WORKDIR}/git" B = "${WORKDIR}/build"