[Pkg-mediawiki-commits] r468 - in mediawiki/trunk/debian: . etc

[Thorsten Glaser]

Author: tg
Date: 2013-09-04 14:52:38 +0000 (Wed, 04 Sep 2013)
New Revision: 468

Modified:
   mediawiki/trunk/debian/changelog
   mediawiki/trunk/debian/etc/apache.conf
Log:
apply fix from bts


Modified: mediawiki/trunk/debian/changelog
===================================================================
--- mediawiki/trunk/debian/changelog	2013-09-04 14:50:50 UTC (rev 467)
+++ mediawiki/trunk/debian/changelog	2013-09-04 14:52:38 UTC (rev 468)
@@ -4,8 +4,9 @@
     ⇒ update the package relationship fields
   * Make my self-drawn CC images nicer and more consistent
   * New upstream security release
+  * Secure the default images directory (Closes: #716884)
 
- -- Thorsten Glaser <tg at mirbsd.de>  Wed, 07 Aug 2013 10:25:15 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Wed, 04 Sep 2013 16:52:03 +0200
 
 mediawiki (1:1.19.7+dfsg-1) unstable; urgency=low
 

Modified: mediawiki/trunk/debian/etc/apache.conf
===================================================================
--- mediawiki/trunk/debian/etc/apache.conf	2013-09-04 14:50:50 UTC (rev 467)
+++ mediawiki/trunk/debian/etc/apache.conf	2013-09-04 14:52:38 UTC (rev 468)
@@ -13,8 +13,15 @@
 <Directory /var/lib/mediawiki/config>
 	Options -FollowSymLinks
 	AllowOverride None
+	php_admin_flag engine off
 </Directory>
+<Directory /var/lib/mediawiki/images>
+	Options -FollowSymLinks
+	AllowOverride None
+	php_admin_flag engine off
+</Directory>
 <Directory /var/lib/mediawiki/upload>
 	Options -FollowSymLinks
 	AllowOverride None
+	php_admin_flag engine off
 </Directory>