Merge lp:~davewalker/ubuntu/lucid/logrotate/lp387189 into lp:ubuntu/lucid/logrotate

[Dave Walker]

[Chuck Short (zulcss)]

Looks good to me

review: Approve

Unmerged revisions

15. By Dave Walker on 2011-02-01

debian/patches/parser571033.patch: Fix the config parser to not get
confused when a wildcard produces no results, which caused /dev/null
to be rotated. (LP: #387189)

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-07 00:56:16 +0000
+++ debian/changelog	2011-02-01 14:26:30 +0000
@@ -1,3 +1,11 @@
+logrotate (3.7.8-4ubuntu2.1) lucid-proposed; urgency=low
+
+  * debian/patches/parser571033.patch: Fix the config parser to not get 
+    confused when a wildcard produces no results, which caused /dev/null
+    to be rotated. (LP: #387189)
+
+ -- Dave Walker (Daviey) <[e-mail]>  Tue, 01 Feb 2011 13:51:08 +0000
+
 logrotate (3.7.8-4ubuntu2) lucid; urgency=low
 
   * rebuild rest of main for armel armv7/thumb2 optimization;

=== added file 'debian/patches/parser571033.patch'
--- debian/patches/parser571033.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/parser571033.patch	2011-02-01 14:26:30 +0000
@@ -0,0 +1,45 @@
+Description: Fix the config parser to not get confused when a wildcard produces no 
+ results, which caused /dev/null to be rotated. (LP: #387189)
+Author: Paul Martin <[e-mail]>
+Origin: Cherry picked from package version, >= 3.7.8-6.
+Bug-Ubuntu: https://launchpad.net/bugs/387189
+Bug-Debian: http://bugs.debian.org/571033
+--- a/config.c
++++ b/config.c
+@@ -574,9 +574,34 @@
+ 			    configFile, lineNum);
+ 		    return 1;
+ 		} else if (*start == '\n') {
+-		    lineNum++;
++		    while (isspace(*start) && (*start)) {
++			if (*start == '\n')
++			    lineNum++;
++			start++;
++		    }
++		} else if (
++		    (strncmp(start, "postrotate", 10) == 0) ||
++		    (strncmp(start, "prerotate", 9) == 0) ||
++		    (strncmp(start, "firstrotate", 11) == 0) ||
++		    (strncmp(start, "lastrotate", 10) == 0)
++		    )
++		{
++		    while (*start) {
++			while ((*start != '\n') && (*start))
++			    start++;
++			while (isspace(*start) && (*start)) {
++			    if (*start == '\n')
++				lineNum++;
++			    start++;
++			}
++			if (strncmp(start, "endscript", 9) == 0) {
++			    start += 9;
++			    break;
++			}
++		    }
++		} else {
++		    start++;
+ 		}
+-		start++;
+ 	    }
+ 	    start++;
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2009-08-16 12:40:24 +0000
+++ debian/patches/series	2011-02-01 14:26:30 +0000
@@ -16,3 +16,4 @@
 create-388608.patch
 nofollow.patch
 security-388608.patch
+parser571033.patch