[systemd/f19] Remove one patch

Zbigniew Jędrzejewski-Szmek zbyszek at fedoraproject.org
Tue Sep 17 16:22:47 UTC 2013


commit a54eec6cfaa4d9b35b3053db8a9874be98f25a17
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Tue Sep 17 11:15:04 2013 -0500

    Remove one patch

 ...rnal-correctly-convert-usec_t-to-timespec.patch |    2 +-
 ...hon-do-not-attempt-to-convert-str-to-byte.patch |    2 +-
 0003-systemd-python-fix-iteration.patch            |    2 +-
 ...systemctl-honor-no-legend-in-list-sockets.patch |    2 +-
 ...l-processes-with-SIGKILL-on-watchdog-fail.patch |    2 +-
 0006-Fix-CPUShares-configuration-option.patch      |    2 +-
 ...-recalculate-the-ACL-mask-but-only-if-it-.patch |    2 +-
 ...-t-report-alien-child-as-alive-when-it-s-.patch |    2 +-
 ...ember-last-direction-of-search-and-keep-o.patch |    2 +-
 0010-journal-letting-interleaved-seqnums-go.patch  |    2 +-
 ...rs-always-call-kmod-even-when-a-driver-is.patch |    2 +-
 ...-slot.rules-only-rename-network-interface.patch |    2 +-
 0013-journal-fix-hashmap-leak-in-mmap-cache.patch  |    2 +-
 ...ator-read-rd.fstab-on-off-switch-correctl.patch |    2 +-
 ...nerator-log_oom-if-automount_name-is-null.patch |    2 +-
 ...-not-overwrite-syslog-facility-when-parsi.patch |    2 +-
 ...ix-parsing-of-facility-in-syslog-messages.patch |    2 +-
 ...budev-fix-memleak-when-enumerating-childs.patch |    2 +-
 ...merate-fix-NULL-deref-for-subsystem-match.patch |    2 +-
 ...edump-Ignore-coredumps-larger-than-COREDU.patch |    2 +-
 0021-journalctl-use-_COMM-match-for-scripts.patch  |    2 +-
 0022-Allow-tabs-in-environment-files.patch         |    2 +-
 ...-Actually-allow-tabs-in-environment-files.patch |    2 +-
 ...rocess-only-signals-for-jobs-we-really-wa.patch |    2 +-
 0025-cgtop-fixup-the-online-help.patch             |    2 +-
 0026-man-fix-description-of-sysctl.d-order.patch   |   28 --------------------
 ....c-do-not-point-users-to-logs-when-unit-n.patch |    4 +-
 systemd.spec                                       |    3 +-
 28 files changed, 28 insertions(+), 57 deletions(-)
---
diff --git a/0001-journal-correctly-convert-usec_t-to-timespec.patch b/0001-journal-correctly-convert-usec_t-to-timespec.patch
index d256838..e5c6cb3 100644
--- a/0001-journal-correctly-convert-usec_t-to-timespec.patch
+++ b/0001-journal-correctly-convert-usec_t-to-timespec.patch
@@ -1,7 +1,7 @@
 From 11fe664c24617569d1088fae7c6630718fbf1896 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Micha=C5=82=20Bartoszkiewicz?= <mbartoszkiewicz at gmail.com>
 Date: Wed, 15 May 2013 11:28:58 +0200
-Subject: [PATCH 01/27] journal: correctly convert usec_t to timespec.
+Subject: [PATCH 01/26] journal: correctly convert usec_t to timespec.
 
 Use timespec_store instead of (incorrectly) doing it inline.
 ---
diff --git a/0002-systemd-python-do-not-attempt-to-convert-str-to-byte.patch b/0002-systemd-python-do-not-attempt-to-convert-str-to-byte.patch
index 743090d..abca933 100644
--- a/0002-systemd-python-do-not-attempt-to-convert-str-to-byte.patch
+++ b/0002-systemd-python-do-not-attempt-to-convert-str-to-byte.patch
@@ -1,7 +1,7 @@
 From 67cbbab20c41dd3a7908bc9e50f56ce3ee607bf7 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Thu, 16 May 2013 00:38:39 -0400
