| 1 |
commit: 1f550c46e58f6d48b6072f50097e1c6d44a30485 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 6 15:24:08 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 6 15:24:08 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f550c46 |
| 7 |
|
| 8 |
sys-apps/systemd: fix segfault in systemd-sysctl |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/708462 |
| 11 |
Package-Manager: Portage-2.3.86_p1, Repoman-2.3.20_p43 |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
.../systemd/files/245-rc1-sysctl-segfault.patch | 23 ++++++++++++++++++++++ |
| 15 |
...md-245_rc1.ebuild => systemd-245_rc1-r1.ebuild} | 1 + |
| 16 |
2 files changed, 24 insertions(+) |
| 17 |
|
| 18 |
diff --git a/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch b/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..7618b2deba5 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch |
| 23 |
@@ -0,0 +1,23 @@ |
| 24 |
+From db99904bc8482efe556bb010a8b203a3e60ee37f Mon Sep 17 00:00:00 2001 |
| 25 |
+From: Yu Watanabe <watanabe.yu+github@×××××.com> |
| 26 |
+Date: Thu, 6 Feb 2020 19:13:11 +0900 |
| 27 |
+Subject: [PATCH] sysctl: fix segfault |
| 28 |
+ |
| 29 |
+Fixes #14801. |
| 30 |
+--- |
| 31 |
+ src/sysctl/sysctl.c | 2 +- |
| 32 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 33 |
+ |
| 34 |
+diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c |
| 35 |
+index bbcf0c43235..0cdb740d218 100644 |
| 36 |
+--- a/src/sysctl/sysctl.c |
| 37 |
++++ b/src/sysctl/sysctl.c |
| 38 |
+@@ -257,7 +257,7 @@ static int parse_file(OrderedHashmap **sysctl_options, const char *path, bool ig |
| 39 |
+ |
| 40 |
+ existing = ordered_hashmap_get(*sysctl_options, p); |
| 41 |
+ if (existing) { |
| 42 |
+- if (streq(value, existing->value)) { |
| 43 |
++ if (streq_ptr(value, existing->value)) { |
| 44 |
+ existing->ignore_failure = existing->ignore_failure || ignore_failure; |
| 45 |
+ continue; |
| 46 |
+ } |
| 47 |
|
| 48 |
diff --git a/sys-apps/systemd/systemd-245_rc1.ebuild b/sys-apps/systemd/systemd-245_rc1-r1.ebuild |
| 49 |
similarity index 99% |
| 50 |
rename from sys-apps/systemd/systemd-245_rc1.ebuild |
| 51 |
rename to sys-apps/systemd/systemd-245_rc1-r1.ebuild |
| 52 |
index 7bb75c3ee62..e889210fcbd 100644 |
| 53 |
--- a/sys-apps/systemd/systemd-245_rc1.ebuild |
| 54 |
+++ b/sys-apps/systemd/systemd-245_rc1-r1.ebuild |
| 55 |
@@ -186,6 +186,7 @@ src_prepare() { |
| 56 |
# Add local patches here |
| 57 |
PATCHES+=( |
| 58 |
"${FILESDIR}"/245-rc1-network-debug.patch |
| 59 |
+ "${FILESDIR}"/245-rc1-sysctl-segfault.patch |
| 60 |
) |
| 61 |
|
| 62 |
if ! use vanilla; then |
Archives