[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. a4d5b4ed0632dfe08fbf169d8171fd7555bafb69

[Arno Töll]

The following commit has been merged in the next branch:
commit a4d5b4ed0632dfe08fbf169d8171fd7555bafb69
Author: Arno Töll <debian at toell.net>
Date:   Fri Mar 9 03:31:30 2012 +0100

    Fix some bugs, but make us much more work really

diff --git a/debian/changelog b/debian/changelog
index c62546f..1bb4792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -75,7 +75,7 @@ apache2 (2.4.1-1) experimental; urgency=low
   * Changes in the default configuration (not specific modules):
     + On the head of the apache2.conf configuration file, give a short summary
       how configuration of the Apache web server works in Debian.
-    + Drop NameVirtualHost entirely. It is deprecated
+    + Drop NameVirtualHost entirely. It is deprecated (Closes: #511594)
     + Remove DefaultType. It is deprecated.
     + Replace Allow/Deny directives in the default configuration by using the
       new Require directive. Load mod_access_compat if you rely on the old
@@ -93,7 +93,9 @@ apache2 (2.4.1-1) experimental; urgency=low
       files need  to have a .conf suffix now. The following configuration
       files are enabled by default: charset localized-error-pages
       other-vhosts-access-log  security.  These were enabled by default
-      previously, too (Closes: #620347).
+      previously, too (Closes: #620347, Closes: #605227).
+      This holds for apache2-doc as well, which is still enabled by default but
+      can be disabled easily anytime by using a2disconf (Closes: #604980).
     + Give site configuration a .conf suffix, too. For example the default vhost
       is called default.conf. Moreover, files without .conf suffix are ignored
       upon startup. Please update your site links and confs. Also rename the
@@ -151,7 +153,7 @@ apache2 (2.4.1-1) experimental; urgency=low
   * Migrate patches to DEP-3 format. For particular changes see the summary
     above.
 
- -- Arno Töll <debian at toell.net>  Fri, 09 Mar 2012 00:41:22 +0100
+ -- Arno Töll <debian at toell.net>  Fri, 09 Mar 2012 03:03:54 +0100
 
 apache2 (2.2.22-1) unstable; urgency=low
 
diff --git a/debian/config-dir/apache2.conf b/debian/config-dir/apache2.conf
index b6d9762..2a2f97b 100644
--- a/debian/config-dir/apache2.conf
+++ b/debian/config-dir/apache2.conf
@@ -50,8 +50,16 @@
 #   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
 #   work with the default configuration.
 
+# TODO: Triage the following bugs involving conf changes:
+#	#589638 [w|  |  ] [apache2] apache2: Generally useful options currently set in sites-available/default should be moved to included file
+#	#548213 [w|  |  ] [apache2.2-common] Apache should protect .svn directories
+#	#341022 [w|  |  ] [apache2] default apache2.conf file should deny access to /
+#	#340947 [w|  |  ] [apache2.2-common] apache2-common: standard path to virtual host document roots under /var/www?
+#	#605123 [m|  |  ] [apache2.2-common] apache2.2-common: "incorrect" definitions of Common Log Format and Combined Log Format
+#	#649020 [n|  |  ] [apache2.2-common] apache2: stronger and faster default SSL config
+#	#400681 [n|  |  ] [apache2.2-common] apache2.2-common: mod_authn_alias does not play well with mod_authnz_ldap
+
 
-#
 # Global configuration
 #
 

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