From patchwork Tue Sep 8 22:12:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360141 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=rockwellcollins.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=jATlh+Tw; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmKD04XL4z9sRK for ; Wed, 9 Sep 2020 08:13:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0C5BB86D80; Tue, 8 Sep 2020 22:13:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HEvsWCgZLMJ8; Tue, 8 Sep 2020 22:13:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id ECF8686B84; Tue, 8 Sep 2020 22:13:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id C0E761BF5B4 for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id A60D12037E for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SalDbhTzbxQv for ; Tue, 8 Sep 2020 22:13:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs04.rockwellcollins.com (ch3vs04.rockwellcollins.com [205.175.226.52]) by silver.osuosl.org (Postfix) with ESMTPS id B511D20371 for ; Tue, 8 Sep 2020 22:13:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=drjUAn7J3N1oAw6xYePX6B2+Bgy6VjPYWWb5mUbt/Xk=; b=jATlh+TwvZn3MKiiCenylaUdv5TQjrzIwS3UQ7YR2njders5/YUxZTRE dwzAXXb+1vkWfvlYGlfG1qu92IvPkZVht0nOT0NZ0jRocyBy8uzwrTwWa RsH+Q3Y4V3vFYMKnFX3N+/fr2aeq5gh3yXHYbYbXxZNZD8IJMdUW/ylbF HmVq0+Z/YvdzGMZKf1qPTQE1tQr/RnzKLmBxl045CnIMfeUMqdpgRXfov 4oe1J5ic5TfXeigK29Lwtd55SVlfM72sFWvIiXdHMo3QyyrIqk4OJOCgX XUscZALVPF8pv3lcm6MixA+q5dUT+xVYVIkQkSgj23Ho5U/rRBejOZ+DF g==; IronPort-SDR: ePKMe9PZg9IM3lXJQiQhcRiyUKGYReEXfpyhntVaZ1qfAbTIJ3iWNKbwUDL7wB0c4ivi8ERlep zq4vNgl3tBoZ3+Zxrdt+cD2tRnPET0ATAUBpmO6+GVv5rQgEa9lNtrUvHLlVreB/+jhB64Pqlv YOX2LnObY9xgrT3XAiFbad6YG6AoEBlnbQhtuOXk3leXlEyi7UtP6y5+Fth1Mx9G4JNZ7B25RW HkpjNVrqTBCslZnU/CoapQfT/Yvii6hKsQh2/8CmAngml3tFOBdRhtuql6kztj5qLSjepEfrHP EVc= Received: from ofwch3n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs04.rockwellcollins.com with ESMTP; 08 Sep 2020 17:13:12 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id C893120051; Tue, 8 Sep 2020 17:13:11 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 17:12:53 -0500 Message-Id: <20200908221256.126984-1-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x v2 1/4] package/systemd: bump version to 244.4 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter@korsgaard.com, Brandon Maier , "Yann E . MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Brandon Maier Acked-by: Yann E. MORIN --- v2: - No change package/systemd/systemd.hash | 2 +- package/systemd/systemd.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 4ab514d673..3f6f4b4db6 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 e6b463733da5eb37075352a64112d030b8612935a54e5b3468279a4f15a4cec4 systemd-244.3.tar.gz +sha256 6f01276f45369d56ea5ced713e63a22acbb9142862eb719246a77a4b3f5699ee systemd-244.4.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 sha256 f7299f5f5e8bdffd347dce1bed888b1cea6ddaf27de521c307265098bcbeae92 README diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 2908caef61..e0a4679955 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 244.3 +SYSTEMD_VERSION = 244.4 SYSTEMD_SITE = $(call github,systemd,systemd-stable,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README), BSD-3-Clause (tools/chromiumos) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README tools/chromiumos/LICENSE From patchwork Tue Sep 8 22:12:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360142 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=rockwellcollins.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=tO+4fX7u; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmKD066WRz9sSJ for ; Wed, 9 Sep 2020 08:13:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 29031848F0; Tue, 8 Sep 2020 22:13:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Rzw5-U602Lsi; Tue, 8 Sep 2020 22:13:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9534586D31; Tue, 8 Sep 2020 22:13:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 891771BF5B4 for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 7F881873EF for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xhaiyXAO7aFP for ; Tue, 8 Sep 2020 22:13:13 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs03.rockwellcollins.com (da1vs03.rockwellcollins.com [205.175.227.47]) by hemlock.osuosl.org (Postfix) with ESMTPS id B9A11873E9 for ; Tue, 8 Sep 2020 22:13:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=TIQ+bEdOQ4z0TtppB4etOsKriCn31eyXcRGzA/YVNd0=; b=tO+4fX7uR96nYFFXZeP4R4ULYmsap/SDptgQ02B7OsF05Kv3wWdPK3OP e44Ta1cYpLlk9+aZkGbx5W1a9H/FM+Zqk7h2iZalMd5kfGHMaoj5+hAMA 25qTADC1JqfUTbtiwx5l+vcd5c6wAtBH0PIVqJLKd6K2WJi34fUO1sdi9 KJ2j/a3aOkxfOw3edRTZV13oD62aeLwviHonfHQSIzvW8GBMziXjqz8Mj QgWoiB1Xjn0lC+OY2SasH9gLzvy3XYhcSoO9+IAi+ndoryGXeOeESGo5M 8YMNoWpsCCy6wHxft39uVL+MulM3ClAB47RBkvQQPW05h835wsP7fcSHD g==; IronPort-SDR: UWimqK8STzs6Ji4dmn32Ut8I+TXEsvvF4s4WK84xHHkhs5OGJUFSlxTYraKVHQlzutJBr7DMXE 8Eei+fNBapUdINxotFzCQcsbcvravNpH7FF+SS5RNvG283dWDNmk3qkcZM587gjCjyN8Z6XAQs itF/OxqLMVHA0nI2bpSADJOhRomhgnYHhXCuGGADOJfd0lyHp3px8/Re1P33T2fXckixzxbqnK zuMOWRpl70sVa1mWddlMxmphICLQQc2AI63Ri6SPP/XMm361yDCE8hth5NUjf9FGvnjuF/h1bT 2u4= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs03.rockwellcollins.com with ESMTP; 08 Sep 2020 17:13:13 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id A0D7620051; Tue, 8 Sep 2020 17:13:12 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 17:12:54 -0500 Message-Id: <20200908221256.126984-2-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908221256.126984-1-brandon.maier@rockwellcollins.com> References: <20200908221256.126984-1-brandon.maier@rockwellcollins.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x v2 2/4] package/systemd: Fix patch numbering X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter@korsgaard.com, Brandon Maier , "Yann E . MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Brandon Maier Acked-by: Yann E. MORIN --- v2: - No change ...> 0002-random-seed-add-missing-header-for-GRND_NONBLOCK.patch} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename package/systemd/{0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch => 0002-random-seed-add-missing-header-for-GRND_NONBLOCK.patch} (100%) diff --git a/package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch b/package/systemd/0002-random-seed-add-missing-header-for-GRND_NONBLOCK.patch similarity index 100% rename from package/systemd/0001-random-seed-add-missing-header-for-GRND_NONBLOCK.patch rename to package/systemd/0002-random-seed-add-missing-header-for-GRND_NONBLOCK.patch From patchwork Tue Sep 8 22:12:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360143 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=rockwellcollins.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=QLXd36ny; dkim-atps=neutral Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmKD158Yhz9sRK for ; Wed, 9 Sep 2020 08:13:21 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 2C36B873F5; Tue, 8 Sep 2020 22:13:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RhtaD1pk-Yqh; Tue, 8 Sep 2020 22:13:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id EC798873EF; Tue, 8 Sep 2020 22:13:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3BF581BF5B4 for ; Tue, 8 Sep 2020 22:13:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 38B9286D76 for ; Tue, 8 Sep 2020 22:13:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X227DLuqYiHA for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs04.rockwellcollins.com (da1vs04.rockwellcollins.com [205.175.227.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 6C6008561D for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CD2tNhCRA5Uo8EkC6uGL+yoBd1xs6HwQxT7bRvg4iM8=; b=QLXd36nyRs90vHkgjDfQqnkT0BubLD6yGTT2+I3JxnfDGoXWrtoEXUr2 c+v9T3bBkwhpMa6TYRHui7z/9TX+mELMdwCrYXl3GtaGhk46jJp1wfUpZ vaTvGOigPJmsSZ7oablpUvHFl5cZ2FA6uYnFwwXUNnXZrwMtK5S+IBO3c S8/0pGbQyF/zAhF8g73C8yrZR4ivmrjARa+CGDVjZx5UlpIhM6IRwyzfU GY6zBY/IFIvCTNxiIVB3+EVf7A/p78xATD9Yw6Bk1yb8ZsWCIq5mfPMoE 8QDrYK3X5Z7HamrnM8wSIc1KgFs87Qjfczo9/5HPkO4mDQsc4e/1sS2Cb A==; IronPort-SDR: raH8cFAGeTZoXwLQpKu6+sU9UGKqGyOjwkiykYT34nyQRdTEuWGOQdaFnvDdRoNmZ2QsFQ7RBx 2lmlHv2HQCxCjMa8umnL/78dOMhQVXQpnJZHPZbTQsEX1m/Vl8aqa7wBVH3CTbnDBFTnJSXEuu alBV8C4eJyZZ9WXM72hJIIy9QivglAlmq7cH4mh9jQ6cthyChjvmxnrOvINmwl7oS/hU11C/7W 0DVwi88V3rkCNRP9QpMvraf2m+O06tt3BwfgUuGMahFqCD2JedTl5YmK19BTGOSgNV1LrpShNk 7gw= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs04.rockwellcollins.com with ESMTP; 08 Sep 2020 17:13:14 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 5B77420051; Tue, 8 Sep 2020 17:13:13 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 17:12:55 -0500 Message-Id: <20200908221256.126984-3-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908221256.126984-1-brandon.maier@rockwellcollins.com> References: <20200908221256.126984-1-brandon.maier@rockwellcollins.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x v2 3/4] package/systemd: Backport fix for network-generator X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter@korsgaard.com, Brandon Maier , "Yann E . MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The systemd-network-generator.service will fail to parse the bootarg "ip=xxx" if it's missing the (optional) hostname field. Backport this fix from systemd v245. Signed-off-by: Brandon Maier Reviewed-by: Yann E. MORIN --- v2: - Add "backport from" and SoB ...twork-generator-allow-empty-hostname.patch | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 package/systemd/0003-network-generator-allow-empty-hostname.patch diff --git a/package/systemd/0003-network-generator-allow-empty-hostname.patch b/package/systemd/0003-network-generator-allow-empty-hostname.patch new file mode 100644 index 0000000000..8d1f3aa86f --- /dev/null +++ b/package/systemd/0003-network-generator-allow-empty-hostname.patch @@ -0,0 +1,44 @@ +From 21a925a4ac7955e7d7e6cfd477e96d3a2aaee7db Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Thu, 12 Dec 2019 19:01:21 +0900 +Subject: [PATCH 1/1] network-generator: allow empty hostname + +Fixes #14319. + +[Brandon: backport from https://github.com/systemd/systemd/commit/21a925a4ac7955e7d7e6cfd477e96d3a2aaee7db] +Signed-off-by: Brandon Maier +--- + src/network/generator/network-generator.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c +index 81afa95307..bed1e42697 100644 +--- a/src/network/generator/network-generator.c ++++ b/src/network/generator/network-generator.c +@@ -574,7 +574,7 @@ static int parse_netmask_or_prefixlen(int family, const char **value, unsigned c + + static int parse_cmdline_ip_address(Context *context, int family, const char *value) { + union in_addr_union addr = {}, peer = {}, gateway = {}; +- const char *hostname, *ifname, *dhcp_type, *dns, *p; ++ const char *hostname = NULL, *ifname, *dhcp_type, *dns, *p; + unsigned char prefixlen; + int r; + +@@ -599,9 +599,11 @@ static int parse_cmdline_ip_address(Context *context, int family, const char *va + if (!p) + return -EINVAL; + +- hostname = strndupa(value, p - value); +- if (!hostname_is_valid(hostname, false)) +- return -EINVAL; ++ if (p != value) { ++ hostname = strndupa(value, p - value); ++ if (!hostname_is_valid(hostname, false)) ++ return -EINVAL; ++ } + + value = p + 1; + +-- +2.23.0 + From patchwork Tue Sep 8 22:12:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360144 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=rockwellcollins.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=mpfgsHef; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmKD36dyqz9sRK for ; Wed, 9 Sep 2020 08:13:23 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6FE8C86D79; Tue, 8 Sep 2020 22:13:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ySxHJM57mhM3; Tue, 8 Sep 2020 22:13:21 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id D054286D9D; Tue, 8 Sep 2020 22:13:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id ECE7C1BF5B4 for ; Tue, 8 Sep 2020 22:13:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E8FE18561D for ; Tue, 8 Sep 2020 22:13:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wbzt82KQoZFH for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs04.rockwellcollins.com (da1vs04.rockwellcollins.com [205.175.227.52]) by fraxinus.osuosl.org (Postfix) with ESMTPS id B5C3686B84 for ; Tue, 8 Sep 2020 22:13:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=UqCfvrhYlU/p4aqyd+aRgn37eXBpwSBZlIx2dnGX58E=; b=mpfgsHefYW8lHxpe884TQ914DOfmi+c3/rdV93kC8zY3yyOHIZ+9mm68 EDrktFluV0qYZlXfM40kV6NqwsVK5cyrOn9NGNZ+5m2NZqmwUoi3Wdzim 85agUUVJmS5IwKyaffOsHdWhLcQJaBdHbssTBWyztGTyi8AvR1vSVC5ta Oi2g8nyjLoU/JI7kSz1iE02elHjLMEeTDK2ja4585X4eUVU65b08zFUDm nIgH8et+02yYhpNlyYrxggR84t0X0bBXknG6BnTaRcPDi9qqGmGumyP0j eMJUiKtvWva0qLIb56iuzwi8o+bSbW4LbnSbw4XtLVUQSQR4gVymCzeuv w==; IronPort-SDR: D4iBC+7Xbv9KJb27Rd4pkH9R32rfqn6VnhxFL9xYC/4WUp+grxpXtihKTH21/a4FUpMRNve3xB /27vMoqvkymOj0UAOND/+6oIRuPry8rPqKukZ27g5Pdif3HPLcqdw9uzww2HKvKCr/pnCwmj/O p/QeTslkqUo2kfpIyftIIva8uZ5rMCKcxN5ISXkE59NLzh/kfqIcumIqlrs4MoPldeO9KyiOEv eyS1isI0pxBINehcrMC7wDlfz7XBAsogVvX5M7kHpUtNKA0BIJVqZQWTuRicp5ZNz7BV1xIDHm o7E= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs04.rockwellcollins.com with ESMTP; 08 Sep 2020 17:13:15 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id EAD9820051; Tue, 8 Sep 2020 17:13:13 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 17:12:56 -0500 Message-Id: <20200908221256.126984-4-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908221256.126984-1-brandon.maier@rockwellcollins.com> References: <20200908221256.126984-1-brandon.maier@rockwellcollins.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x v2 4/4] package/systemd: Backport fix for makefs X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter@korsgaard.com, Brandon Maier , "Yann E . MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The systemd fstab option "x-systemd.makefs" will fail to work, and throw an error that it can't find a device named "" (an empty string). Backport this fix from systemd v245. Signed-off-by: Brandon Maier Reviewed-by: Yann E. MORIN --- v2: - Add "backport from" and SoB ...0004-makefs-strdup-arguments-to-mkfs.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/systemd/0004-makefs-strdup-arguments-to-mkfs.patch diff --git a/package/systemd/0004-makefs-strdup-arguments-to-mkfs.patch b/package/systemd/0004-makefs-strdup-arguments-to-mkfs.patch new file mode 100644 index 0000000000..140d741f63 --- /dev/null +++ b/package/systemd/0004-makefs-strdup-arguments-to-mkfs.patch @@ -0,0 +1,48 @@ +From c315b79fb43a4d921a533ba0c2cb303324887993 Mon Sep 17 00:00:00 2001 +From: Oliver Giles +Date: Thu, 13 Feb 2020 08:55:57 +0200 +Subject: [PATCH] makefs: strdup arguments to mkfs + +Don't pass values from argv[] directly to child process forked using +safe_fork, because it clears argv[]. strdup them first. + +[Brandon: backport from https://github.com/systemd/systemd/commit/c315b79fb43a4d921a533ba0c2cb303324887993] +Signed-off-by: Brandon Maier +--- + src/partition/makefs.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/partition/makefs.c b/src/partition/makefs.c +index 951989cbb6..d73d67c4e8 100644 +--- a/src/partition/makefs.c ++++ b/src/partition/makefs.c +@@ -41,8 +41,7 @@ static int makefs(const char *type, const char *device) { + } + + static int run(int argc, char *argv[]) { +- const char *device, *type; +- _cleanup_free_ char *detected = NULL; ++ _cleanup_free_ char *device = NULL, *type = NULL, *detected = NULL; + struct stat st; + int r; + +@@ -52,8 +51,14 @@ static int run(int argc, char *argv[]) { + return log_error_errno(SYNTHETIC_ERRNO(EINVAL), + "This program expects two arguments."); + +- type = argv[1]; +- device = argv[2]; ++ /* type and device must be copied because makefs calls safe_fork, which clears argv[] */ ++ type = strdup(argv[1]); ++ if (!type) ++ return -ENOMEM; ++ ++ device = strdup(argv[2]); ++ if (!device) ++ return -ENOMEM; + + if (stat(device, &st) < 0) + return log_error_errno(errno, "Failed to stat \"%s\": %m", device); +-- +2.23.0 +