1 |
commit: 2948b4feefa5cbdccf406c2575b2bc80ad4a0808 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun May 27 12:00:54 2018 +0000 |
4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 27 16:09:40 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2948b4fe |
7 |
|
8 |
sys-apps/systemd: remove unused patches |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/8609 |
11 |
|
12 |
...o-not-try-to-close-already-closed-fd-8392.patch | 26 ------------- |
13 |
...e-do-not-free-heap-allocated-strings-8391.patch | 44 ---------------------- |
14 |
...-check-for-address-to-keep-interface-8458.patch | 37 ------------------ |
15 |
3 files changed, 107 deletions(-) |
16 |
|
17 |
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 |
18 |
deleted file mode 100644 |
19 |
index c39575c62b6..00000000000 |
20 |
--- a/sys-apps/systemd/files/238-0001-sd-bus-do-not-try-to-close-already-closed-fd-8392.patch |
21 |
+++ /dev/null |
22 |
@@ -1,26 +0,0 @@ |
23 |
-From 5681f772d7bc8226cb10bfc7f9fba0a29e34a54d Mon Sep 17 00:00:00 2001 |
24 |
-From: Yu Watanabe <watanabe.yu+github@×××××.com> |
25 |
-Date: Thu, 8 Mar 2018 22:19:35 +0900 |
26 |
-Subject: [PATCH 1/2] sd-bus: do not try to close already closed fd (#8392) |
27 |
- |
28 |
-Fixes #8376, which is introduced by 2b33ab0957f453a06b58e4bee482f2c2d4e100c1. |
29 |
---- |
30 |
- src/libsystemd/sd-bus/bus-socket.c | 2 -- |
31 |
- 1 file changed, 2 deletions(-) |
32 |
- |
33 |
-diff --git a/src/libsystemd/sd-bus/bus-socket.c b/src/libsystemd/sd-bus/bus-socket.c |
34 |
-index b5160cff6..166fba157 100644 |
35 |
---- a/src/libsystemd/sd-bus/bus-socket.c |
36 |
-+++ b/src/libsystemd/sd-bus/bus-socket.c |
37 |
-@@ -960,8 +960,6 @@ int bus_socket_exec(sd_bus *b) { |
38 |
- if (r == 0) { |
39 |
- /* Child */ |
40 |
- |
41 |
-- safe_close(s[0]); |
42 |
-- |
43 |
- if (rearrange_stdio(s[1], s[1], STDERR_FILENO) < 0) |
44 |
- _exit(EXIT_FAILURE); |
45 |
- |
46 |
--- |
47 |
-2.16.2 |
48 |
- |
49 |
|
50 |
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 |
51 |
deleted file mode 100644 |
52 |
index 3ee2527f77d..00000000000 |
53 |
--- a/sys-apps/systemd/files/238-0002-core-do-not-free-heap-allocated-strings-8391.patch |
54 |
+++ /dev/null |
55 |
@@ -1,44 +0,0 @@ |
56 |
-From 84c5e8010042788a03cff680592b37257b2a6de0 Mon Sep 17 00:00:00 2001 |
57 |
-From: Yu Watanabe <watanabe.yu+github@×××××.com> |
58 |
-Date: Thu, 8 Mar 2018 22:21:54 +0900 |
59 |
-Subject: [PATCH 2/2] core: do not free heap-allocated strings (#8391) |
60 |
- |
61 |
-Fixes #8387. |
62 |
---- |
63 |
- src/core/mount-setup.c | 6 ++++-- |
64 |
- 1 file changed, 4 insertions(+), 2 deletions(-) |
65 |
- |
66 |
-diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c |
67 |
-index 536c17b4d..9c27972af 100644 |
68 |
---- a/src/core/mount-setup.c |
69 |
-+++ b/src/core/mount-setup.c |
70 |
-@@ -248,6 +248,7 @@ int mount_setup_early(void) { |
71 |
- |
72 |
- int mount_cgroup_controllers(char ***join_controllers) { |
73 |
- _cleanup_set_free_free_ Set *controllers = NULL; |
74 |
-+ bool has_argument = !!join_controllers; |
75 |
- int r; |
76 |
- |
77 |
- if (!cg_is_legacy_wanted()) |
78 |
-@@ -255,7 +256,7 @@ int mount_cgroup_controllers(char ***join_controllers) { |
79 |
- |
80 |
- /* Mount all available cgroup controllers that are built into the kernel. */ |
81 |
- |
82 |
-- if (!join_controllers) |
83 |
-+ if (!has_argument) |
84 |
- /* The defaults: |
85 |
- * mount "cpu" + "cpuacct" together, and "net_cls" + "net_prio". |
86 |
- * |
87 |
-@@ -300,7 +301,8 @@ int mount_cgroup_controllers(char ***join_controllers) { |
88 |
- |
89 |
- t = set_remove(controllers, *i); |
90 |
- if (!t) { |
91 |
-- free(*i); |
92 |
-+ if (has_argument) |
93 |
-+ free(*i); |
94 |
- continue; |
95 |
- } |
96 |
- } |
97 |
--- |
98 |
-2.16.2 |
99 |
- |
100 |
|
101 |
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 |
102 |
deleted file mode 100644 |
103 |
index 693d67152ea..00000000000 |
104 |
--- a/sys-apps/systemd/files/238-0003-udev-net-id-Fix-check-for-address-to-keep-interface-8458.patch |
105 |
+++ /dev/null |
106 |
@@ -1,37 +0,0 @@ |
107 |
-From 8eebb6a9e5e74ec0ef40902e2da53d24559b94a4 Mon Sep 17 00:00:00 2001 |
108 |
-From: Filipe Brandenburger <filbranden@××××××.com> |
109 |
-Date: Thu, 15 Mar 2018 10:42:38 -0700 |
110 |
-Subject: [PATCH] udev/net-id: Fix check for address to keep interface names |
111 |
- stable (#8458) |
112 |
- |
113 |
-This was a bug inadvertently added by commit 73fc96c8ac0aa9. |
114 |
- |
115 |
-The intent of the check is to "match slot address with device by |
116 |
-stripping the function" (as the comment above states it), for example |
117 |
-match network device PCI address 0000:05:00.0 (including a .0 for |
118 |
-function) to PCI slot address 0000:05:00, but changing that to a streq() |
119 |
-call prevented the match. |
120 |
- |
121 |
-Change that to startswith(), which should both fix the bug and make the |
122 |
-intent of the check more clear and prevent unintentional bugs from being |
123 |
-introduced by future refactorings. |
124 |
---- |
125 |
- src/udev/udev-builtin-net_id.c | 2 +- |
126 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
127 |
- |
128 |
-diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c |
129 |
-index 36994360c7..6efa712930 100644 |
130 |
---- a/src/udev/udev-builtin-net_id.c |
131 |
-+++ b/src/udev/udev-builtin-net_id.c |
132 |
-@@ -297,7 +297,7 @@ static int dev_pci_slot(struct udev_device *dev, struct netnames *names) { |
133 |
- if (snprintf_ok(str, sizeof str, "%s/%s/address", slots, dent->d_name) && |
134 |
- read_one_line_file(str, &address) >= 0) |
135 |
- /* match slot address with device by stripping the function */ |
136 |
-- if (streq(address, udev_device_get_sysname(names->pcidev))) |
137 |
-+ if (startswith(udev_device_get_sysname(names->pcidev), address)) |
138 |
- hotplug_slot = i; |
139 |
- |
140 |
- if (hotplug_slot > 0) |
141 |
--- |
142 |
-2.16.2 |
143 |
- |