From 23787635ac979f1bf9ad3d40ddeb0e4aa3bf045f Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 5 May 2022 22:10:09 +0200 Subject: [PATCH] Rebase patches --- ...Add-support-for-TuxOnIce-hibernation.patch | 2 +- .../Don-t-enable-audit-by-default.patch | 2 +- ...ngrade-a-couple-of-warnings-to-debug.patch | 4 ++-- ...l.d-binfmt.d-modules-load.d-back-to-.patch | 2 +- ...-enable-journal-forwarding-to-syslog.patch | 2 +- ...step-back-again-for-nspawn-we-actual.patch | 2 +- ...-RLIMIT_CORE-to-unlimited-by-default.patch | 6 ++--- .../Use-Debian-specific-config-files.patch | 8 +++---- ...daemon-for-inter-fsckd-communication.patch | 10 ++++---- debian/patches/hwdb-fix-parsing-options.patch | 24 ------------------- debian/patches/series | 1 - 11 files changed, 19 insertions(+), 44 deletions(-) delete mode 100644 debian/patches/hwdb-fix-parsing-options.patch diff --git a/debian/patches/debian/Add-support-for-TuxOnIce-hibernation.patch b/debian/patches/debian/Add-support-for-TuxOnIce-hibernation.patch index a838e16e2..aea212625 100644 --- a/debian/patches/debian/Add-support-for-TuxOnIce-hibernation.patch +++ b/debian/patches/debian/Add-support-for-TuxOnIce-hibernation.patch @@ -12,7 +12,7 @@ Forwarded: http://lists.freedesktop.org/archives/systemd-devel/2014-April/018960 1 file changed, 6 insertions(+) diff --git a/src/shared/sleep-config.c b/src/shared/sleep-config.c -index 8ec3d09..e82757c 100644 +index a56f2ff..2d2aa19 100644 --- a/src/shared/sleep-config.c +++ b/src/shared/sleep-config.c @@ -476,6 +476,12 @@ static bool enough_swap_for_hibernation(void) { diff --git a/debian/patches/debian/Don-t-enable-audit-by-default.patch b/debian/patches/debian/Don-t-enable-audit-by-default.patch index 05c1cf067..b2b88f1a8 100644 --- a/debian/patches/debian/Don-t-enable-audit-by-default.patch +++ b/debian/patches/debian/Don-t-enable-audit-by-default.patch @@ -29,7 +29,7 @@ index ed7e428..0abed9c 100644 diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 1ebfdbb..cf1352a 100644 +index 3ed8b80..5d373f4 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -2293,7 +2293,7 @@ int server_init(Server *s, const char *namespace) { diff --git a/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch b/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch index 20c22ce57..ad04dfbe0 100644 --- a/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch +++ b/debian/patches/debian/Downgrade-a-couple-of-warnings-to-debug.patch @@ -16,7 +16,7 @@ Closes: #981407 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c -index e0dc47e..8ed9924 100644 +index 74c4133..34680cb 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -522,6 +522,7 @@ static int patch_var_run( @@ -51,7 +51,7 @@ index 14ae873..aa9e94b 100644 "Please update package to include a native systemd unit file, in order to make it more safe and robust.", fpath); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 023207b..aef45b9 100644 +index 94973c2..0d27daa 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -2760,6 +2760,7 @@ static int specifier_expansion_from_arg(const Specifier *specifier_table, Item * diff --git a/debian/patches/debian/Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-back-to-.patch b/debian/patches/debian/Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-back-to-.patch index f6f2347d0..3cb53bc31 100644 --- a/debian/patches/debian/Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-back-to-.patch +++ b/debian/patches/debian/Move-sysusers.d-sysctl.d-binfmt.d-modules-load.d-back-to-.patch @@ -39,7 +39,7 @@ index fc0f8c3..65996bb 100644 catalog_dir=${prefix}/lib/systemd/catalog diff --git a/src/libsystemd/sd-path/sd-path.c b/src/libsystemd/sd-path/sd-path.c -index 385cfd3..9568818 100644 +index ac33e34..f0615ff 100644 --- a/src/libsystemd/sd-path/sd-path.c +++ b/src/libsystemd/sd-path/sd-path.c @@ -362,19 +362,19 @@ static int get_path(uint64_t type, char **buffer, const char **ret) { diff --git a/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch b/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch index bc5dc7301..b1e7d4e60 100644 --- a/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch +++ b/debian/patches/debian/Re-enable-journal-forwarding-to-syslog.patch @@ -30,7 +30,7 @@ index 4b0dd90..ed7e428 100644 systemd.journald.forward_to_kmsg, systemd.journald.forward_to_console, and diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index 2b3d3dc..1ebfdbb 100644 +index dc94337..3ed8b80 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -2303,6 +2303,7 @@ int server_init(Server *s, const char *namespace) { diff --git a/debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch b/debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch index 9e2223bfd..a072023a4 100644 --- a/debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch +++ b/debian/patches/debian/Revert-core-one-step-back-again-for-nspawn-we-actual.patch @@ -14,7 +14,7 @@ Bug-Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=1141137 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/core/unit.c b/src/core/unit.c -index 5ab7601..cf9ec0f 100644 +index 42ee889..e66066f 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -4606,16 +4606,7 @@ int unit_kill_context( diff --git a/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch b/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch index 64f49a5c8..37f3a0a3e 100644 --- a/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch +++ b/debian/patches/debian/Revert-core-set-RLIMIT_CORE-to-unlimited-by-default.patch @@ -19,10 +19,10 @@ Bug-Debian: https://bugs.debian.org/815020 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/src/core/main.c b/src/core/main.c -index f39c7b0..38940ac 100644 +index 409b84a..7989bbe 100644 --- a/src/core/main.c +++ b/src/core/main.c -@@ -1615,24 +1615,6 @@ static void cmdline_take_random_seed(void) { +@@ -1619,24 +1619,6 @@ static void cmdline_take_random_seed(void) { "This functionality should not be used outside of testing environments."); } @@ -47,7 +47,7 @@ index f39c7b0..38940ac 100644 static void initialize_core_pattern(bool skip_setup) { int r; -@@ -2748,8 +2730,6 @@ int main(int argc, char *argv[]) { +@@ -2765,8 +2747,6 @@ int main(int argc, char *argv[]) { kernel_timestamp = DUAL_TIMESTAMP_NULL; } diff --git a/debian/patches/debian/Use-Debian-specific-config-files.patch b/debian/patches/debian/Use-Debian-specific-config-files.patch index 5ea8a93df..156dc6bb0 100644 --- a/debian/patches/debian/Use-Debian-specific-config-files.patch +++ b/debian/patches/debian/Use-Debian-specific-config-files.patch @@ -69,10 +69,10 @@ index ad4a189..b9c448e 100644 e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/"); if (!e) diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c -index 59ddb9c..25cf884 100644 +index 716febb..9818602 100644 --- a/src/core/locale-setup.c +++ b/src/core/locale-setup.c -@@ -58,6 +58,27 @@ int locale_setup(char ***environment) { +@@ -57,6 +57,27 @@ int locale_setup(char ***environment) { log_warning_errno(r, "Failed to read /etc/locale.conf: %m"); } @@ -97,7 +97,7 @@ index 59ddb9c..25cf884 100644 + log_warning_errno(r, "Failed to read /etc/default/locale: %m"); + } + - for (i = 0; i < _VARIABLE_LC_MAX; i++) { + for (LocaleVariable i = 0; i < _VARIABLE_LC_MAX; i++) { char *s; diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c @@ -402,7 +402,7 @@ index 9759f46..4eb48bb 100644 return r; } diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index c28615c..55f7945 100644 +index 9ca5d37..7b09a4c 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c @@ -296,6 +296,8 @@ static int context_read_data(Context *c) { diff --git a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch index 273edf763..2ad31a477 100644 --- a/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch +++ b/debian/patches/debian/fsckd-daemon-for-inter-fsckd-communication.patch @@ -59,10 +59,10 @@ http://lists.freedesktop.org/archives/systemd-devel/2015-April/030175.html create mode 100644 units/systemd-fsckd.socket diff --git a/man/rules/meson.build b/man/rules/meson.build -index aaa69d3..e909670 100644 +index 55376c0..4e91263 100644 --- a/man/rules/meson.build +++ b/man/rules/meson.build -@@ -869,6 +869,7 @@ manpages = [ +@@ -884,6 +884,7 @@ manpages = [ '8', ['systemd-fsck', 'systemd-fsck-root.service'], ''], @@ -239,10 +239,10 @@ index 0000000..b7ad58d + + diff --git a/meson.build b/meson.build -index e68791b..a70df79 100644 +index a3f9e3b..b9c6620 100644 --- a/meson.build +++ b/meson.build -@@ -3188,6 +3188,15 @@ executable( +@@ -3210,6 +3210,15 @@ executable( install : true, install_dir : rootlibexecdir) @@ -971,7 +971,7 @@ index 0000000..73cb5d9 + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +} diff --git a/units/meson.build b/units/meson.build -index 8a3bd0d..542e331 100644 +index e8f81f2..81bb9a8 100644 --- a/units/meson.build +++ b/units/meson.build @@ -114,6 +114,7 @@ units = [ diff --git a/debian/patches/hwdb-fix-parsing-options.patch b/debian/patches/hwdb-fix-parsing-options.patch deleted file mode 100644 index c4cab2740..000000000 --- a/debian/patches/hwdb-fix-parsing-options.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Michael Biebl -Date: Tue, 5 Apr 2022 22:11:04 +0200 -Subject: hwdb: fix parsing options - -Fixes #22976. - -(cherry picked from commit 5674b74c4f99e433fd8e7242e9f16f6ddfece94c) ---- - src/hwdb/hwdb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c -index 26c8d66..a8c1623 100644 ---- a/src/hwdb/hwdb.c -+++ b/src/hwdb/hwdb.c -@@ -73,7 +73,7 @@ static int parse_argv(int argc, char *argv[]) { - assert(argc >= 0); - assert(argv); - -- while ((c = getopt_long(argc, argv, "ust:r:h", options, NULL)) >= 0) -+ while ((c = getopt_long(argc, argv, "sr:h", options, NULL)) >= 0) - switch(c) { - - case 'h': diff --git a/debian/patches/series b/debian/patches/series index 65fcbab87..7ef7c213e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -hwdb-fix-parsing-options.patch debian/Use-Debian-specific-config-files.patch debian/Bring-tmpfiles.d-tmp.conf-in-line-with-Debian-defaul.patch debian/Make-run-lock-tmpfs-an-API-fs.patch