From db7300e8d4d69d03c5b48b83fc02fb832176f10e Mon Sep 17 00:00:00 2001
From: Giorgio Peron
Date: Sun, 6 Sep 2015 06:50:13 +0700
Subject: network/dokuwiki: Updated for version 20150810a.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/dokuwiki/doinst.sh           |  5 +++++
 network/dokuwiki/dokuwiki.SlackBuild | 13 ++++++++++---
 network/dokuwiki/dokuwiki.info       |  6 +++---
 3 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 network/dokuwiki/doinst.sh

diff --git a/network/dokuwiki/doinst.sh b/network/dokuwiki/doinst.sh
new file mode 100644
index 0000000000..698828834d
--- /dev/null
+++ b/network/dokuwiki/doinst.sh
@@ -0,0 +1,5 @@
+sed -i "s:#Include /etc/httpd/mod_php.conf:Include /etc/httpd/mod_php.conf:g" etc/httpd/httpd.conf 
+grep -q -e 'Dokuwiki' etc/httpd/httpd.conf || cat >> etc/httpd/httpd.conf <<'EOF'
+# Dokuwiki
+Include /etc/httpd/extra/httpd-dokuwiki.conf
+EOF
diff --git a/network/dokuwiki/dokuwiki.SlackBuild b/network/dokuwiki/dokuwiki.SlackBuild
index 13d2926e6a..89f16ce8b5 100644
--- a/network/dokuwiki/dokuwiki.SlackBuild
+++ b/network/dokuwiki/dokuwiki.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Slackware build script for dokuwiki
 
-# Copyright 2014  Giorgio Peron <giorgio.peron@gmail.com>, Campodarsego, PD, Italy
+# Copyright 2015  Giorgio Peron <giorgio.peron@gmail.com>, Campodarsego, PD, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,8 +22,8 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=${PRGNAM:-dokuwiki}
-VERSION=${VERSION:-20140505a}
-SRCVERSION=${SRCVERSION:-2014-05-05a}
+VERSION=${VERSION:-20150810a}
+SRCVERSION=${SRCVERSION:-2015-08-10a}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -50,11 +50,17 @@ mkdir -p $PKG/etc/httpd/extra
 cat > $PKG/etc/httpd/extra/httpd-dokuwiki.conf <<'EOF'
 Alias /dokuwiki /srv/www/dokuwiki
 <Directory /srv/www/dokuwiki/>
+    DirectoryIndex index.php
     Options +FollowSymLinks
     AllowOverride All
     Require all granted
     php_admin_value open_basedir "/srv/www/:/srv/www/dokuwiki/lib/"
 </Directory>
+<LocationMatch "/srv/www/dokuwiki/(data|conf|bin|inc)/">
+    order allow,deny
+    deny from all
+    satisfy all
+</LocationMatch>
 EOF
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -62,6 +68,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/dokuwiki/dokuwiki.info b/network/dokuwiki/dokuwiki.info
index 7cf72f0fae..0de76b4903 100644
--- a/network/dokuwiki/dokuwiki.info
+++ b/network/dokuwiki/dokuwiki.info
@@ -1,8 +1,8 @@
 PRGNAM="dokuwiki"
-VERSION="20140505a"
+VERSION="20150810a"
 HOMEPAGE="https://www.dokuwiki.org/dokuwiki"
-DOWNLOAD="http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2014-05-05a.tgz"
-MD5SUM="fb44f206d1550921c640757599e90bb9"
+DOWNLOAD="http://download.dokuwiki.org/src/dokuwiki/dokuwiki-2015-08-10a.tgz"
+MD5SUM="a4b8ae00ce94e42d4ef52dd8f4ad30fe"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3