Add/fix some lintian overrides, fix some warnings.

Bump Standards-Version (no changes).


git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@500 01b336ce-410b-0410-9a02-a0e7f243c266

6 files changed, 11 insertions, 6 deletions

diff --git a/debian/apache2.2-common.lintian-overrides b/debian/apache2.2-common.lintian-overrides
index 3d477144..b83b65b7 100644
--- a/debian/apache2.2-common.lintian-overrides
+++ b/debian/apache2.2-common.lintian-overrides
@@ -1,2 +1,4 @@
 apache2.2-common: setuid-binary usr/lib/apache2/suexec 4754 root/www-data
 apache2.2-common: non-standard-dir-perm var/log/apache2/ 0750 != 0755
+apache2.2-common: package-contains-empty-directory usr/lib/cgi-bin/
+apache2.2-common: script-in-etc-init.d-not-registered-via-update-rc.d /etc/init.d/apache2
diff --git a/debian/changelog b/debian/changelog
index 804cb6fd..b1a2d2d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ apache2 (2.2.6-3) UNRELEASED; urgency=low
   * Add comment about how to log X-Forwarded-For (Closes: #425008).
   * Make mod_proxy_balancer not depend on mod_cache.
   * Add Homepage field to debian/control.
+  * Add/fix some lintian overrides, fix some warnings.
+  * Bump Standards-Version (no changes).
 
- -- Stefan Fritsch <sf@debian.org>  Fri, 07 Dec 2007 22:10:07 +0100
+ -- Stefan Fritsch <sf@debian.org>  Fri, 07 Dec 2007 22:38:59 +0100
 
 apache2 (2.2.6-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index a92a8589..f9a673f3 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Apache Maintainers <debian-apache@lists.debian.org>
 Uploaders: Tollef Fog Heen <tfheen@debian.org>, Thom May <thom@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Adam Conrad <adconrad@0c3.net>, Peter Samuelson <peter@p12n.org>, Stefan Fritsch <sf@debian.org>
 Build-Depends: debhelper (>=4.1.16), dpatch, lsb-release, libaprutil1-dev, libapr1-dev (>= 1.2.7-6), openssl, libpcre3-dev, libtool, mawk, zlib1g-dev, libssl-dev
-Standards-Version: 3.7.2.0
+Standards-Version: 3.7.3.0
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-apache
 XS-Vcs-svn: svn://svn.debian.org/pkg-apache
 Homepage: http://httpd.apache.org/
diff --git a/debian/patches/047_fix_usage_message.dpatch b/debian/patches/047_fix_usage_message.dpatch
index ec4c3c79..d9e43ae7 100755
--- a/debian/patches/047_fix_usage_message.dpatch
+++ b/debian/patches/047_fix_usage_message.dpatch
@@ -2,7 +2,7 @@
 ## 047_fix_usage_message.dpatch by Stefan Fritsch <sf@debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Add -X to the help message
 
 @DPATCH@
 diff -urNad apache2-2.2.4~/server/main.c apache2-2.2.4/server/main.c
diff --git a/debian/patches/056-CVE-2007-6203.dpatch b/debian/patches/056-CVE-2007-6203.dpatch
index 1216e290..03ad94a8 100755
--- a/debian/patches/056-CVE-2007-6203.dpatch
+++ b/debian/patches/056-CVE-2007-6203.dpatch
@@ -2,7 +2,8 @@
 ## 056-CVE-2007-6203.dpatch
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
+## DP: Fix potential XSS vulnerability because of unescaped
+## DP: HTTP method in 413 error message (CVE-2007-6203).
 
 @DPATCH@
 diff -urNad etch-apache2~/modules/http/http_protocol.c etch-apache2/modules/http/http_protocol.c
diff --git a/debian/source.lintian-overrides b/debian/source.lintian-overrides
index 2084fd81..75ae491b 100644
--- a/debian/source.lintian-overrides
+++ b/debian/source.lintian-overrides
@@ -1,2 +1,2 @@
-outdated-autotools-helper-file srclib/apr-util/xml/expat/conftools/config.guess 2002-03-20
-outdated-autotools-helper-file srclib/apr-util/xml/expat/conftools/config.sub 2002-03-07
+apache2 source: outdated-autotools-helper-file srclib/apr-util/xml/expat/conftools/config.guess 2002-03-20
+apache2 source: outdated-autotools-helper-file srclib/apr-util/xml/expat/conftools/config.sub 2002-03-07