r1930 - in packages/libapache-configfile-perl/trunk/debian: . patches

[Niko Tyni]

Author: ntyni-guest
Date: 2006-01-15 20:14:59 +0000 (Sun, 15 Jan 2006)
New Revision: 1930

Added:
   packages/libapache-configfile-perl/trunk/debian/patches/30novalue.dpatch
Modified:
   packages/libapache-configfile-perl/trunk/debian/changelog
   packages/libapache-configfile-perl/trunk/debian/patches/00list
Log:
Fix #329154: errors parsing /etc/apache/modules.conf


Modified: packages/libapache-configfile-perl/trunk/debian/changelog
===================================================================
--- packages/libapache-configfile-perl/trunk/debian/changelog	2006-01-15 20:09:22 UTC (rev 1929)
+++ packages/libapache-configfile-perl/trunk/debian/changelog	2006-01-15 20:14:59 UTC (rev 1930)
@@ -8,8 +8,12 @@
   * Remove leftover extra Maintainer line.
   * Upgrade to Standards-Version 3.6.2. No changes needed.
   * Don't ignore the return value of 'make distclean'.
+  * debian/patches/30novalue.dpatch:
+    + handle lines like 'ClearModuleList', where there's no value for the
+      variable. Thanks to Jason Thomas <jason at debian.org> for the patch.
+      (Closes: #329154)
 
- -- Niko Tyni <ntyni at iki.fi>  Sun, 15 Jan 2006 22:01:27 +0200
+ -- Niko Tyni <ntyni at iki.fi>  Sun, 15 Jan 2006 22:12:57 +0200
 
 libapache-configfile-perl (1.18-4) unstable; urgency=low
 

Modified: packages/libapache-configfile-perl/trunk/debian/patches/00list
===================================================================
--- packages/libapache-configfile-perl/trunk/debian/patches/00list	2006-01-15 20:09:22 UTC (rev 1929)
+++ packages/libapache-configfile-perl/trunk/debian/patches/00list	2006-01-15 20:14:59 UTC (rev 1930)
@@ -1,2 +1,3 @@
 10dirs.dpatch
 20newline.dpatch
+30novalue.dpatch

Added: packages/libapache-configfile-perl/trunk/debian/patches/30novalue.dpatch
===================================================================
--- packages/libapache-configfile-perl/trunk/debian/patches/30novalue.dpatch	2006-01-15 20:09:22 UTC (rev 1929)
+++ packages/libapache-configfile-perl/trunk/debian/patches/30novalue.dpatch	2006-01-15 20:14:59 UTC (rev 1930)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30novalue.dpatch by Niko Tyni <ntyni at iki.fi>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: handle lines like 'ClearModuleList', where there's no value for the 
+## DP: variable. (#329154, patch by Jason Thomas)
+
+ at DPATCH@
+diff -urNad trunk~/ConfigFile.pm trunk/ConfigFile.pm
+--- trunk~/ConfigFile.pm	2006-01-15 22:11:00.116633689 +0200
++++ trunk/ConfigFile.pm	2006-01-15 22:11:42.666327129 +0200
+@@ -275,6 +275,7 @@
+         # Split up the key and the value. The @val regexp code dynamically
+         # differentiates between "space strings" and array, values.
+         my($key, $r) = $confline =~ m!^\s*\s*(\w+)\s*(?=\s+)(.*)!;             # split up key
++        ($key, $r) = ($confline, 1) unless $key;
+         my(@val)     = $r =~ m!\s+(?:\"([^\"]*[^\\])\"|([^\s,]+))\n?!g;   # split up val
+         @val = grep { defined } @val;                             # lose undef values
+ 


Property changes on: packages/libapache-configfile-perl/trunk/debian/patches/30novalue.dpatch
___________________________________________________________________
Name: svn:executable
   + *