Commit 04ee9a2a authored by Carlo Landmeter's avatar Carlo Landmeter
Browse files

main/collectd: upgrade to 5.6.1

parent f8bde60e
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=collectd
pkgver=5.5.2
pkgrel=1
pkgver=5.6.1
pkgrel=0
pkgdesc="The system statistics collection daemon"
url="http://collectd.org"
arch="all"
......@@ -14,38 +14,27 @@ makedepends="curl-dev net-snmp-dev postgresql-dev perl-dev python2-dev
hiredis-dev
autoconf automake libtool"
install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-perl::noarch $pkgname-snmp
subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp
$pkgname-curl:_curl
$pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql
$pkgname-mysql $pkgname-network $pkgname-rrdtool $pkgname-sensors
$pkgname-python:_python $pkgname-iptables:_ipt $pkgname-bind
$pkgname-ascent $pkgname-virt $pkgname-redis"
$pkgname-ascent $pkgname-virt $pkgname-redis $pkgname-write_redis
$pkgname-log_logstash $pkgname-ceph"
source="http://collectd.org/files/collectd-$pkgver.tar.bz2
gnu_source.patch
collectd.initd"
collectd.initd
gnu_source.patch"
_builddir="$srcdir"/$pkgname-$pkgver
builddir="$srcdir"/$pkgname-$pkgver
# security fixes:
# 5.5.2-r0:
# - CVE-2016-6254
prepare() {
cd "$_builddir"
update_config_sub || return 1
for i in $source; do
case $i in
*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
esac
done
autoreconf -vif || return 1
sed -i -e '/CFLAGS/s/-Werror//' configure src/Makefile.in \
src/*/Makefile.in || return 1
}
build() {
cd "$_builddir"
cd "$builddir"
autoreconf -vif || return 1
./configure \
--build=$CBUILD \
--host=$CHOST \
......@@ -58,6 +47,8 @@ build() {
--enable-rrdtool \
--enable-libvirt \
--enable-bind \
--disable-werror \
--with-perl-bindings=INSTALLDIRS=vendor \
|| return 1
make || return 1
# disable network plugin by default since its in a subpackage
......@@ -66,7 +57,7 @@ build() {
}
package() {
cd "$_builddir"
cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
......@@ -75,10 +66,12 @@ package() {
perl() {
pkgdesc="perl bindings to collectd"
depends="perl"
install -d "$subpkgdir"/usr/lib/ "$subpkgdir"/usr/share
mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/
# mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
mkdir -p "$subpkgdir"/usr/lib/collectd \
"$subpkgdir"/usr/share || return 1
mv "$pkgdir"/usr/lib/collectd/perl.so \
"$subpkgdir"/usr/lib/collectd/ || return 1
mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ || return 1
mv "$pkgdir"/usr/share/perl* "$subpkgdir"/usr/share/
}
_plugin() {
......@@ -105,14 +98,17 @@ _ipt() { _plugin iptables; }
bind() { _plugin bind; }
ascent() { _plugin ascent; }
redis() { _plugin redis; }
write_redis() { _plugin write_redis; }
log_logstash() { _plugin log_logstash; }
ceph() { _plugin ceph; }
virt() { _plugin virt; provides="$pkgname-libvirt"; }
md5sums="40b83343f72089e0330f53965f1140bd collectd-5.5.2.tar.bz2
4c0b185623baebc4f4b71b3b47383b3a gnu_source.patch
8015a61e7cda7abdf60e63eeff2923d2 collectd.initd"
sha256sums="017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f collectd-5.5.2.tar.bz2
5f177512b28b5955231457a8c4468e28dfb667986affebd30c1cba01980e6bff gnu_source.patch
7d7b20cb0c804d56d4e7ffe60b975b82c194898160674be2de49d1489589f6a3 collectd.initd"
sha512sums="9d311db4f3677b95e3a47c03af01bdf1127957f6fccb6c601455632d0ea3b39e3f4cd9a6f8f510083e208714bbb0da2e04aaa574a90b0ad6fe984506675475b3 collectd-5.5.2.tar.bz2
34b65fc2c21980e047e3d803a8293e8b523ad06e725113065787f1ce3ea81c5ce3e907845b03192770972ece3d8b79dc884c9e7782d428416ee418bc0658daae gnu_source.patch
296b9f58df7b0da5b2fbf8c6e77cbd08c6673da28e98e67a34cb52dffc26c45d54a95f0bc51a16729d1844752636419fae98a4d3fd744b736568dfc23fab4296 collectd.initd"
md5sums="979f43b6439d7df93f0b40c73d779223 collectd-5.6.1.tar.bz2
8015a61e7cda7abdf60e63eeff2923d2 collectd.initd
3bba7683187b5fc736727a3b8f9c26b2 gnu_source.patch"
sha256sums="c30ff644f91407b4dc2d99787b99cc45ec00e538bd1cc269429d3c5e8a4aee2c collectd-5.6.1.tar.bz2
7d7b20cb0c804d56d4e7ffe60b975b82c194898160674be2de49d1489589f6a3 collectd.initd
071770da2e443194574c8d7e5dc1c8170f18aa846ef7edfafa8128d96d531a8d gnu_source.patch"
sha512sums="da25f1a9cbaf47533f5a4d2f5f78b966317d4f21865c5a714954ad9d7d02b4798a3e0471ce52199dc80e01dc2808376cb10a7e19c402aafc984bf595f09951a6 collectd-5.6.1.tar.bz2
296b9f58df7b0da5b2fbf8c6e77cbd08c6673da28e98e67a34cb52dffc26c45d54a95f0bc51a16729d1844752636419fae98a4d3fd744b736568dfc23fab4296 collectd.initd
519fa563d319928e35e0235dd2bc38e7e53dbaae93ede1c93622dab2d00e1ac3baa93200f9e3e62cb81c1c9d808171b4648db864191d57a703ac7874b9c5fb95 gnu_source.patch"
This diff is collapsed.
https://github.com/collectd/collectd/issues/1147
diff --git a/configure.ac b/configure.ac
index 6ee6e9a..a0e35b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,6 +49,7 @@ AC_PROG_LEX
AC_PROG_YACC
define GNU_SOURCE so perl will be properly detected
--- ./configure.ac.orig
+++ ./configure.ac
@@ -67,6 +67,8 @@
PKG_PROG_PKG_CONFIG
+AC_GNU_SOURCE
AC_CHECK_PROG([have_protoc_c], [protoc-c], [yes], [no])
AC_CHECK_HEADERS([google/protobuf-c/protobuf-c.h],
[have_protobuf_c_h="yes"],
+
AC_CACHE_CHECK([if bison is the parser generator],
[collectd_cv_prog_bison],
[AS_IF([$YACC --version 2>/dev/null | $EGREP -q '^bison '],
--- ./src/daemon/Makefile.am.orig
+++ ./src/daemon/Makefile.am
@@ -49,7 +49,7 @@
collectd_CFLAGS = $(AM_CFLAGS)
collectd_LDFLAGS = -export-dynamic
collectd_LDADD = libavltree.la libcommon.la libheap.la -lm
-collectd_DEPENDENCIES =
+collectd_DEPENDENCIES = libavltree.la libcommon.la libheap.la
# Link to these libraries..
if BUILD_WITH_LIBRT
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment