summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/atop/atop.SlackBuild10
-rw-r--r--system/atop/atop.info6
-rw-r--r--system/atop/atop.init.diff34
3 files changed, 7 insertions, 43 deletions
diff --git a/system/atop/atop.SlackBuild b/system/atop/atop.SlackBuild
index d82791c3b4..3c8ca4356f 100644
--- a/system/atop/atop.SlackBuild
+++ b/system/atop/atop.SlackBuild
@@ -12,8 +12,8 @@
# http://sam.zoy.org/wtfpl/COPYING for more details.
PRGNAM=atop
-VERSION=${VERSION:-2.1}
-SRCVER=$(echo ${VERSION}-1)
+VERSION=${VERSION:-2.2}
+SRCVER=$(echo ${VERSION}-3)
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -49,9 +49,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf $PRGNAM-$SRCVER
tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM-$VERSION
+cd $PRGNAM-$SRCVER
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -64,8 +64,6 @@ make CFLAGS="$SLKCFLAGS"
# Install the binary sgid utmp in order to allow accounting
install -D -o root -g utmp -m 2751 atop $PKG/usr/bin/atop
-# Add the init script and fix the paths in it
-patch -p1 < $CWD/atop.init.diff
install -D -m 0755 atop.init $PKG/etc/rc.d/rc.atop.new
mkdir -p $PKG/etc/{logrotate.d,cron.daily}
diff --git a/system/atop/atop.info b/system/atop/atop.info
index 6c63a754d4..09b9695500 100644
--- a/system/atop/atop.info
+++ b/system/atop/atop.info
@@ -1,8 +1,8 @@
PRGNAM="atop"
-VERSION="2.1"
+VERSION="2.2"
HOMEPAGE="http://www.atoptool.nl/"
-DOWNLOAD="http://www.atoptool.nl/download/atop-2.1-1.tar.gz"
-MD5SUM="d956f5b0c7e0705cff6cf44898d664d7"
+DOWNLOAD="http://www.atoptool.nl/download/atop-2.2-3.tar.gz"
+MD5SUM="034dc1544f2ec4e4d2c739d320dc326d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
diff --git a/system/atop/atop.init.diff b/system/atop/atop.init.diff
deleted file mode 100644
index a2e75bc030..0000000000
--- a/system/atop/atop.init.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- atop-1.20/atop.init.orig 2008-01-08 20:44:34.327288088 -0600
-+++ atop-1.20/atop.init 2008-01-08 20:45:25.786220566 -0600
-@@ -7,7 +7,7 @@
- #
-
- # Check existance of binaries
--[ -f /usr/bin/atop ] || exit 0
-+[ -f /usr/bin/atop ] || exit 1
-
- PIDFILE=/var/run/atop.pid
- RETVAL=0
-@@ -22,7 +22,7 @@
- :
- else
- # Start atop
-- /etc/atop/atop.daily
-+ /etc/cron.daily/atop
- fi
- ;;
-
-@@ -43,11 +43,11 @@
- ;;
-
- reload)
-- /etc/atop/atop.daily
-+ /etc/cron.daily/atop
- ;;
-
- restart)
-- /etc/atop/atop.daily
-+ /etc/cron.daily/atop
- ;;
-
- *)