From 6c9e39f8c15daf0fa5caa731850fc5f21f17cd1b Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Sat, 20 Feb 2016 00:18:51 +0700
Subject: system/monit: Updated for version 5.16.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 system/monit/doinst.sh        | 19 ++++++++++++-------
 system/monit/monit.SlackBuild |  6 ++++--
 system/monit/monit.info       |  6 +++---
 3 files changed, 19 insertions(+), 12 deletions(-)

(limited to 'system/monit')

diff --git a/system/monit/doinst.sh b/system/monit/doinst.sh
index 1a24db5994b1..293507cbb1a2 100644
--- a/system/monit/doinst.sh
+++ b/system/monit/doinst.sh
@@ -11,12 +11,17 @@ config() {
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-# Keep same perms on rc.monit.new:
-if [ -e etc/rc.d/rc.monit ]; then
-  cp -a etc/rc.d/rc.monit etc/rc.d/rc.monit.new.incoming
-  cat etc/rc.d/rc.monit.new > etc/rc.d/rc.monit.new.incoming
-  mv etc/rc.d/rc.monit.new.incoming etc/rc.d/rc.monit.new
-fi
+preserve_perms() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  if [ -e $OLD ]; then
+    cp -a $OLD ${NEW}.incoming
+    cat $NEW > ${NEW}.incoming
+    mv ${NEW}.incoming $NEW
+  fi
+  config $NEW
+}
 
-config etc/rc.d/rc.monit.new
+preserve_perms etc/rc.d/rc.monit.new
+config etc/monit.conf.new
 
diff --git a/system/monit/monit.SlackBuild b/system/monit/monit.SlackBuild
index 5381604f23b0..252e7988210e 100644
--- a/system/monit/monit.SlackBuild
+++ b/system/monit/monit.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=monit
-VERSION=${VERSION:-5.15}
+VERSION=${VERSION:-5.16}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -84,7 +84,7 @@ make install DESTDIR=$PKG
 
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.monit > $PKG/etc/rc.d/rc.monit.new
-chmod 0755 $PKG/etc/rc.d/rc.monit.new
+chmod 0644 $PKG/etc/rc.d/rc.monit.new
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -92,6 +92,8 @@ 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
 
+cp monitrc $PKG/etc/monit.conf.new
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING CONTRIBUTORS README $PKG/usr/doc/$PRGNAM-$VERSION
 
diff --git a/system/monit/monit.info b/system/monit/monit.info
index 6e2861a7941f..1cc4156095bb 100644
--- a/system/monit/monit.info
+++ b/system/monit/monit.info
@@ -1,8 +1,8 @@
 PRGNAM="monit"
-VERSION="5.15"
+VERSION="5.16"
 HOMEPAGE="http://mmonit.com/monit/"
-DOWNLOAD="http://mmonit.com/monit/dist/monit-5.15.tar.gz"
-MD5SUM="c723745298d7ba6d28194b9f25eba6fe"
+DOWNLOAD="http://mmonit.com/monit/dist/monit-5.16.tar.gz"
+MD5SUM="d9e1b2392b1f737178543f54e3ea9488"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3