-Subject: [PATCH 02/27] systemd-python: do not attempt to convert str to bytes
+Subject: [PATCH 02/26] systemd-python: do not attempt to convert str to bytes
 
 Bug-spotted-by: Steven Hiscocks <steven-systemd at hiscocks.me.uk>
 ---
diff --git a/0003-systemd-python-fix-iteration.patch b/0003-systemd-python-fix-iteration.patch
index 7895855..1b57f83 100644
--- a/0003-systemd-python-fix-iteration.patch
+++ b/0003-systemd-python-fix-iteration.patch
@@ -1,7 +1,7 @@
 From 451cbd3ce291b2e3205461068899bb55d7dcd9d4 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Wed, 17 Jul 2013 12:50:43 -0400
-Subject: [PATCH 03/27] systemd-python: fix iteration
+Subject: [PATCH 03/26] systemd-python: fix iteration
 
 Back in 6a58bf4135 raising stop iteration was removed from the C
 code, but wasn't added in the Python counterpart.
diff --git a/0004-systemctl-honor-no-legend-in-list-sockets.patch b/0004-systemctl-honor-no-legend-in-list-sockets.patch
index 94a0a9a..e9de3f3 100644
--- a/0004-systemctl-honor-no-legend-in-list-sockets.patch
+++ b/0004-systemctl-honor-no-legend-in-list-sockets.patch
@@ -1,7 +1,7 @@
 From 416783827045e646f8c104aa9a0719e738f53ca6 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= <grawity at gmail.com>
 Date: Mon, 20 May 2013 11:20:15 +0300
-Subject: [PATCH 04/27] systemctl: honor "--no-legend" in 'list-sockets'
+Subject: [PATCH 04/26] systemctl: honor "--no-legend" in 'list-sockets'
 
 ---
  src/systemctl/systemctl.c | 22 +++++++++++++---------
diff --git a/0005-service-kill-processes-with-SIGKILL-on-watchdog-fail.patch b/0005-service-kill-processes-with-SIGKILL-on-watchdog-fail.patch
index 0fe5cff..f8b3387 100644
--- a/0005-service-kill-processes-with-SIGKILL-on-watchdog-fail.patch
+++ b/0005-service-kill-processes-with-SIGKILL-on-watchdog-fail.patch
@@ -1,7 +1,7 @@
 From 1edd8011c0a9452d4f384551f06dd0c5f480c60f Mon Sep 17 00:00:00 2001
 From: Michael Olbrich <m.olbrich at pengutronix.de>
 Date: Sun, 19 May 2013 12:10:55 +0200
-Subject: [PATCH 05/27] service: kill processes with SIGKILL on watchdog
+Subject: [PATCH 05/26] service: kill processes with SIGKILL on watchdog
  failure
 
 Just calling service_enter_dead() does not kill any processes.
diff --git a/0006-Fix-CPUShares-configuration-option.patch b/0006-Fix-CPUShares-configuration-option.patch
index 2434b5b..23d274e 100644
--- a/0006-Fix-CPUShares-configuration-option.patch
+++ b/0006-Fix-CPUShares-configuration-option.patch
@@ -1,7 +1,7 @@
 From 099027082347d4c366d1f72e9e23d1939914d7bf Mon Sep 17 00:00:00 2001
 From: Eelco Dolstra <eelco.dolstra at logicblox.com>
 Date: Fri, 24 May 2013 13:34:53 -0400
-Subject: [PATCH 06/27] Fix CPUShares configuration option
+Subject: [PATCH 06/26] Fix CPUShares configuration option
 
 This fixes the error message "Unknown or unsupported cgroup attribute
 CPUShares".
diff --git a/0007-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch b/0007-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
index a531196..f887d1b 100644
--- a/0007-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
+++ b/0007-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
@@ -1,7 +1,7 @@
 From b2923bfc88c874b303efa86f51a53ba0a31f5aaa Mon Sep 17 00:00:00 2001
 From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
 Date: Tue, 28 May 2013 20:45:34 +0200
-Subject: [PATCH 07/27] journald: DO recalculate the ACL mask, but only if it
+Subject: [PATCH 07/26] journald: DO recalculate the ACL mask, but only if it
  doesn't exist
 
 Since 11ec7ce, journald isn't setting the ACLs properly anymore if
