diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
commit | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch) | |
tree | 021998302365c5652e37824b6c26d4d969a62055 /sys-apps/systemd/files | |
parent | 70b82ae359a5538711e103b0e8dfb92654296644 (diff) |
gentoo resync : 03.11.2018
Diffstat (limited to 'sys-apps/systemd/files')
-rw-r--r-- | sys-apps/systemd/files/238-initctl.patch | 46 | ||||
-rw-r--r-- | sys-apps/systemd/files/238-libmount-include.patch | 72 | ||||
-rw-r--r-- | sys-apps/systemd/files/238-nspawn-wait.patch | 83 | ||||
-rw-r--r-- | sys-apps/systemd/files/238-sparc-raw-clone.patch | 42 | ||||
-rw-r--r-- | sys-apps/systemd/files/238-timesync-connection.patch | 49 |
5 files changed, 0 insertions, 292 deletions
diff --git a/sys-apps/systemd/files/238-initctl.patch b/sys-apps/systemd/files/238-initctl.patch deleted file mode 100644 index 399916977433..000000000000 --- a/sys-apps/systemd/files/238-initctl.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4d8c7c1b3a5feebca948a3b8663f5be887b57731 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Fri, 30 Mar 2018 11:00:17 -0400 -Subject: [PATCH] units: initctl: move the fifo to /run/initctl to match - sysvinit - -The fifo location was moved in sysvinit-2.89. - -http://git.savannah.nongnu.org/cgit/sysvinit.git/commit/?id=80dbcf3de3c1b83aeaa713a8fe5b8d35d8649af2 ---- - units/systemd-initctl.service.in | 2 +- - units/systemd-initctl.socket | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/units/systemd-initctl.service.in b/units/systemd-initctl.service.in -index 6cfed3da11f..2b4b957dce3 100644 ---- a/units/systemd-initctl.service.in -+++ b/units/systemd-initctl.service.in -@@ -8,7 +8,7 @@ - # (at your option) any later version. - - [Unit] --Description=/dev/initctl Compatibility Daemon -+Description=initctl Compatibility Daemon - Documentation=man:systemd-initctl.service(8) - DefaultDependencies=no - -diff --git a/units/systemd-initctl.socket b/units/systemd-initctl.socket -index 61f877ba7d2..9d975799081 100644 ---- a/units/systemd-initctl.socket -+++ b/units/systemd-initctl.socket -@@ -8,12 +8,12 @@ - # (at your option) any later version. - - [Unit] --Description=/dev/initctl Compatibility Named Pipe -+Description=initctl Compatibility Named Pipe - Documentation=man:systemd-initctl.service(8) - DefaultDependencies=no - Before=sockets.target - - [Socket] --ListenFIFO=/run/systemd/initctl/fifo -+ListenFIFO=/run/initctl - Symlinks=/dev/initctl - SocketMode=0600 diff --git a/sys-apps/systemd/files/238-libmount-include.patch b/sys-apps/systemd/files/238-libmount-include.patch deleted file mode 100644 index 6a02dff65e40..000000000000 --- a/sys-apps/systemd/files/238-libmount-include.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 227b8a762fea1458547be2cdf0e6e4aac0079730 Mon Sep 17 00:00:00 2001 -From: Michael Olbrich <m.olbrich@pengutronix.de> -Date: Mon, 26 Mar 2018 17:34:53 +0200 -Subject: [PATCH] core: don't include libmount.h in a header file (#8580) - -linux/fs.h sys/mount.h, libmount.h and missing.h all include MS_* -definitions. - -To avoid problems, only one of linux/fs.h, sys/mount.h and libmount.h -should be included. And missing.h must be included last. - -Without this, building systemd may fail with: - -In file included from [...]/libmount/libmount.h:31:0, - from ../systemd-238/src/core/manager.h:23, - from ../systemd-238/src/core/emergency-action.h:37, - from ../systemd-238/src/core/unit.h:34, - from ../systemd-238/src/core/dbus-timer.h:25, - from ../systemd-238/src/core/timer.c:26: -[...]/sys/mount.h:57:2: error: expected identifier before numeric constant ---- - src/core/dbus-execute.c | 1 + - src/core/manager.h | 3 ++- - src/core/mount.c | 2 ++ - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/core/dbus-execute.c b/src/core/dbus-execute.c -index 7344623ebf6..c342093bca4 100644 ---- a/src/core/dbus-execute.c -+++ b/src/core/dbus-execute.c -@@ -18,6 +18,7 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - -+#include <sys/mount.h> - #include <sys/prctl.h> - #include <stdio_ext.h> - -diff --git a/src/core/manager.h b/src/core/manager.h -index 28c5da225b1..e09e0cdf5e9 100644 ---- a/src/core/manager.h -+++ b/src/core/manager.h -@@ -20,7 +20,6 @@ - along with systemd; If not, see <http://www.gnu.org/licenses/>. - ***/ - --#include <libmount.h> - #include <stdbool.h> - #include <stdio.h> - -@@ -34,6 +33,8 @@ - #include "list.h" - #include "ratelimit.h" - -+struct libmnt_monitor; -+ - /* Enforce upper limit how many names we allow */ - #define MANAGER_MAX_NAMES 131072 /* 128K */ - -diff --git a/src/core/mount.c b/src/core/mount.c -index 0e755da5c02..0154ebda5d6 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -23,6 +23,8 @@ - #include <stdio.h> - #include <sys/epoll.h> - -+#include <libmount.h> -+ - #include "sd-messages.h" - - #include "alloc-util.h" diff --git a/sys-apps/systemd/files/238-nspawn-wait.patch b/sys-apps/systemd/files/238-nspawn-wait.patch deleted file mode 100644 index a740e8933453..000000000000 --- a/sys-apps/systemd/files/238-nspawn-wait.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 7511655807e90aa33ea7b71991401a79ec36bb41 Mon Sep 17 00:00:00 2001 -From: Philip Sequeira <phsequei@gmail.com> -Date: Thu, 5 Apr 2018 14:04:27 +0000 -Subject: [PATCH] nspawn: wait for network namespace creation before interface - setup (#8633) - -Otherwise, network interfaces can be "moved" into the container's -namespace while it's still the same as the host namespace, in which case -e.g. host0 for a veth ends up on the host side instead of inside the -container. - -Regression introduced in 0441378080489e4ab6704cd0a2d78cb1ceaca899. - -Fixes #8599. ---- - src/nspawn/nspawn.c | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) - -diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 810f1247ea2..a5bc50c1f4c 100644 ---- a/src/nspawn/nspawn.c -+++ b/src/nspawn/nspawn.c -@@ -2329,6 +2329,9 @@ static int inner_child( - r = unshare(CLONE_NEWNET); - if (r < 0) - return log_error_errno(errno, "Failed to unshare network namespace: %m"); -+ -+ /* Tell the parent that it can setup network interfaces. */ -+ (void) barrier_place(barrier); /* #3 */ - } - - r = mount_sysfs(NULL, arg_mount_settings); -@@ -2337,7 +2340,7 @@ static int inner_child( - - /* Wait until we are cgroup-ified, so that we - * can mount the right cgroup path writable */ -- if (!barrier_place_and_sync(barrier)) { /* #3 */ -+ if (!barrier_place_and_sync(barrier)) { /* #4 */ - log_error("Parent died too early"); - return -ESRCH; - } -@@ -2448,7 +2451,7 @@ static int inner_child( - /* Let the parent know that we are ready and - * wait until the parent is ready with the - * setup, too... */ -- if (!barrier_place_and_sync(barrier)) { /* #4 */ -+ if (!barrier_place_and_sync(barrier)) { /* #5 */ - log_error("Parent died too early"); - return -ESRCH; - } -@@ -3533,6 +3536,14 @@ static int run(int master, - - if (arg_private_network) { - -+ if (!arg_network_namespace_path) { -+ /* Wait until the child has unshared its network namespace. */ -+ if (!barrier_place_and_sync(&barrier)) { /* #3 */ -+ log_error("Child died too early"); -+ return -ESRCH; -+ } -+ } -+ - r = move_network_interfaces(*pid, arg_network_interfaces); - if (r < 0) - return r; -@@ -3656,7 +3667,7 @@ static int run(int master, - * its setup (including cgroup-ification), and that - * the child can now hand over control to the code to - * run inside the container. */ -- (void) barrier_place(&barrier); /* #3 */ -+ (void) barrier_place(&barrier); /* #4 */ - - /* Block SIGCHLD here, before notifying child. - * process_pty() will handle it with the other signals. */ -@@ -3684,7 +3695,7 @@ static int run(int master, - return r; - - /* Let the child know that we are ready and wait that the child is completely ready now. */ -- if (!barrier_place_and_sync(&barrier)) { /* #4 */ -+ if (!barrier_place_and_sync(&barrier)) { /* #5 */ - log_error("Child died too early."); - return -ESRCH; - } diff --git a/sys-apps/systemd/files/238-sparc-raw-clone.patch b/sys-apps/systemd/files/238-sparc-raw-clone.patch deleted file mode 100644 index 736a498e918c..000000000000 --- a/sys-apps/systemd/files/238-sparc-raw-clone.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e4aa2c34d526c108dd8fa37448b19bdb38de52c9 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Thu, 24 May 2018 10:48:55 -0400 -Subject: [PATCH] basic: fix raw_clone() on 32-bit sparc - -The clone syscall uses the same semantics as on 64-bit. The trap number -for syscall entry is different. - -Bug: https://bugs.gentoo.org/656368 ---- - src/basic/raw-clone.h | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/basic/raw-clone.h b/src/basic/raw-clone.h -index d8a68663180..d35540903ab 100644 ---- a/src/basic/raw-clone.h -+++ b/src/basic/raw-clone.h -@@ -39,10 +39,10 @@ static inline pid_t raw_clone(unsigned long flags) { - /* On s390/s390x and cris the order of the first and second arguments - * of the raw clone() system call is reversed. */ - ret = (pid_t) syscall(__NR_clone, NULL, flags); --#elif defined(__sparc__) && defined(__arch64__) -+#elif defined(__sparc__) - { - /** -- * sparc64 always returns the other process id in %o0, and -+ * sparc always returns the other process id in %o0, and - * a boolean flag whether this is the child or the parent in - * %o1. Inline assembly is needed to get the flag returned - * in %o1. -@@ -52,7 +52,11 @@ static inline pid_t raw_clone(unsigned long flags) { - asm volatile("mov %2, %%g1\n\t" - "mov %3, %%o0\n\t" - "mov 0 , %%o1\n\t" -+#if defined(__arch64__) - "t 0x6d\n\t" -+#else -+ "t 0x10\n\t" -+#endif - "mov %%o1, %0\n\t" - "mov %%o0, %1" : - "=r"(in_child), "=r"(child_pid) : diff --git a/sys-apps/systemd/files/238-timesync-connection.patch b/sys-apps/systemd/files/238-timesync-connection.patch deleted file mode 100644 index a48a88e9e68d..000000000000 --- a/sys-apps/systemd/files/238-timesync-connection.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6d254dba01491b994115ecef8c4017fbe5451606 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe <watanabe.yu+github@gmail.com> -Date: Mon, 16 Apr 2018 12:24:36 +0900 -Subject: [PATCH] timesync: establish connection when network become online and - the manager is not connected yet - -This also introduces `manager_is_connected()` helper function, which -returns true when the manager is sending a request, resolving a server -name, or in a poll interval. - -Follow-up for 3e85ec072180b6fbec82d715186985536859a29d. -Fixes #8719. ---- - src/timesync/timesyncd-manager.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/timesync/timesyncd-manager.c b/src/timesync/timesyncd-manager.c -index cfdc43b0ff2..0c5d3e2d6f7 100644 ---- a/src/timesync/timesyncd-manager.c -+++ b/src/timesync/timesyncd-manager.c -@@ -1036,6 +1036,12 @@ static int manager_network_read_link_servers(Manager *m) { - return r; - } - -+static bool manager_is_connected(Manager *m) { -+ /* Return true when the manager is sending a request, resolving a server name, or -+ * in a poll interval. */ -+ return m->server_socket >= 0 || m->resolve_query || m->event_timer; -+} -+ - static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t revents, void *userdata) { - Manager *m = userdata; - bool changed, connected, online; -@@ -1051,13 +1057,13 @@ static int manager_network_event_handler(sd_event_source *s, int fd, uint32_t re - online = network_is_online(); - - /* check if the client is currently connected */ -- connected = m->server_socket >= 0 || m->resolve_query || m->exhausted_servers; -+ connected = manager_is_connected(m); - - if (connected && !online) { - log_info("No network connectivity, watching for changes."); - manager_disconnect(m); - -- } else if (!connected && online && changed) { -+ } else if ((!connected || changed) && online) { - log_info("Network configuration changed, trying to establish connection."); - - if (m->current_server_address) |