diff options
Diffstat (limited to 'system/collectd')
| -rw-r--r-- | system/collectd/README | 26 | ||||
| -rw-r--r-- | system/collectd/collectd.SlackBuild | 28 | ||||
| -rw-r--r-- | system/collectd/collectd.info | 6 | ||||
| -rw-r--r-- | system/collectd/doinst.sh | 3 |
4 files changed, 31 insertions, 32 deletions
diff --git a/system/collectd/README b/system/collectd/README index 64abd67633..8b886ee96e 100644 --- a/system/collectd/README +++ b/system/collectd/README @@ -1,12 +1,15 @@ -collectd is a daemon which collects system performance statistics periodically -and provides mechanisms to store the values in a variety of ways, for example -in RRD files and backends like Graphite. +collectd (statistics collection daemon) -collectd gathers statistics about the system it is running on and stores this -information. Those statistics can then be used to find current performance -bottlenecks (i.e. performance analysis) and predict future system load (i.e. -capacity planning). Or if you just want pretty graphs of your private server -and are fed up with some homegrown solution you're at the right place, too ;). +collectd is a daemon which collects system performance statistics +periodically and provides mechanisms to store the values in a variety +of ways, for example in RRD files and backends like Graphite. + +collectd gathers statistics about the system it is running on and +stores this information. Those statistics can then be used to find +current performance bottlenecks (i.e. performance analysis) and +predict future system load (i.e. capacity planning). Or if you just +want pretty graphs of your private server and are fed up with some +homegrown solution you're at the right place, too ;). Optional, tested, recommended dependencies: rrdtool, yajl @@ -17,6 +20,7 @@ libvirt, lua, postgresql This package has several more optional dependencies, which are autodetected, but are mostly not tested by me (feedback welcome!): -ganglia, gpsd, hiredis, i2c-tools, kafka, libdbi, libesmtp, libmemcached, -libmicrohttpd, libmodbus, libsigrok, libstatgrab, mongo-c, mosquitto, -protobuf, protobuf-c, rabbitmq-c, tokyotyrant, varnish, xen +ganglia, gpsd, hiredis, i2c-tools, kafka, libdbi, libesmtp, +libmemcached, libmicrohttpd, libmodbus, libsigrok, libstatgrab, +mongo-c, mosquitto, protobuf, protobuf-c, rabbitmq-c, tokyotyrant, +varnish, xen diff --git a/system/collectd/collectd.SlackBuild b/system/collectd/collectd.SlackBuild index 930150310b..f7dba59369 100644 --- a/system/collectd/collectd.SlackBuild +++ b/system/collectd/collectd.SlackBuild @@ -1,4 +1,5 @@ #!/bin/bash + # Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST # Copyright 2009, 2010, 2011, 2012 Eric Hameleers, Eindhoven, Netherlands @@ -12,10 +13,12 @@ # Copyright (c) 2017-2019, Modified by: Ricardo J. Barberis <ricardo.barberis@gmail.com> +# 20220211 bkw: fix build on 15.0 (by updating to v5.12.0). + cd $(dirname $0) ; CWD=$(pwd) PRGNAM=collectd -VERSION=${VERSION:-5.10.0} +VERSION=${VERSION:-5.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -28,9 +31,6 @@ if [ -z "$ARCH" ]; then esac fi -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" exit 0 @@ -65,9 +65,9 @@ cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + -exec chmod 644 {} \+ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -81,16 +81,16 @@ CXXFLAGS="$SLKCFLAGS" \ --with-perl-bindings="PREFIX=/usr INSTALLDIRS=vendor INSTALLVENDORMAN3DIR=/usr/man/man3" \ --enable-static=no \ --without-java \ + --disable-werror \ --build=$ARCH-slackware-linux make -make install DESTDIR=$PKG - -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 +make install-strip DESTDIR=$PKG +gzip -9 $PKG/usr/man/man*/* +rm -f $PKG/usr/lib*/*.la -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 +# don't need these empty dirs in the package: +rmdir $PKG/var/{log,run} install -m 0644 -D $CWD/rc.collectd $PKG/etc/rc.d/rc.collectd.new @@ -105,9 +105,7 @@ find $PKG -name "perllocal.pod" \ rm -fr $PKG/var/run $PKG/var/log mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/collectd/collectd.info b/system/collectd/collectd.info index 0669478a2b..dab3d73d39 100644 --- a/system/collectd/collectd.info +++ b/system/collectd/collectd.info @@ -1,8 +1,8 @@ PRGNAM="collectd" -VERSION="5.10.0" +VERSION="5.12.0" HOMEPAGE="https://collectd.org" -DOWNLOAD="https://collectd.org/files/collectd-5.10.0.tar.bz2" -MD5SUM="a8344a199b124711bdbec57f1c0b624f" +DOWNLOAD="https://collectd.org/files/collectd-5.12.0.tar.bz2" +MD5SUM="2b23a65960bc323d065234776a542e04" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/collectd/doinst.sh b/system/collectd/doinst.sh index 6359977249..8684b492f8 100644 --- a/system/collectd/doinst.sh +++ b/system/collectd/doinst.sh @@ -1,14 +1,11 @@ config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy rm $NEW fi - # Otherwise, we leave the .new copy for the admin to consider... } preserve_perms() { |