diff --git a/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch b/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch
index e14d1a6..807e7b2 100644
--- a/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch
+++ b/0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch
@@ -1,7 +1,7 @@
 From 184c94de2cd85228b729dac1fb5f59453cfbbbed Mon Sep 17 00:00:00 2001
 From: Ross Lagerwall <rosslagerwall at gmail.com>
 Date: Sun, 9 Jun 2013 17:28:44 +0100
-Subject: [PATCH 08/27] service: don't report alien child as alive when it's
+Subject: [PATCH 08/26] service: don't report alien child as alive when it's
  not
 
 When a sigchld is received from an alien child, main_pid is set to
diff --git a/0009-journal-remember-last-direction-of-search-and-keep-o.patch b/0009-journal-remember-last-direction-of-search-and-keep-o.patch
index bbfbcdf..8ea8b36 100644
--- a/0009-journal-remember-last-direction-of-search-and-keep-o.patch
+++ b/0009-journal-remember-last-direction-of-search-and-keep-o.patch
@@ -1,7 +1,7 @@
 From c17f7d8a60e17af4abb63668756f9237db3b9634 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Thu, 6 Jun 2013 22:28:05 -0400
-Subject: [PATCH 09/27] journal: remember last direction of search and keep
+Subject: [PATCH 09/26] journal: remember last direction of search and keep
  offset cache
 
 The fields in JournalFile are moved around to avoid wasting
diff --git a/0010-journal-letting-interleaved-seqnums-go.patch b/0010-journal-letting-interleaved-seqnums-go.patch
index fdd0c82..d8d4f11 100644
--- a/0010-journal-letting-interleaved-seqnums-go.patch
+++ b/0010-journal-letting-interleaved-seqnums-go.patch
@@ -1,7 +1,7 @@
 From 0bad6bf0e0c53e68bc41dd011ad22d4672de56eb Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Fri, 7 Jun 2013 22:01:03 -0400
-Subject: [PATCH 10/27] journal: letting (interleaved) seqnums go
+Subject: [PATCH 10/26] journal: letting (interleaved) seqnums go
 
 In the following scenario:
   server creates system.journal
diff --git a/0011-rules-drivers-always-call-kmod-even-when-a-driver-is.patch b/0011-rules-drivers-always-call-kmod-even-when-a-driver-is.patch
index 368ac15..f3d3cf7 100644
--- a/0011-rules-drivers-always-call-kmod-even-when-a-driver-is.patch
+++ b/0011-rules-drivers-always-call-kmod-even-when-a-driver-is.patch
@@ -1,7 +1,7 @@
 From 59eb9113f522703d80f2904c81825e4a165bb050 Mon Sep 17 00:00:00 2001
 From: Kay Sievers <kay at vrfy.org>
 Date: Sat, 20 Jul 2013 14:29:12 +0200
-Subject: [PATCH 11/27] rules: drivers - always call kmod, even when a driver
+Subject: [PATCH 11/26] rules: drivers - always call kmod, even when a driver
  is bound to the device
 
 On Sat, Jul 20, 2013 at 12:56 PM, Rafael J. Wysocki <rjw at sisk.pl> wrote:
diff --git a/0012-80-net-name-slot.rules-only-rename-network-interface.patch b/0012-80-net-name-slot.rules-only-rename-network-interface.patch
index 72aa308..cdc4e7a 100644
--- a/0012-80-net-name-slot.rules-only-rename-network-interface.patch
+++ b/0012-80-net-name-slot.rules-only-rename-network-interface.patch
@@ -1,7 +1,7 @@
 From 33e3e7fbcce582c26604d997df89e71908ac7999 Mon Sep 17 00:00:00 2001
 From: Harald Hoyer <harald at redhat.com>
 Date: Thu, 1 Aug 2013 12:31:38 +0200
-Subject: [PATCH 12/27] 80-net-name-slot.rules: only rename network interfaces
+Subject: [PATCH 12/26] 80-net-name-slot.rules: only rename network interfaces
  on ACTION=="add"
 
 Otherwise systemd-udevd will rename on "change" and "move" events,
