[arch-commits] Commit in mediawiki/trunk (PKGBUILD apache.example.conf)

[Sergej Pupykin]

    Date: Monday, September 29, 2014 @ 12:27:23
  Author: spupykin
Revision: 119758

upgpkg: mediawiki 1.23.4-1

upd

Modified:
  mediawiki/trunk/PKGBUILD
  mediawiki/trunk/apache.example.conf

---------------------+
 PKGBUILD            |    9 +++------
 apache.example.conf |    3 +--
 2 files changed, 4 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-29 10:21:34 UTC (rev 119757)
+++ PKGBUILD	2014-09-29 10:27:23 UTC (rev 119758)
@@ -4,7 +4,7 @@
 
 pkgbase=mediawiki
 pkgname=('mediawiki' 'mediawiki-math')
-pkgver=1.23.3
+pkgver=1.23.4
 _basever=1.23
 pkgrel=1
 pkgdesc="MediaWiki engine"
@@ -27,7 +27,6 @@
 	    'php-gd: for thumbnails rendering'
 	    'imagemagick: for thumbnails rendering'
 	    'sendmail: for mail sending')
-backup=(etc/webapps/mediawiki/.htaccess)
 install=mediawiki.install
 options=(!strip)
 #	mediawiki-math-${_basever}::git+https://git.wikimedia.org/git/mediawiki/extensions/Math.git#branch=REL${_basever/./_}
@@ -34,9 +33,9 @@
 source=("http://releases.wikimedia.org/mediawiki/${_basever}/mediawiki-$pkgver.tar.gz"
 	"mediawiki-math-${_basever}.tar.gz::https://codeload.github.com/wikimedia/mediawiki-extensions-Math/legacy.tar.gz/REL${_basever/./_}"
 	apache.example.conf)
-md5sums=('d31502ae832f5371b6c27c36581577e8'
+md5sums=('391f0f9c3091f23822267addd39872fe'
          '2e292442d22c2478150ee592e7780d89'
-         '99c25f04d4093f3333db1be7624fe4e7')
+         '1b34e53d7be9a124377ac34d9821d574')
 
 package_mediawiki() {
   cd $srcdir
@@ -44,8 +43,6 @@
   install -vdm0755 $pkgdir/etc/webapps/mediawiki
   cp -a $pkgname-$pkgver $pkgdir/usr/share/webapps/mediawiki
 
-  echo "deny from all" >> $pkgdir/etc/webapps/mediawiki/.htaccess
-  ln -sf /etc/webapps/mediawiki/.htaccess $pkgdir/usr/share/webapps/mediawiki/.htaccess
   install -vDm0644 $srcdir/apache.example.conf $pkgdir/etc/webapps/mediawiki/apache.example.conf
 
   # move cache and images to /var

Modified: apache.example.conf
===================================================================
--- apache.example.conf	2014-09-29 10:21:34 UTC (rev 119757)
+++ apache.example.conf	2014-09-29 10:27:23 UTC (rev 119758)
@@ -3,6 +3,5 @@
 <Directory "/usr/share/webapps/mediawiki">
     AllowOverride All
     Options FollowSymlinks
-    Order allow,deny
-    Allow from all
+    Require all granted
 </Directory>