[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, master, updated. debian/2.2.22-3-21-g8cbe0e5

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit 8cbe0e52031af3bd865a1b05140cf4a9c14c7cae
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Fri Jun 8 11:19:02 2012 +0200

    Allow colons in filenames when using wildcards with "Include"

diff --git a/debian/README.Debian b/debian/README.Debian
index f18d22b..68ee748 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -134,7 +134,7 @@ sites-enabled/
 The Include directive ignores files with names that
 
 - do not begin with a letter or number
-- contain a character that is neither letter nor number nor _-.
+- contain a character that is neither letter nor number nor _-:.
 - contain .dpkg
 
 In a future version of the package, this special handling will be removed.
diff --git a/debian/changelog b/debian/changelog
index 2a6878d..920e2f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 apache2 (2.2.22-7) UNRELEASED; urgency=low
 
+  [ Arno Töll ]
   * UNRELEASED
   * Fix "ambiguous comment in /etc/apache2/apache2.conf" by clarifying
     contradicting statements. (Closes: #675184)
 
+  [ Stefan Fritsch ]
+  * Allow colons in filenames when using wildcards with "Include".
+    Closes: #676610
+
  -- Arno Töll <arno at debian.org>  Wed, 06 Jun 2012 00:10:34 +0200
 
 apache2 (2.2.22-6) unstable; urgency=low
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index 76479b2..74fad11 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -35,7 +35,7 @@
 #   In order to avoid conflicts with backup files, the Include directive is
 #   adapted to ignore files that:
 #   - do not begin with a letter or number
-#   - contain a character that is neither letter nor number nor _-.
+#   - contain a character that is neither letter nor number nor _-:.
 #   - contain .dpkg
 #
 #   Yet we strongly suggest that all configuration files either end with a
diff --git a/debian/patches/008_make_include_safe b/debian/patches/008_make_include_safe
index 7bb040e..f2f96e6 100755
--- a/debian/patches/008_make_include_safe
+++ b/debian/patches/008_make_include_safe
@@ -30,7 +30,7 @@
 +    
 +    
 +    while (*c) {
-+        if (!apr_isalnum(*c) && *c!='_' && *c!='-' && *c!='.') {
++        if (!apr_isalnum(*c) && *c!='_' && *c!='-' && *c!='.' && *c!=':') {
 +            return 0;
 +        }
 +        ++c;

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)