[SCM] Debian packaging for apache2 branch, master, updated. debian/2.2.22-3-52-g69c302a

[Arno Töll]

The following commit has been merged in the master branch:
commit 69c302aae0733791591dea1dd0a88337c0130b21
Author: Arno Töll <arno at debian.org>
Date:   Thu Aug 2 22:46:25 2012 +0200

    Be more careful when removing the disk cache directory

diff --git a/debian/apache2.2-common.postinst b/debian/apache2.2-common.postinst
index ae2efed..ee1b1e9 100644
--- a/debian/apache2.2-common.postinst
+++ b/debian/apache2.2-common.postinst
@@ -107,7 +107,8 @@ fi
 if dpkg --compare-versions "$2" lt 2.2.22-10; then
 	if [ -d /var/cache/apache2/mod_disk_cache ] ; then
 		echo "Purging old mod_disk_cache cache data in /var/cache/apache2/mod_cache_disk/"
-		rm -rf /var/cache/apache2/mod_disk_cache/*
+		rm -rf /var/cache/apache2/mod_disk_cache
+                install -o www-data -g www-data -d /var/cache/apache2/mod_disk_cache/
 	fi
 fi
 
diff --git a/debian/changelog b/debian/changelog
index 91fe1f0..214e3cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.2.22-11) UNRELEASED; urgency=low
+
+  * Be more careful regarding link attacks when purging the cache disk
+    directory.
+
+ -- Arno Töll <arno at debian.org>  Thu, 02 Aug 2012 22:43:18 +0200
+
 apache2 (2.2.22-10) unstable; urgency=low
 
   [ Arno Töll ]
diff --git a/debian/rules b/debian/rules
index 4cb688d..ee169d0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -237,7 +237,7 @@ override_dh_fixperms:
 	chmod 4754 debian/apache2-suexec-custom/usr/lib/apache2/suexec
 	chgrp www-data debian/apache2-suexec-custom/usr/lib/apache2/suexec
 	dh_fixperms -Xusr/lib/apache2/suexec
-	chown -R www-data:www-data debian/apache2.2-common/var/cache/apache2
+	chown -R www-data:www-data debian/apache2.2-common/var/cache/apache2/mod_disk_cache
 	chown root:adm debian/apache2.2-common/var/log/apache2
 	chmod o-rx debian/apache2.2-common/var/log/apache2
 

-- 
Debian packaging for apache2