[Initscripts-ng-commits] r1097 - in /trunk/src/insserv/debian: changelog patches/190_disable_debug_output.patch patches/200_upstream-fixes.patch patches/series

[pere at users.alioth.debian.org]

Author: pere
Date: Thu Feb 13 07:39:48 2014
New Revision: 1097

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1097
Log:
* Added new patch 200_upstream-fixes.patch fetched upstream to fix buffer
  overflow, systemd detection and unwanted debug output
* Dropped patch 190_disable_debug_output.patch done obsolete by
  200_upstream-fixes.patch.

Removed:
    trunk/src/insserv/debian/patches/190_disable_debug_output.patch
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/200_upstream-fixes.patch
    trunk/src/insserv/debian/patches/series

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=1097&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog	(original)
+++ trunk/src/insserv/debian/changelog	Thu Feb 13 07:39:48 2014
@@ -1,7 +1,9 @@
 insserv (1.16.0-2) UNRELEASED; urgency=low
 
-  * Add new patch 200_upstream-fixes.patch fetched upstream to fix buffer
-    overflow and systemd detection.
+  * Added new patch 200_upstream-fixes.patch fetched upstream to fix buffer
+    overflow, systemd detection and unwanted debug output
+  * Dropped patch 190_disable_debug_output.patch done obsolete by
+    200_upstream-fixes.patch.
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 12 Feb 2014 23:47:35 +0100
 

Modified: trunk/src/insserv/debian/patches/200_upstream-fixes.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/200_upstream-fixes.patch?rev=1097&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/200_upstream-fixes.patch	(original)
+++ trunk/src/insserv/debian/patches/200_upstream-fixes.patch	Thu Feb 13 07:39:48 2014
@@ -7,10 +7,10 @@
 Reviewed-By: Petter Reinholdtsen <pere at debian.org>
 Last-Update: 2014-02-12
 
-Index: a/systemd.c
+Index: insserv/systemd.c
 ===================================================================
---- b/systemd.c	(revision 122)
-+++ a/systemd.c	(working copy)
+--- insserv.orig/systemd.c	2014-02-13 08:36:37.189756931 +0100
++++ insserv/systemd.c	2014-02-13 08:37:19.770005203 +0100
 @@ -404,7 +404,8 @@
  	bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
  
@@ -32,11 +32,11 @@
      if (dbus_error_is_set(&error))
  	dbus_error_free(&error);
      return (DBusConnection*)0;
-Index: a/insserv.c
+Index: insserv/insserv.c
 ===================================================================
---- a/insserv.c	(revision 122)
-+++ b/insserv.c	(working copy)
-@@ -2863,7 +2863,7 @@
+--- insserv.orig/insserv.c	2014-02-13 08:37:19.750005089 +0100
++++ insserv/insserv.c	2014-02-13 08:37:19.770005203 +0100
+@@ -2867,7 +2867,7 @@
  	char * tmp;
  	if (*path != '/') {
  	    char * pwd = getcwd((char*)0, 0);
@@ -45,7 +45,7 @@
  	    root = (char*)malloc(len);
  	    if (!root)
  		error("%s", strerror(errno));
-@@ -2942,33 +2942,11 @@
+@@ -2946,33 +2946,11 @@
      if (systemd)
  	import_systemd_facilities();
  

Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=1097&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series	(original)
+++ trunk/src/insserv/debian/patches/series	Thu Feb 13 07:39:48 2014
@@ -10,5 +10,4 @@
 160_manual_page_update.patch
 170_if-scope.patch
 180_default_runlevels.patch
-190_disable_debug_output.patch
 200_upstream-fixes.patch