From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 95B22138330 for ; Sun, 27 May 2018 16:11:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CB6EE09A7; Sun, 27 May 2018 16:11:14 +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 D16D9E09AB for ; Sun, 27 May 2018 16:11:13 +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 86D16335CBB for ; Sun, 27 May 2018 16:11:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DED322BD for ; Sun, 27 May 2018 16:11:07 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1527437380.2948b4feefa5cbdccf406c2575b2bc80ad4a0808.bman@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/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch X-VCS-Directories: sys-apps/systemd/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 2948b4feefa5cbdccf406c2575b2bc80ad4a0808 X-VCS-Branch: master Date: Sun, 27 May 2018 16:11:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 10a3e3a7-ea7f-49d1-9cca-d2bbcff062b3 X-Archives-Hash: f7c1ab7b0941db8c35ea72b1cceb4797 commit: 2948b4feefa5cbdccf406c2575b2bc80ad4a0808 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sun May 27 12:00:54 2018 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Sun May 27 16:09:40 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2948b4fe sys-apps/systemd: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/8609 ...o-not-try-to-close-already-closed-fd-8392.patch | 26 ------------- ...e-do-not-free-heap-allocated-strings-8391.patch | 44 ---------------------- ...-check-for-address-to-keep-interface-8458.patch | 37 ------------------ 3 files changed, 107 deletions(-) diff --git a/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch b/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch deleted file mode 100644 index c39575c62b6..00000000000 --- a/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5681f772d7bc8226cb10bfc7f9fba0a29e34a54d Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Thu, 8 Mar 2018 22:19:35 +0900 -Subject: [PATCH 1/2] sd-bus: do not try to close already closed fd (#8392) - -Fixes #8376, which is introduced by 2b33ab0957f453a06b58e4bee482f2c2d4e100c1. ---- - src/libsystemd/sd-bus/bus-socket.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c -index b5160cff6..166fba157 100644 ---- a/src/libsystemd/sd-bus/bus-socket.c -+++ b/src/libsystemd/sd-bus/bus-socket.c -@@ -960,8 +960,6 @@ int bus_socket_exec(sd_bus *b) { - if (r == 0) { - /* Child */ - -- safe_close(s[0]); -- - if (rearrange_stdio(s[1], s[1], STDERR_FILENO) < 0) - _exit(EXIT_FAILURE); - --- -2.16.2 - diff --git a/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch b/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch deleted file mode 100644 index 3ee2527f77d..00000000000 --- a/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 84c5e8010042788a03cff680592b37257b2a6de0 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Thu, 8 Mar 2018 22:21:54 +0900 -Subject: [PATCH 2/2] core: do not free heap-allocated strings (#8391) - -Fixes #8387. ---- - src/core/mount-setup.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c -index 536c17b4d..9c27972af 100644 ---- a/src/core/mount-setup.c -+++ b/src/core/mount-setup.c -@@ -248,6 +248,7 @@ int mount_setup_early(void) { - - int mount_cgroup_controllers(char ***join_controllers) { - _cleanup_set_free_free_ Set *controllers = NULL; -+ bool has_argument = !!join_controllers; - int r; - - if (!cg_is_legacy_wanted()) -@@ -255,7 +256,7 @@ int mount_cgroup_controllers(char ***join_controllers) { - - /* Mount all available cgroup controllers that are built into the kernel. */ - -- if (!join_controllers) -+ if (!has_argument) - /* The defaults: - * mount "cpu" + "cpuacct" together, and "net_cls" + "net_prio". - * -@@ -300,7 +301,8 @@ int mount_cgroup_controllers(char ***join_controllers) { - - t = set_remove(controllers, *i); - if (!t) { -- free(*i); -+ if (has_argument) -+ free(*i); - continue; - } - } --- -2.16.2 - diff --git a/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch b/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch deleted file mode 100644 index 693d67152ea..00000000000 --- a/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8eebb6a9e5e74ec0ef40902e2da53d24559b94a4 Mon Sep 17 00:00:00 2001 -From: Filipe Brandenburger -Date: Thu, 15 Mar 2018 10:42:38 -0700 -Subject: [PATCH] udev/net-id: Fix check for address to keep interface names - stable (#8458) - -This was a bug inadvertently added by commit 73fc96c8ac0aa9. - -The intent of the check is to "match slot address with device by -stripping the function" (as the comment above states it), for example -match network device PCI address 0000:05:00.0 (including a .0 for -function) to PCI slot address 0000:05:00, but changing that to a streq() -call prevented the match. - -Change that to startswith(), which should both fix the bug and make the -intent of the check more clear and prevent unintentional bugs from being -introduced by future refactorings. ---- - src/udev/udev-builtin-net_id.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c -index 36994360c7..6efa712930 100644 ---- a/src/udev/udev-builtin-net_id.c -+++ b/src/udev/udev-builtin-net_id.c -@@ -297,7 +297,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { - if (snprintf_ok(str, sizeof str, "%s/%s/address", slots, dent->d_name) && - read_one_line_file(str, &address) >= 0) - /* match slot address with device by stripping the function */ -- if (streq(address, udev_device_get_sysname(names->pcidev))) -+ if (startswith(udev_device_get_sysname(names->pcidev), address)) - hotplug_slot = i; - - if (hotplug_slot > 0) --- -2.16.2 -