[systemd/f20] Fix botched patch
Zbigniew Jędrzejewski-Szmek
zbyszek at fedoraproject.org
Wed Jun 18 18:28:38 UTC 2014
commit 7f93bc28b630d7f85cd3d122c2d912e1c3c8b2ef
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date: Wed Jun 18 12:36:08 2014 -0400
Fix botched patch
...e-close_nointr_nofail-by-a-more-useful-sa.patch | 47 +++++++++++++-------
0408-async-add-asynchronous-close-call.patch | 2 +-
0409-core-close-socket-fds-asynchronously.patch | 2 +-
...g-polkit-policy-for-hibernate-in-line-wit.patch | 2 +-
....c-Move-code-around-to-easy-cherrypicking.patch | 2 +-
...make-sure-to-serialize-jobs-for-all-units.patch | 2 +-
...-that-the-ExecReload-command-should-be-sy.patch | 2 +-
...ad-fix-cmdline-switch-inconsistency-betwe.patch | 2 +-
...t-configure-check-for-verifying-that-ln-s.patch | 2 +-
0416-man-update-journald-rate-limit-defaults.patch | 2 +-
...erly-format-container_uuid-in-UUID-format.patch | 2 +-
0418-core-reindent-selinux-ima-smack-setup.c.patch | 2 +-
...-selinux_setup-load-policy-more-than-once.patch | 2 +-
...-database-of-Bluetooth-company-identifier.patch | 2 +-
0421-hwdb-update.patch | 2 +-
...w-to-bind-mount-journal-on-top-of-a-non-e.patch | 2 +-
...-restore-journal-directory-is-empty-check.patch | 2 +-
...ape-fields-we-store-in-run-so-that-they-c.patch | 2 +-
...o-escape-external-data-when-saving-to-run.patch | 4 +-
...ference-to-file-locking-for-PID-file-crea.patch | 2 +-
0427-man-update-URL-refernce-in-daemon-7.patch | 2 +-
...-never-consider-it-an-error-if-we-cannot-.patch | 2 +-
...erly-handle-if-our-service-vanished-durin.patch | 2 +-
0430-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch | 2 +-
0431-keymap-Asus-EeePC-touchpad-toggle-key.patch | 2 +-
...dev-keyboard-also-hook-into-change-events.patch | 2 +-
...ot-unescape-unit-names-in-Install-section.patch | 2 +-
...e_file-should-not-allow-files-ending-with.patch | 4 +-
...n-keyboard-do-tell-on-which-device-EVIOCS.patch | 2 +-
...sword-agent-Do-tell-what-directory-we-fai.patch | 2 +-
...yboard-add-Plantronics-.Audio-mute-button.patch | 2 +-
0438-hwdb-fix-case-sensitive-match.patch | 2 +-
...erences-to-sd_journal_cutoff_realtime_use.patch | 2 +-
...ng-for-an-explanation-of-what-a-slice-uni.patch | 2 +-
...ystemd-detect-virt-only-discover-Xen-domU.patch | 2 +-
...man-updates-to-the-passive-target-section.patch | 2 +-
...clearing-selinux-context-don-t-mangle-err.patch | 2 +-
...-network-online.target-after-network.targ.patch | 2 +-
0445-core-fix-invalid-free-in-killall.patch | 2 +-
...nstall-fix-invalid-free-in-unit_file_mask.patch | 2 +-
...ardcode-the-binary-paths-in-the-macros-re.patch | 2 +-
...t-up-selinux-label-proeprly-when-creating.patch | 2 +-
0449-util-add-files_same-helper-function.patch | 4 +-
0450-Add-strappenda3.patch | 2 +-
...fix-detection-of-unit-templates-instances.patch | 2 +-
0452-conf-files-fix-when-for-root-logic.patch | 2 +-
0453-bootchart-set-white-background.patch | 2 +-
...lways-prefer-firmware-platform-backlights.patch | 2 +-
0455-install-various-modernizations.patch | 2 +-
...plify-and-clarify-disabling-logic-for-ins.patch | 2 +-
...n-looking-for-a-unit-file-for-enabling-se.patch | 2 +-
...e-sure-systemctl-disable-foobar-.service-.patch | 2 +-
...e-sure-that-root-mode-doesn-t-make-us-con.patch | 4 +-
0460-install-simplify-symlink-root-logic.patch | 2 +-
54 files changed, 88 insertions(+), 73 deletions(-)
---
diff --git a/0407-util-replace-close_nointr_nofail-by-a-more-useful-sa.patch b/0407-util-replace-close_nointr_nofail-by-a-more-useful-sa.patch
index ac0b44b..3832353 100644
--- a/0407-util-replace-close_nointr_nofail-by-a-more-useful-sa.patch
+++ b/0407-util-replace-close_nointr_nofail-by-a-more-useful-sa.patch
@@ -1,4 +1,4 @@
-From 458383b9b0bc37dfc357b18cc88cb2ee7852ee90 Mon Sep 17 00:00:00 2001
+From a9c89505d8d70c167771dac30eef2a8d40adf077 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Tue, 18 Mar 2014 19:22:43 +0100
Subject: [PATCH] util: replace close_nointr_nofail() by a more useful
@@ -58,7 +58,7 @@ Conflicts:
src/core/automount.c | 40 ++++-------
src/core/cgroup.c | 8 +--
src/core/dbus.c | 10 ++-
- src/core/execute.c | 48 +++++--------
+ src/core/execute.c | 50 +++++--------
src/core/ima-setup.c | 6 +-
src/core/job.c | 7 +-
src/core/load-fragment.c | 2 +-
@@ -103,7 +103,7 @@ Conflicts:
src/login/logind-dbus.c | 5 +-
src/login/logind-inhibit.c | 6 +-
src/login/logind-seat.c | 3 +-
- src/login/logind-session.c | 7 +-
+ src/login/logind-session.c | 6 +-
src/login/logind.c | 23 ++----
src/login/pam-module.c | 3 +-
src/login/sd-login.c | 8 +--
@@ -122,7 +122,7 @@ Conflicts:
src/shared/log.c | 25 ++-----
src/shared/socket-label.c | 2 +-
src/shared/spawn-polkit-agent.c | 4 +-
- src/shared/util.c | 82 +++++++++++-----------
+ src/shared/util.c | 84 +++++++++++-----------
src/shared/util.h | 6 +-
src/shared/watchdog.c | 3 +-
src/shutdownd/shutdownd.c | 3 +-
@@ -130,7 +130,7 @@ Conflicts:
src/tmpfiles/tmpfiles.c | 6 +-
.../tty-ask-password-agent.c | 25 +++----
src/vconsole/vconsole-setup.c | 3 +-
- 76 files changed, 296 insertions(+), 481 deletions(-)
+ 76 files changed, 297 insertions(+), 483 deletions(-)
diff --git a/src/core/audit-fd.c b/src/core/audit-fd.c
index 5955bd8..4326d17 100644
@@ -336,7 +336,7 @@ index aa3d93b..b616a24 100644
}
diff --git a/src/core/execute.c b/src/core/execute.c
-index ee445d7..3d3e8e6 100644
+index ee445d7..add66ce 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -103,7 +103,7 @@ static int shift_fds(int fds[], unsigned n_fds) {
@@ -408,7 +408,7 @@ index ee445d7..3d3e8e6 100644
*_saved_stdin = saved_stdin;
*_saved_stdout = saved_stdout;
-@@ -503,14 +503,9 @@ static int setup_confirm_stdio(int *_saved_stdin,
+@@ -503,20 +503,15 @@ static int setup_confirm_stdio(int *_saved_stdin,
return 0;
fail:
@@ -426,6 +426,13 @@ index ee445d7..3d3e8e6 100644
return r;
}
+
+ _printf_attr_(1, 2) static int write_confirm_message(const char *format, ...) {
+- int fd;
++ _cleanup_close_ int fd = -1;
+ va_list ap;
+
+ assert(format);
@@ -529,8 +524,6 @@ _printf_attr_(1, 2) static int write_confirm_message(const char *format, ...) {
vdprintf(fd, format, ap);
va_end(ap);
@@ -1725,7 +1732,7 @@ index feebcf4..b581925 100644
return r;
}
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index ece222a..9de60af 100644
+index ece222a..13de549 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -375,8 +375,7 @@ int session_load(Session *s) {
@@ -1738,13 +1745,12 @@ index ece222a..9de60af 100644
}
if (realtime) {
-@@ -972,8 +971,8 @@ void session_remove_fifo(Session *s) {
+@@ -972,8 +971,7 @@ void session_remove_fifo(Session *s) {
if (s->fifo_fd >= 0) {
assert_se(hashmap_remove(s->manager->session_fds, INT_TO_PTR(s->fifo_fd + 1)) == s);
assert_se(epoll_ctl(s->manager->epoll_fd, EPOLL_CTL_DEL, s->fifo_fd, NULL) == 0);
- close_nointr_nofail(s->fifo_fd);
- s->fifo_fd = -1;
-+ safe_close(s->fifo_fd);
+ s->fifo_fd = safe_close(s->fifo_fd);
session_save(s);
@@ -2408,7 +2414,7 @@ index f9e52cd..fccf1e9 100644
return r;
}
diff --git a/src/shared/util.c b/src/shared/util.c
-index 533db92..9f5ee53 100644
+index 533db92..aa6242d 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -173,13 +173,22 @@ int close_nointr(int fd) {
@@ -2418,9 +2424,7 @@ index 533db92..9f5ee53 100644
-void close_nointr_nofail(int fd) {
- PROTECT_ERRNO;
+int safe_close(int fd) {
-
-- /* like close_nointr() but cannot fail, and guarantees errno
-- * is unchanged */
++
+ /*
+ * Like close_nointr() but cannot fail. Guarantees errno is
+ * unchanged. Is a NOP with negative fds passed, and returns
@@ -2429,12 +2433,14 @@ index 533db92..9f5ee53 100644
+ * fd = safe_close(fd);
+ */
-- assert_se(close_nointr(fd) == 0);
+- /* like close_nointr() but cannot fail, and guarantees errno
+- * is unchanged */
+ if (fd >= 0) {
+ PROTECT_ERRNO;
+ assert_se(close_nointr(fd) == 0);
+ }
-+
+
+- assert_se(close_nointr(fd) == 0);
+ return -1;
}
@@ -2562,6 +2568,15 @@ index 533db92..9f5ee53 100644
return -EPERM;
}
}
+@@ -3382,7 +3384,7 @@ char *ellipsize(const char *s, size_t length, unsigned percent) {
+ }
+
+ int touch(const char *path) {
+- int fd;
++ _cleanup_close_ int fd;
+
+ assert(path);
+
@@ -3394,7 +3396,6 @@ int touch(const char *path) {
if (fd < 0)
return -errno;
diff --git a/0408-async-add-asynchronous-close-call.patch b/0408-async-add-asynchronous-close-call.patch
index 1d18673..775a864 100644
--- a/0408-async-add-asynchronous-close-call.patch
+++ b/0408-async-add-asynchronous-close-call.patch
@@ -1,4 +1,4 @@
-From d4a04f2dc731b9109b560f53e37a6ad54581227c Mon Sep 17 00:00:00 2001
+From 075d60ceb2efdafcdf5586653b912eeed84194e0 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 2 May 2014 17:56:05 +0200
Subject: [PATCH] async: add asynchronous close() call
diff --git a/0409-core-close-socket-fds-asynchronously.patch b/0409-core-close-socket-fds-asynchronously.patch
index d9e20b7..0b48b5e 100644
--- a/0409-core-close-socket-fds-asynchronously.patch
+++ b/0409-core-close-socket-fds-asynchronously.patch
@@ -1,4 +1,4 @@
-From fc8f646e68209896c316b98af9f69c497052bc57 Mon Sep 17 00:00:00 2001
+From f24d57354422da412a4791a27dbd40760073cea9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
Date: Tue, 13 May 2014 23:22:13 +0200
Subject: [PATCH] core: close socket fds asynchronously
diff --git a/0410-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch b/0410-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch
index 0ea49b1..0f80d2f 100644
--- a/0410-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch
+++ b/0410-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch
@@ -1,4 +1,4 @@
-From 225adb95284a04f7cbacbb44eedf63097ae73484 Mon Sep 17 00:00:00 2001
+From 78134b740f209d97c6f042c74c52f3b5f4ff026a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 15 May 2014 18:30:07 +0200
Subject: [PATCH] logind: bring polkit policy for hibernate in line with
diff --git a/0411-unit.c-Move-code-around-to-easy-cherrypicking.patch b/0411-unit.c-Move-code-around-to-easy-cherrypicking.patch
index ac12ea3..508d855 100644
--- a/0411-unit.c-Move-code-around-to-easy-cherrypicking.patch
+++ b/0411-unit.c-Move-code-around-to-easy-cherrypicking.patch
@@ -1,4 +1,4 @@
-From 6b96332ddae5adff2e73002ccea1c1a32f8fd679 Mon Sep 17 00:00:00 2001
+From f7da070b21c114d70d19e3e23e5c7d1c58837971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
Date: Tue, 17 Jun 2014 15:04:08 -0400
Subject: [PATCH] unit.c: Move code around to easy cherrypicking
diff --git a/0412-core-make-sure-to-serialize-jobs-for-all-units.patch b/0412-core-make-sure-to-serialize-jobs-for-all-units.patch
index 137eb2e..be96727 100644
--- a/0412-core-make-sure-to-serialize-jobs-for-all-units.patch
+++ b/0412-core-make-sure-to-serialize-jobs-for-all-units.patch
@@ -1,4 +1,4 @@
-From d7b501f46d80de21cb1c0f1bd87a71b7978de5e4 Mon Sep 17 00:00:00 2001
+From 54fe753272e47c6fd39aa14854a83a94fa948850 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 16 May 2014 01:15:03 +0200
Subject: [PATCH] core: make sure to serialize jobs for all units
diff --git a/0413-man-clarify-that-the-ExecReload-command-should-be-sy.patch b/0413-man-clarify-that-the-ExecReload-command-should-be-sy.patch
index 5f87d7e..9d73520 100644
--- a/0413-man-clarify-that-the-ExecReload-command-should-be-sy.patch
+++ b/0413-man-clarify-that-the-ExecReload-command-should-be-sy.patch
@@ -1,4 +1,4 @@
-From 4fbf365ae4de8f1654ec41d852b3ca7aea2387ab Mon Sep 17 00:00:00 2001
+From 94dde9f7059c2a0b3710e77379db6f9d8281b6ec Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 16 May 2014 01:33:22 +0200
Subject: [PATCH] man: clarify that the ExecReload= command should be
diff --git a/0414-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch b/0414-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch
index aa07c74..712b32e 100644
--- a/0414-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch
+++ b/0414-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch
@@ -1,4 +1,4 @@
-From 28bebf333d85c5c8e66d81bae2912ddb93115159 Mon Sep 17 00:00:00 2001
+From 266b214a3cae3f6e43bc176614fdb4f5fd8332ea Mon Sep 17 00:00:00 2001
From: Alison Chaiken <alison_chaiken at mentor.com>
Date: Fri, 16 May 2014 09:25:53 +0200
Subject: [PATCH] man: readahead: fix cmdline switch inconsistency between
diff --git a/0415-build-sys-at-configure-check-for-verifying-that-ln-s.patch b/0415-build-sys-at-configure-check-for-verifying-that-ln-s.patch
index 4aaa690..2cf8f83 100644
--- a/0415-build-sys-at-configure-check-for-verifying-that-ln-s.patch
+++ b/0415-build-sys-at-configure-check-for-verifying-that-ln-s.patch
@@ -1,4 +1,4 @@
-From aef39ea7f11682302fad514d57280b561c629ef7 Mon Sep 17 00:00:00 2001
+From 2ee1723d1faf907f5d699b717788fd1ec795cca1 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 16 May 2014 16:51:42 +0200
Subject: [PATCH] build-sys: at configure check for verifying that ln supports
diff --git a/0416-man-update-journald-rate-limit-defaults.patch b/0416-man-update-journald-rate-limit-defaults.patch
index 2f1defb..5b4026d 100644
--- a/0416-man-update-journald-rate-limit-defaults.patch
+++ b/0416-man-update-journald-rate-limit-defaults.patch
@@ -1,4 +1,4 @@
-From c8f2171222a497a47b9f024e3c87bb0199eeb218 Mon Sep 17 00:00:00 2001
+From 134ffc71442b2817653520db01384f950232fc1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity at gmail.com>
Date: Wed, 30 Apr 2014 19:53:13 +0300
Subject: [PATCH] man: update journald rate limit defaults
diff --git a/0417-nspawn-properly-format-container_uuid-in-UUID-format.patch b/0417-nspawn-properly-format-container_uuid-in-UUID-format.patch
index ae79af4..03ebde1 100644
--- a/0417-nspawn-properly-format-container_uuid-in-UUID-format.patch
+++ b/0417-nspawn-properly-format-container_uuid-in-UUID-format.patch
@@ -1,4 +1,4 @@
-From 32983c9617894c203ef4a604d407444f76195b67 Mon Sep 17 00:00:00 2001
+From 63aaa1f0d119840db3541f0db8139e90333beb4d Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 16 May 2014 19:37:19 +0200
Subject: [PATCH] nspawn: properly format container_uuid in UUID format
diff --git a/0418-core-reindent-selinux-ima-smack-setup.c.patch b/0418-core-reindent-selinux-ima-smack-setup.c.patch
index 4d3b8c7..eaf29d7 100644
--- a/0418-core-reindent-selinux-ima-smack-setup.c.patch
+++ b/0418-core-reindent-selinux-ima-smack-setup.c.patch
@@ -1,4 +1,4 @@
-From 414550a53586b95e2a220f630f320a5908ee6d26 Mon Sep 17 00:00:00 2001
+From 5073418cdf3687cded374b8f77042473ad5873e7 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods at redhat.com>
Date: Fri, 25 Apr 2014 18:26:33 -0400
Subject: [PATCH] core: reindent {selinux, ima, smack}-setup.c
diff --git a/0419-core-let-selinux_setup-load-policy-more-than-once.patch b/0419-core-let-selinux_setup-load-policy-more-than-once.patch
index f41faa1..01fe4f8 100644
--- a/0419-core-let-selinux_setup-load-policy-more-than-once.patch
+++ b/0419-core-let-selinux_setup-load-policy-more-than-once.patch
@@ -1,4 +1,4 @@
-From 0763f53c5228539328868ea0e2e186b633efaa6c Mon Sep 17 00:00:00 2001
+From ee83fe9779c6f1f1d082f7b8e91cb0cfd40201c9 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods at redhat.com>
Date: Fri, 25 Apr 2014 18:26:34 -0400
Subject: [PATCH] core: let selinux_setup() load policy more than once
diff --git a/0420-hwdb-Update-database-of-Bluetooth-company-identifier.patch b/0420-hwdb-Update-database-of-Bluetooth-company-identifier.patch
index 1f11bb6..87d3d11 100644
--- a/0420-hwdb-Update-database-of-Bluetooth-company-identifier.patch
+++ b/0420-hwdb-Update-database-of-Bluetooth-company-identifier.patch
@@ -1,4 +1,4 @@
-From a26ac4bebe4784aa27cd80e5689e131ad2ced25c Mon Sep 17 00:00:00 2001
+From 2f2fb552e05f3355cc6eaa6ad89b509ce5a20300 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel at holtmann.org>
Date: Fri, 16 May 2014 15:57:35 -0700
Subject: [PATCH] hwdb: Update database of Bluetooth company identifiers
diff --git a/0421-hwdb-update.patch b/0421-hwdb-update.patch
index 505f8da..f9af792 100644
--- a/0421-hwdb-update.patch
+++ b/0421-hwdb-update.patch
@@ -1,4 +1,4 @@
-From d82d0c5ea851ebad2d4704340918e3955dc884e6 Mon Sep 17 00:00:00 2001
+From a6a0c18495b8dfaa5a7c6bb801dd51490e298966 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay at vrfy.org>
Date: Wed, 21 May 2014 18:19:24 +0900
Subject: [PATCH] hwdb: update
diff --git a/0422-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch b/0422-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
index c8080c5..a530ce4 100644
--- a/0422-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
+++ b/0422-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch
@@ -1,4 +1,4 @@
-From cc662a6cadcc063bc54f1af54025e73e08aaca4d Mon Sep 17 00:00:00 2001
+From 89f16be75b0c520ea35116af64b69140d46e362b Mon Sep 17 00:00:00 2001
From: Djalal Harouni <tixxdz at opendz.org>
Date: Fri, 11 Apr 2014 01:45:52 +0100
Subject: [PATCH] nspawn: allow to bind mount journal on top of a non empty
diff --git a/0423-nspawn-restore-journal-directory-is-empty-check.patch b/0423-nspawn-restore-journal-directory-is-empty-check.patch
index 914cdf7..f9e83b1 100644
--- a/0423-nspawn-restore-journal-directory-is-empty-check.patch
+++ b/0423-nspawn-restore-journal-directory-is-empty-check.patch
@@ -1,4 +1,4 @@
-From 99c831425b65770f43a833d603251c654ef459d8 Mon Sep 17 00:00:00 2001
+From 06e974ab63f9500d856c10dbcb84ea60045abe69 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 22 May 2014 15:19:46 +0900
Subject: [PATCH] nspawn: restore journal directory is empty check
diff --git a/0424-machine-escape-fields-we-store-in-run-so-that-they-c.patch b/0424-machine-escape-fields-we-store-in-run-so-that-they-c.patch
index c1dfae6..ea693c0 100644
--- a/0424-machine-escape-fields-we-store-in-run-so-that-they-c.patch
+++ b/0424-machine-escape-fields-we-store-in-run-so-that-they-c.patch
@@ -1,4 +1,4 @@
-From 05780644890a48d3de410dabef94159c50a8fa21 Mon Sep 17 00:00:00 2001
+From 621e4160e25b8e1154f5e1faa314ce86424b7102 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 22 May 2014 10:26:23 +0900
Subject: [PATCH] machine: escape fields we store in /run, so that they can be
diff --git a/0425-logind-also-escape-external-data-when-saving-to-run.patch b/0425-logind-also-escape-external-data-when-saving-to-run.patch
index 1ac0866..88256c3 100644
--- a/0425-logind-also-escape-external-data-when-saving-to-run.patch
+++ b/0425-logind-also-escape-external-data-when-saving-to-run.patch
@@ -1,4 +1,4 @@
-From 5133a167daf7b62eb0e72f8cb51448cf8be194db Mon Sep 17 00:00:00 2001
+From c194931d2eac3d81cf5d0fd388ea1ae58cae0ebd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 22 May 2014 10:35:28 +0900
Subject: [PATCH] logind: also escape external data when saving to /run
@@ -15,7 +15,7 @@ Conflicts:
1 file changed, 33 insertions(+), 7 deletions(-)
diff --git a/src/login/logind-session.c b/src/login/logind-session.c
-index 9de60af..77a9c66 100644
+index 13de549..9c87e43 100644
--- a/src/login/logind-session.c
+++ b/src/login/logind-session.c
@@ -202,7 +202,6 @@ int session_save(Session *s) {
diff --git a/0426-man-drop-reference-to-file-locking-for-PID-file-crea.patch b/0426-man-drop-reference-to-file-locking-for-PID-file-crea.patch
index 8391aa2..6440ce9 100644
--- a/0426-man-drop-reference-to-file-locking-for-PID-file-crea.patch
+++ b/0426-man-drop-reference-to-file-locking-for-PID-file-crea.patch
@@ -1,4 +1,4 @@
-From 11d7f271bd495d536f0e905ec7e16b6d22bac663 Mon Sep 17 00:00:00 2001
+From 977df069dc76174e5eee2e5e79728dd8a50a88ad Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 22 May 2014 16:15:56 +0900
Subject: [PATCH] man: drop reference to file locking for PID file creation
diff --git a/0427-man-update-URL-refernce-in-daemon-7.patch b/0427-man-update-URL-refernce-in-daemon-7.patch
index d06c089..232641f 100644
--- a/0427-man-update-URL-refernce-in-daemon-7.patch
+++ b/0427-man-update-URL-refernce-in-daemon-7.patch
@@ -1,4 +1,4 @@
-From b7ae22f942dd031082fc5425a365ce258517759c Mon Sep 17 00:00:00 2001
+From 385c0cd3b0dbcfc6af2ff9173bc2feb519d610d6 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 22 May 2014 16:22:48 +0900
Subject: [PATCH] man: update URL refernce in daemon(7)
diff --git a/0428-conf-parser-never-consider-it-an-error-if-we-cannot-.patch b/0428-conf-parser-never-consider-it-an-error-if-we-cannot-.patch
index e70d421..ec08c7c 100644
--- a/0428-conf-parser-never-consider-it-an-error-if-we-cannot-.patch
+++ b/0428-conf-parser-never-consider-it-an-error-if-we-cannot-.patch
@@ -1,4 +1,4 @@
-From da20acfc79c6f9cda31dfd37e0bd9eac61191970 Mon Sep 17 00:00:00 2001
+From ed15dbd87d0c6c18392bfa5b061320a8d318fd07 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 22 May 2014 16:47:46 +0900
Subject: [PATCH] conf-parser: never consider it an error if we cannot load a
diff --git a/0429-socket-properly-handle-if-our-service-vanished-durin.patch b/0429-socket-properly-handle-if-our-service-vanished-durin.patch
index 93b2feb..3bf996c 100644
--- a/0429-socket-properly-handle-if-our-service-vanished-durin.patch
+++ b/0429-socket-properly-handle-if-our-service-vanished-durin.patch
@@ -1,4 +1,4 @@
-From a230a93aa21f2f5c8e1d6dd523714530ea4ab75e Mon Sep 17 00:00:00 2001
+From 01bd69736c3f2384dfa98d71d5380beaebdda3e4 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Thu, 22 May 2014 16:56:21 +0900
Subject: [PATCH] socket: properly handle if our service vanished during
diff --git a/0430-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch b/0430-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
index 00c4839..2a80f78 100644
--- a/0430-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
+++ b/0430-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch
@@ -1,4 +1,4 @@
-From 3b0ae67b69835006cc828fca36732704bc7dbd48 Mon Sep 17 00:00:00 2001
+From 3771f1d5bd9f059c70d1e56503ef4eb029283eee Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Sun, 25 May 2014 11:57:22 +0200
Subject: [PATCH] keymap: Add Lenovo Enhanced USB Keyboard
diff --git a/0431-keymap-Asus-EeePC-touchpad-toggle-key.patch b/0431-keymap-Asus-EeePC-touchpad-toggle-key.patch
index d52919c..c3622c1 100644
--- a/0431-keymap-Asus-EeePC-touchpad-toggle-key.patch
+++ b/0431-keymap-Asus-EeePC-touchpad-toggle-key.patch
@@ -1,4 +1,4 @@
-From 69979668d98365c4862f0de067cf54aac759873f Mon Sep 17 00:00:00 2001
+From 0515a5d28d6f523328ef0ed883af00c6ff8ffd11 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin.pitt at ubuntu.com>
Date: Sun, 25 May 2014 12:16:35 +0200
Subject: [PATCH] keymap: Asus EeePC touchpad toggle key
diff --git a/0432-udev-keyboard-also-hook-into-change-events.patch b/0432-udev-keyboard-also-hook-into-change-events.patch
index b2b6f03..a5bf46c 100644
--- a/0432-udev-keyboard-also-hook-into-change-events.patch
+++ b/0432-udev-keyboard-also-hook-into-change-events.patch
@@ -1,4 +1,4 @@
-From 9dc8d00250c7e28f8e1c6f4a4508247971097312 Mon Sep 17 00:00:00 2001
+From 2a9ec8c983dbe6127ab8d0e9ea638cf8fcc23bbd Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay at vrfy.org>
Date: Mon, 26 May 2014 09:30:21 +0800
Subject: [PATCH] udev: keyboard - also hook into "change" events
diff --git a/0433-Do-not-unescape-unit-names-in-Install-section.patch b/0433-Do-not-unescape-unit-names-in-Install-section.patch
index bd7dcae..91024da 100644
--- a/0433-Do-not-unescape-unit-names-in-Install-section.patch
+++ b/0433-Do-not-unescape-unit-names-in-Install-section.patch
@@ -1,4 +1,4 @@
-From 5cc09ed951c574c5db646da49af575ee972ad15a Mon Sep 17 00:00:00 2001
+From b1710001dbf110ca5ec1a9599c957ab691b0cc55 Mon Sep 17 00:00:00 2001
From: Michal Sekletar <msekleta at redhat.com>
Date: Mon, 26 May 2014 20:09:45 +0200
Subject: [PATCH] Do not unescape unit names in [Install] section
diff --git a/0434-util-ignore_file-should-not-allow-files-ending-with.patch b/0434-util-ignore_file-should-not-allow-files-ending-with.patch
index 9e69581..5725aea 100644
--- a/0434-util-ignore_file-should-not-allow-files-ending-with.patch
+++ b/0434-util-ignore_file-should-not-allow-files-ending-with.patch
@@ -1,4 +1,4 @@
-From b83bfe4cf4bf0b866b7f5b7672f644fc68e3e352 Mon Sep 17 00:00:00 2001
+From 1ad45b4f03c91ce6e885ed852bb732122772ae62 Mon Sep 17 00:00:00 2001
From: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date: Sat, 31 May 2014 21:36:23 +0200
Subject: [PATCH] util: ignore_file should not allow files ending with '~'
@@ -14,7 +14,7 @@ a228a22fda4faa9ecb7c5a5e499980c8ae5d2a08
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 9f5ee53..89fa053 100644
+index aa6242d..6e97a6d 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1499,7 +1499,7 @@ bool ignore_file(const char *filename) {
diff --git a/0435-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch b/0435-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
index a9e5fef..2f4b817 100644
--- a/0435-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
+++ b/0435-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch
@@ -1,4 +1,4 @@
-From 0ac1bf960367c9cfe941970b212353e4c10523e8 Mon Sep 17 00:00:00 2001
+From da9ec06bdc8b1898b33c78d855875245d9c38875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez at opensuse.org>
Date: Fri, 30 May 2014 13:16:56 -0400
Subject: [PATCH] udev-builtin-keyboard: do tell on which device EVIOCSKEYCODE
diff --git a/0436-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch b/0436-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
index 855d68b..f762311 100644
--- a/0436-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
+++ b/0436-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch
@@ -1,4 +1,4 @@
-From 9e693c89b05d1d2b91314767017487883eb420be Mon Sep 17 00:00:00 2001
+From 8038e07f24ced861a2c008e70c57ccafbff91e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= <crrodriguez at opensuse.org>
Date: Thu, 29 May 2014 14:17:37 -0400
Subject: [PATCH] tty-ask-password-agent: Do tell what directory we failed to
diff --git a/0437-keyboard-add-Plantronics-.Audio-mute-button.patch b/0437-keyboard-add-Plantronics-.Audio-mute-button.patch
index 7d77ccd..33e1948 100644
--- a/0437-keyboard-add-Plantronics-.Audio-mute-button.patch
+++ b/0437-keyboard-add-Plantronics-.Audio-mute-button.patch
@@ -1,4 +1,4 @@
-From bd541faf4f117a85f7567cfb7f41509824255571 Mon Sep 17 00:00:00 2001
+From 1d8327c497ffde68aca8d460253091345327e4a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
Date: Sun, 1 Jun 2014 14:01:23 -0400
Subject: [PATCH] keyboard: add Plantronics .Audio mute button
diff --git a/0438-hwdb-fix-case-sensitive-match.patch b/0438-hwdb-fix-case-sensitive-match.patch
index 61099d5..fdbe425 100644
--- a/0438-hwdb-fix-case-sensitive-match.patch
+++ b/0438-hwdb-fix-case-sensitive-match.patch
@@ -1,4 +1,4 @@
-From 6a203eb0721d9a095dfcd86b89ac876ad3a1d710 Mon Sep 17 00:00:00 2001
+From 84f15607fd7dd611c307322689b0adb9186e9d41 Mon Sep 17 00:00:00 2001
From: Kay Sievers <kay at vrfy.org>
Date: Wed, 4 Jun 2014 17:55:14 +0200
Subject: [PATCH] hwdb: fix case-sensitive match
diff --git a/0439-man-fix-references-to-sd_journal_cutoff_realtime_use.patch b/0439-man-fix-references-to-sd_journal_cutoff_realtime_use.patch
index fe4c22a..71edc9d 100644
--- a/0439-man-fix-references-to-sd_journal_cutoff_realtime_use.patch
+++ b/0439-man-fix-references-to-sd_journal_cutoff_realtime_use.patch
@@ -1,4 +1,4 @@
-From 7f0dbe757c0144bd85511d32d0d3e8a1e7fb6932 Mon Sep 17 00:00:00 2001
+From 138156c1563cf48256c36b849e0de547164746a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity at gmail.com>
Date: Mon, 2 Jun 2014 16:47:15 +0300
Subject: [PATCH] man: fix references to sd_journal_cutoff_realtime_usec
diff --git a/0440-man-Searching-for-an-explanation-of-what-a-slice-uni.patch b/0440-man-Searching-for-an-explanation-of-what-a-slice-uni.patch
index f0147bb..acb864a 100644
--- a/0440-man-Searching-for-an-explanation-of-what-a-slice-uni.patch
+++ b/0440-man-Searching-for-an-explanation-of-what-a-slice-uni.patch
@@ -1,4 +1,4 @@
-From 0c888269f42b135c433d815af997747f130e5ffa Mon Sep 17 00:00:00 2001
+From a0883f2dc07479ffc6401d0068f19c32b1823773 Mon Sep 17 00:00:00 2001
From: Mark Eichin <eichin at thok.org>
Date: Mon, 9 Jun 2014 01:57:19 -0400
Subject: [PATCH] man: Searching for an explanation of what a "slice unit" was,
diff --git a/0441-systemd-detect-virt-only-discover-Xen-domU.patch b/0441-systemd-detect-virt-only-discover-Xen-domU.patch
index 074cf8d..6b40f0b 100644
--- a/0441-systemd-detect-virt-only-discover-Xen-domU.patch
+++ b/0441-systemd-detect-virt-only-discover-Xen-domU.patch
@@ -1,4 +1,4 @@
-From 8333445a1902e157e54e54bc70038087fb0aa89a Mon Sep 17 00:00:00 2001
+From dfef23e1b6c0c89b17b7b52f6ec1537649a8c60b Mon Sep 17 00:00:00 2001
From: Thomas Blume <Thomas.Blume at suse.com>
Date: Fri, 6 Jun 2014 16:36:45 +0200
Subject: [PATCH] systemd-detect-virt: only discover Xen domU
diff --git a/0442-man-updates-to-the-passive-target-section.patch b/0442-man-updates-to-the-passive-target-section.patch
index 5c8bd77..1e5ac32 100644
--- a/0442-man-updates-to-the-passive-target-section.patch
+++ b/0442-man-updates-to-the-passive-target-section.patch
@@ -1,4 +1,4 @@
-From 9d41d5eb0664e3b7389b2f11fb8ab6aa0fc5c679 Mon Sep 17 00:00:00 2001
+From 4a8d7c028dea812fd6fbe27ed6ecc1e9beba2738 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Tue, 10 Jun 2014 18:52:28 +0200
Subject: [PATCH] man: updates to the passive target section
diff --git a/0443-label-when-clearing-selinux-context-don-t-mangle-err.patch b/0443-label-when-clearing-selinux-context-don-t-mangle-err.patch
index b5097e5..2f2931d 100644
--- a/0443-label-when-clearing-selinux-context-don-t-mangle-err.patch
+++ b/0443-label-when-clearing-selinux-context-don-t-mangle-err.patch
@@ -1,4 +1,4 @@
-From 2a3d6ea33611531c974b6c37c0685fc2178fab52 Mon Sep 17 00:00:00 2001
+From 52af6106165bb6521e0dab433e647878a33e901c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Tue, 10 Jun 2014 22:48:56 +0200
Subject: [PATCH] label: when clearing selinux context, don't mangle errno
diff --git a/0444-units-order-network-online.target-after-network.targ.patch b/0444-units-order-network-online.target-after-network.targ.patch
index c92a2a4..95c4dcb 100644
--- a/0444-units-order-network-online.target-after-network.targ.patch
+++ b/0444-units-order-network-online.target-after-network.targ.patch
@@ -1,4 +1,4 @@
-From c14e22f6d48d3d22b4661c9191a3ed9dc395bea0 Mon Sep 17 00:00:00 2001
+From 14831b62e7a929d68f9a97ffbdbfb306ed627838 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Wed, 11 Jun 2014 14:58:32 +0200
Subject: [PATCH] units: order network-online.target after network.target
diff --git a/0445-core-fix-invalid-free-in-killall.patch b/0445-core-fix-invalid-free-in-killall.patch
index 39511ac..2f47f7a 100644
--- a/0445-core-fix-invalid-free-in-killall.patch
+++ b/0445-core-fix-invalid-free-in-killall.patch
@@ -1,4 +1,4 @@
-From cd90b3170d09d95f391a10da15be7a0b2eac32ab Mon Sep 17 00:00:00 2001
+From 4acf355b1f266446651218f25904f210fe9433ee Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas at fatal.se>
Date: Fri, 13 Jun 2014 18:48:19 +0200
Subject: [PATCH] core: fix invalid free() in killall()
diff --git a/0446-install-fix-invalid-free-in-unit_file_mask.patch b/0446-install-fix-invalid-free-in-unit_file_mask.patch
index 76a9a16..3d03566 100644
--- a/0446-install-fix-invalid-free-in-unit_file_mask.patch
+++ b/0446-install-fix-invalid-free-in-unit_file_mask.patch
@@ -1,4 +1,4 @@
-From c704373a42bff8615dc4467299ac4c42f5657f51 Mon Sep 17 00:00:00 2001
+From 2b970743216845d26ea21fbdc9e8ed485841e5c7 Mon Sep 17 00:00:00 2001
From: Andreas Henriksson <andreas at fatal.se>
Date: Fri, 13 Jun 2014 18:48:18 +0200
Subject: [PATCH] install: fix invalid free() in unit_file_mask()
diff --git a/0447-rpm-don-t-hardcode-the-binary-paths-in-the-macros-re.patch b/0447-rpm-don-t-hardcode-the-binary-paths-in-the-macros-re.patch
index 2985222..3ef7277 100644
--- a/0447-rpm-don-t-hardcode-the-binary-paths-in-the-macros-re.patch
+++ b/0447-rpm-don-t-hardcode-the-binary-paths-in-the-macros-re.patch
@@ -1,4 +1,4 @@
-From 7ab0e2491ff2d4bacf42c27c55957c36383fae5e Mon Sep 17 00:00:00 2001
+From 0a818dbae3218dd1beb80f287bb3ef47c583b150 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Fri, 13 Jun 2014 19:05:22 +0200
Subject: [PATCH] rpm: don't hardcode the binary paths in the macros, rely on
diff --git a/0448-tmpfiles-set-up-selinux-label-proeprly-when-creating.patch b/0448-tmpfiles-set-up-selinux-label-proeprly-when-creating.patch
index ce343bc..d99ac24 100644
--- a/0448-tmpfiles-set-up-selinux-label-proeprly-when-creating.patch
+++ b/0448-tmpfiles-set-up-selinux-label-proeprly-when-creating.patch
@@ -1,4 +1,4 @@
-From 9b26053ff0ed34351877548a89b803a7729bf855 Mon Sep 17 00:00:00 2001
+From 579be607d6f4081b29af978c0a5529e18e6b8baf Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Mon, 16 Jun 2014 13:20:38 +0200
Subject: [PATCH] tmpfiles: set up selinux label proeprly when creating fifos
diff --git a/0449-util-add-files_same-helper-function.patch b/0449-util-add-files_same-helper-function.patch
index 39e526d..0ce8c53 100644
--- a/0449-util-add-files_same-helper-function.patch
+++ b/0449-util-add-files_same-helper-function.patch
@@ -1,4 +1,4 @@
-From 3f7acd19729163a13b1aca3b6c07ea1d96de696b Mon Sep 17 00:00:00 2001
+From f6e7edef4151734a831f2bb83bf02ccbe17b76da Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 6 Mar 2014 09:12:57 +0100
Subject: [PATCH] util: add files_same() helper function
@@ -16,7 +16,7 @@ files_same() returns
2 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/shared/util.c b/src/shared/util.c
-index 89fa053..0202c39 100644
+index 6e97a6d..1f83eb7 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -3333,19 +3333,27 @@ bool on_tty(void) {
diff --git a/0450-Add-strappenda3.patch b/0450-Add-strappenda3.patch
index f6a2cd4..9364a8f 100644
--- a/0450-Add-strappenda3.patch
+++ b/0450-Add-strappenda3.patch
@@ -1,4 +1,4 @@
-From 9f4a3dd335fc0b6121078c665ed1901e8f964229 Mon Sep 17 00:00:00 2001
+From f6c97dfac68184fd99a09ee6c048d7a859677fe5 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald at redhat.com>
Date: Thu, 6 Mar 2014 16:35:02 +0100
Subject: [PATCH] Add strappenda3
diff --git a/0451-unit-name-fix-detection-of-unit-templates-instances.patch b/0451-unit-name-fix-detection-of-unit-templates-instances.patch
index 9218741..4095f1c 100644
--- a/0451-unit-name-fix-detection-of-unit-templates-instances.patch
+++ b/0451-unit-name-fix-detection-of-unit-templates-instances.patch
@@ -1,4 +1,4 @@
-From 0d8027024c9ac692aaffe1823976aeea1f2ea84d Mon Sep 17 00:00:00 2001
+From b2c7ff14c280e166936e175fc44b3f1f0bf84f96 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Mon, 16 Jun 2014 17:01:26 +0200
Subject: [PATCH] unit-name: fix detection of unit templates/instances
diff --git a/0452-conf-files-fix-when-for-root-logic.patch b/0452-conf-files-fix-when-for-root-logic.patch
index 43f32e3..d6eda4b 100644
--- a/0452-conf-files-fix-when-for-root-logic.patch
+++ b/0452-conf-files-fix-when-for-root-logic.patch
@@ -1,4 +1,4 @@
-From a95d58fe1724ea299b1038b74c454a53f2d43007 Mon Sep 17 00:00:00 2001
+From 86253df02285204e54621bb9bca99b45e56a691a Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Tue, 17 Jun 2014 01:56:44 +0200
Subject: [PATCH] conf-files: fix when for --root= logic
diff --git a/0453-bootchart-set-white-background.patch b/0453-bootchart-set-white-background.patch
index 6c94513..cabe199 100644
--- a/0453-bootchart-set-white-background.patch
+++ b/0453-bootchart-set-white-background.patch
@@ -1,4 +1,4 @@
-From f19ebb4146b22ede6315b3e5c4c3841f085f2f10 Mon Sep 17 00:00:00 2001
+From 8c6c6f50e9accdf3a8af8bcc58f9a2c5f7eb1516 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat at suse.com>
Date: Mon, 16 Jun 2014 18:49:12 +0200
Subject: [PATCH] bootchart: set white background
diff --git a/0454-backlight-always-prefer-firmware-platform-backlights.patch b/0454-backlight-always-prefer-firmware-platform-backlights.patch
index e3dd7a5..dd0648f 100644
--- a/0454-backlight-always-prefer-firmware-platform-backlights.patch
+++ b/0454-backlight-always-prefer-firmware-platform-backlights.patch
@@ -1,4 +1,4 @@
-From 087265848cd7621a156af6c6e8e872b8897ac953 Mon Sep 17 00:00:00 2001
+From 9e760b6e80a875f0a9f3f520bf9656e274b7eb81 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Mon, 14 Oct 2013 02:12:52 +0200
Subject: [PATCH] backlight: always prefer "firmware"/"platform" backlights
diff --git a/0455-install-various-modernizations.patch b/0455-install-various-modernizations.patch
index d2b7b1b..407686b 100644
--- a/0455-install-various-modernizations.patch
+++ b/0455-install-various-modernizations.patch
@@ -1,4 +1,4 @@
-From ed2629f9e62160c176507f56220a44fdbcb3c2f2 Mon Sep 17 00:00:00 2001
+From bed108402ded5dc88cf37ce48936453b15912027 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Mon, 16 Jun 2014 17:19:30 +0200
Subject: [PATCH] install: various modernizations
diff --git a/0456-install-simplify-and-clarify-disabling-logic-for-ins.patch b/0456-install-simplify-and-clarify-disabling-logic-for-ins.patch
index 805f19e..dc817b5 100644
--- a/0456-install-simplify-and-clarify-disabling-logic-for-ins.patch
+++ b/0456-install-simplify-and-clarify-disabling-logic-for-ins.patch
@@ -1,4 +1,4 @@
-From ca757fed07a2a6ce505a8b5761f9fd7da84ca176 Mon Sep 17 00:00:00 2001
+From d1c9c8fa18b2c3d16e9db90c6faf839b0d545887 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Mon, 16 Jun 2014 19:48:31 +0200
Subject: [PATCH] install: simplify and clarify disabling logic for instanced
diff --git a/0457-install-when-looking-for-a-unit-file-for-enabling-se.patch b/0457-install-when-looking-for-a-unit-file-for-enabling-se.patch
index 90eee37..bf7adc4 100644
--- a/0457-install-when-looking-for-a-unit-file-for-enabling-se.patch
+++ b/0457-install-when-looking-for-a-unit-file-for-enabling-se.patch
@@ -1,4 +1,4 @@
-From fc1ec9f3c9e348a169772c872474d3ea208ac918 Mon Sep 17 00:00:00 2001
+From d026f2c46c679fe56145d37519ff760df9703f78 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Tue, 17 Jun 2014 00:13:48 +0200
Subject: [PATCH] install: when looking for a unit file for enabling, search
diff --git a/0458-install-make-sure-systemctl-disable-foobar-.service-.patch b/0458-install-make-sure-systemctl-disable-foobar-.service-.patch
index c7259e8..d5af10d 100644
--- a/0458-install-make-sure-systemctl-disable-foobar-.service-.patch
+++ b/0458-install-make-sure-systemctl-disable-foobar-.service-.patch
@@ -1,4 +1,4 @@
-From 4d0273b5fbb3151b73ce7299f810ffdc77e7db28 Mon Sep 17 00:00:00 2001
+From f1bfb88cea3730c921d7a1d466621c13cdb611ac Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Tue, 17 Jun 2014 00:33:39 +0200
Subject: [PATCH] install: make sure "systemctl disable foobar at .service"
diff --git a/0459-install-make-sure-that-root-mode-doesn-t-make-us-con.patch b/0459-install-make-sure-that-root-mode-doesn-t-make-us-con.patch
index 95c13cf..12b75f3 100644
--- a/0459-install-make-sure-that-root-mode-doesn-t-make-us-con.patch
+++ b/0459-install-make-sure-that-root-mode-doesn-t-make-us-con.patch
@@ -1,4 +1,4 @@
-From e094ca6e2aaafe70977b4c6295ef1fc1640c19de Mon Sep 17 00:00:00 2001
+From 01ed2927822932a028701fc2ed7fb4440177cf45 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Tue, 17 Jun 2014 00:53:49 +0200
Subject: [PATCH] install: make sure that --root= mode doesn't make us consider
@@ -107,7 +107,7 @@ index e772c45..5d93a2e 100644
r = q;
}
diff --git a/src/shared/util.c b/src/shared/util.c
-index 0202c39..fc20e20 100644
+index 1f83eb7..f034134 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -4520,22 +4520,6 @@ int dirent_ensure_type(DIR *d, struct dirent *de) {
diff --git a/0460-install-simplify-symlink-root-logic.patch b/0460-install-simplify-symlink-root-logic.patch
index 9ffc7d3..a54cae7 100644
--- a/0460-install-simplify-symlink-root-logic.patch
+++ b/0460-install-simplify-symlink-root-logic.patch
@@ -1,4 +1,4 @@
-From 2b5c3edabb7e4e3465232a196bf7df62be48939d Mon Sep 17 00:00:00 2001
+From 5763621e1fafe630cfe98181792e7b556db72d21 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart at poettering.net>
Date: Tue, 17 Jun 2014 01:37:54 +0200
Subject: [PATCH] install: simplify symlink --root= logic
More information about the scm-commits
mailing list