* [Buildroot] [PATCH 2020.02.x 2/4] package/systemd: Fix patch numbering
2020-09-08 21:13 [Buildroot] [PATCH 2020.02.x 1/4] package/systemd: bump version to 244.4 Brandon Maier
@ 2020-09-08 21:13 ` Brandon Maier
2020-09-08 21:33 ` Yann E. MORIN
2020-09-08 21:13 ` [Buildroot] [PATCH 2020.02.x 3/4] package/systemd: Backport fix for network-generator Brandon Maier
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Brandon Maier @ 2020-09-08 21:13 UTC (permalink / raw)
To: buildroot
Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
---
...> 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
--
2.28.0
^ permalink raw reply [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2020.02.x 2/4] package/systemd: Fix patch numbering
2020-09-08 21:13 ` [Buildroot] [PATCH 2020.02.x 2/4] package/systemd: Fix patch numbering Brandon Maier
@ 2020-09-08 21:33 ` Yann E. MORIN
0 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2020-09-08 21:33 UTC (permalink / raw)
To: buildroot
Brandon, All,
On 2020-09-08 16:13 -0500, Brandon Maier spake thusly:
> Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
Actually, we added the libmicrohttpd patch after the rndom seed one, but
that is not important: renaming the random seed one guarantees the
de-facto ordering we have today, so:
Acked-by: Yann E. MORIN <yann.morin.1998@free.fr>
Regards,
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
> --
> 2.28.0
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 2020.02.x 3/4] package/systemd: Backport fix for network-generator
2020-09-08 21:13 [Buildroot] [PATCH 2020.02.x 1/4] package/systemd: bump version to 244.4 Brandon Maier
2020-09-08 21:13 ` [Buildroot] [PATCH 2020.02.x 2/4] package/systemd: Fix patch numbering Brandon Maier
@ 2020-09-08 21:13 ` Brandon Maier
2020-09-08 21:28 ` Yann E. MORIN
2020-09-08 21:13 ` [Buildroot] [PATCH 2020.02.x 4/4] package/systemd: Backport fix for makefs Brandon Maier
2020-09-08 21:29 ` [Buildroot] [PATCH 2020.02.x 1/4] package/systemd: bump version to 244.4 Yann E. MORIN
3 siblings, 1 reply; 7+ messages in thread
From: Brandon Maier @ 2020-09-08 21:13 UTC (permalink / raw)
To: 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 <brandon.maier@rockwellcollins.com>
---
...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 <watanabe.yu+github@gmail.com>
+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
+
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2020.02.x 3/4] package/systemd: Backport fix for network-generator
2020-09-08 21:13 ` [Buildroot] [PATCH 2020.02.x 3/4] package/systemd: Backport fix for network-generator Brandon Maier
@ 2020-09-08 21:28 ` Yann E. MORIN
0 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2020-09-08 21:28 UTC (permalink / raw)
To: buildroot
Brandon, All,
On 2020-09-08 16:13 -0500, Brandon Maier spake thusly:
> 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 <brandon.maier@rockwellcollins.com>
> ---
> ...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 <watanabe.yu+github@gmail.com>
> +Date: Thu, 12 Dec 2019 19:01:21 +0900
> +Subject: [PATCH 1/1] network-generator: allow empty hostname
> +
> +Fixes #14319.
Please adda pointer to the upstream commit that you are backporting, and
please add your own SoB line:
[Brandon: backport from https://github.com/systemd/systemd/commit/21a925a4ac7955e7d7e6cfd477e96d3a2aaee7db]
Signed-off-by: Your NAME <your@email>
Ditto your second patch.
Regards,
Yann E. MORIN.
> +---
> + 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
> +
> --
> 2.28.0
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH 2020.02.x 4/4] package/systemd: Backport fix for makefs
2020-09-08 21:13 [Buildroot] [PATCH 2020.02.x 1/4] package/systemd: bump version to 244.4 Brandon Maier
2020-09-08 21:13 ` [Buildroot] [PATCH 2020.02.x 2/4] package/systemd: Fix patch numbering Brandon Maier
2020-09-08 21:13 ` [Buildroot] [PATCH 2020.02.x 3/4] package/systemd: Backport fix for network-generator Brandon Maier
@ 2020-09-08 21:13 ` Brandon Maier
2020-09-08 21:29 ` [Buildroot] [PATCH 2020.02.x 1/4] package/systemd: bump version to 244.4 Yann E. MORIN
3 siblings, 0 replies; 7+ messages in thread
From: Brandon Maier @ 2020-09-08 21:13 UTC (permalink / raw)
To: 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 <brandon.maier@rockwellcollins.com>
---
...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 <ohw.giles@gmail.com>
+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
+
--
2.28.0
^ permalink raw reply related [flat|nested] 7+ messages in thread* [Buildroot] [PATCH 2020.02.x 1/4] package/systemd: bump version to 244.4
2020-09-08 21:13 [Buildroot] [PATCH 2020.02.x 1/4] package/systemd: bump version to 244.4 Brandon Maier
` (2 preceding siblings ...)
2020-09-08 21:13 ` [Buildroot] [PATCH 2020.02.x 4/4] package/systemd: Backport fix for makefs Brandon Maier
@ 2020-09-08 21:29 ` Yann E. MORIN
3 siblings, 0 replies; 7+ messages in thread
From: Yann E. MORIN @ 2020-09-08 21:29 UTC (permalink / raw)
To: buildroot
Brandon, All,
On 2020-09-08 16:13 -0500, Brandon Maier spake thusly:
> Signed-off-by: Brandon Maier <brandon.maier@rockwellcollins.com>
> ---
> 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
Acked-by: Yann E. MORIN <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> 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
> --
> 2.28.0
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 7+ messages in thread