Package: release.debian.org Severity: normal Tags: stretch User: release.debian....@packages.debian.org Usertags: pu
Hi, I'd like to make a stable upload fixing a few (minor) issues that were requested to be fixed by various users. Strictly speaking, those issues are not important per se and would therefore qualify for a stable upload, but given the importance of the systemd package, making it work more smoothly seems worthwile nonetheless. The full debdiff is attached. All changes are cherry-picked upstream fixes, i.e. are in unstable/testing. systemd (232-25+deb9u4) stretch; urgency=medium * core/load-fragment: Add RemoveIPC= Allow RemoveIPC= to be set in the unit file not only via D-Bus. (Closes: #892829) https://salsa.debian.org/systemd-team/systemd/commit/6854cdeb080e5c35a93430f0efcd2fc15c4b7012 * nspawn: Add missing -E to getopt_long. The -E alias for --setenv in systemd-nspawn was not working as documented. This commit fixes that by adding -E to getopt_long. (Closes: #895798) https://salsa.debian.org/systemd-team/systemd/commit/c16bbb83f6adbb1766932b21f45dd9a9def8f948 * login: Respect --no-wall when cancelling a shutdown request (Closes: #897938) https://salsa.debian.org/systemd-team/systemd/commit/2aceef88c722b31352c63b403ecc829da23a8e08 Those changes do not touch udeb, so should not be affected d-i. That said, I've CCed KiBi, as usual, for a d-i ACK. Regards, Michael -- System Information: Debian Release: buster/sid APT prefers unstable APT policy: (500, 'unstable'), (200, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.16.0-2-amd64 (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled
diff --git a/debian/changelog b/debian/changelog index 1117655..a81c855 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +systemd (232-25+deb9u4) stretch; urgency=medium + + * core/load-fragment: Add RemoveIPC= + Allow RemoveIPC= to be set in the unit file not only via D-Bus. + (Closes: #892829) + * nspawn: Add missing -E to getopt_long. + The -E alias for --setenv in systemd-nspawn was not working as + documented. This commit fixes that by adding -E to getopt_long. + (Closes: #895798) + * login: Respect --no-wall when cancelling a shutdown request + (Closes: #897938) + + -- Michael Biebl <bi...@debian.org> Wed, 13 Jun 2018 22:20:36 +0200 + systemd (232-25+deb9u3) stretch; urgency=medium [ Cyril Brulebois ] diff --git a/debian/patches/core-load-fragment-add-RemoveIPC-7288.patch b/debian/patches/core-load-fragment-add-RemoveIPC-7288.patch new file mode 100644 index 0000000..b74f2d8 --- /dev/null +++ b/debian/patches/core-load-fragment-add-RemoveIPC-7288.patch @@ -0,0 +1,28 @@ +From: Yu Watanabe <watanabe.yu+git...@gmail.com> +Date: Fri, 10 Nov 2017 18:15:55 +0900 +Subject: core/load-fragment: add RemoveIPC= (#7288) + +PR #3865 introduced RemoveIPC= but the option is not listed in +load-fragment-gperf.gperf. So, the option could be used only via d-bus. +This adds RemoveIPC= in load-fragment-gperf.gperf. Then, now we can +set the option in unit files. + +Fixes #7281. + +(cherry picked from commit c54515b1e42384ad4c582f7fb13434f9224c148f) +--- + src/core/load-fragment-gperf.gperf.m4 | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 +index cb2f384..10a5682 100644 +--- a/src/core/load-fragment-gperf.gperf.m4 ++++ b/src/core/load-fragment-gperf.gperf.m4 +@@ -35,6 +35,7 @@ $1.Environment, config_parse_environ, 0, + $1.EnvironmentFile, config_parse_unit_env_file, 0, offsetof($1, exec_context.environment_files) + $1.PassEnvironment, config_parse_pass_environ, 0, offsetof($1, exec_context.pass_environment) + $1.DynamicUser, config_parse_bool, 0, offsetof($1, exec_context.dynamic_user) ++$1.RemoveIPC, config_parse_bool, 0, offsetof($1, exec_context.remove_ipc) + $1.StandardInput, config_parse_exec_input, 0, offsetof($1, exec_context) + $1.StandardOutput, config_parse_exec_output, 0, offsetof($1, exec_context) + $1.StandardError, config_parse_exec_output, 0, offsetof($1, exec_context) diff --git a/debian/patches/login-change-variable-type-of-enable_wall_messages-as-it-.patch b/debian/patches/login-change-variable-type-of-enable_wall_messages-as-it-.patch new file mode 100644 index 0000000..1018019 --- /dev/null +++ b/debian/patches/login-change-variable-type-of-enable_wall_messages-as-it-.patch @@ -0,0 +1,23 @@ +From: Yu Watanabe <watanabe.yu+git...@gmail.com> +Date: Mon, 7 May 2018 10:13:54 +0900 +Subject: login: change variable type of enable_wall_messages as it matches + Manager.enable_wall_messages + +(cherry picked from commit c9482b88228db25c77ad61e119f61308af8fe2e9) +--- + src/login/logind-dbus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index 0a84d75..dbb21bd 100644 +--- a/src/login/logind-dbus.c ++++ b/src/login/logind-dbus.c +@@ -2375,7 +2375,7 @@ static int method_set_wall_message( + int r; + Manager *m = userdata; + char *wall_message; +- int enable_wall_messages; ++ unsigned enable_wall_messages; + + assert(message); + assert(m); diff --git a/debian/patches/login-do-not-wall-message-on-cancelling-shutdown-when-Man.patch b/debian/patches/login-do-not-wall-message-on-cancelling-shutdown-when-Man.patch new file mode 100644 index 0000000..678100a --- /dev/null +++ b/debian/patches/login-do-not-wall-message-on-cancelling-shutdown-when-Man.patch @@ -0,0 +1,25 @@ +From: Yu Watanabe <watanabe.yu+git...@gmail.com> +Date: Mon, 7 May 2018 10:16:04 +0900 +Subject: login: do not wall message on cancelling shutdown when + Manager.enable_wall_messages is false + +Fixes #8904. + +(cherry picked from commit 6e78fa4afd474dae984f3ee4a8477c623296a519) +--- + src/login/logind-dbus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index dbb21bd..0dc6a33 100644 +--- a/src/login/logind-dbus.c ++++ b/src/login/logind-dbus.c +@@ -2068,7 +2068,7 @@ static int method_cancel_scheduled_shutdown(sd_bus_message *message, void *userd + cancelled = m->scheduled_shutdown_type != NULL; + reset_scheduled_shutdown(m); + +- if (cancelled) { ++ if (cancelled && m->enable_wall_messages) { + _cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL; + const char *tty = NULL; + uid_t uid = 0; diff --git a/debian/patches/nspawn-add-missing-E-to-getopt_long-4860.patch b/debian/patches/nspawn-add-missing-E-to-getopt_long-4860.patch new file mode 100644 index 0000000..eb31120 --- /dev/null +++ b/debian/patches/nspawn-add-missing-E-to-getopt_long-4860.patch @@ -0,0 +1,22 @@ +From: Wim de With <regis...@wimdewith.com> +Date: Sat, 10 Dec 2016 05:33:58 +0100 +Subject: nspawn: add missing -E to getopt_long (#4860) + +(cherry picked from commit 2e1f244efd2dfc1a60d032bef3d88b9ba6e0444b) +--- + src/nspawn/nspawn.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index 9bafe9b..1fcd09e 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -472,7 +472,7 @@ static int parse_argv(int argc, char *argv[]) { + assert(argc >= 0); + assert(argv); + +- while ((c = getopt_long(argc, argv, "+hD:u:abL:M:jS:Z:qi:xp:nU", options, NULL)) >= 0) ++ while ((c = getopt_long(argc, argv, "+hD:u:abL:M:jS:Z:qi:xp:nUE:", options, NULL)) >= 0) + + switch (c) { + diff --git a/debian/patches/series b/debian/patches/series index 2866963..8252799 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -79,6 +79,10 @@ shared-Add-a-linker-script-so-that-all-functions-are-tagg.patch resolved-fix-loop-on-packets-with-pseudo-dns-types.patch machinectl-don-t-output-No-machines.-with-no-legend-optio.patch networkd-ndisc-handle-missing-mtu-gracefully-4913.patch +core-load-fragment-add-RemoveIPC-7288.patch +nspawn-add-missing-E-to-getopt_long-4860.patch +login-change-variable-type-of-enable_wall_messages-as-it-.patch +login-do-not-wall-message-on-cancelling-shutdown-when-Man.patch debian/Use-Debian-specific-config-files.patch debian/don-t-try-to-start-autovt-units-when-not-running-wit.patch debian/Make-logind-hostnamed-localed-timedated-D-Bus-activa.patch