From patchwork Tue Sep 8 21:13:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360090 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=Up6aQTjy; 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 4BmHtw0pfCz9sRK for ; Wed, 9 Sep 2020 07:13:28 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A2E8A835F5; Tue, 8 Sep 2020 21:13:26 +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 a2E2yXsJvjVA; Tue, 8 Sep 2020 21:13:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 161DF8072C; Tue, 8 Sep 2020 21:13:26 +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 1B2CF1BF3AD for ; Tue, 8 Sep 2020 21:13:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1038D20797 for ; Tue, 8 Sep 2020 21:13:25 +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 5AUmNjQFswpb for ; Tue, 8 Sep 2020 21:13:23 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs05.rockwellcollins.com (da1vs05.rockwellcollins.com [205.175.227.130]) by silver.osuosl.org (Postfix) with ESMTPS id BCC81204B5 for ; Tue, 8 Sep 2020 21:13:23 +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=/u2E/yUgiqqs6jGv57ore7VL3gdWEiJnh+8gEilSVUg=; b=Up6aQTjyDvidt4KxBIFwutax2vMhCxuwiITThH2PCqVzn8EfsaXBNeVl NA8C+Y4BuZk+8zs7vADsNa45WSlfTyJa3m23g9l+SwD0HeIGWqdKxvWYf rHZdmgrbHbQTcI9zvLGa/CgqqwzuinDFQcu1eUvT9e7nGhNp0wCXHY1wy GwcQ8y9vFkKQCnP7wqwSX7a+1UpzfT+IyZXGseMKD/zvQCf2re76spvCG zTiwxj8V1dtBM2uFeE/oBZYOMk/v6fDVSCotIwHB0HB/9QFkESPe0QQXq vx22EhF0JVNBzgn/GP15/45Fl7N0TF1UQbUSST/9+filKtPYeevPBFN5Z g==; IronPort-SDR: oxpeIHYGvo+0tyAP4G8GAnMp4tS7l9dbGL90Vg5YHOyS54h6qSVYfXQUsb5fty3IyIk2ZYLtrL dxWU2ePSKbyNtHGHKrnExuiJ7uBXV3U9xE6xR1yxBJkq8Z62W/ozID1VfX2BRJjjsT7QRK8Wpp bSTAnp1yMmeDoLwTA+MQHB1GOgXG4TXUMjfLh/NvMnNhnvz3AIHvREqYKXQJ62gGN0FXflEHMS 6BOc/la6lc89wbS47qny0cWs7P7tWFy09+uhtVIgLt2+QVwPh6TgKP8GE8OOYdvBcU0yNsz0wz /hc= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs05.rockwellcollins.com with ESMTP; 08 Sep 2020 16:13:23 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 0390320051; Tue, 8 Sep 2020 16:13:21 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 16:13:10 -0500 Message-Id: <20200908211313.107946-1-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x 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 --- 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 21:13:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360091 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=njyskJYz; 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 4BmHv04rCLz9sT6 for ; Wed, 9 Sep 2020 07:13:32 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EE1268702D; Tue, 8 Sep 2020 21:13:30 +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 0KIMNt8+-uhy; Tue, 8 Sep 2020 21:13:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 24BC684627; Tue, 8 Sep 2020 21:13:30 +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 50B821BF3AD for ; Tue, 8 Sep 2020 21:13:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 37E3720797 for ; Tue, 8 Sep 2020 21:13:29 +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 DjRWRf4ZiXUk for ; Tue, 8 Sep 2020 21:13:28 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from da1vs05.rockwellcollins.com (da1vs05.rockwellcollins.com [205.175.227.130]) by silver.osuosl.org (Postfix) with ESMTPS id 3E515204B5 for ; Tue, 8 Sep 2020 21:13:28 +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=H6cj3jlVs3kLwt1HRtmlAxhhgivc2s/XLKxVqouy2Gs=; b=njyskJYzNL5z5yBfvatphH4O4dm4TPDMJw0ihIIu/rw1RYPD0VAGvZRh sIBVcExhIAlsOzIx0VQyRUo6yyX6q+4vhQp1xa6e9n98RzYnvO8pIY9rh nCrMtqyMTuuh/0vhrgDHGJtN0JZ63oLoUdT4PWLulUSqgOXonE/uT/Em6 c7qOdzB9eiMWFO36OFSp0QIDfj9DsHh5wJw1bvbuw+ux/2a+9mkomSwSv DUWc66pAEUhb1n30JNFXXgVbI44X44F/AoCt3pg14M4E7BSUSb76xOX9t iN58tweBAPN/zvJRVeGqpa4AhDVney4h/HZpxKzqOPge87AZTr5oxQqSC A==; IronPort-SDR: 1LmRj8IOjjTmzAnRoU+r8b95UpZAAEEq8cBVkNNXuVFEI7JjceADcJQy5pdDweVXZ51nImPE/B Qcmj9Ue4TDsqDlf5R4mxV+81wQ05Ey6a0TkepZce4xks9meHS3DXYWTIFB+wmtiEv3dXsYq9K2 /kqMp5fcOphxU9ASfLXZmja5srkjoSsBTsoq3F5uh+cGEIrLS76S3BeNF5MN7GWWZYMmhTNCxc 8bTwIDoCTugqWztl3J/ipME5/hRLuf27Y6FUI+7qD4c1+rHkF+WaEpaAHmOiMNX3l33UeImhxH 5Gw= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs05.rockwellcollins.com with ESMTP; 08 Sep 2020 16:13:28 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 0DB0320092; Tue, 8 Sep 2020 16:13:26 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 16:13:11 -0500 Message-Id: <20200908211313.107946-2-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908211313.107946-1-brandon.maier@rockwellcollins.com> References: <20200908211313.107946-1-brandon.maier@rockwellcollins.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x 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 --- ...> 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 21:13:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360093 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.136; helo=silver.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=Ed/oYydz; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BmHv86sMvz9sRK for ; Wed, 9 Sep 2020 07:13:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 51E6B204B5; Tue, 8 Sep 2020 21:13:37 +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 SlnwMduqmqYQ; Tue, 8 Sep 2020 21:13:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 425D720797; Tue, 8 Sep 2020 21:13:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 391A91BF3AD for ; Tue, 8 Sep 2020 21:13:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3277C86CB4 for ; Tue, 8 Sep 2020 21:13:33 +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 IgRI2tgAxL+E for ; Tue, 8 Sep 2020 21:13:31 +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 whitealder.osuosl.org (Postfix) with ESMTPS id 7E39987040 for ; Tue, 8 Sep 2020 21:13:31 +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=+W/dlKrnVBduuQagC1cek0RJ7HyJ4iX5bmh4sSTYDgU=; b=Ed/oYydzcxDaoQSkF7EmZgFEVSbeu9UiZcs6oD4jgLrGfApWMShU186Z ZPozczfx4mIB+scHVxCow9psfL1bn9vJhY62nOyvm2QkCGoHulN9WWMiO zI4NN1dl3h8gGJ8EcpkW8GjTgHP6VXx9JEV7pUBhPgIYbD0f7Vti41FCr 69nwEHCNk4JXO4ZR1B5j0f7dDP7iEXHkq8++HIA7iRFjxH1skYrB2msx3 4qHYIDrprTC2wy/j2XuFjLhiLn5qZAATlD62GelGHH166J3z0fUwPxVCU iiGqeiR1NjTpkCgBDkzzkLlE4A8iywMj7EkeNrKuVBYPEZvU2AZr/0IUz g==; IronPort-SDR: +qV8bzC1XNnPYStCCRfT0eazQfcpZ+hvW9Xc324ZXR9Yk0JM2hyaoQEkcOlDp8AV7ngIXVPZbR NO759KZd/uK+njLZJv7d3ujDtmc7+wJJd7/83RYGsk6DkFo/z2T/lcn6M2U90g/c4nY8yS41Dw n8ZH6scr3qKs8Ih9ohanVvwmChQDbqFgyI+ft/Fffc/zty+CxN6hcz6tQsk4f4rNkYKnh3H8kI 4lpkjon9pacqRIYkugaaWODKEkT7YqBTyw2c/SSm51j4yhUYVC1JTyFXEPHfh3QljQ8FmV+mhw Lx8= Received: from ofwda1n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.227.14]) by da1vs03.rockwellcollins.com with ESMTP; 08 Sep 2020 16:13:30 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id BB32E20051; Tue, 8 Sep 2020 16:13:29 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 16:13:12 -0500 Message-Id: <20200908211313.107946-3-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908211313.107946-1-brandon.maier@rockwellcollins.com> References: <20200908211313.107946-1-brandon.maier@rockwellcollins.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x 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 --- ...twork-generator-allow-empty-hostname.patch | 41 +++++++++++++++++++ 1 file changed, 41 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..37eb91bfaf --- /dev/null +++ b/package/systemd/0003-network-generator-allow-empty-hostname.patch @@ -0,0 +1,41 @@ +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. +--- + 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 21:13:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brandon Maier X-Patchwork-Id: 1360092 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=suo7nCgc; 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 4BmHv73GF3z9sRK for ; Wed, 9 Sep 2020 07:13:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id C0D4687415; Tue, 8 Sep 2020 21:13:37 +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 54AYEkPFa7oE; Tue, 8 Sep 2020 21:13:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 2E59C8740F; Tue, 8 Sep 2020 21:13:37 +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 59FC81BF3AD for ; Tue, 8 Sep 2020 21:13:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 54E858740F for ; Tue, 8 Sep 2020 21:13:35 +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 6BcjDLARIHAI for ; Tue, 8 Sep 2020 21:13:33 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from ch3vs05.rockwellcollins.com (ch3vs05.rockwellcollins.com [205.175.226.130]) by hemlock.osuosl.org (Postfix) with ESMTPS id 41B02873F0 for ; Tue, 8 Sep 2020 21:13:33 +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=zcLjxAP6kZCZf0F4HHgtqIMCr0x2yEtXZR9EMkALFHs=; b=suo7nCgc430C3JjqsjRt2t+6ENldVdIeem/mDStp0KrJIryLKNoXKGvO JJ1di7Y1cWf7kQwd5KQX9Hb9YVEeap/PWFirMHbow5pR7ZH3WhG9kQS7t gQvl2Z8wjJ2+HE1oYfuZSCwdAPg7+0EwJySJuVDpiRa9FBDZj424rhP9u SraWh6MJWazs/Qe8xPID6dhHDMiJIoPYBACDejr2+TBlVCAPTFk42n1Qw l1i9YO7mqu0wP4j4+TwVk1bq6yOnvE5stbl8uzHJ1xqm+oE0VWqBOBl1j g2AatG5QcQgqyd5rnpngLFEX8adtyM8u7nu/fZfgrd/7nUG/5SSl78EpU g==; IronPort-SDR: M63WNfgwzvS2mNHc6J7QFxjTgiOnToqmqH1AxuH7rG0uM4PljQeHcL6KXY2ZUYRv/vdJRkW+BE 31VIO9H0XNEvpGaaaiNRAOPJlaj7sxZSP4t0oSxJG1bZXEQ12g4B9C7cNTJiiueMdzm0MZ6ykV UmcYU9JS7+KXi87KoQs7P6PiL66E6GeSs3rqhZ57TaDBM9FVIRv/rBw+3mc34+GWy+NpxT6Tdu BCPqFJBVcCUq0mYSduQWnDofLmmQFOHZXJIjipofD2LVtk/AK/CJmkoggFQSN706mQ3kcSt83K GkU= Received: from ofwch3n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs05.rockwellcollins.com with ESMTP; 08 Sep 2020 16:13:32 -0500 X-Received: from righttwix.rockwellcollins.com (righttwix.rockwellcollins.com [192.168.141.218]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 9849820051; Tue, 8 Sep 2020 16:13:31 -0500 (CDT) From: Brandon Maier To: buildroot@buildroot.org Date: Tue, 8 Sep 2020 16:13:13 -0500 Message-Id: <20200908211313.107946-4-brandon.maier@rockwellcollins.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200908211313.107946-1-brandon.maier@rockwellcollins.com> References: <20200908211313.107946-1-brandon.maier@rockwellcollins.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2020.02.x 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 --- ...0004-makefs-strdup-arguments-to-mkfs.patch | 45 +++++++++++++++++++ 1 file changed, 45 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..5134941a71 --- /dev/null +++ b/package/systemd/0004-makefs-strdup-arguments-to-mkfs.patch @@ -0,0 +1,45 @@ +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. +--- + 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 +