[Initscripts-ng-commits] r572 - in /trunk/src/insserv/debian: changelog patches/00list patches/10_nosuse.dpatch patches/40_segfault_virtprov.dpatch

[pere at users.alioth.debian.org]

Author: pere
Date: Fri Feb  1 08:21:37 2008
New Revision: 572

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=572
Log:
  * Changed patch 10_nosuse.dpatch to make sure we build with -g.
  * Added patch debian/patches/40_segfault_virtprov.dpatch to avoid
    segfault when finding an enabled script that provide a virtual
    system facility.

Added:
    trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch   (with props)
Modified:
    trunk/src/insserv/debian/changelog
    trunk/src/insserv/debian/patches/00list
    trunk/src/insserv/debian/patches/10_nosuse.dpatch

Modified: trunk/src/insserv/debian/changelog
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/changelog?rev=572&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Fri Feb  1 08:21:37 2008
@@ -7,6 +7,10 @@
   * Changed update-bootsystem-insserv to refuse to enable dependency
     based boot sequencing when a script provide a virtual system
     facility.
+  * Changed patch 10_nosuse.dpatch to make sure we build with -g.
+  * Added patch debian/patches/40_segfault_virtprov.dpatch to avoid
+    segfault when finding an enabled script that provide a virtual
+    system facility.
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri,  1 Feb 2008 08:27:22 +0100
 

Modified: trunk/src/insserv/debian/patches/00list
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/00list?rev=572&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/00list (original)
+++ trunk/src/insserv/debian/patches/00list Fri Feb  1 08:21:37 2008
@@ -1,2 +1,3 @@
 10_nosuse
 31_debian_conf
+40_segfault_virtprov

Modified: trunk/src/insserv/debian/patches/10_nosuse.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/10_nosuse.dpatch?rev=572&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/10_nosuse.dpatch (original)
+++ trunk/src/insserv/debian/patches/10_nosuse.dpatch Fri Feb  1 08:21:37 2008
@@ -2,7 +2,7 @@
 ## 10_nosuse.dpatch by Petter Reinholdtsen
 ## Updated for insserv v1.10 by PEtter Reinholdtsen
 
-Disable the SUSE specific parts.
+Disable the SUSE specific parts and make sure to build with debugging.
 
 @DPATCH@
 diff -urNad insserv-1.10.0~/Makefile insserv-1.10.0/Makefile
@@ -17,3 +17,12 @@
  DESTDIR	 =
  VERSION	 =	1.10.0
  DATE	 =	$(shell date +'%d%b%y' | tr '[:lower:]' '[:upper:]')
+@@ -25,7 +25,7 @@
+ ifeq ($(ARCH),i386)
+ 	  COPTS = -O2 -mcpu=i586 -mtune=i686
+ else
+-	  COPTS = -O2
++	  COPTS = -O2 -g
+ endif
+ endif
+ 	 CFLAGS = -Wall $(COPTS) $(DEBUG) $(LOOPS) -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \

Added: trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch?rev=572&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch (added)
+++ trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch Fri Feb  1 08:21:37 2008
@@ -1,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 40_segfault_virtprov.dpatch by Petter Reinholdtsen
+
+Avoid segfault when an enabled service provide a virtual system
+facility.
+
+ at DPATCH@
+--- insserv-1.11.0.orig/insserv.c
++++ insserv-1.11.0/insserv.c
+@@ -2856,7 +2861,8 @@
+ 	 */
+ 	while ((d = readdir(rcdir)) != (struct dirent*)0) {
+ 	    const char * ptr = d->d_name;
+-	    serv_t * serv;
++	    serv_t * serv = 0;
++	    const char * prov;
+ 
+ 	    if (*ptr != 'S' && *ptr != 'K')
+ 		continue;
+@@ -2865,11 +2871,14 @@
+ 	    if (strspn(ptr, "0123456789") != 2)
+ 		continue;
+ 	    ptr += 2;
+-	    serv = findserv(getprovides(ptr));
+ 
+ 	    if (stat(d->d_name, &st_script) < 0)
+ 		xremove(d->d_name);	/* dangling sym link */
+ 
++	    prov = getprovides(ptr);
++	    if (prov)
++	        serv = findserv(prov);
++
+ 	    if (!serv) continue;
+ 
+ 	    if (defaults && !(serv->opts & SERV_ENABLED))

Propchange: trunk/src/insserv/debian/patches/40_segfault_virtprov.dpatch
------------------------------------------------------------------------------
    svn:executable = *