diff options
| author | Stefan Fritsch <sf@debian.org> | 2009-07-26 19:45:42 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@sfritsch.de> | 2012-01-02 10:37:01 +0100 |
| commit | 7b2c8761799c9f64c0374f58444be9bbaa50a028 (patch) | |
| tree | 2e45a558df7b07ddc9a987c98bee716961b94c6f | |
| parent | 84017ee63f8d05ca6f5bb509137e5fd1e737364b (diff) | |
| download | apache2-7b2c8761799c9f64c0374f58444be9bbaa50a028.tar.gz | |
Make a2ensite and friends ignore the same filenames as apache does for
included config files.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@996 01b336ce-410b-0410-9a02-a0e7f243c266
| -rwxr-xr-x | debian/a2enmod | 3 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/a2enmod b/debian/a2enmod index 538277f2..a3a10e07 100755 --- a/debian/a2enmod +++ b/debian/a2enmod @@ -30,6 +30,7 @@ my $env_file = $ENV{APACHE_ENVVARS} ? "$ENV{APACHE_CONFDIR}/envvars" : "/etc/apache2$dir_suffix/envvars" ); +$ENV{LANG}='C'; read_env_file($env_file); $act .= 'able'; @@ -101,7 +102,7 @@ sub myglob { } glob("$choicedir/$arg$sffx"); # use same rules as apache's Include directive - @glob = grep( /^[A-Za-z0-9][-.\w]*$/, @glob ); + @glob = grep( /^[[:alnum:]][-._[:alnum:]]*$/, @glob ); @glob = grep( !/\.dpkg/, @glob ); return @glob; diff --git a/debian/changelog b/debian/changelog index 2eba4c47..311fdf2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ apache2 (2.2.11-8) UNRELEASED; urgency=low * Enable hardening compile options. + * Make a2ensite and friends ignore the same filenames as apache does for + included config files. * Remove 2.0 -> 2.2 upgrade logic from maintainer scripts. * Remove other_vhosts_access.log on package purge. |