commit: 98fb3b88045ac64e8fd62c9e53e5845ee919fc5f Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Mar 6 19:19:36 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Mar 6 19:19:36 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98fb3b88
sys-apps/systemd: remove unused patches Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/files/245-rc1-network-debug.patch | 45 ---------------------- .../systemd/files/245-rc1-sysctl-segfault.patch | 23 ----------- 2 files changed, 68 deletions(-) diff --git a/sys-apps/systemd/files/245-rc1-network-debug.patch b/sys-apps/systemd/files/245-rc1-network-debug.patch deleted file mode 100644 index e65035f2185..00000000000 --- a/sys-apps/systemd/files/245-rc1-network-debug.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 01ec0028d97fa97d2e433659e24a1517b0e2382e Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <[email protected]> -Date: Wed, 5 Feb 2020 11:04:50 -0500 -Subject: [PATCH] network: remove unnecessary link->ifname from debug log - statements - -Since 98b0299479a68ffd414888368907fc776a46b82a, we log the interface -name automatically via log_link_debug(). - -Fixes: https://github.com/systemd/systemd/issues/14782 ---- - src/network/networkd-dhcp-server.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c -index a6dbe2e596c..bee75a6930e 100644 ---- a/src/network/networkd-dhcp-server.c -+++ b/src/network/networkd-dhcp-server.c -@@ -45,7 +45,7 @@ static int link_push_uplink_dns_to_dhcp_server(Link *link, sd_dhcp_server *s) { - size_t n_addresses = 0, n_allocated = 0; - unsigned i; - -- log_link_debug(link, "Copying DNS server information from %s", link->ifname); -+ log_link_debug(link, "Copying DNS server information from link"); - - if (!link->network) - return 0; -@@ -99,7 +99,7 @@ static int link_push_uplink_ntp_to_dhcp_server(Link *link, sd_dhcp_server *s) { - if (!link->network) - return 0; - -- log_link_debug(link, "Copying NTP server information from %s", link->ifname); -+ log_link_debug(link, "Copying NTP server information from link"); - - STRV_FOREACH(a, link->network->ntp) { - union in_addr_union ia; -@@ -148,7 +148,7 @@ static int link_push_uplink_sip_to_dhcp_server(Link *link, sd_dhcp_server *s) { - if (!link->network) - return 0; - -- log_link_debug(link, "Copying SIP server information from %s", link->ifname); -+ log_link_debug(link, "Copying SIP server information from link"); - - STRV_FOREACH(a, link->network->sip) { - union in_addr_union ia; diff --git a/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch b/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch deleted file mode 100644 index 7618b2deba5..00000000000 --- a/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch +++ /dev/null @@ -1,23 +0,0 @@ -From db99904bc8482efe556bb010a8b203a3e60ee37f Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <[email protected]> -Date: Thu, 6 Feb 2020 19:13:11 +0900 -Subject: [PATCH] sysctl: fix segfault - -Fixes #14801. ---- - src/sysctl/sysctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c -index bbcf0c43235..0cdb740d218 100644 ---- a/src/sysctl/sysctl.c -+++ b/src/sysctl/sysctl.c -@@ -257,7 +257,7 @@ static int parse_file(OrderedHashmap **sysctl_options, const char *path, bool ig - - existing = ordered_hashmap_get(*sysctl_options, p); - if (existing) { -- if (streq(value, existing->value)) { -+ if (streq_ptr(value, existing->value)) { - existing->ignore_failure = existing->ignore_failure || ignore_failure; - continue; - }
