From patchwork Tue Feb 6 07:46:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126951 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2678735ljc; Mon, 5 Feb 2018 23:46:37 -0800 (PST) X-Google-Smtp-Source: AH8x225Ru8gW478B0agabzzTP8PvJto9c+CHIgg4V05tABe2WUG/irc3hW1B06T68C1h6z+mCTs6 X-Received: by 2002:a17:902:5417:: with SMTP id d23-v6mr1542783pli.330.1517903196972; Mon, 05 Feb 2018 23:46:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517903196; cv=none; d=google.com; s=arc-20160816; b=FZqiBxojN6tu0Axb/O2qSNWntQmXgjimatCCSdaTsJUGSEcERKEhBCylkQId1L+tCO oBfG9EOKmwpaJTY2aeN9Vqa02d2pYeaNAgMlvDus22EilP0JLCPTOI+KrY+AUq4WJJhw rVbAbT9/by0kcFs5qvtgE5YavG3Z7CIwYBmwjbCP9MZl3NuD14PBSgz4B7+u3GoIAEeg ZMJpq2lT+LyuZ0ImwsuBE1YX1yYYPaD0Va9JHwna0ZGmfQQOD0qags2uL5vzuTjL7Tv4 szZ0ilTrH4D1bfwLsIS9Ww/IszcLKmD8oqKd4JXF22ZRc00CAaUoq0940lzhTawnFZLJ w+YA== 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=kSmeR2xBfGsjirHEnsZzugbcy28um4XC5jMCpMj82+s=; b=qTB/C9aV+IYZKP0Yq7EiS7tjRbU8ONSdw3k/VdooisSiXQYgRl+c7wwEZUMpW69XTi QvFc8yW5MMvckIfM+tmSBLLhrJRL+iQKMD7G0SfbX810tprh9NKFK0Xka1/cj4+6QAcN 6bgJxQh3v8Fv/UByGRThD9TA3ld/L89aDcb+dD5r+qKNhx++JT6EjWbfc/q5O+891p7Q 8LYDz7nuHBio3YjRad0qVbCcaUw4uILH1XLGhD8J0LAnFxAQ/A3PNJ1dlbhN6PU9JhR7 UwMARVLzYDstn8iHEiYZxcNBC08dMa1uJ2Kwbf0qH5iy1z4Sb1gqd2TMHAyv82Do/Vtr 90/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PZRjZnz2; 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=NONE 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 34-v6si8180221pln.468.2018.02.05.23.46.36; Mon, 05 Feb 2018 23:46:36 -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=PZRjZnz2; 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=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 9042171A92; Tue, 6 Feb 2018 07:46:29 +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 7B438600BC for ; Tue, 6 Feb 2018 07:46:27 +0000 (UTC) Received: by mail-pl0-f67.google.com with SMTP id t4so778262plo.0 for ; Mon, 05 Feb 2018 23:46:29 -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; bh=bX7fJaVhEEGZLxD2keQIv6S//uqcz1kG5KwX8Jt97EE=; b=PZRjZnz2RfmIiksbqbUoFa7xFpkTPnYB6wo2c4TY/TECCixtpy/TDu7zsVnyivnHBS 8AtXD/hGKRNOqmWNfUmTDO35aHPVqMCvah5NiFHJr/fNyKerkAE6wPdFrX066gxdamI6 fcdsIBvQL1fLvnzinbYGMTAwCk9GCCDKPxonI39Thk7k7Qqw0kAHAj2DDEzeq7jhs9kL EeaNEbBV7iXL5gyPZXDHS3mENGvl9f73wXfJbAk68HlRYfkq2vB2S4btu4zKabLomAGl 3n3X91rvo/bsJNtF4Knqwo9a5rHdHgFpHF26Kl4tvXbc4krEVvIFjeIRkdBneNZB+DYM vdIA== 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=bX7fJaVhEEGZLxD2keQIv6S//uqcz1kG5KwX8Jt97EE=; b=B8DOjDN6s/DS5EEEJAMfp4XsIa+nvukrNwjLGXhhCUmNjBTfcStqn7zhZ/MmJ+6gcd fM1xIpGZoi+LZ9g6/gwZl+hyAXkMGANPstsqdA2kSOYkHj5PAsWrVFc/9zK3hp0dw7LL 5CB2cQEYiesy6C8v2vLvQZdh00Ncw3SZI3KngznDc9/30ecq6HiIhenvlR2ivuHmE939 T/P1COJlBE+zEGiIPvfdlfRAO2tY7vprwg8wX7yLI9CQKWwZuJX3kaKt++lMVQWHazqZ FKOOBEZUF6puEuUkhGPf7miHUND1UgiBuelDu+gQLs9hZe0dLMUsdEFyJ1mZv4TxxDEb +QQg== X-Gm-Message-State: APf1xPAn/x6XmA8sy+WLhOjgS5X0V8lQHIj+H3IJJiciSjveeT/mNyk9 KiQyTn7W6a4B6hHA27rIEud2yA== X-Received: by 2002:a17:902:8f98:: with SMTP id z24-v6mr1564534plo.311.1517903188454; Mon, 05 Feb 2018 23:46:28 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::5590]) by smtp.gmail.com with ESMTPSA id s90sm20976060pfi.139.2018.02.05.23.46.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 23:46:27 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 5 Feb 2018 23:46:14 -0800 Message-Id: <20180206074619.22165-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 Subject: [oe] [meta-networking][PATCH 1/6] mdns: Do not include nss.h with musl 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 --- ...mdns-Do-not-include-nss.h-when-libc-glibc.patch | 42 ++++++++++++++++++++++ .../recipes-protocols/mdns/mdns_765.50.9.bb | 1 + 2 files changed, 43 insertions(+) create mode 100644 meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch -- 2.16.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch new file mode 100644 index 000000000..863866d18 --- /dev/null +++ b/meta-networking/recipes-protocols/mdns/files/0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch @@ -0,0 +1,42 @@ +From d3082d2c606c810aa0a39378bf1e02575af3a301 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 21:54:11 -0800 +Subject: [PATCH] nss_mdns: Do not include nss.h when libc != glibc + +Provide nss_status macro instead for non-glibc case +where nss.h is absent + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + mDNSPosix/nss_mdns.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/mDNSPosix/nss_mdns.c b/mDNSPosix/nss_mdns.c +index afadb3c..c469584 100755 +--- a/mDNSPosix/nss_mdns.c ++++ b/mDNSPosix/nss_mdns.c +@@ -378,8 +378,19 @@ init_config (); + + #define ENTNAME hostent + #define DATABASE "hosts" +- ++#ifdef __GLIBC__ + #include ++#else ++enum nss_status ++{ ++ NSS_STATUS_TRYAGAIN = -2, ++ NSS_STATUS_UNAVAIL, ++ NSS_STATUS_NOTFOUND, ++ NSS_STATUS_SUCCESS, ++ NSS_STATUS_RETURN ++}; ++#define NETDB_INTERNAL NULL ++#endif + // For nss_status + #include + // For hostent +-- +2.16.1 + diff --git a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb b/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb index 1a80f7acb..9a7152fcf 100644 --- a/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb +++ b/meta-networking/recipes-protocols/mdns/mdns_765.50.9.bb @@ -9,6 +9,7 @@ RPROVIDES_${PN} += "libdns_sd.so" SRC_URI = "http://opensource.apple.com/tarballs/mDNSResponder/mDNSResponder-${PV}.tar.gz \ file://build.patch;patchdir=.. \ file://mdns.service \ + file://0001-nss_mdns-Do-not-include-nss.h-when-libc-glibc.patch;patchdir=.. \ " SRC_URI[md5sum] = "4a6bc1628851002634ea3833a4dca317" From patchwork Tue Feb 6 07:46:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126952 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2679022ljc; Mon, 5 Feb 2018 23:47:05 -0800 (PST) X-Google-Smtp-Source: AH8x225p9BFlzT7Jpk5a08b+iRBXxy823dNDSxchM7fS+KitgBEkFjL2PDZiJNBNTjnxrBja62By X-Received: by 2002:a17:902:7c98:: with SMTP id y24-v6mr1520581pll.305.1517903225757; Mon, 05 Feb 2018 23:47:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517903225; cv=none; d=google.com; s=arc-20160816; b=XsrQP0GX5pNd8h392ejtCpSKpbuMvDbLdb4s3sHCuX7Tcjt/GTlAmQtsbpkdi4tTC0 C6fwDlYxHV1v69unSgoM7zoJxLd6uXqAjyDbi0rrhM7cHwJQHXTtpyvTOOkdHwV4phEe 4l6gfIkjNu1kchEHtEqDPFlXaj6DndCDEx3JJnuRz2Vm36rJX0o/zL4CfYDBQigFN0R6 Q8BjUHczlmb+lzveIqd4CEl0Qpxui2OO7jY14QkePxmeKNsebnSlaBAIP3I/N0ybvmP8 p14gjWZfQXAetDHC9hVLs6p1hxd/KAVmU1GOeISxg9FHWOPD1s7zwu4qewLeNQg5L9J5 9yrQ== 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=/Sbgs+DgHMQEtgXJdAtQNGnxNeg1HuvXOcZ/6u8xnSY=; b=zyIoxk+zcDyUkgbOJD8FI8MAYxaRlv4vwNAhnXgxsQG+gjJvZ6bLdDVoXrglSKY6Jt u06V1xcz2Qm3k91D68ke8SoiWTq2cDRP/SRjgVrlSoOT4OqfhuaixxJqVOEdUjibzm8u WNooXqdY2fEIuFNxdhxjspbgqJYY5TCCXVkrIFpyPliUyfgyJlk4+hT6pIEO1jrE1zBc jG07IxJa6xfKy5+gKBtSYaClummLQ09oHk38+hhFIv1z8TDzQ9cresdwGNuCFek6RxgI IjCNrnAbHo5x22dEM63952rfgsxj/rSdFNv6cq1c9qcCQzTrQm+L57NYfe4CuT1NdxYZ 3yng== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=okPi/43A; 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=NONE 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 15si1557752pfq.361.2018.02.05.23.47.05; Mon, 05 Feb 2018 23:47:05 -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=okPi/43A; 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=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7584A78558; Tue, 6 Feb 2018 07:47:02 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by mail.openembedded.org (Postfix) with ESMTP id 4A5F671A92 for ; Tue, 6 Feb 2018 07:46:29 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id f4so760079plr.10 for ; Mon, 05 Feb 2018 23:46:31 -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; bh=CKm2VRI+x/2U4IDOeQSsfPMPKJ11xSsyr6Sol6Y+KV0=; b=okPi/43A7lqZ7pcxXpZuzvQQVbpA7usQE9u4uQOb1i5P5Ez4jkwasU7BpR4Sq6Op0A j3iWklaWYI9eN/5kzRCEOrA1alwfzclVwfJ1JT6tyi3xjJMp9RcCu8Liuxhh/VTuJj/N iUQ4gLXxvEIFBxs0T2Gnl9yMWBClvsHsxs9qy1doWfEsEOqz7sCNUpr5akHJOemyl4cc iFx46ZRKq6gGXDT77jH76suH+3DPDbmKNzDUnBpPMnhl7mb5PgsysO2tAcp8K7BwBeww LtDzE4FudxDUQShE7EluwdHT4buiT1FpWQTJmX9Nvg1BFXjRGTevFpidO1LuBl3etIN7 uwZQ== 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=CKm2VRI+x/2U4IDOeQSsfPMPKJ11xSsyr6Sol6Y+KV0=; b=GgGa7y9T7Ar9YLVNbhx/or16VNBLRqcXTPgMvR9ZvEfu83uZZ4B4LevYO3HgRr2lAt Jcq/f7L0h9KzbUhdhdzunJ+GGASjF41e4pvbIsZ7VNnUjKeshK59s43P8TfljcMAyIFH hww6R97i3UrqQii5hR+R9RdshbPTZHHvUrBW7N2d3DDgnd7pgwo2EKVFNKwiiP1JT6SW YRTcIJFrP3f39fgjhzkoGqVAIqnwnj0Dmjabk9yAj7I7chQ1sTIaXPaGqmxxF3Gh0ATm PfWYAiXfPbIZD5F+AObGgXejAM6yaacgPU7iIUvFPEZGp3DLbyPKewIb4gH1DiWLHy+T CrUw== X-Gm-Message-State: APf1xPBdQhVHHHOSqFgp9fz4nTE62rQjbDFfRaDnvdu88T/aia+qFkUb QR/dm+emgNqtOEzwVwk+0ntDzw== X-Received: by 2002:a17:902:968e:: with SMTP id n14-v6mr1561245plp.21.1517903190412; Mon, 05 Feb 2018 23:46:30 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::5590]) by smtp.gmail.com with ESMTPSA id s90sm20976060pfi.139.2018.02.05.23.46.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 23:46:28 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 5 Feb 2018 23:46:15 -0800 Message-Id: <20180206074619.22165-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180206074619.22165-1-raj.khem@gmail.com> References: <20180206074619.22165-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 2/6] alsa-oss: Upgrade to 1.0.28 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 --- .../alsa/{alsa-oss-1.0.17 => alsa-oss}/libio.patch | 16 ++++++++-------- .../alsa/{alsa-oss_1.0.17.bb => alsa-oss_1.0.28.bb} | 6 ++---- 2 files changed, 10 insertions(+), 12 deletions(-) rename meta-oe/recipes-multimedia/alsa/{alsa-oss-1.0.17 => alsa-oss}/libio.patch (66%) rename meta-oe/recipes-multimedia/alsa/{alsa-oss_1.0.17.bb => alsa-oss_1.0.28.bb} (75%) -- 2.16.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch similarity index 66% rename from meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch rename to meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch index a053e4c60..5299945e1 100644 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss-1.0.17/libio.patch +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss/libio.patch @@ -1,7 +1,7 @@ -Index: alsa-oss-1.0.15/alsa/stdioemu.c +Index: alsa-oss-1.0.28/alsa/stdioemu.c =================================================================== ---- alsa-oss-1.0.15.orig/alsa/stdioemu.c 2007-10-15 10:50:40.000000000 +0200 -+++ alsa-oss-1.0.15/alsa/stdioemu.c 2008-07-21 22:17:06.303161438 +0200 +--- alsa-oss-1.0.28.orig/alsa/stdioemu.c ++++ alsa-oss-1.0.28/alsa/stdioemu.c @@ -37,7 +37,9 @@ #endif @@ -12,7 +12,7 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c struct fd_cookie { int fd; -@@ -99,7 +101,11 @@ +@@ -99,7 +101,11 @@ static FILE *fake_fopen(const char *path if (open_mode && fdc->fd > 0) { result = fopencookie (fdc,"w", fns); @@ -24,11 +24,11 @@ Index: alsa-oss-1.0.15/alsa/stdioemu.c } return result; } -Index: alsa-oss-1.0.15/configure.in +Index: alsa-oss-1.0.28/configure.ac =================================================================== ---- alsa-oss-1.0.15.orig/configure.in 2007-10-15 10:50:40.000000000 +0200 -+++ alsa-oss-1.0.15/configure.in 2008-07-21 22:16:11.719837298 +0200 -@@ -33,6 +33,12 @@ +--- alsa-oss-1.0.28.orig/configure.ac ++++ alsa-oss-1.0.28/configure.ac +@@ -35,6 +35,12 @@ if test "$with_aoss" = "yes"; then LIBS="$OLD_LIBS" fi diff --git a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb similarity index 75% rename from meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb rename to meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb index 8966dbbc1..0c4a9f545 100644 --- a/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.17.bb +++ b/meta-oe/recipes-multimedia/alsa/alsa-oss_1.0.28.bb @@ -3,11 +3,12 @@ SECTION = "libs/multimedia" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" DEPENDS = "alsa-lib" -PR = "r1" SRC_URI = "ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-${PV}.tar.bz2 \ file://libio.patch \ " +SRC_URI[md5sum] = "91f57e8cee1ad4cc956caa8b62ac5d43" +SRC_URI[sha256sum] = "3ae62caa88a0bc7b30ed836dcb794dc6ef4d3650439e2260db54cace7d5c6ad5" inherit autotools @@ -17,6 +18,3 @@ do_configure_prepend () { touch NEWS README AUTHORS ChangeLog sed -i "s/libaoss.so/${LEAD_SONAME}/" ${S}/alsa/aoss.in } - -SRC_URI[md5sum] = "1b1850c2fc91476a73d50f537cbd402f" -SRC_URI[sha256sum] = "8d009e23e2cbee1691ec3c95d1838056a804d98440eae7715d6c3aebc710f9ca" From patchwork Tue Feb 6 07:46:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126953 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2679090ljc; Mon, 5 Feb 2018 23:47:12 -0800 (PST) X-Google-Smtp-Source: AH8x2260JTeaQwINk5euD8rYABwnVeDQ8zF8JlEzSh+hBc6yeNeiQcO2WHQFEm3G9WsA93K4LxTo X-Received: by 10.101.92.9 with SMTP id u9mr1257034pgr.440.1517903232125; Mon, 05 Feb 2018 23:47:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517903232; cv=none; d=google.com; s=arc-20160816; b=jG5mv2teUj8fMv1KQliXo1m9nJPxoWrmvdesTAV59Pkkhs38EL5Ul2AgyNAyUrstXe bNxDbC/qEphV7k2z8ZLYTY37PeawyW8j8LXlDO9gZQI1e837NNf8UROU+xwfc51qdpOx io2jCE3UBEKKdBLIDL2GeMiUGoQZGwf9ddvfEe2v3eiUBBxHBaswX1XL5h/rJ7MytSju UrFnYOpdRM2dfoRoV4TSShJka+ND90X0GhZ8gjFET6SoYbfRw5/VXs7nDzREm18Mlgvx rtMyka1sJtZ2py2DvrWAEd+UrPV20F7A+bmGGioTBD2cp+EQla4HJ1wwz/qZTkUg7V6Q gTkw== 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=9OuTMVmNct3TEq/hWLRsNCOgvwA2cxDsBYX0P9XzSeI=; b=PHp9xXbOiAqtJO1kdEwrr0p6R92B5b7G+JUG4Yx/yHj2qDU7WRxXgLj29r0TnQw+y2 CiQ4phnp8HBhavcbYzDeNkfgU7D3e2wGJesrvAxYKih2GyZ8x/vOrqR7iDbUT7sDlmR9 UfW/4LxzAXPAGT93HddRs6tJx8NLWkSwQEctuYkSfKPFn2Hkwy3CP9B/jpy1jkeKdixn vb9nAdjFsFdypBL86iqUV+zSvhvPCvHbP9NSNh/xsx4Ho1twC0+ey7ebhYdU1lVQcTnY 05yWW8aOrT3EMUjNJ9gXgPrOS4g6PmBosBFqcAcPDexnbV9uCgT5ksy3CCbcWk/PSvZt c5LA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RjApfdxC; 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=NONE 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 h13si931752pgn.782.2018.02.05.23.47.11; Mon, 05 Feb 2018 23:47:12 -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=RjApfdxC; 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=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A1BED7857A; Tue, 6 Feb 2018 07:47:03 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f54.google.com (mail-pl0-f54.google.com [209.85.160.54]) by mail.openembedded.org (Postfix) with ESMTP id B7FD8784CC for ; Tue, 6 Feb 2018 07:46:30 +0000 (UTC) Received: by mail-pl0-f54.google.com with SMTP id g18so772281plo.7 for ; Mon, 05 Feb 2018 23:46:32 -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; bh=61B90Hi6y2vUo8TJjTA1hQ9oCg8Ctcg37vRmOW3wwX8=; b=RjApfdxCAGsMCCKJN093jhiodDFYsla1fsLIjhGXjnStpT6Igz9OXV8OqAP1M4ckUS +vqlv3qW2bC1o2Zj+/Vh41TVQ3zbylTIV6eryyZnFT1jKFyjXVm8+eV60o02W9mRgbyK S3pN3tCELJtevKweCanuG3od8ARa8Ms/SRkKqYe2OKF5bLfTG3ttIBfg2ae400LDXrY2 NhQ3/W4HTvuMkhfrbeqpofHPHADvRqfjYrE1DnLyS7G0wa2kBlqueZ7czmNRAQzokEeG LsgUbUybCm+7LCVydBdfysKhaVzawZcz+5F++r985LABz2Wq8UvW2rI1ehOYCvWoh2Tb YY4Q== 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=61B90Hi6y2vUo8TJjTA1hQ9oCg8Ctcg37vRmOW3wwX8=; b=rhMmgOYiDc45a1vg3aqDPLk2cdegL7/MqDCYA/lgYNRkOEKp7HVkRfQnwkx5l/vldr 56cijE5avOQcV6FPIRCphBzkNdaM+UZMcRsik7tfLP+IbDR2ZD5NujD6qT77nVEeeE4y pBQaDmkoEaHmr9nOzICqx2GhehtGPIPUHJgDhT9BuBDCXErefqTqQcfYW7+EZoK5EQzl fOyR/Wyprjh1O5jE7fNGTdcH9mlkr195o2SFDsM8M8CvKfKh04IcXKjgX8hHhrMzn/eG HX6OeXW9y3zioZ9gI6cy564TNB1jqlasUikleDlJPixcpXOVXVkJL231WJOHrx97iXvr SKzQ== X-Gm-Message-State: APf1xPDjG7LldFMpI9Ayixri7JaYj1aIKfVcauABVsgHFUY8pn/Bc/Aq wCsp+IL4J3EnS8l++8kzOWKclg== X-Received: by 2002:a17:902:3363:: with SMTP id a90-v6mr1500017plc.159.1517903191607; Mon, 05 Feb 2018 23:46:31 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::5590]) by smtp.gmail.com with ESMTPSA id s90sm20976060pfi.139.2018.02.05.23.46.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 23:46:30 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 5 Feb 2018 23:46:16 -0800 Message-Id: <20180206074619.22165-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180206074619.22165-1-raj.khem@gmail.com> References: <20180206074619.22165-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/6] mraa: Fix build on musl 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 --- ...ian.h-for-be16toh-and-le16toh-declaration.patch | 27 ++++++++++++++++++++++ meta-oe/recipes-extended/mraa/mraa_git.bb | 4 +++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch -- 2.16.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch b/meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch new file mode 100644 index 000000000..711738a92 --- /dev/null +++ b/meta-oe/recipes-extended/mraa/mraa/0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch @@ -0,0 +1,27 @@ +From 2c85decc3b93bfe7322309d2ca7d6377e746c18f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 5 Feb 2018 09:51:08 -0800 +Subject: [PATCH] include endian.h for be16toh and le16toh declarations + +Upstream-Status: Submitted [https://github.com/intel-iot-devkit/mraa/pull/863] + +Signed-off-by: Khem Raj +--- + examples/iio_driver.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/examples/iio_driver.c b/examples/iio_driver.c +index c5a0181..568011c 100644 +--- a/examples/iio_driver.c ++++ b/examples/iio_driver.c +@@ -22,6 +22,7 @@ + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + ++#include + #include + #include "mraa/iio.h" + +-- +2.16.1 + diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb index c4b9c6f90..473116e63 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=66493d54e65bfc12c7983ff2e884f37f" SRCREV = "8ddbcde84e2d146bc0f9e38504d6c89c14291480" PV = "1.7.0-git${SRCPV}" -SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http" +SRC_URI = "git://github.com/intel-iot-devkit/${BPN}.git;protocol=http \ + file://0001-include-endian.h-for-be16toh-and-le16toh-declaration.patch \ + " S = "${WORKDIR}/git" From patchwork Tue Feb 6 07:46:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126954 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2679188ljc; Mon, 5 Feb 2018 23:47:22 -0800 (PST) X-Google-Smtp-Source: AH8x226b8OwETdzVNw0Oftqocrr3FPG8WegFzK41ovnW9O/L/fvXkGQnyTJsp0lMjCiJ+QuJqy5m X-Received: by 2002:a17:902:595d:: with SMTP id e29-v6mr1579670plj.436.1517903241896; Mon, 05 Feb 2018 23:47:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517903241; cv=none; d=google.com; s=arc-20160816; b=MXmVW7vhXTFIlJUVDqKSj5KQkf3tvf5odVDkWZBU3n07Tq5SfM2rBrYEWawndCq0N0 uW0cFrl3361FWYfF1xuK7OVC90ad97HeX1eYFD5Bfgz7WXX41hpqtttHAzZsUxWG5PhB XujTzMiL5reMlXqgByQw4EF+J8vfl6qVi7ABOeBmQxu1mWsxCawocvWhixOthPDCanLy S6qpd2xxsdaxSk2uUZemuIZLTZeGrxVWkXRHpJo2tFr7JHvT/6skktM8jPvYOX5vjub6 47cdRuQav/H+1V/wQUwUe4oYxvt0dqulFlGtmMg1c6ttzSClrzc282e+s5J/4qGJ5uYl 44IQ== 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=SWvusmICnXY15DpWD4va5jkyQvRLjvOu3AE1SuIHYD4=; b=zthAlsRxVzwifY1XEZV8fU5g4MsgafPq3P4iUI3slaePRlRoMjg7ZrUu+hAB4s+osR 8IHoGjRJ7W5cxNUGRVeTEbYOjyWv9HXzDXV0/l6/7ew1A5H5Xhw2daaXXT/bFECyxaB9 6GqHR6t/RMmB583yAvQ3AySLEj6Mz19uWovDVFATY+3FTnfYF2HvPPtyHTm5NO9cf7V5 wV5s6bMlI5I26eVoKY9g4JHahvDkVODhNxyKXH278v0zUmnKyK8oLxpe2Jh6zUi49Gvy VAM2iPUnBQTTdaHCw+St2bcM7pKG9ikWroXPccxTT4lfkUMHOrGS8V3iYTHwR9mS1ADv kFIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=HeYs7nKX; 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=NONE 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 q11-v6si6496070plk.225.2018.02.05.23.47.21; Mon, 05 Feb 2018 23:47:21 -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=HeYs7nKX; 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=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 62331784E6; Tue, 6 Feb 2018 07:47:10 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f51.google.com (mail-pl0-f51.google.com [209.85.160.51]) by mail.openembedded.org (Postfix) with ESMTP id 4B9FC60602 for ; Tue, 6 Feb 2018 07:46:32 +0000 (UTC) Received: by mail-pl0-f51.google.com with SMTP id 13so770934plb.5 for ; Mon, 05 Feb 2018 23:46:33 -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; bh=O/sly3YDGBJqlwzfwXsXnMkOnf+6ElxAjOOj04IDl2w=; b=HeYs7nKXXTRCYgpWCGYrOObnQod+hAp2/GGw4pAlvvg0P3VNej4qyEeNGMgHyoxSt2 xhKYilN6Hwwo30CYi/Lr74a87haIydNA7oOKDrCD5zCwtnj0YO+UjMOtxqBIVNfNbTmR NB+v3azKv0jZpN4ZobxUythjN6DavMHQodHNB2C0x4bU5OZ0Y0nOeok/cF9UC1gaHOCE OPWK4WGKMy/Dav59D5zhfPilDs+QTfNFNPbyj4teMnXfaKh8t8n0Ic3MopPd2vOyWrGb dGN8WH9qaeE3ND9Sn7Uh+9mbZM9nfe9a1lIJ7fyM92FwrlZliRr3B5oXgmIF/mMeuLBc uoBg== 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=O/sly3YDGBJqlwzfwXsXnMkOnf+6ElxAjOOj04IDl2w=; b=E4WlL2XNnEBRKMB32i8SeYwhICS6NQqUGssW3CW7fuxCPPCr5ulPoO358YwbQIr5tB +9NohhXs53jGdYG0yAnNFWEIesh6nAG/ivM0alu7kTZ0gvjlMjSqMzJxsrFgswZ2dguE U8thKzC4BdFW7q/bPD0RIaaxuK1wYW8bI3xYLmiyfPWvSwcJWB2NsRuYsIVdS530NG/S Xua6ollGrG4U71uwREInGA9GUJV4Ruq6/5oHvGRRf1ErG59owJ7pyIumkx0xatpaJ0wW fCL5L1SGWOEeT54GPHlG9hwCe6H3b+5WATkGERrjv/1kT6d9JIURXHv89MiipZx0sh6V dJ4Q== X-Gm-Message-State: APf1xPCyugWoYbifa5IqVmNClyJQgMjkwCO9dRSBZBziNx0agyQlBnUD m1W7+zEOsKjyLrT0HD7fBg2vVw== X-Received: by 2002:a17:902:b7c3:: with SMTP id v3-v6mr1555121plz.307.1517903192982; Mon, 05 Feb 2018 23:46:32 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::5590]) by smtp.gmail.com with ESMTPSA id s90sm20976060pfi.139.2018.02.05.23.46.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 23:46:31 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 5 Feb 2018 23:46:17 -0800 Message-Id: <20180206074619.22165-4-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180206074619.22165-1-raj.khem@gmail.com> References: <20180206074619.22165-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH V2 4/6] iscsi-initiator-utils: Upgrade to 2.0.876 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 Fix build with musl along the way Signed-off-by: Khem Raj --- Changes since V1: - Rebased on top of master and drop backports ...Check-for-root-peer-user-for-iscsiuio-IPC.patch | 135 --------------------- ...openiscsiusr-Include-limit.h-for-PATH_MAX.patch | 25 ++++ ...001-qedi.c-Removed-unused-linux-ethtool.h.patch | 25 ++++ ...ude-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch | 25 ++++ ...ould-ignore-bogus-iscsid-broadcast-packet.patch | 39 ------ ...openiscsiusr-Add-CFLAGS-to-linker-cmdline.patch | 29 +++++ ...l-fields-in-iscsiuio-IPC-response-are-set.patch | 34 ------ ...rder-the-includes-to-avoid-duplicate-defi.patch | 49 ++++++++ ...ot-double-close-IPC-file-stream-to-iscsid.patch | 62 ---------- ...04-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch | 28 +++++ ...re-strings-from-peer-are-copied-correctly.patch | 78 ------------ ...-useless-strcopy-and-validate-CIDR-length.patch | 44 ------- ...ck-iscsiuio-ping-data-length-for-validity.patch | 64 ---------- ...nitiator-utils-Do-not-clean-kernel-source.patch | 44 ------- ...text-add-include-for-NI_MAXHOST-definiton.patch | 35 ------ ...2.0.874.bb => iscsi-initiator-utils_2.0.876.bb} | 32 ++--- 16 files changed, 191 insertions(+), 557 deletions(-) delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch delete mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.0.874.bb => iscsi-initiator-utils_2.0.876.bb} (78%) -- 2.16.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-Check-for-root-peer-user-for-iscsiuio-IPC.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch deleted file mode 100644 index 2fd5c08a1..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch +++ /dev/null @@ -1,135 +0,0 @@ -From eb516ac5f9dddc80564f6becee08a0011e7aa58b Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 10:36:11 -0800 -Subject: [PATCH 1/7] Check for root peer user for iscsiuio IPC - -This fixes a possible vulnerability where a non-root -process could connect with iscsiuio. Fouund by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/Makefile.am | 3 ++- - iscsiuio/src/unix/iscsid_ipc.c | 47 ++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 49 insertions(+), 1 deletion(-) - -diff --git a/iscsiuio/src/unix/Makefile.am b/iscsiuio/src/unix/Makefile.am -index 71d5463..a989ef0 100644 ---- a/iscsiuio/src/unix/Makefile.am -+++ b/iscsiuio/src/unix/Makefile.am -@@ -20,7 +20,8 @@ iscsiuio_SOURCES = build_date.c \ - nic_utils.c \ - packet.c \ - iscsid_ipc.c \ -- ping.c -+ ping.c \ -+ ${top_srcdir}/../utils/sysdeps/sysdeps.c - - iscsiuio_CFLAGS = $(AM_CFLAGS) \ - $(LIBNL_CFLAGS) \ -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index a2a59a8..08e49e5 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -37,6 +37,8 @@ - * - */ - -+#define _GNU_SOURCE -+ - #include - #include - #include -@@ -47,6 +49,8 @@ - #include - #include - #include -+#include -+#include - - #define PFX "iscsi_ipc " - -@@ -61,6 +65,7 @@ - #include "iscsid_ipc.h" - #include "uip.h" - #include "uip_mgmt_ipc.h" -+#include "sysdeps.h" - - #include "logger.h" - #include "uip.h" -@@ -102,6 +107,7 @@ struct iface_rec_decode { - uint16_t mtu; - }; - -+#define PEERUSER_MAX 64 - - /****************************************************************************** - * iscsid_ipc Constants -@@ -1029,6 +1035,40 @@ static void iscsid_loop_close(void *arg) - LOG_INFO(PFX "iSCSI daemon socket closed"); - } - -+/* -+ * check that the peer user is privilidged -+ * -+ * return 1 if peer is ok else 0 -+ * -+ * XXX: this function is copied from iscsid_ipc.c and should be -+ * moved into a common library -+ */ -+static int -+mgmt_peeruser(int sock, char *user) -+{ -+ struct ucred peercred; -+ socklen_t so_len = sizeof(peercred); -+ struct passwd *pass; -+ -+ errno = 0; -+ if (getsockopt(sock, SOL_SOCKET, SO_PEERCRED, &peercred, -+ &so_len) != 0 || so_len != sizeof(peercred)) { -+ /* We didn't get a valid credentials struct. */ -+ LOG_ERR(PFX "peeruser_unux: error receiving credentials: %m"); -+ return 0; -+ } -+ -+ pass = getpwuid(peercred.uid); -+ if (pass == NULL) { -+ LOG_ERR(PFX "peeruser_unix: unknown local user with uid %d", -+ (int) peercred.uid); -+ return 0; -+ } -+ -+ strlcpy(user, pass->pw_name, PEERUSER_MAX); -+ return 1; -+} -+ - /** - * iscsid_loop() - This is the function which will process the broadcast - * messages from iscsid -@@ -1038,6 +1078,7 @@ static void *iscsid_loop(void *arg) - { - int rc; - sigset_t set; -+ char user[PEERUSER_MAX]; - - pthread_cleanup_push(iscsid_loop_close, arg); - -@@ -1077,6 +1118,12 @@ static void *iscsid_loop(void *arg) - continue; - } - -+ if (!mgmt_peeruser(iscsid_opts.fd, user) || strncmp(user, "root", PEERUSER_MAX)) { -+ close(s2); -+ LOG_ERR(PFX "Access error: non-administrative connection rejected"); -+ break; -+ } -+ - process_iscsid_broadcast(s2); - close(s2); - } --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch new file mode 100644 index 000000000..f5e1bec8a --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch @@ -0,0 +1,25 @@ +From cfee58d5863a535b61aa54690ae205b876f57944 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 22:53:29 -0800 +Subject: [PATCH 1/2] libopeniscsiusr: Include limit.h for PATH_MAX + +Signed-off-by: Khem Raj +--- + libopeniscsiusr/iface.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libopeniscsiusr/iface.c b/libopeniscsiusr/iface.c +index 79898df..a48ef36 100644 +--- a/libopeniscsiusr/iface.c ++++ b/libopeniscsiusr/iface.c +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include "libopeniscsiusr/libopeniscsiusr.h" + #include "misc.h" +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch new file mode 100644 index 000000000..174aa50d2 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-qedi.c-Removed-unused-linux-ethtool.h.patch @@ -0,0 +1,25 @@ +From 197713ad7e3e944102bbd792e1ab9ec4a67100c0 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 23:25:21 -0800 +Subject: [PATCH 1/4] qedi.c: Removed unused linux/ethtool.h + +Signed-off-by: Khem Raj +--- + iscsiuio/src/unix/libs/qedi.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/iscsiuio/src/unix/libs/qedi.c b/iscsiuio/src/unix/libs/qedi.c +index b81fecd..24cb89a 100644 +--- a/iscsiuio/src/unix/libs/qedi.c ++++ b/iscsiuio/src/unix/libs/qedi.c +@@ -49,7 +49,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch new file mode 100644 index 000000000..aecede6ee --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch @@ -0,0 +1,25 @@ +From 2b39f85dcf020647544002cb0b0e734748391dfb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 23:27:25 -0800 +Subject: [PATCH 2/4] idbm.c: Include fcnl.h for O_RDWR and O_CREAT definitions + +Signed-off-by: Khem Raj +--- + usr/idbm.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/usr/idbm.c b/usr/idbm.c +index 5532202..0a51b85 100644 +--- a/usr/idbm.c ++++ b/usr/idbm.c +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + #include + #include + +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch deleted file mode 100644 index 1f5202ec0..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 035bb16845537351e1bccb16d38981754fd53129 Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 10:37:56 -0800 -Subject: [PATCH 2/7] iscsiuio should ignore bogus iscsid broadcast packets - -When iscsiuio is receiving broadcast packets from iscsid, -if the 'payload_len', carried in the packet, is too -large then ignore the packet and print a message. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 08e49e5..dfdae63 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -950,6 +950,12 @@ int process_iscsid_broadcast(int s2) - - cmd = data->header.command; - payload_len = data->header.payload_len; -+ if (payload_len > sizeof(data->u)) { -+ LOG_ERR(PFX "Data payload length too large (%d). Corrupt payload?", -+ payload_len); -+ rc = -EINVAL; -+ goto error; -+ } - - LOG_DEBUG(PFX "recv iscsid request: cmd: %d, payload_len: %d", - cmd, payload_len); --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch new file mode 100644 index 000000000..836ed6048 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch @@ -0,0 +1,29 @@ +From 29571f71692e28ce9a17d1450097a98492f3b465 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 22:54:04 -0800 +Subject: [PATCH 2/2] libopeniscsiusr: Add CFLAGS to linker cmdline + +This will ensure that -fPIC is passed to linker as +well + +Signed-off-by: Khem Raj +--- + libopeniscsiusr/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libopeniscsiusr/Makefile b/libopeniscsiusr/Makefile +index 8b9b523..4f1d0d6 100644 +--- a/libopeniscsiusr/Makefile ++++ b/libopeniscsiusr/Makefile +@@ -49,7 +49,7 @@ LIBADD = + all: $(LIBS) $(LIBS_MAJOR) $(TESTS) doc + + $(LIBS): $(OBJS) +- $(CC) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) ++ $(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname=$@ -o $@ $(OBJS) $(LIBADD) + ln -sf $@ $(DEVLIB) + + $(LIBS_MAJOR): $(LIBS) +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch deleted file mode 100644 index 825083b74..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 81d3106cf8f09c79fe20ad7d234d7e1dda27bddb Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:11:17 -0800 -Subject: [PATCH 3/7] Ensure all fields in iscsiuio IPC response are set - -Make sure all fields in the response strcuture are set, -or info from the stack can be leaked to our caller. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index dfdae63..61e96cc 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -960,6 +960,8 @@ int process_iscsid_broadcast(int s2) - LOG_DEBUG(PFX "recv iscsid request: cmd: %d, payload_len: %d", - cmd, payload_len); - -+ memset(&rsp, 0, sizeof(rsp)); -+ - switch (cmd) { - case ISCSID_UIP_IPC_GET_IFACE: - size = fread(&data->u.iface_rec, payload_len, 1, fd); --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch new file mode 100644 index 000000000..0ce155f7a --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch @@ -0,0 +1,49 @@ +From 9b7a32903b56ce4d41f264a345ca59a0b00d53b3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 23:28:33 -0800 +Subject: [PATCH 3/4] bnx2x.c: Reorder the includes to avoid duplicate defines + with musl + +including nic.h before linux/ethtool.h avoids redefinitions of +eth structs + +/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0.876-r0/recipe-sysroot/ +usr/include/netinet/if_ether.h:104:8: error: redefinition of 'struct ethhdr' + struct ethhdr { + ^~~~~~ +In file included from /mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0. +876-r0/recipe-sysroot/usr/include/linux/ethtool.h:19:0, + from qedi.c:52: +/mnt/a/oe/build/tmp/work/cortexa7t2hf-neon-vfpv4-bec-linux-musleabi/iscsi-initiator-utils/2.0.876-r0/recipe-sysroot/ +usr/include/linux/if_ether.h:154:8: note: originally defined here + struct ethhdr { + ^~~~~~ + +Signed-off-by: Khem Raj +--- + iscsiuio/src/unix/libs/bnx2x.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/iscsiuio/src/unix/libs/bnx2x.c b/iscsiuio/src/unix/libs/bnx2x.c +index 3df6d5f..62530d1 100644 +--- a/iscsiuio/src/unix/libs/bnx2x.c ++++ b/iscsiuio/src/unix/libs/bnx2x.c +@@ -36,6 +36,7 @@ + * bnx2x.c - bnx2x user space driver + * + */ ++#include "nic.h" + #include + #include + #include +@@ -58,7 +59,6 @@ + #include "bnx2x.h" + #include "cnic.h" + #include "logger.h" +-#include "nic.h" + #include "nic_id.h" + #include "nic_utils.h" + #include "options.h" +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch deleted file mode 100644 index 274722c23..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 8167e5ce99682f64918a20966ce393cd33ac67ef Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:13:29 -0800 -Subject: [PATCH 4/7] Do not double-close IPC file stream to iscsid - -A double-close of a file descriptor and its associated FILE stream -can be an issue in multi-threaded cases. Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 61e96cc..bde8d66 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -913,6 +913,9 @@ early_exit: - /** - * process_iscsid_broadcast() - This function is used to process the - * broadcast messages from iscsid -+ * -+ * s2 is an open file descriptor, which -+ * must not be left open upon return - */ - int process_iscsid_broadcast(int s2) - { -@@ -928,6 +931,7 @@ int process_iscsid_broadcast(int s2) - if (fd == NULL) { - LOG_ERR(PFX "Couldn't open file descriptor: %d(%s)", - errno, strerror(errno)); -+ close(s2); - return -EIO; - } - -@@ -1030,7 +1034,8 @@ int process_iscsid_broadcast(int s2) - } - - error: -- free(data); -+ if (data) -+ free(data); - fclose(fd); - - return rc; -@@ -1132,8 +1137,8 @@ static void *iscsid_loop(void *arg) - break; - } - -+ /* this closes the file descriptor s2 */ - process_iscsid_broadcast(s2); -- close(s2); - } - - pthread_cleanup_pop(0); --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch new file mode 100644 index 000000000..57bdc8cb6 --- /dev/null +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch @@ -0,0 +1,28 @@ +From 6f9c1a04d250388d1574cfaf20a1ff66a64beb48 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 2 Feb 2018 23:42:12 -0800 +Subject: [PATCH 4/4] fwparam_ppc.c: Do not use __compar_fn_t + +__compar_fn_t is not defined in musl + +Signed-off-by: Khem Raj +--- + utils/fwparam_ibft/fwparam_ppc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/fwparam_ibft/fwparam_ppc.c b/utils/fwparam_ibft/fwparam_ppc.c +index c298b8c..391faa2 100644 +--- a/utils/fwparam_ibft/fwparam_ppc.c ++++ b/utils/fwparam_ibft/fwparam_ppc.c +@@ -356,7 +356,7 @@ static int loop_devs(const char *devtree) + * Sort the nics into "natural" order. The proc fs + * device-tree has them in somewhat random, or reversed order. + */ +- qsort(niclist, nic_count, sizeof(char *), (__compar_fn_t)nic_cmp); ++ qsort(niclist, nic_count, sizeof(char *), nic_cmp); + + snprintf(prefix, sizeof(prefix), "%s/%s", devtree, "aliases"); + dev_count = 0; +-- +2.16.1 + diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch deleted file mode 100644 index b73b01120..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0005-Ensure-strings-from-peer-are-copied-correctly.patch +++ /dev/null @@ -1,78 +0,0 @@ -From c9fc86a50459776d9a7abb609f6503c57d69e034 Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:15:26 -0800 -Subject: [PATCH 5/7] Ensure strings from peer are copied correctly. - -The method of using strlen() and strcpy()/strncpy() has -a couple of holes. Do not try to measure the length of -strings supplied from peer, and ensure copied strings are -NULL-terminated. Use the new strlcpy() instead. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 24 ++++++------------------ - 1 file changed, 6 insertions(+), 18 deletions(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index bde8d66..52ae8c6 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -152,10 +152,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird) - struct in_addr ia; - struct in6_addr ia6; - -- if (strlen(in_ipaddr_str) > NI_MAXHOST) -- strncpy(ipaddr_str, in_ipaddr_str, NI_MAXHOST); -- else -- strcpy(ipaddr_str, in_ipaddr_str); -+ strlcpy(ipaddr_str, in_ipaddr_str, NI_MAXHOST); - - /* Find the CIDR if any */ - tmp = strchr(ipaddr_str, '/'); -@@ -287,22 +284,16 @@ static int decode_iface(struct iface_rec_decode *ird, struct iface_rec *rec) - - /* For LL on, ignore the IPv6 addr in the iface */ - if (ird->linklocal_autocfg == IPV6_LL_AUTOCFG_OFF) { -- if (strlen(rec->ipv6_linklocal) > NI_MAXHOST) -- strncpy(ipaddr_str, rec->ipv6_linklocal, -- NI_MAXHOST); -- else -- strcpy(ipaddr_str, rec->ipv6_linklocal); -+ strlcpy(ipaddr_str, rec->ipv6_linklocal, -+ NI_MAXHOST); - inet_pton(AF_INET6, ipaddr_str, - &ird->ipv6_linklocal); - } - - /* For RTR on, ignore the IPv6 addr in the iface */ - if (ird->router_autocfg == IPV6_RTR_AUTOCFG_OFF) { -- if (strlen(rec->ipv6_router) > NI_MAXHOST) -- strncpy(ipaddr_str, rec->ipv6_router, -- NI_MAXHOST); -- else -- strcpy(ipaddr_str, rec->ipv6_router); -+ strlcpy(ipaddr_str, rec->ipv6_router, -+ NI_MAXHOST); - inet_pton(AF_INET6, ipaddr_str, - &ird->ipv6_router); - } -@@ -316,10 +307,7 @@ static int decode_iface(struct iface_rec_decode *ird, struct iface_rec *rec) - calculate_default_netmask( - ird->ipv4_addr.s_addr); - -- if (strlen(rec->gateway) > NI_MAXHOST) -- strncpy(ipaddr_str, rec->gateway, NI_MAXHOST); -- else -- strcpy(ipaddr_str, rec->gateway); -+ strlcpy(ipaddr_str, rec->gateway, NI_MAXHOST); - inet_pton(AF_INET, ipaddr_str, &ird->ipv4_gateway); - } - } else { --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch deleted file mode 100644 index 0fa24cd10..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0006-Skip-useless-strcopy-and-validate-CIDR-length.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a6efed7601c890ac051ad1425582ec67dbd3f5ff Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:18:35 -0800 -Subject: [PATCH 6/7] Skip useless strcopy, and validate CIDR length - -Remove a useless strcpy() that copies a string onto itself, -and ensure the CIDR length "keepbits" is not negative. -Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 52ae8c6..85742da 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -148,7 +148,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird) - char *tmp, *tok; - char ipaddr_str[NI_MAXHOST]; - char str[INET6_ADDRSTRLEN]; -- int keepbits = 0; -+ unsigned long keepbits = 0; - struct in_addr ia; - struct in6_addr ia6; - -@@ -161,8 +161,7 @@ static int decode_cidr(char *in_ipaddr_str, struct iface_rec_decode *ird) - tmp = ipaddr_str; - tok = strsep(&tmp, "/"); - LOG_INFO(PFX "in cidr: bitmask '%s' ip '%s'", tmp, tok); -- keepbits = atoi(tmp); -- strcpy(ipaddr_str, tok); -+ keepbits = strtoull(tmp, NULL, 10); - } - - /* Determine if the IP address passed from the iface file is --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch deleted file mode 100644 index c63c0a8d5..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0007-Check-iscsiuio-ping-data-length-for-validity.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5df60ad8b22194391af34c1a7e54776b0372ffed Mon Sep 17 00:00:00 2001 -From: Lee Duncan -Date: Fri, 15 Dec 2017 11:21:15 -0800 -Subject: [PATCH 7/7] Check iscsiuio ping data length for validity - -We do not trust that the received ping packet data length -is correct, so sanity check it. Found by Qualsys. - -CVE: CVE-2017-17840 - -Upstream-Status: Backport - -Signed-off-by: Zhixiong Chi ---- - iscsiuio/src/unix/iscsid_ipc.c | 5 +++++ - iscsiuio/src/unix/packet.c | 2 +- - iscsiuio/src/unix/packet.h | 2 ++ - 3 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/iscsiuio/src/unix/iscsid_ipc.c b/iscsiuio/src/unix/iscsid_ipc.c -index 85742da..a2caacc 100644 ---- a/iscsiuio/src/unix/iscsid_ipc.c -+++ b/iscsiuio/src/unix/iscsid_ipc.c -@@ -333,6 +333,11 @@ static void *perform_ping(void *arg) - - data = (iscsid_uip_broadcast_t *)png_c->data; - datalen = data->u.ping_rec.datalen; -+ if ((datalen > STD_MTU_SIZE) || (datalen < 0)) { -+ LOG_ERR(PFX "Ping datalen invalid: %d", datalen); -+ rc = -EINVAL; -+ goto ping_done; -+ } - - memset(dst_addr, 0, sizeof(uip_ip6addr_t)); - if (nic_iface->protocol == AF_INET) { -diff --git a/iscsiuio/src/unix/packet.c b/iscsiuio/src/unix/packet.c -index ecea09b..3ce2c6b 100644 ---- a/iscsiuio/src/unix/packet.c -+++ b/iscsiuio/src/unix/packet.c -@@ -112,7 +112,7 @@ int alloc_free_queue(nic_t *nic, size_t num_of_packets) - for (i = 0; i < num_of_packets; i++) { - packet_t *pkt; - -- pkt = alloc_packet(1500, 1500); -+ pkt = alloc_packet(STD_MTU_SIZE, STD_MTU_SIZE); - if (pkt == NULL) { - goto done; - } -diff --git a/iscsiuio/src/unix/packet.h b/iscsiuio/src/unix/packet.h -index b63d688..19d1db9 100644 ---- a/iscsiuio/src/unix/packet.h -+++ b/iscsiuio/src/unix/packet.h -@@ -43,6 +43,8 @@ - - #include "nic.h" - -+#define STD_MTU_SIZE 1500 -+ - struct nic; - struct nic_interface; - --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch deleted file mode 100644 index 2c466119c..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-Do-not-clean-kernel-source.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4ebab8add4a549c16ab8b124137546c0a7b46a9b Mon Sep 17 00:00:00 2001 -From: Joe MacDonald -Date: Tue, 15 Nov 2016 11:11:30 -0500 -Subject: [PATCH] Do not clean kernel source - -The default behaviour should not be to attempt to clean the kernel source -tree when building userspace. When not cross-compiling, however, this action is -harmless, but when attempting to build within the sysroot and since this package -is purely userspace, the clean step will fail. - -Removing the clean step eliminates an unnecessary dependency on the kernel build -infrastructure. - -Upstream-status: Inappropriate (embedded specific) - -Signed-off-by: Joe MacDonald ---- - Makefile | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index c8cd00e..9576bba 100644 ---- a/Makefile -+++ b/Makefile -@@ -37,7 +37,7 @@ endif - - all: user - --user: iscsiuio/Makefile -+user: - $(MAKE) -C utils/sysdeps - $(MAKE) -C utils/fwparam_ibft - $(MAKE) -C usr -@@ -75,7 +75,6 @@ clean: - $(MAKE) -C utils/fwparam_ibft clean - $(MAKE) -C utils clean - $(MAKE) -C usr clean -- $(MAKE) -C kernel clean - [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio clean - [ ! -f iscsiuio/Makefile ] || $(MAKE) -C iscsiuio distclean - --- -1.9.1 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch deleted file mode 100644 index 37d695f49..000000000 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 79bea58a554205dd185509fbc4e76b5fc40f9038 Mon Sep 17 00:00:00 2001 -From: Joe MacDonald -Date: Tue, 15 Nov 2016 12:36:45 -0500 -Subject: [PATCH] fw_context: add include for NI_MAXHOST definiton - -This appears to build successfully with gcc 4.x but fails on gcc 5+, though it's -not immediately clear why NI_MAXHOST isn't being defined from the include -chain. Currently engaging with the upstream devs to determine the best course -of action, but this is an adequate workaround. - -Upstream-status: Pending - -Signed-off-by: Joe MacDonald ---- - include/fw_context.h | 4 + - 1 file changed, 1 insertion(+) - -diff --git a/include/fw_context.h b/include/fw_context.h -index 44053d8..0b05cea 100644 ---- a/include/fw_context.h -+++ b/include/fw_context.h -@@ -21,6 +21,10 @@ - #ifndef FWPARAM_CONTEXT_H_ - #define FWPARAM_CONTEXT_H_ - -+#include -+#ifndef NI_MAXHOST -+#define NI_MAXHOST 1025 -+#endif - #include - #include - --- -2.1.4 - diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb similarity index 78% rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb index 6c4a867b5..823227c46 100644 --- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.874.bb +++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.0.876.bb @@ -11,26 +11,22 @@ DEPENDS = "openssl flex-native bison-native open-isns util-linux" LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" -SRCREV ?= "8db9717e73d32d2c5131da4f9ad86dfd9065f74b" +SRCREV ?= "24580adc4c174bbc5dde3ae7594a46d57635e906" SRC_URI = "git://github.com/open-iscsi/open-iscsi \ - file://iscsi-initiator-utils-Do-not-clean-kernel-source.patch \ - file://iscsi-initiator-utils-fw_context-add-include-for-NI_MAXHOST-definiton.patch \ file://initd.debian \ file://99_iscsi-initiator-utils \ file://iscsi-initiator \ file://iscsi-initiator.service \ file://iscsi-initiator-targets.service \ file://set_initiatorname \ - file://0001-Check-for-root-peer-user-for-iscsiuio-IPC.patch \ - file://0002-iscsiuio-should-ignore-bogus-iscsid-broadcast-packet.patch \ - file://0003-Ensure-all-fields-in-iscsiuio-IPC-response-are-set.patch \ - file://0004-Do-not-double-close-IPC-file-stream-to-iscsid.patch \ - file://0005-Ensure-strings-from-peer-are-copied-correctly.patch \ - file://0006-Skip-useless-strcopy-and-validate-CIDR-length.patch \ - file://0007-Check-iscsiuio-ping-data-length-for-validity.patch \ + file://0001-libopeniscsiusr-Include-limit.h-for-PATH_MAX.patch \ + file://0002-libopeniscsiusr-Add-CFLAGS-to-linker-cmdline.patch \ + file://0001-qedi.c-Removed-unused-linux-ethtool.h.patch \ + file://0002-idbm.c-Include-fcnl.h-for-O_RDWR-and-O_CREAT-definit.patch \ + file://0003-bnx2x.c-Reorder-the-includes-to-avoid-duplicate-defi.patch \ + file://0004-fwparam_ppc.c-Do-not-use-__compar_fn_t.patch \ " - S = "${WORKDIR}/git" B = "${WORKDIR}/build" @@ -39,25 +35,15 @@ inherit update-rc.d systemd autotools EXTRA_OECONF = " \ --target=${TARGET_SYS} \ --host=${BUILD_SYS} \ - --prefix=${prefix} \ - --libdir=${libdir} \ " EXTRA_OEMAKE = ' \ - CC="${CC}" \ - AR="${AR}" \ - RANLIB="${RANLIB}" \ - CFLAGS="${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE -I. -I../include -I../../include -I../usr -I../../usr" \ - LDFLAGS="${LDFLAGS}" \ - LD="${LD}" \ OS="${TARGET_SYS}" \ TARGET="${TARGET_OS}" \ BASE="${prefix}" \ MANDIR="${mandir}" \ ' -TARGET_CC_ARCH += "${LDFLAGS}" - do_configure () { cd ${S}/iscsiuio ; autoreconf --install; ./configure ${EXTRA_OECONF} } @@ -81,12 +67,14 @@ do_install () { ${D}${localstatedir}/lib/iscsi/isns \ ${D}${localstatedir}/lib/iscsi/slp \ ${D}${localstatedir}/lib/iscsi/ifaces \ - ${D}/${mandir}/man8 + ${D}${libdir} \ + ${D}${mandir}/man8 install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \ ${S}/utils/iscsi-iname \ ${S}/usr/iscsistart ${D}/${sbindir} + cp -dR ${S}/libopeniscsiusr/libopeniscsiusr.so* ${D}${libdir} install -p -m 644 ${S}/doc/iscsiadm.8 ${S}/doc/iscsid.8 ${D}/${mandir}/man8 install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi install -p -m 755 ${WORKDIR}/initd.debian ${D}${sysconfdir}/init.d/iscsid From patchwork Tue Feb 6 07:46:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126955 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2679263ljc; Mon, 5 Feb 2018 23:47:30 -0800 (PST) X-Google-Smtp-Source: AH8x226EKBIZFysiwHLpJqjOV7Je6fUDJMXHeyUsBRM8LjC/d06OTh/WLsuv0I1oFcjkdTaIYcH6 X-Received: by 10.98.28.210 with SMTP id c201mr1546159pfc.109.1517903250553; Mon, 05 Feb 2018 23:47:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517903250; cv=none; d=google.com; s=arc-20160816; b=FS7f+85jULEzFhXlUHtb9nNQwZrkWBukeYNvHwJzRNEwrK6+ccH+GQaPtD/e9jSfRm YC2HCfcodmoiH9J5hcqhliqohkdaFh30g4R08Log5ak6C2YL9CsjcVSI/RDOeJ3snn5h vo6WUBCzhN5xGWdlvmn5gAc454FsN//SbTgKsFgVQe3+H93fh9JZyWd50FtjWpBRnfYA 1W5+4CMvERgRSLcdXwvCBcFl+aAVIPqQFWg9SbVFAS1N/mS1diGHjrxgPJKR/JIhLoUU XkkYBvSuB+zkckziyv4eE/hzLlkHUHSSfyMVn3UvMyfp2iLwDC/WjHSYUlvVnA+Y6poJ 5MZg== 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=PaTz5JLJMASnnlDaXB+f2jsHOY9dvyoPcjmI5WI2Msg=; b=M04pDYNz/wBYoFJ+0hx/J6L8B2ntI6hdqYo35XAHof9SfgbUrPDW5Wvxm5237hwEGq TjTeZTp4X6Dlcq+qIGxsoBMHJ9Ys1j82SIEIZaV51gQPSOeTdenBLyZm4eAIFqi6vi4J ofsluCiA/SX3KPTlcaOd9yD5rKSvbK6ksLOBNPeKU+J33n8MCVtrNYqPFj9JC/sXcKFx N8Xomq0OgXRy5iZleL5GATFeo3b/r3fepNnw31oAa0TnztVNqLtEWHiibtIN6kXDJUbT uZxyRiTs84ZU6oDAsGIiRPXfQLhG+FuE4+yoZrFw8cRZrbyv56YKH+sZN3dfzEouYKP/ cgtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=s4QI3wL+; 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=NONE 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 q27si1271222pfl.135.2018.02.05.23.47.30; Mon, 05 Feb 2018 23:47:30 -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=s4QI3wL+; 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=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 7F9227859E; Tue, 6 Feb 2018 07:47:11 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by mail.openembedded.org (Postfix) with ESMTP id C1186784FE for ; Tue, 6 Feb 2018 07:46:32 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id 36so756468ple.13 for ; Mon, 05 Feb 2018 23:46:34 -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; bh=BjrKzEZNc4AjiLAAg2ydaNfG8E2pvQ0GD4b3vCHohfg=; b=s4QI3wL+R2tRs8TQLvx8Wp/Iih8zgqy1rVYKUdFMA4a8Np6CM7wSpWJg83YQg6KPdb jxH26c1o3D2xvVKSVsmGdxg7Xo0T5wGwjJsXok7CJOMbl60BZwsrJzacJFsoCD7uWwyn 0FoY1PSiIPdrnjJ8isvcDT//Q8NEwjOtav9azyKDDQyp5ZV2rEo4NFdMjKALBMl3XBj2 /CDncRf2bbJ2FRuxjaD1UYzvMrl3S2p72v8BfUtMJdveGIsmSk03hjY3HUxt9GsC3o/r tGURF2L0XAjasfVit+Qy1nwpVX4FEUx26MgFjUn6wr7dJCX05+7t0QYlKQCjO5i1UKmV nf2g== 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=BjrKzEZNc4AjiLAAg2ydaNfG8E2pvQ0GD4b3vCHohfg=; b=ZHxQ1z7d/X7NFNukXwY9mLGOhH4CJNaCtLBQ1HUsIXhV7rpISoR+IPC7Wb5s8oEvCF qk4+re8pDheOT8n/ybMjRphKeoevlm7JcmDJy6e3DXvF8ByiLpN7zudaUp9kMjVk4Oho YslldC/esbZvuMqjsUwWU4+x0vhrcTuLPFdQcVgQDOjaceI1/S4PMQVMDldnfjwUxgBN ZZeRYoYQB9In86yVY0CO7ezhPuGva5cqeH91xa+O79tp38lwc2Z5A/rFaLpQDr2VMDic nGc4TfVWw1ESZJEnI8p/334n4IJfb5Xep7+KlAvRkvgOixlGu+BR9Zy/F6a8L3myx24s Wqow== X-Gm-Message-State: APf1xPBwm0BwKkDYMlvQwf+YWbGvwhcLSRTi47vDTh0XxCqGlckVxwo6 YdOrXK8GShzAHICgTGXJ8q+DKw== X-Received: by 2002:a17:902:223:: with SMTP id 32-v6mr1572459plc.77.1517903193831; Mon, 05 Feb 2018 23:46:33 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::5590]) by smtp.gmail.com with ESMTPSA id s90sm20976060pfi.139.2018.02.05.23.46.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 23:46:33 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 5 Feb 2018 23:46:18 -0800 Message-Id: <20180206074619.22165-5-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180206074619.22165-1-raj.khem@gmail.com> References: <20180206074619.22165-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 5/6] samba: Refresh musl pam patch 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 last update left the musl builds broken since the patch was not forward ported Signed-off-by: Khem Raj --- .../{samba-4.2.7-pam.patch => samba-pam.patch} | 21 +++++++++++---------- .../recipes-connectivity/samba/samba_4.7.0.bb | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-) rename meta-networking/recipes-connectivity/samba/samba/{samba-4.2.7-pam.patch => samba-pam.patch} (73%) -- 2.16.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch similarity index 73% rename from meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch rename to meta-networking/recipes-connectivity/samba/samba/samba-pam.patch index 6b9ade920..0cbacb6c0 100644 --- a/meta-networking/recipes-connectivity/samba/samba/samba-4.2.7-pam.patch +++ b/meta-networking/recipes-connectivity/samba/samba/samba-pam.patch @@ -4,12 +4,11 @@ http://data.gpo.zugaina.org/musl/net-fs/samba/files/samba-4.2.7-pam.patch Signed-off-by: Khem Raj - -Index: samba-4.4.5/source3/wscript +Index: samba-4.7.0/source3/wscript =================================================================== ---- samba-4.4.5.orig/source3/wscript -+++ samba-4.4.5/source3/wscript -@@ -873,7 +873,7 @@ msg.msg_accrightslen = sizeof(fd); +--- samba-4.7.0.orig/source3/wscript ++++ samba-4.7.0/source3/wscript +@@ -875,7 +875,7 @@ msg.msg_accrightslen = sizeof(fd); if conf.env.with_iconv: conf.DEFINE('HAVE_ICONV', 1) @@ -18,10 +17,10 @@ Index: samba-4.4.5/source3/wscript use_pam=True conf.CHECK_HEADERS('security/pam_appl.h pam/pam_appl.h') if not conf.CONFIG_SET('HAVE_SECURITY_PAM_APPL_H') and not conf.CONFIG_SET('HAVE_PAM_PAM_APPL_H'): -@@ -945,6 +945,15 @@ int i; i = PAM_RADIO_TYPE; - if use_pam: - conf.DEFINE('WITH_PAM', 1) - conf.DEFINE('WITH_PAM_MODULES', 1) +@@ -952,6 +952,17 @@ int i; i = PAM_RADIO_TYPE; + "or headers not found. Use --without-pam to disable " + "PAM support."); + + else: + Logs.warn("PAM disabled") + use_pam=False @@ -31,6 +30,8 @@ Index: samba-4.4.5/source3/wscript + conf.undefine('PAM_RHOST') + conf.undefine('PAM_TTY') + conf.undefine('HAVE_PAM_PAM_APPL_H') - ++ ++ seteuid = False + # diff --git a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb index 686998e5e..8a031eb5e 100644 --- a/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb +++ b/meta-networking/recipes-connectivity/samba/samba_4.7.0.bb @@ -26,7 +26,7 @@ SRC_URI = "${SAMBA_MIRROR}/stable/samba-${PV}.tar.gz \ file://volatiles.03_samba \ " SRC_URI_append_libc-musl = " \ - file://samba-4.2.7-pam.patch \ + file://samba-pam.patch \ file://samba-4.3.9-remove-getpwent_r.patch \ " From patchwork Tue Feb 6 07:46:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 126956 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp2679337ljc; Mon, 5 Feb 2018 23:47:39 -0800 (PST) X-Google-Smtp-Source: AH8x225IosDo/Filt9tpjbFx1KPaNov8sqjVXdjsJcn9m4fTQ4U12rfsvOG8SmVWMniF8pbz2Nwn X-Received: by 10.99.95.215 with SMTP id t206mr1263515pgb.132.1517903259383; Mon, 05 Feb 2018 23:47:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517903259; cv=none; d=google.com; s=arc-20160816; b=Eu9UYaRHyOQ/FjsSclx5LTGKrmtAv8Efte4p2DLVjT2QSPgh25VL0yvs7SmoDcjiz8 Be2ETVel22WSOcV3U4JE2PJVaj61f/EE0BiQt5DwO8mRT+JoZBhDoPDeekqW4t96V1nC NKR2iFJHgsUvFKIdUzLGKPlH5iwmVN/RxT7OO6tIAOhj2ysZIrbRwkC+PqLKoxtB3fmr EZ8pDAStTSyqCOWIpcz8y/b65lZV0zkI5awNfc7fTiOWTsJ4POO9w2ZCwFVQGa3Lf3xB DH0AXWOyQckGMQZ28p1GFAQB4fU1oloEYuFjCpX03cVPJwp1JODM/C5oHs+Oj/LvT6SS dIWA== 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=/bNA/W/9EQuDdNn713xEqxdI81jwHeZ2271b0069m7Q=; b=Szqzom2GpD9pXSIb65pYYVMC34YPkyXUoiys8E4BHck/6M8rxYpn7Bf6fzygGcdAUl RzTA8tUHjythupTsUz6crfkdZLw2l1l+uQ+qdDM7pkXkAEp1SGkptxTNjbDtKPPiZ/ET Zb3LhO5YbJ8hMJmKjBceGjXceY7t+mxJ4VC0qcIp+NdtmWJar2f1f6UhDkXu41aB5L/x gxwPyDtNXpGgCCSVyy0aa6erXQzEDq1KYXM0Ra610CrGgEptq0qfKNab6QEbZz2JZVHA aeVU9CFChyCmQQX9ANsolO3HgG2PQiLmdNGlpCbbnjPazMWDH5H3pzLULOpS/8EM9xSY fvvg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G6ZZrpTn; 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=NONE 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 n12si321591pgs.141.2018.02.05.23.47.39; Mon, 05 Feb 2018 23:47:39 -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=G6ZZrpTn; 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=NONE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CB707785E0; Tue, 6 Feb 2018 07:47:12 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f44.google.com (mail-pl0-f44.google.com [209.85.160.44]) by mail.openembedded.org (Postfix) with ESMTP id EF9E378055 for ; Tue, 6 Feb 2018 07:46:33 +0000 (UTC) Received: by mail-pl0-f44.google.com with SMTP id q17so779482pll.1 for ; Mon, 05 Feb 2018 23:46:35 -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; bh=Y4lyUR02JC4t6q2Y5aImrMtVpY8v7yp5Rf6eecikbUg=; b=G6ZZrpTn8Y2cre146BeAjkaP/JgNW/qGsReDi4PBrTjnEFAk8lXwiwsukuEtltlykY sKyFXJnoP6m5i+c0NG+M6AvLchrCDyzbp9/ebV4pQuFiBS6X7QJouUVWQs5R3u1SaOAD Amz584OL/kpIKBf2GbkTbY+H0ZVAJN3vhRcflC2qhsyRJWuPwagu53l0yhk/Q7An/rAI i2/pdMU0h/L8gohe4h2lFHWyiXRItx/tBZ5wBV6MdMeIFNbyhfa3E0NY/oLTI4CrHC7p oPYR4+ntRle01kkRN3GBQnJ0qrucFzapA3+N08cbAQyyzvnk2lmItgmm64uJqVYqwMMv 0ONw== 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=Y4lyUR02JC4t6q2Y5aImrMtVpY8v7yp5Rf6eecikbUg=; b=mBiHssFf67NzvU/yWshpRBhuDnLHwytBKuUcIPpgRTcCRrShvUxfYak1S8Bx27Cs7j N6JzS/F78hIRHFDVdWD1wIq8l5gsLE1iR+HwEOnetFd/TVsPuzlsAgpLRTIp77rz8gz9 CwhtZRcLhE/GcwmMPQhp1JPwIeqcPmdK/UhX1O9LkfOPuaeZlB6qn9dabkmD+Qhw/sls Iyb/FbcDrlkUdIIInz7MSmzMUQ2id/oXUep2BAkB+bzd3oaXoXuF5isEBE7Pa1UdObbi DlOywED1jaceGFqQeTeQ0gx+lfJJh7AyuI2jm/nuH0angaTJ0vrPrjSfQFNjFMkjxpEj HFMg== X-Gm-Message-State: APf1xPBv43x0cwLPq1uPTP9f/7RPVZA9rD4bNi21ULXukVB0JVsmsMhX MfKqL+eau2pdCKcDlwatvvQrIg== X-Received: by 2002:a17:902:380c:: with SMTP id l12-v6mr1520249plc.8.1517903194968; Mon, 05 Feb 2018 23:46:34 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c::5590]) by smtp.gmail.com with ESMTPSA id s90sm20976060pfi.139.2018.02.05.23.46.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Feb 2018 23:46:34 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Mon, 5 Feb 2018 23:46:19 -0800 Message-Id: <20180206074619.22165-6-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180206074619.22165-1-raj.khem@gmail.com> References: <20180206074619.22165-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 6/6] libyui-ncurses: Fix build with musl 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 --- ...rc-Replace-using-sys-errno.h-with-errno.h.patch | 59 ++++++++++++++++++++++ .../recipes-graphics/libyui/libyui-ncurses_git.bb | 4 +- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch -- 2.16.1 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch new file mode 100644 index 000000000..ae1b265dc --- /dev/null +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-src-Replace-using-sys-errno.h-with-errno.h.patch @@ -0,0 +1,59 @@ +From 46f016c4b87bb2a594df1c84e4d494bff0cbeaf9 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Mon, 5 Feb 2018 12:01:25 -0800 +Subject: [PATCH] src: Replace using sys/errno.h with errno.h + +sys/errno.h is no longer the right place for this file + +error: #warning redirecting incorrect #include to [-Werror=cpp] + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted [https://github.com/libyui/libyui-ncurses/pull/63] + src/NCAskForDirectory.cc | 2 +- + src/NCAskForFile.cc | 2 +- + src/NCFileSelection.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/NCAskForDirectory.cc b/src/NCAskForDirectory.cc +index 06ec6ac..ed1a30c 100644 +--- a/src/NCAskForDirectory.cc ++++ b/src/NCAskForDirectory.cc +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + + /* + Textdomain "ncurses" +diff --git a/src/NCAskForFile.cc b/src/NCAskForFile.cc +index 31fdb39..63a6679 100644 +--- a/src/NCAskForFile.cc ++++ b/src/NCAskForFile.cc +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + + /* + Textdomain "ncurses" +diff --git a/src/NCFileSelection.h b/src/NCFileSelection.h +index d42311f..514d020 100644 +--- a/src/NCFileSelection.h ++++ b/src/NCFileSelection.h +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + + + struct NCFileInfo +-- +2.16.1 + diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb index e445ee0cc..3388876e4 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_git.bb @@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ file://COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://github.com/libyui/libyui-ncurses.git" +SRC_URI = "git://github.com/libyui/libyui-ncurses.git \ + file://0001-src-Replace-using-sys-errno.h-with-errno.h.patch \ + " SRC_URI_append_class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch"