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

Arno Töll debian at toell.net
Thu Feb 2 23:40:52 UTC 2012 

The following commit has been merged in the next branch:
commit 8bf8bdc7496dcf70bea501dea4a2f28c3e5fae7f
Author: Arno Töll <debian at toell.net>
Date:   Fri Jan 27 18:42:09 2012 +0100

    * Denote (some of the) bugs fixed in 2.4 in debian/changelog
    * Re-enable some modules again, for each update configuration where required
    * Add dependency lines to non-essential modules, make use of it
    * Tighten the list of postinst auto-enabled modules in favor of module dependencies

diff --git a/debian/a2enmod b/debian/a2enmod
index cb3b159..89f76a6 100755
--- a/debian/a2enmod
+++ b/debian/a2enmod
@@ -215,7 +215,7 @@ sub doit {
 
             print "Enabling $obj $acton.\n";
             if ( $acton eq 'ssl' ) {
-                info("See /usr/share/doc/apache2.2-common/README.Debian.gz on " .
+                info("See /usr/share/doc/apache2/README.Debian.gz on " .
                      "how to configure SSL and create self-signed certificates.\n");
 	    }
             return add_link( $tgt, $link );
diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index 66860d5..c4fdea1 100755
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -21,7 +21,7 @@ set -e
 
 enable_default_modules()
 {
-        for module in authz_core authz_host alias cgi dir ; do
+        for module in authz_host alias cgi dir ; do
                 a2enmod -q $module
         done
 }
diff --git a/debian/changelog b/debian/changelog
index bba1dd8..682499e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ apache2 (2.3.16-beta-1) UNRELEASED; urgency=low
 
   * Package the coming up 2.4 branch of Apache by packaging the current
     development release 2.3.16.
+    + Fix "IndexIgnore only allowes to add in vhost context, not replace"
+     (Closes: #296886)
+    + Fix "mod_status stats are wrong." (Closes: #519322)
+    + Fix "PNG DirectoryIndex icons transparancy messed up" (Closes: #233047)
   * Rewrite most parts of debian/rules / debhelper configuration.
     + move cronjob and init script to debhelper configuration files
       (apache2.cron.daily and apache2.init respectively)
@@ -51,7 +55,7 @@ apache2 (2.3.16-beta-1) UNRELEASED; urgency=low
     + Update configuration to use the new IncludeOptional syntax
     + Enable these modules by default: authz_core authz_host alias cgi dir
 
- -- Arno Töll <debian at toell.net>  Thu, 26 Jan 2012 02:45:08 +0100
+ -- Arno Töll <debian at toell.net>  Fri, 27 Jan 2012 14:07:09 +0100
 
 apache2 (2.2.21-6) UNRELEASED; urgency=low
 
diff --git a/debian/config-dir/old-mods-available/actions.conf b/debian/config-dir/mods-available/actions.conf
similarity index 100%
rename from debian/config-dir/old-mods-available/actions.conf
rename to debian/config-dir/mods-available/actions.conf
diff --git a/debian/config-dir/old-mods-available/actions.load b/debian/config-dir/mods-available/actions.load
similarity index 100%
rename from debian/config-dir/old-mods-available/actions.load
rename to debian/config-dir/mods-available/actions.load
diff --git a/debian/config-dir/mods-available/authz_host.load b/debian/config-dir/mods-available/authz_host.load
index 097592a..f8cf87a 100644
--- a/debian/config-dir/mods-available/authz_host.load
+++ b/debian/config-dir/mods-available/authz_host.load
@@ -1 +1,2 @@
+# Depends: authz_core
 LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
diff --git a/debian/config-dir/old-mods-available/autoindex.conf b/debian/config-dir/mods-available/autoindex.conf
similarity index 100%
rename from debian/config-dir/old-mods-available/autoindex.conf
rename to debian/config-dir/mods-available/autoindex.conf
diff --git a/debian/config-dir/old-mods-available/autoindex.load b/debian/config-dir/mods-available/autoindex.load
similarity index 100%
rename from debian/config-dir/old-mods-available/autoindex.load
rename to debian/config-dir/mods-available/autoindex.load
diff --git a/debian/config-dir/old-mods-available/env.load b/debian/config-dir/mods-available/env.load
similarity index 100%
rename from debian/config-dir/old-mods-available/env.load
rename to debian/config-dir/mods-available/env.load
diff --git a/debian/config-dir/old-mods-available/info.conf b/debian/config-dir/mods-available/info.conf
similarity index 76%
rename from debian/config-dir/old-mods-available/info.conf
rename to debian/config-dir/mods-available/info.conf
index 6c14e63..a7e30b5 100644
--- a/debian/config-dir/old-mods-available/info.conf
+++ b/debian/config-dir/mods-available/info.conf
@@ -6,10 +6,8 @@
 #
 <Location /server-info>
     SetHandler server-info
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1 ::1
-#    Allow from 192.0.2.0/24
+    Require ip 127.0.0.0/255.0.0.0 ::1/128
+#    Require ip 192.168.0.0/8
 </Location>
 
 </IfModule>
diff --git a/debian/config-dir/old-mods-available/info.load b/debian/config-dir/mods-available/info.load
similarity index 100%
rename from debian/config-dir/old-mods-available/info.load
rename to debian/config-dir/mods-available/info.load
diff --git a/debian/config-dir/old-mods-available/mime.conf b/debian/config-dir/mods-available/mime.conf
similarity index 100%
rename from debian/config-dir/old-mods-available/mime.conf
rename to debian/config-dir/mods-available/mime.conf
diff --git a/debian/config-dir/old-mods-available/mime.load b/debian/config-dir/mods-available/mime.load
similarity index 100%
rename from debian/config-dir/old-mods-available/mime.load
rename to debian/config-dir/mods-available/mime.load
diff --git a/debian/config-dir/old-mods-available/mime_magic.conf b/debian/config-dir/mods-available/mime_magic.conf
similarity index 100%
rename from debian/config-dir/old-mods-available/mime_magic.conf
rename to debian/config-dir/mods-available/mime_magic.conf
diff --git a/debian/config-dir/old-mods-available/mime_magic.load b/debian/config-dir/mods-available/mime_magic.load
similarity index 100%
rename from debian/config-dir/old-mods-available/mime_magic.load
rename to debian/config-dir/mods-available/mime_magic.load
diff --git a/debian/config-dir/old-mods-available/rewrite.load b/debian/config-dir/mods-available/rewrite.load
similarity index 100%
rename from debian/config-dir/old-mods-available/rewrite.load
rename to debian/config-dir/mods-available/rewrite.load
diff --git a/debian/config-dir/old-mods-available/setenvif.conf b/debian/config-dir/mods-available/setenvif.conf
similarity index 100%
rename from debian/config-dir/old-mods-available/setenvif.conf
rename to debian/config-dir/mods-available/setenvif.conf
diff --git a/debian/config-dir/old-mods-available/setenvif.load b/debian/config-dir/mods-available/setenvif.load
similarity index 100%
rename from debian/config-dir/old-mods-available/setenvif.load
rename to debian/config-dir/mods-available/setenvif.load
diff --git a/debian/config-dir/mods-available/socache_shmcb.load b/debian/config-dir/mods-available/socache_shmcb.load
new file mode 100644
index 0000000..542a2b2
--- /dev/null
+++ b/debian/config-dir/mods-available/socache_shmcb.load
@@ -0,0 +1 @@
+LoadModule socache_shmcb_module /usr/lib/apache2/modules/mod_socache_shmcb.so
diff --git a/debian/config-dir/old-mods-available/ssl.conf b/debian/config-dir/mods-available/ssl.conf
similarity index 95%
rename from debian/config-dir/old-mods-available/ssl.conf
rename to debian/config-dir/mods-available/ssl.conf
index f2e9eba..f544bd8 100644
--- a/debian/config-dir/old-mods-available/ssl.conf
+++ b/debian/config-dir/mods-available/ssl.conf
@@ -46,7 +46,10 @@ SSLSessionCacheTimeout  300
 #   Semaphore:
 #   Configure the path to the mutual exclusion semaphore the
 #   SSL engine uses internally for inter-process synchronization. 
-SSLMutex  file:${APACHE_RUN_DIR}/ssl_mutex
+#   (Disabled by default, the global Mutex directive consolidates by default
+#   this)
+#Mutex file:${APACHE_LOCK_DIR}/ssl_mutex ssl-cache
+
 
 #   SSL Cipher Suite:
 #   List the ciphers that the client is permitted to negotiate.
diff --git a/debian/config-dir/mods-available/ssl.load b/debian/config-dir/mods-available/ssl.load
new file mode 100644
index 0000000..3d2336a
--- /dev/null
+++ b/debian/config-dir/mods-available/ssl.load
@@ -0,0 +1,2 @@
+# Depends: setenvif mime socache_shmcb
+LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
diff --git a/debian/config-dir/old-mods-available/status.conf b/debian/config-dir/mods-available/status.conf
similarity index 87%
rename from debian/config-dir/old-mods-available/status.conf
rename to debian/config-dir/mods-available/status.conf
index c608c9c..9a304b8 100644
--- a/debian/config-dir/old-mods-available/status.conf
+++ b/debian/config-dir/mods-available/status.conf
@@ -6,10 +6,8 @@
 #
 <Location /server-status>
     SetHandler server-status
-    Order deny,allow
-    Deny from all
-    Allow from 127.0.0.1 ::1
-#    Allow from 192.0.2.0/24
+    Require ip 127.0.0.0/255.0.0.0 ::1/128
+#   Require ip 192.0.2.0/24
 </Location>
 
 # Keep track of extended status information for each request
diff --git a/debian/config-dir/old-mods-available/status.load b/debian/config-dir/mods-available/status.load
similarity index 100%
rename from debian/config-dir/old-mods-available/status.load
rename to debian/config-dir/mods-available/status.load
diff --git a/debian/config-dir/old-mods-available/suexec.load b/debian/config-dir/mods-available/suexec.load
similarity index 100%
rename from debian/config-dir/old-mods-available/suexec.load
rename to debian/config-dir/mods-available/suexec.load
diff --git a/debian/config-dir/old-mods-available/unique_id.load b/debian/config-dir/mods-available/unique_id.load
similarity index 100%
rename from debian/config-dir/old-mods-available/unique_id.load
rename to debian/config-dir/mods-available/unique_id.load
diff --git a/debian/config-dir/old-mods-available/ssl.load b/debian/config-dir/old-mods-available/ssl.load
deleted file mode 100644
index ff861da..0000000
--- a/debian/config-dir/old-mods-available/ssl.load
+++ /dev/null
@@ -1 +0,0 @@
-LoadModule ssl_module /usr/lib/apache2/modules/mod_ssl.so
diff --git a/debian/config-dir/sites-available/default-ssl b/debian/config-dir/sites-available/default-ssl
index 9f2d7b8..b9a50aa 100644
--- a/debian/config-dir/sites-available/default-ssl
+++ b/debian/config-dir/sites-available/default-ssl
@@ -10,16 +10,14 @@
 	<Directory /var/www/>
 		Options Indexes FollowSymLinks MultiViews
 		AllowOverride None
-		Order allow,deny
-		allow from all
+		Require all granted 
 	</Directory>
 
 	ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
 	<Directory "/usr/lib/cgi-bin">
 		AllowOverride None
 		Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
-		Order allow,deny
-		Allow from all
+		Require all granted
 	</Directory>
 
 	ErrorLog ${APACHE_LOG_DIR}/error.log
@@ -34,9 +32,7 @@
 	<Directory "/usr/share/doc/">
 		Options Indexes MultiViews FollowSymLinks
 		AllowOverride None
-		Order deny,allow
-		Deny from all
-		Allow from 127.0.0.0/255.0.0.0 ::1/128
+		Require ip 127.0.0.0/255.0.0.0 ::1/128
 	</Directory>
 
 	#   SSL Engine Switch:

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

More information about the Pkg-apache-commits mailing list