r32039 - in /trunk/libapache-configfile-perl/debian: changelog patches/10dirs.patch patches/15globs.patch patches/20newline.patch patches/30novalue.patch patches/series

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri Mar 13 22:02:46 2009
New Revision: 32039

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=32039
Log:
tentative fix for #519271. please review.

Added:
    trunk/libapache-configfile-perl/debian/patches/15globs.patch
Modified:
    trunk/libapache-configfile-perl/debian/changelog
    trunk/libapache-configfile-perl/debian/patches/10dirs.patch
    trunk/libapache-configfile-perl/debian/patches/20newline.patch
    trunk/libapache-configfile-perl/debian/patches/30novalue.patch
    trunk/libapache-configfile-perl/debian/patches/series

Modified: trunk/libapache-configfile-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/changelog?rev=32039&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/changelog (original)
+++ trunk/libapache-configfile-perl/debian/changelog Fri Mar 13 22:02:46 2009
@@ -5,6 +5,9 @@
   * debian/control: Changed: Switched Vcs-Browser field to ViewSVN
     (source stanza).
   * debian/control: Added: ${misc:Depends} to Depends: field.
+  * Add new patch 15globs.patch to support Include lines with file globbing;
+    thanks to Stefan Schlesinger for the bug report (closes: #519271). Refresh
+    other patches.
 
  -- gregor herrmann <gregoa at debian.org>  Wed, 06 Aug 2008 21:33:13 -0300
 

Modified: trunk/libapache-configfile-perl/debian/patches/10dirs.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/patches/10dirs.patch?rev=32039&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/patches/10dirs.patch (original)
+++ trunk/libapache-configfile-perl/debian/patches/10dirs.patch Fri Mar 13 22:02:46 2009
@@ -8,7 +8,7 @@
 @DPATCH@
 --- a/ConfigFile.pm
 +++ b/ConfigFile.pm
-@@ -168,6 +168,19 @@ sub _include {
+@@ -168,6 +168,19 @@
      # add the server root unless it's a /full/path/name
      $file = "$server_root/$file" if $file !~ m!^/! && $server_root;
  

Added: trunk/libapache-configfile-perl/debian/patches/15globs.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/patches/15globs.patch?rev=32039&op=file
==============================================================================
--- trunk/libapache-configfile-perl/debian/patches/15globs.patch (added)
+++ trunk/libapache-configfile-perl/debian/patches/15globs.patch Fri Mar 13 22:02:46 2009
@@ -1,0 +1,24 @@
+Author: gregor herrmann <gregoa at debian.org>
+Description: deal with "Include /etc/apache2/mods-enabled/*.load" and friends
+Bug: #519271
+
+--- a/ConfigFile.pm
++++ b/ConfigFile.pm
+@@ -181,6 +181,17 @@
+         return @conf;
+     }
+ 
++    # Handling for wildcards
++    if ($file =~ /\/\*/) {
++        my @files = glob($file)
++            || croak("Cannot glob '$file': $!");
++        my @conf;
++        foreach (@files) {
++            push @conf, _include($_);
++        }
++        return @conf;
++    }
++
+     open(CONF, "<$file")
+         || croak("Cannot read '$file': $! (do you need to define ServerRoot?)");
+     chomp(my @conf = <CONF>);

Modified: trunk/libapache-configfile-perl/debian/patches/20newline.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/patches/20newline.patch?rev=32039&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/patches/20newline.patch (original)
+++ trunk/libapache-configfile-perl/debian/patches/20newline.patch Fri Mar 13 22:02:46 2009
@@ -8,7 +8,7 @@
 @DPATCH@
 --- a/ConfigFile.pm
 +++ b/ConfigFile.pm
-@@ -212,15 +212,28 @@ sub reread {
+@@ -223,15 +223,28 @@
      my $cmd_context = $conf;
      my @parselevel = ();
      my $line = 0;
@@ -40,7 +40,7 @@
  
          # This substitutes in re-used variable on the right side of the file
          # We have to handle the ignore_case flag hence the expression
-@@ -228,17 +241,17 @@ sub reread {
+@@ -239,17 +252,17 @@
          # are visible for re-substitution
          if ($self->{expand_vars}) { 
              local($^W) = 0 ;
@@ -61,7 +61,7 @@
              # create new sublevel in parsing
              my $k = $self->_fixcase($1);
              push @parselevel, $cmd_context;
-@@ -261,8 +274,8 @@ sub reread {
+@@ -272,8 +285,8 @@
  
          # Split up the key and the value. The @val regexp code dynamically
          # differentiates between "space strings" and array, values.

Modified: trunk/libapache-configfile-perl/debian/patches/30novalue.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/patches/30novalue.patch?rev=32039&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/patches/30novalue.patch (original)
+++ trunk/libapache-configfile-perl/debian/patches/30novalue.patch Fri Mar 13 22:02:46 2009
@@ -8,7 +8,7 @@
 @DPATCH@
 --- a/ConfigFile.pm
 +++ b/ConfigFile.pm
-@@ -275,6 +275,7 @@ sub reread {
+@@ -286,6 +286,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

Modified: trunk/libapache-configfile-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-configfile-perl/debian/patches/series?rev=32039&op=diff
==============================================================================
--- trunk/libapache-configfile-perl/debian/patches/series (original)
+++ trunk/libapache-configfile-perl/debian/patches/series Fri Mar 13 22:02:46 2009
@@ -1,3 +1,4 @@
 10dirs.patch
+15globs.patch
 20newline.patch
 30novalue.patch