1 files changed, 17 insertions, 28 deletions
diff --git a/network/monkey/monkey.SlackBuild b/network/monkey/monkey.SlackBuild
index efbb0094e0bb4..d6e1dbb404b73 100644
--- a/network/monkey/monkey.SlackBuild
+++ b/network/monkey/monkey.SlackBuild
@@ -29,13 +29,13 @@
 # and libev script by Šime Ramov <s@ramov.com>
 
 PRGNAM=monkey
-VERSION=${VERSION:-1.5.6}
+VERSION=${VERSION:-1.6.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -46,8 +46,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -75,24 +75,20 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-patch -p1 --verbose -i $CWD/config_values_fix.patch
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --libdir=/usr/lib${LIBDIRSUFFIX}/monkey \
   --mandir=/usr/man \
   --sysconfdir=/etc/monkey \
-  --datadir=/var/www/monkey \
+  --webroot=/var/www/monkey \
   --logdir=/var/log/monkey \
-  --pidfile=/var/run/monkey/monkey.pid \
+  --pidfile=monkey/monkey.pid \
   --malloc-libc \
-  --bindir=/usr/sbin \
-  --plugdir=/usr/lib${LIBDIRSUFFIX}/monkey \
+  --sbindir=/usr/sbin \
   --default-port=80 \
-  --default-user=apache \
-  --safe-free
+  --default-user=apache
 
 make
 make install DESTDIR=$PKG
@@ -103,9 +99,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-# out of the box logging is disabled (and looks like this part in configure script is broken),
+# out of the box logging is disabled,
 # enable it to audit http server's life
-sed -i 's/# Load \/usr\/lib\/monkey\/monkey\-logger\.so/Load \/usr\/lib\/monkey\/monkey\-logger\.so/g' $PKG/etc/monkey/plugins.load
+sed -i "s|# Load /usr/lib${LIBDIRSUFFIX}/monkey/monkey-logger.so|Load /usr/lib${LIBDIRSUFFIX}/monkey/monkey-logger.so|g" $PKG/etc/monkey/plugins.load
 
 # make log dir
 mkdir -p $PKG/var/log/monkey
@@ -115,32 +111,25 @@ mkdir -p $PKG/var/run/monkey
 
 # move init script to it's dir
 mkdir -p $PKG/etc/rc.d
-mv $PKG/usr/sbin/rc.monkey $PKG/etc/rc.d/rc.monkey.new
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README LICENSE NOTICE ChangeLog CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION
-install -m 644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+install -Dpm 0644 monkey.init $PKG/etc/rc.d/rc.monkey.new
 
-mkdir -p $PKG/etc/logrotate.d
-install -m 644 $CWD/monkey.logrotate $PKG/etc/logrotate.d/monkey.new
+install -Dpm 0644 $CWD/$PRGNAM.SlackBuild $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cp -a README.md LICENSE NOTICE ChangeLog CONTRIBUTING.md $PKG/usr/doc/$PRGNAM-$VERSION
+install -Dpm 0644 $CWD/monkey.logrotate $PKG/etc/logrotate.d/monkey.new
 
 mv $PKG/etc/monkey/monkey.conf $PKG/etc/monkey/monkey.conf.new
 mv $PKG/etc/monkey/plugins.load $PKG/etc/monkey/plugins.load.new
 mv $PKG/etc/monkey/sites/default $PKG/etc/monkey/sites/default.new
-mv $PKG/etc/monkey/plugins/auth/monkey.users $PKG/etc/monkey/plugins/auth/monkey.users.new
-mv $PKG/etc/monkey/plugins/cgi/cgi.conf $PKG/etc/monkey/plugins/cgi/cgi.conf.new
 mv $PKG/etc/monkey/plugins/cheetah/cheetah.conf $PKG/etc/monkey/plugins/cheetah/cheetah.conf.new
 mv $PKG/etc/monkey/plugins/dirlisting/dirhtml.conf $PKG/etc/monkey/plugins/dirlisting/dirhtml.conf.new
 mv $PKG/etc/monkey/plugins/fastcgi/fastcgi.conf $PKG/etc/monkey/plugins/fastcgi/fastcgi.conf.new
 mv $PKG/etc/monkey/plugins/logger/logger.conf $PKG/etc/monkey/plugins/logger/logger.conf.new
 mv $PKG/etc/monkey/plugins/mandril/mandril.conf $PKG/etc/monkey/plugins/mandril/mandril.conf.new
-mv $PKG/var/www/monkey/404.html $PKG/var/www/monkey/404.html.new
 mv $PKG/var/www/monkey/favicon.ico $PKG/var/www/monkey/favicon.ico.new
 mv $PKG/var/www/monkey/index.html $PKG/var/www/monkey/index.html.new
 
-mkdir -p $PKG/install
-install -m 644 $CWD/slack-desc $PKG/install/slack-desc
-install -m 644 $CWD/doinst.sh $PKG/install/doinst.sh
+install -Dpm 0644 $CWD/slack-desc $PKG/install/slack-desc
+install -Dpm 0644 $CWD/doinst.sh $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}