main/collectd: upgrade to 5.8.0; modernize

This commit is contained in:
TBK 2018-01-28 19:19:04 +01:00 committed by Timo Teräs
parent 4e0974895b
commit 07bf8cf73e
2 changed files with 41 additions and 27 deletions

View File

@ -1,12 +1,14 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com> # Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=collectd pkgname=collectd
pkgver=5.7.2 pkgver=5.8.0
pkgrel=0 pkgrel=0
pkgdesc="The system statistics collection daemon" pkgdesc="The system statistics collection daemon"
url="http://collectd.org" url="http://collectd.org"
arch="all" arch="all"
license="GPL-2.0" license="GPL-2.0"
pkgusers="collectd"
pkggroups="collectd"
depends="" depends=""
makedepends="curl-dev net-snmp-dev postgresql-dev perl-dev python2-dev makedepends="curl-dev net-snmp-dev postgresql-dev perl-dev python2-dev
libgcrypt-dev mariadb-dev zlib-dev libressl-dev iptables-dev libgcrypt-dev mariadb-dev zlib-dev libressl-dev iptables-dev
@ -14,7 +16,6 @@ makedepends="curl-dev net-snmp-dev postgresql-dev perl-dev python2-dev
hiredis-dev eudev-dev mosquitto-dev lua-dev lvm2-dev openipmi-dev hiredis-dev eudev-dev mosquitto-dev lua-dev lvm2-dev openipmi-dev
libpcap-dev liboping-dev libpcap-dev liboping-dev
autoconf automake libtool" autoconf automake libtool"
install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-libs subpackages="$pkgname-dev $pkgname-doc $pkgname-libs
$pkgname-perl $pkgname-snmp $pkgname-curl:_curl $pkgname-utils $pkgname-perl $pkgname-snmp $pkgname-curl:_curl $pkgname-utils
$pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql $pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql
@ -24,12 +25,10 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs
$pkgname-log_logstash $pkgname-ceph $pkgname-disk $pkgname-lvm $pkgname-log_logstash $pkgname-ceph $pkgname-disk $pkgname-lvm
$pkgname-lua $pkgname-mqtt $pkgname-ipmi $pkgname-ping $pkgname-dns" $pkgname-lua $pkgname-mqtt $pkgname-ipmi $pkgname-ping $pkgname-dns"
install="$pkgname.pre-install" install="$pkgname.pre-install"
pkgusers="collectd"
pkggroups="collectd"
source="http://collectd.org/files/collectd-$pkgver.tar.bz2 source="http://collectd.org/files/collectd-$pkgver.tar.bz2
collectd.initd collectd.initd
gnu_source.patch gnu_source.patch
collectd.pre-install" "
builddir="$srcdir"/$pkgname-$pkgver builddir="$srcdir"/$pkgname-$pkgver
@ -37,9 +36,17 @@ builddir="$srcdir"/$pkgname-$pkgver
# 5.5.2-r0: # 5.5.2-r0:
# - CVE-2016-6254 # - CVE-2016-6254
prepare() {
cd "$builddir"
default_prepare
autoreconf -vif
}
build() { build() {
cd "$builddir" cd "$builddir"
autoreconf -vif || return 1
./configure \ ./configure \
--build=$CBUILD \ --build=$CBUILD \
--host=$CHOST \ --host=$CHOST \
@ -50,23 +57,29 @@ build() {
--localstate=/var \ --localstate=/var \
--with-libiptc \ --with-libiptc \
--enable-rrdtool \ --enable-rrdtool \
--enable-libvirt \
--enable-bind \ --enable-bind \
--disable-werror \ --disable-werror \
--with-perl-bindings=INSTALLDIRS=vendor \ --with-perl-bindings=INSTALLDIRS=vendor
|| return 1
make || return 1 make
# disable plugins by default since its in a subpackage # disable plugins by default since its in a subpackage
sed -i -e 's/^LoadPlugin network/#LoadPlugin network/' \ sed -i -e 's/^LoadPlugin network/#LoadPlugin network/' \
src/collectd.conf || return 1 src/collectd.conf
sed -i -e 's/^LoadPlugin rrdtool/#LoadPlugin rrdtool/' \ sed -i -e 's/^LoadPlugin rrdtool/#LoadPlugin rrdtool/' \
src/collectd.conf || return 1 src/collectd.conf
}
check() {
cd "$builddir"
make check
} }
package() { package() {
cd "$builddir" cd "$builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install
chown root:collectd "$pkgdir"/etc/collectd/collectd.conf || return 1 chown root:collectd "$pkgdir"/etc/collectd/collectd.conf
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
} }
@ -74,10 +87,10 @@ package() {
perl() { perl() {
pkgdesc="perl bindings to collectd" pkgdesc="perl bindings to collectd"
mkdir -p "$subpkgdir"/usr/lib/collectd \ mkdir -p "$subpkgdir"/usr/lib/collectd \
"$subpkgdir"/usr/share || return 1 "$subpkgdir"/usr/share
mv "$pkgdir"/usr/lib/collectd/perl.so \ mv "$pkgdir"/usr/lib/collectd/perl.so \
"$subpkgdir"/usr/lib/collectd/ || return 1 "$subpkgdir"/usr/lib/collectd/
mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ || return 1 mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/
mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/ mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
} }
@ -123,7 +136,6 @@ ipmi() { _plugin ipmi; }
ping() { _plugin ping; } ping() { _plugin ping; }
dns() { _plugin dns; } dns() { _plugin dns; }
sha512sums="8844b67159f8da2203b5ac57ef19fce0a01050a016174d196b48b5fb24925ad2935af9bdd9af06097ff663499abc496cdcc2d9e9a10f403f8d707c465c1a88f3 collectd-5.7.2.tar.bz2 sha512sums="1b3d0cc44e2ca54e13eebf292074f1efa8b33d6800d04405e0eaaa2dd1cb2416c6eae580729fb5aead23a5039f41ffe8a9989a907a8c18be8f867f1099fc0008 collectd-5.8.0.tar.bz2
a286c2164af196154d017658d6e5aa3cc4f76dadf90b68c3021418979d9f0377776bb990d737ae5c916c04475725365aea8b78e3bc5e2f3679d5a99f8b9af13e collectd.initd a286c2164af196154d017658d6e5aa3cc4f76dadf90b68c3021418979d9f0377776bb990d737ae5c916c04475725365aea8b78e3bc5e2f3679d5a99f8b9af13e collectd.initd
519fa563d319928e35e0235dd2bc38e7e53dbaae93ede1c93622dab2d00e1ac3baa93200f9e3e62cb81c1c9d808171b4648db864191d57a703ac7874b9c5fb95 gnu_source.patch 3078e43fc1aa5e5d5f7042472f465cc3b077c59f43a9867ade038e59bb210f26f53bb9a1e1e8a198ca53939a4b2e03a1f05628aa54f826746f970faa36acff6a gnu_source.patch"
cb0efcd3b9bd5620b7d812d5f038ebd60253f1ce9006da0a1b4b56666202a4254e80ab6a84d675b6cb099ecda1897de17b51a9e3f0d83e8b0455343f5f6d24d7 collectd.pre-install"

View File

@ -1,12 +1,14 @@
define GNU_SOURCE so perl will be properly detected #
--- ./configure.ac.orig # Define GNU_SOURCE so perl will be properly detected
+++ ./configure.ac #
@@ -67,6 +67,8 @@ --- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,8 @@
PKG_PROG_PKG_CONFIG PKG_PROG_PKG_CONFIG
+AC_GNU_SOURCE +AC_GNU_SOURCE
+ +
AC_CACHE_CHECK([if bison is the parser generator], AC_CACHE_CHECK([if Bison is the parser generator],
[collectd_cv_prog_bison], [collectd_cv_prog_bison],
[AS_IF([$YACC --version 2>/dev/null | $EGREP -q '^bison '], [