From c0431dd9e85b164879bf423f31ee69f19fe594a7ba550735c496eb8ce4b18969 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
Date: Thu, 24 May 2012 12:06:55 +0000
Subject: [PATCH] - Update new-lsb-headers.patch to handle entries written
 after   description tag (bnc#727771, bnc#747931).

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=274
---
 new-lsb-headers.patch | 32 ++++++++++++++++----------------
 systemd.changes       |  6 ++++++
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/new-lsb-headers.patch b/new-lsb-headers.patch
index fbf46ede..e0b07870 100644
--- a/new-lsb-headers.patch
+++ b/new-lsb-headers.patch
@@ -1,8 +1,8 @@
-Index: systemd-41/src/service.c
+Index: systemd-44/src/service.c
 ===================================================================
---- systemd-41.orig/src/service.c
-+++ systemd-41/src/service.c
-@@ -119,6 +119,7 @@ static void service_init(Unit *u) {
+--- systemd-44.orig/src/service.c
++++ systemd-44/src/service.c
+@@ -122,6 +122,7 @@ static void service_init(Unit *u) {
  #ifdef HAVE_SYSV_COMPAT
          s->sysv_start_priority = -1;
          s->sysv_start_priority_from_rcnd = -1;
@@ -10,10 +10,10 @@ Index: systemd-41/src/service.c
  #endif
          s->socket_fd = -1;
          s->guess_main_pid = true;
-@@ -861,6 +862,34 @@ static int service_load_sysv_path(Servic
+@@ -840,6 +841,34 @@ static int service_load_sysv_path(Servic
+                                 free(short_description);
+                                 short_description = d;
  
-                                 } else
-                                         state = LSB;
 +                        } else if (startswith_no_case(t, "PIDFile:")) {
 +                                char *fn;
 +
@@ -42,10 +42,10 @@ Index: systemd-41/src/service.c
 +                                        s->remain_after_exit = parse_boolean(j);
 +                                        s->sysv_remain_after_exit_heuristic = false;
 +                                }
-                         }
-                 }
-         }
-@@ -891,7 +920,8 @@ static int service_load_sysv_path(Servic
+                         } else if (state == LSB_DESCRIPTION) {
+ 
+                                 if (startswith(l, "#\t") || startswith(l, "#  ")) {
+@@ -894,7 +923,8 @@ static int service_load_sysv_path(Servic
  
          /* Special setting for all SysV services */
          s->type = SERVICE_FORKING;
@@ -55,7 +55,7 @@ Index: systemd-41/src/service.c
          s->guess_main_pid = false;
          s->restart = SERVICE_RESTART_NO;
          s->exec_context.ignore_sigpipe = false;
-@@ -2030,7 +2060,7 @@ static void service_enter_running(Servic
+@@ -2036,7 +2066,7 @@ static void service_enter_running(Servic
          if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
              (s->bus_name_good || s->type != SERVICE_DBUS)) {
  #ifdef HAVE_SYSV_COMPAT
@@ -64,11 +64,11 @@ Index: systemd-41/src/service.c
                          s->remain_after_exit = false;
  #endif
                  service_set_state(s, SERVICE_RUNNING);
-Index: systemd-41/src/service.h
+Index: systemd-44/src/service.h
 ===================================================================
---- systemd-41.orig/src/service.h
-+++ systemd-41/src/service.h
-@@ -157,6 +157,7 @@ struct Service {
+--- systemd-44.orig/src/service.h
++++ systemd-44/src/service.h
+@@ -166,6 +166,7 @@ struct Service {
  #ifdef HAVE_SYSV_COMPAT
          bool sysv_has_lsb:1;
          bool sysv_enabled:1;
diff --git a/systemd.changes b/systemd.changes
index f1a5ed61..0eaca842 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu May 24 11:45:54 UTC 2012 - fcrozat@suse.com
+
+- Update new-lsb-headers.patch to handle entries written after
+  description tag (bnc#727771, bnc#747931).
+
 -------------------------------------------------------------------
 Thu May  3 11:40:20 UTC 2012 - fcrozat@suse.com