diff --git a/0013-journal-fix-hashmap-leak-in-mmap-cache.patch b/0013-journal-fix-hashmap-leak-in-mmap-cache.patch
index c040dd5..5e3a406 100644
--- a/0013-journal-fix-hashmap-leak-in-mmap-cache.patch
+++ b/0013-journal-fix-hashmap-leak-in-mmap-cache.patch
@@ -1,7 +1,7 @@
 From 812882be86dcb30b2ab6e7f95dfcd393d972c781 Mon Sep 17 00:00:00 2001
 From: George McCollister <george.mccollister at gmail.com>
 Date: Thu, 1 Aug 2013 12:40:01 -0500
-Subject: [PATCH 13/27] journal: fix hashmap leak in mmap-cache
+Subject: [PATCH 13/26] journal: fix hashmap leak in mmap-cache
 
 hashmap_free() wasn't being called on m->contexts and m->fds resulting
 in a leak.
diff --git a/0014-fstab-generator-read-rd.fstab-on-off-switch-correctl.patch b/0014-fstab-generator-read-rd.fstab-on-off-switch-correctl.patch
index 465bcba..c615a8d 100644
--- a/0014-fstab-generator-read-rd.fstab-on-off-switch-correctl.patch
+++ b/0014-fstab-generator-read-rd.fstab-on-off-switch-correctl.patch
@@ -1,7 +1,7 @@
 From b09b841398cccd3794b9573d57828e810f5f33cb Mon Sep 17 00:00:00 2001
 From: WANG Chao <chaowang at redhat.com>
 Date: Fri, 9 Aug 2013 17:01:50 +0800
-Subject: [PATCH 14/27] fstab-generator: read rd.fstab=on/off switch correctly
+Subject: [PATCH 14/26] fstab-generator: read rd.fstab=on/off switch correctly
 
 ---
  src/fstab-generator/fstab-generator.c | 4 ++--
diff --git a/0015-fstab-generator-log_oom-if-automount_name-is-null.patch b/0015-fstab-generator-log_oom-if-automount_name-is-null.patch
index aee7d73..1c615a0 100644
--- a/0015-fstab-generator-log_oom-if-automount_name-is-null.patch
+++ b/0015-fstab-generator-log_oom-if-automount_name-is-null.patch
@@ -1,7 +1,7 @@
 From 591e3ca379b32a65aea20f84fba3f88dd0f85f9b Mon Sep 17 00:00:00 2001
 From: WANG Chao <chaowang at redhat.com>
 Date: Tue, 13 Aug 2013 16:38:19 +0800
-Subject: [PATCH 15/27] fstab-generator: log_oom() if automount_name is null
+Subject: [PATCH 15/26] fstab-generator: log_oom() if automount_name is null
 
 ---
  src/fstab-generator/fstab-generator.c | 2 +-
diff --git a/0016-journald-do-not-overwrite-syslog-facility-when-parsi.patch b/0016-journald-do-not-overwrite-syslog-facility-when-parsi.patch
index f622a89..3da9382 100644
--- a/0016-journald-do-not-overwrite-syslog-facility-when-parsi.patch
+++ b/0016-journald-do-not-overwrite-syslog-facility-when-parsi.patch
@@ -1,7 +1,7 @@
 From 9331382dd5caabd748d8fc28a0bc2a087ed8f9a8 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Mon, 10 Jun 2013 18:10:12 -0400
-Subject: [PATCH 16/27] journald: do not overwrite syslog facility when parsing
+Subject: [PATCH 16/26] journald: do not overwrite syslog facility when parsing
  priority
 
 https://bugs.freedesktop.org/show_bug.cgi?id=65610
diff --git a/0017-journal-fix-parsing-of-facility-in-syslog-messages.patch b/0017-journal-fix-parsing-of-facility-in-syslog-messages.patch
index 89653cb..2ba7839 100644
--- a/0017-journal-fix-parsing-of-facility-in-syslog-messages.patch
+++ b/0017-journal-fix-parsing-of-facility-in-syslog-messages.patch
@@ -1,7 +1,7 @@
 From 5ca24e3f6deaba05049e4b0e4d8cea8a31f9eea0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Fri, 26 Jul 2013 12:57:33 -0400
-Subject: [PATCH 17/27] journal: fix parsing of facility in syslog messages
+Subject: [PATCH 17/26] journal: fix parsing of facility in syslog messages
 
 In 49998b383 (journald: do not overwrite syslog facility when
 parsing priority) journald started ignoring facility part when
diff --git a/0018-libudev-fix-memleak-when-enumerating-childs.patch b/0018-libudev-fix-memleak-when-enumerating-childs.patch
index c1c4066..0296542 100644
--- a/0018-libudev-fix-memleak-when-enumerating-childs.patch
+++ b/0018-libudev-fix-memleak-when-enumerating-childs.patch
@@ -1,7 +1,7 @@
 From fa74dedd21c2c64dc6cf20f49be9db32d909db74 Mon Sep 17 00:00:00 2001
 From: David Herrmann <dh.herrmann at gmail.com>
 Date: Wed, 4 Sep 2013 12:36:19 +0200
-Subject: [PATCH 18/27] libudev: fix memleak when enumerating childs
+Subject: [PATCH 18/26] libudev: fix memleak when enumerating childs
 
 We need to free udev-devices again if they don't match. Funny that no-one
 noticed it yet since valgrind is quite verbose about it.
diff --git a/0019-libudev-enumerate-fix-NULL-deref-for-subsystem-match.patch b/0019-libudev-enumerate-fix-NULL-deref-for-subsystem-match.patch
index 1d9fbde..85dedb3 100644
--- a/0019-libudev-enumerate-fix-NULL-deref-for-subsystem-match.patch
+++ b/0019-libudev-enumerate-fix-NULL-deref-for-subsystem-match.patch
@@ -1,7 +1,7 @@
 From 0006eedfd2596b69a6d62e0ae6ec7cfeec20ce0c Mon Sep 17 00:00:00 2001
 From: David Herrmann <dh.herrmann at gmail.com>
 Date: Fri, 30 Aug 2013 15:50:41 +0200
-Subject: [PATCH 19/27] libudev: enumerate: fix NULL-deref for
+Subject: [PATCH 19/26] libudev: enumerate: fix NULL-deref for
  subsystem-matches
 
 udev_device_get_subsystem() may return NULL if no subsystem could be
diff --git a/0020-systemd-coredump-Ignore-coredumps-larger-than-COREDU.patch b/0020-systemd-coredump-Ignore-coredumps-larger-than-COREDU.patch
index 2cb271e..0c2eca4 100644
--- a/0020-systemd-coredump-Ignore-coredumps-larger-than-COREDU.patch
+++ b/0020-systemd-coredump-Ignore-coredumps-larger-than-COREDU.patch
@@ -1,7 +1,7 @@
 From 27b1a19a3c1c42a3af0d3970ca5b5cb5b24c7254 Mon Sep 17 00:00:00 2001
 From: Andrew Cook <ariscop at gmail.com>
 Date: Wed, 4 Sep 2013 23:27:40 +1000
-Subject: [PATCH 20/27] systemd-coredump: Ignore coredumps larger than
+Subject: [PATCH 20/26] systemd-coredump: Ignore coredumps larger than
  COREDUMP_MAX
 
 Currently this check happens when the coredump has been collected in
diff --git a/0021-journalctl-use-_COMM-match-for-scripts.patch b/0021-journalctl-use-_COMM-match-for-scripts.patch
index ad9203b..c13cf90 100644
--- a/0021-journalctl-use-_COMM-match-for-scripts.patch
+++ b/0021-journalctl-use-_COMM-match-for-scripts.patch
@@ -1,7 +1,7 @@
 From 7d3f06fa516a0eacad9ca9a17c433ca7e4f5876a Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Fri, 19 Jul 2013 04:02:50 -0400
-Subject: [PATCH 21/27] journalctl: use _COMM= match for scripts
+Subject: [PATCH 21/26] journalctl: use _COMM= match for scripts
 
 In case of scripts, _EXE is set to the interpreter name, and
 _COMM is set based on the file name. Add a match for _COMM,
diff --git a/0022-Allow-tabs-in-environment-files.patch b/0022-Allow-tabs-in-environment-files.patch
index cac3f66..c2053d3 100644
--- a/0022-Allow-tabs-in-environment-files.patch
+++ b/0022-Allow-tabs-in-environment-files.patch
@@ -1,7 +1,7 @@
 From c884f73cb754db77632a84830e5a058827d732e5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Wed, 11 Sep 2013 21:50:16 -0400
