system/atop: Updated for version 1.23

3 files changed, 33 insertions, 9 deletions

diff --git a/system/atop/README b/system/atop/README
index 0011997cdebd2..43faf8534a73d 100644
--- a/system/atop/README
+++ b/system/atop/README
@@ -3,14 +3,20 @@ to view the load on system-level and process-level.
 
 Some features depend on the 'acct' (BSD accounting) package from 
 Slackware being installed.  To enable it, execute the following:
+
   touch /var/log/pacct
   chgrp utmp /var/log/pacct
   chmod 640 /var/log/pacct
   accton
 
-You may want to have atop start at boot; to do so, added the
-following lines to /etc/rc.d/rc.local:
+You may want to have atop start at boot; to do so, add to
+/etc/rc.d/rc.local the following lines:
+
   # Start the accounting top service
   if [ -x /etc/rc.d/rc.atop ]; then
     /etc/rc.d/rc.atop
   fi
+
+Note: logrotate(8) doesn't like .new files to reside in
+      /etc/logrotate.d - thus make sure to merge@remove
+
diff --git a/system/atop/atop.SlackBuild b/system/atop/atop.SlackBuild
index 378fde2196c45..ccea68881a0b4 100644
--- a/system/atop/atop.SlackBuild
+++ b/system/atop/atop.SlackBuild
@@ -5,8 +5,12 @@
 # Written by Menno E. Duursma <druiloor@zonnet.nl>
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
+# This program is free software. It comes without any warranty.
+# Granted WTFPL, Version 2, as published by Sam Hocevar. See
+# http://sam.zoy.org/wtfpl/COPYING for more details.
+
 PRGNAM=atop
-VERSION=1.20
+VERSION=1.23
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
@@ -20,6 +24,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e	 # Exit on most errors
@@ -31,7 +37,11 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 make CFLAGS="$SLKCFLAGS"
 
@@ -53,15 +63,23 @@ touch $PKG/var/log/atop/dummy_{before,after}
 # We'll create daily.log in doinst.sh so it doesn't get wiped on uninstall
 
 ( cd $PKG
-  find . -type f | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Create link to enable the 'atopsar' functionality
+( cd $PKG/usr/bin
+  ln -vsf atop atopsar
 )
 
 mkdir -p $PKG/usr/man/man1
 gzip -9c man/atop.1 > $PKG/usr/man/man1/atop.1.gz
+gzip -9c man/atopsar.1 > $PKG/usr/man/man1/atopsar.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a [A-Z][A-Z]* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/atop/atop.info b/system/atop/atop.info
index 25e72209d30b6..9dd8938c9d3a7 100644
--- a/system/atop/atop.info
+++ b/system/atop/atop.info
@@ -1,8 +1,8 @@
 PRGNAM="atop"
-VERSION="1.20"
+VERSION="1.23"
 HOMEPAGE="http://www.atcomputing.nl/Tools/atop"
-DOWNLOAD="http://oldwww.atconsultancy.nl/atop/packages/atop-1.20.tar.gz"
-MD5SUM="ca4c8f47532b25aa0afd7d1061a1ad11"
+DOWNLOAD="http://www.atcomputing.nl/Tools/atop/packages/atop-1.23.tar.gz"
+MD5SUM="ba1d733b9f0fcf8469a8e6c8e4d2d3b7"
 MAINTAINER="Menno E. Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="rworkman"
+APPROVED="David Somero"
\ No newline at end of file