network/monkey: Updated for version 1.5.2.

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

4 files changed, 24 insertions, 9 deletions

diff --git a/network/monkey/monkey.SlackBuild b/network/monkey/monkey.SlackBuild
index 8e21fe5a46..92ff7b313a 100644
--- a/network/monkey/monkey.SlackBuild
+++ b/network/monkey/monkey.SlackBuild
@@ -29,7 +29,7 @@
 # and libev script by Šime Ramov <s@ramov.com>
 
 PRGNAM=monkey
-VERSION=${VERSION:-1.4.0}
+VERSION=${VERSION:-1.5.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,10 +84,13 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc/monkey \
   --datadir=/var/www/monkey \
   --logdir=/var/log/monkey \
+  --pidfile=/var/run/monkey/monkey.pid \
+  --malloc-libc \
   --bindir=/usr/sbin \
   --plugdir=/usr/lib${LIBDIRSUFFIX}/monkey \
   --default-port=80 \
-  --default-user=apache
+  --default-user=apache \
+  --safe-free
 
 make
 make install DESTDIR=$PKG
@@ -100,6 +103,14 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 
 # fix PID-file path and make empty dir under /var/run
 sed -i 's/\/var\/log\/monkey\/monkey.pid/\/var\/run\/monkey\/monkey.pid/g' $PKG/etc/monkey/monkey.conf
+# Hide version of http daemon
+sed -i 's/HideVersion off/HideVersion on/g' $PKG/etc/monkey/monkey.conf
+# Enable use of symlinks - it _is_ a good and usable feature
+sed -i 's/SymLink Off/SymLink On/g' $PKG/etc/monkey/monkey.conf
+# Php via CGI if EVIL, not feature, disable it
+sed -i 's/Match \/\.\*\\\.php/#Match \/\.\*\\\.php/g' $PKG/etc/monkey/plugins/cgi/cgi.conf
+
+
 mkdir -p $PKG/var/run/monkey
 
 # out of the box logging is disabled, enable it to audit http server's life
diff --git a/network/monkey/monkey.info b/network/monkey/monkey.info
index 3bf680e5cd..7f7b6ef0a2 100644
--- a/network/monkey/monkey.info
+++ b/network/monkey/monkey.info
@@ -1,8 +1,8 @@
 PRGNAM="monkey"
-VERSION="1.4.0"
+VERSION="1.5.2"
 HOMEPAGE="http://monkey-project.com/"
-DOWNLOAD="http://monkey-project.com/releases/1.4/monkey-1.4.0.tar.gz"
-MD5SUM="c17e394b985ead873fc7e7cb2a05cef7"
+DOWNLOAD="http://monkey-project.com/releases/1.5/monkey-1.5.2.tar.gz"
+MD5SUM="c90ccba23a814265c7e0fd3a75f883fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/network/monkey/monkey.logrotate b/network/monkey/monkey.logrotate
index 5d1cde3540..77e606aa75 100644
--- a/network/monkey/monkey.logrotate
+++ b/network/monkey/monkey.logrotate
@@ -8,6 +8,10 @@
   postrotate
 #    kill -HUP `cat /var/run/monkey/monkey.pid.*`
 # Handling of SIGHUP is not implemented yet, but they promise make it like apache httpd
-     /etc/rc.d/rc.monkey restart
+     PATH=/usr/sbin:/sbin:/usr/bin:/bin
+     pgrep -u apache -x monkey 1>/dev/null 2>/dev/null
+     if [ $? != '0' ]; then
+         /etc/rc.d/rc.monkey restart
+     fi
   endscript
 }
diff --git a/network/monkey/slack-desc b/network/monkey/slack-desc
index 0404d9c987..d260e27c71 100644
--- a/network/monkey/slack-desc
+++ b/network/monkey/slack-desc
@@ -8,12 +8,12 @@
       |-----handy-ruler------------------------------------------------------|
 monkey: monkey (web server)
 monkey:
-monkey: Monkey is a lightweight and powerful web server and development 
-monkey: ostack for GNU/Linux.
+monkey: Monkey is a lightweight and powerful web server and development stack
+monkey: for GNU/Linux.
 monkey: 
 monkey: It has been designed to be very scalable with low memory and CPU
 monkey: consumption, the perfect solution for embedded devices.
-monkey: Made for ARM, x86 and x64. 
+monkey: Made for ARM, x86 and x64.
 monkey:
 monkey: Website: <http://monkey-project.com/>
 monkey: