[systemd/f21] Fix patch

Zbigniew Jędrzejewski-Szmek zbyszek at fedoraproject.org
Fri Jan 16 15:49:25 UTC 2015 

commit 9767024b5bc810c29ff2d5db617ab18cb09449b5
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Fri Jan 16 10:45:32 2015 -0500

    Fix patch

 ...filter-out-noauto-auto-nofail-fail-option.patch |    6 +++---
 ...ragment-avoid-allocating-0-bytes-when-giv.patch |    2 +-
 ...ab-util-fix-priority-parsing-and-add-test.patch |    2 +-
 0181-core-mount-remove-fail-again.patch            |    4 ++--
 ...ion-add-missing-completions-for-coredumpc.patch |    2 +-
 ...ion-add-missing-M-completion-for-timedate.patch |    2 +-
 ...ion-add-missing-completions-for-systemd-a.patch |    2 +-
 ...ion-add-missing-completions-for-systemd-t.patch |    2 +-
 ...ss-references-between-systemd.-link-netde.patch |    2 +-
 0187-man-remove-nofail-from-systemd.swap-5.patch   |    2 +-
 ...sysv-generator-fix-memory-leak-on-failure.patch |    2 +-
 ...sv-generator-always-use-fstatat-if-we-can.patch |    2 +-
 0190-fix-zsh-completion-typo.patch                 |    2 +-
 0191-udev-fix-NULL-ptr-deref.patch                 |    2 +-
 ...ger-print-fatal-errors-on-the-console-too.patch |    2 +-
 ...-vconsole-setup-when-switching-from-vgaco.patch |    2 +-
 systemd.spec                                       |    5 ++++-
 17 files changed, 23 insertions(+), 20 deletions(-)
---
diff --git a/0178-core-mount-filter-out-noauto-auto-nofail-fail-option.patch b/0178-core-mount-filter-out-noauto-auto-nofail-fail-option.patch
index e4ccb04..338625a 100644
--- a/0178-core-mount-filter-out-noauto-auto-nofail-fail-option.patch
+++ b/0178-core-mount-filter-out-noauto-auto-nofail-fail-option.patch
@@ -1,4 +1,4 @@
-From a092cdfe1f59689c4ee54f3ef4cf6f014c117843 Mon Sep 17 00:00:00 2001
+From e3880a3d573aa678b36806647661b4de47aaf00d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Sun, 11 Jan 2015 00:27:37 -0500
 Subject: [PATCH] core/mount: filter out noauto,auto,nofail,fail options
@@ -26,7 +26,7 @@ Conflicts:
  1 file changed, 10 insertions(+), 3 deletions(-)
 
 diff --git a/src/core/mount.c b/src/core/mount.c
-index 6ca389bc03..5414572a66 100644
+index 6ca389bc03..7c0527d6a1 100644
 --- a/src/core/mount.c
 +++ b/src/core/mount.c
 @@ -897,7 +897,14 @@ static void mount_enter_mounting(Mount *m) {
@@ -50,7 +50,7 @@ index 6ca389bc03..5414572a66 100644
                                  m->where,
                                  "-t", m->parameters_fragment.fstype ? m->parameters_fragment.fstype : "auto",
 -                                m->parameters_fragment.options ? "-o" : NULL, m->parameters_fragment.options,
-+                                isempty(opts) ? "-o" : NULL, isempty(opts) ? m->parameters_fragment.options : NULL,
++                                isempty(opts) ? NULL : "-o", isempty(opts) ? NULL : opts,
                                  NULL);
 -        else
 +        } else
diff --git a/0179-core-load-fragment-avoid-allocating-0-bytes-when-giv.patch b/0179-core-load-fragment-avoid-allocating-0-bytes-when-giv.patch
index b0d29a7..f55d130 100644
--- a/0179-core-load-fragment-avoid-allocating-0-bytes-when-giv.patch
+++ b/0179-core-load-fragment-avoid-allocating-0-bytes-when-giv.patch
@@ -1,4 +1,4 @@
-From 3fff351c881b7c83066d8aa16addc59a0194451f Mon Sep 17 00:00:00 2001
+From ce4ad5de372ecc8b3f5c935c76c2771440e66b4a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Sun, 11 Jan 2015 16:57:02 -0500
 Subject: [PATCH] core/load-fragment: avoid allocating 0 bytes when given an
diff --git a/0180-fstab-util-fix-priority-parsing-and-add-test.patch b/0180-fstab-util-fix-priority-parsing-and-add-test.patch
index d7c5ca8..73daf2d 100644
--- a/0180-fstab-util-fix-priority-parsing-and-add-test.patch
+++ b/0180-fstab-util-fix-priority-parsing-and-add-test.patch
@@ -1,4 +1,4 @@
-From ab755c9e982eada014a906c7dac0c3a5bae5f853 Mon Sep 17 00:00:00 2001
+From ca542322933c2477b7a67da4eb123ac810de8512 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Sun, 11 Jan 2015 23:40:46 -0500
 Subject: [PATCH] fstab-util: fix priority parsing and add test
diff --git a/0181-core-mount-remove-fail-again.patch b/0181-core-mount-remove-fail-again.patch
index 8e381ab..d0bddff 100644
--- a/0181-core-mount-remove-fail-again.patch
+++ b/0181-core-mount-remove-fail-again.patch
@@ -1,4 +1,4 @@
-From d75874557dad0059b9399e7350f2d4ee6606dfab Mon Sep 17 00:00:00 2001
+From 63bc82c30cebb7ed39649a45d91d48c109b70cba Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Mon, 12 Jan 2015 12:14:59 -0500
 Subject: [PATCH] core/mount: remove "fail" again
