From a52f6741bd20d8383d75ad852a37699fbfb4b896 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mar 05 2014 06:23:25 +0000 Subject: Backport a bunch of fixes and small features --- diff --git a/0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch b/0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch index 28c2835..a27dc1a 100644 --- a/0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch +++ b/0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch @@ -1,4 +1,4 @@ -From 3e4aca291a6ab914e08108acbd5d96600370c20d Mon Sep 17 00:00:00 2001 +From 0951e738eb1e46a5ef5ca22e2bc81986aeafa005 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 2 Oct 2013 13:39:49 +0200 Subject: [PATCH] acpi-fptd: fix memory leak in acpi_get_boot_usec diff --git a/0002-fix-lingering-references-to-var-lib-backlight-random.patch b/0002-fix-lingering-references-to-var-lib-backlight-random.patch index bbefb42..f49a902 100644 --- a/0002-fix-lingering-references-to-var-lib-backlight-random.patch +++ b/0002-fix-lingering-references-to-var-lib-backlight-random.patch @@ -1,4 +1,4 @@ -From 80c0a135afe5d801903ac742c386a5468837175c Mon Sep 17 00:00:00 2001 +From 50bc3a5d68b5595c4fecaab06dfd7842fb168a0b Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 2 Oct 2013 07:46:24 -0400 Subject: [PATCH] fix lingering references to /var/lib/{backlight,random-seed} diff --git a/0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch b/0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch index 4be984a..6bcdfbe 100644 --- a/0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch +++ b/0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch @@ -1,4 +1,4 @@ -From 4294dcefec5bd85c17d671612fac3b4b8cd20eac Mon Sep 17 00:00:00 2001 +From 248c3f3b5c2d1f0cc68eed831bc28b2369856544 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Oct 2013 14:03:56 +0200 Subject: [PATCH] acpi: make sure we never free an uninitialized pointer diff --git a/0004-systemctl-fix-name-mangling-for-sysv-units.patch b/0004-systemctl-fix-name-mangling-for-sysv-units.patch index 9e5a25a..a1e1922 100644 --- a/0004-systemctl-fix-name-mangling-for-sysv-units.patch +++ b/0004-systemctl-fix-name-mangling-for-sysv-units.patch @@ -1,4 +1,4 @@ -From 5103e16f5e12e1754a2dcfabafb7618eb15ccf98 Mon Sep 17 00:00:00 2001 +From f9bd829cb9858015ad7c4c09ad5fa6584362e884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= Date: Wed, 2 Oct 2013 16:42:42 +0200 Subject: [PATCH] systemctl: fix name mangling for sysv units diff --git a/0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch b/0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch index 559376e..1db0d68 100644 --- a/0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch +++ b/0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch @@ -1,4 +1,4 @@ -From 0f1ed3485115fd6bc7217658412ea6d7be511b5a Mon Sep 17 00:00:00 2001 +From 0843dfcfcdf541d02387bc466c957ca84ad2a746 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Oct 2013 19:36:28 +0200 Subject: [PATCH] cryptsetup: fix OOM handling when parsing mount options diff --git a/0006-journald-add-missing-error-check.patch b/0006-journald-add-missing-error-check.patch index 8ed0124..a237365 100644 --- a/0006-journald-add-missing-error-check.patch +++ b/0006-journald-add-missing-error-check.patch @@ -1,4 +1,4 @@ -From 71ff575fffcd22db42de59abbeaf150bcf6ac144 Mon Sep 17 00:00:00 2001 +From e639baf54ba664aee4c679d24a8337c90da37713 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Oct 2013 19:36:43 +0200 Subject: [PATCH] journald: add missing error check diff --git a/0007-bus-fix-potentially-uninitialized-memory-access.patch b/0007-bus-fix-potentially-uninitialized-memory-access.patch index 8807b85..0261499 100644 --- a/0007-bus-fix-potentially-uninitialized-memory-access.patch +++ b/0007-bus-fix-potentially-uninitialized-memory-access.patch @@ -1,4 +1,4 @@ -From f20403c231e9c7f5446066f01f2f5245238d978c Mon Sep 17 00:00:00 2001 +From 1b2ebabf88dbe45e1186156549ff94ce86c33400 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Oct 2013 19:37:11 +0200 Subject: [PATCH] bus: fix potentially uninitialized memory access diff --git a/0008-dbus-fix-return-value-of-dispatch_rqueue.patch b/0008-dbus-fix-return-value-of-dispatch_rqueue.patch index 3b4244b..a3e8234 100644 --- a/0008-dbus-fix-return-value-of-dispatch_rqueue.patch +++ b/0008-dbus-fix-return-value-of-dispatch_rqueue.patch @@ -1,4 +1,4 @@ -From 27d066e733e369873328e7bc0b67d91f07687cb0 Mon Sep 17 00:00:00 2001 +From 15224c786eed91903665ed99b3a1b03c823ae1c8 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Oct 2013 19:37:30 +0200 Subject: [PATCH] dbus: fix return value of dispatch_rqueue() diff --git a/0009-modules-load-fix-error-handling.patch b/0009-modules-load-fix-error-handling.patch index 9b8740e..e6c4be0 100644 --- a/0009-modules-load-fix-error-handling.patch +++ b/0009-modules-load-fix-error-handling.patch @@ -1,4 +1,4 @@ -From 3afab028b6bdeadd32e2c87b6f5a64019945358f Mon Sep 17 00:00:00 2001 +From 48fdd931a8403093e091189f84eb190796475e2e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Oct 2013 19:37:44 +0200 Subject: [PATCH] modules-load: fix error handling diff --git a/0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch b/0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch index d320265..1f6766b 100644 --- a/0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch +++ b/0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch @@ -1,4 +1,4 @@ -From e0cbed4dbb7c21798b5eecf3d326fb778c4d0be2 Mon Sep 17 00:00:00 2001 +From 0bf9388b5c3df03a217ec0300cfbba8bbe53b045 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Oct 2013 19:38:09 +0200 Subject: [PATCH] efi: never call qsort on potentially NULL arrays diff --git a/0011-strv-don-t-access-potentially-NULL-string-arrays.patch b/0011-strv-don-t-access-potentially-NULL-string-arrays.patch index e9d6b84..3249142 100644 --- a/0011-strv-don-t-access-potentially-NULL-string-arrays.patch +++ b/0011-strv-don-t-access-potentially-NULL-string-arrays.patch @@ -1,4 +1,4 @@ -From b430e6ff0580b962c0b36dd5817dac681c159a58 Mon Sep 17 00:00:00 2001 +From d79f41c58f17c12c21512fb59ad415c10877cc09 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Oct 2013 19:38:28 +0200 Subject: [PATCH] strv: don't access potentially NULL string arrays diff --git a/0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch b/0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch index e591844..b5cb2fd 100644 --- a/0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch +++ b/0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch @@ -1,4 +1,4 @@ -From 77c2f8448bc13bb796b9b8dbc93c684428ab38c2 Mon Sep 17 00:00:00 2001 +From 77cd831bac1a3e086dc77e66614ec65f84e267b6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 2 Oct 2013 19:38:52 +0200 Subject: [PATCH] mkdir: pass a proper function pointer to mkdir_safe_internal diff --git a/0013-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch b/0013-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch index 2aca9b7..daae0a7 100644 --- a/0013-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch +++ b/0013-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch @@ -1,4 +1,4 @@ -From 4e1d571d8564b6383ced03316f0d84b96e1299a4 Mon Sep 17 00:00:00 2001 +From a038f23862a327fb52a93f3d41287b83a67ae527 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Wed, 2 Oct 2013 15:35:16 -0400 Subject: [PATCH] tmpfiles.d: include setgid perms for /run/log/journal diff --git a/0014-execute.c-always-set-SHELL.patch b/0014-execute.c-always-set-SHELL.patch index 9c93c23..0086f7b 100644 --- a/0014-execute.c-always-set-SHELL.patch +++ b/0014-execute.c-always-set-SHELL.patch @@ -1,4 +1,4 @@ -From 0a1d15d3b802128cc9be10c849c29b76a8fae3ed Mon Sep 17 00:00:00 2001 +From ead2d686d9c9145fef59ce737e91515d9b42f845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 2 Oct 2013 13:23:10 +0200 Subject: [PATCH] execute.c: always set $SHELL diff --git a/0015-man-Improve-the-description-of-parameter-X-in-tmpfil.patch b/0015-man-Improve-the-description-of-parameter-X-in-tmpfil.patch index 9161601..47dfad0 100644 --- a/0015-man-Improve-the-description-of-parameter-X-in-tmpfil.patch +++ b/0015-man-Improve-the-description-of-parameter-X-in-tmpfil.patch @@ -1,4 +1,4 @@ -From f4c2f322509191d38f6e94fac06607d1dd99b4ac Mon Sep 17 00:00:00 2001 +From 5b248f13e4f453ed5a44602a9a0c8e029044499c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= Date: Thu, 3 Oct 2013 15:47:26 +0200 Subject: [PATCH] man: Improve the description of parameter X in tmpfiles.d diff --git a/0016-execute-more-debugging-messages.patch b/0016-execute-more-debugging-messages.patch index c01d99f..92276a2 100644 --- a/0016-execute-more-debugging-messages.patch +++ b/0016-execute-more-debugging-messages.patch @@ -1,4 +1,4 @@ -From 669ac5ee25f166bdf688b06f96e8e8fd3cf9f43c Mon Sep 17 00:00:00 2001 +From a439fc06fa3eba74f09efbb538287b20cd0ce84e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 28 Aug 2013 08:01:30 -0400 Subject: [PATCH] execute: more debugging messages diff --git a/0017-gpt-auto-generator-exit-immediately-if-in-container.patch b/0017-gpt-auto-generator-exit-immediately-if-in-container.patch index 0ced77d..b4e382d 100644 --- a/0017-gpt-auto-generator-exit-immediately-if-in-container.patch +++ b/0017-gpt-auto-generator-exit-immediately-if-in-container.patch @@ -1,4 +1,4 @@ -From d25cc648fed1d6902d07c74afd71458f971ab314 Mon Sep 17 00:00:00 2001 +From f4e59a032bb2e77f8b0f21015ce67e2d2abb739e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 3 Oct 2013 22:13:01 -0400 Subject: [PATCH] gpt-auto-generator: exit immediately if in container diff --git a/0018-systemd-order-remote-mounts-from-mountinfo-before-re.patch b/0018-systemd-order-remote-mounts-from-mountinfo-before-re.patch index df58924..4e894d2 100644 --- a/0018-systemd-order-remote-mounts-from-mountinfo-before-re.patch +++ b/0018-systemd-order-remote-mounts-from-mountinfo-before-re.patch @@ -1,4 +1,4 @@ -From 095da7cd7cdb33cd5efe7a53c77862aa677045d5 Mon Sep 17 00:00:00 2001 +From b8bf0aa699014f143f308fb4f8f872c13edff402 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 3 Oct 2013 22:15:08 -0400 Subject: [PATCH] systemd: order remote mounts from mountinfo before diff --git a/0019-manager-when-verifying-whether-clients-may-change-en.patch b/0019-manager-when-verifying-whether-clients-may-change-en.patch index d445dac..8f9193a 100644 --- a/0019-manager-when-verifying-whether-clients-may-change-en.patch +++ b/0019-manager-when-verifying-whether-clients-may-change-en.patch @@ -1,4 +1,4 @@ -From 8f84713d297fcba39b65e7409ec114009896c3ff Mon Sep 17 00:00:00 2001 +From 8c19b420bba6a9aeb120b85c986798762065bb33 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Oct 2013 17:01:37 +0200 Subject: [PATCH] manager: when verifying whether clients may change diff --git a/0020-logind-fix-bus-introspection-data-for-TakeControl.patch b/0020-logind-fix-bus-introspection-data-for-TakeControl.patch index 6f3db80..1312109 100644 --- a/0020-logind-fix-bus-introspection-data-for-TakeControl.patch +++ b/0020-logind-fix-bus-introspection-data-for-TakeControl.patch @@ -1,4 +1,4 @@ -From e25723afe5ebc4b05d5330a935bb654904eaf2f0 Mon Sep 17 00:00:00 2001 +From 10ec3c93c8e17f317339ca453986767c2f2bdb30 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Oct 2013 21:16:40 +0200 Subject: [PATCH] logind: fix bus introspection data for TakeControl() diff --git a/0021-mount-check-for-NULL-before-reading-pm-what.patch b/0021-mount-check-for-NULL-before-reading-pm-what.patch index 10be17b..56506e1 100644 --- a/0021-mount-check-for-NULL-before-reading-pm-what.patch +++ b/0021-mount-check-for-NULL-before-reading-pm-what.patch @@ -1,4 +1,4 @@ -From 61ccd1762fa0f9a8ec9285a8a7367fc03bcc5982 Mon Sep 17 00:00:00 2001 +From 67e09a256f3cd235a22b71569711bc4f85f5e827 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Fri, 4 Oct 2013 18:22:40 -0400 Subject: [PATCH] mount: check for NULL before reading pm->what diff --git a/0022-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch b/0022-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch index d804be1..7310f50 100644 --- a/0022-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch +++ b/0022-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch @@ -1,4 +1,4 @@ -From 47c666095e4ed827bbb15b6e58b760dc5dcd97ae Mon Sep 17 00:00:00 2001 +From 91f1a3f512e1b046267bce7c472c06962f3d9db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 5 Oct 2013 13:09:43 -0400 Subject: [PATCH] core: do not add "what" to RequiresMountsFor for network diff --git a/0023-utf8-fix-utf8_is_printable.patch b/0023-utf8-fix-utf8_is_printable.patch index fb88716..35ec82d 100644 --- a/0023-utf8-fix-utf8_is_printable.patch +++ b/0023-utf8-fix-utf8_is_printable.patch @@ -1,4 +1,4 @@ -From 5b5f505ab485dd60fb608ffb2eecd755537f039f Mon Sep 17 00:00:00 2001 +From b3a5ca3c5b12569743c8fc9326c73b17b95752a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 5 Oct 2013 22:47:52 -0400 Subject: [PATCH] utf8: fix utf8_is_printable diff --git a/0024-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch b/0024-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch index 8e02bec..b8983d1 100644 --- a/0024-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch +++ b/0024-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch @@ -1,4 +1,4 @@ -From c3d2db4dd65bf5127cbddec2edd931399ce5ebce Mon Sep 17 00:00:00 2001 +From f9389c058f7b52b33a4281b2d7653819486b7569 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 6 Oct 2013 18:26:23 -0400 Subject: [PATCH] shared/util: fix off-by-one error in tag_to_udev_node diff --git a/0025-systemd-serialize-deserialize-forbid_restart-value.patch b/0025-systemd-serialize-deserialize-forbid_restart-value.patch index e306bce..2620ed3 100644 --- a/0025-systemd-serialize-deserialize-forbid_restart-value.patch +++ b/0025-systemd-serialize-deserialize-forbid_restart-value.patch @@ -1,4 +1,4 @@ -From adb4105cf7f0018d05696f96a1058041037c9243 Mon Sep 17 00:00:00 2001 +From 36d752d26f949a001b56f9ed26d48f5391a86dd2 Mon Sep 17 00:00:00 2001 From: Sylvia Else Date: Sun, 6 Oct 2013 23:06:35 -0400 Subject: [PATCH] systemd: serialize/deserialize forbid_restart value diff --git a/0026-core-unify-the-way-we-denote-serialization-attribute.patch b/0026-core-unify-the-way-we-denote-serialization-attribute.patch index b778da1..dc4b0c9 100644 --- a/0026-core-unify-the-way-we-denote-serialization-attribute.patch +++ b/0026-core-unify-the-way-we-denote-serialization-attribute.patch @@ -1,4 +1,4 @@ -From 7d1f35a5838363c2d1981fc62f5bbcb43cbdc57c Mon Sep 17 00:00:00 2001 +From 026ff192dda3f05ac592b7421375c6447e334dc7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 9 Oct 2013 00:13:55 +0200 Subject: [PATCH] core: unify the way we denote serialization attributes diff --git a/0027-journald-fix-minor-memory-leak.patch b/0027-journald-fix-minor-memory-leak.patch index 995d65c..b0dc489 100644 --- a/0027-journald-fix-minor-memory-leak.patch +++ b/0027-journald-fix-minor-memory-leak.patch @@ -1,4 +1,4 @@ -From 85f4505eab750835fdfe022012bf7d33123bc940 Mon Sep 17 00:00:00 2001 +From 74002ad108e92b482448ec2f8075d68f7d17c789 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 9 Oct 2013 04:03:45 +0200 Subject: [PATCH] journald: fix minor memory leak diff --git a/0028-keymap-Fix-Samsung-900X-34-C.patch b/0028-keymap-Fix-Samsung-900X-34-C.patch index 313d243..640c1f5 100644 --- a/0028-keymap-Fix-Samsung-900X-34-C.patch +++ b/0028-keymap-Fix-Samsung-900X-34-C.patch @@ -1,4 +1,4 @@ -From 6381c0c4adc2d637ad53dd81cfeb73d7b4a2cbcb Mon Sep 17 00:00:00 2001 +From c9eb4cbe6f8f7acfc42f97a99e1f0212c278d79c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 9 Oct 2013 16:05:15 +0200 Subject: [PATCH] keymap: Fix Samsung 900X[34]C diff --git a/0029-do-not-accept-garbage-from-acpi-firmware-performance.patch b/0029-do-not-accept-garbage-from-acpi-firmware-performance.patch index 998ec91..61eb12e 100644 --- a/0029-do-not-accept-garbage-from-acpi-firmware-performance.patch +++ b/0029-do-not-accept-garbage-from-acpi-firmware-performance.patch @@ -1,4 +1,4 @@ -From 44d7510b31f3e9331a2c6b5518438697404655c6 Mon Sep 17 00:00:00 2001 +From 8a6e544444b3e78c2139952de46dcde45c2afeae Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 10 Oct 2013 01:38:11 +0200 Subject: [PATCH] do not accept "garbage" from acpi firmware performance data diff --git a/0030-journald-remove-rotated-file-from-hashmap-when-rotat.patch b/0030-journald-remove-rotated-file-from-hashmap-when-rotat.patch index d818c2d..a88ff88 100644 --- a/0030-journald-remove-rotated-file-from-hashmap-when-rotat.patch +++ b/0030-journald-remove-rotated-file-from-hashmap-when-rotat.patch @@ -1,4 +1,4 @@ -From c9cceff90794d452b16a5dd8d1c53cdb44f4a002 Mon Sep 17 00:00:00 2001 +From a032e5652ae1dbf86ca668924a1a4e7ef4f94df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 9 Oct 2013 22:13:13 -0400 Subject: [PATCH] journald: remove rotated file from hashmap when rotation diff --git a/0031-login-fix-invalid-free-in-sd_session_get_vt.patch b/0031-login-fix-invalid-free-in-sd_session_get_vt.patch index 92a964c..0bb0e77 100644 --- a/0031-login-fix-invalid-free-in-sd_session_get_vt.patch +++ b/0031-login-fix-invalid-free-in-sd_session_get_vt.patch @@ -1,4 +1,4 @@ -From a72c398b5af558d231decbbf12c7990dbd38c682 Mon Sep 17 00:00:00 2001 +From e45377cca2eeeef018cfe457e29becc77bf80eb8 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Thu, 10 Oct 2013 13:09:37 +0200 Subject: [PATCH] login: fix invalid free() in sd_session_get_vt() diff --git a/0032-login-make-sd_session_get_vt-actually-work.patch b/0032-login-make-sd_session_get_vt-actually-work.patch index de3bd5c..50f230c 100644 --- a/0032-login-make-sd_session_get_vt-actually-work.patch +++ b/0032-login-make-sd_session_get_vt-actually-work.patch @@ -1,4 +1,4 @@ -From 88a16dc6bd64267e4a0fbe58f2e8d273c096f1e5 Mon Sep 17 00:00:00 2001 +From 680b2b091623ed5b3dd616e98669afff97e22025 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Thu, 10 Oct 2013 13:11:27 +0200 Subject: [PATCH] login: make sd_session_get_vt() actually work diff --git a/0033-udevadm.xml-document-resolve-names-option-for-test.patch b/0033-udevadm.xml-document-resolve-names-option-for-test.patch index dc42183..a24e184 100644 --- a/0033-udevadm.xml-document-resolve-names-option-for-test.patch +++ b/0033-udevadm.xml-document-resolve-names-option-for-test.patch @@ -1,4 +1,4 @@ -From 2ef8bf3f6b44d2860b149ad09cf8aea3a4f1bd42 Mon Sep 17 00:00:00 2001 +From e464afe5229d177fa19f5ed91312e4a62515e7a2 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sun, 13 Oct 2013 17:42:51 -0400 Subject: [PATCH] udevadm.xml: document --resolve-names option for test diff --git a/0034-Never-call-qsort-on-potentially-NULL-arrays.patch b/0034-Never-call-qsort-on-potentially-NULL-arrays.patch index 5d2fd9b..a944a21 100644 --- a/0034-Never-call-qsort-on-potentially-NULL-arrays.patch +++ b/0034-Never-call-qsort-on-potentially-NULL-arrays.patch @@ -1,4 +1,4 @@ -From 88bef035149080be5a83f90d91d5b13cec9749e8 Mon Sep 17 00:00:00 2001 +From 640e6b9ae24e6e8137f99687df66507b4130d5c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Oct 2013 19:33:13 -0400 Subject: [PATCH] Never call qsort on potentially NULL arrays diff --git a/0035-dbus-common-avoid-leak-in-error-path.patch b/0035-dbus-common-avoid-leak-in-error-path.patch index 906c9fe..0e19801 100644 --- a/0035-dbus-common-avoid-leak-in-error-path.patch +++ b/0035-dbus-common-avoid-leak-in-error-path.patch @@ -1,4 +1,4 @@ -From 65f2e8e1f7a86e62630fd36e34609dc7fc09b474 Mon Sep 17 00:00:00 2001 +From 5746ed2343512d5b94c9ce19b74972f835d5e2ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Oct 2013 19:33:20 -0400 Subject: [PATCH] dbus-common: avoid leak in error path diff --git a/0036-drop-ins-check-return-value.patch b/0036-drop-ins-check-return-value.patch index 5193275..6058de6 100644 --- a/0036-drop-ins-check-return-value.patch +++ b/0036-drop-ins-check-return-value.patch @@ -1,4 +1,4 @@ -From 187ff3e80b8d6b447e584708d88a1858e154a348 Mon Sep 17 00:00:00 2001 +From 1eb11fe0ff64239cea4fec250a9ca484867d81b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Oct 2013 19:33:36 -0400 Subject: [PATCH] drop-ins: check return value diff --git a/0037-Make-sure-that-we-don-t-dereference-NULL.patch b/0037-Make-sure-that-we-don-t-dereference-NULL.patch index 80c2231..075ca31 100644 --- a/0037-Make-sure-that-we-don-t-dereference-NULL.patch +++ b/0037-Make-sure-that-we-don-t-dereference-NULL.patch @@ -1,4 +1,4 @@ -From bb653097a1e0c5c2228cafda144814c42cd05da2 Mon Sep 17 00:00:00 2001 +From fdf7d22045e74adbe0e3ad0a5df4607d31c158d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 12 Oct 2013 13:43:07 -0400 Subject: [PATCH] Make sure that we don't dereference NULL diff --git a/0038-gitignore-ignore-clang-analyze-output.patch b/0038-gitignore-ignore-clang-analyze-output.patch index 023ad3c..b5154f4 100644 --- a/0038-gitignore-ignore-clang-analyze-output.patch +++ b/0038-gitignore-ignore-clang-analyze-output.patch @@ -1,4 +1,4 @@ -From 8d2f7d0ecc3b949f7f15934f3adb73e812866c59 Mon Sep 17 00:00:00 2001 +From 91a4412a44af07985048a664472388ed27482d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 12 Oct 2013 19:50:54 -0400 Subject: [PATCH] gitignore: ignore clang --analyze output diff --git a/0039-man-add-more-markup-to-udevadm-8.patch b/0039-man-add-more-markup-to-udevadm-8.patch index 7c14c0b..bc60114 100644 --- a/0039-man-add-more-markup-to-udevadm-8.patch +++ b/0039-man-add-more-markup-to-udevadm-8.patch @@ -1,4 +1,4 @@ -From 83a4e0160b3756222b0c8e8d220c5cc07cc76a40 Mon Sep 17 00:00:00 2001 +From 2fefc1a2891620d57aff93ac5c9f486b441ffbbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 13 Oct 2013 19:43:19 -0400 Subject: [PATCH] man: add more markup to udevadm(8) diff --git a/0040-shared-util-Fix-glob_extend-argument.patch b/0040-shared-util-Fix-glob_extend-argument.patch index ff1837b..107ce08 100644 --- a/0040-shared-util-Fix-glob_extend-argument.patch +++ b/0040-shared-util-Fix-glob_extend-argument.patch @@ -1,4 +1,4 @@ -From 4d2a7145666c91f0ba63dd5c6937b15339b42b0c Mon Sep 17 00:00:00 2001 +From 87aaa9cab7b5f50e8f780cff35af2c3b09065427 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 14 Oct 2013 08:15:51 +0200 Subject: [PATCH] shared/util: Fix glob_extend() argument diff --git a/0041-Fix-bad-assert-in-show_pid_array.patch b/0041-Fix-bad-assert-in-show_pid_array.patch index 4042ba6..056b524 100644 --- a/0041-Fix-bad-assert-in-show_pid_array.patch +++ b/0041-Fix-bad-assert-in-show_pid_array.patch @@ -1,4 +1,4 @@ -From ce626319c273383a8f8d1a7d9f549f4d487699ea Mon Sep 17 00:00:00 2001 +From d41f56e59b48e1e05f917e97f27d0931c492a60f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 14 Oct 2013 19:15:24 -0400 Subject: [PATCH] Fix bad assert in show_pid_array diff --git a/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch b/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch index f9158e9..6e7de85 100644 --- a/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch +++ b/0042-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch @@ -1,4 +1,4 @@ -From cd1338b7abe6d300ce66051f3490f35c8b4d1443 Mon Sep 17 00:00:00 2001 +From 6a5ca4af4911b8dee459ab409e73929ab57f6c82 Mon Sep 17 00:00:00 2001 From: Igor Zhbanov Date: Tue, 15 Oct 2013 14:35:13 +0400 Subject: [PATCH] Fix for SIGSEGV in systemd-bootchart on short-living diff --git a/0043-man-document-the-b-special-boot-option.patch b/0043-man-document-the-b-special-boot-option.patch index 6cedef6..68627ed 100644 --- a/0043-man-document-the-b-special-boot-option.patch +++ b/0043-man-document-the-b-special-boot-option.patch @@ -1,4 +1,4 @@ -From 3dca881397af86883639ab25f27dfb605acc2a2c Mon Sep 17 00:00:00 2001 +From 48a7472dbd791622bd97d7e211207e014c526705 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 15 Oct 2013 08:58:50 +0200 Subject: [PATCH] man: document the -b special boot option diff --git a/0044-logind-allow-unprivileged-session-device-access.patch b/0044-logind-allow-unprivileged-session-device-access.patch index 39962fa..1d83a5b 100644 --- a/0044-logind-allow-unprivileged-session-device-access.patch +++ b/0044-logind-allow-unprivileged-session-device-access.patch @@ -1,4 +1,4 @@ -From 6d3e661d97dd6157381ca1dd52b839e2049b86b5 Mon Sep 17 00:00:00 2001 +From 7f5331b7b4f945204c6a7efe24dd8c131e132f1d Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 15 Oct 2013 21:13:39 +0200 Subject: [PATCH] logind: allow unprivileged session-device access diff --git a/0045-rules-expose-loop-block-devices-to-systemd.patch b/0045-rules-expose-loop-block-devices-to-systemd.patch index 6119d6e..f67e788 100644 --- a/0045-rules-expose-loop-block-devices-to-systemd.patch +++ b/0045-rules-expose-loop-block-devices-to-systemd.patch @@ -1,4 +1,4 @@ -From 78846d19d3569cf637d2e37c10e75395ebcf9d06 Mon Sep 17 00:00:00 2001 +From 342a404f2a09afd6c957116052f15fc99ce4de27 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 Oct 2013 02:49:54 +0200 Subject: [PATCH] rules: expose loop block devices to systemd diff --git a/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch b/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch index 9aea829..eb3b594 100644 --- a/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch +++ b/0046-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch @@ -1,4 +1,4 @@ -From 9a3296571683a6a3eaee44d18db91ca113841da6 Mon Sep 17 00:00:00 2001 +From 7c6ed28afab4cf2a7ab0fbdf7cd8f95fd99a5529 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 Oct 2013 02:51:24 +0200 Subject: [PATCH] rules: don't limit some of the rules to the "add" action diff --git a/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch b/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch index a02d654..9a54a4a 100644 --- a/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch +++ b/0047-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch @@ -1,4 +1,4 @@ -From bc3ae365890fa52f9beca1a67744a0fcbdcb5f82 Mon Sep 17 00:00:00 2001 +From fa5ad41f9931b378c7b6c95df433f39c9b9b36f4 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 17 Oct 2013 03:20:46 +0200 Subject: [PATCH] tmpfiles: log unaccessible FUSE mount points only as debug diff --git a/0048-hwdb-update.patch b/0048-hwdb-update.patch index 6d8d820..32c82a0 100644 --- a/0048-hwdb-update.patch +++ b/0048-hwdb-update.patch @@ -1,4 +1,4 @@ -From d7490751d3036a2b01ac74cdf4b632803f0b9ea9 Mon Sep 17 00:00:00 2001 +From 98cd991470905d861e9034a3f61e0091a2c1d168 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sun, 20 Oct 2013 01:12:29 +0200 Subject: [PATCH] hwdb: update diff --git a/0049-rules-remove-pointless-MODE-settings.patch b/0049-rules-remove-pointless-MODE-settings.patch index 32aeb01..c421a31 100644 --- a/0049-rules-remove-pointless-MODE-settings.patch +++ b/0049-rules-remove-pointless-MODE-settings.patch @@ -1,4 +1,4 @@ -From 431e477b8e66ddbaba28a9f59fb8ae2e16d59cb5 Mon Sep 17 00:00:00 2001 +From 0e0e285f98abbce3763131ce95fecd68e15368d2 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 21 Oct 2013 03:49:03 +0200 Subject: [PATCH] rules: remove pointless MODE= settings diff --git a/0050-analyze-set-white-backgound.patch b/0050-analyze-set-white-backgound.patch index f531a11..742738d 100644 --- a/0050-analyze-set-white-backgound.patch +++ b/0050-analyze-set-white-backgound.patch @@ -1,4 +1,4 @@ -From ff86c42c8614828be77810a50202e1f771b35ff3 Mon Sep 17 00:00:00 2001 +From a2ea772c697c8e3abb34e37216205c8d8f7659a2 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Mon, 21 Oct 2013 21:29:23 +0200 Subject: [PATCH] analyze: set white backgound diff --git a/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch b/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch index 6603792..21b60b3 100644 --- a/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch +++ b/0051-shell-completion-dump-has-moved-to-systemd-analyze.patch @@ -1,4 +1,4 @@ -From 8ee1b98e2f4d4d36d9fccc776aa3fb124d05ac9b Mon Sep 17 00:00:00 2001 +From cd8596ed35691c0fff2f527ca963c5e9de0ea4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 21 Oct 2013 18:53:57 -0400 Subject: [PATCH] shell-completion: dump has moved to systemd-analyze diff --git a/0052-systemd-use-unit-name-in-PrivateTmp-directories.patch b/0052-systemd-use-unit-name-in-PrivateTmp-directories.patch index 8316ef2..62e96b5 100644 --- a/0052-systemd-use-unit-name-in-PrivateTmp-directories.patch +++ b/0052-systemd-use-unit-name-in-PrivateTmp-directories.patch @@ -1,4 +1,4 @@ -From df3db39c105ff8a6ba409ae8e28216d8571dece7 Mon Sep 17 00:00:00 2001 +From 730cb1d24ea7a339b06b0b513b6e99c2c7d01004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 22 Oct 2013 20:39:18 -0400 Subject: [PATCH] systemd: use unit name in PrivateTmp directories diff --git a/0053-catalog-remove-links-to-non-existent-wiki-pages.patch b/0053-catalog-remove-links-to-non-existent-wiki-pages.patch index 71f5c18..48fa36f 100644 --- a/0053-catalog-remove-links-to-non-existent-wiki-pages.patch +++ b/0053-catalog-remove-links-to-non-existent-wiki-pages.patch @@ -1,4 +1,4 @@ -From 5048d22d69d889d17eaea99f223fd9369eadc919 Mon Sep 17 00:00:00 2001 +From ee48fe63b1dac38cbc80a733b1ef8bcc53d8b1fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 24 Oct 2013 00:45:10 -0400 Subject: [PATCH] catalog: remove links to non-existent wiki pages diff --git a/0054-journalctl-add-list-boots-to-show-boot-IDs-and-times.patch b/0054-journalctl-add-list-boots-to-show-boot-IDs-and-times.patch index 5e776ec..d9e140b 100644 --- a/0054-journalctl-add-list-boots-to-show-boot-IDs-and-times.patch +++ b/0054-journalctl-add-list-boots-to-show-boot-IDs-and-times.patch @@ -1,4 +1,4 @@ -From e94957b964380c0c9b0f3264ba5e35166d543ca7 Mon Sep 17 00:00:00 2001 +From 7c185c94af054145b3621e11ad4c3359931ca8fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 28 Oct 2013 23:43:57 -0400 Subject: [PATCH] journalctl: add --list-boots to show boot IDs and times diff --git a/0055-udev-builtin-path_id-add-support-for-bcma-bus.patch b/0055-udev-builtin-path_id-add-support-for-bcma-bus.patch index ec7a3cb..aa6fda3 100644 --- a/0055-udev-builtin-path_id-add-support-for-bcma-bus.patch +++ b/0055-udev-builtin-path_id-add-support-for-bcma-bus.patch @@ -1,4 +1,4 @@ -From d22ea78deff9fe2c87a3a90381ae2d4e8234d1ca Mon Sep 17 00:00:00 2001 +From 4253b511b986b2e37735a79885effd871b9a07f3 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 26 Oct 2013 12:22:04 +0200 Subject: [PATCH] udev-builtin: path_id - add support for bcma bus diff --git a/0056-udev-ata_id-log-faling-ioctls-as-debug.patch b/0056-udev-ata_id-log-faling-ioctls-as-debug.patch index 2011cb6..7b27d81 100644 --- a/0056-udev-ata_id-log-faling-ioctls-as-debug.patch +++ b/0056-udev-ata_id-log-faling-ioctls-as-debug.patch @@ -1,4 +1,4 @@ -From e323253480b01f0df71ee409cbf9aba88ec1a5e4 Mon Sep 17 00:00:00 2001 +From ecd905af9b322957712e23046baed1514aba5819 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 30 Oct 2013 14:34:58 +0100 Subject: [PATCH] udev: ata_id: log faling ioctls as "debug" diff --git a/0057-libudev-default-log_priority-to-INFO.patch b/0057-libudev-default-log_priority-to-INFO.patch index 3db1618..43fd16c 100644 --- a/0057-libudev-default-log_priority-to-INFO.patch +++ b/0057-libudev-default-log_priority-to-INFO.patch @@ -1,4 +1,4 @@ -From d0aeff58c118ae0be82d346ae0ce75bf9a20f02d Mon Sep 17 00:00:00 2001 +From 84d779c769c812677b94ce23d04b656af72b1ccc Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Wed, 30 Oct 2013 15:09:01 +0100 Subject: [PATCH] libudev: default log_priority to INFO diff --git a/0058-nspawn-only-pass-in-slice-setting-if-it-is-set.patch b/0058-nspawn-only-pass-in-slice-setting-if-it-is-set.patch index 8984b65..5e54415 100644 --- a/0058-nspawn-only-pass-in-slice-setting-if-it-is-set.patch +++ b/0058-nspawn-only-pass-in-slice-setting-if-it-is-set.patch @@ -1,4 +1,4 @@ -From 7aa2bfdb3b0c3babc6bb8c4a9534a328b8ac37ab Mon Sep 17 00:00:00 2001 +From 8574653382521a2100b0ef22ed3b3cdd341a6425 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 30 Oct 2013 18:40:21 +0100 Subject: [PATCH] nspawn: only pass in slice setting if it is set diff --git a/0059-zsh-completion-add-systemd-run.patch b/0059-zsh-completion-add-systemd-run.patch index 471061e..3434010 100644 --- a/0059-zsh-completion-add-systemd-run.patch +++ b/0059-zsh-completion-add-systemd-run.patch @@ -1,4 +1,4 @@ -From 0f25880b6e0feea046923d2d796e6e10abdd7c6a Mon Sep 17 00:00:00 2001 +From 72a0befe3e1f4462afde44c1d4818241b58c8bc9 Mon Sep 17 00:00:00 2001 From: Ronny Chevalier Date: Wed, 30 Oct 2013 21:57:44 +0100 Subject: [PATCH] zsh-completion: add systemd-run diff --git a/0060-man-explain-NAME-in-systemctl-man-page.patch b/0060-man-explain-NAME-in-systemctl-man-page.patch index face639..aa93495 100644 --- a/0060-man-explain-NAME-in-systemctl-man-page.patch +++ b/0060-man-explain-NAME-in-systemctl-man-page.patch @@ -1,4 +1,4 @@ -From 04547df8f2b71ec3fb4e18e9363da583264a3915 Mon Sep 17 00:00:00 2001 +From 457490196dbf2ad0cd1a31cfd63b8eb9606e9981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Pavl=C3=ADn?= Date: Thu, 31 Oct 2013 14:36:41 +0100 Subject: [PATCH] man: explain NAME in systemctl man page diff --git a/0061-virt-move-caching-of-virtualization-check-results-in.patch b/0061-virt-move-caching-of-virtualization-check-results-in.patch index eda77ac..de8c5f6 100644 --- a/0061-virt-move-caching-of-virtualization-check-results-in.patch +++ b/0061-virt-move-caching-of-virtualization-check-results-in.patch @@ -1,4 +1,4 @@ -From 48a66a7f6a23ee71bcf54da5bd0bbd69a0710582 Mon Sep 17 00:00:00 2001 +From 99af0b814cc849298a7acf9236bfa9847a38685d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 31 Oct 2013 16:23:06 +0100 Subject: [PATCH] virt: move caching of virtualization check results into diff --git a/0062-systemctl-fix-typo-in-help-text.patch b/0062-systemctl-fix-typo-in-help-text.patch index 3ce5b45..fdc6f82 100644 --- a/0062-systemctl-fix-typo-in-help-text.patch +++ b/0062-systemctl-fix-typo-in-help-text.patch @@ -1,4 +1,4 @@ -From 93a311b380a9c7367efe46fbc1d45902a9abcff5 Mon Sep 17 00:00:00 2001 +From ce33b14b1dcf1837618aa42bddf46994eb6b1af1 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Fri, 1 Nov 2013 20:46:49 +0100 Subject: [PATCH] systemctl: fix typo in help text diff --git a/0063-analyze-plot-place-the-text-on-the-side-with-most-sp.patch b/0063-analyze-plot-place-the-text-on-the-side-with-most-sp.patch index 1786814..d92c591 100644 --- a/0063-analyze-plot-place-the-text-on-the-side-with-most-sp.patch +++ b/0063-analyze-plot-place-the-text-on-the-side-with-most-sp.patch @@ -1,4 +1,4 @@ -From 319b9f00eb3d84744453ae70bf9c89c37131124b Mon Sep 17 00:00:00 2001 +From 14934e15ab96b3bd1932d257ec7e62a53fcbe35a Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Fri, 1 Nov 2013 22:57:47 +0100 Subject: [PATCH] analyze: plot: place the text on the side with most space diff --git a/0064-detect_virtualization-returns-NULL-pass-empty-string.patch b/0064-detect_virtualization-returns-NULL-pass-empty-string.patch index 02a7316..96926e2 100644 --- a/0064-detect_virtualization-returns-NULL-pass-empty-string.patch +++ b/0064-detect_virtualization-returns-NULL-pass-empty-string.patch @@ -1,4 +1,4 @@ -From 855359a615a6002ac601a778f12e60970f18c64f Mon Sep 17 00:00:00 2001 +From ea98de45c8ba12898b83ae53907082b8a225cfc6 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Sat, 2 Nov 2013 00:01:32 +0100 Subject: [PATCH] detect_virtualization() returns NULL; pass empty string to diff --git a/0065-rules-load-path_id-on-DRM-devices.patch b/0065-rules-load-path_id-on-DRM-devices.patch index 620f14a..0f2623a 100644 --- a/0065-rules-load-path_id-on-DRM-devices.patch +++ b/0065-rules-load-path_id-on-DRM-devices.patch @@ -1,4 +1,4 @@ -From 0af3aeb44697533df2bc79d0985b65bca6b8cd86 Mon Sep 17 00:00:00 2001 +From 52099229bcce9724fa050f7ff7249bb483d2fecc Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sun, 3 Nov 2013 13:01:20 +0100 Subject: [PATCH] rules: load path_id on DRM devices diff --git a/0066-rules-simply-60-drm.rules.patch b/0066-rules-simply-60-drm.rules.patch index b19766b..66930c0 100644 --- a/0066-rules-simply-60-drm.rules.patch +++ b/0066-rules-simply-60-drm.rules.patch @@ -1,4 +1,4 @@ -From 5700379e437756e1e7a2508b238c8220367292bc Mon Sep 17 00:00:00 2001 +From 56fd14a7e3671e1d9163fffd378a1985d42b1b4d Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sun, 3 Nov 2013 16:17:14 +0100 Subject: [PATCH] rules: simply 60-drm.rules diff --git a/0067-udev-builtin-keyboard-Fix-large-scan-codes-on-32-bit.patch b/0067-udev-builtin-keyboard-Fix-large-scan-codes-on-32-bit.patch index 889ab51..0233d16 100644 --- a/0067-udev-builtin-keyboard-Fix-large-scan-codes-on-32-bit.patch +++ b/0067-udev-builtin-keyboard-Fix-large-scan-codes-on-32-bit.patch @@ -1,4 +1,4 @@ -From 4f0d2ef232fe578576a2bec5076fda19de15ff27 Mon Sep 17 00:00:00 2001 +From 470bfa21f6213565126f8447de6126b5b2377e7b Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 4 Nov 2013 07:25:45 +0100 Subject: [PATCH] udev-builtin-keyboard: Fix large scan codes on 32 bit diff --git a/0068-nspawn-log-out-of-memory-errors.patch b/0068-nspawn-log-out-of-memory-errors.patch index bef1d8b..406c222 100644 --- a/0068-nspawn-log-out-of-memory-errors.patch +++ b/0068-nspawn-log-out-of-memory-errors.patch @@ -1,4 +1,4 @@ -From 30304d0fd69e703992c62ab3bcabcc6239f5fe1c Mon Sep 17 00:00:00 2001 +From 4f54a2da178f683d7c7b86df6aa3b873802dcea0 Mon Sep 17 00:00:00 2001 From: Djalal Harouni Date: Tue, 5 Nov 2013 15:26:37 +0100 Subject: [PATCH] nspawn: log out of memory errors diff --git a/0069-Configurable-Timeouts-Restarts-default-values.patch b/0069-Configurable-Timeouts-Restarts-default-values.patch index 1711fd3..a0597cc 100644 --- a/0069-Configurable-Timeouts-Restarts-default-values.patch +++ b/0069-Configurable-Timeouts-Restarts-default-values.patch @@ -1,4 +1,4 @@ -From f9d232e896bec3301a20a33a38a87b102f0172bc Mon Sep 17 00:00:00 2001 +From 2b3474ddf48ce7fb4e04221f767b363a0706753d Mon Sep 17 00:00:00 2001 From: Oleksii Shevchuk Date: Mon, 4 Nov 2013 18:47:43 +0200 Subject: [PATCH] Configurable Timeouts/Restarts default values diff --git a/0070-man-fix-typo.patch b/0070-man-fix-typo.patch index 8c3a68c..fb4fc47 100644 --- a/0070-man-fix-typo.patch +++ b/0070-man-fix-typo.patch @@ -1,4 +1,4 @@ -From 6f0949daa0b7f4928a7abb8e26ded604988f8efc Mon Sep 17 00:00:00 2001 +From 2fb9ec2d99e654fa4bc71f9c90a7fdee7a7eaa17 Mon Sep 17 00:00:00 2001 From: Ronny Chevalier Date: Sun, 3 Nov 2013 15:07:31 +0100 Subject: [PATCH] man: fix typo diff --git a/0071-man-do-not-use-term-in-para.patch b/0071-man-do-not-use-term-in-para.patch index cbea9ce..9a9ea2e 100644 --- a/0071-man-do-not-use-term-in-para.patch +++ b/0071-man-do-not-use-term-in-para.patch @@ -1,4 +1,4 @@ -From 6547d848002537063bf0d5457e56ebd15ed947b0 Mon Sep 17 00:00:00 2001 +From 771b7c8755ff3ce69e26bacf9487a8ec1b859093 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 5 Nov 2013 21:34:50 +0100 Subject: [PATCH] man: do not use in diff --git a/0072-cgroup-run-PID-1-in-the-root-cgroup.patch b/0072-cgroup-run-PID-1-in-the-root-cgroup.patch index b2d7b57..7266ea0 100644 --- a/0072-cgroup-run-PID-1-in-the-root-cgroup.patch +++ b/0072-cgroup-run-PID-1-in-the-root-cgroup.patch @@ -1,4 +1,4 @@ -From 298f884a265c1c4b30cce7467650cc4a165a284e Mon Sep 17 00:00:00 2001 +From f9de310f2d0e4394c2cb084f95dfa64a5f58b9a0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 5 Nov 2013 22:14:52 +0100 Subject: [PATCH] cgroup: run PID 1 in the root cgroup diff --git a/0073-shutdown-trim-the-cgroup-tree-on-loop-iteration.patch b/0073-shutdown-trim-the-cgroup-tree-on-loop-iteration.patch index 88edf87..1721729 100644 --- a/0073-shutdown-trim-the-cgroup-tree-on-loop-iteration.patch +++ b/0073-shutdown-trim-the-cgroup-tree-on-loop-iteration.patch @@ -1,4 +1,4 @@ -From db296e9f3e78b9694464dbde956d04f6621125ed Mon Sep 17 00:00:00 2001 +From f7feb791d476d2248c3f8df089092996262e9a23 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 5 Nov 2013 22:17:03 +0100 Subject: [PATCH] shutdown: trim the cgroup tree on loop iteration diff --git a/0074-nspawn-split-out-pty-forwaring-logic-into-ptyfwd.c.patch b/0074-nspawn-split-out-pty-forwaring-logic-into-ptyfwd.c.patch index f1571da..de83e49 100644 --- a/0074-nspawn-split-out-pty-forwaring-logic-into-ptyfwd.c.patch +++ b/0074-nspawn-split-out-pty-forwaring-logic-into-ptyfwd.c.patch @@ -1,4 +1,4 @@ -From f1b1f3bab4764964d12a62aba1cdbd71ec6415ae Mon Sep 17 00:00:00 2001 +From ea46660942050162d9fcf8ec9582272d5fa68203 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 30 Oct 2013 18:58:59 +0100 Subject: [PATCH] nspawn: split out pty forwaring logic into ptyfwd.c diff --git a/0075-nspawn-explicitly-terminate-machines-when-we-exit-ns.patch b/0075-nspawn-explicitly-terminate-machines-when-we-exit-ns.patch index 0edaeb7..a268d32 100644 --- a/0075-nspawn-explicitly-terminate-machines-when-we-exit-ns.patch +++ b/0075-nspawn-explicitly-terminate-machines-when-we-exit-ns.patch @@ -1,4 +1,4 @@ -From 546f518baf5c1cb083030fe2b3de751f160e5eea Mon Sep 17 00:00:00 2001 +From 34b8fd165b187dd271d92b6ecaef89b056b4f742 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 Nov 2013 02:05:06 +0100 Subject: [PATCH] nspawn: explicitly terminate machines when we exit nspawn diff --git a/0076-run-support-system-to-match-other-commands-even-if-r.patch b/0076-run-support-system-to-match-other-commands-even-if-r.patch index 4081aa1..e8b70d8 100644 --- a/0076-run-support-system-to-match-other-commands-even-if-r.patch +++ b/0076-run-support-system-to-match-other-commands-even-if-r.patch @@ -1,4 +1,4 @@ -From 9888a5919971d6eacd1ca025c1d4197248022319 Mon Sep 17 00:00:00 2001 +From e1404d93e4dbacf2a16e5a7d4757dd15317ed05d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 6 Nov 2013 17:31:20 +0100 Subject: [PATCH] run: support --system to match other commands, even if diff --git a/0077-acpi-fpdt-break-on-zero-or-negative-length-read.patch b/0077-acpi-fpdt-break-on-zero-or-negative-length-read.patch index 778d99e..752e107 100644 --- a/0077-acpi-fpdt-break-on-zero-or-negative-length-read.patch +++ b/0077-acpi-fpdt-break-on-zero-or-negative-length-read.patch @@ -1,4 +1,4 @@ -From 98f6a4dfe1d6e601ddd2b59c42e8fc16193d187b Mon Sep 17 00:00:00 2001 +From e3af95f3c8bf6f7e52cc848d7330d5d00deec35b Mon Sep 17 00:00:00 2001 From: Pavel Holica Date: Wed, 6 Nov 2013 23:24:16 +0100 Subject: [PATCH] acpi-fpdt: break on zero or negative length read diff --git a/0078-man-add-rationale-into-systemd-halt-8.patch b/0078-man-add-rationale-into-systemd-halt-8.patch index c8cf0aa..0e0d539 100644 --- a/0078-man-add-rationale-into-systemd-halt-8.patch +++ b/0078-man-add-rationale-into-systemd-halt-8.patch @@ -1,4 +1,4 @@ -From 85f85783569c4a662262c7b7579fb130d25ccd42 Mon Sep 17 00:00:00 2001 +From a3db436909aadc7f77911285e6cd667c47045a67 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 7 Nov 2013 01:17:49 +0100 Subject: [PATCH] man: add rationale into systemd-halt(8) diff --git a/0079-systemd-python-convert-keyword-value-to-string.patch b/0079-systemd-python-convert-keyword-value-to-string.patch index f66c752..91a5ff1 100644 --- a/0079-systemd-python-convert-keyword-value-to-string.patch +++ b/0079-systemd-python-convert-keyword-value-to-string.patch @@ -1,4 +1,4 @@ -From 044615d3520fe1884b6d1c410b99c26c0b02d41a Mon Sep 17 00:00:00 2001 +From 395932dfebaa4d9b4ef91857802d222484fd610e Mon Sep 17 00:00:00 2001 From: Richard Marko Date: Tue, 5 Nov 2013 15:41:20 +0100 Subject: [PATCH] systemd-python: convert keyword value to string diff --git a/0080-systemctl-make-LOAD-column-width-dynamic.patch b/0080-systemctl-make-LOAD-column-width-dynamic.patch index f37ecc4..e1e126c 100644 --- a/0080-systemctl-make-LOAD-column-width-dynamic.patch +++ b/0080-systemctl-make-LOAD-column-width-dynamic.patch @@ -1,4 +1,4 @@ -From 4beb4dc09a06e36a5831530115f1a14beeaa436a Mon Sep 17 00:00:00 2001 +From 3acbdd7f02877815432a4a7a547da575b72d1144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= Date: Mon, 4 Nov 2013 23:01:17 +0200 Subject: [PATCH] systemctl: make LOAD column width dynamic diff --git a/0081-Make-hibernation-test-work-for-swap-files.patch b/0081-Make-hibernation-test-work-for-swap-files.patch index 6f096f8..8630a35 100644 --- a/0081-Make-hibernation-test-work-for-swap-files.patch +++ b/0081-Make-hibernation-test-work-for-swap-files.patch @@ -1,4 +1,4 @@ -From a5fd1d54d63e9e5861113fd30911949a148921e1 Mon Sep 17 00:00:00 2001 +From 4c6e52522bc1264949f346e0607eb145011728ff Mon Sep 17 00:00:00 2001 From: Jan Janssen Date: Thu, 31 Oct 2013 17:22:03 +0100 Subject: [PATCH] Make hibernation test work for swap files diff --git a/0082-man-add-docs-for-sd_is_special-and-some-man-page-sym.patch b/0082-man-add-docs-for-sd_is_special-and-some-man-page-sym.patch index 249e1ef..adfcb18 100644 --- a/0082-man-add-docs-for-sd_is_special-and-some-man-page-sym.patch +++ b/0082-man-add-docs-for-sd_is_special-and-some-man-page-sym.patch @@ -1,4 +1,4 @@ -From 82e54a15fa202a67c9a9d2e53aad660f8a5ff36c Mon Sep 17 00:00:00 2001 +From fbefdc24d1f9a4cecb85fbd42c3f027941a1c9fe Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 7 Nov 2013 17:51:09 +0100 Subject: [PATCH] man: add docs for sd_is_special() and some man page symlinks diff --git a/0083-systemctl-return-r-instead-of-always-returning-0.patch b/0083-systemctl-return-r-instead-of-always-returning-0.patch index 77b647f..7bba18a 100644 --- a/0083-systemctl-return-r-instead-of-always-returning-0.patch +++ b/0083-systemctl-return-r-instead-of-always-returning-0.patch @@ -1,4 +1,4 @@ -From 94c73ca7e22de4355f8ef32ea30ddf1ef8dae662 Mon Sep 17 00:00:00 2001 +From 6b867443d99feefaa911ac55e9a6b16ed7c1b811 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Wed, 6 Nov 2013 11:18:02 +0100 Subject: [PATCH] systemctl: return r instead of always returning 0 diff --git a/0084-journal-fix-minor-memory-leak.patch b/0084-journal-fix-minor-memory-leak.patch index 0cf84fb..2841e08 100644 --- a/0084-journal-fix-minor-memory-leak.patch +++ b/0084-journal-fix-minor-memory-leak.patch @@ -1,4 +1,4 @@ -From e46b85ec8f333d1bdd0e66b99530965c7781110b Mon Sep 17 00:00:00 2001 +From 2bef355ec58002ffec2b1a72e7373dc72f175bf6 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 8 Nov 2013 13:53:25 +0100 Subject: [PATCH] journal: fix minor memory leak diff --git a/0085-manager-configurable-StartLimit-default-values.patch b/0085-manager-configurable-StartLimit-default-values.patch index bbf7780..88cbb8c 100644 --- a/0085-manager-configurable-StartLimit-default-values.patch +++ b/0085-manager-configurable-StartLimit-default-values.patch @@ -1,4 +1,4 @@ -From 9e694cd271f7bce2ad7a77de03b66d493ca5dd61 Mon Sep 17 00:00:00 2001 +From a113780cce01ad0ebd3c3b54bcbd0756b1eb9482 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Fri, 8 Nov 2013 16:01:22 +0100 Subject: [PATCH] manager: configurable StartLimit default values diff --git a/0086-man-units-fix-installation-of-systemd-nspawn-.servic.patch b/0086-man-units-fix-installation-of-systemd-nspawn-.servic.patch index adc022c..d9d230f 100644 --- a/0086-man-units-fix-installation-of-systemd-nspawn-.servic.patch +++ b/0086-man-units-fix-installation-of-systemd-nspawn-.servic.patch @@ -1,4 +1,4 @@ -From 4108d06603404e70b93747e156213eb59ed8bc27 Mon Sep 17 00:00:00 2001 +From d91e577c4e241bd16b982b31000df40799858a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 7 Nov 2013 23:57:19 -0500 Subject: [PATCH] man,units: fix installation of systemd-nspawn@.service and diff --git a/0087-systemd-fix-memory-leak-in-cgroup-code.patch b/0087-systemd-fix-memory-leak-in-cgroup-code.patch index 292241d..3908431 100644 --- a/0087-systemd-fix-memory-leak-in-cgroup-code.patch +++ b/0087-systemd-fix-memory-leak-in-cgroup-code.patch @@ -1,4 +1,4 @@ -From 7930484abfb17a9c72efdd93ebfc4637ad2be738 Mon Sep 17 00:00:00 2001 +From d204c3b3f4225652f0b7264b289a481c6b7b076c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 8 Nov 2013 08:41:13 -0500 Subject: [PATCH] systemd: fix memory leak in cgroup code diff --git a/0088-button-don-t-exit-if-we-cannot-handle-a-button-press.patch b/0088-button-don-t-exit-if-we-cannot-handle-a-button-press.patch index d8f59d7..250bef2 100644 --- a/0088-button-don-t-exit-if-we-cannot-handle-a-button-press.patch +++ b/0088-button-don-t-exit-if-we-cannot-handle-a-button-press.patch @@ -1,4 +1,4 @@ -From 12a195707153882b1df1b1503b51703a81c85de6 Mon Sep 17 00:00:00 2001 +From 4a0c09ccb4ba02fca9730c8e7cb68e41deb181ca Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 10 Nov 2013 23:05:08 +0100 Subject: [PATCH] button: don't exit if we cannot handle a button press diff --git a/0089-timer-properly-format-relative-timestamps-in-the-fut.patch b/0089-timer-properly-format-relative-timestamps-in-the-fut.patch index 81db5ad..73e669a 100644 --- a/0089-timer-properly-format-relative-timestamps-in-the-fut.patch +++ b/0089-timer-properly-format-relative-timestamps-in-the-fut.patch @@ -1,4 +1,4 @@ -From d5910017f2cfaea144f766a3fb772b53f8d9dcbf Mon Sep 17 00:00:00 2001 +From 8883cb66c96692625916d4350b93c557d3b86b88 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 11 Nov 2013 03:02:52 +0100 Subject: [PATCH] timer: properly format relative timestamps in the future diff --git a/0090-timer-consider-usec_t-1-an-invalid-timestamp.patch b/0090-timer-consider-usec_t-1-an-invalid-timestamp.patch index 54b9943..a45702d 100644 --- a/0090-timer-consider-usec_t-1-an-invalid-timestamp.patch +++ b/0090-timer-consider-usec_t-1-an-invalid-timestamp.patch @@ -1,4 +1,4 @@ -From a0598047e4bfd308a25b9a516529ab49074fa527 Mon Sep 17 00:00:00 2001 +From d5a8cc7503ed9d54ed6b7e76e211deaa1b701125 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 11 Nov 2013 03:03:17 +0100 Subject: [PATCH] timer: consider (usec_t) -1 an invalid timestamp diff --git a/0091-udev-usb_id-remove-obsoleted-bInterfaceSubClass-5-ma.patch b/0091-udev-usb_id-remove-obsoleted-bInterfaceSubClass-5-ma.patch index 45ff980..0b6f54f 100644 --- a/0091-udev-usb_id-remove-obsoleted-bInterfaceSubClass-5-ma.patch +++ b/0091-udev-usb_id-remove-obsoleted-bInterfaceSubClass-5-ma.patch @@ -1,4 +1,4 @@ -From 7583c92b266cd632712ced40be837f52a8de9715 Mon Sep 17 00:00:00 2001 +From 148eee542c3274fdcb9b3233f00532ea17d34e42 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 11 Oct 2013 11:23:34 +0200 Subject: [PATCH] udev: usb_id - remove obsoleted bInterfaceSubClass == 5 match diff --git a/0092-Add-support-for-saving-restoring-keyboard-backlights.patch b/0092-Add-support-for-saving-restoring-keyboard-backlights.patch index 0b3a777..1622449 100644 --- a/0092-Add-support-for-saving-restoring-keyboard-backlights.patch +++ b/0092-Add-support-for-saving-restoring-keyboard-backlights.patch @@ -1,4 +1,4 @@ -From e7e2208e73ccc4a93dc87d1fc4624be0dbe3e747 Mon Sep 17 00:00:00 2001 +From 4c7c750f00de1f8649f8397c0579e47868d380f2 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Fri, 11 Oct 2013 09:45:32 +0200 Subject: [PATCH] Add support for saving/restoring keyboard backlights diff --git a/0093-static-nodes-don-t-call-mkdir.patch b/0093-static-nodes-don-t-call-mkdir.patch index 3fa8043..794c862 100644 --- a/0093-static-nodes-don-t-call-mkdir.patch +++ b/0093-static-nodes-don-t-call-mkdir.patch @@ -1,4 +1,4 @@ -From fada68e9f922a3a6a176092a7abdeec0b58408e8 Mon Sep 17 00:00:00 2001 +From 0e3ff7da8e53b30ae0a5534beceee46adc14b3ef Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 17 Oct 2013 19:49:19 +0200 Subject: [PATCH] static-nodes: don't call mkdir diff --git a/0094-Fix-kmod-error-message-to-have-correct-version-requi.patch b/0094-Fix-kmod-error-message-to-have-correct-version-requi.patch index 7d2503b..099bb52 100644 --- a/0094-Fix-kmod-error-message-to-have-correct-version-requi.patch +++ b/0094-Fix-kmod-error-message-to-have-correct-version-requi.patch @@ -1,4 +1,4 @@ -From 6ff7db9dcee918b020f6c50e2785785b2b9ca854 Mon Sep 17 00:00:00 2001 +From 7a06ad3ac70904983ef1f2add835dab74124bf6c Mon Sep 17 00:00:00 2001 From: David Strauss Date: Thu, 17 Oct 2013 13:19:29 -0700 Subject: [PATCH] Fix kmod error message to have correct version requirement diff --git a/0095-systemd-python-fix-booted-and-add-two-functions-to-d.patch b/0095-systemd-python-fix-booted-and-add-two-functions-to-d.patch index 79e1292..c847312 100644 --- a/0095-systemd-python-fix-booted-and-add-two-functions-to-d.patch +++ b/0095-systemd-python-fix-booted-and-add-two-functions-to-d.patch @@ -1,13 +1,12 @@ -From 57db3ee2c1aa714f6fc88a40043bf531f155843c Mon Sep 17 00:00:00 2001 +From c914a2beb806b5a004935dfd3725f5d0fe87fe77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 11 Nov 2013 19:53:59 -0500 Subject: [PATCH] systemd-python: fix booted() and add two functions to docs For some reason sphinx doesn't want to show inherited C functions. --- - src/python-systemd/_daemon.c | 2 +- - src/python-systemd/docs/daemon.rst | 2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) + src/python-systemd/_daemon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/python-systemd/_daemon.c b/src/python-systemd/_daemon.c index 6b84fb8..f0ab16f 100644 diff --git a/0096-activate-mention-E-in-the-help-text.patch b/0096-activate-mention-E-in-the-help-text.patch index e01f913..36519d7 100644 --- a/0096-activate-mention-E-in-the-help-text.patch +++ b/0096-activate-mention-E-in-the-help-text.patch @@ -1,4 +1,4 @@ -From 8aa997f8e2e0ff3d801c1a3fe4065edc940c41f1 Mon Sep 17 00:00:00 2001 +From f4390a76a800e95b2923bcc88c3691a4435447c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= Date: Wed, 13 Nov 2013 13:36:17 +0200 Subject: [PATCH] activate: mention -E in the help text diff --git a/0097-activate-fix-crash-when-s-is-passed.patch b/0097-activate-fix-crash-when-s-is-passed.patch index bc81890..b3fa83c 100644 --- a/0097-activate-fix-crash-when-s-is-passed.patch +++ b/0097-activate-fix-crash-when-s-is-passed.patch @@ -1,4 +1,4 @@ -From 767d458826e99cc55aeccb65c469124be61851a0 Mon Sep 17 00:00:00 2001 +From 0065eb89fd172f6e2014a8efd952d29bc0c7a5e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= Date: Wed, 13 Nov 2013 13:36:16 +0200 Subject: [PATCH] activate: fix crash when -s is passed diff --git a/0098-journal-timestamp-support-on-console-messages.patch b/0098-journal-timestamp-support-on-console-messages.patch index abff166..31613f2 100644 --- a/0098-journal-timestamp-support-on-console-messages.patch +++ b/0098-journal-timestamp-support-on-console-messages.patch @@ -1,4 +1,4 @@ -From d787844df7f23a079c8bab893a8412550848bb6a Mon Sep 17 00:00:00 2001 +From f65a1b58e8f88b00cff82fe609ca83f55b166518 Mon Sep 17 00:00:00 2001 From: Umut Tezduyar Lindskog Date: Wed, 13 Nov 2013 15:27:19 +0100 Subject: [PATCH] journal: timestamp support on console messages diff --git a/0099-man-add-bootctl-8.patch b/0099-man-add-bootctl-8.patch index 6041d2a..628ab5c 100644 --- a/0099-man-add-bootctl-8.patch +++ b/0099-man-add-bootctl-8.patch @@ -1,4 +1,4 @@ -From 30712bf9c2baefc73ce110854c40be354a60bd78 Mon Sep 17 00:00:00 2001 +From 4daec5fdd05a1e646aa43c8073c7157114f9ce7e Mon Sep 17 00:00:00 2001 From: Marko Myllynen Date: Wed, 13 Nov 2013 11:06:13 +0200 Subject: [PATCH] man: add bootctl(8) diff --git a/0100-zsh-completion-add-bootctl.patch b/0100-zsh-completion-add-bootctl.patch index b1d20d7..70178b0 100644 --- a/0100-zsh-completion-add-bootctl.patch +++ b/0100-zsh-completion-add-bootctl.patch @@ -1,4 +1,4 @@ -From 99f96571a3a7667ab6f3a46944c267bcc7c980e6 Mon Sep 17 00:00:00 2001 +From f262a262c871e0bd35f41339464337820320a7c9 Mon Sep 17 00:00:00 2001 From: Marko Myllynen Date: Wed, 13 Nov 2013 23:02:23 -0500 Subject: [PATCH] zsh-completion: add bootctl diff --git a/0101-Resolve-dev-console-to-the-active-tty-instead-of-jus.patch b/0101-Resolve-dev-console-to-the-active-tty-instead-of-jus.patch index 39f7887..7560582 100644 --- a/0101-Resolve-dev-console-to-the-active-tty-instead-of-jus.patch +++ b/0101-Resolve-dev-console-to-the-active-tty-instead-of-jus.patch @@ -1,4 +1,4 @@ -From b5f796a636fed8b75fcfbb44f48b808743fca964 Mon Sep 17 00:00:00 2001 +From 203562872b07690556d196ef8980c3af41f1d21c Mon Sep 17 00:00:00 2001 From: Olivier Brunel Date: Fri, 20 Sep 2013 22:18:28 +0200 Subject: [PATCH] Resolve /dev/console to the active tty instead of just "tty0" diff --git a/0102-Only-disable-output-on-console-during-boot-if-needed.patch b/0102-Only-disable-output-on-console-during-boot-if-needed.patch index 7f32abe..3ff5dac 100644 --- a/0102-Only-disable-output-on-console-during-boot-if-needed.patch +++ b/0102-Only-disable-output-on-console-during-boot-if-needed.patch @@ -1,4 +1,4 @@ -From 00fac3c4c2ef02d5f0056a47a2ae29b048ed4d74 Mon Sep 17 00:00:00 2001 +From 91562e90166756d00c5e30817506921656de8769 Mon Sep 17 00:00:00 2001 From: Olivier Brunel Date: Fri, 20 Sep 2013 22:18:29 +0200 Subject: [PATCH] Only disable output on console during boot if needed diff --git a/0103-Fix-possible-lack-of-status-messages-on-shutdown-reb.patch b/0103-Fix-possible-lack-of-status-messages-on-shutdown-reb.patch index 1bf6f9c..c3bbc4a 100644 --- a/0103-Fix-possible-lack-of-status-messages-on-shutdown-reb.patch +++ b/0103-Fix-possible-lack-of-status-messages-on-shutdown-reb.patch @@ -1,4 +1,4 @@ -From 4131de47cae7e769b6cabb4894830efd3476fc0b Mon Sep 17 00:00:00 2001 +From 57ef8dcd5d572fcdb7a347b8979002a065984121 Mon Sep 17 00:00:00 2001 From: Olivier Brunel Date: Fri, 20 Sep 2013 22:18:30 +0200 Subject: [PATCH] Fix possible lack of status messages on shutdown/reboot diff --git a/0104-fsck-modernization.patch b/0104-fsck-modernization.patch index 2af6795..8bafa4d 100644 --- a/0104-fsck-modernization.patch +++ b/0104-fsck-modernization.patch @@ -1,4 +1,4 @@ -From ed1c300e6bd7d27d3dde228a3bb0f73fe8e00ca6 Mon Sep 17 00:00:00 2001 +From 4fa456e244ebb30c6fb1792c811b87822d2c5264 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 11 Nov 2013 23:32:31 -0500 Subject: [PATCH] fsck: modernization diff --git a/0105-Introduce-udev-object-cleanup-functions.patch b/0105-Introduce-udev-object-cleanup-functions.patch index 4a1259c..3359219 100644 --- a/0105-Introduce-udev-object-cleanup-functions.patch +++ b/0105-Introduce-udev-object-cleanup-functions.patch @@ -1,4 +1,4 @@ -From 48ee0228ec2bcfcb48866b717ac8a5a8dbbd506e Mon Sep 17 00:00:00 2001 +From 7fc6e478fe20b0f6e16cd6be6d707068fab7334b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 12 Oct 2013 20:28:21 -0400 Subject: [PATCH] Introduce udev object cleanup functions diff --git a/0106-util-allow-trailing-semicolons-on-define_trivial_cle.patch b/0106-util-allow-trailing-semicolons-on-define_trivial_cle.patch index 381c57c..3056976 100644 --- a/0106-util-allow-trailing-semicolons-on-define_trivial_cle.patch +++ b/0106-util-allow-trailing-semicolons-on-define_trivial_cle.patch @@ -1,4 +1,4 @@ -From 925af552121e7028d432685948c2e061d86955e5 Mon Sep 17 00:00:00 2001 +From a33c431f6792e66efc0e1df082cbbb684d83b4df Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 14 Oct 2013 04:59:26 +0200 Subject: [PATCH] util: allow trailing semicolons on diff --git a/0107-fsck-fstab-generator-be-lenient-about-missing-fsck.-.patch b/0107-fsck-fstab-generator-be-lenient-about-missing-fsck.-.patch index ce66f9e..713b51d 100644 --- a/0107-fsck-fstab-generator-be-lenient-about-missing-fsck.-.patch +++ b/0107-fsck-fstab-generator-be-lenient-about-missing-fsck.-.patch @@ -1,4 +1,4 @@ -From ea46250058d413de21a38d29290eb90f453af72d Mon Sep 17 00:00:00 2001 +From d229aed1cb6af297523724ee77e95844b0665830 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 12 Nov 2013 00:53:59 -0500 Subject: [PATCH] fsck,fstab-generator: be lenient about missing fsck. diff --git a/0108-fstab-generator-use-RequiresOverridable-for-fsck-uni.patch b/0108-fstab-generator-use-RequiresOverridable-for-fsck-uni.patch index 32459c3..0980bbd 100644 --- a/0108-fstab-generator-use-RequiresOverridable-for-fsck-uni.patch +++ b/0108-fstab-generator-use-RequiresOverridable-for-fsck-uni.patch @@ -1,4 +1,4 @@ -From a787829ac3db6a0f34c59180c796dfa49f46d34c Mon Sep 17 00:00:00 2001 +From 09325ab3bb438caae9aca719ee329023a7ff4d82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 12 Nov 2013 22:01:10 -0500 Subject: [PATCH] fstab-generator: use RequiresOverridable for fsck units diff --git a/0109-bash-completion-journalctl-file.patch b/0109-bash-completion-journalctl-file.patch index 5bee4a1..0013351 100644 --- a/0109-bash-completion-journalctl-file.patch +++ b/0109-bash-completion-journalctl-file.patch @@ -1,4 +1,4 @@ -From 6fe0184c4b1f5689e735c4e826ed42689e96c618 Mon Sep 17 00:00:00 2001 +From 5db9aa5608a3ac3c546fac8377de0d52d77206ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 15 Nov 2013 19:00:01 -0500 Subject: [PATCH] bash-completion: journalctl --file diff --git a/0110-random-seed-improve-debugging-messages-a-bit.patch b/0110-random-seed-improve-debugging-messages-a-bit.patch index 340ba3b..84c97f9 100644 --- a/0110-random-seed-improve-debugging-messages-a-bit.patch +++ b/0110-random-seed-improve-debugging-messages-a-bit.patch @@ -1,4 +1,4 @@ -From 2fee90a7564f87472c39238b3345025dd383ce60 Mon Sep 17 00:00:00 2001 +From f84f575e8b7e1477fee0ed771ff50725f944f4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 12 Nov 2013 22:05:16 -0500 Subject: [PATCH] random-seed: improve debugging messages a bit diff --git a/0111-Fix-RemainAfterExit-services-keeping-a-hold-on-conso.patch b/0111-Fix-RemainAfterExit-services-keeping-a-hold-on-conso.patch index e066f8e..07902e9 100644 --- a/0111-Fix-RemainAfterExit-services-keeping-a-hold-on-conso.patch +++ b/0111-Fix-RemainAfterExit-services-keeping-a-hold-on-conso.patch @@ -1,4 +1,4 @@ -From 24f0323b41612b3170ce1ed84917bdb6c60f0b78 Mon Sep 17 00:00:00 2001 +From 6a60d6b627d8bc8602b46c29bb89ddcb92f08efd Mon Sep 17 00:00:00 2001 From: Olivier Brunel Date: Thu, 14 Nov 2013 15:52:54 +0100 Subject: [PATCH] Fix RemainAfterExit services keeping a hold on console diff --git a/0112-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch b/0112-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch index 2d05999..4584e57 100644 --- a/0112-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch +++ b/0112-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch @@ -1,4 +1,4 @@ -From f1d712f9028cec81748102a4b05b09a98cddfc79 Mon Sep 17 00:00:00 2001 +From 230860d86571d9cf240a7b2d171f5ceffa9d89fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 16 Nov 2013 17:29:28 -0500 Subject: [PATCH] tmpfiles: adjust excludes for the new per-service private diff --git a/0113-core-socket-fix-SO_REUSEPORT.patch b/0113-core-socket-fix-SO_REUSEPORT.patch index b567411..112c087 100644 --- a/0113-core-socket-fix-SO_REUSEPORT.patch +++ b/0113-core-socket-fix-SO_REUSEPORT.patch @@ -1,4 +1,4 @@ -From d125991e2d5f4095605eece35d8d436437036a12 Mon Sep 17 00:00:00 2001 +From 9b27d8b71d422b454cd98f206d1a998ccfe612aa Mon Sep 17 00:00:00 2001 From: Shawn Landden Date: Sat, 16 Nov 2013 13:18:13 -0800 Subject: [PATCH] core/socket: fix SO_REUSEPORT diff --git a/0114-localed-match-converted-keymaps-before-legacy.patch b/0114-localed-match-converted-keymaps-before-legacy.patch index f4ca6f4..dfe88b3 100644 --- a/0114-localed-match-converted-keymaps-before-legacy.patch +++ b/0114-localed-match-converted-keymaps-before-legacy.patch @@ -1,4 +1,4 @@ -From 3f3485b6bc8995f0e51e6725d1a4d99d825c8188 Mon Sep 17 00:00:00 2001 +From 1bd1c389f923d324e7e37076d4b7747d215c8796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 18 Nov 2013 13:42:57 -0500 Subject: [PATCH] localed: match converted keymaps before legacy diff --git a/0115-keymap-Add-Toshiba-Satellite-U940.patch b/0115-keymap-Add-Toshiba-Satellite-U940.patch index d59b50b..88900dd 100644 --- a/0115-keymap-Add-Toshiba-Satellite-U940.patch +++ b/0115-keymap-Add-Toshiba-Satellite-U940.patch @@ -1,4 +1,4 @@ -From e62bf9ca184d34e100014b4ef3c0c6b3b04ccebf Mon Sep 17 00:00:00 2001 +From 980ef7590058af1171c4d8093e0a8434fd287ccf Mon Sep 17 00:00:00 2001 From: Jose Ignacio Naranjo Date: Sun, 17 Nov 2013 21:11:34 +0100 Subject: [PATCH] keymap: Add Toshiba Satellite U940 diff --git a/0116-calendar-support-yearly-and-annually-names-the-same-.patch b/0116-calendar-support-yearly-and-annually-names-the-same-.patch index a9a71c8..79d69a4 100644 --- a/0116-calendar-support-yearly-and-annually-names-the-same-.patch +++ b/0116-calendar-support-yearly-and-annually-names-the-same-.patch @@ -1,4 +1,4 @@ -From ad792a7d7a407e2bcdf3553290c97d3642fdaf01 Mon Sep 17 00:00:00 2001 +From 2e4d2f542ccf95bec04d8144ef348257474586dc Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Nov 2013 01:13:42 +0100 Subject: [PATCH] calendar: support 'yearly' and 'annually' names the same way diff --git a/0117-hashmap-be-a-bit-more-conservative-with-pre-allocati.patch b/0117-hashmap-be-a-bit-more-conservative-with-pre-allocati.patch index 8d2b4ae..e4ad917 100644 --- a/0117-hashmap-be-a-bit-more-conservative-with-pre-allocati.patch +++ b/0117-hashmap-be-a-bit-more-conservative-with-pre-allocati.patch @@ -1,4 +1,4 @@ -From 48335b715e811ba56f7c03199efb85a664762f5d Mon Sep 17 00:00:00 2001 +From e17033cf6004d701a7da9e97d62fdb7a9a16e0a4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 19 Nov 2013 21:02:59 +0100 Subject: [PATCH] hashmap: be a bit more conservative with pre-allocating hash diff --git a/0118-manager-don-t-do-plymouth-in-a-container.patch b/0118-manager-don-t-do-plymouth-in-a-container.patch index 1628994..7a4611c 100644 --- a/0118-manager-don-t-do-plymouth-in-a-container.patch +++ b/0118-manager-don-t-do-plymouth-in-a-container.patch @@ -1,4 +1,4 @@ -From c74cf7621353d765a89e800c5a040fefa79e7915 Mon Sep 17 00:00:00 2001 +From 9ddf775ac3cc784af3439b212616aaac5a088cc0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 20 Nov 2013 03:44:11 +0100 Subject: [PATCH] manager: don't do plymouth in a container diff --git a/0119-nspawn-add-new-drop-capability-switch.patch b/0119-nspawn-add-new-drop-capability-switch.patch index 8289870..e884673 100644 --- a/0119-nspawn-add-new-drop-capability-switch.patch +++ b/0119-nspawn-add-new-drop-capability-switch.patch @@ -1,4 +1,4 @@ -From c3f82c64d86432c7d4b0c3abf61b70fd88f1d9dd Mon Sep 17 00:00:00 2001 +From e421712a2283e22ae4bfbdf7085194dcf223b614 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 20 Nov 2013 22:10:42 +0100 Subject: [PATCH] nspawn: add new --drop-capability= switch diff --git a/0120-valgrind-make-running-PID-1-in-valgrind-useful.patch b/0120-valgrind-make-running-PID-1-in-valgrind-useful.patch index edf2c66..75b24d3 100644 --- a/0120-valgrind-make-running-PID-1-in-valgrind-useful.patch +++ b/0120-valgrind-make-running-PID-1-in-valgrind-useful.patch @@ -1,4 +1,4 @@ -From 246592d8f7eaf899ec6292cac4985f7bcc8b65fd Mon Sep 17 00:00:00 2001 +From c45acb6e734f183d16af7f80cb62c1e26d679c52 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 20 Nov 2013 22:11:10 +0100 Subject: [PATCH] valgrind: make running PID 1 in valgrind useful diff --git a/0121-efi-boot-generator-don-t-mount-boot-eagerly.patch b/0121-efi-boot-generator-don-t-mount-boot-eagerly.patch index 7a7c376..ccd1501 100644 --- a/0121-efi-boot-generator-don-t-mount-boot-eagerly.patch +++ b/0121-efi-boot-generator-don-t-mount-boot-eagerly.patch @@ -1,4 +1,4 @@ -From 1530d333580859301dc57ca1a602d1ccd9cd594f Mon Sep 17 00:00:00 2001 +From b5201dca3f5f3513feeac74656684a3ac2843913 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 21 Nov 2013 12:35:46 +0100 Subject: [PATCH] efi-boot-generator: don't mount /boot eagerly diff --git a/0122-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0122-hwdb-Update-database-of-Bluetooth-company-identifier.patch index 1b80365..d798c10 100644 --- a/0122-hwdb-Update-database-of-Bluetooth-company-identifier.patch +++ b/0122-hwdb-Update-database-of-Bluetooth-company-identifier.patch @@ -1,4 +1,4 @@ -From 542aea95d13a4e88add77b3a473557dc2f47bb61 Mon Sep 17 00:00:00 2001 +From 68965f7853403ebe1033bf46e16565df0107e61a Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 21 Sep 2013 11:45:05 -0700 Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers diff --git a/0123-journal-when-appending-to-journal-file-allocate-larg.patch b/0123-journal-when-appending-to-journal-file-allocate-larg.patch index 183ee4b..9ee4b70 100644 --- a/0123-journal-when-appending-to-journal-file-allocate-larg.patch +++ b/0123-journal-when-appending-to-journal-file-allocate-larg.patch @@ -1,4 +1,4 @@ -From c0658e1948c301177b1527227be0c18932cd7cce Mon Sep 17 00:00:00 2001 +From bf3a7f42544b8ca31062f032f067294d41897613 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 26 Nov 2013 18:39:42 +0100 Subject: [PATCH] journal: when appending to journal file, allocate larger diff --git a/0124-journal-make-table-const.patch b/0124-journal-make-table-const.patch index 64a317c..7f2cc19 100644 --- a/0124-journal-make-table-const.patch +++ b/0124-journal-make-table-const.patch @@ -1,4 +1,4 @@ -From 1ae9614a4373029f3f2464cf4d8e61641f1a50a6 Mon Sep 17 00:00:00 2001 +From 0a79ae6f36f4d93c7c9166d8ba541618567f8b1b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 26 Nov 2013 18:40:23 +0100 Subject: [PATCH] journal: make table const diff --git a/0125-journald-keep-statistics-on-how-of-we-hit-miss-the-m.patch b/0125-journald-keep-statistics-on-how-of-we-hit-miss-the-m.patch index 527be5c..579071d 100644 --- a/0125-journald-keep-statistics-on-how-of-we-hit-miss-the-m.patch +++ b/0125-journald-keep-statistics-on-how-of-we-hit-miss-the-m.patch @@ -1,4 +1,4 @@ -From dd186998dd408c54ffe30df1cc35422e645e0ca2 Mon Sep 17 00:00:00 2001 +From 6f1c85d5ce89fdee924a45ec31cc9510f61b18c0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 26 Nov 2013 18:58:44 +0100 Subject: [PATCH] journald: keep statistics on how of we hit/miss the mmap diff --git a/0126-journal-optimize-bisection-logic-a-bit-by-caching-th.patch b/0126-journal-optimize-bisection-logic-a-bit-by-caching-th.patch index 41a159e..4b775f7 100644 --- a/0126-journal-optimize-bisection-logic-a-bit-by-caching-th.patch +++ b/0126-journal-optimize-bisection-logic-a-bit-by-caching-th.patch @@ -1,4 +1,4 @@ -From a460644e808ed7671e28ef8231ee590317371fed Mon Sep 17 00:00:00 2001 +From 4dfb6b49da44fb646c83939b73713a453bf09133 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 26 Nov 2013 20:37:53 +0100 Subject: [PATCH] journal: optimize bisection logic a bit by caching the last diff --git a/0127-journal-fix-iteration-when-we-go-backwards-from-the-.patch b/0127-journal-fix-iteration-when-we-go-backwards-from-the-.patch index 29c2fbe..07c7b38 100644 --- a/0127-journal-fix-iteration-when-we-go-backwards-from-the-.patch +++ b/0127-journal-fix-iteration-when-we-go-backwards-from-the-.patch @@ -1,4 +1,4 @@ -From 6ddc0196df2400e440e4bddbcc4ce32c636a7ec1 Mon Sep 17 00:00:00 2001 +From dafc0cfabbbe6f53e41f48c7a867db5dd0c16d6b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Nov 2013 00:58:39 +0100 Subject: [PATCH] journal: fix iteration when we go backwards from the diff --git a/0128-journal-allow-journal_file_copy_entry-to-work-on-non.patch b/0128-journal-allow-journal_file_copy_entry-to-work-on-non.patch index db5c630..aea6020 100644 --- a/0128-journal-allow-journal_file_copy_entry-to-work-on-non.patch +++ b/0128-journal-allow-journal_file_copy_entry-to-work-on-non.patch @@ -1,4 +1,4 @@ -From 00a827da3737dc95c2561292c03468fc96f53f14 Mon Sep 17 00:00:00 2001 +From 86959e45dccb4c69b96cf2cef15af691d01edcc7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Nov 2013 00:59:07 +0100 Subject: [PATCH] journal: allow journal_file_copy_entry() to work on non-local diff --git a/0129-journal-simplify-pre-allocation-logic.patch b/0129-journal-simplify-pre-allocation-logic.patch index e37d415..362513b 100644 --- a/0129-journal-simplify-pre-allocation-logic.patch +++ b/0129-journal-simplify-pre-allocation-logic.patch @@ -1,4 +1,4 @@ -From ab3ada57a761fde9050d7452f6bd9d897b9067ec Mon Sep 17 00:00:00 2001 +From 18d0ef3a1135c430370ae6ebf3ebe5b6e567284d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Nov 2013 01:44:52 +0100 Subject: [PATCH] journal: simplify pre-allocation logic diff --git a/0130-journald-mention-how-long-we-needed-to-flush-to-var-.patch b/0130-journald-mention-how-long-we-needed-to-flush-to-var-.patch index 2fe9226..221d996 100644 --- a/0130-journald-mention-how-long-we-needed-to-flush-to-var-.patch +++ b/0130-journald-mention-how-long-we-needed-to-flush-to-var-.patch @@ -1,4 +1,4 @@ -From f201d0f2ca7adcfcbb854a83ff9a75b40ace7967 Mon Sep 17 00:00:00 2001 +From 7d64f9468da3cb18390e971e685efba9fa225cf7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 27 Nov 2013 01:54:25 +0100 Subject: [PATCH] journald: mention how long we needed to flush to /var in the diff --git a/0131-automount-log-info-about-triggering-process.patch b/0131-automount-log-info-about-triggering-process.patch index 0cf8a97..3c23dc9 100644 --- a/0131-automount-log-info-about-triggering-process.patch +++ b/0131-automount-log-info-about-triggering-process.patch @@ -1,4 +1,4 @@ -From e64e35b2f24f0a2979d435a752d2ab141c5a0cc2 Mon Sep 17 00:00:00 2001 +From 62b2f75aa55f78dd6e2fcb9433c46ee809bbb898 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 28 Nov 2013 01:25:10 +0100 Subject: [PATCH] automount: log info about triggering process diff --git a/0132-virt-split-detect_vm-into-separate-functions.patch b/0132-virt-split-detect_vm-into-separate-functions.patch index a0c1028..4178f50 100644 --- a/0132-virt-split-detect_vm-into-separate-functions.patch +++ b/0132-virt-split-detect_vm-into-separate-functions.patch @@ -1,4 +1,4 @@ -From 4931213c9f9fed23c4a103eda1ee19aa06b9f613 Mon Sep 17 00:00:00 2001 +From d3a841560dfacf7b87980257bb6dd8b3fd3fbcdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 28 Nov 2013 13:34:08 -0500 Subject: [PATCH] virt: split detect_vm into separate functions diff --git a/0133-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0133-hwdb-Update-database-of-Bluetooth-company-identifier.patch index adbd9ad..d6a8725 100644 --- a/0133-hwdb-Update-database-of-Bluetooth-company-identifier.patch +++ b/0133-hwdb-Update-database-of-Bluetooth-company-identifier.patch @@ -1,4 +1,4 @@ -From 123cc4b594188a5caed955e77228a37001ee451f Mon Sep 17 00:00:00 2001 +From c8a4465338cec4a8ff005e824611df30cb2e31cd Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 29 Nov 2013 07:26:47 -0800 Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers diff --git a/0134-sysfs-show.c-return-negative-error.patch b/0134-sysfs-show.c-return-negative-error.patch index d94a211..650accd 100644 --- a/0134-sysfs-show.c-return-negative-error.patch +++ b/0134-sysfs-show.c-return-negative-error.patch @@ -1,4 +1,4 @@ -From cd0e1552ad5d5dffdd0f8a01fa9b451d3e14a60d Mon Sep 17 00:00:00 2001 +From 5805da2b4fd807e566d2c7a743a2da3e43ddabf6 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Sat, 30 Nov 2013 21:59:40 +0100 Subject: [PATCH] sysfs-show.c: return negative error diff --git a/0135-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch b/0135-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch index 20deb99..0c2eea9 100644 --- a/0135-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch +++ b/0135-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch @@ -1,4 +1,4 @@ -From 05175fd678f6f7f09ff9543cd11bbd7ebf14fe58 Mon Sep 17 00:00:00 2001 +From 5da5aaac9f474db371e1f0121fbbbc36fbd9bc83 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Sat, 30 Nov 2013 23:45:31 +0100 Subject: [PATCH] util.c: check if return value from ttyname_r is > 0 instead diff --git a/0136-docs-remove-unneeded-the-s-in-gudev-docs.patch b/0136-docs-remove-unneeded-the-s-in-gudev-docs.patch index 8669be8..a024dc2 100644 --- a/0136-docs-remove-unneeded-the-s-in-gudev-docs.patch +++ b/0136-docs-remove-unneeded-the-s-in-gudev-docs.patch @@ -1,4 +1,4 @@ -From bbf5b0815c2561c3a98903160f3193953ba962c6 Mon Sep 17 00:00:00 2001 +From 574bcb12b19559d75e0ddde83bc0d07fcb407d87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 30 Nov 2013 20:27:54 -0500 Subject: [PATCH] docs: remove unneeded the's in gudev docs diff --git a/0137-man-explicitly-say-when-multiple-units-can-be-specif.patch b/0137-man-explicitly-say-when-multiple-units-can-be-specif.patch index f4cbb4a..4ee3efd 100644 --- a/0137-man-explicitly-say-when-multiple-units-can-be-specif.patch +++ b/0137-man-explicitly-say-when-multiple-units-can-be-specif.patch @@ -1,4 +1,4 @@ -From 06c5b7a9f3d47834ea4dbbfb24f169b6893dd338 Mon Sep 17 00:00:00 2001 +From 029e3233b8634cb99052c3142aa1889f562398b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 30 Nov 2013 21:23:01 -0500 Subject: [PATCH] man: explicitly say when multiple units can be specified diff --git a/0138-systemd-treat-reload-failure-as-failure.patch b/0138-systemd-treat-reload-failure-as-failure.patch index be0b057..afc6196 100644 --- a/0138-systemd-treat-reload-failure-as-failure.patch +++ b/0138-systemd-treat-reload-failure-as-failure.patch @@ -1,4 +1,4 @@ -From 99e4b98b064042a2c1cea103941a7895b183821e Mon Sep 17 00:00:00 2001 +From f923c3e18a33ff11a0a7a8cc60abcd13c3c75a5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 2 Dec 2013 21:52:51 -0500 Subject: [PATCH] systemd: treat reload failure as failure diff --git a/0139-journal-fail-silently-in-sd_j_sendv-if-journal-is-un.patch b/0139-journal-fail-silently-in-sd_j_sendv-if-journal-is-un.patch index 5cbb239..03e12ab 100644 --- a/0139-journal-fail-silently-in-sd_j_sendv-if-journal-is-un.patch +++ b/0139-journal-fail-silently-in-sd_j_sendv-if-journal-is-un.patch @@ -1,4 +1,4 @@ -From 9c6964b0a23852353aaa0ca0c30586c3f19502b7 Mon Sep 17 00:00:00 2001 +From cbc55cc2e7ac0e4214315dc91af5d7d34e3f878e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 3 Dec 2013 08:07:32 -0500 Subject: [PATCH] journal: fail silently in sd_j_sendv() if journal is diff --git a/0140-systemd-add-a-start-job-for-all-units-specified-with.patch b/0140-systemd-add-a-start-job-for-all-units-specified-with.patch index 269ab55..9237b02 100644 --- a/0140-systemd-add-a-start-job-for-all-units-specified-with.patch +++ b/0140-systemd-add-a-start-job-for-all-units-specified-with.patch @@ -1,4 +1,4 @@ -From 043a559ff3732439fc61872a6320ee0a05dd088f Mon Sep 17 00:00:00 2001 +From aadac335f8f9ab693fb671f2ad9490ceb33c820a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 5 Dec 2013 00:41:12 -0500 Subject: [PATCH] systemd: add a start job for all units specified with diff --git a/0141-core-device-ignore-SYSTEMD_WANTS-in-user-mode.patch b/0141-core-device-ignore-SYSTEMD_WANTS-in-user-mode.patch index de66012..ec54a21 100644 --- a/0141-core-device-ignore-SYSTEMD_WANTS-in-user-mode.patch +++ b/0141-core-device-ignore-SYSTEMD_WANTS-in-user-mode.patch @@ -1,4 +1,4 @@ -From bd819c6a6761827adc05f15ebc20bd78a1c751dc Mon Sep 17 00:00:00 2001 +From bc979de36a9523ffe907e610f28719d44c364f49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 5 Dec 2013 16:06:04 -0500 Subject: [PATCH] core/device: ignore SYSTEMD_WANTS= in user mode diff --git a/0142-Fix-memory-leak-in-stdout-journal-streams.patch b/0142-Fix-memory-leak-in-stdout-journal-streams.patch index 7f86517..d4097e0 100644 --- a/0142-Fix-memory-leak-in-stdout-journal-streams.patch +++ b/0142-Fix-memory-leak-in-stdout-journal-streams.patch @@ -1,10 +1,12 @@ -From 371ce08fb9814a39ca2f984d6040aaf0f6c172e8 Mon Sep 17 00:00:00 2001 +From a345f4c7f5868d27f3c23515055ae6fa0565689d Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 8 Dec 2013 14:33:45 -0600 Subject: [PATCH] Fix memory leak in stdout journal streams Just as 'identifier' is strdup-ed and freed, we need to do the same for unit_id. + +(cherry picked from commit f92ae4968f070ef0ada61ba7cd585794fac404dd) --- src/journal/journald-stream.c | 1 + 1 file changed, 1 insertion(+) diff --git a/0143-man-document-is-enabled-output.patch b/0143-man-document-is-enabled-output.patch index 2f4fdd8..521d500 100644 --- a/0143-man-document-is-enabled-output.patch +++ b/0143-man-document-is-enabled-output.patch @@ -1,9 +1,10 @@ -From 77e9da01ad6383aab4d50a00b705ec96f16cb55e Mon Sep 17 00:00:00 2001 +From e88356c9651b2257ecb6aa51dfe55c42b1ddf130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 8 Dec 2013 18:56:16 -0500 Subject: [PATCH] man: document 'is-enabled' output https://bugzilla.redhat.com/show_bug.cgi?id=953077 +(cherry picked from commit 171754aa4ae37a6ab626878256f7b664da78ef55) --- man/systemctl.xml | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 5 deletions(-) diff --git a/0144-hostnamed-avoid-using-NULL-in-error-path.patch b/0144-hostnamed-avoid-using-NULL-in-error-path.patch index 8d62943..23be9dd 100644 --- a/0144-hostnamed-avoid-using-NULL-in-error-path.patch +++ b/0144-hostnamed-avoid-using-NULL-in-error-path.patch @@ -1,4 +1,4 @@ -From d4ae9b53caa77d17528d36610ad70dd2eb1bb54c Mon Sep 17 00:00:00 2001 +From 04bbe7a7e009d3129e6956af8beb08a6e975e60b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 6 Jan 2014 12:16:55 +0000 Subject: [PATCH] hostnamed: avoid using NULL in error path diff --git a/0145-logind-use-correct-who-enum-values-with-KillUnit.patch b/0145-logind-use-correct-who-enum-values-with-KillUnit.patch index 0c1d66a..80b36b7 100644 --- a/0145-logind-use-correct-who-enum-values-with-KillUnit.patch +++ b/0145-logind-use-correct-who-enum-values-with-KillUnit.patch @@ -1,8 +1,9 @@ -From 524147c1ef991edf4432aac51c880b363b4402df Mon Sep 17 00:00:00 2001 +From 07138cd2967a6a56ca8b17267d054758ff53fd4c Mon Sep 17 00:00:00 2001 From: Marius Vollmer Date: Thu, 31 Oct 2013 15:55:07 +0200 Subject: [PATCH] logind: use correct "who" enum values with KillUnit. +NB This is already fixed differently in systemd 209 with the port to kdbus --- src/login/logind-dbus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0146-Revert-systemd-add-a-start-job-for-all-units-specifi.patch b/0146-Revert-systemd-add-a-start-job-for-all-units-specifi.patch index bb465d9..53d62fb 100644 --- a/0146-Revert-systemd-add-a-start-job-for-all-units-specifi.patch +++ b/0146-Revert-systemd-add-a-start-job-for-all-units-specifi.patch @@ -1,4 +1,4 @@ -From 106c98f6b08d3b9254b419b09bc4ceed1963d7aa Mon Sep 17 00:00:00 2001 +From 5d976fa2fa07dbf77bef23f1789e6d7389d4acea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 14 Jan 2014 17:31:00 -0500 Subject: [PATCH] Revert "systemd: add a start job for all units specified with diff --git a/0147-core-do-not-segfault-if-swap-activity-happens-when-p.patch b/0147-core-do-not-segfault-if-swap-activity-happens-when-p.patch index dd7a6a3..086fad6 100644 --- a/0147-core-do-not-segfault-if-swap-activity-happens-when-p.patch +++ b/0147-core-do-not-segfault-if-swap-activity-happens-when-p.patch @@ -1,4 +1,4 @@ -From 85a77eea8d7114675602a33d2e067fd7c4ad0624 Mon Sep 17 00:00:00 2001 +From f84b1b1ff9b1261cc9ee339fe0e5447f1573f807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 12 Jan 2014 11:38:56 -0500 Subject: [PATCH] core: do not segfault if swap activity happens when diff --git a/0148-kernel-install-add-h-help.patch b/0148-kernel-install-add-h-help.patch index fae104a..f7fbcdb 100644 --- a/0148-kernel-install-add-h-help.patch +++ b/0148-kernel-install-add-h-help.patch @@ -1,8 +1,9 @@ -From cb5fd30c9ca64024335129d393c15a9586433ca2 Mon Sep 17 00:00:00 2001 +From e393b85d62f02206ca52ac3de3debf9249f7777e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 8 Dec 2013 07:46:46 -0500 Subject: [PATCH] kernel-install: add -h/--help +(cherry picked from commit a6c3d202b14939006f39e22179a058159a8512fb) --- src/kernel-install/kernel-install | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/0149-kernel-install-fix-help-output.patch b/0149-kernel-install-fix-help-output.patch index 2ed9d61..77b270f 100644 --- a/0149-kernel-install-fix-help-output.patch +++ b/0149-kernel-install-fix-help-output.patch @@ -1,4 +1,4 @@ -From 245b830c77bfbac0346bd1df3fa5d6b81d77014a Mon Sep 17 00:00:00 2001 +From 7c189d8c6bdab161c14ac616b0c292255005becd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= Date: Thu, 5 Dec 2013 02:55:05 +0100 Subject: [PATCH] kernel-install: fix help output @@ -6,6 +6,8 @@ Subject: [PATCH] kernel-install: fix help output Kernel install doesn't need the second argument on his command line when removing. This is correctly documented in the man page. + +(cherry picked from commit d838db0d3b1369639ed7572f4f838eda58b8d858) --- src/kernel-install/kernel-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0150-man-improve-wording-and-comma-usage-in-systemd.journ.patch b/0150-man-improve-wording-and-comma-usage-in-systemd.journ.patch index 69eb561..b6ce33a 100644 --- a/0150-man-improve-wording-and-comma-usage-in-systemd.journ.patch +++ b/0150-man-improve-wording-and-comma-usage-in-systemd.journ.patch @@ -1,10 +1,12 @@ -From 07e7e0378c3f2b73e56e886f7a4b59068dbbbc55 Mon Sep 17 00:00:00 2001 +From 79ce71419652f093842d4d27a88662742a57aa0c Mon Sep 17 00:00:00 2001 From: "Jason St. John" Date: Tue, 10 Dec 2013 00:10:03 -0500 Subject: [PATCH] man: improve wording and comma usage in systemd.journal-fields(7) Improve wording under "Description" and "_KERNEL_DEVICE=" + +(cherry picked from commit 8c9552c6b417c8dc8d66019bc8e412c8d736454d) --- man/systemd.journal-fields.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/0151-drop-several-entries-from-kbd-model-map-whose-kbd-la.patch b/0151-drop-several-entries-from-kbd-model-map-whose-kbd-la.patch index 6dceeae..94dcb16 100644 --- a/0151-drop-several-entries-from-kbd-model-map-whose-kbd-la.patch +++ b/0151-drop-several-entries-from-kbd-model-map-whose-kbd-la.patch @@ -1,4 +1,4 @@ -From 26dcf06766bc1fc533d301831838e9e302315134 Mon Sep 17 00:00:00 2001 +From 5abb54b9398799f83f7df303b5da85a8e59d6bb9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 9 Dec 2013 21:58:34 -0800 Subject: [PATCH] drop several entries from kbd-model-map whose kbd layouts do @@ -14,6 +14,8 @@ entry or other in that field. For systemd, the only function of kbd-model-map is to 'match' kbd and xkb configurations, so it does not make any sense to maintain entries for cases where only one or the other exists in this context. + +(cherry picked from commit 70dc36d17fbd81eead01fb73cc231c83c6d977e9) --- src/locale/kbd-model-map | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/0152-correct-name-of-Tajik-kbd-layout-in-kbd-model-map.patch b/0152-correct-name-of-Tajik-kbd-layout-in-kbd-model-map.patch index b64a443..592cc01 100644 --- a/0152-correct-name-of-Tajik-kbd-layout-in-kbd-model-map.patch +++ b/0152-correct-name-of-Tajik-kbd-layout-in-kbd-model-map.patch @@ -1,8 +1,9 @@ -From bc0cbe40cbfde7e8194f6f4b9b17e7102efa35c7 Mon Sep 17 00:00:00 2001 +From 062bbced2336dea9b3d24aec7fdf8fcab0de766d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Mon, 9 Dec 2013 22:02:25 -0800 Subject: [PATCH] correct name of Tajik kbd layout in kbd-model-map +(cherry picked from commit 18c92a4958361f333d63507c67a35bbcfd0aa925) --- src/locale/kbd-model-map | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0153-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0153-hwdb-Update-database-of-Bluetooth-company-identifier.patch index 15b0ddc..30ab69e 100644 --- a/0153-hwdb-Update-database-of-Bluetooth-company-identifier.patch +++ b/0153-hwdb-Update-database-of-Bluetooth-company-identifier.patch @@ -1,8 +1,9 @@ -From 4ee475e4786ac69b74a75fd668f0bb8e07bdde2d Mon Sep 17 00:00:00 2001 +From a06c63e5cf60a585166f11dbefa0dad3f64814cc Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Tue, 10 Dec 2013 03:17:39 -0800 Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers +(cherry picked from commit 0234c599218518b1eb478d64d9883ba46e4ce5d8) --- hwdb/20-bluetooth-vendor-product.hwdb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/0154-Ensure-unit-is-journaled-for-short-lived-or-oneshot-.patch b/0154-Ensure-unit-is-journaled-for-short-lived-or-oneshot-.patch index 9c35091..2a956e0 100644 --- a/0154-Ensure-unit-is-journaled-for-short-lived-or-oneshot-.patch +++ b/0154-Ensure-unit-is-journaled-for-short-lived-or-oneshot-.patch @@ -1,4 +1,4 @@ -From d8b3047ccb52c2b55683f2fe12f0674f63d746cb Mon Sep 17 00:00:00 2001 +From 66d0783137db1d37f0cdc904773087878da469ce Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 8 Dec 2013 13:27:05 -0600 Subject: [PATCH] Ensure unit is journaled for short-lived or oneshot processes @@ -13,6 +13,8 @@ Add an else if case that allows the passed in unit_id to be logged even if we couldn't capture cgroup information. This ensures a command like `journalctl -u run-XXX` will return all log messages from a oneshot process. + +(cherry picked from commit 2d43b190901902dbd98ccea77c1d1ddc9e2a9955) --- src/journal/journald-server.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/0155-libudev-hwdb-use-libudev-not-systemd-logging.patch b/0155-libudev-hwdb-use-libudev-not-systemd-logging.patch index e4f88c0..e5a608e 100644 --- a/0155-libudev-hwdb-use-libudev-not-systemd-logging.patch +++ b/0155-libudev-hwdb-use-libudev-not-systemd-logging.patch @@ -1,8 +1,9 @@ -From 4c5b792c88c81d0595a1273804d2cd405140f81d Mon Sep 17 00:00:00 2001 +From 64a880e7637f875ef144404ce291634f0a50fb4b Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 10 Dec 2013 16:36:45 +0100 Subject: [PATCH] libudev: hwdb - use libudev not systemd logging +(cherry picked from commit 85719154e7412de2d84f64b50b6b98b13981b65f) --- src/libudev/libudev-hwdb.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/0156-core-manager-remove-infinite-loop.patch b/0156-core-manager-remove-infinite-loop.patch index 53e8f4c..a03084f 100644 --- a/0156-core-manager-remove-infinite-loop.patch +++ b/0156-core-manager-remove-infinite-loop.patch @@ -1,8 +1,9 @@ -From 906a89f8e60c9a39610afd7edbc41f79a3c711e7 Mon Sep 17 00:00:00 2001 +From f980d7eccb5a25a174454dd7ba7d4ebc8a9b5a42 Mon Sep 17 00:00:00 2001 From: Shawn Landden Date: Tue, 10 Dec 2013 09:28:26 -0800 Subject: [PATCH] core/manager: remove infinite loop +(cherry picked from commit 145b1f799ff6712f333cef92c44218254a1320c5) --- src/core/manager.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/0157-util-check-for-overflow-in-greedy_realloc.patch b/0157-util-check-for-overflow-in-greedy_realloc.patch index 9cdcc40..41168b3 100644 --- a/0157-util-check-for-overflow-in-greedy_realloc.patch +++ b/0157-util-check-for-overflow-in-greedy_realloc.patch @@ -1,8 +1,10 @@ -From b7b1af75b9f76f3bff35369b0c1666890c586144 Mon Sep 17 00:00:00 2001 +From f0c730c5407ec42ff2f416a71f6519cd0e2c0afe Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 10 Dec 2013 18:53:03 +0000 Subject: [PATCH] util: check for overflow in greedy_realloc() +(cherry picked from commit 98088803bb2a9f89b7bbc063123dda3343138f18) + Conflicts: src/shared/util.c --- diff --git a/0158-journald-use-a-bit-more-cleanup-magic.patch b/0158-journald-use-a-bit-more-cleanup-magic.patch index 2338479..922f101 100644 --- a/0158-journald-use-a-bit-more-cleanup-magic.patch +++ b/0158-journald-use-a-bit-more-cleanup-magic.patch @@ -1,8 +1,9 @@ -From ce69ab385535d23bec04018941b0cda19d2d4855 Mon Sep 17 00:00:00 2001 +From d690f32eeba37f3598b8dfdb564f26559d4e39a2 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 10 Dec 2013 19:51:47 +0000 Subject: [PATCH] journald: use a bit more cleanup magic! +(cherry picked from commit 14c1025934e709d07948c13ca62b40c35c91d111) --- src/journal/journald-stream.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/0159-journald-malloc-less-when-streaming-messages.patch b/0159-journald-malloc-less-when-streaming-messages.patch index 362b36d..6115d07 100644 --- a/0159-journald-malloc-less-when-streaming-messages.patch +++ b/0159-journald-malloc-less-when-streaming-messages.patch @@ -1,8 +1,9 @@ -From feaaf9358a0bd619ef77dca732aa08e21f5c1a56 Mon Sep 17 00:00:00 2001 +From f201bcae8477da321d396f58595ef743034aa2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 10 Dec 2013 06:17:01 -0500 Subject: [PATCH] journald: malloc less when streaming messages +(cherry picked from commit e3bfb7be07d9b1f4ebb12eb22c4c8bcd2a988d51) --- src/journal/journald-stream.c | 23 ++++++++++++----------- src/journal/journald-syslog.c | 4 ++-- diff --git a/0160-activate-clean-up-inherited-descriptors.patch b/0160-activate-clean-up-inherited-descriptors.patch index 8776646..933e491 100644 --- a/0160-activate-clean-up-inherited-descriptors.patch +++ b/0160-activate-clean-up-inherited-descriptors.patch @@ -1,4 +1,4 @@ -From 9b618fb2369046434ced28fe1420d8d5c75cd46e Mon Sep 17 00:00:00 2001 +From 4aaa35d08f4942e28a1046b46a853b170c9d8858 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 10 Dec 2013 21:52:11 -0500 Subject: [PATCH] activate: clean up inherited descriptors @@ -16,6 +16,8 @@ Subject: [PATCH] activate: clean up inherited descriptors systemd-activate should be robust against the shell (or anything else) leaking descriptors. Now everything except stdin/stdout/stderr and received sockets will be closed. + +(cherry picked from commit c099716487df4a4f5394e57e7ca14da1d358166a) --- src/activate/activate.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/0161-man-explain-in-more-detail-how-SYSTEMD_READY-influen.patch b/0161-man-explain-in-more-detail-how-SYSTEMD_READY-influen.patch index 297de17..eea182b 100644 --- a/0161-man-explain-in-more-detail-how-SYSTEMD_READY-influen.patch +++ b/0161-man-explain-in-more-detail-how-SYSTEMD_READY-influen.patch @@ -1,10 +1,11 @@ -From bb9c2f82137bb6d1a352341eb81ed2a0ac96d4cb Mon Sep 17 00:00:00 2001 +From 0036c02a84e5322f2ee57a728c478c00097a6c3c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Dec 2013 18:38:51 +0100 Subject: [PATCH] man: explain in more detail how SYSTEMD_READY= influences SYSTEMD_WANTS= in udev rules https://bugzilla.redhat.com/show_bug.cgi?id=1026860 +(cherry picked from commit 419173e60a05424008fcd312f6df4b59b2ce8e62) --- man/systemd.device.xml | 45 +++++++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/0162-units-don-t-run-readahead-done-timers-in-containers.patch b/0162-units-don-t-run-readahead-done-timers-in-containers.patch index ac5f405..bb6ae6d 100644 --- a/0162-units-don-t-run-readahead-done-timers-in-containers.patch +++ b/0162-units-don-t-run-readahead-done-timers-in-containers.patch @@ -1,10 +1,12 @@ -From 3fa582ff9d4bea413a7a0e301b7dbca6b33382b0 Mon Sep 17 00:00:00 2001 +From 5b4dd52a36dbaefd9973c7be41d2f5d691402c62 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Dec 2013 23:31:34 +0100 Subject: [PATCH] units: don't run readahead done timers in containers We don't run the collector in the container either, hence we don't need to stop it either. + +(cherry picked from commit b3de50cb07bb49c4e24287002eca1e95c490f90d) --- units/systemd-readahead-done.service.in | 1 + units/systemd-readahead-done.timer | 1 + diff --git a/0163-test-fileio-replace-mktemp-with-mkstemp-to-avoid-war.patch b/0163-test-fileio-replace-mktemp-with-mkstemp-to-avoid-war.patch index db7b9d7..6e9dcd8 100644 --- a/0163-test-fileio-replace-mktemp-with-mkstemp-to-avoid-war.patch +++ b/0163-test-fileio-replace-mktemp-with-mkstemp-to-avoid-war.patch @@ -1,10 +1,12 @@ -From 622dfd7a6553cc27b6f75653481dd8808f717c49 Mon Sep 17 00:00:00 2001 +From 1027958557a7155b83afe8dc596b9a94d7e7bf82 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Thu, 12 Dec 2013 00:06:30 +0100 Subject: [PATCH] test-fileio: replace mktemp with mkstemp to avoid warnings This is a fairly useless thing to do but it makes the compilers and analyzers shut up about the use of mktemp. + +(cherry picked from commit d514feaa872820d5cb4e9321ad32673c09fbb3f4) --- src/test/test-fileio.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/0164-journal-pipe-journalctl-help-output-into-a-pager.patch b/0164-journal-pipe-journalctl-help-output-into-a-pager.patch index 8e0c0ca..39485f8 100644 --- a/0164-journal-pipe-journalctl-help-output-into-a-pager.patch +++ b/0164-journal-pipe-journalctl-help-output-into-a-pager.patch @@ -1,10 +1,12 @@ -From 59f2f4cfd399275c3da061212fc25636ee72367f Mon Sep 17 00:00:00 2001 +From d6cb5d101b096d5a8115d8861b18ac1808a5420e Mon Sep 17 00:00:00 2001 From: Djalal Harouni Date: Thu, 12 Dec 2013 00:22:48 +0100 Subject: [PATCH] journal: pipe journalctl help output into a pager journalctl help output might run off the screen, so be consistent as other systemd tools do and pipe it into a pager. + +(cherry picked from commit faf5077f891aa249270b2a3d9f0104c3eec02da6) --- src/journal/journalctl.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/0165-nspawn-complain-and-continue-if-machine-has-same-id.patch b/0165-nspawn-complain-and-continue-if-machine-has-same-id.patch index 7597fe9..a72438a 100644 --- a/0165-nspawn-complain-and-continue-if-machine-has-same-id.patch +++ b/0165-nspawn-complain-and-continue-if-machine-has-same-id.patch @@ -1,4 +1,4 @@ -From bedb539662380d6a120db1e8dbb63b55d2ecac2c Mon Sep 17 00:00:00 2001 +From 005982c6cd05cf0e9474e0790a92eabefd05a1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 11 Dec 2013 22:00:33 -0500 Subject: [PATCH] nspawn: complain and continue if machine has same id @@ -12,6 +12,7 @@ filesystem as the host. Since other things mostly function correctly, let's allow that. https://bugs.freedesktop.org/show_bug.cgi?id=68369 +(cherry picked from commit 4d680aeea1e479f08f3dbdb7430def5d9eefe2ee) --- src/nspawn/nspawn.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/0166-man-beef-up-ExecStart-description.patch b/0166-man-beef-up-ExecStart-description.patch index 6c1fb82..ba5d4b8 100644 --- a/0166-man-beef-up-ExecStart-description.patch +++ b/0166-man-beef-up-ExecStart-description.patch @@ -1,4 +1,4 @@ -From a6ba849c002fc991a290d2792573a9145f02aaf6 Mon Sep 17 00:00:00 2001 +From 36c301992db7d3538ef2f58d5b32183da6b55f31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 14 Dec 2013 17:21:55 -0500 Subject: [PATCH] man: beef up ExecStart description @@ -8,6 +8,7 @@ here, so let's be very explicit what is allowed and what is not. A few examples should also help. http://bugs.debian.org/732156 +(cherry picked from commit ec6039bc08f8e77f92427afec048e4f8ac4b81a8) --- man/systemd.service.xml | 97 ++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 80 insertions(+), 17 deletions(-) diff --git a/0167-man-remove-advice-to-avoid-setting-the-same-var-more.patch b/0167-man-remove-advice-to-avoid-setting-the-same-var-more.patch index b1943b1..e83a9eb 100644 --- a/0167-man-remove-advice-to-avoid-setting-the-same-var-more.patch +++ b/0167-man-remove-advice-to-avoid-setting-the-same-var-more.patch @@ -1,4 +1,4 @@ -From 7c6c28dca3b75b7d0c2d067752ed917b113d90d2 Mon Sep 17 00:00:00 2001 +From 4a042534a6883898ebf83a185e8801fc1eb85a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 14 Dec 2013 17:30:25 -0500 Subject: [PATCH] man: remove advice to avoid setting the same var more than @@ -7,6 +7,8 @@ Subject: [PATCH] man: remove advice to avoid setting the same var more than So far the compatibility with .desktop settings hasn't been imporant at all, and we do not want people to write convoluted unit files. + +(cherry picked from commit 6baf995c17a95ca0d6b5ad0b1f1667c956574816) --- man/systemd.service.xml | 6 +----- man/systemd.unit.xml | 11 +++++++++++ diff --git a/0168-systemctl-add-the-plain-option-to-the-help-message.patch b/0168-systemctl-add-the-plain-option-to-the-help-message.patch index ec04f72..9b5f88d 100644 --- a/0168-systemctl-add-the-plain-option-to-the-help-message.patch +++ b/0168-systemctl-add-the-plain-option-to-the-help-message.patch @@ -1,8 +1,9 @@ -From c818ae0c9288afac78a1761de3bd65007448558a Mon Sep 17 00:00:00 2001 +From 5bf271d8433e6e98e8b4fc94a812bf0570d4f098 Mon Sep 17 00:00:00 2001 From: Djalal Harouni Date: Sun, 15 Dec 2013 00:05:38 +0100 Subject: [PATCH] systemctl: add the --plain option to the help message +(cherry picked from commit 815ebc540daf5cede58570bbeb0a4106e201c52e) --- src/systemctl/systemctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/0169-Fix-a-few-resource-leaks-in-error-paths.patch b/0169-Fix-a-few-resource-leaks-in-error-paths.patch index fc01bb9..6fcbb1a 100644 --- a/0169-Fix-a-few-resource-leaks-in-error-paths.patch +++ b/0169-Fix-a-few-resource-leaks-in-error-paths.patch @@ -1,9 +1,10 @@ -From 010d6c4909ed75c247ff91a555c7942f9c2ce1c5 Mon Sep 17 00:00:00 2001 +From 57856f3da469a06b5ef863c0d14a36b2b3befd87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 15 Dec 2013 16:25:04 -0500 Subject: [PATCH] Fix a few resource leaks in error paths https://bugzilla.redhat.com/show_bug.cgi?id=1043304 +(cherry picked from commit 2fd069b18e525860514a70d3ea08410ca122d3e2) Conflicts: src/libsystemd-bus/bus-objects.c diff --git a/0170-Fix-a-few-signed-unsigned-format-string-issues.patch b/0170-Fix-a-few-signed-unsigned-format-string-issues.patch index 085e455..f40717d 100644 --- a/0170-Fix-a-few-signed-unsigned-format-string-issues.patch +++ b/0170-Fix-a-few-signed-unsigned-format-string-issues.patch @@ -1,4 +1,4 @@ -From dca7710c31218a2292c8e3987d1e906b27bed4e9 Mon Sep 17 00:00:00 2001 +From f9b744fd6ecb4a993571ac25f9726585f309ae15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 15 Dec 2013 16:26:27 -0500 Subject: [PATCH] Fix a few signed/unsigned format string issues @@ -6,6 +6,7 @@ Subject: [PATCH] Fix a few signed/unsigned format string issues Since numbers involved are all small, behaviour was correct already. https://bugzilla.redhat.com/show_bug.cgi?id=1043304 +(cherry picked from commit b5dd8148730db080b48b874c214f8f74ae787d6b) --- src/shared/time-util.c | 2 +- src/udev/udev-builtin-net_id.c | 21 +++++++-------------- diff --git a/0171-util-try-harder-to-increase-the-send-recv-buffers-of.patch b/0171-util-try-harder-to-increase-the-send-recv-buffers-of.patch index 361253f..cb55752 100644 --- a/0171-util-try-harder-to-increase-the-send-recv-buffers-of.patch +++ b/0171-util-try-harder-to-increase-the-send-recv-buffers-of.patch @@ -1,10 +1,12 @@ -From 4a0ab3a8fd59d38dabb9a7096939d8d8e8adc62f Mon Sep 17 00:00:00 2001 +From c4f7609113a7734313d95f33774deb4b9c143b29 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 16 Dec 2013 17:04:36 +0100 Subject: [PATCH] util: try harder to increase the send/recv buffers of sockets If we have the priviliges we will try SO_SNDBUFFORCE/SO_RCVBUFFORCE and only fall back to SO_SNDBUF/SO_RCVBUF if that fails. + +(cherry picked from commit 92d75ca419994f3924dc14117b71f8706d9e1f57) --- src/shared/util.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/0172-execute-also-set-SO_SNDBUF-when-spawning-a-service-w.patch b/0172-execute-also-set-SO_SNDBUF-when-spawning-a-service-w.patch index 82de044..53c7d62 100644 --- a/0172-execute-also-set-SO_SNDBUF-when-spawning-a-service-w.patch +++ b/0172-execute-also-set-SO_SNDBUF-when-spawning-a-service-w.patch @@ -1,9 +1,10 @@ -From 8d872d28194f58da2311ca88072084458dc2eb15 Mon Sep 17 00:00:00 2001 +From 415dd375cf6850c3c8c6dd07be2ce95b789c46e5 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 16 Dec 2013 20:00:09 +0100 Subject: [PATCH] execute: also set SO_SNDBUF when spawning a service with stdout/stderr connected to journald +(cherry picked from commit 531dca789ea6b4c269ca2646515b42962f83d64a) --- src/core/execute.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/0173-journal-file-protect-against-alloca-0.patch b/0173-journal-file-protect-against-alloca-0.patch index 953373e..df7aefe 100644 --- a/0173-journal-file-protect-against-alloca-0.patch +++ b/0173-journal-file-protect-against-alloca-0.patch @@ -1,8 +1,9 @@ -From a25fd0d4bd3cf652e55c24e7dc873fe530fa111a Mon Sep 17 00:00:00 2001 +From 6392180b7a11f2177be9e6411e3fd4bd79237d81 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Mon, 16 Dec 2013 23:35:30 +0100 Subject: [PATCH] journal-file: protect against alloca(0) +(cherry picked from commit 4faa70046ca0c1775c8e231179716a78cf3291b1) --- src/journal/journal-file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/0174-man-describe-journalctl-show-cursor.patch b/0174-man-describe-journalctl-show-cursor.patch index e36e5b6..553be3d 100644 --- a/0174-man-describe-journalctl-show-cursor.patch +++ b/0174-man-describe-journalctl-show-cursor.patch @@ -1,8 +1,9 @@ -From 2d46a006393fe823e119a14794a931bd9bc25f74 Mon Sep 17 00:00:00 2001 +From 282f8934fe5c19471bea64bf72bfe413b216cfed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 16 Dec 2013 23:40:00 -0500 Subject: [PATCH] man: describe journalctl --show-cursor +(cherry picked from commit 7fd97d7829de4e62690b5fb8d41de81bcde24db2) --- man/journalctl.xml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/0175-journal-fix-against-theoretical-undefined-behavior.patch b/0175-journal-fix-against-theoretical-undefined-behavior.patch index d2825e4..87a8e41 100644 --- a/0175-journal-fix-against-theoretical-undefined-behavior.patch +++ b/0175-journal-fix-against-theoretical-undefined-behavior.patch @@ -1,4 +1,4 @@ -From 9e32b8f531a1e15f85cce97bea931c43a9db7798 Mon Sep 17 00:00:00 2001 +From 5fd0e6e4db2690a1c23140cc3bf14b192dd52ebe Mon Sep 17 00:00:00 2001 From: Shawn Landden Date: Mon, 16 Dec 2013 15:41:00 -0800 Subject: [PATCH] journal: fix against (theoretical) undefined behavior @@ -17,6 +17,8 @@ compares two character sequences returns zero, and a function that copies characters copies zero characters. see http://llvm.org/bugs/show_bug.cgi?id=18247 + +(cherry picked from commit 08c6f819cb0ed435649583da02fa0de965b32dbe) --- src/journal/journal-file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0176-journald-downgrade-warning-message-when-dev-kmsg-doe.patch b/0176-journald-downgrade-warning-message-when-dev-kmsg-doe.patch index 6936e38..e08ce5b 100644 --- a/0176-journald-downgrade-warning-message-when-dev-kmsg-doe.patch +++ b/0176-journald-downgrade-warning-message-when-dev-kmsg-doe.patch @@ -1,9 +1,10 @@ -From 602fa0f30e4770b1f45e005a7ed9417065b0d640 Mon Sep 17 00:00:00 2001 +From 0501945504cdc3b81f01d565e95be71c91ec9696 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 17 Dec 2013 19:56:06 +0100 Subject: [PATCH] journald: downgrade warning message when /dev/kmsg does not exist +(cherry picked from commit 445ea9be520b9549aee45d0b6427cf48b446987f) --- src/journal/journald-kmsg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/0177-journal-file.c-remove-redundant-assignment-of-variab.patch b/0177-journal-file.c-remove-redundant-assignment-of-variab.patch index e5baa81..226dec1 100644 --- a/0177-journal-file.c-remove-redundant-assignment-of-variab.patch +++ b/0177-journal-file.c-remove-redundant-assignment-of-variab.patch @@ -1,10 +1,12 @@ -From 029cd4a129832bcc750206deb05695da350efe77 Mon Sep 17 00:00:00 2001 +From 477aa08b702f43368005f4ee84fe4b3fdc641daf Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Tue, 17 Dec 2013 20:15:45 +0100 Subject: [PATCH] journal-file.c: remove redundant assignment of variable we also do 'last_index = (uint64_t) -1;' at the end of the while loop so there is no reason to also do it here. + +(cherry picked from commit 0d647f7f73fa17074a1df81e2bdd00877554e436) --- src/journal/journal-file.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch b/0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch index 4523e80..56b082b 100644 --- a/0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch +++ b/0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch @@ -1,4 +1,4 @@ -From 0fa446efab8593abc726a7c2438549098db4cc70 Mon Sep 17 00:00:00 2001 +From f3656789f8c0d5255809b4057f609247d440ef79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Sun, 15 Dec 2013 12:06:37 +0100 Subject: [PATCH] login: Don't stop a running user manager from @@ -8,6 +8,8 @@ With the current logic, a user will never be garbage-collected, since its manager will always be around. Change the logic such that a user is garbage-collected when it has no sessions and linger is disabled. +(cherry picked from commit 63966da86d8e71b1f3f2b57d5448770d526421f9) + Conflicts: src/login/logind-user.c --- diff --git a/0179-libudev-devices-received-from-udev-are-always-initia.patch b/0179-libudev-devices-received-from-udev-are-always-initia.patch index 492bb25..6f797a0 100644 --- a/0179-libudev-devices-received-from-udev-are-always-initia.patch +++ b/0179-libudev-devices-received-from-udev-are-always-initia.patch @@ -1,8 +1,10 @@ -From 0e075f4d98a653cc0b468fc786fcd869075a75e1 Mon Sep 17 00:00:00 2001 +From 17524d5fe60c683a6f937424a112cd2259edb0f8 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 18 Dec 2013 16:49:19 +0100 Subject: [PATCH] libudev: devices received from udev are always initialized +(cherry picked from commit f6613dd959a1ab49bf061555ada77903397569ad) + Conflicts: TODO --- diff --git a/0180-log-don-t-reopen-dev-console-each-time-we-call-log_o.patch b/0180-log-don-t-reopen-dev-console-each-time-we-call-log_o.patch index ea04f74..0bbf9dd 100644 --- a/0180-log-don-t-reopen-dev-console-each-time-we-call-log_o.patch +++ b/0180-log-don-t-reopen-dev-console-each-time-we-call-log_o.patch @@ -1,9 +1,11 @@ -From df5013c79d99848730abe4585dd93f77409a95c0 Mon Sep 17 00:00:00 2001 +From 95dc0bbe007d9625b763bb73742d9d3a9dce4c44 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 18 Dec 2013 05:07:34 +0100 Subject: [PATCH] log: don't reopen /dev/console each time we call log_open() Instead, force reopen it only if we really really have to. + +(cherry picked from commit 99f098257f5e4135609edc3df965ebf27975df18) --- src/core/main.c | 1 + src/core/shutdown.c | 1 + diff --git a/0181-log-when-we-log-to-dev-console-and-got-disconnected-.patch b/0181-log-when-we-log-to-dev-console-and-got-disconnected-.patch index 643807f..ae25ee0 100644 --- a/0181-log-when-we-log-to-dev-console-and-got-disconnected-.patch +++ b/0181-log-when-we-log-to-dev-console-and-got-disconnected-.patch @@ -1,9 +1,10 @@ -From 21804157ff0e60508fd128310505381f7b3ec2b0 Mon Sep 17 00:00:00 2001 +From d550c0b83e0c01c7fb2a185ce91627285c350ca1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 18 Dec 2013 16:49:15 +0100 Subject: [PATCH] log: when we log to /dev/console and got disconnected (maybe due to vhangup) reconnect +(cherry picked from commit 0e6eaa2d98fffa86d29a9616485b7ade5c160638) --- src/shared/log.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/0182-loginctl-when-showing-device-tree-of-seats-with-no-d.patch b/0182-loginctl-when-showing-device-tree-of-seats-with-no-d.patch index 68ec5ce..c9bc617 100644 --- a/0182-loginctl-when-showing-device-tree-of-seats-with-no-d.patch +++ b/0182-loginctl-when-showing-device-tree-of-seats-with-no-d.patch @@ -1,9 +1,10 @@ -From d34a6029e4a59c75d9826e0aa57e548a86b08bba Mon Sep 17 00:00:00 2001 +From 10131437ac7d636966f5419fc52af19b85cb409c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 18 Dec 2013 17:16:33 +0100 Subject: [PATCH] loginctl: when showing device tree of seats with no devices show something useful +(cherry picked from commit ddae67fa1bdd86b480a60ad6fc1d90d6f35a03d0) --- src/login/sysfs-show.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/0183-man-be-more-explicit-about-option-arguments-that-tak.patch b/0183-man-be-more-explicit-about-option-arguments-that-tak.patch index f930ed0..c76fc38 100644 --- a/0183-man-be-more-explicit-about-option-arguments-that-tak.patch +++ b/0183-man-be-more-explicit-about-option-arguments-that-tak.patch @@ -1,4 +1,4 @@ -From 6bd96f28f8d67cb5cb77057e60badb4550ae35f3 Mon Sep 17 00:00:00 2001 +From 64aa27e512f01f95f91d7e20dc2107b287220fcc Mon Sep 17 00:00:00 2001 From: "Jason St. John" Date: Tue, 17 Dec 2013 18:48:43 -0500 Subject: [PATCH] man: be more explicit about option arguments that take @@ -6,6 +6,8 @@ Subject: [PATCH] man: be more explicit about option arguments that take It may not be immediately obvious to the reader what "ID128" is, so replace the example option argument "ID128" with "128-bit-ID". + +(cherry picked from commit 9a7adc9a0ed53d6e422321e9196eb83d18afcba5) --- man/journalctl.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/0184-man-add-DOI-for-refereed-article-on-Forward-Secure-S.patch b/0184-man-add-DOI-for-refereed-article-on-Forward-Secure-S.patch index 9e08719..17d313a 100644 --- a/0184-man-add-DOI-for-refereed-article-on-Forward-Secure-S.patch +++ b/0184-man-add-DOI-for-refereed-article-on-Forward-Secure-S.patch @@ -1,4 +1,4 @@ -From 1f3128aec84ea40d54423386384ad28a789cb381 Mon Sep 17 00:00:00 2001 +From cfb8ec6045ca2f99e2d800e0ee605390f12046af Mon Sep 17 00:00:00 2001 From: "Jason St. John" Date: Tue, 17 Dec 2013 19:40:02 -0500 Subject: [PATCH] man: add DOI for refereed article on Forward Secure Sealing @@ -6,6 +6,8 @@ Subject: [PATCH] man: add DOI for refereed article on Forward Secure Sealing In journalctl(1), be more explicit about the reference to "Seal=" in journald.conf(5) and what information can be found there. + +(cherry picked from commit 06d9d3efa554ffc63b5977f1d86e393edeef8ad1) --- man/journalctl.xml | 8 ++++++-- man/journald.conf.xml | 10 +++++----- diff --git a/0185-journalctl-zsh-completion-fix-several-issues-in-help.patch b/0185-journalctl-zsh-completion-fix-several-issues-in-help.patch index 4a8b38f..cb15b27 100644 --- a/0185-journalctl-zsh-completion-fix-several-issues-in-help.patch +++ b/0185-journalctl-zsh-completion-fix-several-issues-in-help.patch @@ -1,4 +1,4 @@ -From 643f82598b69d3b3002294a456a459cceb075cd3 Mon Sep 17 00:00:00 2001 +From ae03512503e7ac6c948449d3c32e01d2cee24e8f Mon Sep 17 00:00:00 2001 From: "Jason St. John" Date: Tue, 17 Dec 2013 21:36:27 -0500 Subject: [PATCH] journalctl,zsh-completion: fix several issues in --help @@ -15,6 +15,8 @@ both sections squash! journalctl: fix several issues in --help message text +(cherry picked from commit c736283bfb81f5b00756e08a13946c113a41527f) + Conflicts: src/journal/journalctl.c --- diff --git a/0186-keymap-Refactor-Acer-tables.patch b/0186-keymap-Refactor-Acer-tables.patch index 424f2b1..e568db5 100644 --- a/0186-keymap-Refactor-Acer-tables.patch +++ b/0186-keymap-Refactor-Acer-tables.patch @@ -1,10 +1,12 @@ -From 7bf8a20c2f52a3684deef37098f7a73a873da93c Mon Sep 17 00:00:00 2001 +From 01b1101571ff332816a171f037fff1b41ae7b246 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 19 Dec 2013 08:33:32 +0100 Subject: [PATCH] keymap: Refactor Acer tables Move common keys into generic Acer table, and factorize the model specific exceptions. + +(cherry picked from commit c5b7838ddeae1fcd5c613ea15f04918b945823e5) --- hwdb/60-keyboard.hwdb | 101 ++++++++++++++++++-------------------------------- 1 file changed, 36 insertions(+), 65 deletions(-) diff --git a/0187-logging-reduce-send-timeout-to-something-more-sensib.patch b/0187-logging-reduce-send-timeout-to-something-more-sensib.patch index 4c7c234..7b57b00 100644 --- a/0187-logging-reduce-send-timeout-to-something-more-sensib.patch +++ b/0187-logging-reduce-send-timeout-to-something-more-sensib.patch @@ -1,4 +1,4 @@ -From f1a638c065df3432bb69cc664b5425b96de13325 Mon Sep 17 00:00:00 2001 +From b7f2e5ac769ca4d9b7d28050ec662104635a7822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 14 Dec 2013 11:54:26 -0500 Subject: [PATCH] logging: reduce send timeout to something more sensible @@ -6,6 +6,8 @@ Subject: [PATCH] logging: reduce send timeout to something more sensible For a user, the timeout of 1 min per message seems equivalent to a hang. If journald cannot process a message from PID1 for 10 ms then something is significantly wrong. It's better to lose the message and continue. + +(cherry picked from commit 4d89874af6a798744a32deb314001a13a28f0559) --- src/shared/log.c | 5 ++++- src/shared/time-util.c | 7 +++---- diff --git a/0188-DEFAULT_PATH_SPLIT_USR-macro.patch b/0188-DEFAULT_PATH_SPLIT_USR-macro.patch index 60d290f..a154f1a 100644 --- a/0188-DEFAULT_PATH_SPLIT_USR-macro.patch +++ b/0188-DEFAULT_PATH_SPLIT_USR-macro.patch @@ -1,8 +1,9 @@ -From e02f70c30b2ad98e5547faebd1304d5273eb0fe6 Mon Sep 17 00:00:00 2001 +From 52410883d28cb05012ddbc892bc73071bdd2145b Mon Sep 17 00:00:00 2001 From: Shawn Landden Date: Fri, 20 Dec 2013 15:35:38 -0800 Subject: [PATCH] DEFAULT_PATH_SPLIT_USR macro +(cherry picked from commit e10a55fd72b5246cec1bbd09135d544db32e0414) --- src/nspawn/nspawn.c | 2 +- src/shared/path-util.h | 7 +++++-- diff --git a/0189-fstab-generator-Do-not-try-to-fsck-non-devices.patch b/0189-fstab-generator-Do-not-try-to-fsck-non-devices.patch index 7bb4534..bd8e4e7 100644 --- a/0189-fstab-generator-Do-not-try-to-fsck-non-devices.patch +++ b/0189-fstab-generator-Do-not-try-to-fsck-non-devices.patch @@ -1,4 +1,4 @@ -From 67ab7e43a7c5623af367193817f5b562d635b0aa Mon Sep 17 00:00:00 2001 +From 6b838ee990970947770ea7458b036d4cd1af5a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20B=C3=A4chler?= Date: Sat, 21 Dec 2013 11:22:37 +0100 Subject: [PATCH] fstab-generator: Do not try to fsck non-devices @@ -6,6 +6,8 @@ Subject: [PATCH] fstab-generator: Do not try to fsck non-devices This fixes a regression introduced in 64e70e4 where the mount fails when fstab is misconfigured with fs_passno > 0 on a virtual file system like nfs, and the type is specified as "auto". + +(cherry picked from commit e2f123b97b9af34f39cb18ce0c1c5ef6cb89117e) --- src/fstab-generator/fstab-generator.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/0190-logind-remove-dead-variable.patch b/0190-logind-remove-dead-variable.patch index 59b0a63..2e53d8e 100644 --- a/0190-logind-remove-dead-variable.patch +++ b/0190-logind-remove-dead-variable.patch @@ -1,9 +1,10 @@ -From 45e44dd49cafc1befdc1fb6d948071520335964a Mon Sep 17 00:00:00 2001 +From 4d73c5f38ac3b6515d6a4871405ee47dd948fb73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 19 Dec 2013 14:16:46 -0500 Subject: [PATCH] logind: remove dead variable Noticed-by: Jan Alexander Steffens +(cherry picked from commit eb53c37e2eb1ff9e2dbf370985dd53c62a98fa66) --- src/login/logind-user.c | 3 --- src/login/logind-user.h | 1 - diff --git a/0191-hwdb-update.patch b/0191-hwdb-update.patch index 7359702..35e2d22 100644 --- a/0191-hwdb-update.patch +++ b/0191-hwdb-update.patch @@ -1,8 +1,10 @@ -From 59f89c783a3dd29bc024be457dfd7ad664d55358 Mon Sep 17 00:00:00 2001 +From 18f18b6b5f397024ce31ae80d8e30edfe11138e8 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 22 Dec 2013 11:32:11 -0800 Subject: [PATCH] hwdb: update +(cherry picked from commit c309c17df4e9ecb548bf437159b3cdc2cbfe6ef1) + Conflicts: hwdb/20-sdio-vendor-model.hwdb --- diff --git a/0192-delta-replace-readdir_r-with-readdir.patch b/0192-delta-replace-readdir_r-with-readdir.patch index 0ebc7d7..b0af48d 100644 --- a/0192-delta-replace-readdir_r-with-readdir.patch +++ b/0192-delta-replace-readdir_r-with-readdir.patch @@ -1,8 +1,9 @@ -From 3c0667a5ed5bc7043499f176d68f77dea6bae944 Mon Sep 17 00:00:00 2001 +From ac5bf29c46514c1370cbc3a70f90a83b07ca8183 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 19 Dec 2013 11:16:12 +0100 Subject: [PATCH] delta: replace readdir_r with readdir +(cherry picked from commit 6887ec4f00d7c10cd70da3e10d570684bf32d28d) --- src/delta/delta.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/0193-delta-fix-delta-for-drop-ins.patch b/0193-delta-fix-delta-for-drop-ins.patch index 94b5a5d..9ae8a28 100644 --- a/0193-delta-fix-delta-for-drop-ins.patch +++ b/0193-delta-fix-delta-for-drop-ins.patch @@ -1,4 +1,4 @@ -From e0902bd55deee738f3d6e33b8744364ef922caa2 Mon Sep 17 00:00:00 2001 +From 928b0d1e7555ce4b3dc897c8cc80c97406e69931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 22 Dec 2013 19:45:02 -0500 Subject: [PATCH] delta: fix delta for drop-ins @@ -6,6 +6,8 @@ Subject: [PATCH] delta: fix delta for drop-ins Also, fix highlighting, add more debug statements, make const tables static and global, run path_kill_slashes only at entry. +(cherry picked from commit f939e9a47c54ac37504e8517f316cbec46864d14) + Conflicts: src/delta/delta.c --- diff --git a/0194-delta-if-prefix-is-specified-only-show-overrides-the.patch b/0194-delta-if-prefix-is-specified-only-show-overrides-the.patch index 23026ab..cb09dfa 100644 --- a/0194-delta-if-prefix-is-specified-only-show-overrides-the.patch +++ b/0194-delta-if-prefix-is-specified-only-show-overrides-the.patch @@ -1,10 +1,12 @@ -From 31ce1352b687551d62d3b7d4dc1276b2dff1d65a Mon Sep 17 00:00:00 2001 +From 8193cf614082dc3ed42895bbae963cf5d134e191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 22 Dec 2013 22:53:23 -0500 Subject: [PATCH] delta: if prefix is specified, only show overrides there systemd-delta /run/systemd/system will show all unit overrides in /run, etc. + +(cherry picked from commit 6096dfd6167f8520be3a359c1fd0e6f2e76a4dc1) --- man/systemd-delta.xml | 80 +++++++++++++++++++++++++++++++++++++++++---------- src/delta/delta.c | 71 ++++++++++++++++++++++++++++----------------- diff --git a/0195-log-log_error-and-friends-add-a-newline-after-each-l.patch b/0195-log-log_error-and-friends-add-a-newline-after-each-l.patch index e89402c..2e13ddb 100644 --- a/0195-log-log_error-and-friends-add-a-newline-after-each-l.patch +++ b/0195-log-log_error-and-friends-add-a-newline-after-each-l.patch @@ -1,9 +1,11 @@ -From 316d1c573345d8d13a289ce38cbe2fd683a75d98 Mon Sep 17 00:00:00 2001 +From f66138e444da2361be0dad9a034efd13a37e7001 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 24 Dec 2013 16:39:37 +0100 Subject: [PATCH] log: log_error() and friends add a newline after each line anyway, so avoid including it in the log strings +(cherry picked from commit 9f6445e34a57c270f013c9416c123e56261553dd) + Conflicts: src/bus-driverd/bus-driverd.c src/bus-proxyd/bus-proxyd.c diff --git a/0196-man-units-tmpfiles.d-5-cleanup.patch b/0196-man-units-tmpfiles.d-5-cleanup.patch index fd8eb7b..975307e 100644 --- a/0196-man-units-tmpfiles.d-5-cleanup.patch +++ b/0196-man-units-tmpfiles.d-5-cleanup.patch @@ -1,4 +1,4 @@ -From 6972095a2b6eb919b622a89d11e0dc823ed60efb Mon Sep 17 00:00:00 2001 +From a4f5607fb79ce51d1be905da6dec7f9e8d514e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 24 Dec 2013 10:21:45 -0500 Subject: [PATCH] man,units: tmpfiles.d(5) cleanup @@ -10,6 +10,8 @@ systemd-tmpfiles(1). Also use markup where possible. +(cherry picked from commit ef72c1f06e2bc696a799cd31a1e0ed25cc999ea4) + Conflicts: man/tmpfiles.d.xml --- diff --git a/0197-tmpfiles-introduce-the-concept-of-unsafe-operations.patch b/0197-tmpfiles-introduce-the-concept-of-unsafe-operations.patch index bfe7f21..ed75d38 100644 --- a/0197-tmpfiles-introduce-the-concept-of-unsafe-operations.patch +++ b/0197-tmpfiles-introduce-the-concept-of-unsafe-operations.patch @@ -1,4 +1,4 @@ -From 66b1ee20b814b02cd0fb73fec4a2a9b11defc607 Mon Sep 17 00:00:00 2001 +From 98712c792cea68c76a0c8383476c366d2ad0df20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 20 Dec 2013 20:25:39 -0500 Subject: [PATCH] tmpfiles: introduce the concept of unsafe operations @@ -24,6 +24,7 @@ easy to override. https://bugzilla.redhat.com/show_bug.cgi?id=1043212 https://bugzilla.redhat.com/show_bug.cgi?id=1045849 +(cherry picked from commit c4708f132381e4bbc864d5241381b5cde4f54878) --- Makefile.am | 1 + man/systemd-tmpfiles.xml | 6 ++++++ diff --git a/0198-sleep-config-fix-useless-check-for-swapfile-type.patch b/0198-sleep-config-fix-useless-check-for-swapfile-type.patch index 2871866..25f85aa 100644 --- a/0198-sleep-config-fix-useless-check-for-swapfile-type.patch +++ b/0198-sleep-config-fix-useless-check-for-swapfile-type.patch @@ -1,4 +1,4 @@ -From 5e86ba530ae6f7a4c9aec4069b0b8481003094c6 Mon Sep 17 00:00:00 2001 +From 873186b8f64a8c1e37300e9e82876a21244bf9cf Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Tue, 24 Dec 2013 16:42:06 -0500 Subject: [PATCH] sleep-config: fix useless check for swapfile type @@ -9,6 +9,8 @@ ever only write "partition" or "file" there. OTOH, it is possible that "\\040(deleted)" (escaped " (deleted)") will be added for removed files. This should not happen, so add a warning to detect those cases. + +(cherry picked from commit db69869f264af2d1afcdd3e573e0e9fdd5bef065) --- src/shared/sleep-config.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/0199-journalctl-make-sure-b-foobar-cannot-be-misunderstoo.patch b/0199-journalctl-make-sure-b-foobar-cannot-be-misunderstoo.patch index 08ec28f..e6bb464 100644 --- a/0199-journalctl-make-sure-b-foobar-cannot-be-misunderstoo.patch +++ b/0199-journalctl-make-sure-b-foobar-cannot-be-misunderstoo.patch @@ -1,9 +1,11 @@ -From 2c3dd6140293fb09b4c78b5db2dbcad35ee7d002 Mon Sep 17 00:00:00 2001 +From a36b4264aa9de5f796fb43af9e14e889c90db52d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 26 Dec 2013 01:52:01 +0100 Subject: [PATCH] journalctl: make sure -b --foobar cannot be misunderstood as --boot=--foobar +(cherry picked from commit 442e2def7938435481eed34cd7331e34ebc8d9e0) + Conflicts: src/journal/journalctl.c src/systemd/sd-bus.h diff --git a/0200-man-resolve-word-omissions.patch b/0200-man-resolve-word-omissions.patch index 8528eef..96e77ff 100644 --- a/0200-man-resolve-word-omissions.patch +++ b/0200-man-resolve-word-omissions.patch @@ -1,4 +1,4 @@ -From 424e80301de3b39d8641a49a7755af6dc3d6b4e8 Mon Sep 17 00:00:00 2001 +From 2b360c18dbbd03ef2cbf4d251099e1317a9341a8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 26 Dec 2013 02:47:43 +0100 Subject: [PATCH] man: resolve word omissions @@ -6,6 +6,8 @@ Subject: [PATCH] man: resolve word omissions This is a recurring submission and includes corrections to: word omissions and word class choice. +(cherry picked from commit 494a66821815e8109afa136bd42818b85da38c09) + Conflicts: man/sd_bus_message_get_cookie.xml man/sd_bus_request_name.xml diff --git a/0201-man-improvements-to-comma-placement.patch b/0201-man-improvements-to-comma-placement.patch index b1a9674..4d299bf 100644 --- a/0201-man-improvements-to-comma-placement.patch +++ b/0201-man-improvements-to-comma-placement.patch @@ -1,4 +1,4 @@ -From 4a1155c88d295e81037fd8a48b585a00fbf43cbc Mon Sep 17 00:00:00 2001 +From c8fbfc50732a45c0d644e4b4949088657c47c18f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 26 Dec 2013 02:47:44 +0100 Subject: [PATCH] man: improvements to comma placement diff --git a/0202-man-grammar-and-wording-improvements.patch b/0202-man-grammar-and-wording-improvements.patch index f40a0a9..59eae77 100644 --- a/0202-man-grammar-and-wording-improvements.patch +++ b/0202-man-grammar-and-wording-improvements.patch @@ -1,4 +1,4 @@ -From cae52ffc976561b6c847a38e3ea9d9a9ce2c1513 Mon Sep 17 00:00:00 2001 +From 69c3bedc376e0e49a03378fbd049dcade46dcc62 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 26 Dec 2013 02:47:45 +0100 Subject: [PATCH] man: grammar and wording improvements diff --git a/0203-man-document-fail-nofail-auto-noauto.patch b/0203-man-document-fail-nofail-auto-noauto.patch index 104ec34..55a445d 100644 --- a/0203-man-document-fail-nofail-auto-noauto.patch +++ b/0203-man-document-fail-nofail-auto-noauto.patch @@ -1,4 +1,4 @@ -From 6566f27fc123e1b2fd14e5177dcb21c6b3598d5d Mon Sep 17 00:00:00 2001 +From 904fa7d6cde45ea7cb70a177317911f3f174e6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 25 Dec 2013 23:20:57 -0500 Subject: [PATCH] man: document fail/nofail, auto/noauto diff --git a/0204-man-fix-description-of-is-enabled-returned-value.patch b/0204-man-fix-description-of-is-enabled-returned-value.patch index 0686560..313550d 100644 --- a/0204-man-fix-description-of-is-enabled-returned-value.patch +++ b/0204-man-fix-description-of-is-enabled-returned-value.patch @@ -1,4 +1,4 @@ -From 8debc611398abf60d16e73982c9d56b5ea957e15 Mon Sep 17 00:00:00 2001 +From 89402dc49ef5dd48b302b62658843712b952ec29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 24 Dec 2013 22:57:15 -0500 Subject: [PATCH] man: fix description of is-enabled returned value diff --git a/0205-man-fix-Type-reference.patch b/0205-man-fix-Type-reference.patch index 7bc3030..625beba 100644 --- a/0205-man-fix-Type-reference.patch +++ b/0205-man-fix-Type-reference.patch @@ -1,4 +1,4 @@ -From c32611c5388de404cf4b169fa3d757c2603e597d Mon Sep 17 00:00:00 2001 +From 2ce57c2ad34d90ba9a3487457742e73e70b38d19 Mon Sep 17 00:00:00 2001 From: Marcos Felipe Rasia de Mello Date: Thu, 26 Dec 2013 17:47:57 -0200 Subject: [PATCH] man: fix Type= reference diff --git a/0206-man-fix-Type-reference-v2.patch b/0206-man-fix-Type-reference-v2.patch index 694a0f3..adc5bcc 100644 --- a/0206-man-fix-Type-reference-v2.patch +++ b/0206-man-fix-Type-reference-v2.patch @@ -1,4 +1,4 @@ -From 73868c5b0a59438256d8abd4157ff915a7dc1f37 Mon Sep 17 00:00:00 2001 +From 8cb0a403bede237ad50691e3801ba07d90a19540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 27 Dec 2013 01:18:39 -0500 Subject: [PATCH] man: fix Type= reference v2 diff --git a/0207-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0207-hwdb-Update-database-of-Bluetooth-company-identifier.patch index c013152..8504019 100644 --- a/0207-hwdb-Update-database-of-Bluetooth-company-identifier.patch +++ b/0207-hwdb-Update-database-of-Bluetooth-company-identifier.patch @@ -1,8 +1,9 @@ -From d38baf3d9088a2d206a6b622fb7f609dc115bd6a Mon Sep 17 00:00:00 2001 +From 20e82d507777c71d57db58d25dc852430f60a740 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 27 Dec 2013 09:35:20 -0800 Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers +(cherry picked from commit c4a3a17ee919e8b1197328394709edfe36d8b710) --- hwdb/20-bluetooth-vendor-product.hwdb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/0208-man-add-a-note-about-propagating-signals.patch b/0208-man-add-a-note-about-propagating-signals.patch index 687f5a7..498a739 100644 --- a/0208-man-add-a-note-about-propagating-signals.patch +++ b/0208-man-add-a-note-about-propagating-signals.patch @@ -1,8 +1,9 @@ -From 16142c7f1f24c58af1388608f1efb382a094bcb5 Mon Sep 17 00:00:00 2001 +From 81277768f5c70ade9d7a35868b3bb76d9f61724e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 27 Dec 2013 15:27:24 -0500 Subject: [PATCH] man: add a note about propagating signals +(cherry picked from commit a9a305332b7faf0d0d16db04909badaf6a095fef) --- man/systemd.service.xml | 39 +++++++++++++++++++++++++-------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/0209-man-include-autoconf-snippet-in-daemon-7.patch b/0209-man-include-autoconf-snippet-in-daemon-7.patch index 1a74456..b93ceb4 100644 --- a/0209-man-include-autoconf-snippet-in-daemon-7.patch +++ b/0209-man-include-autoconf-snippet-in-daemon-7.patch @@ -1,9 +1,10 @@ -From cc5b9c30f5e8312ee8905f7882da7ab79fef571c Mon Sep 17 00:00:00 2001 +From 2a57e30e2dede0fc218110710cd947e925b9bd17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Fri, 27 Dec 2013 23:44:27 -0500 Subject: [PATCH] man: include autoconf snippet in daemon(7) https://bugs.freedesktop.org/show_bug.cgi?id=40446 +(cherry picked from commit 5486855f7d9748684633a96bf646d29080d5a28d) --- man/daemon.xml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/0210-systemd-python-fix-setting-of-exception-codes.patch b/0210-systemd-python-fix-setting-of-exception-codes.patch index 82d0980..dfef194 100644 --- a/0210-systemd-python-fix-setting-of-exception-codes.patch +++ b/0210-systemd-python-fix-setting-of-exception-codes.patch @@ -1,4 +1,4 @@ -From 2a683cff7e7ac4f94ce545a0907d5b5b883c2a36 Mon Sep 17 00:00:00 2001 +From 50b9110bad80771869c9dd68978e0272e8bdf0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 29 Dec 2013 23:39:28 -0500 Subject: [PATCH] systemd-python: fix setting of exception codes @@ -7,6 +7,8 @@ The return value of 0 would be treated as failure by mistake, resulting in " SystemError: error return without exception set". The way that set_error() is used is changed to be the same everywhere. + +(cherry picked from commit b560cc1c45006a98c7652435df13c96b39827f22) --- src/python-systemd/_daemon.c | 14 +++++----- src/python-systemd/_reader.c | 63 ++++++++++++++++++++------------------------ diff --git a/0211-systemd-python-fix-listen_fds-under-Python-2.patch b/0211-systemd-python-fix-listen_fds-under-Python-2.patch index fb0e675..dff4332 100644 --- a/0211-systemd-python-fix-listen_fds-under-Python-2.patch +++ b/0211-systemd-python-fix-listen_fds-under-Python-2.patch @@ -1,8 +1,9 @@ -From 353a5553a38d002a69a4fbafabf1e9ab50ff32c2 Mon Sep 17 00:00:00 2001 +From 6042e2c1dd87374edeb4763461b242a3015c63b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 30 Dec 2013 00:01:00 -0500 Subject: [PATCH] systemd-python: fix listen_fds under Python 2 +(cherry picked from commit 819c7e4fa4422af1298a0bf074b1f5644e46fa13) --- src/python-systemd/_daemon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0212-man-expand-on-some-more-subtle-points-in-systemd.soc.patch b/0212-man-expand-on-some-more-subtle-points-in-systemd.soc.patch index a08fc4b..d6e9560 100644 --- a/0212-man-expand-on-some-more-subtle-points-in-systemd.soc.patch +++ b/0212-man-expand-on-some-more-subtle-points-in-systemd.soc.patch @@ -1,9 +1,10 @@ -From 204a710b647527c35cee26962bbd324e6cebc822 Mon Sep 17 00:00:00 2001 +From 058e00e289847654cf8ceabf24703ea49eda08f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 30 Dec 2013 00:11:30 -0500 Subject: [PATCH] man: expand on some more subtle points in systemd.socket(5) http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=727708#1694 +(cherry picked from commit 3cf148f307e6450aa3411968f59a2563fe9cb154) --- man/systemd.socket.xml | 67 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 49 insertions(+), 18 deletions(-) diff --git a/0213-tmpfiles-rename-unsafe-to-boot.patch b/0213-tmpfiles-rename-unsafe-to-boot.patch index aec129c..93e5f3b 100644 --- a/0213-tmpfiles-rename-unsafe-to-boot.patch +++ b/0213-tmpfiles-rename-unsafe-to-boot.patch @@ -1,10 +1,12 @@ -From 3d2c847396cf348ef1ee55f5d4211045a6202efc Mon Sep 17 00:00:00 2001 +From fbf992e84452e101ec70957646ed3a460a421445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 30 Dec 2013 13:00:38 -0500 Subject: [PATCH] tmpfiles: rename --unsafe to --boot As suggested by Kay, it is better to describe what is done, not what might happen. + +(cherry picked from commit 818156512411835a4a7f070e6fec3d7b80e1f629) --- man/systemd-tmpfiles.xml | 2 +- man/tmpfiles.d.xml | 4 ++-- diff --git a/0214-sleep-config-Dereference-pointer-before-check-for-NU.patch b/0214-sleep-config-Dereference-pointer-before-check-for-NU.patch index 5bbb976..06a18a1 100644 --- a/0214-sleep-config-Dereference-pointer-before-check-for-NU.patch +++ b/0214-sleep-config-Dereference-pointer-before-check-for-NU.patch @@ -1,4 +1,4 @@ -From ba087745bca7eea8f62cc529c3e6c5eaf6bf2904 Mon Sep 17 00:00:00 2001 +From 01b42c7fc7476814ff2e87327ff6e02ed4c8b55c Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Mon, 30 Dec 2013 17:43:52 +0100 Subject: [PATCH] sleep-config: Dereference pointer before check for NULL @@ -28,6 +28,8 @@ code in question. As we access *modes and *states before the check in the changed line of this patch, I assume the line to be wrong and we actually wanted to check for *modes and *states being both non null. + +(cherry picked from commit 34a3baa4dbd8a4032ae74cb5947b9494bf3ec106) --- src/shared/sleep-config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0215-sleep-config-fix-double-free.patch b/0215-sleep-config-fix-double-free.patch index be26e91..ffcb744 100644 --- a/0215-sleep-config-fix-double-free.patch +++ b/0215-sleep-config-fix-double-free.patch @@ -1,4 +1,4 @@ -From e8d2aa2c8d3533a2dc6f0db5ed22453a16bcf1ee Mon Sep 17 00:00:00 2001 +From 4eb924cb2ffc7c53737e268a2dfffebc459f4acc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 31 Dec 2013 11:23:58 -0500 Subject: [PATCH] sleep-config: fix double free @@ -9,6 +9,8 @@ free was performed. Rework the whole function to be easier to understand, and also replace strv_split_nulstr with strv_new, since we know the strings anyway. + +(cherry picked from commit dabeaa460d9fa01db645116775f53e3071977503) --- src/shared/sleep-config.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/0216-rules-drivers-do-not-reset-RUN-list.patch b/0216-rules-drivers-do-not-reset-RUN-list.patch index 1c9eb58..785d0d4 100644 --- a/0216-rules-drivers-do-not-reset-RUN-list.patch +++ b/0216-rules-drivers-do-not-reset-RUN-list.patch @@ -1,8 +1,9 @@ -From eb882aa36d9c700b7b5469df3f2bf43092d5c68b Mon Sep 17 00:00:00 2001 +From a218015bbd267992a8d9dd37110945f47c0656ca Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 3 Jan 2014 01:32:03 +0100 Subject: [PATCH] rules: drivers - do not reset RUN list +(cherry picked from commit b11d8d199334494d3434875e63856540cec7f8d1) --- rules/80-drivers.rules | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/0217-core-manager-print-info-about-interesting-signals.patch b/0217-core-manager-print-info-about-interesting-signals.patch index 3cad48c..1cd116e 100644 --- a/0217-core-manager-print-info-about-interesting-signals.patch +++ b/0217-core-manager-print-info-about-interesting-signals.patch @@ -1,4 +1,4 @@ -From 0e09a7e4c14e6b1d31a9a56b80d02b52c9583ab1 Mon Sep 17 00:00:00 2001 +From 8d8d64b5a542e9530dc0e06e7bd4e6f47aee56e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 27 Dec 2013 22:12:38 -0500 Subject: [PATCH] core/manager: print info about interesting signals @@ -6,6 +6,8 @@ Subject: [PATCH] core/manager: print info about interesting signals Information about signals which are not routinely received by systemd are printed at info level. This should make it easier to see what is happening in the system. + +(cherry picked from commit a9244623f785f504f799407b0228dea9655e24cb) --- src/core/manager.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/0218-core-service-check-if-mainpid-matches-only-if-it-is-.patch b/0218-core-service-check-if-mainpid-matches-only-if-it-is-.patch index 707ce3e..6ccd76e 100644 --- a/0218-core-service-check-if-mainpid-matches-only-if-it-is-.patch +++ b/0218-core-service-check-if-mainpid-matches-only-if-it-is-.patch @@ -1,9 +1,10 @@ -From d4466e04783415eee7eec269104e60ab1f6b4b50 Mon Sep 17 00:00:00 2001 +From d252d0b50d37bffd19b71572115447fc67f2acf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 30 Dec 2013 11:21:56 -0500 Subject: [PATCH] core/service: check if mainpid matches only if it is set https://bugzilla.redhat.com/show_bug.cgi?id=1047304 +(cherry picked from commit da13d4d20f8ca12e86863abbae5ed47bca936828) Conflicts: src/core/service.c diff --git a/0219-man-typo-fix.patch b/0219-man-typo-fix.patch index 6a1759b..dd45ce3 100644 --- a/0219-man-typo-fix.patch +++ b/0219-man-typo-fix.patch @@ -1,8 +1,9 @@ -From dfb3a987b160406fb4cf6cc3935cf54571d7c373 Mon Sep 17 00:00:00 2001 +From d9149a1f3756500dc44d959bd8c14321897cb140 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Sat, 4 Jan 2014 23:21:13 +0100 Subject: [PATCH] man: typo fix +(cherry picked from commit 3563b896da77bb2e6abc2ca0f03d8e2f570f1cc7) --- man/systemd.time.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0220-swap-remove-if-else-with-the-same-data-path.patch b/0220-swap-remove-if-else-with-the-same-data-path.patch index fc12f02..ac2d33c 100644 --- a/0220-swap-remove-if-else-with-the-same-data-path.patch +++ b/0220-swap-remove-if-else-with-the-same-data-path.patch @@ -1,4 +1,4 @@ -From d61f36a7ef07c252b49cc8015fe37b69bffb1a35 Mon Sep 17 00:00:00 2001 +From 753aeaee0bdaecf804e6c750051fe094f03b9c84 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Fri, 3 Jan 2014 20:33:20 +0100 Subject: [PATCH] swap: remove if/else with the same data path @@ -7,6 +7,8 @@ This was introduced in e1770af812 (2012-02-03, swap: replace failure boolean by result enum). This just removes unneeded lines of code, no functional change. + +(cherry picked from commit 7bb01eff62aa7b612e33fe0e512a4d97862050c4) --- src/core/swap.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/0221-hwdb-update.patch b/0221-hwdb-update.patch index 2c7a3c1..47390e9 100644 --- a/0221-hwdb-update.patch +++ b/0221-hwdb-update.patch @@ -1,8 +1,10 @@ -From 3c8008b94726f3812ac28f4a33db61635323ee6a Mon Sep 17 00:00:00 2001 +From 2f1814df5d255c4b02240671f6cb41db75dbe705 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sun, 5 Jan 2014 00:44:34 -0800 Subject: [PATCH] hwdb: update +(cherry picked from commit 479e339e5534af4c800894a553010af91f5ec8f7) + Conflicts: hwdb/20-sdio-vendor-model.hwdb --- diff --git a/0222-journal-Add-missing-byte-order-conversions.patch b/0222-journal-Add-missing-byte-order-conversions.patch index 8493e83..5d5c222 100644 --- a/0222-journal-Add-missing-byte-order-conversions.patch +++ b/0222-journal-Add-missing-byte-order-conversions.patch @@ -1,4 +1,4 @@ -From 43539d6b60ef0db3e98d00bef0024614c8c1807a Mon Sep 17 00:00:00 2001 +From 655462b69ccd87c4634a8c202c98efdedcf2192d Mon Sep 17 00:00:00 2001 From: George McCollister Date: Tue, 31 Dec 2013 14:37:32 -0600 Subject: [PATCH] journal: Add missing byte order conversions @@ -9,6 +9,7 @@ chain_cache_put(). [zj: also use le64toh in journal-verify.c] https://bugs.freedesktop.org/show_bug.cgi?id=73194 +(cherry picked from commit af13a6b0606f166c93cafc9892343f167f880281) --- src/journal/journal-file.c | 4 ++-- src/journal/journal-verify.c | 6 +++--- diff --git a/0223-hwdb-change-key-mappings-for-Samsung-90X3A.patch b/0223-hwdb-change-key-mappings-for-Samsung-90X3A.patch index 511c442..85943fa 100644 --- a/0223-hwdb-change-key-mappings-for-Samsung-90X3A.patch +++ b/0223-hwdb-change-key-mappings-for-Samsung-90X3A.patch @@ -1,4 +1,4 @@ -From c47bbfc9af040f1b0fce2edced4136ee921d9e70 Mon Sep 17 00:00:00 2001 +From 5be51230458adb52f23b2053900b94521a425584 Mon Sep 17 00:00:00 2001 From: Raudi Date: Mon, 6 Jan 2014 19:44:08 -0500 Subject: [PATCH] hwdb: change key mappings for Samsung 90X3A @@ -7,6 +7,7 @@ The Key codes didn't match with the described key. Also the key identifier strings were missing. I hope I chose appropriate ones. https://bugs.freedesktop.org/show_bug.cgi?id=70296 +(cherry picked from commit dfa2ea215df5f1e78084de862a54c0f1f321a13a) --- hwdb/60-keyboard.hwdb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/0224-hwdb-add-Samsung-700G.patch b/0224-hwdb-add-Samsung-700G.patch index 41cb167..90b115c 100644 --- a/0224-hwdb-add-Samsung-700G.patch +++ b/0224-hwdb-add-Samsung-700G.patch @@ -1,9 +1,10 @@ -From 8e48fd6cc5e12bb1662970dc7a7d306550a9a079 Mon Sep 17 00:00:00 2001 +From de10b71d31c4d0aed229b0a099ea229ea6db3389 Mon Sep 17 00:00:00 2001 From: Dmitry Pisklov Date: Mon, 6 Jan 2014 20:06:59 -0500 Subject: [PATCH] hwdb: add Samsung 700G https://bugs.freedesktop.org/show_bug.cgi?id=72311 +(cherry picked from commit dcafc342bfa44d4d5ee76e5ddc12fd36f8f64af5) --- hwdb/60-keyboard.hwdb | 1 + 1 file changed, 1 insertion(+) diff --git a/0225-hwdb-remove-duplicate-entry-for-Samsung-700Z.patch b/0225-hwdb-remove-duplicate-entry-for-Samsung-700Z.patch index 0f668a2..9d4060e 100644 --- a/0225-hwdb-remove-duplicate-entry-for-Samsung-700Z.patch +++ b/0225-hwdb-remove-duplicate-entry-for-Samsung-700Z.patch @@ -1,4 +1,4 @@ -From 1bfc778f2c82180873407f2da8a8c3335ae37b07 Mon Sep 17 00:00:00 2001 +From 89351766335b8ebf07e53658c32c622f490a902c Mon Sep 17 00:00:00 2001 From: Dmitry Pisklov Date: Mon, 6 Jan 2014 20:08:21 -0500 Subject: [PATCH] hwdb: remove duplicate entry for Samsung 700Z @@ -6,6 +6,7 @@ Subject: [PATCH] hwdb: remove duplicate entry for Samsung 700Z keyboardbrightnessup/down are not even real keys. https://bugs.freedesktop.org/show_bug.cgi?id=72311 +(cherry picked from commit 245dc22920d6592e50265c82c8def8e4bbf0e665) --- hwdb/60-keyboard.hwdb | 5 ----- 1 file changed, 5 deletions(-) diff --git a/0226-hwdb-fix-match-for-Thinkpad-X201-tablet.patch b/0226-hwdb-fix-match-for-Thinkpad-X201-tablet.patch index ac9269d..5cb5912 100644 --- a/0226-hwdb-fix-match-for-Thinkpad-X201-tablet.patch +++ b/0226-hwdb-fix-match-for-Thinkpad-X201-tablet.patch @@ -1,9 +1,10 @@ -From 0ec2b82ee4f1bb1fdbf3293cfe10e59240d5c533 Mon Sep 17 00:00:00 2001 +From 348a8dfdcfcb869bab08ee286b5b4858f95fb938 Mon Sep 17 00:00:00 2001 From: AppleBloom Date: Mon, 6 Jan 2014 20:51:47 -0500 Subject: [PATCH] hwdb: fix match for Thinkpad X201 tablet https://bugs.freedesktop.org/show_bug.cgi?id=71929 +(cherry picked from commit f92164e45a0f7524e294fb383e624ff754095a25) --- hwdb/60-keyboard.hwdb | 1 + 1 file changed, 1 insertion(+) diff --git a/0227-keymap-Recognize-different-Toshiba-Satellite-capital.patch b/0227-keymap-Recognize-different-Toshiba-Satellite-capital.patch index 3486097..44914b2 100644 --- a/0227-keymap-Recognize-different-Toshiba-Satellite-capital.patch +++ b/0227-keymap-Recognize-different-Toshiba-Satellite-capital.patch @@ -1,9 +1,10 @@ -From 5ed0efb00ec5cf103debcb4fc5f38398c59cc619 Mon Sep 17 00:00:00 2001 +From 924df1ee06dddb47c153ebfc29ac0612293e89fd Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 7 Jan 2014 09:40:01 +0100 Subject: [PATCH] keymap: Recognize different Toshiba Satellite capitalizations https://launchpad.net/bugs/665918 +(cherry picked from commit c79af123de72cdb70f122c7fda5b2401acc5ea7b) --- hwdb/60-keyboard.hwdb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0228-sleep.c-fix-typo.patch b/0228-sleep.c-fix-typo.patch index 0ad123a..38ab255 100644 --- a/0228-sleep.c-fix-typo.patch +++ b/0228-sleep.c-fix-typo.patch @@ -1,8 +1,9 @@ -From b1f114caf2e2b0913e4122847c7fa2b182b86771 Mon Sep 17 00:00:00 2001 +From fdaa623f6260f03f2c7c38802fc713a865a3fc34 Mon Sep 17 00:00:00 2001 From: Michele Curti Date: Tue, 7 Jan 2014 17:51:41 +0100 Subject: [PATCH] sleep.c: fix typo +(cherry picked from commit 096924092b664e992cec49e2ef4ce33443877ac8) --- src/sleep/sleep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0229-delta-ensure-that-d_type-will-be-set-on-every-fs.patch b/0229-delta-ensure-that-d_type-will-be-set-on-every-fs.patch index d005b76..49baf94 100644 --- a/0229-delta-ensure-that-d_type-will-be-set-on-every-fs.patch +++ b/0229-delta-ensure-that-d_type-will-be-set-on-every-fs.patch @@ -1,8 +1,9 @@ -From 35fbb83e322dfe14771d0c84b623b423a38b1200 Mon Sep 17 00:00:00 2001 +From 62393e23d43a25622261a0f1b5d81af1bd7f287f Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 9 Jan 2014 16:43:00 +0100 Subject: [PATCH] delta: ensure that d_type will be set on every fs +(cherry picked from commit 277f2f75f69bbd5868c74991011c804ce00dfed9) --- src/delta/delta.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/0230-tmpfiles-don-t-allow-label_fix-to-print-ENOENT-when-.patch b/0230-tmpfiles-don-t-allow-label_fix-to-print-ENOENT-when-.patch index 6e7cb46..d4ba7a5 100644 --- a/0230-tmpfiles-don-t-allow-label_fix-to-print-ENOENT-when-.patch +++ b/0230-tmpfiles-don-t-allow-label_fix-to-print-ENOENT-when-.patch @@ -1,9 +1,10 @@ -From 3bef88018c93e77d50d3206e84f6fa2fe8c2fb99 Mon Sep 17 00:00:00 2001 +From 20de07b19d30ac0ca69aba491ce7c8558a4a0c96 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Thu, 9 Jan 2014 18:00:50 +0100 Subject: [PATCH] tmpfiles: don't allow label_fix to print ENOENT when we want to ignore it +(cherry picked from commit f58ceb21e9cdc4b79586283743351750ae35c175) --- src/tmpfiles/tmpfiles.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/0231-man-mention-which-variables-will-be-expanded-in-Exec.patch b/0231-man-mention-which-variables-will-be-expanded-in-Exec.patch index a491004..758f84e 100644 --- a/0231-man-mention-which-variables-will-be-expanded-in-Exec.patch +++ b/0231-man-mention-which-variables-will-be-expanded-in-Exec.patch @@ -1,8 +1,10 @@ -From 4f4e72a317126e9d41db675ddae27a0942cd23bf Mon Sep 17 00:00:00 2001 +From 492427208b00f716de6f6d1bab8969b20ab6bf5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 9 Jan 2014 22:23:32 -0500 Subject: [PATCH] man: mention which variables will be expanded in ExecStart +(cherry picked from commit c5b37953b7835562348d71ad5514faefa4cfb10b) + Conflicts: man/systemd.service.xml --- diff --git a/0232-hwdb-Add-support-for-Toshiba-Satellite-P75-A7200-key.patch b/0232-hwdb-Add-support-for-Toshiba-Satellite-P75-A7200-key.patch index a9f69ab..040e828 100644 --- a/0232-hwdb-Add-support-for-Toshiba-Satellite-P75-A7200-key.patch +++ b/0232-hwdb-Add-support-for-Toshiba-Satellite-P75-A7200-key.patch @@ -1,8 +1,9 @@ -From 0fb47635e6db4d27b821388274c0c83d612fc0bb Mon Sep 17 00:00:00 2001 +From 637e74f351bff40968e74cd12e47e210b9994f57 Mon Sep 17 00:00:00 2001 From: Unai Uribarri Date: Sat, 11 Jan 2014 09:19:41 -0500 Subject: [PATCH] hwdb: Add support for Toshiba Satellite P75-A7200 keyboard +(cherry picked from commit 2a61aaac6607d998e981481c34ae06e3e3ace4fe) --- hwdb/60-keyboard.hwdb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/0233-journal-fix-access-to-munmapped-memory-in-sd_journal.patch b/0233-journal-fix-access-to-munmapped-memory-in-sd_journal.patch index 4b23ffe..e38c106 100644 --- a/0233-journal-fix-access-to-munmapped-memory-in-sd_journal.patch +++ b/0233-journal-fix-access-to-munmapped-memory-in-sd_journal.patch @@ -1,4 +1,4 @@ -From 9b9103a07cc32fa76be4c71fcd9a93b5d946edd4 Mon Sep 17 00:00:00 2001 +From 9e6366a959cefc30b941ebf1611ada7e47949c8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 28 Dec 2013 19:33:23 -0500 Subject: [PATCH] journal: fix access to munmapped memory in @@ -15,6 +15,8 @@ be increased and decreased. Other callers which set keep_always=true are unmodified: their references are never released but are ignored when the whole file is closed, which happens at some point. keep_always is increased in sd_j_e_u and later on released. + +(cherry picked from commit ae97089d49d1795a35a443b7b830ee666028e733) --- src/journal/journal-file.c | 5 +--- src/journal/journal-file.h | 24 +++++++++++++++++++ diff --git a/0234-gpt-auto-generator-skip-nonexistent-devices.patch b/0234-gpt-auto-generator-skip-nonexistent-devices.patch index 1735610..16c93e3 100644 --- a/0234-gpt-auto-generator-skip-nonexistent-devices.patch +++ b/0234-gpt-auto-generator-skip-nonexistent-devices.patch @@ -1,4 +1,4 @@ -From 182a32427b50aed5812833e3ecb8a6078160a501 Mon Sep 17 00:00:00 2001 +From 518e59833ad33561788f56b7ea624c6094b8b94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stelmach?= Date: Tue, 7 Jan 2014 15:00:22 +0100 Subject: [PATCH] gpt-auto-generator: skip nonexistent devices @@ -12,6 +12,8 @@ are presented by the kernel as children of the latter. That relationship makes gpt-auto-generator try to peek them but since they are not GPT partitions blkid_do_safeprobe() returns -2 making verify_gpt_parition() function return -ENODEV. + +(cherry picked from commit 843f737ade9c73609a2280dd3dd16e18222a5dcb) --- src/gpt-auto-generator/gpt-auto-generator.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/0235-gpt-auto-generator-use-EBADSLT-code-when-unable-to-d.patch b/0235-gpt-auto-generator-use-EBADSLT-code-when-unable-to-d.patch index 90dcbbb..0f3eed6 100644 --- a/0235-gpt-auto-generator-use-EBADSLT-code-when-unable-to-d.patch +++ b/0235-gpt-auto-generator-use-EBADSLT-code-when-unable-to-d.patch @@ -1,4 +1,4 @@ -From 15ef380be7e38898fe2aef4ae3aa6fb0ce804564 Mon Sep 17 00:00:00 2001 +From b195fe269dc40f483dd0c525f1f23d96e694d17b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 11 Jan 2014 16:45:29 -0500 Subject: [PATCH] gpt-auto-generator: use EBADSLT code when unable to detect @@ -6,6 +6,8 @@ Subject: [PATCH] gpt-auto-generator: use EBADSLT code when unable to detect ENODEV suggests that something is missing, which is be misleading here. + +(cherry picked from commit b94801803417c23d099cb7e508754181ecd27f9c) --- src/gpt-auto-generator/gpt-auto-generator.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/0236-journald-do-not-free-space-when-disk-space-runs-low.patch b/0236-journald-do-not-free-space-when-disk-space-runs-low.patch index 53a0bda..80040c4 100644 --- a/0236-journald-do-not-free-space-when-disk-space-runs-low.patch +++ b/0236-journald-do-not-free-space-when-disk-space-runs-low.patch @@ -1,4 +1,4 @@ -From 96dc1b72f3fb5d344538984121e11e5804905145 Mon Sep 17 00:00:00 2001 +From 7fed327890e10c38d89df2c7913f906d76e515e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 13 Nov 2013 00:42:22 -0500 Subject: [PATCH] journald: do not free space when disk space runs low @@ -25,6 +25,8 @@ and sets the limit based on the current usage, so if disk remains to be filled, journald might use one journal-file-size less on each restart, if restarts happen just after rotation. This seems like a reasonable compromise between implementation complexity and robustness. + +(cherry picked from commit 348ced909724a1331b85d57aede80a102a00e428) --- man/journald.conf.xml | 39 +++++++++++++++++++++++---------- src/journal/journal-file.h | 1 + diff --git a/0237-man-add-busctl-1.patch b/0237-man-add-busctl-1.patch index 208c839..6781612 100644 --- a/0237-man-add-busctl-1.patch +++ b/0237-man-add-busctl-1.patch @@ -1,8 +1,10 @@ -From 7cfdb4b03c310e9bb55609a98eb70356e4c50148 Mon Sep 17 00:00:00 2001 +From 5ac6fce073ab60cc8efa29dec0c9e7462da1b3be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sat, 11 Jan 2014 23:44:34 -0500 Subject: [PATCH] man: add busctl(1) +(cherry picked from commit 708c143c7cd2bbd748ac0fa993496ff44e72701c) + Conflicts: Makefile-man.am TODO diff --git a/0238-journalctl-flip-to-full-by-default.patch b/0238-journalctl-flip-to-full-by-default.patch index 28f1a29..1bd8b4b 100644 --- a/0238-journalctl-flip-to-full-by-default.patch +++ b/0238-journalctl-flip-to-full-by-default.patch @@ -1,4 +1,4 @@ -From 25bebb7cc2b1b0d4ffc9ed02c348ae96b49c4572 Mon Sep 17 00:00:00 2001 +From 9425c5d1440fe5ffaa8f56b0ef91f17d97475706 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 6 Oct 2013 21:55:18 -0400 Subject: [PATCH] journalctl: flip to --full by default @@ -14,6 +14,7 @@ but aren't advertised as much. This change applies only to jornalctl, not to systemctl, when ellipsization is useful to keep the layout. https://bugzilla.redhat.com/show_bug.cgi?id=984758 +(cherry picked from commit 2b8f6883a17b9386299b7690869ccd8e20fe0347) --- man/journalctl.xml | 15 ++++++++++++--- src/journal/journalctl.c | 12 +++++++++--- diff --git a/0239-coredumpctl-in-case-of-error-free-pattern-after-prin.patch b/0239-coredumpctl-in-case-of-error-free-pattern-after-prin.patch index 6b373bf..76af1ac 100644 --- a/0239-coredumpctl-in-case-of-error-free-pattern-after-prin.patch +++ b/0239-coredumpctl-in-case-of-error-free-pattern-after-prin.patch @@ -1,8 +1,9 @@ -From a5c54f73b345b191b99cf47c8efe33afc0e4b066 Mon Sep 17 00:00:00 2001 +From e3d3ab46502d06d9e266cff638d78b05ecee8957 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Tue, 14 Jan 2014 15:40:16 +0100 Subject: [PATCH] coredumpctl: in case of error free pattern after print +(cherry picked from commit cf50a55277ee432e1217ad894afcbd9a664ff96c) --- src/journal/coredumpctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/0240-shell-completion-remove-load-from-systemctl.patch b/0240-shell-completion-remove-load-from-systemctl.patch index 566e9af..e1eb456 100644 --- a/0240-shell-completion-remove-load-from-systemctl.patch +++ b/0240-shell-completion-remove-load-from-systemctl.patch @@ -1,8 +1,10 @@ -From 4028b4cf18191ca958d2ef6cced1d5087aeea976 Mon Sep 17 00:00:00 2001 +From e96f97ae440a6ceda973584fa8c613bc4e92d890 Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Wed, 15 Jan 2014 15:31:07 +0100 Subject: [PATCH] shell-completion: remove load from systemctl +(cherry picked from commit f89a4474e05307e45992e1f30b6b1b26900d91bd) + Conflicts: shell-completion/bash/systemctl --- diff --git a/0241-units-drop-Install-section-from-multi-user.target-an.patch b/0241-units-drop-Install-section-from-multi-user.target-an.patch index a204197..9d5a3eb 100644 --- a/0241-units-drop-Install-section-from-multi-user.target-an.patch +++ b/0241-units-drop-Install-section-from-multi-user.target-an.patch @@ -1,4 +1,4 @@ -From 491712eabdbdb0693a8b04dfee02665094eb7576 Mon Sep 17 00:00:00 2001 +From e81566523ee61473daab8cdad95007f151825bab Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 17 Jan 2014 20:27:35 +0100 Subject: [PATCH] units: drop [Install] section from multi-user.target and @@ -9,6 +9,8 @@ to these targets, but this was never advertised and we have a better command for this now in "systemctl set-default". Since the install section makes the output of "systemctl list-unit-files" confusing (since it makes the units appear as "disabled"), let's drop the sections. + +(cherry picked from commit 02ebe178a2bd6b2448d4fbfa4a1f7fa98e9e82b1) --- units/graphical.target | 3 --- units/multi-user.target | 3 --- diff --git a/0242-systemctl-skip-native-unit-file-handling-if-sysv-fil.patch b/0242-systemctl-skip-native-unit-file-handling-if-sysv-fil.patch index 143add8..bd9a42e 100644 --- a/0242-systemctl-skip-native-unit-file-handling-if-sysv-fil.patch +++ b/0242-systemctl-skip-native-unit-file-handling-if-sysv-fil.patch @@ -1,10 +1,12 @@ -From d953cda9e6b3e41f419b63a35632edc8f769a7d0 Mon Sep 17 00:00:00 2001 +From 345151292fb48647cb9e9d5c6b4cd5dff0d0452a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 20 Jan 2014 13:43:20 +0100 Subject: [PATCH] systemctl: skip native unit file handling if sysv file handling already handled everything Issue pointed out by Colin Guthrie. + +(cherry picked from commit 67d6621059085963a2a908a3ea99ced3b0ca789e) --- src/systemctl/systemctl.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/0243-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0243-hwdb-Update-database-of-Bluetooth-company-identifier.patch index e5ba4d2..738e4c8 100644 --- a/0243-hwdb-Update-database-of-Bluetooth-company-identifier.patch +++ b/0243-hwdb-Update-database-of-Bluetooth-company-identifier.patch @@ -1,8 +1,9 @@ -From abcf860569fc85e7a6eb05606d579b6f2e6de898 Mon Sep 17 00:00:00 2001 +From 3011aefdb1e25deecdb7cbb81c3544070490c66b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Mon, 20 Jan 2014 17:53:16 -0800 Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers +(cherry picked from commit 43d9c2b5848b1363b659c38443c1c94db57415fd) --- hwdb/20-bluetooth-vendor-product.hwdb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/0244-udev-static_node-do-not-exit-rule-after-first-static.patch b/0244-udev-static_node-do-not-exit-rule-after-first-static.patch index f7f66b6..a7a4fe0 100644 --- a/0244-udev-static_node-do-not-exit-rule-after-first-static.patch +++ b/0244-udev-static_node-do-not-exit-rule-after-first-static.patch @@ -1,4 +1,4 @@ -From 87041721ccfc9472d9c4f229402e342ba6c855b0 Mon Sep 17 00:00:00 2001 +From 78645cfb57f854a8715782c502e458b51b92b74b Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 22 Jan 2014 10:47:48 +0100 Subject: [PATCH] udev: static_node - do not exit rule after first static_node @@ -6,6 +6,8 @@ Subject: [PATCH] udev: static_node - do not exit rule after first static_node The nodes usually do not exist, so handle the next item instead of skipping the entire rule. + +(cherry picked from commit d6f116a7b18f8bd3c6507c803217991235c7f1bb) --- src/udev/udev-rules.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/0245-cryptsetup-Support-key-slot-option.patch b/0245-cryptsetup-Support-key-slot-option.patch index 2cb4b61..b2c79cc 100644 --- a/0245-cryptsetup-Support-key-slot-option.patch +++ b/0245-cryptsetup-Support-key-slot-option.patch @@ -1,4 +1,4 @@ -From 47ac3edbade8ab5f4a205f2c1bad11ec9643b8b6 Mon Sep 17 00:00:00 2001 +From 9a81579b603024729b6666fc8091654eb0e5c710 Mon Sep 17 00:00:00 2001 From: Christian Seiler Date: Sun, 26 Jan 2014 12:02:49 +0100 Subject: [PATCH] cryptsetup: Support key-slot option @@ -14,6 +14,8 @@ This patch makes systemd aware of this option. Debian bug that introduced the feature: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=704470 + +(cherry picked from commit b4a11878f2fdf5b07f895863747153de632ff4e6) --- man/crypttab.xml | 14 ++++++++++++++ src/cryptsetup/cryptsetup.c | 13 +++++++++++-- diff --git a/0246-pam_systemd-Ignore-vtnr-when-seat-seat0.patch b/0246-pam_systemd-Ignore-vtnr-when-seat-seat0.patch index 1f7df88..a18c71f 100644 --- a/0246-pam_systemd-Ignore-vtnr-when-seat-seat0.patch +++ b/0246-pam_systemd-Ignore-vtnr-when-seat-seat0.patch @@ -1,10 +1,12 @@ -From 2373386db2501528c74e2f547c2c5d27d81be35b Mon Sep 17 00:00:00 2001 +From 4939be5d981f0839458ec88f7d29bd5a0d1d71c0 Mon Sep 17 00:00:00 2001 From: Matthew Monaco Date: Fri, 24 Jan 2014 11:23:01 -0700 Subject: [PATCH] pam_systemd: Ignore vtnr when seat != seat0 logind considers it an error for a seat other than seat0 to have a non-zero vtnr for CreateSession + +(cherry picked from commit d7353ef6095f5e7db63d9cc898c7134b64482550) --- src/login/pam-module.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/0247-keymap-Add-HP-Chromebook-14-Falco.patch b/0247-keymap-Add-HP-Chromebook-14-Falco.patch index f3d28f6..d7d9cf0 100644 --- a/0247-keymap-Add-HP-Chromebook-14-Falco.patch +++ b/0247-keymap-Add-HP-Chromebook-14-Falco.patch @@ -1,9 +1,11 @@ -From 815422d1be5fab4acaa8c1c752342752a0935e3a Mon Sep 17 00:00:00 2001 +From 2d4310a9280f9f4dfa4e331b512275551c8edaa4 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 27 Jan 2014 09:04:22 +0100 Subject: [PATCH] keymap: Add HP Chromebook 14 (Falco) Thanks to Stefan Nagy . + +(cherry picked from commit 82cd413782cca6de3088c2705f839ff31abec7f9) --- hwdb/60-keyboard.hwdb | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/0248-keymap-Add-release-quirk-for-Acer-AOA-switchvideomod.patch b/0248-keymap-Add-release-quirk-for-Acer-AOA-switchvideomod.patch index bef8d26..e688d54 100644 --- a/0248-keymap-Add-release-quirk-for-Acer-AOA-switchvideomod.patch +++ b/0248-keymap-Add-release-quirk-for-Acer-AOA-switchvideomod.patch @@ -1,9 +1,10 @@ -From ad001361e54d4e04175acd7f0eca55ffcb5e19ad Mon Sep 17 00:00:00 2001 +From 3f7f36fa7d3f96db5d207b03a10dcf03179b2f56 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 28 Jan 2014 18:10:12 +0100 Subject: [PATCH] keymap: Add release quirk for Acer AOA switchvideomode key https://launchpad.net/bugs/1272658 +(cherry picked from commit 1e091c1285b59d0fbab58e6e5113ad111bc08794) --- hwdb/60-keyboard.hwdb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/0249-keymap-Add-Sony-Vaio-VGN-FW250.patch b/0249-keymap-Add-Sony-Vaio-VGN-FW250.patch index 778803c..749efc8 100644 --- a/0249-keymap-Add-Sony-Vaio-VGN-FW250.patch +++ b/0249-keymap-Add-Sony-Vaio-VGN-FW250.patch @@ -1,9 +1,10 @@ -From cf981a6c17d44d00c385fe8a9ed7b8259533006d Mon Sep 17 00:00:00 2001 +From e3d72aa78b6e86432f9ff6c3f6b5f77ebfacd01e Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 28 Jan 2014 18:14:18 +0100 Subject: [PATCH] keymap: Add Sony Vaio VGN-FW250 https://launchpad.net/bugs/1271163 +(cherry picked from commit 7b36bf82c4deeadef6d914cef750b4a51ff2ed48) --- hwdb/60-keyboard.hwdb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/0250-keymap-Add-Toshiba-EQUIUM.patch b/0250-keymap-Add-Toshiba-EQUIUM.patch index 7feb0c9..c04e5f7 100644 --- a/0250-keymap-Add-Toshiba-EQUIUM.patch +++ b/0250-keymap-Add-Toshiba-EQUIUM.patch @@ -1,9 +1,11 @@ -From 8b690dd3c8d28ff107a9992e7405126a02ee7ae2 Mon Sep 17 00:00:00 2001 +From 454d0a0a60c4fb6d921950742b27cc06f5c5d30e Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 29 Jan 2014 16:13:22 +0100 Subject: [PATCH] keymap: Add Toshiba EQUIUM Thanks Aleksander Kowalski ! + +(cherry picked from commit c9cf047362cd8e4530c10bc7c2d6db988452305d) --- hwdb/60-keyboard.hwdb | 1 + 1 file changed, 1 insertion(+) diff --git a/0251-tmpfiles-fix-memory-leak-of-exclude_prefixes.patch b/0251-tmpfiles-fix-memory-leak-of-exclude_prefixes.patch index 70e9125..c0e47df 100644 --- a/0251-tmpfiles-fix-memory-leak-of-exclude_prefixes.patch +++ b/0251-tmpfiles-fix-memory-leak-of-exclude_prefixes.patch @@ -1,9 +1,11 @@ -From 85e9236488cfad07cc0aa4d23610bc25039dda27 Mon Sep 17 00:00:00 2001 +From e57f9c025955228a856f1329d6facd510074d8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 30 Jan 2014 21:40:27 -0500 Subject: [PATCH] tmpfiles: fix memory leak of exclude_prefixes Missed in 5c795114. + +(cherry picked from commit 498f8a39e66a62d015ac78e67e2504658bbba5f2) --- src/tmpfiles/tmpfiles.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/0252-analyze-fix-plot-issues-when-using-gummiboot.patch b/0252-analyze-fix-plot-issues-when-using-gummiboot.patch index 719477a..5f6b8d8 100644 --- a/0252-analyze-fix-plot-issues-when-using-gummiboot.patch +++ b/0252-analyze-fix-plot-issues-when-using-gummiboot.patch @@ -1,9 +1,11 @@ -From 982c437cfa1dc189fb650e00c6124e00f2c6de68 Mon Sep 17 00:00:00 2001 +From 2bd5b03aed6a5f0012a5f1c5ed01e948c967c531 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Fri, 31 Jan 2014 07:07:20 +0100 Subject: [PATCH] analyze: fix plot issues when using gummiboot It would crash and the legend in the bottom followed the time 0.0. + +(cherry picked from commit b5cfa7408c4cb68e9bb232fc34b07fd03c915617) --- src/analyze/systemd-analyze.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/0253-udev-add-zram-to-the-list-of-devices-inappropriate-f.patch b/0253-udev-add-zram-to-the-list-of-devices-inappropriate-f.patch index 4e93e33..2634606 100644 --- a/0253-udev-add-zram-to-the-list-of-devices-inappropriate-f.patch +++ b/0253-udev-add-zram-to-the-list-of-devices-inappropriate-f.patch @@ -1,4 +1,4 @@ -From 66065b8d9cd1bb7e488fd84d4f19d34487bf29a7 Mon Sep 17 00:00:00 2001 +From 9693c7f0bf20471ae91cc975f2e08fc5fd4a88ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3hann=20B=2E=20Gu=C3=B0mundsson?= Date: Sun, 2 Feb 2014 13:29:19 +0000 Subject: [PATCH] udev: add zram to the list of devices inappropriate for @@ -7,6 +7,8 @@ Subject: [PATCH] udev: add zram to the list of devices inappropriate for udev seems to have a race condition with swapon to see which can open /dev/zram0 first, causing swapon to fail. Seems to be most noticeable on arm devices one out of every 7 times or something. + +(cherry picked from commit 99bd4af0c7034f425b4d334986b03e632ab71718) --- rules/60-persistent-storage.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0254-bash-completion-fix-completion-of-complete-verbs.patch b/0254-bash-completion-fix-completion-of-complete-verbs.patch index 8033222..6fff04d 100644 --- a/0254-bash-completion-fix-completion-of-complete-verbs.patch +++ b/0254-bash-completion-fix-completion-of-complete-verbs.patch @@ -1,4 +1,4 @@ -From f00ffd4f0ab82c38125d2292f8f429aa22865dc3 Mon Sep 17 00:00:00 2001 +From 1bb3ed6816bf287d2cd30bd5b2c7b97786cd65c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 6 Feb 2014 00:31:22 -0500 Subject: [PATCH] bash-completion: fix completion of complete verbs @@ -7,6 +7,7 @@ When doing 'command verb', the arguments for verb would be proposed, but it is too early. We should complete verb first. https://bugs.freedesktop.org/show_bug.cgi?id=74596 +(cherry picked from commit 3ce09b7da2eb8b888066468663b2b5c81a05a03c) Conflicts: shell-completion/bash/busctl diff --git a/0255-shell-completion-fix-completion-of-localectl-set-loc.patch b/0255-shell-completion-fix-completion-of-localectl-set-loc.patch index 93c93c6..339f5c9 100644 --- a/0255-shell-completion-fix-completion-of-localectl-set-loc.patch +++ b/0255-shell-completion-fix-completion-of-localectl-set-loc.patch @@ -1,9 +1,10 @@ -From 827591e3b789844ec103338573cf8ed82231c0ad Mon Sep 17 00:00:00 2001 +From 14cf8f97d162a2f117f9ebd227a9f86567ad6bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 6 Feb 2014 11:59:33 -0500 Subject: [PATCH] shell-completion: fix completion of localectl set-locale https://bugs.freedesktop.org/show_bug.cgi?id=74157 +(cherry picked from commit 627a98d39844a1ac10fde1f72cf18b4f08be4990) --- shell-completion/bash/localectl | 20 ++++++++++++++++++-- shell-completion/zsh/_localectl | 13 +++++++++---- diff --git a/0256-zsh-completions-kernel-install-only-show-existing-ke.patch b/0256-zsh-completions-kernel-install-only-show-existing-ke.patch index 71ee646..c74715f 100644 --- a/0256-zsh-completions-kernel-install-only-show-existing-ke.patch +++ b/0256-zsh-completions-kernel-install-only-show-existing-ke.patch @@ -1,10 +1,12 @@ -From 7f10373aa0b75725edb66917fc31a17c65750a7c Mon Sep 17 00:00:00 2001 +From 91602b7c82cb12dd3d11840a8b2ea4520cbf1bb5 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 6 Feb 2014 18:15:47 +0100 Subject: [PATCH] zsh-completions: kernel-install - only show existing kernels for 'remove' When we remove a kernel, we don't remove the modules, so don't look at the modules directory to find installed kernels. + +(cherry picked from commit d72143bad46b51fc0bbedf01ff92aea8b07afac6) --- shell-completion/zsh/_kernel-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0257-core-fix-crashes-if-locale.conf-contains-invalid-utf.patch b/0257-core-fix-crashes-if-locale.conf-contains-invalid-utf.patch index 6e71a17..8226142 100644 --- a/0257-core-fix-crashes-if-locale.conf-contains-invalid-utf.patch +++ b/0257-core-fix-crashes-if-locale.conf-contains-invalid-utf.patch @@ -1,4 +1,4 @@ -From 43ccd990b8478b5aaf9b1618e0a5c3dd8924a9ee Mon Sep 17 00:00:00 2001 +From 08ad3cb42d0c075d5b51127e9f867907b42fccbb Mon Sep 17 00:00:00 2001 From: Goffredo Baroncelli Date: Thu, 6 Feb 2014 19:09:59 +0100 Subject: [PATCH] core: fix crashes if locale.conf contains invalid utf-8 @@ -22,6 +22,8 @@ systemd doesn't crash anymore and logs the error. [1] parse_env_file_internal(), invoked by load_env_file() and parse_env_file() + +(cherry picked from commit f27f0e2177ac0a4b96585aed7db3a080e27a2f00) --- src/shared/fileio.c | 77 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 34 deletions(-) diff --git a/0258-core-do-not-print-invalid-utf-8-in-error-messages.patch b/0258-core-do-not-print-invalid-utf-8-in-error-messages.patch index eb0a96c..53b863d 100644 --- a/0258-core-do-not-print-invalid-utf-8-in-error-messages.patch +++ b/0258-core-do-not-print-invalid-utf-8-in-error-messages.patch @@ -1,8 +1,10 @@ -From e8321526823f2b7b945aeb04e5cdb1367e3d5b94 Mon Sep 17 00:00:00 2001 +From bbc51fd471fd92a40458e4ba667799b9dfaa67f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 17 Jan 2014 21:28:41 -0500 Subject: [PATCH] core: do not print invalid utf-8 in error messages +(cherry picked from commit 550a40eceb7d1917152fc9317bf2696708d52bc2) + Conflicts: TODO --- diff --git a/0259-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch b/0259-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch index ce0de4f..1f80018 100644 --- a/0259-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch +++ b/0259-cryptsetup-generator-auto-add-deps-for-device-as-pas.patch @@ -1,10 +1,12 @@ -From caf058da753c7aae6fbf03feb68e689a8d8265c6 Mon Sep 17 00:00:00 2001 +From ebf9ef1bbc71f05a762ee76e7c9d97987c9b3216 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Sat, 8 Feb 2014 12:54:58 -0500 Subject: [PATCH] cryptsetup-generator: auto add deps for device as password If the password is a device file, we can add Requires/After dependencies on the device rather than requiring the user to do so. + +(cherry picked from commit 66a5dbdf282435403f947c2caadd04bb0cdec752) --- src/cryptsetup/cryptsetup-generator.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/0260-man-fix-reference-in-systemd-inhibit-1.patch b/0260-man-fix-reference-in-systemd-inhibit-1.patch index acafea6..81a245e 100644 --- a/0260-man-fix-reference-in-systemd-inhibit-1.patch +++ b/0260-man-fix-reference-in-systemd-inhibit-1.patch @@ -1,9 +1,10 @@ -From 46b93fa99d008403699a74478feac4e9b3f6f6a0 Mon Sep 17 00:00:00 2001 +From dc5f60d2681c51c2f2c46ecd14357cd78672ee71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 9 Feb 2014 01:34:20 -0500 Subject: [PATCH] man: fix reference in systemd-inhibit(1) http://bugs.debian.org/738316 +(cherry picked from commit 07b4b9b82247c4eff88dc236bb248dcc8c155548) --- man/systemd-inhibit.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0261-man-fix-another-reference-in-systemd-inhibit-1.patch b/0261-man-fix-another-reference-in-systemd-inhibit-1.patch index 17c1e03..1d46e47 100644 --- a/0261-man-fix-another-reference-in-systemd-inhibit-1.patch +++ b/0261-man-fix-another-reference-in-systemd-inhibit-1.patch @@ -1,9 +1,10 @@ -From 9bcaa50d2eb1f99fcb7393d52b53b95cdc193d30 Mon Sep 17 00:00:00 2001 +From 0b180f851f5da6571a9f4655f706497cf8088b15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 9 Feb 2014 01:34:20 -0500 Subject: [PATCH] man: fix another reference in systemd-inhibit(1) http://bugs.debian.org/738316 +(cherry picked from commit bbf261b75fda04ea6c1278d5e427f7c47eea9a6b) --- man/systemd-inhibit.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0262-fstab-generator-Create-fsck-root-symlink-with-correc.patch b/0262-fstab-generator-Create-fsck-root-symlink-with-correc.patch index 754805e..5a44c51 100644 --- a/0262-fstab-generator-Create-fsck-root-symlink-with-correc.patch +++ b/0262-fstab-generator-Create-fsck-root-symlink-with-correc.patch @@ -1,4 +1,4 @@ -From 9a36f797debf5f7dd240036a15c6942236c3e649 Mon Sep 17 00:00:00 2001 +From 06b7227f234e027502892f930b4f24a34baa22ab Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sun, 9 Feb 2014 12:07:11 +0000 Subject: [PATCH] fstab-generator: Create fsck-root symlink with correct path @@ -6,6 +6,8 @@ Subject: [PATCH] fstab-generator: Create fsck-root symlink with correct path This was noticed in Brussels at the hackfest. The fstab-generator currently creates a broken symlink pointing to itself in /run/systemd/generator/local-fs.target.wants/ for systemd-fsck-root.service + +(cherry picked from commit 63a1b905d83b8d223f78822122c71860c1b613d1) --- src/fstab-generator/fstab-generator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/0263-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch b/0263-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch index 40ababd..66917f4 100644 --- a/0263-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch +++ b/0263-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch @@ -1,9 +1,10 @@ -From fe56ff349838e5dfbc523db1c4d5625f5c69e2a9 Mon Sep 17 00:00:00 2001 +From d086399f4181ef1506f6de38efa4735500776d0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Tue, 11 Feb 2014 09:54:49 -0300 Subject: [PATCH] efi: fix Undefined reference efi_loader_get_boot_usec when EFI support is disabled +(cherry picked from commit 70d9b9fc0a4fa1698ff00e364c61bb875244efa1) --- src/shared/boot-timestamps.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/0264-core-make-StopWhenUnneeded-work-in-conjunction-with-.patch b/0264-core-make-StopWhenUnneeded-work-in-conjunction-with-.patch index 374f00f..003380a 100644 --- a/0264-core-make-StopWhenUnneeded-work-in-conjunction-with-.patch +++ b/0264-core-make-StopWhenUnneeded-work-in-conjunction-with-.patch @@ -1,10 +1,11 @@ -From 5c2e6a05a8b4bcb05c88872eec27f848caf30722 Mon Sep 17 00:00:00 2001 +From ee7dd7eacf1e618fd292a7b791124263ebb97ed9 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 13 Feb 2014 02:12:27 +0100 Subject: [PATCH] core: make StopWhenUnneeded work in conjunction with units that fail during their start job https://bugzilla.redhat.com/show_bug.cgi?id=997031 +(cherry picked from commit b33918c210a9b7a651e4e91cf7429967f1df6c25) --- src/core/unit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/0265-man-always-place-programlisting-and-programlisting-i.patch b/0265-man-always-place-programlisting-and-programlisting-i.patch index be075fe..f194b87 100644 --- a/0265-man-always-place-programlisting-and-programlisting-i.patch +++ b/0265-man-always-place-programlisting-and-programlisting-i.patch @@ -1,10 +1,12 @@ -From 8ea4ccf4ef7d3bc4c12ba008d270534257fb88b7 Mon Sep 17 00:00:00 2001 +From 8d467dc76e470298b384d104be9822c528b81c2e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 14 Feb 2014 15:56:19 +0100 Subject: [PATCH] man: always place and in a line with actual sources, so that we don't get spurious newlines in the man page output +(cherry picked from commit 9fccdb0f64d12bc09a71442dd0af2248c1aa3e89) + Conflicts: man/systemd-socket-proxyd.xml --- diff --git a/0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch b/0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch index 0c1036c..bf87194 100644 --- a/0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch +++ b/0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch @@ -1,4 +1,4 @@ -From 29e00416bbef0e8073373fde25347d139749d949 Mon Sep 17 00:00:00 2001 +From a2ca1771f9f8f2b8b5f08ab181e5cd9e6935f695 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Mon, 27 Jan 2014 17:54:29 +0000 Subject: [PATCH] Temporary work around for slow shutdown due to unterminated diff --git a/0267-pam-module-fix-warning-about-ignoring-vtnr.patch b/0267-pam-module-fix-warning-about-ignoring-vtnr.patch new file mode 100644 index 0000000..ec793dd --- /dev/null +++ b/0267-pam-module-fix-warning-about-ignoring-vtnr.patch @@ -0,0 +1,24 @@ +From 3696a356bbe3d7bfb6e130123cdff18f95adc4da Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 19 Feb 2014 09:13:09 -0500 +Subject: [PATCH] pam-module: fix warning about ignoring vtnr + +Feb 19 22:15:01 server crond[26418]: pam_systemd(crond:session): Ignoring vtnr +0 for which is not seat0 +--- + src/login/pam-module.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/login/pam-module.c b/src/login/pam-module.c +index 7ebb5d2..aa09ec1 100644 +--- a/src/login/pam-module.c ++++ b/src/login/pam-module.c +@@ -335,7 +335,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( + get_seat_from_display(display, NULL, &vtnr); + } + +- if (seat && !streq(seat, "seat0")) { ++ if (seat && !streq(seat, "seat0") && vtnr != 0) { + pam_syslog(handle, LOG_DEBUG, + "Ignoring vtnr %d for %s which is not seat0", vtnr, seat); + vtnr = 0; diff --git a/0268-pam_systemd-do-not-set-XDG_RUNTIME_DIR-if-the-sessio.patch b/0268-pam_systemd-do-not-set-XDG_RUNTIME_DIR-if-the-sessio.patch new file mode 100644 index 0000000..74a376c --- /dev/null +++ b/0268-pam_systemd-do-not-set-XDG_RUNTIME_DIR-if-the-sessio.patch @@ -0,0 +1,198 @@ +From 4ae930d9ddb8d2f806f89068142f4e7cd4df85e6 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Tue, 26 Nov 2013 05:05:00 +0100 +Subject: [PATCH] pam_systemd: do not set XDG_RUNTIME_DIR if the session's + original user is not the same as the newly logged in one + +It's better not to set any XDG_RUNTIME_DIR at all rather than one of a +different user. So let's do this. + +This changes the bus call parameters of CreateSession(), but that is +explicitly an internal API hence should be fine. Note however, that a +logind restart (the way the RPM postinst scriptlets do it) is necessary +to make things work again. + +(cherry picked from commit baae0358f349870544884e405e82e4be7d8add9f) + +Conflicts: + src/login/logind-dbus.c + src/login/logind-session-dbus.c + src/login/pam-module.c + +Note: Backported by Dr. Werner Fink +--- + src/login/logind-dbus.c | 1 + + src/login/logind-session-dbus.c | 1 + + src/login/pam-module.c | 67 ++++++++++++++++++++++------------------- + 3 files changed, 38 insertions(+), 31 deletions(-) + +diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c +index 583d62e..6f3e442 100644 +--- a/src/login/logind-dbus.c ++++ b/src/login/logind-dbus.c +@@ -523,6 +523,7 @@ static int bus_manager_create_session(Manager *m, DBusMessage *message) { + DBUS_TYPE_OBJECT_PATH, &path, + DBUS_TYPE_STRING, &session->user->runtime_path, + DBUS_TYPE_UNIX_FD, &fifo_fd, ++ DBUS_TYPE_UINT32, &session->user->uid, + DBUS_TYPE_STRING, &cseat, + DBUS_TYPE_UINT32, &vtnr, + DBUS_TYPE_BOOLEAN, &exists, +diff --git a/src/login/logind-session-dbus.c b/src/login/logind-session-dbus.c +index be4e01c..86b0746 100644 +--- a/src/login/logind-session-dbus.c ++++ b/src/login/logind-session-dbus.c +@@ -755,6 +755,7 @@ int session_send_create_reply(Session *s, DBusError *error) { + DBUS_TYPE_OBJECT_PATH, &path, + DBUS_TYPE_STRING, &s->user->runtime_path, + DBUS_TYPE_UNIX_FD, &fifo_fd, ++ DBUS_TYPE_UINT32, &s->user->uid, + DBUS_TYPE_STRING, &cseat, + DBUS_TYPE_UINT32, &vtnr, + DBUS_TYPE_BOOLEAN, &exists, +diff --git a/src/login/pam-module.c b/src/login/pam-module.c +index aa09ec1..4d6b052 100644 +--- a/src/login/pam-module.c ++++ b/src/login/pam-module.c +@@ -86,31 +86,24 @@ static int get_user_data( + + const char *username = NULL; + struct passwd *pw = NULL; +- uid_t uid; + int r; + + assert(handle); + assert(ret_username); + assert(ret_pw); + +- r = audit_loginuid_from_pid(0, &uid); +- if (r >= 0) +- pw = pam_modutil_getpwuid(handle, uid); +- else { +- r = pam_get_user(handle, &username, NULL); +- if (r != PAM_SUCCESS) { +- pam_syslog(handle, LOG_ERR, "Failed to get user name."); +- return r; +- } +- +- if (isempty(username)) { +- pam_syslog(handle, LOG_ERR, "User name not valid."); +- return PAM_AUTH_ERR; +- } ++ r = pam_get_user(handle, &username, NULL); ++ if (r != PAM_SUCCESS) { ++ pam_syslog(handle, LOG_ERR, "Failed to get user name."); ++ return r; ++ } + +- pw = pam_modutil_getpwnam(handle, username); ++ if (isempty(username)) { ++ pam_syslog(handle, LOG_ERR, "User name not valid."); ++ return PAM_AUTH_ERR; + } + ++ pw = pam_modutil_getpwnam(handle, username); + if (!pw) { + pam_syslog(handle, LOG_ERR, "Failed to get user data."); + return PAM_USER_UNKNOWN; +@@ -123,16 +116,14 @@ static int get_user_data( + } + + static int get_seat_from_display(const char *display, const char **seat, uint32_t *vtnr) { +- _cleanup_free_ char *p = NULL; +- int r; +- _cleanup_close_ int fd = -1; + union sockaddr_union sa = { + .un.sun_family = AF_UNIX, + }; ++ _cleanup_free_ char *p = NULL, *tty = NULL; ++ _cleanup_close_ int fd = -1; + struct ucred ucred; + socklen_t l; +- _cleanup_free_ char *tty = NULL; +- int v; ++ int v, r; + + assert(display); + assert(vtnr); +@@ -194,14 +185,12 @@ _public_ PAM_EXTERN int pam_sm_open_session( + dbus_bool_t remote, existing; + int r; + uint32_t vtnr = 0; ++ uid_t original_uid; + + assert(handle); + + dbus_error_init(&error); + +- if (debug) +- pam_syslog(handle, LOG_INFO, "pam-systemd initializing"); +- + /* Make this a NOP on non-logind systems */ + if (!logind_running()) + return PAM_SUCCESS; +@@ -214,6 +203,9 @@ _public_ PAM_EXTERN int pam_sm_open_session( + goto finish; + } + ++ if (debug) ++ pam_syslog(handle, LOG_INFO, "pam-systemd initializing"); ++ + r = get_user_data(handle, &username, &pw); + if (r != PAM_SUCCESS) + goto finish; +@@ -381,7 +373,11 @@ _public_ PAM_EXTERN int pam_sm_open_session( + if (debug) + pam_syslog(handle, LOG_DEBUG, "Asking logind to create session: " + "uid=%u pid=%u service=%s type=%s class=%s seat=%s vtnr=%u tty=%s display=%s remote=%s remote_user=%s remote_host=%s", +- uid, pid, service, type, class, seat, vtnr, tty, display, yes_no(remote), remote_user, remote_host); ++ pw->pw_uid, pid, ++ strempty(service), ++ type, class, ++ seat, vtnr, tty, display, ++ yes_no(remote), remote_user, remote_host); + + reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); + if (!reply) { +@@ -395,6 +391,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( + DBUS_TYPE_OBJECT_PATH, &object_path, + DBUS_TYPE_STRING, &runtime_path, + DBUS_TYPE_UNIX_FD, &session_fd, ++ DBUS_TYPE_UINT32, &original_uid, + DBUS_TYPE_STRING, &seat, + DBUS_TYPE_UINT32, &vtnr, + DBUS_TYPE_BOOLEAN, &existing, +@@ -406,8 +403,8 @@ _public_ PAM_EXTERN int pam_sm_open_session( + + if (debug) + pam_syslog(handle, LOG_DEBUG, "Reply from logind: " +- "id=%s object_path=%s runtime_path=%s session_fd=%d seat=%s vtnr=%u", +- id, object_path, runtime_path, session_fd, seat, vtnr); ++ "id=%s object_path=%s runtime_path=%s session_fd=%d seat=%s vtnr=%u original_uid=%u", ++ id, object_path, runtime_path, session_fd, seat, vtnr, original_uid); + + r = pam_misc_setenv(handle, "XDG_SESSION_ID", id, 0); + if (r != PAM_SUCCESS) { +@@ -415,10 +412,18 @@ _public_ PAM_EXTERN int pam_sm_open_session( + goto finish; + } + +- r = pam_misc_setenv(handle, "XDG_RUNTIME_DIR", runtime_path, 0); +- if (r != PAM_SUCCESS) { +- pam_syslog(handle, LOG_ERR, "Failed to set runtime dir."); +- goto finish; ++ if (original_uid == pw->pw_uid) { ++ /* Don't set $XDG_RUNTIME_DIR if the user we now ++ * authenticated for does not match the original user ++ * of the session. We do this in order not to result ++ * in privileged apps clobbering the runtime directory ++ * unnecessarily. */ ++ ++ r = pam_misc_setenv(handle, "XDG_RUNTIME_DIR", runtime_path, 0); ++ if (r != PAM_SUCCESS) { ++ pam_syslog(handle, LOG_ERR, "Failed to set runtime dir."); ++ goto finish; ++ } + } + + if (!isempty(seat)) { diff --git a/0269-core-do-not-segfault-if-proc-swaps-cannot-be-opened.patch b/0269-core-do-not-segfault-if-proc-swaps-cannot-be-opened.patch new file mode 100644 index 0000000..9c25c58 --- /dev/null +++ b/0269-core-do-not-segfault-if-proc-swaps-cannot-be-opened.patch @@ -0,0 +1,50 @@ +From 817a2d0c98ca035e2a906c04a4e2509103c583b1 Mon Sep 17 00:00:00 2001 +From: Matt Mullins +Date: Mon, 24 Feb 2014 15:03:52 -0800 +Subject: [PATCH] core: do not segfault if /proc/swaps cannot be opened + +The refactoring in f84b1b1ff9b1261 ('core: do not segfault if swap +activity happens when /proc/swaps is not open') caused +swap_dispatch_reload and swap_enumerate to continue even if fopen() +failed with ENOENT. + +This should instead be modified to return from swap_dispatch_reload and +swap_enumerate, rather than continuing to load the list of swaps when +m->proc_swaps is NULL. + +https://bugzilla.redhat.com/show_bug.cgi?id=1069393 +--- + src/core/swap.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/core/swap.c b/src/core/swap.c +index 727bb95..3c009da 100644 +--- a/src/core/swap.c ++++ b/src/core/swap.c +@@ -1074,7 +1074,7 @@ static int open_proc_swaps(Manager *m) { + + m->proc_swaps = fopen("/proc/swaps", "re"); + if (!m->proc_swaps) +- return (errno == ENOENT) ? 0 : -errno; ++ return -errno; + + m->swap_watch.type = WATCH_SWAP; + m->swap_watch.fd = fileno(m->proc_swaps); +@@ -1097,7 +1097,7 @@ int swap_dispatch_reload(Manager *m) { + + r = open_proc_swaps(m); + if (r < 0) +- return r; ++ return (r == -ENOENT) ? 0 : r; + + return swap_fd_event(m, EPOLLPRI); + } +@@ -1250,7 +1250,7 @@ static int swap_enumerate(Manager *m) { + + r = open_proc_swaps(m); + if (r < 0) +- return r; ++ return (r == -ENOENT) ? 0 : r; + + r = swap_load_proc_swaps(m, false); + if (r < 0) diff --git a/0270-Revert-login-Don-t-stop-a-running-user-manager-from-.patch b/0270-Revert-login-Don-t-stop-a-running-user-manager-from-.patch new file mode 100644 index 0000000..b1ecb28 --- /dev/null +++ b/0270-Revert-login-Don-t-stop-a-running-user-manager-from-.patch @@ -0,0 +1,30 @@ +From d3f2e8c826b310b7b48e8394a3726c5bd0efc8ae Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 24 Feb 2014 21:50:36 -0500 +Subject: [PATCH] Revert "login: Don't stop a running user manager from + garbage-collecting the user." + +This reverts commit f3656789f8c0d5255809b4057f609247d440ef79. + +https://bugzilla.redhat.com/show_bug.cgi?id=1053315 +--- + src/login/logind-user.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/login/logind-user.c b/src/login/logind-user.c +index b87311c..ddf19eb 100644 +--- a/src/login/logind-user.c ++++ b/src/login/logind-user.c +@@ -629,6 +629,12 @@ int user_check_gc(User *u, bool drop_not_started) { + if (u->slice_job || u->service_job) + return 1; + ++ if (u->slice && manager_unit_is_active(u->manager, u->slice) != 0) ++ return 1; ++ ++ if (u->service && manager_unit_is_active(u->manager, u->service) != 0) ++ return 1; ++ + return 0; + } + diff --git a/0271-Revert-journalctl-flip-to-full-by-default.patch b/0271-Revert-journalctl-flip-to-full-by-default.patch new file mode 100644 index 0000000..e940519 --- /dev/null +++ b/0271-Revert-journalctl-flip-to-full-by-default.patch @@ -0,0 +1,99 @@ +From 255eb046a7bcb90e60a3a54302bc1250c1aed26a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 24 Feb 2014 21:53:13 -0500 +Subject: [PATCH] Revert "journalctl: flip to --full by default" + +This reverts commit 9425c5d1440fe5ffaa8f56b0ef91f17d97475706. + +This is a user visible change and doesn't belong in stable series. +--- + man/journalctl.xml | 15 +++------------ + src/journal/journalctl.c | 12 +++--------- + 2 files changed, 6 insertions(+), 21 deletions(-) + +diff --git a/man/journalctl.xml b/man/journalctl.xml +index d1e841a..d75c758 100644 +--- a/man/journalctl.xml ++++ b/man/journalctl.xml +@@ -152,20 +152,11 @@ + + + +- +- + ++ + +- Ellipsize fields when +- they don't fit in available columns. +- The default is to show full fields, +- allowing them to wrap or be truncated +- by the pager if one is used. +- +- Old options +- / +- not useful anymore, except to undo +- . ++ Show all (printable) fields in ++ full. + + + +diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c +index 1b5bdd3..ccd96b2 100644 +--- a/src/journal/journalctl.c ++++ b/src/journal/journalctl.c +@@ -64,7 +64,7 @@ + static OutputMode arg_output = OUTPUT_SHORT; + static bool arg_pager_end = false; + static bool arg_follow = false; +-static bool arg_full = true; ++static bool arg_full = false; + static bool arg_all = false; + static bool arg_no_pager = false; + static int arg_lines = -1; +@@ -187,7 +187,7 @@ static int help(void) { + " short-precise, short-monotonic, verbose,\n" + " export, json, json-pretty, json-sse, cat)\n" + " -x --catalog Add message explanations where available\n" +- " --no-full Ellipsize fields\n" ++ " -l --full Do not ellipsize fields\n" + " -a --all Show all fields, including long and unprintable\n" + " -q --quiet Do not show privilege warning\n" + " --no-pager Do not pipe output into a pager\n" +@@ -224,7 +224,6 @@ static int parse_argv(int argc, char *argv[]) { + enum { + ARG_VERSION = 0x100, + ARG_NO_PAGER, +- ARG_NO_FULL, + ARG_NO_TAIL, + ARG_NEW_ID128, + ARG_LIST_BOOTS, +@@ -259,7 +258,6 @@ static int parse_argv(int argc, char *argv[]) { + { "output", required_argument, NULL, 'o' }, + { "all", no_argument, NULL, 'a' }, + { "full", no_argument, NULL, 'l' }, +- { "no-full", no_argument, NULL, ARG_NO_FULL }, + { "lines", optional_argument, NULL, 'n' }, + { "no-tail", no_argument, NULL, ARG_NO_TAIL }, + { "new-id128", no_argument, NULL, ARG_NEW_ID128 }, +@@ -351,10 +349,6 @@ static int parse_argv(int argc, char *argv[]) { + arg_full = true; + break; + +- case ARG_NO_FULL: +- arg_full = false; +- break; +- + case 'a': + arg_all = true; + break; +@@ -1742,7 +1736,7 @@ int main(int argc, char *argv[]) { + + flags = + arg_all * OUTPUT_SHOW_ALL | +- arg_full * OUTPUT_FULL_WIDTH | ++ (arg_full || !on_tty() || pager_have()) * OUTPUT_FULL_WIDTH | + on_tty() * OUTPUT_COLOR | + arg_catalog * OUTPUT_CATALOG; + diff --git a/0272-util-fix-handling-of-trailing-whitespace-in-split_qu.patch b/0272-util-fix-handling-of-trailing-whitespace-in-split_qu.patch new file mode 100644 index 0000000..072282a --- /dev/null +++ b/0272-util-fix-handling-of-trailing-whitespace-in-split_qu.patch @@ -0,0 +1,132 @@ +From adc915a7a815700626333548d6e2fd1123e081a6 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 27 Nov 2013 22:37:52 +0100 +Subject: [PATCH] util: fix handling of trailing whitespace in split_quoted() + +Inspired by a patch by Lukas Nykryn. + +(cherry picked from commit 70f75a523b16ad495a7791d595ee3eececf75953) + +Conflicts: + src/test/test-strv.c +--- + src/shared/util.c | 24 +++++++++++++++--------- + src/test/test-strv.c | 27 +++++++++++++++++++++++++++ + 2 files changed, 42 insertions(+), 9 deletions(-) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 8824b9b..52451f9 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -370,17 +370,21 @@ char *split(const char *c, size_t *l, const char *separator, char **state) { + /* Split a string into words, but consider strings enclosed in '' and + * "" as words even if they include spaces. */ + char *split_quoted(const char *c, size_t *l, char **state) { +- char *current, *e; ++ const char *current, *e; + bool escaped = false; + +- current = *state ? *state : (char*) c; ++ assert(c); ++ assert(l); ++ assert(state); + +- if (!*current || *c == 0) +- return NULL; ++ current = *state ? *state : c; + + current += strspn(current, WHITESPACE); + +- if (*current == '\'') { ++ if (*current == 0) ++ return NULL; ++ ++ else if (*current == '\'') { + current ++; + + for (e = current; *e; e++) { +@@ -393,7 +397,8 @@ char *split_quoted(const char *c, size_t *l, char **state) { + } + + *l = e-current; +- *state = *e == 0 ? e : e+1; ++ *state = (char*) (*e == 0 ? e : e+1); ++ + } else if (*current == '\"') { + current ++; + +@@ -407,7 +412,8 @@ char *split_quoted(const char *c, size_t *l, char **state) { + } + + *l = e-current; +- *state = *e == 0 ? e : e+1; ++ *state = (char*) (*e == 0 ? e : e+1); ++ + } else { + for (e = current; *e; e++) { + if (escaped) +@@ -418,10 +424,10 @@ char *split_quoted(const char *c, size_t *l, char **state) { + break; + } + *l = e-current; +- *state = e; ++ *state = (char*) e; + } + +- return (char*) current; ++ return current; + } + + int get_parent_of_pid(pid_t pid, pid_t *_ppid) { +diff --git a/src/test/test-strv.c b/src/test/test-strv.c +index c3d536d..6de1455 100644 +--- a/src/test/test-strv.c ++++ b/src/test/test-strv.c +@@ -143,6 +143,7 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted + char **t; + + p = strv_join_quoted((char **)split); ++ assert_se(p); + printf("-%s- --- -%s-\n", p, quoted); /* fprintf deals with NULL, puts does not */ + assert_se(p); + assert_se(streq(p, quoted)); +@@ -156,6 +157,20 @@ static void test_strv_quote_unquote(const char* const *split, const char *quoted + } + } + ++static void test_strv_quote_unquote2(const char *quoted, const char ** list) { ++ _cleanup_strv_free_ char **s; ++ unsigned i = 0; ++ char **t; ++ ++ s = strv_split_quoted(quoted); ++ assert_se(s); ++ ++ STRV_FOREACH(t, s) ++ assert_se(streq(list[i++], *t)); ++ ++ assert_se(list[i] == NULL); ++} ++ + static void test_strv_split_nulstr(void) { + _cleanup_strv_free_ char **l = NULL; + const char nulstr[] = "str0\0str1\0str2\0str3\0"; +@@ -309,6 +324,18 @@ int main(int argc, char *argv[]) { + test_strv_quote_unquote(input_table_quotes, QUOTES_STRING); + test_strv_quote_unquote(input_table_spaces, SPACES_STRING); + ++ test_strv_quote_unquote2(" foo=bar \"waldo\" zzz ", (const char*[]) { "foo=bar", "waldo", "zzz", NULL }); ++ test_strv_quote_unquote2("", (const char*[]) { NULL }); ++ test_strv_quote_unquote2(" ", (const char*[]) { NULL }); ++ test_strv_quote_unquote2(" ", (const char*[]) { NULL }); ++ test_strv_quote_unquote2(" x", (const char*[]) { "x", NULL }); ++ test_strv_quote_unquote2("x ", (const char*[]) { "x", NULL }); ++ test_strv_quote_unquote2(" x ", (const char*[]) { "x", NULL }); ++ test_strv_quote_unquote2(" \"x\" ", (const char*[]) { "x", NULL }); ++ test_strv_quote_unquote2(" \'x\' ", (const char*[]) { "x", NULL }); ++ test_strv_quote_unquote2(" \'x\"\' ", (const char*[]) { "x\"", NULL }); ++ test_strv_quote_unquote2(" \"x\'\" ", (const char*[]) { "x\'", NULL }); ++ + test_strv_split_nulstr(); + test_strv_parse_nulstr(); + test_strv_overlap(); diff --git a/0273-udev-net_id-Introduce-predictable-network-names-for-.patch b/0273-udev-net_id-Introduce-predictable-network-names-for-.patch new file mode 100644 index 0000000..4064828 --- /dev/null +++ b/0273-udev-net_id-Introduce-predictable-network-names-for-.patch @@ -0,0 +1,144 @@ +From 74c5f67a0703a23bf223c790b01a9bc2a7ef67d5 Mon Sep 17 00:00:00 2001 +From: Hendrik Brueckner +Date: Thu, 9 Jan 2014 11:28:12 +0100 +Subject: [PATCH] udev/net_id: Introduce predictable network names for Linux on + System z + +Use the bus-ID to create predicatable devices names for network interfaces +on Linux on System z instances. The bus-ID identifies a device in the s390 +channel subsystem. + +Network interfaces of device type Ethernet are named as: + enccw0.0.1234 (13 characters) +up to + enccwff.7.ffff (14 characters) + +CTC network devices of device type SLIP, use a different prefix as follows: + slccw0.0.1234 (13 characters) + +See also Red Hat Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=870859 +[tomegun: typical problem of netdevs switching names between reboots.] + +(cherry picked from commit e0d4a0ac06afb856c9370c5c256f0f7bb7efdc8e) + +Conflicts: + src/udev/udev-builtin-net_id.c +--- + src/udev/udev-builtin-net_id.c | 64 ++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 62 insertions(+), 2 deletions(-) + +diff --git a/src/udev/udev-builtin-net_id.c b/src/udev/udev-builtin-net_id.c +index 9bc1946..b3cb04b 100644 +--- a/src/udev/udev-builtin-net_id.c ++++ b/src/udev/udev-builtin-net_id.c +@@ -28,6 +28,7 @@ + * + * Two character prefixes based on the type of interface: + * en -- ethernet ++ * sl -- serial line IP (slip) + * wl -- wlan + * ww -- wwan + * +@@ -101,6 +102,7 @@ enum netname_type{ + NET_PCI, + NET_USB, + NET_BCMA, ++ NET_CCWGROUP, + }; + + struct netnames { +@@ -118,6 +120,8 @@ struct netnames { + char usb_ports[IFNAMSIZ]; + + char bcma_core[IFNAMSIZ]; ++ ++ char ccw_core[IFNAMSIZ]; + }; + + /* retrieve on-board index number and label from firmware */ +@@ -344,6 +348,44 @@ static int names_bcma(struct udev_device *dev, struct netnames *names) { + return 0; + } + ++static int names_ccw(struct udev_device *dev, struct netnames *names) { ++ struct udev_device *cdev; ++ const char *bus_id; ++ size_t bus_id_len; ++ int rc; ++ ++ /* Retrieve the associated CCW device */ ++ cdev = udev_device_get_parent(dev); ++ if (!cdev) ++ return -ENOENT; ++ ++ /* Network devices are always grouped CCW devices */ ++ if (!streq_ptr("ccwgroup", udev_device_get_subsystem(cdev))) ++ return -ENOENT; ++ ++ /* Retrieve bus-ID of the grouped CCW device. The bus-ID uniquely ++ * identifies the network device on the Linux on System z channel ++ * subsystem. Note that the bus-ID contains lowercase characters. ++ */ ++ bus_id = udev_device_get_sysname(cdev); ++ if (!bus_id) ++ return -ENOENT; ++ ++ /* Check the length of the bus-ID. Rely on that the kernel provides ++ * a correct bus-ID; alternatively, improve this check and parse and ++ * verify each bus-ID part... ++ */ ++ bus_id_len = strlen(bus_id); ++ if (!bus_id_len || bus_id_len < 8 || bus_id_len > 9) ++ return -EINVAL; ++ ++ /* Store the CCW bus-ID for use as network device name */ ++ rc = snprintf(names->ccw_core, sizeof(names->ccw_core), "ccw%s", bus_id); ++ if (rc >= 0 && rc < (int)sizeof(names->ccw_core)) ++ names->type = NET_CCWGROUP; ++ return 0; ++} ++ + static int names_mac(struct udev_device *dev, struct netnames *names) { + const char *s; + unsigned int i; +@@ -402,13 +444,21 @@ static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool + struct netnames names = {}; + int err; + +- /* handle only ARPHRD_ETHER devices */ ++ /* handle only ARPHRD_ETHER and ARPHRD_SLIP devices */ + s = udev_device_get_sysattr_value(dev, "type"); + if (!s) + return EXIT_FAILURE; + i = strtoul(s, NULL, 0); +- if (i != 1) ++ switch (i) { ++ case 1: /* ARPHRD_ETHER */ ++ prefix = "en"; ++ break; ++ case 256: /* ARPHRD_SLIP */ ++ prefix = "sl"; ++ break; ++ default: + return 0; ++ } + + /* skip stacked devices, like VLANs, ... */ + s = udev_device_get_sysattr_value(dev, "ifindex"); +@@ -440,6 +490,16 @@ static int builtin_net_id(struct udev_device *dev, int argc, char *argv[], bool + ieee_oui(dev, &names, test); + } + ++ /* get path names for Linux on System z network devices */ ++ err = names_ccw(dev, &names); ++ if (err >= 0 && names.type == NET_CCWGROUP) { ++ char str[IFNAMSIZ]; ++ ++ if (snprintf(str, sizeof(str), "%s%s", prefix, names.ccw_core) < (int)sizeof(str)) ++ udev_builtin_add_property(dev, test, "ID_NET_NAME_PATH", str); ++ goto out; ++ } ++ + /* get PCI based path names, we compose only PCI based paths */ + err = names_pci(dev, &names); + if (err < 0) diff --git a/0274-utils-silence-the-compiler-warning.patch b/0274-utils-silence-the-compiler-warning.patch new file mode 100644 index 0000000..ad1745a --- /dev/null +++ b/0274-utils-silence-the-compiler-warning.patch @@ -0,0 +1,22 @@ +From cb7312ee004ba4f1a0f8cf7f103c99fe2ae02b9e Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Mon, 10 Feb 2014 15:41:47 +0100 +Subject: [PATCH] utils: silence the compiler warning + +--- + src/shared/util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 52451f9..7500779 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -427,7 +427,7 @@ char *split_quoted(const char *c, size_t *l, char **state) { + *state = (char*) e; + } + +- return current; ++ return (char *) current; + } + + int get_parent_of_pid(pid_t pid, pid_t *_ppid) { diff --git a/0275-fix-SELinux-check-for-transient-units.patch b/0275-fix-SELinux-check-for-transient-units.patch new file mode 100644 index 0000000..1a63bc5 --- /dev/null +++ b/0275-fix-SELinux-check-for-transient-units.patch @@ -0,0 +1,107 @@ +From a369dc213166c91ef7cc673a0ee7a75f24eab5f6 Mon Sep 17 00:00:00 2001 +From: Dan Walsh +Date: Thu, 16 Jan 2014 12:59:10 +0100 +Subject: [PATCH] fix SELinux check for transient units + +SELinux does not have a path to check for a snapshot servic creation. +This ends up giving us a bogus check. + +On snapshot creation we should check if the remote process type, has the ability to start a service with the type that systemd is running with. + +This patch is only for systemd-208 +--- + src/core/dbus-manager.c | 6 +++--- + src/core/selinux-access.c | 9 +++++---- + src/core/selinux-access.h | 13 +++++++++++++ + 3 files changed, 21 insertions(+), 7 deletions(-) + +diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c +index 536f2ea..6d16c2a 100644 +--- a/src/core/dbus-manager.c ++++ b/src/core/dbus-manager.c +@@ -1104,7 +1104,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + dbus_bool_t cleanup; + Snapshot *s; + +- SELINUX_ACCESS_CHECK(connection, message, "start"); ++ SELINUX_RUNTIME_UNIT_ACCESS_CHECK(connection, message, "start"); + + if (!dbus_message_get_args( + message, +@@ -1157,7 +1157,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + return bus_send_error_reply(connection, message, &error, -ENOENT); + } + +- SELINUX_UNIT_ACCESS_CHECK(u, connection, message, "stop"); ++ SELINUX_RUNTIME_UNIT_ACCESS_CHECK(connection, message, "stop"); + snapshot_remove(SNAPSHOT(u)); + + reply = dbus_message_new_method_return(message); +@@ -1767,7 +1767,7 @@ static DBusHandlerResult bus_manager_message_handler(DBusConnection *connection, + if (r < 0) + return bus_send_error_reply(connection, message, &error, r); + +- SELINUX_UNIT_ACCESS_CHECK(u, connection, message, "start"); ++ SELINUX_RUNTIME_UNIT_ACCESS_CHECK(connection, message, "start"); + + if (u->load_state != UNIT_NOT_FOUND || set_size(u->dependencies[UNIT_REFERENCED_BY]) > 0) { + dbus_set_error(&error, BUS_ERROR_UNIT_EXISTS, "Unit %s already exists.", name); +diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c +index 0a3ee18..5d85b26 100644 +--- a/src/core/selinux-access.c ++++ b/src/core/selinux-access.c +@@ -374,8 +374,9 @@ int selinux_access_check( + goto finish; + } + +- if (path) { +- tclass = "service"; ++ ++ tclass = "service"; ++ if (path && !strneq(path,"system", strlen("system"))) { + /* get the file context of the unit file */ + r = getfilecon(path, &fcon); + if (r < 0) { +@@ -384,9 +385,9 @@ int selinux_access_check( + log_error("Failed to get security context on %s: %m",path); + goto finish; + } +- + } else { +- tclass = "system"; ++ if (path) ++ tclass = "system"; + r = getcon(&fcon); + if (r < 0) { + dbus_set_error(error, DBUS_ERROR_ACCESS_DENIED, "Failed to get current context."); +diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h +index 2d7ac64..92acd69 100644 +--- a/src/core/selinux-access.h ++++ b/src/core/selinux-access.h +@@ -36,6 +36,18 @@ int selinux_access_check(DBusConnection *connection, DBusMessage *message, const + DBusConnection *_c = (connection); \ + DBusMessage *_m = (message); \ + dbus_error_init(&_error); \ ++ _r = selinux_access_check(_c, _m, "system", (permission), &_error); \ ++ if (_r < 0) \ ++ return bus_send_error_reply(_c, _m, &_error, _r); \ ++ } while (false) ++ ++#define SELINUX_RUNTIME_UNIT_ACCESS_CHECK(connection, message, permission) \ ++ do { \ ++ DBusError _error; \ ++ int _r; \ ++ DBusConnection *_c = (connection); \ ++ DBusMessage *_m = (message); \ ++ dbus_error_init(&_error); \ + _r = selinux_access_check(_c, _m, NULL, (permission), &_error); \ + if (_r < 0) \ + return bus_send_error_reply(_c, _m, &_error, _r); \ +@@ -57,6 +69,7 @@ int selinux_access_check(DBusConnection *connection, DBusMessage *message, const + #else + + #define SELINUX_ACCESS_CHECK(connection, message, permission) do { } while (false) ++#define SELINUX_RUNTIME_UNIT_ACCESS_CHECK(connection, message, permission) do { } while (false) + #define SELINUX_UNIT_ACCESS_CHECK(unit, connection, message, permission) do { } while (false) + + #endif diff --git a/0276-s390-getty-generator-initialize-essential-system-ter.patch b/0276-s390-getty-generator-initialize-essential-system-ter.patch new file mode 100644 index 0000000..632dca9 --- /dev/null +++ b/0276-s390-getty-generator-initialize-essential-system-ter.patch @@ -0,0 +1,60 @@ +From a05284199e2007999a367232a98d2305401077c1 Mon Sep 17 00:00:00 2001 +From: Hendrik Brueckner +Date: Fri, 31 Jan 2014 17:08:37 +0100 +Subject: [PATCH] s390/getty-generator: initialize essential system + terminals/consoles + +Ensure to start getty programs on all essential system consoles on Linux on +System z. Add these essential devices to the list of virtualization_consoles +to always generate getty configurations. + +For the sake of completion, the list of essential consoles is: + + /dev/sclp_line0 - Operating system messages applet (LPAR) + /dev/ttysclp0 - Integrated ASCII console applet (z/VM and LPAR) + /dev/ttyS0 - Already handled by systemd (3215 console on z/VM) + /dev/hvc0 - Already handled by systemd (IUCV HVC terminal on z/VM) + +Depending on the environment, z/VM or LPAR, only a subset of these terminals +are available. + +See also RH BZ 860158[1] "Cannot login via Operating System Console into RHEL7 +instance installed on a LPAR". This bugzilla actually blocks the installation +of Linux on System z instances in LPAR mode. + +[1] https://bugzilla.redhat.com/show_bug.cgi?id=860158 + +(cherry picked from commit 07901fc142504efb67c07875a588933dc59a3955) +--- + rules/99-systemd.rules.in | 2 +- + src/getty-generator/getty-generator.c | 4 +++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/rules/99-systemd.rules.in b/rules/99-systemd.rules.in +index a00ffed..1eaf0c1 100644 +--- a/rules/99-systemd.rules.in ++++ b/rules/99-systemd.rules.in +@@ -7,7 +7,7 @@ + + ACTION=="remove", GOTO="systemd_end" + +-SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*", TAG+="systemd" ++SUBSYSTEM=="tty", KERNEL=="tty[a-zA-Z]*|hvc*|xvc*|hvsi*|ttysclp*|sclp_line*", TAG+="systemd" + + KERNEL=="vport*", TAG+="systemd" + +diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c +index 6c93806..40374b5 100644 +--- a/src/getty-generator/getty-generator.c ++++ b/src/getty-generator/getty-generator.c +@@ -91,7 +91,9 @@ int main(int argc, char *argv[]) { + static const char virtualization_consoles[] = + "hvc0\0" + "xvc0\0" +- "hvsi0\0"; ++ "hvsi0\0" ++ "sclp_line0\0" ++ "ttysclp0\0"; + + int r = EXIT_SUCCESS; + char *active; diff --git a/0277-pam-use-correct-log-level.patch b/0277-pam-use-correct-log-level.patch new file mode 100644 index 0000000..57f7462 --- /dev/null +++ b/0277-pam-use-correct-log-level.patch @@ -0,0 +1,23 @@ +From 3488c1a78806c9a18b91ffd7387d7eeaec497459 Mon Sep 17 00:00:00 2001 +From: Michal Sekletar +Date: Mon, 10 Feb 2014 16:37:09 +0100 +Subject: [PATCH] pam: use correct log level + +(cherry picked from commit 3831838ae7b3ac145711bb84a71cb86cdd829975) +--- + src/login/pam-module.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/login/pam-module.c b/src/login/pam-module.c +index 4d6b052..5baf1b7 100644 +--- a/src/login/pam-module.c ++++ b/src/login/pam-module.c +@@ -204,7 +204,7 @@ _public_ PAM_EXTERN int pam_sm_open_session( + } + + if (debug) +- pam_syslog(handle, LOG_INFO, "pam-systemd initializing"); ++ pam_syslog(handle, LOG_DEBUG, "pam-systemd initializing"); + + r = get_user_data(handle, &username, &pw); + if (r != PAM_SUCCESS) diff --git a/0278-nspawn-if-we-don-t-find-bash-try-sh.patch b/0278-nspawn-if-we-don-t-find-bash-try-sh.patch new file mode 100644 index 0000000..5766bbe --- /dev/null +++ b/0278-nspawn-if-we-don-t-find-bash-try-sh.patch @@ -0,0 +1,25 @@ +From 9d713de8161428deda10e857b43b6e8bcc273abe Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Fri, 14 Feb 2014 16:41:03 +0100 +Subject: [PATCH] nspawn: if we don't find bash, try sh + +(cherry picked from commit 262d10e6bd8e4a0a6a0967fbb5f89a5b989779ac) + +Conflicts: + src/nspawn/nspawn.c +--- + src/nspawn/nspawn.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c +index cafc306..410b879 100644 +--- a/src/nspawn/nspawn.c ++++ b/src/nspawn/nspawn.c +@@ -1499,6 +1499,7 @@ int main(int argc, char *argv[]) { + else { + chdir(home ? home : "/root"); + execle("/bin/bash", "-bash", NULL, (char**) envp); ++ execle("/bin/sh", "-sh", NULL, (char**) envp); + } + + log_error("execv() failed: %m"); diff --git a/0279-units-systemd-logind-fails-hard-without-dbus.patch b/0279-units-systemd-logind-fails-hard-without-dbus.patch new file mode 100644 index 0000000..8dbd224 --- /dev/null +++ b/0279-units-systemd-logind-fails-hard-without-dbus.patch @@ -0,0 +1,32 @@ +From dc76cad2163e39553af52c5a56fe1f8419ba17ab Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Fri, 14 Feb 2014 17:01:43 -0500 +Subject: [PATCH] units: systemd-logind fails hard without dbus + +That is, without --enable-kdbus and kdbus running. + +With --enable-kdbus things are more complicated, because dbus might be +necessary, if kdbus is missing at runtime. If it is not necessary, +the socket will be started, which is not imporant, but not the service. + +(cherry picked from commit 8f9c6fe5ff1d59001aecbf3fbf9ca0ed7ff28ba7) +--- + units/systemd-logind.service.in | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/units/systemd-logind.service.in b/units/systemd-logind.service.in +index 31b5cd0..e0b1b59 100644 +--- a/units/systemd-logind.service.in ++++ b/units/systemd-logind.service.in +@@ -13,6 +13,11 @@ Documentation=http://www.freedesktop.org/wiki/Software/systemd/multiseat + Wants=user.slice + After=nss-user-lookup.target user.slice + ++# Ask for the dbus socket. If running over kdbus, the socket will ++# not be actually used. ++Wants=dbus.socket ++After=dbus.socket ++ + [Service] + ExecStart=@rootlibexecdir@/systemd-logind + Restart=always diff --git a/0280-man-fix-grammatical-errors-and-other-formatting-issu.patch b/0280-man-fix-grammatical-errors-and-other-formatting-issu.patch new file mode 100644 index 0000000..b72bba5 --- /dev/null +++ b/0280-man-fix-grammatical-errors-and-other-formatting-issu.patch @@ -0,0 +1,878 @@ +From 4f6569d919c82aff74e4cfe40f988585f7d3d133 Mon Sep 17 00:00:00 2001 +From: "Jason St. John" +Date: Thu, 13 Feb 2014 20:25:23 -0500 +Subject: [PATCH] man: fix grammatical errors and other formatting issues + +* standardize capitalization of STDIN, STDOUT, and STDERR +* reword some sentences for clarity +* reflow some very long lines to be shorter than ~80 characters +* add some missing , , , +@@ -172,13 +172,13 @@ + PIDFile= option, so + that systemd can identify the main + process of the daemon. systemd will +- proceed starting follow-up units as +- soon as the parent process ++ proceed with starting follow-up units ++ as soon as the parent process + exits. + + Behavior of + is similar +- to , however ++ to ; however, + it is expected that the process has to + exit before systemd starts follow-up + units. RemainAfterExit= +@@ -187,13 +187,13 @@ + + Behavior of + is similar to +- , however it is ++ ; however, it is + expected that the daemon acquires a + name on the D-Bus bus, as configured + by + BusName=. systemd +- will proceed starting follow-up units +- after the D-Bus bus name has been ++ will proceed with starting follow-up ++ units after the D-Bus bus name has been + acquired. Service units with this + option configured implicitly gain + dependencies on the +@@ -204,12 +204,12 @@ + + Behavior of + is similar to +- , however it is ++ ; however, it is + expected that the daemon sends a + notification message via + sd_notify3 +- or an equivalent call when it finished +- starting up. systemd will proceed ++ or an equivalent call when it has finished ++ starting up. systemd will proceed with + starting follow-up units after this + notification message has been sent. If + this option is used, +@@ -227,7 +227,7 @@ + + Behavior of + is very similar +- to , however ++ to ; however, + actual execution of the service + binary is delayed until all jobs are + dispatched. This may be used to avoid +@@ -260,7 +260,7 @@ + is set and + is unset because for the other types + or with an explicitly configured PID +- file the main PID is always known. The ++ file, the main PID is always known. The + guessing algorithm might come to + incorrect conclusions if a daemon + consists of more than one process. If +@@ -292,14 +292,13 @@ + BusName= + + Takes a D-Bus bus +- name, that this service is reachable ++ name that this service is reachable + as. This option is mandatory for + services where + Type= is set to + , but its use +- is otherwise recommended as well if +- the process takes a name on the D-Bus +- bus. ++ is otherwise recommended if the process ++ takes a name on the D-Bus bus. + + + +@@ -318,7 +317,7 @@ + Type=oneshot is + used, more than one command may be + specified. Multiple command lines may +- be concatenated in a single directive, ++ be concatenated in a single directive + by separating them with semicolons + (these semicolons must be passed as + separate words). Alternatively, this +@@ -362,12 +361,12 @@ + + If more than one command is + specified, the commands are invoked +- one by one sequentially in the order +- they appear in the unit file. If one +- of the commands fails (and is not +- prefixed with -), +- other lines are not executed and the +- unit is considered failed. ++ sequentially in the order they appear ++ in the unit file. If one of the ++ commands fails (and is not prefixed ++ with -), other lines ++ are not executed, and the unit is ++ considered failed. + + Unless + Type=forking is +@@ -387,7 +386,7 @@ + Basic environment variable + substitution is supported. Use + ${FOO} as part of a +- word, or as a word of its own on the ++ word, or as a word of its own, on the + command line, in which case it will be + replaced by the value of the + environment variable including all +@@ -410,12 +409,12 @@ + fashion may be defined through + Environment= and + EnvironmentFile=. +- In addition, variables listed in ++ In addition, variables listed in the + section "Environment variables in + spawned processes" in +- systemd.exec5 ++ systemd.exec5, + which are considered "static +- configuration" may used (this includes ++ configuration", may be used (this includes + e.g. $USER, but not + $TERM). + +@@ -447,10 +446,10 @@ + ExecStart=/bin/echo one ; /bin/echo "two two" + This will execute + /bin/echo two +- times, each time with one argument, ++ times, each time with one argument: + one and + two two, +- respectively. Since two commands are ++ respectively. Because two commands are + specified, + Type=oneshot must + be used. +@@ -512,8 +511,8 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + here following the same scheme as for + ExecStart=. + +- One additional special +- environment variables is set: if known ++ One additional, special ++ environment variable is set: if known, + $MAINPID is set to + the main process of the daemon, and + may be used for command lines like the +@@ -532,15 +531,15 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + following the same scheme as described + for ExecStart= + above. Use of this setting is +- optional. All processes remaining for +- a service after the commands +- configured in this option are run are ++ optional. After the commands configured ++ in this option are run, all processes ++ remaining for a service are + terminated according to the + KillMode= setting + (see + systemd.kill5). If + this option is not specified, the +- process is terminated right-away when ++ process is terminated immediately when + service stop is requested. Specifier + and environment variable substitution + is supported (including +@@ -586,15 +585,16 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + daemon service does not signal + start-up completion within the + configured time, the service will be +- considered failed and be shut down +- again. ++ considered failed and will be shut ++ down again. + Takes a unit-less value in seconds, or a + time span value such as "5min +- 20s". Pass 0 to disable the timeout +- logic. Defaults to TimeoutStartSec= in +- manager configuration file, except when +- Type=oneshot is +- used in which case the timeout ++ 20s". Pass 0 to ++ disable the timeout logic. Defaults to ++ TimeoutStartSec= from ++ the manager configuration file, except ++ when Type=oneshot is ++ used, in which case the timeout + is disabled by default. + + +@@ -603,17 +603,18 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + TimeoutStopSec= + Configures the time to + wait for stop. If a service is asked +- to stop but does not terminate in the ++ to stop, but does not terminate in the + specified time, it will be terminated +- forcibly via SIGTERM, and after +- another delay of this time with +- SIGKILL (See ++ forcibly via SIGTERM, ++ and after another timeout of equal duration ++ with SIGKILL (see + KillMode= + in systemd.kill5). + Takes a unit-less value in seconds, or a + time span value such as "5min +- 20s". Pass 0 to disable the timeout +- logic. Defaults to TimeoutStartSec= in ++ 20s". Pass 0 to disable ++ the timeout logic. Defaults to ++ TimeoutStartSec= from the + manager configuration file. + + +@@ -634,11 +635,11 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + watchdog is activated when the start-up is + completed. The service must call + sd_notify3 +- regularly with "WATCHDOG=1" (i.e. the +- "keep-alive ping"). If the time ++ regularly with WATCHDOG=1 ++ (i.e. the "keep-alive ping"). If the time + between two such calls is larger than + the configured time, then the service +- is placed in a failure state. By ++ is placed in a failed state. By + setting Restart= to + or + , the service +@@ -669,8 +670,8 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + service process exits, is killed, + or a timeout is reached. The service + process may be the main service +- process, but also one of the processes +- specified with ++ process, but it may also be one of the ++ processes specified with + ExecStartPre=, + ExecStartPost=, + ExecStopPre=, +@@ -698,12 +699,15 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + exits cleanly. + In this context, a clean exit means + an exit code of 0, or one of the signals +- SIGHUP, SIGINT, SIGTERM, or SIGPIPE, and ++ SIGHUP, ++ SIGINT, ++ SIGTERM, ++ or SIGPIPE, and + additionally, exit statuses and signals + specified in SuccessExitStatus=. + If set to , + the service will be restarted when the +- process exits with an nonzero exit code, ++ process exits with a non-zero exit code, + is terminated by a signal (including on + core dump), when an operation (such as + service reload) times out, and when the +@@ -722,7 +726,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + , the service + will be restarted regardless of whether + it exited cleanly or not, got +- terminated abnormally by a signal or ++ terminated abnormally by a signal, or + hit a timeout. + + In addition to the above settings, +@@ -774,7 +778,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + Takes a list of exit + status definitions that when returned + by the main service process will +- prevent automatic service restarts ++ prevent automatic service restarts, + regardless of the restart setting + configured with + Restart=. Exit +@@ -782,19 +786,20 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + numeric exit codes or termination + signal names, and are separated by + spaces. Defaults to the empty list, so +- that by default no exit status is ++ that, by default, no exit status is + excluded from the configured restart + logic. Example: + RestartPreventExitStatus=1 6 + SIGABRT, ensures that exit + codes 1 and 6 and the termination +- signal SIGABRT will not result in +- automatic service restarting. This +- option may appear more than once in +- which case the list of restart preventing ++ signal SIGABRT will ++ not result in automatic service ++ restarting. This ++ option may appear more than once, in ++ which case the list of restart-preventing + statuses is merged. If the empty + string is assigned to this option, the +- list is reset, all prior assignments ++ list is reset and all prior assignments + of this option will have no + effect. + +@@ -802,20 +807,20 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + + PermissionsStartOnly= + Takes a boolean +- argument. If true, the permission +- related execution options as ++ argument. If true, the permission-related ++ execution options, as + configured with + User= and similar + options (see + systemd.exec5 +- for more information) are only applied ++ for more information), are only applied + to the process started with + ExecStart=, and not + to the various other + ExecStartPre=, + ExecStartPost=, + ExecReload=, +- ExecStop=, ++ ExecStop=, and + ExecStopPost= + commands. If false, the setting is + applied to all configured commands the +@@ -826,19 +831,19 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + + RootDirectoryStartOnly= + Takes a boolean +- argument. If true, the root directory ++ argument. If true, the root directory, + as configured with the + RootDirectory= + option (see + systemd.exec5 +- for more information) is only applied ++ for more information), is only applied + to the process started with + ExecStart=, and not + to the various other + ExecStartPre=, + ExecStartPost=, + ExecReload=, +- ExecStop=, ++ ExecStop=, and + ExecStopPost= + commands. If false, the setting is + applied to all configured commands the +@@ -848,12 +853,14 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + + + NonBlocking= +- Set O_NONBLOCK flag ++ Set the ++ O_NONBLOCK flag + for all file descriptors passed via + socket-based activation. If true, all + file descriptors >= 3 (i.e. all except + STDIN/STDOUT/STDERR) will have +- the O_NONBLOCK flag set and hence are in ++ the O_NONBLOCK flag ++ set and hence are in + non-blocking mode. This option is only + useful in conjunction with a socket + unit, as described in +@@ -909,8 +916,8 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + passed to multiple processes at the + same time. Also note that a different + service may be activated on incoming +- traffic than inherits the sockets. Or +- in other words: the ++ traffic than that which inherits the ++ sockets. Or in other words: the + Service= setting of + .socket units + does not have to match the inverse of +@@ -923,7 +930,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + once, in which case the list of socket + units is merged. If the empty string + is assigned to this option, the list of +- sockets is reset, all prior uses of ++ sockets is reset, and all prior uses of + this setting will have no + effect. + +@@ -934,10 +941,10 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + + Configure service + start rate limiting. By default, +- services which are started more often +- than 5 times within 10s are not ++ services which are started more ++ than 5 times within 10 seconds are not + permitted to start any more times +- until the 10s interval ends. With ++ until the 10 second interval ends. With + these two options, this rate limiting + may be modified. Use + StartLimitInterval= +@@ -952,18 +959,18 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + manager configuration file). These + configuration options are particularly + useful in conjunction with +- Restart=, however +- apply to all kinds of starts ++ Restart=; however, ++ they apply to all kinds of starts + (including manual), not just those + triggered by the + Restart= logic. + Note that units which are configured + for Restart= and + which reach the start limit are not +- attempted to be restarted anymore, +- however they may still be restarted +- manually at a later point from which +- point on the restart logic is again ++ attempted to be restarted anymore; ++ however, they may still be restarted ++ manually at a later point, from which ++ point on, the restart logic is again + activated. Note that + systemctl + reset-failed will cause the +@@ -987,18 +994,17 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + hit. Takes one of + , + , +- or ++ , or + . If + is set, + hitting the rate limit will trigger no + action besides that the start will not +- be +- permitted. ++ be permitted. + causes a reboot following the normal + shutdown procedure (i.e. equivalent to +- systemctl reboot), ++ systemctl reboot). + causes +- an forced reboot which will terminate ++ a forced reboot which will terminate + all processes forcibly but should + cause no dirty file systems on reboot + (i.e. equivalent to systemctl +@@ -1007,7 +1013,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + causes immediate execution of the + reboot2 + system call, which might result in +- data loss. Defaults to ++ data loss. Defaults to + . + + +@@ -1037,19 +1043,19 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + in relation to SysV services lacking + LSB headers. This option is only + necessary to fix ordering in relation +- to legacy SysV services, that have no ++ to legacy SysV services that have no + ordering information encoded in the +- script headers. As such it should only +- be used as temporary compatibility +- option, and not be used in new unit +- files. Almost always it is a better ++ script headers. As such, it should only ++ be used as a temporary compatibility ++ option and should not be used in new unit ++ files. Almost always, it is a better + choice to add explicit ordering + directives via + After= or + Before=, +- instead. For more details see +- systemd.unit5. If +- used, pass an integer value in the ++ instead. For more details, see ++ systemd.unit5. ++ If used, pass an integer value in the + range 0-99. + + +diff --git a/man/udev.xml b/man/udev.xml +index f107482..82e7478 100644 +--- a/man/udev.xml ++++ b/man/udev.xml +@@ -255,9 +255,9 @@ + Execute a program to determine whether there + is a match; the key is true if the program returns + successfully. The device properties are made available to the +- executed program in the environment. The program's stdout +- is available in the RESULT key. +- This can only be used for very short-running foreground tasks. For details ++ executed program in the environment. The program's STDOUT ++ is available in the RESULT key. ++ This can only be used for very short-running foreground tasks. For details, + see RUN. + + +@@ -265,8 +265,9 @@ + + RESULT + +- Match the returned string of the last PROGRAM call. This key can +- be used in the same or in any later rule after a PROGRAM call. ++ Match the returned string of the last PROGRAM call. ++ This key can be used in the same or in any later rule after a ++ PROGRAM call. + + + +@@ -293,9 +294,10 @@ + example, the pattern string tty[SR] + would match either ttyS or ttyR. + Ranges are also supported via the - character. +- For example, to match on the range of all digits, the pattern [0-9] could +- be used. If the first character following the [ is a +- !, any characters not enclosed are matched. ++ For example, to match on the range of all digits, the pattern ++ [0-9] could be used. If the first character ++ following the [ is a !, ++ any characters not enclosed are matched. + + + +@@ -353,7 +355,8 @@ + + Set a device property value. Property names with a leading . + are neither stored in the database nor exported to events or +- external tools (run by, say, the PROGRAM match key). ++ external tools (run by, for example, the PROGRAM ++ match key). + + + +@@ -373,24 +376,26 @@ + + RUN{type} + +- Add a program to the list of programs to be executed after processing all the +- rules for a specific event, depending on type: ++ Add a program to the list of programs to be executed after ++ processing all the rules for a specific event, depending on ++ type: + + + program + + Execute an external program specified as the assigned +- value. If no absolute path is given, the program is expected to live in +- /usr/lib/udev, otherwise the absolute path must be specified. +- This is the default if no type is +- specified. ++ value. If no absolute path is given, the program is expected ++ to live in /usr/lib/udev; otherwise, the ++ absolute path must be specified. ++ This is the default if no type ++ is specified. + + + + builtin + +- As program, but use one of the built-in programs rather +- than an external one. ++ As program, but use one of the ++ built-in programs rather than an external one. + + + +@@ -399,7 +404,7 @@ + This can only be used for very short-running foreground tasks. Running an + event process for a long period of time may block all further events for + this or a dependent device. +- Starting daemons or other long running processes is not appropriate ++ Starting daemons or other long-running processes is not appropriate + for udev; the forked processes, detached or not, will be unconditionally + killed after the event handling has finished. + +@@ -408,14 +413,14 @@ + + LABEL + +- A named label to which a GOTO may jump. ++ A named label to which a GOTO may jump. + + + + + GOTO + +- Jumps to the next LABEL with a matching name. ++ Jumps to the next LABEL with a matching name. + + + +@@ -518,21 +523,24 @@ + + + +- Apply the permissions specified in this rule to the static device node with +- the specified name. Also, for every tag specified in this rule, create a symlink ++ Apply the permissions specified in this rule to the ++ static device node with the specified name. Also, for every ++ tag specified in this rule, create a symlink + in the directory + /run/udev/static_node-tags/tag +- pointing at the static device node with the specified name. Static device node +- creation is performed by systemd-tmpfiles before systemd-udevd is started. The +- static nodes might not have a corresponding kernel device; they are used to +- trigger automatic kernel module loading when they are accessed. ++ pointing at the static device node with the specified name. ++ Static device node creation is performed by systemd-tmpfiles ++ before systemd-udevd is started. The static nodes might not ++ have a corresponding kernel device; they are used to trigger ++ automatic kernel module loading when they are accessed. + + + + + +- Watch the device node with inotify; when the node is closed after being opened for +- writing, a change uevent is synthesized. ++ Watch the device node with inotify; when the node is ++ closed after being opened for writing, a change uevent is ++ synthesized. + + + +@@ -546,13 +554,15 @@ + + + +- The NAME, SYMLINK, PROGRAM, +- OWNER, GROUP, MODE and RUN +- fields support simple string substitutions. The RUN +- substitutions are performed after all rules have been processed, right before the program +- is executed, allowing for the use of device properties set by earlier matching +- rules. For all other fields, substitutions are performed while the individual rule is +- being processed. The available substitutions are: ++ The NAME, SYMLINK, ++ PROGRAM, OWNER, ++ GROUP, MODE, and ++ RUN fields support simple string substitutions. ++ The RUN substitutions are performed after all rules ++ have been processed, right before the program is executed, allowing for ++ the use of device properties set by earlier matching rules. For all other ++ fields, substitutions are performed while the individual rule is being ++ processed. The available substitutions are: + + + , +@@ -565,7 +575,8 @@ + , + + The kernel number for this device. For example, +- sda3 has kernel number 3. ++ sda3 has kernel number 3. ++ + + + +@@ -579,8 +590,9 @@ + + , + +- The name of the device matched while searching the devpath upwards for +- , , and . ++ The name of the device matched while searching the devpath ++ upwards for , , ++ , and . + + + +@@ -588,8 +600,10 @@ + + + +- The driver name of the device matched while searching the devpath upwards for +- , , and . ++ The driver name of the device matched while searching the ++ devpath upwards for , ++ , , and ++ . + + + +@@ -598,12 +612,15 @@ + , + + The value of a sysfs attribute found at the device where +- all keys of the rule have matched. If the matching device does not have +- such an attribute, and a previous KERNELS, SUBSYSTEMS, DRIVERS, or +- ATTRS test selected a parent device, then the attribute from that +- parent device is used. +- If the attribute is a symlink, the last element of the symlink target is +- returned as the value. ++ all keys of the rule have matched. If the matching device does not ++ have such an attribute, and a previous , ++ , , or ++ test selected a parent device, then the ++ attribute from that parent device is used. ++ ++ If the attribute is a symlink, the last element of the ++ symlink target is returned as the value. ++ + + + +@@ -631,7 +648,8 @@ + + , + +- The string returned by the external program requested with PROGRAM. ++ The string returned by the external program requested with ++ PROGRAM. + A single part of the string, separated by a space character, may be selected + by specifying the part number as an attribute: %c{N}. + If the number is followed by the + character, this part plus all remaining parts +@@ -736,11 +754,13 @@ + + + See Also +- ++ ++ + systemd-udevd.service8 + , + + udevadm8 +- ++ ++ + + +diff --git a/man/udevadm.xml b/man/udevadm.xml +index ca3713f..32bf480 100644 +--- a/man/udevadm.xml ++++ b/man/udevadm.xml +@@ -72,7 +72,7 @@ + + + +- Print debug messages to stderr. ++ Print debug messages to STDERR. + + + diff --git a/0281-man-replace-STDOUT-with-standard-output-etc.patch b/0281-man-replace-STDOUT-with-standard-output-etc.patch new file mode 100644 index 0000000..68dd559 --- /dev/null +++ b/0281-man-replace-STDOUT-with-standard-output-etc.patch @@ -0,0 +1,384 @@ +From cd93a7ed60d621631e242d0654f21b7cc88b2e08 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Fri, 14 Feb 2014 22:00:06 -0500 +Subject: [PATCH] man: replace STDOUT with standard output, etc. + +Actually 'STDOUT' is something that doesn't appear anywhere: in the +stdlib we have 'stdin', and there's only the constant STDOUT_FILENO, +so there's no reason to use capitals. When refering to code, +STDOUT/STDOUT/STDERR are replaced with stdin/stdout/stderr, and in +other places they are replaced with normal phrases like standard +output, etc. + +(cherry picked from commit 6db2742802b70938f0f2d373110ed734d4fb9813) + +Conflicts: + man/systemctl.xml + man/systemd-bus-proxyd.xml +--- + man/daemon.xml | 21 +++++++++++---------- + man/sd-daemon.xml | 2 +- + man/sd_journal_stream_fd.xml | 4 ++-- + man/systemctl.xml | 27 +++++++++++++++------------ + man/systemd-ask-password.xml | 2 +- + man/systemd-cat.xml | 14 +++++++------- + man/systemd-coredumpctl.xml | 4 ++-- + man/systemd-journald.service.xml | 16 ++++++++-------- + man/systemd-udevd.service.xml | 11 ++++++----- + man/systemd.exec.xml | 10 +++++----- + man/systemd.service.xml | 2 +- + man/systemd.socket.xml | 4 ++-- + man/udev.xml | 2 +- + man/udevadm.xml | 2 +- + 14 files changed, 63 insertions(+), 58 deletions(-) + +diff --git a/man/daemon.xml b/man/daemon.xml +index 17d9dd6..26ba600 100644 +--- a/man/daemon.xml ++++ b/man/daemon.xml +@@ -74,8 +74,8 @@ + + + Close all open file +- descriptors except STDIN, STDOUT, +- STDERR (i.e. the first three file ++ descriptors except stdin, stdout, ++ stderr (i.e. the first three file + descriptors 0, 1, 2). This ensures + that no accidentally passed file + descriptor stays around in the daemon +@@ -128,8 +128,8 @@ + + In the daemon process, + connect /dev/null +- to STDIN, STDOUT, +- STDERR. ++ to standard input, output, and error. ++ + + In the daemon process, + reset the umask to 0, so that the file +@@ -223,15 +223,16 @@ + service. + + Note that new-style init systems +- guarantee execution of daemon processes in +- a clean process context: it is guaranteed that ++ guarantee execution of daemon processes in a ++ clean process context: it is guaranteed that + the environment block is sanitized, that the + signal handlers and mask is reset and that no + left-over file descriptors are passed. Daemons +- will be executed in their own session, and +- STDIN/STDOUT/STDERR connected to ++ will be executed in their own session, with ++ standard input/output/error connected to + /dev/null unless +- otherwise configured. The umask is reset. ++ otherwise configured. The umask is reset. ++ + + It is recommended for new-style daemons + to implement the following: +@@ -324,7 +325,7 @@ + Instead of using the + syslog() call to log directly to the + system syslog service, a new-style daemon may +- choose to simply log to STDERR via ++ choose to simply log to standard error via + fprintf(), which is then forwarded to + syslog by the init system. If log + priorities are necessary, these can be +diff --git a/man/sd-daemon.xml b/man/sd-daemon.xml +index b48eac9..555d1ac 100644 +--- a/man/sd-daemon.xml ++++ b/man/sd-daemon.xml +@@ -96,7 +96,7 @@ + #define SD_DEBUG "<7>" /* debug-level messages */ + + These prefixes are intended to be used in +- conjunction with STDERR-based logging as implemented ++ conjunction with stderr-based logging as implemented + by systemd. If a systemd service definition file is + configured with StandardError=syslog + or StandardError=kmsg, these +diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml +index a8dc8fd..646fe15 100644 +--- a/man/sd_journal_stream_fd.xml ++++ b/man/sd_journal_stream_fd.xml +@@ -69,8 +69,8 @@ + messages written to this file descriptor as simple + newline-separated text strings are written to the + journal. This file descriptor can be used internally +- by applications or be made STDOUT/STDERR of other +- processes executed. ++ by applications or be made standard output or standard ++ error of other processes executed. + + sd_journal_stream_fd() + takes a short program identifier string as first +diff --git a/man/systemctl.xml b/man/systemctl.xml +index cde1694..d4048a8 100644 +--- a/man/systemctl.xml ++++ b/man/systemctl.xml +@@ -666,21 +666,23 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service + + + Check whether any of the specified units are active +- (i.e. running). Returns an exit code 0 if at least one is +- active, non-zero otherwise. Unless +- is specified, this will also print the current unit state to +- STDOUT. ++ (i.e. running). Returns an exit code ++ 0 if at least one is active, or ++ non-zero otherwise. Unless is ++ specified, this will also print the current unit state to ++ standard output. + + + + is-failed NAME... + + +- Check whether any of the specified units are in a "failed" state. +- Returns an exit code 0 if at least one has failed, non-zero +- otherwise. Unless is specified, this +- will also print the current unit state to +- STDOUT. ++ Check whether any of the specified units are in a ++ "failed" state. Returns an exit code ++ 0 if at least one has failed, ++ non-zero otherwise. Unless is ++ specified, this will also print the current unit state to ++ standard output. + + + +@@ -1069,9 +1071,10 @@ kobject-uevent 1 systemd-udevd-kernel.socket systemd-udevd.service + + Create a snapshot. If a snapshot name is specified, + the new snapshot will be named after it. If none is +- specified, an automatic snapshot name is generated. In either +- case, the snapshot name used is printed to STDOUT, unless +- is specified. ++ specified, an automatic snapshot name is generated. In ++ either case, the snapshot name used is printed to standard ++ output, unless is specified. ++ + + A snapshot refers to a saved state of the systemd + manager. It is implemented itself as a unit that is +diff --git a/man/systemd-ask-password.xml b/man/systemd-ask-password.xml +index 79902cb..db5cb20 100644 +--- a/man/systemd-ask-password.xml ++++ b/man/systemd-ask-password.xml +@@ -60,7 +60,7 @@ + used to query a system password or passphrase from the + user, using a question message specified on the + command line. When run from a TTY it will query a +- password on the TTY and print it to STDOUT. When run ++ password on the TTY and print it to standard output. When run + with no TTY or with it will + query the password system-wide and allow active users + to respond via several agents. The latter is +diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml +index ba7a2cf..16a8eb4 100644 +--- a/man/systemd-cat.xml ++++ b/man/systemd-cat.xml +@@ -60,18 +60,18 @@ + Description + + systemd-cat may be used to +- connect STDOUT and STDERR of a process with the ++ connect the standard input and output of a process to the + journal, or as a filter tool in a shell pipeline to + pass the output the previous pipeline element + generates to the journal. + + If no parameter is passed, + systemd-cat will write +- everything it reads from standard input (STDIN) to the journal. ++ everything it reads from standard input (stdin) to the journal. + + If parameters are passed, they are executed as +- command line with standard output (STDOUT) and standard +- error output (STDERR) connected to the journal, so ++ command line with standard output (stdout) and standard ++ error output (stderr) connected to the journal, so + that all it writes is stored in the journal. + + +@@ -169,7 +169,7 @@ + Invoke a program + + This calls /bin/ls +- with STDOUT/STDERR connected to the ++ with standard output and error connected to the + journal: + + # systemd-cat ls +@@ -188,8 +188,8 @@ + + Even though the two examples have very similar + effects the first is preferable since only one process +- is running at a time, and both STDOUT and STDERR are +- captured while in the second example only STDOUT is ++ is running at a time, and both stdout and stderr are ++ captured while in the second example only stdout is + captured. + + +diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml +index c096f6d..286ff14 100644 +--- a/man/systemd-coredumpctl.xml ++++ b/man/systemd-coredumpctl.xml +@@ -135,8 +135,8 @@ + + Extract the last coredump + matching specified characteristics. +- Coredump will be written on STDOUT, unless +- an output file is specified with ++ Coredump will be written on standard output, ++ unless an output file is specified with + . + + +diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml +index 2f877f5..0a20e21 100644 +--- a/man/systemd-journald.service.xml ++++ b/man/systemd-journald.service.xml +@@ -59,15 +59,15 @@ + Description + + systemd-journald is a +- system service that collects and stores logging +- data. It creates and maintains structured, indexed +- journals based on logging information that is received +- from the kernel, from user processes via the libc ++ system service that collects and stores logging data. ++ It creates and maintains structured, indexed journals ++ based on logging information that is received from the ++ kernel, from user processes via the libc + syslog3 +- call, from STDOUT/STDERR of system services or via its +- native API. It will implicitly collect numerous meta +- data fields for each log messages in a secure and +- unfakeable way. See ++ call, from standard input and standard error of system ++ services or via its native API. It will implicitly ++ collect numerous meta data fields for each log ++ messages in a secure and unfakeable way. See + systemd.journal-fields7 + for more information about the collected meta data. + +diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml +index 50a1076..b3bca2f 100644 +--- a/man/systemd-udevd.service.xml ++++ b/man/systemd-udevd.service.xml +@@ -70,7 +70,7 @@ + + + +- Print debug messages to STDERR. ++ Print debug messages to standard error. + + + +@@ -82,10 +82,11 @@ + + + +- Delay the execution of RUN instruction by the given +- number of seconds. This option might be useful when +- debugging system crashes during coldplug caused by loading +- non-working kernel modules. ++ Delay the execution of RUN ++ instruction by the given number of seconds. This option ++ might be useful when debugging system crashes during ++ coldplug caused by loading non-working kernel ++ modules. + + + +diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml +index 5ba1aac..ae134f2 100644 +--- a/man/systemd.exec.xml ++++ b/man/systemd.exec.xml +@@ -472,9 +472,9 @@ + + StandardError= + Controls where file +- descriptor 2 (STDERR) of the executed +- processes is connected to. The +- available options are identical to ++ descriptor 2 (standard error) of the ++ executed processes is connected to. ++ The available options are identical to + those of + StandardOutput=, + with one exception: if set to +@@ -491,8 +491,8 @@ + + TTYPath= + Sets the terminal +- device node to use if STDIN, STDOUT, +- or STDERR are connected to a ++ device node to use if standard input, output, ++ or error are connected to a + TTY (see above). Defaults to + /dev/console. + +diff --git a/man/systemd.service.xml b/man/systemd.service.xml +index d23904e..c116a9b 100644 +--- a/man/systemd.service.xml ++++ b/man/systemd.service.xml +@@ -858,7 +858,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + for all file descriptors passed via + socket-based activation. If true, all + file descriptors >= 3 (i.e. all except +- STDIN/STDOUT/STDERR) will have ++ stdin, stdout, and stderr) will have + the O_NONBLOCK flag + set and hence are in + non-blocking mode. This option is only +diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml +index 570a6fb..da0f2aa 100644 +--- a/man/systemd.socket.xml ++++ b/man/systemd.socket.xml +@@ -144,8 +144,8 @@ + sd_listen_fds3 + for details) or via the traditional + inetd8-style +- socket passing (i.e. sockets passed in via STDIN and +- STDOUT, using StandardInput=socket ++ socket passing (i.e. sockets passed in via standard input and ++ output, using StandardInput=socket + in the service file). + + +diff --git a/man/udev.xml b/man/udev.xml +index 82e7478..25a3ea9 100644 +--- a/man/udev.xml ++++ b/man/udev.xml +@@ -255,7 +255,7 @@ + Execute a program to determine whether there + is a match; the key is true if the program returns + successfully. The device properties are made available to the +- executed program in the environment. The program's STDOUT ++ executed program in the environment. The program's standard ouput + is available in the RESULT key. + This can only be used for very short-running foreground tasks. For details, + see RUN. +diff --git a/man/udevadm.xml b/man/udevadm.xml +index 32bf480..b172266 100644 +--- a/man/udevadm.xml ++++ b/man/udevadm.xml +@@ -72,7 +72,7 @@ + + + +- Print debug messages to STDERR. ++ Print debug messages to standard error. + + + diff --git a/0282-man-use-spaces-instead-of-tabs.patch b/0282-man-use-spaces-instead-of-tabs.patch new file mode 100644 index 0000000..761c3b4 --- /dev/null +++ b/0282-man-use-spaces-instead-of-tabs.patch @@ -0,0 +1,163 @@ +From 05b3ce6df1c334f91f5b62dd547062dd6986c80a Mon Sep 17 00:00:00 2001 +From: "Jason St. John" +Date: Fri, 14 Feb 2014 22:07:22 -0500 +Subject: [PATCH] man: use spaces instead of tabs + +Several sections of the man pages included intermixed tabs and spaces; +this commit replaces all tabs with spaces. + +(cherry picked from commit b200a92cdc47b204e2ed7fbdd1eaf15abfd019c6) + +Conflicts: + man/crypttab.xml + man/sd_bus_creds_get_pid.xml + man/systemd.service.xml +--- + man/systemd-delta.xml | 68 ++++++++++++++++++++++++------------------------- + man/systemd.service.xml | 4 +-- + man/systemd.socket.xml | 20 +++++++-------- + 3 files changed, 46 insertions(+), 46 deletions(-) + +diff --git a/man/systemd-delta.xml b/man/systemd-delta.xml +index f802aa5..23fb8d1 100644 +--- a/man/systemd-delta.xml ++++ b/man/systemd-delta.xml +@@ -50,8 +50,8 @@ + + + systemd-delta +- OPTIONS +- PREFIX/SUFFIX|SUFFIX ++ OPTIONS ++ PREFIX/SUFFIX|SUFFIX + + + +@@ -78,27 +78,27 @@ + the name of the main configuration file, must match). + For a fuller explanation, see + systemd.unit5. +- +- +- The command line argument will be split into a +- prefix and a suffix. Either is optional. The prefix +- must be one of the directories containing +- configuration files (/etc, +- /run, +- /usr/lib, ...). If it is given, +- only overriding files contained in this directory will +- be shown. Otherwise, all overriding files will be +- shown. The suffix must be a name of a subdirectory +- containing configuration files like +- tmpfiles.d, +- sysctl.d or +- systemd/system. If it is given, +- only configuration files in this subdirectory (across +- all configuration paths) will be analyzed. Otherwise, +- all configuration files will be analyzed. If the +- commandline argument is not given at all, all +- configuration files will be analyzed. See below for +- some examples. ++ ++ ++ The command line argument will be split into a ++ prefix and a suffix. Either is optional. The prefix ++ must be one of the directories containing ++ configuration files (/etc, ++ /run, ++ /usr/lib, ...). If it is given, ++ only overriding files contained in this directory will ++ be shown. Otherwise, all overriding files will be ++ shown. The suffix must be a name of a subdirectory ++ containing configuration files like ++ tmpfiles.d, ++ sysctl.d or ++ systemd/system. If it is given, ++ only configuration files in this subdirectory (across ++ all configuration paths) will be analyzed. Otherwise, ++ all configuration files will be analyzed. If the ++ commandline argument is not given at all, all ++ configuration files will be analyzed. See below for ++ some examples. + + + +@@ -200,21 +200,21 @@ + + + +- +- Examples ++ ++ Examples + +- To see all local configuration: +- systemd-delta ++ To see all local configuration: ++ systemd-delta + +- To see all runtime configuration: +- systemd-delta /run ++ To see all runtime configuration: ++ systemd-delta /run + +- To see all system unit configuration changes: +- systemd-delta systemd/system ++ To see all system unit configuration changes: ++ systemd-delta systemd/system + +- To see all runtime "drop-in" changes for system units: +- systemd-delta --type=extended /run/systemd/system +- ++ To see all runtime "drop-in" changes for system units: ++ systemd-delta --type=extended /run/systemd/system ++ + + + Exit status +diff --git a/man/systemd.service.xml b/man/systemd.service.xml +index c116a9b..0f4be71 100644 +--- a/man/systemd.service.xml ++++ b/man/systemd.service.xml +@@ -769,8 +769,8 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + exit statuses is merged. If the empty + string is assigned to this option, the + list is reset, all prior assignments +- of this option will have no +- effect. ++ of this option will have no ++ effect. + + + +diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml +index da0f2aa..39fba51 100644 +--- a/man/systemd.socket.xml ++++ b/man/systemd.socket.xml +@@ -121,16 +121,16 @@ + boot or late system shutdown should disable this + option. + +- Socket units will have a +- Before= dependency on the service +- which they trigger added implicitly. No implicit +- WantedBy= or +- RequiredBy= dependency from the +- socket to the service is added. This means that the +- service may be started without the socket, in which +- case it must be able to open sockets by itself. To +- prevent this, an explicit Requires= +- dependency may be added. ++ Socket units will have a ++ Before= dependency on the service ++ which they trigger added implicitly. No implicit ++ WantedBy= or ++ RequiredBy= dependency from the ++ socket to the service is added. This means that the ++ service may be started without the socket, in which ++ case it must be able to open sockets by itself. To ++ prevent this, an explicit Requires= ++ dependency may be added. + + Socket units may be used to implement on-demand + starting of services, as well as parallelized starting diff --git a/0283-macro-add-a-macro-to-test-whether-a-value-is-in-a-sp.patch b/0283-macro-add-a-macro-to-test-whether-a-value-is-in-a-sp.patch new file mode 100644 index 0000000..6c986c7 --- /dev/null +++ b/0283-macro-add-a-macro-to-test-whether-a-value-is-in-a-sp.patch @@ -0,0 +1,76 @@ +From edc8c0565efe09c404e0588fcdb1027b1c61faa8 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 2 Dec 2013 23:08:25 +0100 +Subject: [PATCH] macro: add a macro to test whether a value is in a specified + list + +Introduce IN_SET() macro to nicely check whether a value a is one of a +few listed values. + +This makes writing this: + + if (a == 1 || a == 7 || a == 8 || a == 9) + +nicer, by allowing this: + + if (IN_SET(a, 1, 7, 8, 9)) + +This is particularly useful for state machine enums. + +(cherry picked from commit cabb78068899232c152f4585f19d023e373aa73d) +--- + src/shared/macro.h | 13 +++++++++++++ + src/test/test-util.c | 11 +++++++++++ + 2 files changed, 24 insertions(+) + +diff --git a/src/shared/macro.h b/src/shared/macro.h +index bc5b3c1..5f3e522 100644 +--- a/src/shared/macro.h ++++ b/src/shared/macro.h +@@ -294,4 +294,17 @@ do { \ + #define SET_FLAG(v, flag, b) \ + (v) = (b) ? ((v) | (flag)) : ((v) & ~(flag)) + ++#define IN_SET(x, ...) ({ \ ++ typeof(x) _x = (x); \ ++ unsigned _i; \ ++ bool _found = false; \ ++ for (_i = 0; _i < sizeof((typeof(_x)[]) { __VA_ARGS__ })/sizeof(typeof(_x)); _i++) \ ++ if (((typeof(_x)[]) { __VA_ARGS__ })[_i] == _x) { \ ++ _found = true; \ ++ break; \ ++ } \ ++ _found; \ ++ }) ++ ++ + #include "log.h" +diff --git a/src/test/test-util.c b/src/test/test-util.c +index c5762ed..7566adc 100644 +--- a/src/test/test-util.c ++++ b/src/test/test-util.c +@@ -591,6 +591,16 @@ static void test_get_files_in_directory(void) { + assert_se(get_files_in_directory(".", NULL) >= 0); + } + ++static void test_in_set(void) { ++ assert_se(IN_SET(1, 1)); ++ assert_se(IN_SET(1, 1, 2, 3, 4)); ++ assert_se(IN_SET(2, 1, 2, 3, 4)); ++ assert_se(IN_SET(3, 1, 2, 3, 4)); ++ assert_se(IN_SET(4, 1, 2, 3, 4)); ++ assert_se(!IN_SET(0, 1)); ++ assert_se(!IN_SET(0, 1, 2, 3, 4)); ++} ++ + int main(int argc, char *argv[]) { + test_streq_ptr(); + test_first_word(); +@@ -628,6 +638,7 @@ int main(int argc, char *argv[]) { + test_split_pair(); + test_fstab_node_to_udev_node(); + test_get_files_in_directory(); ++ test_in_set(); + + return 0; + } diff --git a/0284-core-fix-property-changes-in-transient-units.patch b/0284-core-fix-property-changes-in-transient-units.patch new file mode 100644 index 0000000..6e2128d --- /dev/null +++ b/0284-core-fix-property-changes-in-transient-units.patch @@ -0,0 +1,91 @@ +From 39899c866206a14dfdd19497763c84ea19f15f8a Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 17 Feb 2014 01:58:33 +0100 +Subject: [PATCH] core: fix property changes in transient units + +(cherry picked from commit 6d2357247b198314d972932415d65a42f83a9b6e) +--- + src/core/dbus-unit.c | 3 --- + src/core/unit.c | 13 ++++++------- + 2 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c +index 2ea59b2..a185f5c 100644 +--- a/src/core/dbus-unit.c ++++ b/src/core/dbus-unit.c +@@ -962,9 +962,6 @@ int bus_unit_set_properties( + assert(u); + assert(iter); + +- if (u->transient) +- mode &= UNIT_RUNTIME; +- + /* We iterate through the array twice. First run we just check + * if all passed data is valid, second run actually applies + * it. This is to implement transaction-like behaviour without +diff --git a/src/core/unit.c b/src/core/unit.c +index 49833d1..8e2a7c4 100644 +--- a/src/core/unit.c ++++ b/src/core/unit.c +@@ -2785,7 +2785,6 @@ static int drop_in_file(Unit *u, UnitSetPropertiesMode mode, const char *name, c + assert(name); + assert(_p); + assert(_q); +- assert(mode & (UNIT_PERSISTENT|UNIT_RUNTIME)); + + b = xescape(name, "/."); + if (!b) +@@ -2804,7 +2803,7 @@ static int drop_in_file(Unit *u, UnitSetPropertiesMode mode, const char *name, c + return -ENOENT; + + p = strjoin(c, "/", u->id, ".d", NULL); +- } else if (mode & UNIT_PERSISTENT) ++ } else if (mode == UNIT_PERSISTENT && !u->transient) + p = strjoin("/etc/systemd/system/", u->id, ".d", NULL); + else + p = strjoin("/run/systemd/system/", u->id, ".d", NULL); +@@ -2830,7 +2829,7 @@ int unit_write_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name, co + assert(name); + assert(data); + +- if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) ++ if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME)) + return 0; + + r = drop_in_file(u, mode, name, &p, &q); +@@ -2850,7 +2849,7 @@ int unit_write_drop_in_format(Unit *u, UnitSetPropertiesMode mode, const char *n + assert(name); + assert(format); + +- if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) ++ if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME)) + return 0; + + va_start(ap, format); +@@ -2873,7 +2872,7 @@ int unit_write_drop_in_private(Unit *u, UnitSetPropertiesMode mode, const char * + if (!UNIT_VTABLE(u)->private_section) + return -EINVAL; + +- if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) ++ if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME)) + return 0; + + ndata = strjoin("[", UNIT_VTABLE(u)->private_section, "]\n", data, NULL); +@@ -2892,7 +2891,7 @@ int unit_write_drop_in_private_format(Unit *u, UnitSetPropertiesMode mode, const + assert(name); + assert(format); + +- if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) ++ if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME)) + return 0; + + va_start(ap, format); +@@ -2911,7 +2910,7 @@ int unit_remove_drop_in(Unit *u, UnitSetPropertiesMode mode, const char *name) { + + assert(u); + +- if (!(mode & (UNIT_PERSISTENT|UNIT_RUNTIME))) ++ if (!IN_SET(mode, UNIT_PERSISTENT, UNIT_RUNTIME)) + return 0; + + r = drop_in_file(u, mode, name, &p, &q); diff --git a/0285-core-more-exact-test-on-the-procfs-special-string-de.patch b/0285-core-more-exact-test-on-the-procfs-special-string-de.patch new file mode 100644 index 0000000..049fa1b --- /dev/null +++ b/0285-core-more-exact-test-on-the-procfs-special-string-de.patch @@ -0,0 +1,27 @@ +From 878ca1ee66efe252c3dee848ef874ca6a6f78f5b Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Sun, 16 Feb 2014 13:58:18 +0100 +Subject: [PATCH] core: more exact test on the procfs special string + "(deleted)" + +In other parts of systemd, the code checks for " (deleted)", +but in one instance, it did not (yet). Make it do the same. + +(cherry picked from commit a87f0f726ca6dc9fde11eea6591a244e77d2d182) +--- + src/core/umount.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/umount.c b/src/core/umount.c +index 99dbe27..fbd7e1c 100644 +--- a/src/core/umount.c ++++ b/src/core/umount.c +@@ -170,7 +170,7 @@ static int swap_list_get(MountPoint **head) { + continue; + } + +- if (endswith(dev, "(deleted)")) { ++ if (endswith(dev, " (deleted)")) { + free(dev); + continue; + } diff --git a/0286-doc-update-punctuation.patch b/0286-doc-update-punctuation.patch new file mode 100644 index 0000000..70eb9da --- /dev/null +++ b/0286-doc-update-punctuation.patch @@ -0,0 +1,278 @@ +From e9511e0450e97fe28f66c231e347d64c9730f539 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 17 Feb 2014 03:37:13 +0100 +Subject: [PATCH] doc: update punctuation + +Resolve spotted issues related to missing or extraneous commas, dashes. + +(cherry picked from commit 73e231abde39f22097df50542c745e01de879836) + +Conflicts: + man/journalctl.xml + man/sd_bus_error.xml + man/sd_bus_new.xml + man/systemctl.xml + man/systemd-networkd.service.xml + man/systemd-nspawn.xml + man/systemd-system.conf.xml + man/systemd.exec.xml + man/systemd.kill.xml + man/systemd.service.xml + man/systemd.timer.xml + src/backlight/backlight.c + src/core/cgroup.c + src/libsystemd/sd-bus/bus-kernel.c +--- + man/journalctl.xml | 1 + + man/systemd-cat.xml | 2 +- + man/systemd-udevd.service.xml | 6 +++--- + man/systemd.service.xml | 42 +++++++++++++++++++-------------------- + man/systemd.socket.xml | 6 +++--- + man/systemd.special.xml | 2 +- + man/systemd.xml | 2 +- + rules/60-persistent-storage.rules | 2 +- + src/journal/journalctl.c | 2 +- + src/journal/sd-journal.c | 4 ++-- + src/shared/cgroup-util.c | 4 ++-- + src/udev/udev-builtin-usb_id.c | 4 ++-- + 12 files changed, 39 insertions(+), 38 deletions(-) + +diff --git a/man/journalctl.xml b/man/journalctl.xml +index d75c758..b695b3d 100644 +--- a/man/journalctl.xml ++++ b/man/journalctl.xml +@@ -509,6 +509,7 @@ + and additional matches for messages + from systemd and messages about + coredumps for the specified unit. ++ + This parameter can be specified multiple times. + + +diff --git a/man/systemd-cat.xml b/man/systemd-cat.xml +index 16a8eb4..e61a6ac 100644 +--- a/man/systemd-cat.xml ++++ b/man/systemd-cat.xml +@@ -189,7 +189,7 @@ + Even though the two examples have very similar + effects the first is preferable since only one process + is running at a time, and both stdout and stderr are +- captured while in the second example only stdout is ++ captured while in the second example, only stdout is + captured. + + +diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml +index b3bca2f..0e49fa0 100644 +--- a/man/systemd-udevd.service.xml ++++ b/man/systemd-udevd.service.xml +@@ -93,10 +93,10 @@ + + + Specify when systemd-udevd should resolve names of users and groups. +- When set to (the default) names will be ++ When set to (the default), names will be + resolved when the rules are parsed. When set to +- names will be resolved for every event. +- When set to names will never be resolved ++ , names will be resolved for every event. ++ When set to , names will never be resolved + and all devices will be owned by root. + + +diff --git a/man/systemd.service.xml b/man/systemd.service.xml +index 0f4be71..4d672f0 100644 +--- a/man/systemd.service.xml ++++ b/man/systemd.service.xml +@@ -748,27 +748,27 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + definitions can either be numeric exit + codes or termination signal names, + separated by spaces. For example: +- SuccessExitStatus=1 2 8 SIGKILL +- ensures that exit codes 1, 2, 8 and +- the termination signal +- SIGKILL are +- considered clean service terminations. +- +- +- Note that if a process has a +- signal handler installed and exits by +- calling +- _exit2 +- in response to a signal, the +- information about the signal is lost. +- Programs should instead perform cleanup and kill themselves with the same signal instead. See +- Proper handling of SIGINT/SIGQUIT — How to be a proper program. +- +- This option may appear more than once +- in which case the list of successful +- exit statuses is merged. If the empty +- string is assigned to this option, the +- list is reset, all prior assignments ++ SuccessExitStatus=1 2 8 SIGKILL ++ ensures that exit codes 1, 2, 8 and ++ the termination signal ++ SIGKILL are ++ considered clean service terminations. ++ ++ ++ Note that if a process has a ++ signal handler installed and exits by ++ calling ++ _exit2 ++ in response to a signal, the ++ information about the signal is lost. ++ Programs should instead perform cleanup and kill themselves with the same signal instead. See ++ Proper handling of SIGINT/SIGQUIT — How to be a proper program. ++ ++ This option may appear more than once, ++ in which case the list of successful ++ exit statuses is merged. If the empty ++ string is assigned to this option, the ++ list is reset, all prior assignments + of this option will have no + effect. + +diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml +index 39fba51..3e1dd88 100644 +--- a/man/systemd.socket.xml ++++ b/man/systemd.socket.xml +@@ -84,7 +84,7 @@ + which configure resource control settings for the + processes of the socket. + +- For each socket file a matching service file ++ For each socket file, a matching service file + must exist, describing the service to start on + incoming traffic on the socket (see + systemd.service5 +@@ -254,7 +254,7 @@ + before the interface it is configured + on is up and running, and even + regardless of whether it will be up and +- running at any point. To deal with this ++ running at any point. To deal with this, + it is recommended to set the + FreeBind= option + described below. +@@ -720,7 +720,7 @@ + Accept=no. It + defaults to the service that bears the + same name as the socket (with the +- suffix replaced). In most cases it ++ suffix replaced). In most cases, it + should not be necessary to use this + option. + +diff --git a/man/systemd.special.xml b/man/systemd.special.xml +index 76bb5cd..8ccccc2 100644 +--- a/man/systemd.special.xml ++++ b/man/systemd.special.xml +@@ -820,7 +820,7 @@ + services. These targets are generally not part of the + initial boot transaction, unless they are explicitly + pulled in by one of the implementing services. Note +- specifically, that these passive ++ specifically that these passive + target units are generally not pulled in by the + consumer of a service, but by the provider of the + service. This means: a consuming service should order +diff --git a/man/systemd.xml b/man/systemd.xml +index 23a0c26..76d977d 100644 +--- a/man/systemd.xml ++++ b/man/systemd.xml +@@ -407,7 +407,7 @@ + and ordering dependencies are placed between two + units. Also note that the majority of dependencies are + implicitly created and maintained by systemd. In most +- cases it should be unnecessary to declare additional ++ cases, it should be unnecessary to declare additional + dependencies manually, however it is possible to do + this. + +diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules +index 154ffd9..4f7163d 100644 +--- a/rules/60-persistent-storage.rules ++++ b/rules/60-persistent-storage.rules +@@ -33,7 +33,7 @@ KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="scsi", ATTRS{type}== + + # Run ata_id on non-removable USB Mass Storage (SATA/PATA disks in enclosures) + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", ATTR{removable}=="0", SUBSYSTEMS=="usb", IMPORT{program}="ata_id --export $devnode" +-# Otherwise fall back to using usb_id for USB devices ++# Otherwise, fall back to using usb_id for USB devices + KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id" + + # scsi devices +diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c +index ccd96b2..5b0be27 100644 +--- a/src/journal/journalctl.c ++++ b/src/journal/journalctl.c +@@ -715,7 +715,7 @@ static int add_matches(sd_journal *j, char **args) { + t = strappend("_COMM=", comm); + + /* Append _EXE only if the interpreter is not a link. +- Otherwise it might be outdated often. */ ++ Otherwise, it might be outdated often. */ + if (lstat(interpreter, &st) == 0 && + !S_ISLNK(st.st_mode)) { + t2 = strappend("_EXE=", interpreter); +diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c +index 46c3feb..f4af1f6 100644 +--- a/src/journal/sd-journal.c ++++ b/src/journal/sd-journal.c +@@ -472,7 +472,7 @@ static int compare_entry_order(JournalFile *af, Object *_ao, + + if (sd_id128_equal(ao->entry.boot_id, bo->entry.boot_id)) { + +- /* If the boot id matches compare monotonic time */ ++ /* If the boot id matches, compare monotonic time */ + a = le64toh(ao->entry.monotonic); + b = le64toh(bo->entry.monotonic); + +@@ -482,7 +482,7 @@ static int compare_entry_order(JournalFile *af, Object *_ao, + return 1; + } + +- /* Otherwise compare UTC time */ ++ /* Otherwise, compare UTC time */ + a = le64toh(ao->entry.realtime); + b = le64toh(bo->entry.realtime); + +diff --git a/src/shared/cgroup-util.c b/src/shared/cgroup-util.c +index 8a4edda..3c64e62 100644 +--- a/src/shared/cgroup-util.c ++++ b/src/shared/cgroup-util.c +@@ -1115,7 +1115,7 @@ int cg_mangle_path(const char *path, char **result) { + assert(path); + assert(result); + +- /* First check if it already is a filesystem path */ ++ /* First, check if it already is a filesystem path */ + if (path_startswith(path, "/sys/fs/cgroup")) { + + t = strdup(path); +@@ -1127,7 +1127,7 @@ int cg_mangle_path(const char *path, char **result) { + return 0; + } + +- /* Otherwise treat it as cg spec */ ++ /* Otherwise, treat it as cg spec */ + r = cg_split_spec(path, &c, &p); + if (r < 0) + return r; +diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c +index 1b9f824..883e11e 100644 +--- a/src/udev/udev-builtin-usb_id.c ++++ b/src/udev/udev-builtin-usb_id.c +@@ -219,9 +219,9 @@ static int dev_if_packed_info(struct udev_device *dev, char *ifs_str, size_t len + * A unique USB identification is generated like this: + * + * 1.) Get the USB device type from InterfaceClass and InterfaceSubClass +- * 2.) If the device type is 'Mass-Storage/SPC-2' or 'Mass-Storage/RBC' ++ * 2.) If the device type is 'Mass-Storage/SPC-2' or 'Mass-Storage/RBC', + * use the SCSI vendor and model as USB-Vendor and USB-model. +- * 3.) Otherwise use the USB manufacturer and product as ++ * 3.) Otherwise, use the USB manufacturer and product as + * USB-Vendor and USB-model. Any non-printable characters + * in those strings will be skipped; a slash '/' will be converted + * into a full stop '.'. diff --git a/0287-doc-resolve-missing-extraneous-words-or-inappropriat.patch b/0287-doc-resolve-missing-extraneous-words-or-inappropriat.patch new file mode 100644 index 0000000..22d3619 --- /dev/null +++ b/0287-doc-resolve-missing-extraneous-words-or-inappropriat.patch @@ -0,0 +1,244 @@ +From a7f8bd7d142ef6342e95be9a428df695a951034b Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 17 Feb 2014 03:37:18 +0100 +Subject: [PATCH] doc: resolve missing/extraneous words or inappropriate forms + +Issues fixed: +* missing words required by grammar +* duplicated or extraneous words +* inappropriate forms (e.g. singular/plural), and declinations +* orthographic misspellings + +(cherry picked from commit 66f756d437658cc464bfb5647c97efd0cf77f933) + +Conflicts: + man/pam_systemd.xml + man/sd_bus_creds_get_pid.xml + man/sd_bus_error.xml + man/sd_bus_open_user.xml + man/systemctl.xml + man/systemd-nspawn.xml + man/systemd-system.conf.xml + man/systemd.exec.xml + man/udev.xml +--- + man/busctl.xml | 2 +- + man/journalctl.xml | 2 +- + man/journald.conf.xml | 6 +++--- + man/machine-info.xml | 6 +++--- + man/sd_journal_print.xml | 2 +- + man/systemd-coredumpctl.xml | 2 +- + man/systemd-journald.service.xml | 4 ++-- + man/systemd-system.conf.xml | 2 +- + man/systemd-udevd.service.xml | 4 ++-- + man/systemd.exec.xml | 2 +- + man/systemd.journal-fields.xml | 2 +- + man/systemd.socket.xml | 6 +++--- + 12 files changed, 20 insertions(+), 20 deletions(-) + +diff --git a/man/busctl.xml b/man/busctl.xml +index 0c5f05a..854eb38 100644 +--- a/man/busctl.xml ++++ b/man/busctl.xml +@@ -151,7 +151,7 @@ along with systemd; If not, see . + + + When showing the list of endpoints, show +- only endpoints which haven't actually been activated yet, ++ only endpoints which have actually not been activated yet, + but may be started automatically if accessed. + + +diff --git a/man/journalctl.xml b/man/journalctl.xml +index b695b3d..623d966 100644 +--- a/man/journalctl.xml ++++ b/man/journalctl.xml +@@ -370,7 +370,7 @@ + terse output only + showing the actual + message of each journal +- entry with no meta data, ++ entry with no metadata, + not even a timestamp. + + +diff --git a/man/journald.conf.xml b/man/journald.conf.xml +index e0796e1..27c326e 100644 +--- a/man/journald.conf.xml ++++ b/man/journald.conf.xml +@@ -269,12 +269,12 @@ + violated when systemd-journald is + started, the value will be raised to + percentage that is actually free. This +- means that if before there was enough +- free space and journal files were ++ means that if there was enough ++ free space before and journal files were + created, and subsequently something + else causes the file system to fill + up, journald will stop using more +- space, but it'll will not removing ++ space, but it will not be removing + existing files to go reduce footprint + either. + +diff --git a/man/machine-info.xml b/man/machine-info.xml +index ddf8f8b..7448e68 100644 +--- a/man/machine-info.xml ++++ b/man/machine-info.xml +@@ -55,7 +55,7 @@ + Description + + The /etc/machine-info file +- contains machine meta data. ++ contains machine metadata. + + The basic file format of + machine-info is a +@@ -68,7 +68,7 @@ + execution engine. + + /etc/machine-info contains +- meta data about the machine that is set by the user or ++ metadata about the machine that is set by the user or + administrator. + + Depending on the operating system other +@@ -84,7 +84,7 @@ + + Options + +- The following machine meta data parameters may ++ The following machine metadata parameters may + be set using + /etc/machine-info: + +diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml +index a716cc3..871baff 100644 +--- a/man/sd_journal_print.xml ++++ b/man/sd_journal_print.xml +@@ -203,7 +203,7 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid( + be guaranteed. Using + sd_journal_print() has the + benefit of logging source code line, filenames, and +- functions as meta data along all entries, and ++ functions as metadata along all entries, and + guaranteeing chronological ordering with structured + log entries that are generated via + sd_journal_send(). Using +diff --git a/man/systemd-coredumpctl.xml b/man/systemd-coredumpctl.xml +index 286ff14..4318a2f 100644 +--- a/man/systemd-coredumpctl.xml ++++ b/man/systemd-coredumpctl.xml +@@ -135,7 +135,7 @@ + + Extract the last coredump + matching specified characteristics. +- Coredump will be written on standard output, ++ The coredump will be written on standard output, + unless an output file is specified with + . + +diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml +index 0a20e21..4d2cb40 100644 +--- a/man/systemd-journald.service.xml ++++ b/man/systemd-journald.service.xml +@@ -66,10 +66,10 @@ + syslog3 + call, from standard input and standard error of system + services or via its native API. It will implicitly +- collect numerous meta data fields for each log ++ collect numerous metadata fields for each log + messages in a secure and unfakeable way. See + systemd.journal-fields7 +- for more information about the collected meta data. ++ for more information about the collected metadata. + + + Log data collected by the journal is primarily +diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml +index 9a1a99f..6f36930 100644 +--- a/man/systemd-system.conf.xml ++++ b/man/systemd-system.conf.xml +@@ -135,7 +135,7 @@ + Configures the initial + CPU affinity for the init + process. Takes a space-separated list +- of CPU indexes. ++ of CPU indices. + + + +diff --git a/man/systemd-udevd.service.xml b/man/systemd-udevd.service.xml +index 0e49fa0..bb04694 100644 +--- a/man/systemd-udevd.service.xml ++++ b/man/systemd-udevd.service.xml +@@ -83,7 +83,7 @@ + + + Delay the execution of RUN +- instruction by the given number of seconds. This option ++ instructions by the given number of seconds. This option + might be useful when debugging system crashes during + coldplug caused by loading non-working kernel + modules. +@@ -148,7 +148,7 @@ + udev.exec-delay= + rd.udev.exec-delay= + +- Delay the execution of RUN instruction by the given ++ Delay the execution of RUN instructions by the given + number of seconds. This option might be useful when + debugging system crashes during coldplug caused by loading + non-working kernel modules. +diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml +index ae134f2..630a28c 100644 +--- a/man/systemd.exec.xml ++++ b/man/systemd.exec.xml +@@ -248,7 +248,7 @@ + Controls the CPU + affinity of the executed + processes. Takes a space-separated +- list of CPU indexes. This option may ++ list of CPU indices. This option may + be specified more than once in which + case the specificed CPU affinity masks + are merged. If the empty string is +diff --git a/man/systemd.journal-fields.xml b/man/systemd.journal-fields.xml +index bb89ed5..b492aae 100644 +--- a/man/systemd.journal-fields.xml ++++ b/man/systemd.journal-fields.xml +@@ -529,7 +529,7 @@ + JSON Format, the addresses of journal entries + are serialized into fields prefixed with double + underscores. Note that these are not proper fields when +- stored in the journal but for addressing meta data of ++ stored in the journal but for addressing metadata of + entries. They cannot be written as part of structured + log entries via calls such as + sd_journal_send3. They +diff --git a/man/systemd.socket.xml b/man/systemd.socket.xml +index 3e1dd88..67267b2 100644 +--- a/man/systemd.socket.xml ++++ b/man/systemd.socket.xml +@@ -90,9 +90,9 @@ + systemd.service5 + for more information about .service files). The name + of the .service unit is by default the same as the +- name of the .socket unit, but can be altered with ++ name of the .socket unit, but can be altered with the + option described below. +- Depending on the setting of ++ Depending on the setting of the + option described below, this .service unit must either + be named like the .socket unit, but with the suffix + replaced, unless overridden with +@@ -135,7 +135,7 @@ + Socket units may be used to implement on-demand + starting of services, as well as parallelized starting + of services. See the blog stories linked at the end +- for introduction. ++ for an introduction. + + Note that the daemon software configured for + socket activation with socket units needs to be able diff --git a/0288-doc-choose-different-words-to-improve-clarity.patch b/0288-doc-choose-different-words-to-improve-clarity.patch new file mode 100644 index 0000000..0aea4a1 --- /dev/null +++ b/0288-doc-choose-different-words-to-improve-clarity.patch @@ -0,0 +1,131 @@ +From aaad88a2eb3a9be24b75e36aefbea9a77b9927b4 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 17 Feb 2014 02:49:45 +0100 +Subject: [PATCH] doc: choose different words to improve clarity + +I suggest the following changes to improve the way the text reads +("flows"). + +(cherry picked from commit dc968941bfc9be464e1df15afa05693dec3ec192) + +Conflicts: + man/crypttab.xml + man/sd_bus_creds_get_pid.xml + man/sd_bus_message_get_monotonic_usec.xml +--- + man/crypttab.xml | 4 +- + src/journal/systemd-journal-feeder.py | 83 +++++++++++++++++++++++++++++++++++ + 2 files changed, 85 insertions(+), 2 deletions(-) + create mode 100644 src/journal/systemd-journal-feeder.py + +diff --git a/man/crypttab.xml b/man/crypttab.xml +index 5f386e5..4b6d12e 100644 +--- a/man/crypttab.xml ++++ b/man/crypttab.xml +@@ -171,7 +171,7 @@ + If the key slot does not match the given + passphrase or key, but another would, the + setup of the device will fail regardless. +- This implies luks. See ++ This option implies luks. See + cryptsetup8 + for possible values. The default is to try + all key slots in sequential order. +@@ -275,7 +275,7 @@ + tcrypt-hidden + + Use the hidden TrueCrypt volume. +- This implies tcrypt. ++ This option implies tcrypt. + + This will map the hidden volume that is + inside of the volume provided in the second +diff --git a/src/journal/systemd-journal-feeder.py b/src/journal/systemd-journal-feeder.py +new file mode 100644 +index 0000000..5cfab82 +--- /dev/null ++++ b/src/journal/systemd-journal-feeder.py +@@ -0,0 +1,83 @@ ++import argparse ++import subprocess ++import collections ++import struct ++from systemd import journal ++ ++options = argparse.ArgumentParser() ++options.add_argument('-H', '--host', default='localhost') ++options.add_argument('-p', '--port', default=19531) ++options.add_argument('-b', '--boot', default='no', ++ action='store_const', const='yes') ++options.add_argument('-f', '--follow', default='no', ++ action='store_const', const='yes') ++options.add_argument('-s', '--submit', action='store_true') ++ ++def spawn_curl(host, port, boot, follow): ++ "Spawn curl to get events from systemd-journal-gatewayd" ++ url = 'http://{host}:{port}/entries?follow={follow}&boot={boot}'.format( ++ host=host, port=port, follow=follow, boot=boot) ++ cmdline = ['curl', '-HAccept: application/vnd.fdo.journal', ++ '--silent', '--show-error', ++ url] ++ child = subprocess.Popen(cmdline, ++ stdin=subprocess.DEVNULL, ++ stdout=subprocess.PIPE) ++ return child ++ ++def _read_one(inp): ++ fields = collections.OrderedDict() ++ ++ while inp: ++ line = inp.readline() ++ line = line[:-1] # remove newline ++ if not line: ++ break ++ left, split, right = line.partition(b'=') ++ name = left.decode('ascii') ++ if split: ++ value = right.decode() ++ else: ++ flen_ = inp.read(8) ++ flen = struct.unpack(' +Date: Mon, 17 Feb 2014 03:58:37 +0100 +Subject: [PATCH] doc: properly use XML entities + +(cherry picked from commit 3c8fa0fd0f99996088e42c5d48e164fdae4ada40) + +Conflicts: + man/sd_bus_error.xml +--- + man/localtime.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/localtime.xml b/man/localtime.xml +index b7fd1ba..dbf2379 100644 +--- a/man/localtime.xml ++++ b/man/localtime.xml +@@ -55,7 +55,7 @@ + + + +- /etc/localtime -> ../usr/share/zoneinfo/… ++ /etc/localtime -> ../usr/share/zoneinfo/… + + + diff --git a/0290-man-machinectl-there-is-no-command-kill-machine.patch b/0290-man-machinectl-there-is-no-command-kill-machine.patch new file mode 100644 index 0000000..6df269a --- /dev/null +++ b/0290-man-machinectl-there-is-no-command-kill-machine.patch @@ -0,0 +1,32 @@ +From 7e7ef00585dd145c6a66144ef8c71c99289ca07f Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Tue, 18 Feb 2014 16:39:17 +0100 +Subject: [PATCH] man: machinectl: there is no command 'kill-machine' + +(cherry picked from commit 773e264d13cac53cbf7e0b174e1883dabb4c9bc2) +--- + man/machinectl.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/man/machinectl.xml b/man/machinectl.xml +index 2ed9f2e..bb88395 100644 +--- a/man/machinectl.xml ++++ b/man/machinectl.xml +@@ -141,7 +141,7 @@ + + + When used with +- kill-machine, ++ kill, + choose which processes to kill. Must + be one of , or + to select whether +@@ -156,7 +156,7 @@ + + + When used with +- kill-machine, choose ++ kill, choose + which signal to send to selected + processes. Must be one of the + well-known signal specifiers, such as diff --git a/0291-load-modules-properly-return-a-failing-error-code-if.patch b/0291-load-modules-properly-return-a-failing-error-code-if.patch new file mode 100644 index 0000000..56741cc --- /dev/null +++ b/0291-load-modules-properly-return-a-failing-error-code-if.patch @@ -0,0 +1,32 @@ +From 743b0038f679e6f8825594dd936f287404c4b1b6 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Tue, 18 Feb 2014 21:23:16 +0100 +Subject: [PATCH] load-modules: properly return a failing error code if some + module fails to load + +This is the missing part of b857193b1def5172e3641ca1d5bc9e08ae81aac4. + +(cherry picked from commit 4b462d1a28461b302586b117736ef288fba1012f) +--- + src/modules-load/modules-load.c | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c +index 9789398..ba7d417 100644 +--- a/src/modules-load/modules-load.c ++++ b/src/modules-load/modules-load.c +@@ -306,9 +306,11 @@ int main(int argc, char *argv[]) { + r = k; + } + +- r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); +- if (r < 0) { +- log_error("Failed to enumerate modules-load.d files: %s", strerror(-r)); ++ k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs); ++ if (k < 0) { ++ log_error("Failed to enumerate modules-load.d files: %s", strerror(-k)); ++ if (r == 0) ++ r = k; + goto finish; + } + diff --git a/0292-machinectl-add-bash-completion.patch b/0292-machinectl-add-bash-completion.patch new file mode 100644 index 0000000..07d3544 --- /dev/null +++ b/0292-machinectl-add-bash-completion.patch @@ -0,0 +1,244 @@ +From a3772fb0d46a99641b0713e669fcb47c364f20bd Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Tue, 18 Feb 2014 21:09:05 +0100 +Subject: [PATCH] machinectl: add bash completion + +(cherry picked from commit e56056e93d33619a3acf13e483900b4f8938228f) + +Default to --no-legend if !on_tty(). + +Conflicts: + man/machinectl.xml + src/machine/machinectl.c +--- + Makefile.am | 3 ++ + man/machinectl.xml | 8 ++++ + shell-completion/bash/machinectl | 97 ++++++++++++++++++++++++++++++++++++++++ + src/machine/machinectl.c | 24 +++++++--- + 4 files changed, 126 insertions(+), 6 deletions(-) + create mode 100644 shell-completion/bash/machinectl + +diff --git a/Makefile.am b/Makefile.am +index 6233a7f..033bbfa 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -3726,6 +3726,9 @@ machinectl_LDADD = \ + rootbin_PROGRAMS += \ + machinectl + ++dist_bashcompletion_DATA += \ ++ shell-completion/bash/machinectl ++ + test_machine_tables_SOURCES = \ + src/machine/test-machine-tables.c + +diff --git a/man/machinectl.xml b/man/machinectl.xml +index bb88395..f00d212 100644 +--- a/man/machinectl.xml ++++ b/man/machinectl.xml +@@ -130,6 +130,14 @@ + + + ++ ++ ++ Do not print the legend, ++ i.e. the column headers and the ++ footer. ++ ++ ++ + + + Do not query the user +diff --git a/shell-completion/bash/machinectl b/shell-completion/bash/machinectl +new file mode 100644 +index 0000000..3789492 +--- /dev/null ++++ b/shell-completion/bash/machinectl +@@ -0,0 +1,97 @@ ++# machinectl(1) completion -*- shell-script -*- ++# ++# This file is part of systemd. ++# ++# Copyright 2014 Thomas H.P. Andersen ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word() { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++__get_machines() { ++ local a b ++ machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; }; ++} ++ ++_machinectl() { ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} ++ local i verb comps ++ ++ local -A OPTS=( ++ [STANDALONE]='--all -a --full --help -h --no-ask-password --no-legend --no-pager --version' ++ [ARG]='--host -H --kill-who -M --machine --property -p --signal -s' ++ ) ++ ++ local -A VERBS=( ++ [STANDALONE]='list' ++ [MACHINES]='status show terminate kill reboot login' ++ ) ++ ++ _init_completion || return ++ ++ for ((i=0; i <= COMP_CWORD; i++)); do ++ if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]} && ++ ! __contains_word "${COMP_WORDS[i-1]}" ${OPTS[ARG]}; then ++ verb=${COMP_WORDS[i]} ++ break ++ fi ++ done ++ ++ if __contains_word "$prev" ${OPTS[ARG]}; then ++ case $prev in ++ --signal|-s) ++ comps=$(compgen -A signal) ++ ;; ++ --kill-who) ++ comps='all leader' ++ ;; ++ --host|-H) ++ comps=$(compgen -A hostname) ++ ;; ++ --machine|-M) ++ comps=$( __get_machines ) ++ ;; ++ --property|-p) ++ comps='' ++ ;; ++ esac ++ COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) ++ return 0 ++ fi ++ ++ if [[ "$cur" = -* ]]; then ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++ return 0 ++ fi ++ ++ if [[ -z $verb ]]; then ++ comps=${VERBS[*]} ++ ++ elif __contains_word "$verb" ${VERBS[STANDALONE]}; then ++ comps='' ++ ++ elif __contains_word "$verb" ${VERBS[MACHINES]}; then ++ comps=$( __get_machines ) ++ fi ++ ++ COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) ++ return 0 ++} ++ ++complete -F _machinectl machinectl +diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c +index 97c2193..88cf8d5 100644 +--- a/src/machine/machinectl.c ++++ b/src/machine/machinectl.c +@@ -43,6 +43,7 @@ static char **arg_property = NULL; + static bool arg_all = false; + static bool arg_full = false; + static bool arg_no_pager = false; ++static bool arg_legend = true; + static const char *arg_kill_who = NULL; + static int arg_signal = SIGTERM; + static enum transport { +@@ -90,11 +91,11 @@ static int list_machines(DBusConnection *bus, char **args, unsigned n) { + return -EIO; + } + +- dbus_message_iter_recurse(&iter, &sub); +- +- if (on_tty()) ++ if (arg_legend) + printf("%-32s %-9s %-16s\n", "MACHINE", "CONTAINER", "SERVICE"); + ++ dbus_message_iter_recurse(&iter, &sub); ++ + while (dbus_message_iter_get_arg_type(&sub) != DBUS_TYPE_INVALID) { + const char *name, *class, *service, *object; + +@@ -120,7 +121,7 @@ static int list_machines(DBusConnection *bus, char **args, unsigned n) { + dbus_message_iter_next(&sub); + } + +- if (on_tty()) ++ if (arg_legend) + printf("\n%u machines listed.\n", k); + + return 0; +@@ -559,10 +560,12 @@ static int help(void) { + " --kill-who=WHO Who to send signal to\n" + " -l --full Do not ellipsize output\n" + " -s --signal=SIGNAL Which signal to send\n" +- " --no-ask-password Don't prompt for password\n" + " -H --host=[USER@]HOST Show information for remote host\n" + " -P --privileged Acquire privileges before execution\n" +- " --no-pager Do not pipe output into a pager\n\n" ++ " --no-pager Do not pipe output into a pager\n" ++ " --no-legend Do not show the headers and footers\n" ++ " --no-ask-password Don't prompt for password\n\n" ++ + "Commands:\n" + " list List running VMs and containers\n" + " status [NAME...] Show VM/container status\n" +@@ -579,6 +582,7 @@ static int parse_argv(int argc, char *argv[]) { + enum { + ARG_VERSION = 0x100, + ARG_NO_PAGER, ++ ARG_NO_LEGEND, + ARG_KILL_WHO, + ARG_NO_ASK_PASSWORD, + }; +@@ -590,6 +594,7 @@ static int parse_argv(int argc, char *argv[]) { + { "all", no_argument, NULL, 'a' }, + { "full", no_argument, NULL, 'l' }, + { "no-pager", no_argument, NULL, ARG_NO_PAGER }, ++ { "no-legend", no_argument, NULL, ARG_NO_LEGEND }, + { "kill-who", required_argument, NULL, ARG_KILL_WHO }, + { "signal", required_argument, NULL, 's' }, + { "host", required_argument, NULL, 'H' }, +@@ -645,6 +650,10 @@ static int parse_argv(int argc, char *argv[]) { + arg_no_pager = true; + break; + ++ case ARG_NO_LEGEND: ++ arg_legend = false; ++ break; ++ + case ARG_NO_ASK_PASSWORD: + arg_ask_password = false; + break; +@@ -679,6 +688,9 @@ static int parse_argv(int argc, char *argv[]) { + } + } + ++ if (!on_tty()) ++ arg_legend = false; ++ + return 1; + } + diff --git a/0293-delta-add-bash-completion.patch b/0293-delta-add-bash-completion.patch new file mode 100644 index 0000000..3c3e19c --- /dev/null +++ b/0293-delta-add-bash-completion.patch @@ -0,0 +1,91 @@ +From 8d04b9ce22bd716b19695e36c9ca0caf24c2ca25 Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Tue, 18 Feb 2014 22:20:26 +0100 +Subject: [PATCH] delta: add bash completion + +(cherry picked from commit 0bc8e31b358a872ec2631874bd2109ba4e009ccf) +--- + Makefile.am | 1 + + shell-completion/bash/systemd-delta | 61 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 62 insertions(+) + create mode 100644 shell-completion/bash/systemd-delta + +diff --git a/Makefile.am b/Makefile.am +index 033bbfa..9049fed 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -342,6 +342,7 @@ dist_bashcompletion_DATA = \ + shell-completion/bash/journalctl \ + shell-completion/bash/systemctl \ + shell-completion/bash/systemd-analyze \ ++ shell-completion/bash/systemd-delta \ + shell-completion/bash/systemd-run \ + shell-completion/bash/udevadm \ + shell-completion/bash/kernel-install +diff --git a/shell-completion/bash/systemd-delta b/shell-completion/bash/systemd-delta +new file mode 100644 +index 0000000..cb17328 +--- /dev/null ++++ b/shell-completion/bash/systemd-delta +@@ -0,0 +1,61 @@ ++# systemd-delta(1) completion -*- shell-script -*- ++# ++# This file is part of systemd. ++# ++# Copyright 2014 Thomas H.P. Andersen ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word() { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++_systemd-delta() { ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} ++ local comps ++ ++ local -A OPTS=( ++ [STANDALONE]='--help -h --no-pager --version' ++ [ARG]='--diff --type -t' ++ ) ++ ++ _init_completion || return ++ ++ ++ if __contains_word "$prev" ${OPTS[ARG]}; then ++ case $prev in ++ --diff) ++ comps='yes no' ++ ;; ++ --type|-t) ++ comps='masked equivalent redirected overridden unchanged extended default' ++ ;; ++ esac ++ COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) ++ return 0 ++ fi ++ ++ if [[ "$cur" = -* ]]; then ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++ return 0 ++ fi ++ ++ COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) ++ return 0 ++} ++ ++complete -F _systemd-delta systemd-delta diff --git a/0294-man-document-MAINPID.patch b/0294-man-document-MAINPID.patch new file mode 100644 index 0000000..0521873 --- /dev/null +++ b/0294-man-document-MAINPID.patch @@ -0,0 +1,41 @@ +From 360ac98ec365f55ea198e07d2c5b86deef14bc6c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 19 Feb 2014 02:54:00 +0100 +Subject: [PATCH] man: document $MAINPID + +(cherry picked from commit b67f562c9cac44bd78b24f5aae78a1797c5d4182) +--- + man/systemd.exec.xml | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml +index 630a28c..d8dab36 100644 +--- a/man/systemd.exec.xml ++++ b/man/systemd.exec.xml +@@ -472,7 +472,7 @@ + + StandardError= + Controls where file +- descriptor 2 (standard error) of the ++ descriptor 2 (STDERR) of the + executed processes is connected to. + The available options are identical to + those of +@@ -1067,6 +1067,17 @@ + + + ++ $MAINPID ++ ++ The PID of the units ++ main process if it is known. This is ++ only set for control processes as ++ invoked by ++ ExecReload= and ++ similar. ++ ++ ++ + $MANAGERPID + + The PID of the user diff --git a/0295-man-busctl-typo-fix.patch b/0295-man-busctl-typo-fix.patch new file mode 100644 index 0000000..7f4fe48 --- /dev/null +++ b/0295-man-busctl-typo-fix.patch @@ -0,0 +1,23 @@ +From 840ad04cd8ab038ee90a787e2914ad0e46945f99 Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Wed, 19 Feb 2014 17:02:45 +0100 +Subject: [PATCH] man: busctl typo fix + +(cherry picked from commit f5ca75f4a1f9f97a23c8bb70ee89cf669f9bb425) +--- + man/busctl.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/busctl.xml b/man/busctl.xml +index 854eb38..6200643 100644 +--- a/man/busctl.xml ++++ b/man/busctl.xml +@@ -184,7 +184,7 @@ along with systemd; If not, see . + + Dump messages being exchanged. If + NAME is specified, show messages +- to or from this endpoint. Otherwsise, show all messages on the ++ to or from this endpoint. Otherwise, show all messages on the + bus. + + diff --git a/0296-journal-don-t-clobber-return-parameters-of-sd_journa.patch b/0296-journal-don-t-clobber-return-parameters-of-sd_journa.patch new file mode 100644 index 0000000..c221d89 --- /dev/null +++ b/0296-journal-don-t-clobber-return-parameters-of-sd_journa.patch @@ -0,0 +1,52 @@ +From e19b6a48bfeddc3102b757df36f9da17c5215c5b Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 19 Feb 2014 17:49:50 +0100 +Subject: [PATCH] journal: don't clobber return parameters of + sd_journal_get_cutoff_realtime_usec() on failure + +(cherry picked from commit 581483bf59ea62147739e71dd2216477be03411c) +--- + src/journal/sd-journal.c | 18 ++++++++++-------- + 1 file changed, 10 insertions(+), 8 deletions(-) + +diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c +index f4af1f6..b1bd61f 100644 +--- a/src/journal/sd-journal.c ++++ b/src/journal/sd-journal.c +@@ -2359,6 +2359,7 @@ _public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from, + Iterator i; + JournalFile *f; + bool first = true; ++ uint64_t fmin = 0, tmax = 0; + int r; + + if (!j) +@@ -2382,19 +2383,20 @@ _public_ int sd_journal_get_cutoff_realtime_usec(sd_journal *j, uint64_t *from, + continue; + + if (first) { +- if (from) +- *from = fr; +- if (to) +- *to = t; ++ fmin = fr; ++ tmax = t; + first = false; + } else { +- if (from) +- *from = MIN(fr, *from); +- if (to) +- *to = MAX(t, *to); ++ fmin = MIN(fr, fmin); ++ tmax = MAX(t, tmax); + } + } + ++ if (from) ++ *from = fmin; ++ if (to) ++ *to = tmax; ++ + return first ? 0 : 1; + } + diff --git a/0297-udev-make-sure-we-always-return-a-valid-error-code-i.patch b/0297-udev-make-sure-we-always-return-a-valid-error-code-i.patch new file mode 100644 index 0000000..9c358d7 --- /dev/null +++ b/0297-udev-make-sure-we-always-return-a-valid-error-code-i.patch @@ -0,0 +1,50 @@ +From bafeb54696d57d063052ea19286aa72e1a3cc0be Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 19 Feb 2014 17:51:08 +0100 +Subject: [PATCH] udev: make sure we always return a valid error code in + trie_store() + +(cherry picked from commit d4f1ef4437e59b2cb69a201bb086ab23070ea72d) + +Conflicts: + src/udev/udevadm-hwdb.c +--- + src/udev/udevadm-hwdb.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/src/udev/udevadm-hwdb.c b/src/udev/udevadm-hwdb.c +index fe56758..141db57 100644 +--- a/src/udev/udevadm-hwdb.c ++++ b/src/udev/udevadm-hwdb.c +@@ -341,7 +341,7 @@ static int trie_store(struct trie *trie, const char *filename) { + struct trie_f t = { + .trie = trie, + }; +- char *filename_tmp; ++ _cleanup_free_ char *filename_tmp = NULL; + int64_t pos; + int64_t root_off; + int64_t size; +@@ -385,8 +385,8 @@ static int trie_store(struct trie *trie, const char *filename) { + err = -errno; + fclose(t.f); + if (err < 0 || rename(filename_tmp, filename) < 0) { +- unlink(filename_tmp); +- goto out; ++ unlink_noerrno(filename_tmp); ++ return err < 0 ? err : -errno; + } + + log_debug("=== trie on-disk ==="); +@@ -400,9 +400,8 @@ static int trie_store(struct trie *trie, const char *filename) { + (unsigned long long)t.values_count * sizeof(struct trie_value_entry_f), (unsigned long long)t.values_count); + log_debug("string store: %8llu bytes", (unsigned long long)trie->strings->len); + log_debug("strings start: %8llu", (unsigned long long) t.strings_off); +-out: +- free(filename_tmp); +- return err; ++ ++ return 0; + } + + static int insert_data(struct trie *trie, struct udev_list *match_list, diff --git a/0298-bootctl-add-bash-completion.patch b/0298-bootctl-add-bash-completion.patch new file mode 100644 index 0000000..d346630 --- /dev/null +++ b/0298-bootctl-add-bash-completion.patch @@ -0,0 +1,92 @@ +From 3646a66d0935ec54d4aebbf1daac6b83812f6ed1 Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Thu, 20 Feb 2014 23:12:02 +0100 +Subject: [PATCH] bootctl: add bash completion + +(cherry picked from commit 95fe27d9307628a4a593e63794000c09ecb91b95) +--- + Makefile.am | 3 +++ + shell-completion/bash/bootctl | 60 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 63 insertions(+) + create mode 100644 shell-completion/bash/bootctl + +diff --git a/Makefile.am b/Makefile.am +index 9049fed..703925a 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1748,6 +1748,9 @@ bootctl_LDADD = \ + bin_PROGRAMS += \ + bootctl + ++dist_bashcompletion_DATA += \ ++ shell-completion/bash/bootctl ++ + dist_zshcompletion_DATA += \ + shell-completion/zsh/_bootctl + +diff --git a/shell-completion/bash/bootctl b/shell-completion/bash/bootctl +new file mode 100644 +index 0000000..c86ec7e +--- /dev/null ++++ b/shell-completion/bash/bootctl +@@ -0,0 +1,60 @@ ++# bootctl(1) completion -*- shell-script -*- ++# ++# This file is part of systemd. ++# ++# Copyright 2014 Thomas H.P. Andersen ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word () { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++_bootctl() { ++ local i verb comps ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} ++ local -A OPTS=( ++ [STANDALONE]='-h --help --version' ++ ) ++ ++ if [[ "$cur" = -* ]]; then ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++ return 0 ++ fi ++ ++ local -A VERBS=( ++ [STANDALONE]='status' ++ ) ++ ++ for ((i=0; i < COMP_CWORD; i++)); do ++ if __contains_word "${COMP_WORDS[i]}" ${VERBS[*]}; then ++ verb=${COMP_WORDS[i]} ++ break ++ fi ++ done ++ ++ if [[ -z $verb ]]; then ++ comps=${VERBS[*]} ++ elif __contains_word "$verb" ${VERBS[STANDALONE]}; then ++ comps='' ++ fi ++ ++ COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) ++ return 0 ++} ++ ++complete -F _bootctl bootctl diff --git a/0299-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch b/0299-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch new file mode 100644 index 0000000..02ece81 --- /dev/null +++ b/0299-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch @@ -0,0 +1,42 @@ +From a8b34088546fdd1505c5def6879e76bc69f03df6 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Fri, 21 Feb 2014 03:29:00 +0100 +Subject: [PATCH] selinux: Don't attempt to load policy in initramfs if it + doesn't exist + +Currently on at least Fedora, SELinux policy does not come in the +initramfs. systemd will attempt to load *both* in the initramfs and +in the real root. + +Now, the selinux_init_load_policy() API has a regular error return +value, as well as an "enforcing" boolean. To determine enforcing +state, it looks for /etc/selinux/config as well as the presence of +"enforcing=" on the kernel command line. + +Ordinarily, neither of those exist in the initramfs, so it will return +"unknown" for enforcing, and systemd will simply ignore the failure to +load policy. + +(cherry picked from commit 37f78db2f4a33474fc349f406b0a0a48e9c573a2) +--- + src/core/selinux-setup.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/core/selinux-setup.c b/src/core/selinux-setup.c +index 7a32ed5..9a5d6b2 100644 +--- a/src/core/selinux-setup.c ++++ b/src/core/selinux-setup.c +@@ -58,6 +58,13 @@ int selinux_setup(bool *loaded_policy) { + cb.func_log = null_log; + selinux_set_callback(SELINUX_CB_LOG, cb); + ++ /* Don't load policy in the initrd if we don't appear to have ++ * it. For the real root, we check below if we've already ++ * loaded policy, and return gracefully. ++ */ ++ if (in_initrd() && access(selinux_path(), F_OK) < 0) ++ return 0; ++ + /* Already initialized by somebody else? */ + r = getcon_raw(&con); + if (r == 0) { diff --git a/0300-man-there-is-no-ExecStopPre-for-service-units.patch b/0300-man-there-is-no-ExecStopPre-for-service-units.patch new file mode 100644 index 0000000..b4ba21c --- /dev/null +++ b/0300-man-there-is-no-ExecStopPre-for-service-units.patch @@ -0,0 +1,24 @@ +From 095743031d97f244530be341c29643344c3cbedf Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Fri, 21 Feb 2014 15:06:44 +0100 +Subject: [PATCH] man: there is no ExecStopPre= for service units + +https://bugs.freedesktop.org/show_bug.cgi?id=73177 +(cherry picked from commit c32acc96ef74d13d0059a680cdede5f05db1981a) +--- + man/systemd.service.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/man/systemd.service.xml b/man/systemd.service.xml +index 4d672f0..50b19a8 100644 +--- a/man/systemd.service.xml ++++ b/man/systemd.service.xml +@@ -674,7 +674,7 @@ ExecStart=/bin/echo $ONE $TWO ${TWO} + processes specified with + ExecStartPre=, + ExecStartPost=, +- ExecStopPre=, ++ ExecStop=, + ExecStopPost=, or + ExecReload=. + When the death of the process is a diff --git a/0301-man-document-that-per-interface-sysctl-variables-are.patch b/0301-man-document-that-per-interface-sysctl-variables-are.patch new file mode 100644 index 0000000..f84723e --- /dev/null +++ b/0301-man-document-that-per-interface-sysctl-variables-are.patch @@ -0,0 +1,33 @@ +From 536e62fefffdc7726c7bf5b83e8f1cb155960e28 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Sun, 23 Feb 2014 16:43:19 +0100 +Subject: [PATCH] man: document that per-interface sysctl variables are applied + as network interfaces show up + +https://bugzilla.redhat.com/show_bug.cgi?id=1062955 +(cherry picked from commit 8f03fd08911016d8bbcad5892b2c07b30a4c2306) +--- + man/sysctl.d.xml | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/man/sysctl.d.xml b/man/sysctl.d.xml +index 5544283..00a857b 100644 +--- a/man/sysctl.d.xml ++++ b/man/sysctl.d.xml +@@ -103,6 +103,16 @@ + /dev/null in + /etc/sysctl.d/ bearing the + same filename. ++ ++ The settings configured with ++ sysctl.d files will be applied ++ early on boot. The network interface-specific options ++ will also be applied individually for each network ++ interface as it shows up in the system. (More ++ specifically, that is ++ net.ipv4.conf.*, ++ net.ipv6.conf.*, ++ net.ipv4.neigh.* and net.ipv6.neigh.*) + + + diff --git a/0302-journal-downgrade-vaccuum-message-to-debug-level.patch b/0302-journal-downgrade-vaccuum-message-to-debug-level.patch new file mode 100644 index 0000000..1822911 --- /dev/null +++ b/0302-journal-downgrade-vaccuum-message-to-debug-level.patch @@ -0,0 +1,24 @@ +From d5fdaa66bf7f31a49cc7938264aaedc9261f78ef Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Sun, 23 Feb 2014 17:05:37 +0100 +Subject: [PATCH] journal: downgrade vaccuum message to debug level + +https://bugzilla.redhat.com/show_bug.cgi?id=1047148 +(cherry picked from commit 3bb621e1e66b704c0c2dcef31c66f7c646dd47f6) +--- + src/journal/journal-vacuum.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/journal/journal-vacuum.c b/src/journal/journal-vacuum.c +index 8b07f65..695e518 100644 +--- a/src/journal/journal-vacuum.c ++++ b/src/journal/journal-vacuum.c +@@ -334,7 +334,7 @@ finish: + free(list[i].filename); + free(list); + +- log_info("Vacuuming done, freed %"PRIu64" bytes", freed); ++ log_debug("Vacuuming done, freed %"PRIu64" bytes", freed); + + return r; + } diff --git a/0303-core-gc-half-created-stub-units.patch b/0303-core-gc-half-created-stub-units.patch new file mode 100644 index 0000000..e572019 --- /dev/null +++ b/0303-core-gc-half-created-stub-units.patch @@ -0,0 +1,24 @@ +From 97a7eeadeee5bed4e219b56c3414d3d72504234a Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 24 Feb 2014 03:20:54 +0100 +Subject: [PATCH] core: gc half-created stub units + +(cherry picked from commit c35fa384d00dc5dc7d9f339113b015a3f8a5cf79) +--- + src/core/unit.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/core/unit.c b/src/core/unit.c +index 8e2a7c4..de34ddc 100644 +--- a/src/core/unit.c ++++ b/src/core/unit.c +@@ -249,9 +249,6 @@ int unit_set_description(Unit *u, const char *description) { + bool unit_check_gc(Unit *u) { + assert(u); + +- if (u->load_state == UNIT_STUB) +- return true; +- + if (UNIT_VTABLE(u)->no_gc) + return true; + diff --git a/0304-getty-generator-verify-ttys-before-we-make-use-of-th.patch b/0304-getty-generator-verify-ttys-before-we-make-use-of-th.patch new file mode 100644 index 0000000..631520d --- /dev/null +++ b/0304-getty-generator-verify-ttys-before-we-make-use-of-th.patch @@ -0,0 +1,77 @@ +From e485d9fa1e43c164a322cf4db11f511597d6e635 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Mon, 24 Feb 2014 03:59:50 +0100 +Subject: [PATCH] getty-generator: verify ttys before we make use of them + +The ttyS[0-3] devices are weird. They may be enumerated, but when one +actually tries to open and use them they return EIO, because they don't +actually exist. Because they may be enumerated they may be specified on +the kernel command line as console=. And some people do that as default. +As response to that we'll spawn a getty on the tty that will quickly +fail, and we retry a couple of time before giving up. That is quite +noisy. + +With this new change we will validate all serial terminals configured +with console= on the kernel cmdline before adding gettys on them, and +remove the invalid ones. THis should remove the noise later on. + +This should make Eric Paris happy! + +(cherry picked from commit 543407517e05688915128cfc544c5d7f97f240ef) +--- + src/getty-generator/getty-generator.c | 28 ++++++++++++++++++++++++++++ + 1 file changed, 28 insertions(+) + +diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c +index 40374b5..625a87e 100644 +--- a/src/getty-generator/getty-generator.c ++++ b/src/getty-generator/getty-generator.c +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + + #include "log.h" + #include "util.h" +@@ -86,6 +87,30 @@ static int add_serial_getty(const char *tty) { + return r; + } + ++static int verify_tty(const char *name) { ++ _cleanup_close_ int fd = -1; ++ const char *p; ++ ++ /* Some TTYs are weird and have been enumerated but don't work ++ * when you try to use them, such as classic ttyS0 and ++ * friends. Let's check that and open the device and run ++ * isatty() on it. */ ++ ++ p = strappenda("/dev/", name); ++ ++ /* O_NONBLOCK is essential here, to make sure we don't wait ++ * for DCD */ ++ fd = open(p, O_RDWR|O_NONBLOCK|O_NOCTTY|O_CLOEXEC|O_NOFOLLOW); ++ if (fd < 0) ++ return -errno; ++ ++ errno = 0; ++ if (isatty(fd) <= 0) ++ return errno ? -errno : -EIO; ++ ++ return 0; ++} ++ + int main(int argc, char *argv[]) { + + static const char virtualization_consoles[] = +@@ -146,6 +171,9 @@ int main(int argc, char *argv[]) { + continue; + } + ++ if (verify_tty(tty) < 0) ++ continue; ++ + /* We assume that gettys on virtual terminals are + * started via manual configuration and do this magic + * only for non-VC terminals. */ diff --git a/0305-units-serial-getty-.service-add-Install-section.patch b/0305-units-serial-getty-.service-add-Install-section.patch new file mode 100644 index 0000000..2a46d0a --- /dev/null +++ b/0305-units-serial-getty-.service-add-Install-section.patch @@ -0,0 +1,25 @@ +From e9327994f09d2b59dc51c322cdd9878c23181e2c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 24 Feb 2014 08:02:28 -0500 +Subject: [PATCH] units/serial-getty@.service: add [Install] section + +This makes it easier to manually enable and disable +specific gettys, and also mirrors getty@.service. + +http://lists.freedesktop.org/archives/systemd-devel/2014-February/017329.html +(cherry picked from commit 7143555ce8f94b002d06b9b058d7d90c3a4901a9) +--- + units/serial-getty@.service.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 +index e32c6b7..aea078f 100644 +--- a/units/serial-getty@.service.m4 ++++ b/units/serial-getty@.service.m4 +@@ -33,3 +33,6 @@ TTYVHangup=yes + KillMode=process + IgnoreSIGPIPE=no + SendSIGHUP=yes ++ ++[Install] ++WantedBy=getty.target diff --git a/0306-README-document-that-var-run-must-be-a-symlink-run.patch b/0306-README-document-that-var-run-must-be-a-symlink-run.patch new file mode 100644 index 0000000..8152222 --- /dev/null +++ b/0306-README-document-that-var-run-must-be-a-symlink-run.patch @@ -0,0 +1,29 @@ +From e3a2cced777977487ac7be6a199292fcda72ef36 Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 26 Feb 2014 02:54:37 +0100 +Subject: [PATCH] =?UTF-8?q?README:=20document=20that=20/var/run=20must=20b?= + =?UTF-8?q?e=20a=20symlink=20=E2=86=92=20/run?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(cherry picked from commit 47bc23c18cbc87471dc832534c8565625e4a9d16) +(cherry picked from commit 10acd244847eb8689e79efbf95475aef8818bb51) +--- + README | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/README b/README +index cf0a18d..fa433be 100644 +--- a/README ++++ b/README +@@ -189,6 +189,9 @@ WARNINGS: + about this, since this kind of file system setup is not really + supported anymore by the basic set of Linux OS components. + ++ systemd requires that the /run mount point exists. systemd also ++ requires that /var/run is a a symlink → /run. ++ + For more information on this issue consult + http://freedesktop.org/wiki/Software/systemd/separate-usr-is-broken + diff --git a/0307-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch b/0307-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch new file mode 100644 index 0000000..3bd5ff1 --- /dev/null +++ b/0307-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch @@ -0,0 +1,46 @@ +From 017c73f0c1112dd3e315173e35ba1bd357f6e5b4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 25 Feb 2014 21:26:31 -0500 +Subject: [PATCH] Use /var/run/dbus/system_bus_socket for the D-Bus socket + +(cherry picked from commit 1ae383a8a3ae4824453e297352fda603d2d3fd5e) +(cherry picked from commit d5194bbb174d0b9a87e81d465644624ab455bbf6) + +Conflicts: + man/systemd-bus-proxyd@.service.xml + src/libsystemd/sd-bus/PORTING-DBUS1 + src/shared/def.h + units/systemd-bus-proxyd.socket +--- + src/libsystemd-bus/sd-bus.c | 4 ++-- + src/stdio-bridge/stdio-bridge.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/libsystemd-bus/sd-bus.c b/src/libsystemd-bus/sd-bus.c +index db0880f..8dc3f6e 100644 +--- a/src/libsystemd-bus/sd-bus.c ++++ b/src/libsystemd-bus/sd-bus.c +@@ -972,8 +972,8 @@ int sd_bus_open_system(sd_bus **ret) { + goto fail; + } else { + b->sockaddr.un.sun_family = AF_UNIX; +- strncpy(b->sockaddr.un.sun_path, "/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); +- b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + sizeof("/run/dbus/system_bus_socket") - 1; ++ strncpy(b->sockaddr.un.sun_path, "/var/run/dbus/system_bus_socket", sizeof(b->sockaddr.un.sun_path)); ++ b->sockaddr_size = offsetof(struct sockaddr_un, sun_path) + strlen("/var/run/dbus/system_bus_socket"); + } + + b->bus_client = true; +diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c +index ab1a43a..f2a26c0 100644 +--- a/src/stdio-bridge/stdio-bridge.c ++++ b/src/stdio-bridge/stdio-bridge.c +@@ -62,7 +62,7 @@ int main(int argc, char *argv[]) { + goto finish; + } + +- r = sd_bus_set_address(a, "unix:path=/run/dbus/system_bus_socket"); ++ r = sd_bus_set_address(a, "unix:path=/var/run/dbus/system_bus_socket"); + if (r < 0) { + log_error("Failed to set address to connect to: %s", strerror(-r)); + goto finish; diff --git a/0308-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch b/0308-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch new file mode 100644 index 0000000..02225b6 --- /dev/null +++ b/0308-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch @@ -0,0 +1,74 @@ +From bd46db0b848f202fa11d876ecb0f48b982abfb3f Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 26 Feb 2014 04:27:50 +0100 +Subject: [PATCH] mount: don't send out PropertiesChanged message if actually + nothing got changed + +(cherry picked from commit ff5f34d08c191c326c41a083745522383ac86cae) + +Conflicts: + src/core/mount.c +--- + src/core/mount.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index c0445a6..0a0ef82 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -1412,9 +1412,10 @@ static int mount_add_one( + const char *fstype, + int passno, + bool set_flags) { ++ + int r; + Unit *u; +- bool delete; ++ bool delete, changed = false; + char *e, *w = NULL, *o = NULL, *f = NULL; + MountParameters *p; + bool load_extras = false; +@@ -1483,6 +1484,7 @@ static int mount_add_one( + } + + unit_add_to_load_queue(u); ++ changed = true; + } else { + delete = false; + free(e); +@@ -1502,6 +1504,7 @@ static int mount_add_one( + /* Load in the extras later on, after we + * finished initialization of the unit */ + load_extras = true; ++ changed = true; + } + } + +@@ -1513,10 +1516,16 @@ static int mount_add_one( + } + + p = &MOUNT(u)->parameters_proc_self_mountinfo; ++ ++ changed = changed || ++ !streq_ptr(p->options, options) || ++ !streq_ptr(p->what, what) || ++ !streq_ptr(p->fstype, fstype); ++ + if (set_flags) { + MOUNT(u)->is_mounted = true; + MOUNT(u)->just_mounted = !MOUNT(u)->from_proc_self_mountinfo; +- MOUNT(u)->just_changed = !streq_ptr(p->options, o); ++ MOUNT(u)->just_changed = changed; + } + + MOUNT(u)->from_proc_self_mountinfo = true; +@@ -1538,7 +1547,8 @@ static int mount_add_one( + goto fail; + } + +- unit_add_to_dbus_queue(u); ++ if (changed) ++ unit_add_to_dbus_queue(u); + + return 0; + diff --git a/0309-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch b/0309-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch new file mode 100644 index 0000000..5b5c3d4 --- /dev/null +++ b/0309-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch @@ -0,0 +1,49 @@ +From 672f89e96aa251c3174d340541609e100882172c Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 26 Feb 2014 04:28:37 +0100 +Subject: [PATCH] mount: don't fire PropertiesChanged signals for mounts that + are stopped + +(cherry picked from commit aef831369cd2a7a1bd4a58dd96ff8628ed6a85f9) +--- + src/core/mount.c | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index 0a0ef82..65ea3f9 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -1691,20 +1691,20 @@ void mount_fd_event(Manager *m, int events) { + Mount *mount = MOUNT(u); + + if (!mount->is_mounted) { +- /* This has just been unmounted. */ + + mount->from_proc_self_mountinfo = false; + + switch (mount->state) { + + case MOUNT_MOUNTED: ++ /* This has just been unmounted by ++ * somebody else, follow the state ++ * change. */ + mount_enter_dead(mount, MOUNT_SUCCESS); + break; + + default: +- mount_set_state(mount, mount->state); + break; +- + } + + } else if (mount->just_mounted || mount->just_changed) { +@@ -1715,6 +1715,9 @@ void mount_fd_event(Manager *m, int events) { + + case MOUNT_DEAD: + case MOUNT_FAILED: ++ /* This has just been mounted by ++ * somebody else, follow the state ++ * change. */ + mount_enter_mounted(mount, MOUNT_SUCCESS); + break; + diff --git a/0310-logs-show-fix-corrupt-output-with-empty-messages.patch b/0310-logs-show-fix-corrupt-output-with-empty-messages.patch new file mode 100644 index 0000000..4c182d1 --- /dev/null +++ b/0310-logs-show-fix-corrupt-output-with-empty-messages.patch @@ -0,0 +1,40 @@ +From 0f9825cc7807f1af6c12709b86c76b141f366630 Mon Sep 17 00:00:00 2001 +From: Uoti Urpala +Date: Thu, 20 Feb 2014 03:00:09 +0200 +Subject: [PATCH] logs-show: fix corrupt output with empty messages + +If a message had zero length, journalctl would print no newline, and +two output lines would be concatenated. Fix. The problem was +introduced in commit 31f7bf199452 ("logs-show: print multiline +messages"). Affected short and verbose output modes. + +Before fix: + +Feb 09 21:16:17 glyph dhclient[1323]: Feb 09 21:16:17 glyph NetworkManager[788]: (enp4s2): DHCPv4 state changed nbi -> preinit + +after: + +Feb 09 21:16:17 glyph dhclient[1323]: +Feb 09 21:16:17 glyph NetworkManager[788]: (enp4s2): DHCPv4 state changed nbi -> preinit + +(cherry picked from commit 47d80904a1f72d559962cc5ad32fffd46672a34a) +--- + src/shared/logs-show.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c +index 7bb19b4..91eefb3 100644 +--- a/src/shared/logs-show.c ++++ b/src/shared/logs-show.c +@@ -121,6 +121,11 @@ static bool print_multiline(FILE *f, unsigned prefix, unsigned n_columns, Output + } + } + ++ /* A special case: make sure that we print a newline when ++ the message is empty. */ ++ if (message_len == 0) ++ fputs("\n", f); ++ + for (pos = message; + pos < message + message_len; + pos = end + 1, line++) { diff --git a/0311-journalctl-refuse-extra-arguments-with-verify-and-si.patch b/0311-journalctl-refuse-extra-arguments-with-verify-and-si.patch new file mode 100644 index 0000000..bd005db --- /dev/null +++ b/0311-journalctl-refuse-extra-arguments-with-verify-and-si.patch @@ -0,0 +1,29 @@ +From 1aebc805e5f46fa03439f11a00f955a5031cd355 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 26 Feb 2014 23:01:43 -0500 +Subject: [PATCH] journalctl: refuse extra arguments with --verify and similar + +Positional arguments only make sense with the default action. +For other actions, complain instead of ignoring them silently. + +(cherry picked from commit 0b6b7c2004317da48e5bbd3078c5662d8f0061b6) +--- + src/journal/journalctl.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c +index 5b0be27..6f52467 100644 +--- a/src/journal/journalctl.c ++++ b/src/journal/journalctl.c +@@ -646,6 +646,11 @@ static int parse_argv(int argc, char *argv[]) { + return -EINVAL; + } + ++ if (arg_action != ACTION_SHOW && optind < argc) { ++ log_error("Extraneous arguments starting with '%s'", argv[optind]); ++ return -EINVAL; ++ } ++ + return 1; + } + diff --git a/0312-cdrom_id-use-the-old-MMC-fallback.patch b/0312-cdrom_id-use-the-old-MMC-fallback.patch new file mode 100644 index 0000000..1aa5073 --- /dev/null +++ b/0312-cdrom_id-use-the-old-MMC-fallback.patch @@ -0,0 +1,52 @@ +From 34a3cc7eabb3777bcf118e895668259ae0ffa770 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Thu, 27 Feb 2014 11:06:37 +0100 +Subject: [PATCH] cdrom_id: use the old MMC fallback + +https://bugzilla.redhat.com/show_bug.cgi?id=1038015 +The problem seems to be that the your virtual DVD is emulating a really +old DVD device, and doing it kind of strangely. + +> dracut:# /lib/udev/cdrom_id --debug /dev/sr0 +> probing: '/dev/sr0' +> INQUIRY: [IMM ][Virtual CD/DVD ][0316] +> GET CONFIGURATION failed with SK=5h/ASC=24h/ACQ=00h + +So your virtual drive rejects the GET CONFIGURATION command as illegal. + +Other pre-MMC2 drives that don't accept this command usually return the +error +SK=5h,ASC=20h (invalid/unsupported command code), in which case cdrom_id +tries an older method, and then ID_CDROM_MEDIA_TRACK_COUNT_DATA gets set +and all the /dev/disk/by-label (etc) links get set up. + +The virtual drive returns the error SK=5h,ASC=24h (invalid field in +Command Descriptor Block), which cdrom_id doesn't handle, so it gives up +and the links never get made. + +The ideal solution would be to make the IMM to emulate a device that's +less than 15 years old, but I'm not going to hold my breath waiting for +that. + +So probably cdrom_id should also use the old MMC fallback when the error +is SK=5h,ASC=24h, and then all of this would work as expected. + +Suggested-by:Luca Miccini +(cherry picked from commit a14f14976094650e17d39f3a7d15a1c68c93c333) +--- + src/udev/cdrom_id/cdrom_id.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c +index 1fc0dfa..dac35a6 100644 +--- a/src/udev/cdrom_id/cdrom_id.c ++++ b/src/udev/cdrom_id/cdrom_id.c +@@ -555,7 +555,7 @@ static int cd_profiles(struct udev *udev, int fd) + if ((err != 0)) { + info_scsi_cmd_err(udev, "GET CONFIGURATION", err); + /* handle pre-MMC2 drives which do not support GET CONFIGURATION */ +- if (SK(err) == 0x5 && ASC(err) == 0x20) { ++ if (SK(err) == 0x5 && (ASC(err) == 0x20 || ASC(err) == 0x24)) { + log_debug("drive is pre-MMC2 and does not support 46h get configuration command"); + log_debug("trying to work around the problem"); + ret = cd_profiles_old_mmc(udev, fd); diff --git a/0313-udev-rules-setup-tty-permissions-and-group-for-sclp_.patch b/0313-udev-rules-setup-tty-permissions-and-group-for-sclp_.patch new file mode 100644 index 0000000..715470d --- /dev/null +++ b/0313-udev-rules-setup-tty-permissions-and-group-for-sclp_.patch @@ -0,0 +1,25 @@ +From dd3afc0c52462d845b2939e4beb343fbe9548e3a Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Thu, 27 Feb 2014 11:19:09 +0100 +Subject: [PATCH] udev/rules: setup tty permissions and group for sclp_line, + ttysclp and 3270/tty + +(cherry picked from commit c594cccee264cfd98f183ae6ec289b11e70f2d6c) +--- + rules/50-udev-default.rules | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/rules/50-udev-default.rules b/rules/50-udev-default.rules +index 679dfdf..0bccf67 100644 +--- a/rules/50-udev-default.rules ++++ b/rules/50-udev-default.rules +@@ -15,6 +15,9 @@ ACTION!="add", GOTO="default_permissions_end" + SUBSYSTEM=="tty", KERNEL=="ptmx", GROUP="tty", MODE="0666" + SUBSYSTEM=="tty", KERNEL=="tty", GROUP="tty", MODE="0666" + SUBSYSTEM=="tty", KERNEL=="tty[0-9]*", GROUP="tty", MODE="0620" ++SUBSYSTEM=="tty", KERNEL=="sclp_line[0-9]*", GROUP="tty", MODE="0620" ++SUBSYSTEM=="tty", KERNEL=="ttysclp[0-9]*", GROUP="tty", MODE="0620" ++SUBSYSTEM=="tty", KERNEL=="3270/tty[0-9]*", GROUP="tty", MODE="0620" + SUBSYSTEM=="vc", KERNEL=="vcs*|vcsa*", GROUP="tty" + KERNEL=="tty[A-Z]*[0-9]|pppox[0-9]*|ircomm[0-9]*|noz[0-9]*|rfcomm[0-9]*", GROUP="dialout" + diff --git a/0314-bash-add-completion-for-systemd-nspawn.patch b/0314-bash-add-completion-for-systemd-nspawn.patch new file mode 100644 index 0000000..da239f2 --- /dev/null +++ b/0314-bash-add-completion-for-systemd-nspawn.patch @@ -0,0 +1,120 @@ +From a18b0404be6c4b84d556479c0fbb8691dd9792e1 Mon Sep 17 00:00:00 2001 +From: Thomas Andersen +Date: Sat, 1 Mar 2014 03:27:49 +0100 +Subject: [PATCH] bash: add completion for systemd-nspawn + +(cherry picked from commit 0d6883b6a870b66c8c70e43695d22de96aab68e7) +--- + Makefile.am | 1 + + shell-completion/bash/systemd-nspawn | 90 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 91 insertions(+) + create mode 100644 shell-completion/bash/systemd-nspawn + +diff --git a/Makefile.am b/Makefile.am +index 703925a..03a1f91 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -343,6 +343,7 @@ dist_bashcompletion_DATA = \ + shell-completion/bash/systemctl \ + shell-completion/bash/systemd-analyze \ + shell-completion/bash/systemd-delta \ ++ shell-completion/bash/systemd-nspawn \ + shell-completion/bash/systemd-run \ + shell-completion/bash/udevadm \ + shell-completion/bash/kernel-install +diff --git a/shell-completion/bash/systemd-nspawn b/shell-completion/bash/systemd-nspawn +new file mode 100644 +index 0000000..0e8a30c +--- /dev/null ++++ b/shell-completion/bash/systemd-nspawn +@@ -0,0 +1,90 @@ ++# systemd-nspawn(1) completion -*- shell-script -*- ++# ++# This file is part of systemd. ++# ++# Copyright 2014 Thomas H.P. Andersen ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word() { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++__get_users() { ++ local a b ++ loginctl list-users --no-legend --no-pager | { while read a b; do echo " $b"; done; }; ++} ++ ++__get_slices() { ++ local a b ++ systemctl list-units -t slice --no-legend --no-pager | { while read a b; do echo " $a"; done; }; ++} ++ ++_systemd_nspawn() { ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} ++ local i verb comps ++ ++ local -A OPTS=( ++ [STANDALONE]='-h --help --version --private-network -b --boot --read-only -q --quiet --share-system --keep-unit --network-veth -j' ++ [ARG]='-D --directory -u --user --uuid --capability --drop-capability --link-journal --bind --bind-ro -M --machine ++ -S --slice' ++ ) ++ ++ _init_completion || return ++ ++ if __contains_word "$prev" ${OPTS[ARG]}; then ++ case $prev in ++ --directory|-D) ++ comps=$(compgen -A directory -- "$cur" ) ++ ;; ++ --user|-u) ++ comps=$( __get_users ) ++ ;; ++ --uuid) ++ comps='' ++ ;; ++ --capability) ++ comps='CAP_BLOCK_SUSPEND CAP_IPC_LOCK CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_MODULE CAP_SYS_PACCT CAP_SYS_RAWIO ++ CAP_SYS_TIME CAP_SYSLOG CAP_WAKE_ALARM CAP_NET_ADMIN' ++ ;; ++ --drop-capability) ++ comps='CAP_AUDIT_CONTROL CAP_AUDIT_WRITE CAP_CHOWN CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_FSETID ++ CAP_IPC_OWNER CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE CAP_MKNOD CAP_NET_ADMIN CAP_NET_BIND_SERVICE ++ CAP_NET_BROADCAST CAP_NET_RAW CAP_SETFCAP CAP_SETGID CAP_SETPCAP CAP_SETUID CAP_SYS_ADMIN CAP_SYS_BOOT ++ CAP_SYS_CHROOT CAP_SYS_NICE CAP_SYS_PTRACE CAP_SYS_RESOURCE CAP_SYS_TTY_CONFIG' ++ ;; ++ --link-journal) ++ comps='no auto guest host' ++ ;; ++ --bind|--bind-ro) ++ comps='' ++ ;; ++ --machine|-M) ++ comps='' ++ ;; ++ --slice|-S) ++ comps=$( __get_slices ) ++ ;; ++ esac ++ COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) ++ return 0 ++ fi ++ ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++} ++ ++complete -F _systemd_nspawn systemd-nspawn diff --git a/0315-add-bash-completion-for-systemd-cgls.patch b/0315-add-bash-completion-for-systemd-cgls.patch new file mode 100644 index 0000000..5c1e44c --- /dev/null +++ b/0315-add-bash-completion-for-systemd-cgls.patch @@ -0,0 +1,86 @@ +From 7d6ed8b92b7490ddf419d2782d3d8a0d6f827cc7 Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Sat, 1 Mar 2014 23:08:38 +0100 +Subject: [PATCH] add bash completion for systemd-cgls + +(cherry picked from commit abdab4f602745952030a37b1521cd0374d51d3ea) +--- + Makefile.am | 1 + + shell-completion/bash/systemd-cgls | 56 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 57 insertions(+) + create mode 100644 shell-completion/bash/systemd-cgls + +diff --git a/Makefile.am b/Makefile.am +index 03a1f91..d4a65e7 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -342,6 +342,7 @@ dist_bashcompletion_DATA = \ + shell-completion/bash/journalctl \ + shell-completion/bash/systemctl \ + shell-completion/bash/systemd-analyze \ ++ shell-completion/bash/systemd-cgls \ + shell-completion/bash/systemd-delta \ + shell-completion/bash/systemd-nspawn \ + shell-completion/bash/systemd-run \ +diff --git a/shell-completion/bash/systemd-cgls b/shell-completion/bash/systemd-cgls +new file mode 100644 +index 0000000..0570438 +--- /dev/null ++++ b/shell-completion/bash/systemd-cgls +@@ -0,0 +1,56 @@ ++# systemd-cgls(1) completion -*- shell-script -*- ++# ++# This file is part of systemd. ++# ++# Copyright 2014 Thomas H.P. Andersen ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word() { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++__get_machines() { ++ local a b ++ machinectl list --no-legend --no-pager | { while read a b; do echo " $a"; done; }; ++} ++ ++_systemd_cgls() { ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} ++ local i verb comps ++ ++ local -A OPTS=( ++ [STANDALONE]='-h --help --version --all -l --full -k --no-pager' ++ [ARG]='-M --machine' ++ ) ++ ++ _init_completion || return ++ ++ if __contains_word "$prev" ${OPTS[ARG]}; then ++ case $prev in ++ --machine|-M) ++ comps=$( __get_machines ) ++ ;; ++ esac ++ COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) ++ return 0 ++ fi ++ ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++} ++ ++complete -F _systemd_cgls systemd-cgls diff --git a/0316-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0316-hwdb-Update-database-of-Bluetooth-company-identifier.patch new file mode 100644 index 0000000..b8c6a93 --- /dev/null +++ b/0316-hwdb-Update-database-of-Bluetooth-company-identifier.patch @@ -0,0 +1,58 @@ +From 455624a164ba0a50a78fbac659efeca26f1bc507 Mon Sep 17 00:00:00 2001 +From: Marcel Holtmann +Date: Fri, 21 Feb 2014 21:41:01 -0800 +Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers + +(cherry picked from commit 4b28cdeb2332cfbd3f5172b43a2f5f534b7e6e57) +--- + hwdb/20-bluetooth-vendor-product.hwdb | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb +index 6a9dc50..db3bc24 100644 +--- a/hwdb/20-bluetooth-vendor-product.hwdb ++++ b/hwdb/20-bluetooth-vendor-product.hwdb +@@ -630,6 +630,9 @@ bluetooth:v00CE* + bluetooth:v00CF* + ID_VENDOR_FROM_DATABASE=ARCHOS SA + ++bluetooth:v00D0* ++ ID_VENDOR_FROM_DATABASE=Dexcom, Inc. ++ + bluetooth:v00D1* + ID_VENDOR_FROM_DATABASE=Polar Electro Europe B.V. + +@@ -869,3 +872,33 @@ bluetooth:v011F* + + bluetooth:v0120* + ID_VENDOR_FROM_DATABASE=Porsche AG ++ ++bluetooth:v0121* ++ ID_VENDOR_FROM_DATABASE=Sino Wealth Electronic Ltd. ++ ++bluetooth:v0122* ++ ID_VENDOR_FROM_DATABASE=AirTurn, Inc. ++ ++bluetooth:v0123* ++ ID_VENDOR_FROM_DATABASE=Kinsa, Inc. ++ ++bluetooth:v0124* ++ ID_VENDOR_FROM_DATABASE=HID Global ++ ++bluetooth:v0125* ++ ID_VENDOR_FROM_DATABASE=SEAT es ++ ++bluetooth:v0126* ++ ID_VENDOR_FROM_DATABASE=Promethean Ltd. ++ ++bluetooth:v0127* ++ ID_VENDOR_FROM_DATABASE=Salutica Allied Solutions ++ ++bluetooth:v0128* ++ ID_VENDOR_FROM_DATABASE=GPSI Group Pty Ltd ++ ++bluetooth:v0129* ++ ID_VENDOR_FROM_DATABASE=Nimble Devices Oy ++ ++bluetooth:v012A* ++ ID_VENDOR_FROM_DATABASE=Changzhou Yongse Infotech Co., Ltd diff --git a/0317-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0317-hwdb-Update-database-of-Bluetooth-company-identifier.patch new file mode 100644 index 0000000..0df6fb1 --- /dev/null +++ b/0317-hwdb-Update-database-of-Bluetooth-company-identifier.patch @@ -0,0 +1,27 @@ +From 33b2fe7716b465418f956f0ec4292e7ae95c0bbd Mon Sep 17 00:00:00 2001 +From: Marcel Holtmann +Date: Sun, 2 Mar 2014 10:02:10 -0800 +Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers + +(cherry picked from commit e525326bd07ebf3cabcfd730bc479166723f2d44) +--- + hwdb/20-bluetooth-vendor-product.hwdb | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/hwdb/20-bluetooth-vendor-product.hwdb b/hwdb/20-bluetooth-vendor-product.hwdb +index db3bc24..0335a71 100644 +--- a/hwdb/20-bluetooth-vendor-product.hwdb ++++ b/hwdb/20-bluetooth-vendor-product.hwdb +@@ -902,3 +902,12 @@ bluetooth:v0129* + + bluetooth:v012A* + ID_VENDOR_FROM_DATABASE=Changzhou Yongse Infotech Co., Ltd ++ ++bluetooth:v012B* ++ ID_VENDOR_FROM_DATABASE=SportIQ ++ ++bluetooth:v012C* ++ ID_VENDOR_FROM_DATABASE=TEMEC Instruments B.V. ++ ++bluetooth:v012D* ++ ID_VENDOR_FROM_DATABASE=Sony Corporation diff --git a/0318-Allow-fractional-parts-in-disk-sizes.patch b/0318-Allow-fractional-parts-in-disk-sizes.patch new file mode 100644 index 0000000..bea605b --- /dev/null +++ b/0318-Allow-fractional-parts-in-disk-sizes.patch @@ -0,0 +1,64 @@ +From f8e71de7270d91d18f93af0e6fd1c92a571bae04 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Sun, 2 Mar 2014 00:05:16 -0500 +Subject: [PATCH] Allow fractional parts in disk sizes + +It seems natural to be able to say SystemMaxUsage=1.5G. + +https://bugzilla.redhat.com/show_bug.cgi?id=1047568 +(cherry picked from commit 9480794b277b5ce33e467578ed669996df576bb9) + +Conflicts: + src/test/test-util.c +--- + src/shared/util.c | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) + +diff --git a/src/shared/util.c b/src/shared/util.c +index 7500779..e754747 100644 +--- a/src/shared/util.c ++++ b/src/shared/util.c +@@ -2285,6 +2285,8 @@ int parse_bytes(const char *t, off_t *bytes) { + p = t; + do { + long long l; ++ unsigned long long l2; ++ double frac = 0; + char *e; + unsigned i; + +@@ -2300,14 +2302,32 @@ int parse_bytes(const char *t, off_t *bytes) { + if (e == p) + return -EINVAL; + ++ if (*e == '.') { ++ e++; ++ if (*e >= '0' && *e <= '9') { ++ char *e2; ++ ++ /* strotoull itself would accept space/+/- */ ++ l2 = strtoull(e, &e2, 10); ++ ++ if (errno == ERANGE) ++ return -errno; ++ ++ /* Ignore failure. E.g. 10.M is valid */ ++ frac = l2; ++ for (; e < e2; e++) ++ frac /= 10; ++ } ++ } ++ + e += strspn(e, WHITESPACE); + + for (i = 0; i < ELEMENTSOF(table); i++) + if (startswith(e, table[i].suffix)) { + unsigned long long tmp; +- if ((unsigned long long) l > ULLONG_MAX / table[i].factor) ++ if ((unsigned long long) l + (frac > 0) > ULLONG_MAX / table[i].factor) + return -ERANGE; +- tmp = l * table[i].factor; ++ tmp = l * table[i].factor + (unsigned long long) (frac * table[i].factor); + if (tmp > ULLONG_MAX - r) + return -ERANGE; + diff --git a/0319-add-bash-completion-for-systemd-cgtop.patch b/0319-add-bash-completion-for-systemd-cgtop.patch new file mode 100644 index 0000000..9f1dcd8 --- /dev/null +++ b/0319-add-bash-completion-for-systemd-cgtop.patch @@ -0,0 +1,70 @@ +From 6772933b7fa165529e2f33bda183b931beeefc83 Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Sun, 2 Mar 2014 22:58:18 +0100 +Subject: [PATCH] add bash completion for systemd-cgtop + +(cherry picked from commit d9256bac4da4241cb5d97960c899390839f2c6e5) +--- + Makefile.am | 1 + + shell-completion/bash/systemd-cgtop | 40 +++++++++++++++++++++++++++++++++++++ + 2 files changed, 41 insertions(+) + create mode 100644 shell-completion/bash/systemd-cgtop + +diff --git a/Makefile.am b/Makefile.am +index d4a65e7..64d44ce 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -343,6 +343,7 @@ dist_bashcompletion_DATA = \ + shell-completion/bash/systemctl \ + shell-completion/bash/systemd-analyze \ + shell-completion/bash/systemd-cgls \ ++ shell-completion/bash/systemd-cgtop \ + shell-completion/bash/systemd-delta \ + shell-completion/bash/systemd-nspawn \ + shell-completion/bash/systemd-run \ +diff --git a/shell-completion/bash/systemd-cgtop b/shell-completion/bash/systemd-cgtop +new file mode 100644 +index 0000000..d7ea42d +--- /dev/null ++++ b/shell-completion/bash/systemd-cgtop +@@ -0,0 +1,40 @@ ++# systemd-cgtop(1) completion -*- shell-script -*- ++# ++# This file is part of systemd. ++# ++# Copyright 2014 Thomas H.P. Andersen ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word() { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++_systemd_cgtop() { ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} ++ local comps ++ ++ local -A OPTS=( ++ [STANDALONE]='-h --help --version -p -t -c -m -i -b --batch -n --iterations -d --delay' ++ ) ++ ++ _init_completion || return ++ ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++} ++ ++complete -F _systemd_cgtop systemd-cgtop diff --git a/0320-execute-free-directory-path-if-we-fail-to-remove-it-.patch b/0320-execute-free-directory-path-if-we-fail-to-remove-it-.patch new file mode 100644 index 0000000..b220c4d --- /dev/null +++ b/0320-execute-free-directory-path-if-we-fail-to-remove-it-.patch @@ -0,0 +1,33 @@ +From b0e7aa5558ff540de8d61c3756a9a0999bc4b1e3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 5 Mar 2014 00:44:23 -0500 +Subject: [PATCH] execute: free directory path if we fail to remove it because + we cannot allocate a thread + +Based on 98b47d54ce946ad3524f84eb38d2413498a333dc. +--- + src/core/execute.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/src/core/execute.c b/src/core/execute.c +index 9b85379..ee445d7 100644 +--- a/src/core/execute.c ++++ b/src/core/execute.c +@@ -1611,10 +1611,16 @@ void exec_context_tmp_dirs_done(ExecContext *c) { + c->tmp_dir ? c->var_tmp_dir : NULL, + NULL}; + char **dirp; ++ int r; + + for(dirp = dirs; *dirp; dirp++) { + log_debug("Spawning thread to nuke %s", *dirp); +- asynchronous_job(remove_tmpdir_thread, *dirp); ++ ++ r = asynchronous_job(remove_tmpdir_thread, *dirp); ++ if (r < 0) { ++ log_warning("Failed to nuke %s: %s", *dirp, strerror(-r)); ++ free(*dirp); ++ } + } + + c->tmp_dir = c->var_tmp_dir = NULL; diff --git a/0321-add-bash-completion-for-systemd-detect-virt.patch b/0321-add-bash-completion-for-systemd-detect-virt.patch new file mode 100644 index 0000000..c5cc392 --- /dev/null +++ b/0321-add-bash-completion-for-systemd-detect-virt.patch @@ -0,0 +1,70 @@ +From 838c834403dc9aeed0b9c579a2d28982f5067067 Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Mon, 3 Mar 2014 22:16:04 +0100 +Subject: [PATCH] add bash completion for systemd-detect-virt + +(cherry picked from commit 3bfe58cbd4a9b1d2520f425f95de718f3a583d39) +--- + Makefile.am | 1 + + shell-completion/bash/systemd-detect-virt | 40 +++++++++++++++++++++++++++++++ + 2 files changed, 41 insertions(+) + create mode 100644 shell-completion/bash/systemd-detect-virt + +diff --git a/Makefile.am b/Makefile.am +index 64d44ce..dafc428 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -345,6 +345,7 @@ dist_bashcompletion_DATA = \ + shell-completion/bash/systemd-cgls \ + shell-completion/bash/systemd-cgtop \ + shell-completion/bash/systemd-delta \ ++ shell-completion/bash/systemd-detect-virt \ + shell-completion/bash/systemd-nspawn \ + shell-completion/bash/systemd-run \ + shell-completion/bash/udevadm \ +diff --git a/shell-completion/bash/systemd-detect-virt b/shell-completion/bash/systemd-detect-virt +new file mode 100644 +index 0000000..df06c29 +--- /dev/null ++++ b/shell-completion/bash/systemd-detect-virt +@@ -0,0 +1,40 @@ ++# systemd-detect-virt(1) completion -*- shell-script -*- ++# ++# This file is part of systemd. ++# ++# Copyright 2014 Thomas H.P. Andersen ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word() { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++_systemd_detect_virt() { ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} ++ local i verb comps ++ ++ local -A OPTS=( ++ [STANDALONE]='-h --help --version -c --container -v --vm -q --quiet' ++ ) ++ ++ _init_completion || return ++ ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++} ++ ++complete -F _systemd_detect_virt systemd-detect-virt diff --git a/0322-Do-not-print-invalid-UTF-8-in-error-messages.patch b/0322-Do-not-print-invalid-UTF-8-in-error-messages.patch new file mode 100644 index 0000000..901c8e1 --- /dev/null +++ b/0322-Do-not-print-invalid-UTF-8-in-error-messages.patch @@ -0,0 +1,123 @@ +From b189ee91c9f1ff74dd2c025dcad1e1f87d30b533 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 4 Mar 2014 09:50:26 -0500 +Subject: [PATCH] Do not print invalid UTF-8 in error messages + +Inexplicably, 550a40ec ('core: do not print invalid utf-8 in error +messages') only fixed two paths. Convert all of them now. + +(cherry picked from commit b5d742138f71e87312541a89aac5657015f50f48) + +Conflicts: + src/core/load-fragment.c + src/shared/conf-parser.c +--- + src/core/load-fragment.c | 11 +++-------- + src/shared/conf-parser.c | 6 ++---- + src/shared/conf-parser.h | 6 ++++++ + src/shared/fileio.c | 9 ++++++--- + 4 files changed, 17 insertions(+), 15 deletions(-) + +diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c +index f01843d..d6ac4f6 100644 +--- a/src/core/load-fragment.c ++++ b/src/core/load-fragment.c +@@ -515,9 +515,7 @@ int config_parse_exec(const char *unit, + } + + if (!utf8_is_valid(path)) { +- log_syntax(unit, LOG_ERR, filename, line, EINVAL, +- "Path is not UTF-8 clean, ignoring assignment: %s", +- rvalue); ++ log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue); + r = 0; + goto fail; + } +@@ -532,9 +530,7 @@ int config_parse_exec(const char *unit, + } + + if (!utf8_is_valid(c)) { +- log_syntax(unit, LOG_ERR, filename, line, EINVAL, +- "Path is not UTF-8 clean, ignoring assignment: %s", +- rvalue); ++ log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue); + r = 0; + goto fail; + } +@@ -1803,8 +1799,7 @@ int config_parse_unit_requires_mounts_for( + return log_oom(); + + if (!utf8_is_valid(n)) { +- log_syntax(unit, LOG_ERR, filename, line, EINVAL, +- "Path is not UTF-8 clean, ignoring assignment: %s", rvalue); ++ log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue); + continue; + } + +diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c +index 6085d33..4ac71ed 100644 +--- a/src/shared/conf-parser.c ++++ b/src/shared/conf-parser.c +@@ -607,8 +607,7 @@ int config_parse_path(const char *unit, + assert(data); + + if (!utf8_is_valid(rvalue)) { +- log_syntax(unit, LOG_ERR, filename, line, EINVAL, +- "Path is not UTF-8 clean, ignoring assignment: %s", rvalue); ++ log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue); + return 0; + } + +@@ -675,8 +674,7 @@ int config_parse_strv(const char *unit, + return log_oom(); + + if (!utf8_is_valid(n)) { +- log_syntax(unit, LOG_ERR, filename, line, EINVAL, +- "String is not UTF-8 clean, ignoring: %s", rvalue); ++ log_invalid_utf8(unit, LOG_ERR, filename, line, EINVAL, rvalue); + continue; + } + +diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h +index 08428a5..247e562 100644 +--- a/src/shared/conf-parser.h ++++ b/src/shared/conf-parser.h +@@ -122,6 +122,12 @@ int log_syntax_internal(const char *unit, int level, + config_file, config_line, \ + error, __VA_ARGS__) + ++#define log_invalid_utf8(unit, level, config_file, config_line, error, rvalue) { \ ++ _cleanup_free_ char *__p = utf8_escape_invalid(rvalue); \ ++ log_syntax(unit, level, config_file, config_line, error, \ ++ "String is not UTF-8 clean, ignoring assignment: %s", __p); \ ++ } ++ + #define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg) \ + int function(const char *unit, \ + const char *filename, \ +diff --git a/src/shared/fileio.c b/src/shared/fileio.c +index 121cd57..0586e33 100644 +--- a/src/shared/fileio.c ++++ b/src/shared/fileio.c +@@ -526,15 +526,18 @@ static int load_env_file_push(const char *filename, unsigned line, + int r; + + if (!utf8_is_valid(key)) { ++ _cleanup_free_ char *t = utf8_escape_invalid(key); ++ + log_error("%s:%u: invalid UTF-8 for key '%s', ignoring.", +- filename, line, key); ++ filename, line, t); + return -EINVAL; + } + + if (value && !utf8_is_valid(value)) { +- /* FIXME: filter UTF-8 */ ++ _cleanup_free_ char *t = utf8_escape_invalid(value); ++ + log_error("%s:%u: invalid UTF-8 value for key %s: '%s', ignoring.", +- filename, line, key, value); ++ filename, line, key, t); + return -EINVAL; + } + diff --git a/0323-add-bash-completion-for-systemd-cat.patch b/0323-add-bash-completion-for-systemd-cat.patch new file mode 100644 index 0000000..d526611 --- /dev/null +++ b/0323-add-bash-completion-for-systemd-cat.patch @@ -0,0 +1,87 @@ +From 1c01cf8b9d2adfb25694fa3f317d7afa2eb8783c Mon Sep 17 00:00:00 2001 +From: Thomas Hindoe Paaboel Andersen +Date: Tue, 4 Mar 2014 23:16:30 +0100 +Subject: [PATCH] add bash completion for systemd-cat + +(cherry picked from commit 207017017db91232189226bfcf29e61926310a9b) +--- + Makefile.am | 1 + + shell-completion/bash/systemd-cat | 57 +++++++++++++++++++++++++++++++++++++++ + 2 files changed, 58 insertions(+) + create mode 100644 shell-completion/bash/systemd-cat + +diff --git a/Makefile.am b/Makefile.am +index dafc428..df476ce 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -342,6 +342,7 @@ dist_bashcompletion_DATA = \ + shell-completion/bash/journalctl \ + shell-completion/bash/systemctl \ + shell-completion/bash/systemd-analyze \ ++ shell-completion/bash/systemd-cat \ + shell-completion/bash/systemd-cgls \ + shell-completion/bash/systemd-cgtop \ + shell-completion/bash/systemd-delta \ +diff --git a/shell-completion/bash/systemd-cat b/shell-completion/bash/systemd-cat +new file mode 100644 +index 0000000..8d84042 +--- /dev/null ++++ b/shell-completion/bash/systemd-cat +@@ -0,0 +1,57 @@ ++# systemd-cat(1) completion -*- shell-script -*- ++# ++# This file is part of systemd. ++# ++# Copyright 2014 Thomas H.P. Andersen ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU Lesser General Public License as published by ++# the Free Software Foundation; either version 2.1 of the License, or ++# (at your option) any later version. ++# ++# systemd is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++# General Public License for more details. ++# ++# You should have received a copy of the GNU Lesser General Public License ++# along with systemd; If not, see . ++ ++__contains_word() { ++ local w word=$1; shift ++ for w in "$@"; do ++ [[ $w = "$word" ]] && return ++ done ++} ++ ++_systemd_cat() { ++ local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]} ++ local i verb comps ++ ++ local -A OPTS=( ++ [STANDALONE]='-h --help --version' ++ [ARG]='-t --identifier -p --priority --level-prefix' ++ ) ++ ++ _init_completion || return ++ ++ if __contains_word "$prev" ${OPTS[ARG]}; then ++ case $prev in ++ --identifier|-t) ++ comps='' ++ ;; ++ --priority|-p) ++ comps='emerg alert crit err warning notice info debug' ++ ;; ++ --level-prefix) ++ comps='yes no' ++ ;; ++ esac ++ COMPREPLY=( $(compgen -W '$comps' -- "$cur") ) ++ return 0 ++ fi ++ ++ COMPREPLY=( $(compgen -W '${OPTS[*]}' -- "$cur") ) ++} ++ ++complete -F _systemd_cat systemd-cat diff --git a/0324-journal-assume-that-next-entry-is-after-previous-ent.patch b/0324-journal-assume-that-next-entry-is-after-previous-ent.patch new file mode 100644 index 0000000..7febcfc --- /dev/null +++ b/0324-journal-assume-that-next-entry-is-after-previous-ent.patch @@ -0,0 +1,68 @@ +From e649fb0f7b9493b92434ca9e19dbcc7125fd9420 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Thu, 27 Feb 2014 00:07:29 -0500 +Subject: [PATCH] journal: assume that next entry is after previous entry + +With a corrupted file, we can get in a situation where two entries +in the entry array point to the same object. Then journal_file_next_entry +will find the first one using generic_arrray_bisect, and try to move to +the second one, but since the address is the same, generic_array_get will +return the first one. journal_file_next_entry ends up in an infinite loop. + +https://bugzilla.redhat.com/show_bug.cgi?id=1047039 +(cherry picked from commit fb099c8d2af6620db2709e826a258089d10cdfe8) +--- + src/journal/journal-file.c | 26 ++++++++++++++++++++------ + 1 file changed, 20 insertions(+), 6 deletions(-) + +diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c +index 4d9787a..57ded0a 100644 +--- a/src/journal/journal-file.c ++++ b/src/journal/journal-file.c +@@ -1359,7 +1359,7 @@ int journal_file_append_entry(JournalFile *f, const dual_timestamp *ts, const st + } + + typedef struct ChainCacheItem { +- uint64_t first; /* the array at the begin of the chain */ ++ uint64_t first; /* the array at the beginning of the chain */ + uint64_t array; /* the cached array */ + uint64_t begin; /* the first item in the cached array */ + uint64_t total; /* the total number of items in all arrays before this one in the chain */ +@@ -1945,7 +1945,7 @@ int journal_file_next_entry( + direction_t direction, + Object **ret, uint64_t *offset) { + +- uint64_t i, n; ++ uint64_t i, n, ofs; + int r; + + assert(f); +@@ -1986,10 +1986,24 @@ int journal_file_next_entry( + } + + /* And jump to it */ +- return generic_array_get(f, +- le64toh(f->header->entry_array_offset), +- i, +- ret, offset); ++ r = generic_array_get(f, ++ le64toh(f->header->entry_array_offset), ++ i, ++ ret, &ofs); ++ if (r <= 0) ++ return r; ++ ++ if (p > 0 && ++ (direction == DIRECTION_DOWN ? ofs <= p : ofs >= p)) { ++ log_debug("%s: entry array corrupted at entry %"PRIu64, ++ f->path, i); ++ return -EBADMSG; ++ } ++ ++ if (offset) ++ *offset = ofs; ++ ++ return 1; + } + + int journal_file_skip_entry( diff --git a/0325-journal-forget-file-after-encountering-an-error.patch b/0325-journal-forget-file-after-encountering-an-error.patch new file mode 100644 index 0000000..de00c2b --- /dev/null +++ b/0325-journal-forget-file-after-encountering-an-error.patch @@ -0,0 +1,73 @@ +From d53f421adfe975b86bf1a7f08053acc9b2d17310 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Thu, 27 Feb 2014 00:11:54 -0500 +Subject: [PATCH] journal: forget file after encountering an error + +If we encounter an inconsistency in a file, let's just +ignore it. Otherwise, after previous patch, we would try, +and fail, to use this file in every invocation of sd_journal_next +or sd_journal_previous that happens afterwards. + +(cherry picked from commit a9a245c128af6c0418085062c60251bc51fa4a94) +--- + src/journal/sd-journal.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) + +diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c +index b1bd61f..661257b 100644 +--- a/src/journal/sd-journal.c ++++ b/src/journal/sd-journal.c +@@ -50,6 +50,8 @@ + + #define DEFAULT_DATA_THRESHOLD (64*1024) + ++static void remove_file_real(sd_journal *j, JournalFile *f); ++ + static bool journal_pid_changed(sd_journal *j) { + assert(j); + +@@ -895,6 +897,7 @@ static int real_journal_next(sd_journal *j, direction_t direction) { + r = next_beyond_location(j, f, direction, &o, &p); + if (r < 0) { + log_debug("Can't iterate through %s, ignoring: %s", f->path, strerror(-r)); ++ remove_file_real(j, f); + continue; + } else if (r == 0) + continue; +@@ -1368,7 +1371,7 @@ static int add_file(sd_journal *j, const char *prefix, const char *filename) { + } + + static int remove_file(sd_journal *j, const char *prefix, const char *filename) { +- char *path; ++ _cleanup_free_ char *path; + JournalFile *f; + + assert(j); +@@ -1380,10 +1383,17 @@ static int remove_file(sd_journal *j, const char *prefix, const char *filename) + return -ENOMEM; + + f = hashmap_get(j->files, path); +- free(path); + if (!f) + return 0; + ++ remove_file_real(j, f); ++ return 0; ++} ++ ++static void remove_file_real(sd_journal *j, JournalFile *f) { ++ assert(j); ++ assert(f); ++ + hashmap_remove(j->files, f->path); + + log_debug("File %s removed.", f->path); +@@ -1401,8 +1411,6 @@ static int remove_file(sd_journal *j, const char *prefix, const char *filename) + journal_file_close(f); + + j->current_invalidate_counter ++; +- +- return 0; + } + + static int add_directory(sd_journal *j, const char *prefix, const char *dirname) { diff --git a/0326-logind-ignore-failing-close-on-session-devices.patch b/0326-logind-ignore-failing-close-on-session-devices.patch new file mode 100644 index 0000000..87f057f --- /dev/null +++ b/0326-logind-ignore-failing-close-on-session-devices.patch @@ -0,0 +1,57 @@ +From 66a28b3bec25e0456771db7ac356ad58793c337e Mon Sep 17 00:00:00 2001 +From: David Herrmann +Date: Thu, 28 Nov 2013 14:51:40 +0100 +Subject: [PATCH] logind: ignore failing close() on session-devices + +Unfortunately, close() on a revoked/removed character-device fails with +ENODEV. I tried tracking this down in the kernel, but couldn't figure out +were exactly it comes from. However, can be easily reproduced with: + fd = open("/dev/input/event0", O_RDWR); + ioctl(fd, EVIOCREVOKE, 0); + r = close(fd); +A second close on @fd would return EBADF so the close is actually valid. + +We simply ignore close() errors for all session-devices as their access +may be revoked asynchronously, or the device might get unplugged. +We use close_nointr() in case anyone ever looks at the return value (or +anyone runs "grep 'close(' -r src/" to find broken close() calls). + +Fixes: + systemd-logind[31992]: Assertion 'close_nointr(fd) == 0' failed at src/shared/util.c:185, function close_nointr_nofail(). Aborting. + +(cherry picked from commit d1107170f9e0fa2cb6e8d18586a003f0d96abfc3) +--- + src/login/logind-session-device.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c +index 6605935..fd02b43 100644 +--- a/src/login/logind-session-device.c ++++ b/src/login/logind-session-device.c +@@ -162,7 +162,7 @@ static int session_device_open(SessionDevice *sd, bool active) { + * state. */ + r = sd_drmsetmaster(fd); + if (r < 0) { +- close(fd); ++ close_nointr(fd); + return r; + } + } else { +@@ -209,7 +209,7 @@ static int session_device_start(SessionDevice *sd) { + r = session_device_open(sd, true); + if (r < 0) + return r; +- close_nointr_nofail(sd->fd); ++ close_nointr(sd->fd); + sd->fd = r; + break; + case DEVICE_TYPE_UNKNOWN: +@@ -407,7 +407,7 @@ void session_device_free(SessionDevice *sd) { + + session_device_stop(sd); + session_device_notify(sd, SESSION_DEVICE_RELEASE); +- close_nointr_nofail(sd->fd); ++ close_nointr(sd->fd); + + LIST_REMOVE(SessionDevice, sd_by_device, sd->device->session_devices, sd); + diff --git a/systemd.spec b/systemd.spec index 32362e9..bacff48 100644 --- a/systemd.spec +++ b/systemd.spec @@ -36,7 +36,7 @@ Source4: listen.conf # Prevent accidental removal of the systemd package Source6: yum-protect-systemd.conf -# Patch series is available as http://kawka.in.waw.pl/git/systemd/shortlog/refs/heads/v208-stable +# Patch series is available from http://cgit.freedesktop.org/systemd/systemd-stable/log/?h=v208-stable # GIT_DIR=~/src/systemd/.git git format-patch-ab -M -N --no-signature v208..v208-stable # i=1; for p in 0*patch;do printf "Patch%03d: %s\n" $i $p; ((i++));done Patch001: 0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch @@ -216,7 +216,7 @@ Patch174: 0174-man-describe-journalctl-show-cursor.patch Patch175: 0175-journal-fix-against-theoretical-undefined-behavior.patch Patch176: 0176-journald-downgrade-warning-message-when-dev-kmsg-doe.patch Patch177: 0177-journal-file.c-remove-redundant-assignment-of-variab.patch -#Patch178: 0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch +Patch178: 0178-login-Don-t-stop-a-running-user-manager-from-garbage.patch Patch179: 0179-libudev-devices-received-from-udev-are-always-initia.patch Patch180: 0180-log-don-t-reopen-dev-console-each-time-we-call-log_o.patch Patch181: 0181-log-when-we-log-to-dev-console-and-got-disconnected-.patch @@ -276,14 +276,14 @@ Patch234: 0234-gpt-auto-generator-skip-nonexistent-devices.patch Patch235: 0235-gpt-auto-generator-use-EBADSLT-code-when-unable-to-d.patch Patch236: 0236-journald-do-not-free-space-when-disk-space-runs-low.patch Patch237: 0237-man-add-busctl-1.patch -#Patch238: 0238-journalctl-flip-to-full-by-default.patch +Patch238: 0238-journalctl-flip-to-full-by-default.patch Patch239: 0239-coredumpctl-in-case-of-error-free-pattern-after-prin.patch Patch240: 0240-shell-completion-remove-load-from-systemctl.patch Patch241: 0241-units-drop-Install-section-from-multi-user.target-an.patch Patch242: 0242-systemctl-skip-native-unit-file-handling-if-sysv-fil.patch Patch243: 0243-hwdb-Update-database-of-Bluetooth-company-identifier.patch Patch244: 0244-udev-static_node-do-not-exit-rule-after-first-static.patch -#Patch245: 0245-cryptsetup-Support-key-slot-option.patch +Patch245: 0245-cryptsetup-Support-key-slot-option.patch Patch246: 0246-pam_systemd-Ignore-vtnr-when-seat-seat0.patch Patch247: 0247-keymap-Add-HP-Chromebook-14-Falco.patch Patch248: 0248-keymap-Add-release-quirk-for-Acer-AOA-switchvideomod.patch @@ -305,6 +305,67 @@ Patch263: 0263-efi-fix-Undefined-reference-efi_loader_get_boot_usec.patch Patch264: 0264-core-make-StopWhenUnneeded-work-in-conjunction-with-.patch Patch265: 0265-man-always-place-programlisting-and-programlisting-i.patch Patch266: 0266-Temporary-work-around-for-slow-shutdown-due-to-unter.patch +Patch267: 0267-pam-module-fix-warning-about-ignoring-vtnr.patch +Patch268: 0268-pam_systemd-do-not-set-XDG_RUNTIME_DIR-if-the-sessio.patch +Patch269: 0269-core-do-not-segfault-if-proc-swaps-cannot-be-opened.patch +Patch270: 0270-Revert-login-Don-t-stop-a-running-user-manager-from-.patch +Patch271: 0271-Revert-journalctl-flip-to-full-by-default.patch +Patch272: 0272-util-fix-handling-of-trailing-whitespace-in-split_qu.patch +Patch273: 0273-udev-net_id-Introduce-predictable-network-names-for-.patch +Patch274: 0274-utils-silence-the-compiler-warning.patch +Patch275: 0275-fix-SELinux-check-for-transient-units.patch +Patch276: 0276-s390-getty-generator-initialize-essential-system-ter.patch +Patch277: 0277-pam-use-correct-log-level.patch +Patch278: 0278-nspawn-if-we-don-t-find-bash-try-sh.patch +Patch279: 0279-units-systemd-logind-fails-hard-without-dbus.patch +Patch280: 0280-man-fix-grammatical-errors-and-other-formatting-issu.patch +Patch281: 0281-man-replace-STDOUT-with-standard-output-etc.patch +Patch282: 0282-man-use-spaces-instead-of-tabs.patch +Patch283: 0283-macro-add-a-macro-to-test-whether-a-value-is-in-a-sp.patch +Patch284: 0284-core-fix-property-changes-in-transient-units.patch +Patch285: 0285-core-more-exact-test-on-the-procfs-special-string-de.patch +Patch286: 0286-doc-update-punctuation.patch +Patch287: 0287-doc-resolve-missing-extraneous-words-or-inappropriat.patch +Patch288: 0288-doc-choose-different-words-to-improve-clarity.patch +Patch289: 0289-doc-properly-use-XML-entities.patch +Patch290: 0290-man-machinectl-there-is-no-command-kill-machine.patch +Patch291: 0291-load-modules-properly-return-a-failing-error-code-if.patch +Patch292: 0292-machinectl-add-bash-completion.patch +Patch293: 0293-delta-add-bash-completion.patch +Patch294: 0294-man-document-MAINPID.patch +Patch295: 0295-man-busctl-typo-fix.patch +Patch296: 0296-journal-don-t-clobber-return-parameters-of-sd_journa.patch +Patch297: 0297-udev-make-sure-we-always-return-a-valid-error-code-i.patch +Patch298: 0298-bootctl-add-bash-completion.patch +Patch299: 0299-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch +Patch300: 0300-man-there-is-no-ExecStopPre-for-service-units.patch +Patch301: 0301-man-document-that-per-interface-sysctl-variables-are.patch +Patch302: 0302-journal-downgrade-vaccuum-message-to-debug-level.patch +Patch303: 0303-core-gc-half-created-stub-units.patch +Patch304: 0304-getty-generator-verify-ttys-before-we-make-use-of-th.patch +Patch305: 0305-units-serial-getty-.service-add-Install-section.patch +Patch306: 0306-README-document-that-var-run-must-be-a-symlink-run.patch +Patch307: 0307-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch +Patch308: 0308-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch +Patch309: 0309-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch +Patch310: 0310-logs-show-fix-corrupt-output-with-empty-messages.patch +Patch311: 0311-journalctl-refuse-extra-arguments-with-verify-and-si.patch +Patch312: 0312-cdrom_id-use-the-old-MMC-fallback.patch +Patch313: 0313-udev-rules-setup-tty-permissions-and-group-for-sclp_.patch +Patch314: 0314-bash-add-completion-for-systemd-nspawn.patch +Patch315: 0315-add-bash-completion-for-systemd-cgls.patch +Patch316: 0316-hwdb-Update-database-of-Bluetooth-company-identifier.patch +Patch317: 0317-hwdb-Update-database-of-Bluetooth-company-identifier.patch +Patch318: 0318-Allow-fractional-parts-in-disk-sizes.patch +Patch319: 0319-add-bash-completion-for-systemd-cgtop.patch +Patch320: 0320-execute-free-directory-path-if-we-fail-to-remove-it-.patch +Patch321: 0321-add-bash-completion-for-systemd-detect-virt.patch +Patch322: 0322-Do-not-print-invalid-UTF-8-in-error-messages.patch +Patch323: 0323-add-bash-completion-for-systemd-cat.patch +Patch324: 0324-journal-assume-that-next-entry-is-after-previous-ent.patch +Patch325: 0325-journal-forget-file-after-encountering-an-error.patch +Patch326: 0326-logind-ignore-failing-close-on-session-devices.patch + # kernel-install patch for grubby, drop if grubby is obsolete Patch1000: kernel-install-grubby.patch @@ -882,17 +943,7 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/pkgconfig/systemd.pc %{_datadir}/pkgconfig/udev.pc -%{_datadir}/bash-completion/completions/hostnamectl -%{_datadir}/bash-completion/completions/journalctl -%{_datadir}/bash-completion/completions/localectl -%{_datadir}/bash-completion/completions/loginctl -%{_datadir}/bash-completion/completions/systemctl -%{_datadir}/bash-completion/completions/systemd-coredumpctl -%{_datadir}/bash-completion/completions/timedatectl -%{_datadir}/bash-completion/completions/udevadm -%{_datadir}/bash-completion/completions/systemd-analyze -%{_datadir}/bash-completion/completions/kernel-install -%{_datadir}/bash-completion/completions/systemd-run +%{_datadir}/bash-completion/completions/* %{_datadir}/zsh/site-functions/* # Make sure we don't remove runlevel targets from F14 alpha installs, @@ -961,7 +1012,14 @@ getent passwd systemd-journal-gateway >/dev/null 2>&1 || useradd -r -l -u 191 -g %{_datadir}/systemd/gatewayd %changelog -* Sub Feb 23 2014 Zbigniew Jędrzejewski-Szmek - 208-15 +* Sun Feb 23 2014 Zbigniew Jędrzejewski-Szmek - 208-15 +- Backport some small patches, mostly completion updates and + documentation fixes (#1069393, #1047568, #1047039, #1070970, #1061031) +- Make sclp_line, ttysclp and 3270/tty owned by group tty +- Allow key-slot= in crypttab +- Update database of bluetooth identifiers + +* Sun Feb 23 2014 Zbigniew Jędrzejewski-Szmek - 208-15 - Enable dnssec-triggerd.service by default (#1060754) * Mon Feb 17 2014 Zbigniew Jędrzejewski-Szmek - 208-14