[Initscripts-ng-commits] r1058 - in /trunk/src/insserv/debian: changelog patches/30_interactive_regexp_match_fix.patch patches/series

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Fri May  7 07:21:18 2010
New Revision: 1058

URL: http://svn.debian.org/wsvn/initscripts-ng/?sc=1&rev=1058
Log:
Add 30_interactive_regexp_match_fix.patch which fixes failure to
properly match the correct group in the regular expression used on
the X-Interactive keyword. (Closes: #580564)

Added:
    trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.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=1058&op=diff
==============================================================================
--- trunk/src/insserv/debian/changelog (original)
+++ trunk/src/insserv/debian/changelog Fri May  7 07:21:18 2010
@@ -1,16 +1,22 @@
 insserv (1.14.0-2) UNRELEASED; urgency=low
 
+  [ Kel Modderman ]
   * Add 21_tweak_warnings.patch to make insserv warn about differing on
     disk state/LSB runlevel info for the script(s) in its argument list.
     (Closes: #578308)
   * Add 100_show.patch which allows insserv --showall to dump start/stop
     bit, sequence number, runlevels and script name in the format:
     SK:NUM:RUNLEVELS:SCRIPT. (Closes: #573004)
+  * Add 30_interactive_regexp_match_fix.patch which fixes failure to
+    properly match the correct group in the regular expression used on
+    the X-Interactive keyword. (Closes: #580564)
+
+  [ Petter Reinholdtsen ]
   * Improve the output from make-testsuite. 
   * Adjust the test_x_interactive behaviour to make sure it fails with
     a fatal error if X-Interactive: true do not work.
 
- -- Kel Modderman <kel at otaku42.de>  Mon, 03 May 2010 19:12:23 +1000
+ -- Kel Modderman <kel at otaku42.de>  Fri, 07 May 2010 17:20:47 +1000
 
 insserv (1.14.0-1) unstable; urgency=low
 

Added: trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.patch
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.patch?rev=1058&op=file
==============================================================================
--- trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.patch (added)
+++ trunk/src/insserv/debian/patches/30_interactive_regexp_match_fix.patch Fri May  7 07:21:18 2010
@@ -1,0 +1,21 @@
+Description: Fix regular expression match for X-Interactive keyword, it was
+ off-by-one match group and thus always returned 'X-'.
+From: Kel Modderman <kel at otaku42.de>
+---
+--- a/insserv.c
++++ b/insserv.c
+@@ -1378,10 +1378,10 @@ static uchar scan_lsb_headers(const int
+ 		description = empty;
+ 	}
+ 
+-	if (!interactive    && regexecutor(&reg.interact,      COMMON_ARGS) == true) {
+-	    if (val->rm_so < val->rm_eo) {
+-		*(pbuf+val->rm_eo) = '\0';
+-		interactive = xstrdup(pbuf+val->rm_so);
++	if (!interactive    && regexecutor(&reg.interact,  COMMON_SHD_ARGS) == true) {
++	    if (shl->rm_so < shl->rm_eo) {
++		*(pbuf+shl->rm_eo) = '\0';
++		interactive = xstrdup(pbuf+shl->rm_so);
+ 	    } else
+ 		interactive = empty;
+ 	}

Modified: trunk/src/insserv/debian/patches/series
URL: http://svn.debian.org/wsvn/initscripts-ng/trunk/src/insserv/debian/patches/series?rev=1058&op=diff
==============================================================================
--- trunk/src/insserv/debian/patches/series (original)
+++ trunk/src/insserv/debian/patches/series Fri May  7 07:21:18 2010
@@ -2,5 +2,6 @@
 11_debian_conf.patch
 20_manpage_spelling.patch
 21_tweak_warnings.patch
+30_interactive_regexp_match_fix.patch
 92_m68k_alignment.patch
 100_show.patch