@@ -14,7 +14,7 @@ those three.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/core/mount.c b/src/core/mount.c
-index 5414572a66..8afa2e6dda 100644
+index 7c0527d6a1..f14599fc92 100644
 --- a/src/core/mount.c
 +++ b/src/core/mount.c
 @@ -901,7 +901,7 @@ static void mount_enter_mounting(Mount *m) {
diff --git a/0182-zsh-completion-add-missing-completions-for-coredumpc.patch b/0182-zsh-completion-add-missing-completions-for-coredumpc.patch
index 82e7f4f..2af3880 100644
--- a/0182-zsh-completion-add-missing-completions-for-coredumpc.patch
+++ b/0182-zsh-completion-add-missing-completions-for-coredumpc.patch
@@ -1,4 +1,4 @@
-From b77ff3c5290d9177e216b994fb2e0a60568382ae Mon Sep 17 00:00:00 2001
+From 60c149882c1519679335ab2b82fc9e798570078d Mon Sep 17 00:00:00 2001
 From: Ronny Chevalier <chevalier.ronny at gmail.com>
 Date: Mon, 12 Jan 2015 21:26:27 +0100
 Subject: [PATCH] zsh-completion: add missing completions for coredumpctl
diff --git a/0183-zsh-completion-add-missing-M-completion-for-timedate.patch b/0183-zsh-completion-add-missing-M-completion-for-timedate.patch
index 227aa7e..c7d127d 100644
--- a/0183-zsh-completion-add-missing-M-completion-for-timedate.patch
+++ b/0183-zsh-completion-add-missing-M-completion-for-timedate.patch
@@ -1,4 +1,4 @@
-From aeda35467fd4bbc45f595de1ffa41b2916f13b1a Mon Sep 17 00:00:00 2001
+From fab6d4c7aa4460f4a5016427d627c1a645a5d7f2 Mon Sep 17 00:00:00 2001
 From: Ronny Chevalier <chevalier.ronny at gmail.com>
 Date: Mon, 12 Jan 2015 21:31:45 +0100
 Subject: [PATCH] zsh-completion: add missing -M completion for timedatectl
diff --git a/0184-zsh-completion-add-missing-completions-for-systemd-a.patch b/0184-zsh-completion-add-missing-completions-for-systemd-a.patch
index 4502cd7..f8f49ca 100644
--- a/0184-zsh-completion-add-missing-completions-for-systemd-a.patch
+++ b/0184-zsh-completion-add-missing-completions-for-systemd-a.patch
@@ -1,4 +1,4 @@
-From fe10c8346813546d076d91cefb60f03fe03ab266 Mon Sep 17 00:00:00 2001
+From 65fd39f8a222a3dadf53de50b15664d5c2f73bf2 Mon Sep 17 00:00:00 2001
 From: Ronny Chevalier <chevalier.ronny at gmail.com>
 Date: Mon, 12 Jan 2015 21:43:45 +0100
 Subject: [PATCH] zsh-completion: add missing completions for systemd-analyze
diff --git a/0185-zsh-completion-add-missing-completions-for-systemd-t.patch b/0185-zsh-completion-add-missing-completions-for-systemd-t.patch
index 1336712..837cb6a 100644
--- a/0185-zsh-completion-add-missing-completions-for-systemd-t.patch
+++ b/0185-zsh-completion-add-missing-completions-for-systemd-t.patch
@@ -1,4 +1,4 @@
-From 3d42081b1ccc5c4fbfde7ccad992e9651c9b2d69 Mon Sep 17 00:00:00 2001
+From a4f21be76f1fef11908f26e57e792c04e8b6a7ec Mon Sep 17 00:00:00 2001
 From: Ronny Chevalier <chevalier.ronny at gmail.com>
 Date: Mon, 12 Jan 2015 22:19:34 +0100
 Subject: [PATCH] zsh-completion: add missing completions for systemd-tmpfiles
diff --git a/0186-doc-add-cross-references-between-systemd.-link-netde.patch b/0186-doc-add-cross-references-between-systemd.-link-netde.patch
index 9702c97..e08f929 100644
--- a/0186-doc-add-cross-references-between-systemd.-link-netde.patch
+++ b/0186-doc-add-cross-references-between-systemd.-link-netde.patch
@@ -1,4 +1,4 @@
-From 3ea7797a7c7d5cb849e1b4e0e1fb07d981d09684 Mon Sep 17 00:00:00 2001
+From 9e69da8bdd2b0d9db274816ce9102682a7036cd5 Mon Sep 17 00:00:00 2001
 From: Jan Engelhardt <jengelh at inai.de>
 Date: Mon, 12 Jan 2015 20:43:14 +0100
 Subject: [PATCH] doc: add cross-references between systemd.{link, netdev,
diff --git a/0187-man-remove-nofail-from-systemd.swap-5.patch b/0187-man-remove-nofail-from-systemd.swap-5.patch
index 7dc7376..a923019 100644
--- a/0187-man-remove-nofail-from-systemd.swap-5.patch
+++ b/0187-man-remove-nofail-from-systemd.swap-5.patch
@@ -1,4 +1,4 @@
-From 3828abe47c6367e05754eb48cca668e5b7de8407 Mon Sep 17 00:00:00 2001
+From 1b6db97fa2f5d537f3d2ee894b66df9751918247 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Tue, 13 Jan 2015 20:05:42 -0500
 Subject: [PATCH] man: remove "nofail" from systemd.swap(5)
diff --git a/0188-sysv-generator-fix-memory-leak-on-failure.patch b/0188-sysv-generator-fix-memory-leak-on-failure.patch
index 0e11267..b0a0a54 100644
--- a/0188-sysv-generator-fix-memory-leak-on-failure.patch
+++ b/0188-sysv-generator-fix-memory-leak-on-failure.patch
@@ -1,4 +1,4 @@
-From 91b84855f270af0a1b1edd44ea1dd86bb8b8e25d Mon Sep 17 00:00:00 2001
+From 7bc3b3007e7ebd04f88df6bc2c380a9f6d075190 Mon Sep 17 00:00:00 2001
 From: Lennart Poettering <lennart at poettering.net>
 Date: Wed, 14 Jan 2015 22:31:03 +0100
 Subject: [PATCH] sysv-generator: fix memory leak on failure
diff --git a/0189-sysv-generator-always-use-fstatat-if-we-can.patch b/0189-sysv-generator-always-use-fstatat-if-we-can.patch
index 17f29af..1b41015 100644
--- a/0189-sysv-generator-always-use-fstatat-if-we-can.patch
+++ b/0189-sysv-generator-always-use-fstatat-if-we-can.patch
@@ -1,4 +1,4 @@
-From 5304ec638fc00b1bb277fdfe806e758126fd1bb8 Mon Sep 17 00:00:00 2001
+From 46c3a085f0aa48e832be8ac78d77544e1dc0ca6b Mon Sep 17 00:00:00 2001
 From: Lennart Poettering <lennart at poettering.net>
 Date: Wed, 14 Jan 2015 22:37:56 +0100
 Subject: [PATCH] sysv-generator: always use fstatat() if we can
diff --git a/0190-fix-zsh-completion-typo.patch b/0190-fix-zsh-completion-typo.patch
index db766c2..805f40b 100644
--- a/0190-fix-zsh-completion-typo.patch
+++ b/0190-fix-zsh-completion-typo.patch
@@ -1,4 +1,4 @@
-From db6e0dd4d2f8eaeec287219f1912a060f250f714 Mon Sep 17 00:00:00 2001
+From a5ef43743566428d7aa800f6d84ea16b2768b478 Mon Sep 17 00:00:00 2001
 From: Moez Bouhlel <bmoez.j at gmail.com>
 Date: Wed, 14 Jan 2015 14:33:32 +0000
 Subject: [PATCH] fix zsh completion typo
diff --git a/0191-udev-fix-NULL-ptr-deref.patch b/0191-udev-fix-NULL-ptr-deref.patch
index ea34464..0d4cb5c 100644
--- a/0191-udev-fix-NULL-ptr-deref.patch
+++ b/0191-udev-fix-NULL-ptr-deref.patch
@@ -1,4 +1,4 @@
-From 0486a437c223e965a07923f34e9fb8d72338b2f8 Mon Sep 17 00:00:00 2001
+From f3093590ab485c98943434812325fc7d87bf83e9 Mon Sep 17 00:00:00 2001
 From: David Herrmann <dh.herrmann at gmail.com>
 Date: Thu, 15 Jan 2015 12:38:57 +0100
 Subject: [PATCH] udev: fix NULL-ptr deref
diff --git a/0192-manager-print-fatal-errors-on-the-console-too.patch b/0192-manager-print-fatal-errors-on-the-console-too.patch
index 04ab288..c7c6c4b 100644
--- a/0192-manager-print-fatal-errors-on-the-console-too.patch
+++ b/0192-manager-print-fatal-errors-on-the-console-too.patch
@@ -1,4 +1,4 @@
-From 3d5ae9c8bb683bd6aa66d6a93e79b2e797083ae8 Mon Sep 17 00:00:00 2001
+From f14dd032d058427b90681846036f4ea5c353b8e4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Fri, 16 Jan 2015 00:45:24 -0500
 Subject: [PATCH] manager: print fatal errors on the console too
diff --git a/0193-login-rerun-vconsole-setup-when-switching-from-vgaco.patch b/0193-login-rerun-vconsole-setup-when-switching-from-vgaco.patch
index f480992..b579404 100644
--- a/0193-login-rerun-vconsole-setup-when-switching-from-vgaco.patch
+++ b/0193-login-rerun-vconsole-setup-when-switching-from-vgaco.patch
@@ -1,4 +1,4 @@
-From 0e7221610c5fcd7687d31b5668cb0867bcd7e301 Mon Sep 17 00:00:00 2001
+From 5b9f8f0a472c96002360e65eec3e9c07a345a893 Mon Sep 17 00:00:00 2001
 From: Ray Strode <rstrode at redhat.com>
 Date: Wed, 5 Nov 2014 08:30:52 -0500
 Subject: [PATCH] login: rerun vconsole-setup when switching from vgacon to
diff --git a/systemd.spec b/systemd.spec
index 60a4035..34fe879 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -16,7 +16,7 @@
 Name:           systemd
 Url:            http://www.freedesktop.org/wiki/Software/systemd
 Version:        216
-Release:        15%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release:        16%{?gitcommit:.git%{gitcommit}}%{?dist}
 # For a breakdown of the licensing, see README
 License:        LGPLv2+ and MIT and GPLv2+
 Summary:        A System and Service Manager
@@ -1023,6 +1023,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
 %{_datadir}/systemd/gatewayd
 
 %changelog
+* Fri Jan 16 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 216-16
+- Fix patch
+
 * Fri Jan 16 2015 Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl> - 216-15
 - Many documentation and shell completion updates
 - Hardware database update

More information about the scm-commits mailing list