-Subject: [PATCH 22/27] Allow tabs in environment files
+Subject: [PATCH 22/26] Allow tabs in environment files
 
 bash allows them, and so should we.
 
diff --git a/0023-Actually-allow-tabs-in-environment-files.patch b/0023-Actually-allow-tabs-in-environment-files.patch
index 65007c7..e2e25a5 100644
--- a/0023-Actually-allow-tabs-in-environment-files.patch
+++ b/0023-Actually-allow-tabs-in-environment-files.patch
@@ -1,7 +1,7 @@
 From f3e54e0678ed5cf42ce21ef83cf4640889db1f5d Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Thu, 12 Sep 2013 10:03:16 -0400
-Subject: [PATCH 23/27] Actually allow tabs in environment files
+Subject: [PATCH 23/26] Actually allow tabs in environment files
 
 Fixup for ac4c8d6da8b5e.
 ---
diff --git a/0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch b/0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch
index d1f116f..698a623 100644
--- a/0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch
+++ b/0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch
@@ -1,7 +1,7 @@
 From 90c6172bd8c7e40cba714737f5a5f5364dc56084 Mon Sep 17 00:00:00 2001
 From: Michal Sekletar <msekleta at redhat.com>
 Date: Thu, 12 Sep 2013 15:42:24 +0200
-Subject: [PATCH 24/27] systemctl: process only signals for jobs we really wait
+Subject: [PATCH 24/26] systemctl: process only signals for jobs we really wait
  for
 
 wait_filter() callback shouldn't process JobRemove signals for arbitrary
diff --git a/0025-cgtop-fixup-the-online-help.patch b/0025-cgtop-fixup-the-online-help.patch
index 141ae3e..e6097a2 100644
--- a/0025-cgtop-fixup-the-online-help.patch
+++ b/0025-cgtop-fixup-the-online-help.patch
@@ -1,7 +1,7 @@
 From fc9783ea51072f062a98f1541481355bac3aee3b Mon Sep 17 00:00:00 2001
 From: Brandon Philips <brandon at ifup.co>
 Date: Tue, 3 Sep 2013 21:34:02 -0700
-Subject: [PATCH 25/27] cgtop: fixup the online help
+Subject: [PATCH 25/26] cgtop: fixup the online help
 
 The online help shows the keys as uppercase but the code and manpage say
 lower case. Make the online help follow reality.
diff --git a/0027-transaction.c-do-not-point-users-to-logs-when-unit-n.patch b/0026-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
similarity index 94%
rename from 0027-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
rename to 0026-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
index 93e8bee..7a240dd 100644
--- a/0027-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
+++ b/0026-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
@@ -1,7 +1,7 @@
-From 71a73884d42ffb3a2b4d64f099a145b9abc2eee0 Mon Sep 17 00:00:00 2001
+From 6756886b2193392af72c7a497b70ded76eef5c22 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek at in.waw.pl>
 Date: Sun, 15 Sep 2013 12:15:38 -0400
-Subject: [PATCH 27/27] transaction.c: do not point users to logs when unit not
+Subject: [PATCH 26/26] transaction.c: do not point users to logs when unit not
  found
 
 The logs are unlikely to contain any useful information in this case.
diff --git a/systemd.spec b/systemd.spec
index b4785e9..00355a6 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -70,8 +70,7 @@ Patch22:        0022-Allow-tabs-in-environment-files.patch
 Patch23:        0023-Actually-allow-tabs-in-environment-files.patch
 Patch24:        0024-systemctl-process-only-signals-for-jobs-we-really-wa.patch
 Patch25:        0025-cgtop-fixup-the-online-help.patch
-Patch26:        0026-man-fix-description-of-sysctl.d-order.patch
-Patch27:        0027-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
+Patch26:        0026-transaction.c-do-not-point-users-to-logs-when-unit-n.patch
 
 # git diff --src-prefix=a/ --dst-prefix=b/ v204 -- hwdb/ > systemd-hwdb.patch
 Patch99:        systemd-hwdb.patch


More information about the scm-commits mailing list