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

[pere at users.alioth.debian.org]

Author: pere
Date: Wed Feb 12 22:48:14 2014
New Revision: 1096

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1096
Log:
Add new patch 200_upstream-fixes.patch fetched upstream to fix buffer
overflow and systemd detection.

Added:
    trunk/src/insserv/debian/patches/200_upstream-fixes.patch
Modified:
    trunk/src/insserv/debian/changelog
    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=1096&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog	(original)
+++ trunk/src/insserv/debian/changelog	Wed Feb 12 22:48:14 2014
@@ -1,3 +1,10 @@
+insserv (1.16.0-2) UNRELEASED; urgency=low
+
+  * Add new patch 200_upstream-fixes.patch fetched upstream to fix buffer
+    overflow and systemd detection.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Wed, 12 Feb 2014 23:47:35 +0100
+
 insserv (1.16.0-1) experimental; urgency=low
 
   * New upstream version.

Added: 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=1096&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/200_upstream-fixes.patch	(added)
+++ trunk/src/insserv/debian/patches/200_upstream-fixes.patch	Wed Feb 12 22:48:14 2014
@@ -0,0 +1,81 @@
+Description: Fix buffer overflow and incorrect handling of systemd detection
+ Patch fetched from upstream svn.
+Author: Petter Reinholdtsen <pere at debian.org>
+Status: applied upstream
+
+Forwarded: already present
+Reviewed-By: Petter Reinholdtsen <pere at debian.org>
+Last-Update: 2014-02-12
+
+Index: a/systemd.c
+===================================================================
+--- b/systemd.c	(revision 122)
++++ a/systemd.c	(working copy)
+@@ -404,7 +404,8 @@
+ 	bus = dbus_bus_get_private(DBUS_BUS_SYSTEM, &error);
+ 
+     if (!bus) {
+-	warn ("can not connect systemd: %s\n", error.message);
++	if (errno != ENOENT)
++	    warn ("can not connect systemd: %s\n", error.message);
+ 	goto err;
+     }
+     dbus_connection_set_exit_on_disconnect(bus, FALSE);
+@@ -425,9 +426,9 @@
+     return bus;
+ perm:
+     warn ("can not connect to systemd: %m\n");
+-err:
+     dbus_connection_close(bus);
+     dbus_connection_unref(bus);
++err:
+     if (dbus_error_is_set(&error))
+ 	dbus_error_free(&error);
+     return (DBusConnection*)0;
+Index: a/insserv.c
+===================================================================
+--- a/insserv.c	(revision 122)
++++ b/insserv.c	(working copy)
+@@ -2863,7 +2863,7 @@
+ 	char * tmp;
+ 	if (*path != '/') {
+ 	    char * pwd = getcwd((char*)0, 0);
+-	    size_t len = strlen(pwd)+1+strlen(path);
++	    size_t len = strlen(pwd)+2+strlen(path);
+ 	    root = (char*)malloc(len);
+ 	    if (!root)
+ 		error("%s", strerror(errno));
+@@ -2942,33 +2942,11 @@
+     if (systemd)
+ 	import_systemd_facilities();
+ 
+-    {
+-	list_t *ptr;
+-	list_for_each(ptr, sysfaci_start) {
+-	    list_t *iptr, *head = &getfaci(ptr)->replace;
+-	    printf("%s : ", getfaci(ptr)->name);
+-	    np_list_for_each(iptr, head)
+-		printf("%s ", getrepl(iptr)->name);
+-	    printf("\n");
+-	}
+-    }
+-
+     /*
+      * Expand system facilities to real services
+      */
+     expand_conf();
+ 
+-    {
+-	list_t *ptr;
+-	list_for_each(ptr, sysfaci_start) {
+-	    list_t *iptr, *head = &getfaci(ptr)->replace;
+-	    printf("%s : ", getfaci(ptr)->name);
+-	    np_list_for_each(iptr, head)
+-		printf("%s ", getrepl(iptr)->name);
+-	    printf("\n");
+-	}
+-    }
+-
+     /*
+      * Handle Systemd services (<name>.service -> <name>)
+      */

Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=1096&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series	(original)
+++ trunk/src/insserv/debian/patches/series	Wed Feb 12 22:48:14 2014
@@ -11,3 +11,4 @@
 170_if-scope.patch
 180_default_runlevels.patch
 190_disable_debug_output.patch
+200_upstream-fixes.patch