[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. 966cdeb002abc7b7425d2c58f1077931b166ea0f
Arno Töll
debian at toell.net
Mon Feb 6 20:21:17 UTC 2012
The following commit has been merged in the next branch:
commit 966cdeb002abc7b7425d2c58f1077931b166ea0f
Author: Arno Töll <debian at toell.net>
Date: Mon Feb 6 21:20:21 2012 +0100
* enable most module configurations again, update them where necessary
* fix syntax error in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index bb1b53c..5a8c6a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -61,8 +61,9 @@ apache2 (2.3.16-beta-1) experimental; urgency=low
+ Parse "Conflicts: " header to denote conflicts between modules which
cannot be loaded into the same Apache server.
- -- Arno Töll <debian at toell.net> Thu, 02 Feb 2012 23:51:16 +0100
+ -- Arno Töll <debian at toell.net> Mon, 06 Feb 2012 00:03:57 +0100
+apache2 (2.2.22-1) unstable; urgency=low
[ Stefan Fritsch ]
* New upstream release, urgency medium due to security fixes:
@@ -79,7 +80,7 @@ apache2 (2.3.16-beta-1) experimental; urgency=low
-- Stefan Fritsch <sf at debian.org> Wed, 01 Feb 2012 21:49:04 +0100
-pache2 (2.2.21-5) unstable; urgency=low
+apache2 (2.2.21-5) unstable; urgency=low
[ Arno Töll ]
* Fix build failures introduced as regregression by the previous build. Debian
diff --git a/debian/config-dir/old-mods-available/auth_basic.load b/debian/config-dir/mods-available/auth_basic.load
similarity index 100%
rename from debian/config-dir/old-mods-available/auth_basic.load
rename to debian/config-dir/mods-available/auth_basic.load
diff --git a/debian/config-dir/old-mods-available/auth_digest.load b/debian/config-dir/mods-available/auth_digest.load
similarity index 100%
rename from debian/config-dir/old-mods-available/auth_digest.load
rename to debian/config-dir/mods-available/auth_digest.load
diff --git a/debian/config-dir/old-mods-available/authn_anon.load b/debian/config-dir/mods-available/authn_anon.load
similarity index 100%
rename from debian/config-dir/old-mods-available/authn_anon.load
rename to debian/config-dir/mods-available/authn_anon.load
diff --git a/debian/config-dir/old-mods-available/authn_dbd.load b/debian/config-dir/mods-available/authn_dbd.load
similarity index 100%
rename from debian/config-dir/old-mods-available/authn_dbd.load
rename to debian/config-dir/mods-available/authn_dbd.load
diff --git a/debian/config-dir/old-mods-available/authn_dbm.load b/debian/config-dir/mods-available/authn_dbm.load
similarity index 100%
rename from debian/config-dir/old-mods-available/authn_dbm.load
rename to debian/config-dir/mods-available/authn_dbm.load
diff --git a/debian/config-dir/old-mods-available/authn_file.load b/debian/config-dir/mods-available/authn_file.load
similarity index 100%
rename from debian/config-dir/old-mods-available/authn_file.load
rename to debian/config-dir/mods-available/authn_file.load
diff --git a/debian/config-dir/old-mods-available/authnz_ldap.load b/debian/config-dir/mods-available/authnz_ldap.load
similarity index 100%
rename from debian/config-dir/old-mods-available/authnz_ldap.load
rename to debian/config-dir/mods-available/authnz_ldap.load
diff --git a/debian/config-dir/old-mods-available/authz_dbm.load b/debian/config-dir/mods-available/authz_dbm.load
similarity index 76%
rename from debian/config-dir/old-mods-available/authz_dbm.load
rename to debian/config-dir/mods-available/authz_dbm.load
index 95fec7d..6db4831 100644
--- a/debian/config-dir/old-mods-available/authz_dbm.load
+++ b/debian/config-dir/mods-available/authz_dbm.load
@@ -1 +1,2 @@
+# Depends: authz_core
LoadModule authz_dbm_module /usr/lib/apache2/modules/mod_authz_dbm.so
diff --git a/debian/config-dir/old-mods-available/authz_groupfile.load b/debian/config-dir/mods-available/authz_groupfile.load
similarity index 78%
rename from debian/config-dir/old-mods-available/authz_groupfile.load
rename to debian/config-dir/mods-available/authz_groupfile.load
index 41d5993..eda3d21 100644
--- a/debian/config-dir/old-mods-available/authz_groupfile.load
+++ b/debian/config-dir/mods-available/authz_groupfile.load
@@ -1 +1,2 @@
+# Depends: authz_core
LoadModule authz_groupfile_module /usr/lib/apache2/modules/mod_authz_groupfile.so
diff --git a/debian/config-dir/old-mods-available/authz_owner.load b/debian/config-dir/mods-available/authz_owner.load
similarity index 100%
rename from debian/config-dir/old-mods-available/authz_owner.load
rename to debian/config-dir/mods-available/authz_owner.load
diff --git a/debian/config-dir/old-mods-available/authz_user.load b/debian/config-dir/mods-available/authz_user.load
similarity index 76%
rename from debian/config-dir/old-mods-available/authz_user.load
rename to debian/config-dir/mods-available/authz_user.load
index 81abd61..e47c40c 100644
--- a/debian/config-dir/old-mods-available/authz_user.load
+++ b/debian/config-dir/mods-available/authz_user.load
@@ -1 +1,2 @@
+# Depends: authz_core
LoadModule authz_user_module /usr/lib/apache2/modules/mod_authz_user.so
diff --git a/debian/config-dir/old-mods-available/cache.load b/debian/config-dir/mods-available/cache.load
similarity index 100%
rename from debian/config-dir/old-mods-available/cache.load
rename to debian/config-dir/mods-available/cache.load
diff --git a/debian/config-dir/old-mods-available/charset_lite.load b/debian/config-dir/mods-available/charset_lite.load
similarity index 100%
rename from debian/config-dir/old-mods-available/charset_lite.load
rename to debian/config-dir/mods-available/charset_lite.load
diff --git a/debian/config-dir/old-mods-available/dav.load b/debian/config-dir/mods-available/dav.load
similarity index 100%
rename from debian/config-dir/old-mods-available/dav.load
rename to debian/config-dir/mods-available/dav.load
diff --git a/debian/config-dir/old-mods-available/dav_fs.conf b/debian/config-dir/mods-available/dav_fs.conf
similarity index 100%
rename from debian/config-dir/old-mods-available/dav_fs.conf
rename to debian/config-dir/mods-available/dav_fs.conf
diff --git a/debian/config-dir/old-mods-available/dav_fs.load b/debian/config-dir/mods-available/dav_fs.load
similarity index 100%
rename from debian/config-dir/old-mods-available/dav_fs.load
rename to debian/config-dir/mods-available/dav_fs.load
diff --git a/debian/config-dir/old-mods-available/dav_lock.load b/debian/config-dir/mods-available/dav_lock.load
similarity index 100%
rename from debian/config-dir/old-mods-available/dav_lock.load
rename to debian/config-dir/mods-available/dav_lock.load
diff --git a/debian/config-dir/old-mods-available/dbd.load b/debian/config-dir/mods-available/dbd.load
similarity index 100%
rename from debian/config-dir/old-mods-available/dbd.load
rename to debian/config-dir/mods-available/dbd.load
diff --git a/debian/config-dir/old-mods-available/dump_io.load b/debian/config-dir/mods-available/dump_io.load
similarity index 100%
rename from debian/config-dir/old-mods-available/dump_io.load
rename to debian/config-dir/mods-available/dump_io.load
diff --git a/debian/config-dir/old-mods-available/ext_filter.load b/debian/config-dir/mods-available/ext_filter.load
similarity index 100%
rename from debian/config-dir/old-mods-available/ext_filter.load
rename to debian/config-dir/mods-available/ext_filter.load
diff --git a/debian/config-dir/old-mods-available/file_cache.load b/debian/config-dir/mods-available/file_cache.load
similarity index 100%
rename from debian/config-dir/old-mods-available/file_cache.load
rename to debian/config-dir/mods-available/file_cache.load
diff --git a/debian/config-dir/old-mods-available/headers.load b/debian/config-dir/mods-available/headers.load
similarity index 100%
rename from debian/config-dir/old-mods-available/headers.load
rename to debian/config-dir/mods-available/headers.load
diff --git a/debian/config-dir/old-mods-available/include.load b/debian/config-dir/mods-available/include.load
similarity index 81%
rename from debian/config-dir/old-mods-available/include.load
rename to debian/config-dir/mods-available/include.load
index 73b56f5..51a7016 100644
--- a/debian/config-dir/old-mods-available/include.load
+++ b/debian/config-dir/mods-available/include.load
@@ -1 +1,2 @@
+# Depends mime
LoadModule include_module /usr/lib/apache2/modules/mod_include.so
diff --git a/debian/config-dir/mods-available/ldap.conf b/debian/config-dir/mods-available/ldap.conf
new file mode 100644
index 0000000..d2b1ed9
--- /dev/null
+++ b/debian/config-dir/mods-available/ldap.conf
@@ -0,0 +1,4 @@
+<Location /ldap-status>
+ SetHandler ldap-status
+ Require ip 127.0.0.0/255.0.0.0 ::1/128
+</Location>
diff --git a/debian/config-dir/old-mods-available/ldap.load b/debian/config-dir/mods-available/ldap.load
similarity index 100%
rename from debian/config-dir/old-mods-available/ldap.load
rename to debian/config-dir/mods-available/ldap.load
diff --git a/debian/config-dir/old-mods-available/log_forensic.load b/debian/config-dir/mods-available/log_forensic.load
similarity index 100%
rename from debian/config-dir/old-mods-available/log_forensic.load
rename to debian/config-dir/mods-available/log_forensic.load
diff --git a/debian/config-dir/old-mods-available/proxy.conf b/debian/config-dir/mods-available/proxy.conf
similarity index 89%
rename from debian/config-dir/old-mods-available/proxy.conf
rename to debian/config-dir/mods-available/proxy.conf
index 882daf0..957bc81 100644
--- a/debian/config-dir/old-mods-available/proxy.conf
+++ b/debian/config-dir/mods-available/proxy.conf
@@ -13,9 +13,8 @@
#ProxyRequests On
#<Proxy *>
# AddDefaultCharset off
-# Order deny,allow
-# Deny from all
-# #Allow from .example.com
+# Require all denied
+# #Require ip 127.0.0.0/255.0.0.0 ::1/128
#</Proxy>
# Enable/disable the handling of HTTP/1.1 "Via:" headers.
diff --git a/debian/config-dir/old-mods-available/proxy.load b/debian/config-dir/mods-available/proxy.load
similarity index 100%
rename from debian/config-dir/old-mods-available/proxy.load
rename to debian/config-dir/mods-available/proxy.load
diff --git a/debian/config-dir/old-mods-available/proxy_ajp.load b/debian/config-dir/mods-available/proxy_ajp.load
similarity index 100%
rename from debian/config-dir/old-mods-available/proxy_ajp.load
rename to debian/config-dir/mods-available/proxy_ajp.load
diff --git a/debian/config-dir/old-mods-available/proxy_balancer.conf b/debian/config-dir/mods-available/proxy_balancer.conf
similarity index 75%
rename from debian/config-dir/old-mods-available/proxy_balancer.conf
rename to debian/config-dir/mods-available/proxy_balancer.conf
index 4849b96..78e2cfe 100644
--- a/debian/config-dir/old-mods-available/proxy_balancer.conf
+++ b/debian/config-dir/mods-available/proxy_balancer.conf
@@ -6,10 +6,7 @@
#<IfModule mod_status.c>
#<Location /balancer-manager>
# SetHandler balancer-manager
-# Order deny,allow
-# Deny from all
-# Allow from 127.0.0.1 ::1
-# Satisfy all
+# Require ip 127.0.0.0/255.0.0.0 ::1/128
#</Location>
#</IfModule>
diff --git a/debian/config-dir/old-mods-available/proxy_balancer.load b/debian/config-dir/mods-available/proxy_balancer.load
similarity index 68%
rename from debian/config-dir/old-mods-available/proxy_balancer.load
rename to debian/config-dir/mods-available/proxy_balancer.load
index 18b4b1a..209bd0e 100644
--- a/debian/config-dir/old-mods-available/proxy_balancer.load
+++ b/debian/config-dir/mods-available/proxy_balancer.load
@@ -1,2 +1,2 @@
-# Depends: proxy
+# Depends: proxy, alias, slotmem_shm
LoadModule proxy_balancer_module /usr/lib/apache2/modules/mod_proxy_balancer.so
diff --git a/debian/config-dir/old-mods-available/proxy_connect.load b/debian/config-dir/mods-available/proxy_connect.load
similarity index 100%
rename from debian/config-dir/old-mods-available/proxy_connect.load
rename to debian/config-dir/mods-available/proxy_connect.load
diff --git a/debian/config-dir/old-mods-available/proxy_ftp.conf b/debian/config-dir/mods-available/proxy_ftp.conf
similarity index 100%
rename from debian/config-dir/old-mods-available/proxy_ftp.conf
rename to debian/config-dir/mods-available/proxy_ftp.conf
diff --git a/debian/config-dir/old-mods-available/proxy_ftp.load b/debian/config-dir/mods-available/proxy_ftp.load
similarity index 100%
rename from debian/config-dir/old-mods-available/proxy_ftp.load
rename to debian/config-dir/mods-available/proxy_ftp.load
diff --git a/debian/config-dir/old-mods-available/proxy_http.load b/debian/config-dir/mods-available/proxy_http.load
similarity index 100%
rename from debian/config-dir/old-mods-available/proxy_http.load
rename to debian/config-dir/mods-available/proxy_http.load
diff --git a/debian/config-dir/old-mods-available/proxy_scgi.load b/debian/config-dir/mods-available/proxy_scgi.load
similarity index 100%
rename from debian/config-dir/old-mods-available/proxy_scgi.load
rename to debian/config-dir/mods-available/proxy_scgi.load
diff --git a/debian/config-dir/old-mods-available/reqtimeout.conf b/debian/config-dir/mods-available/reqtimeout.conf
similarity index 100%
rename from debian/config-dir/old-mods-available/reqtimeout.conf
rename to debian/config-dir/mods-available/reqtimeout.conf
diff --git a/debian/config-dir/old-mods-available/reqtimeout.load b/debian/config-dir/mods-available/reqtimeout.load
similarity index 100%
rename from debian/config-dir/old-mods-available/reqtimeout.load
rename to debian/config-dir/mods-available/reqtimeout.load
diff --git a/debian/config-dir/mods-available/slotmem_shm.load b/debian/config-dir/mods-available/slotmem_shm.load
new file mode 100644
index 0000000..48ba402
--- /dev/null
+++ b/debian/config-dir/mods-available/slotmem_shm.load
@@ -0,0 +1 @@
+LoadModule slotmem_shm_module /usr/lib/apache2/modules/mod_slotmem_shm.so
diff --git a/debian/config-dir/old-mods-available/substitute.load b/debian/config-dir/mods-available/substitute.load
similarity index 100%
rename from debian/config-dir/old-mods-available/substitute.load
rename to debian/config-dir/mods-available/substitute.load
diff --git a/debian/config-dir/old-mods-available/userdir.conf b/debian/config-dir/mods-available/userdir.conf
similarity index 73%
rename from debian/config-dir/old-mods-available/userdir.conf
rename to debian/config-dir/mods-available/userdir.conf
index 1e384a5..e21f364 100644
--- a/debian/config-dir/old-mods-available/userdir.conf
+++ b/debian/config-dir/mods-available/userdir.conf
@@ -6,12 +6,10 @@
AllowOverride FileInfo AuthConfig Limit Indexes
Options MultiViews Indexes SymLinksIfOwnerMatch IncludesNoExec
<Limit GET POST OPTIONS>
- Order allow,deny
- Allow from all
+ Require all granted
</Limit>
<LimitExcept GET POST OPTIONS>
- Order deny,allow
- Deny from all
+ Require all denied
</LimitExcept>
</Directory>
</IfModule>
diff --git a/debian/config-dir/old-mods-available/userdir.load b/debian/config-dir/mods-available/userdir.load
similarity index 100%
rename from debian/config-dir/old-mods-available/userdir.load
rename to debian/config-dir/mods-available/userdir.load
diff --git a/debian/config-dir/old-mods-available/usertrack.load b/debian/config-dir/mods-available/usertrack.load
similarity index 100%
rename from debian/config-dir/old-mods-available/usertrack.load
rename to debian/config-dir/mods-available/usertrack.load
diff --git a/debian/config-dir/old-mods-available/version.load b/debian/config-dir/mods-available/version.load
similarity index 100%
rename from debian/config-dir/old-mods-available/version.load
rename to debian/config-dir/mods-available/version.load
diff --git a/debian/config-dir/old-mods-available/vhost_alias.load b/debian/config-dir/mods-available/vhost_alias.load
similarity index 100%
rename from debian/config-dir/old-mods-available/vhost_alias.load
rename to debian/config-dir/mods-available/vhost_alias.load
diff --git a/debian/config-dir/old-mods-available/authz_host.load b/debian/config-dir/old-mods-available/authz_host.load
deleted file mode 100644
index 097592a..0000000
--- a/debian/config-dir/old-mods-available/authz_host.load
+++ /dev/null
@@ -1 +0,0 @@
-LoadModule authz_host_module /usr/lib/apache2/modules/mod_authz_host.so
diff --git a/debian/config-dir/old-mods-available/ldap.conf b/debian/config-dir/old-mods-available/ldap.conf
deleted file mode 100644
index 6d3b6d1..0000000
--- a/debian/config-dir/old-mods-available/ldap.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-<Location /ldap-status>
- SetHandler ldap-status
- Order deny,allow
- Deny from all
- Allow from 127.0.0.1 ::1
-# Allow from 192.0.2.0/24
- Satisfy all
-</Location>
--
Debian packaging for apache2 (Apache HTTPD 2.x)
More information about the Pkg-apache-commits
mailing list