From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1150434-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id CCB0D138350
for <garchives@archives.gentoo.org>; Fri, 6 Mar 2020 19:20:36 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 03408E083E;
Fri, 6 Mar 2020 19:20:36 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id C3AE2E083E
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Mar 2020 19:20:35 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BB65934EF11
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Mar 2020 19:20:33 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 98D2510A
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Mar 2020 19:20:31 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1583522376.98fb3b88045ac64e8fd62c9e53e5845ee919fc5f.floppym@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/systemd/files/245-rc1-network-debug.patch sys-apps/systemd/files/245-rc1-sysctl-segfault.patch
X-VCS-Directories: sys-apps/systemd/files/
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 98fb3b88045ac64e8fd62c9e53e5845ee919fc5f
X-VCS-Branch: master
Date: Fri, 6 Mar 2020 19:20:31 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 77c62e4e-c6d3-4c69-8b86-a638f8175e25
X-Archives-Hash: b78cf727c1c0e2224fd67cc5e5a6a28d
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 <floppym@gentoo.org>
-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 <watanabe.yu+github@gmail.com>
-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;
- }