diff options
-rw-r--r-- | main/collectd/APKBUILD | 9 | ||||
-rw-r--r-- | main/collectd/collectd-4.10.3-iptc-check.patch | 20 |
2 files changed, 4 insertions, 25 deletions
diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD index 438f0e8c0d..5f114fb424 100644 --- a/main/collectd/APKBUILD +++ b/main/collectd/APKBUILD @@ -1,8 +1,8 @@ # Contributor: # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=collectd -pkgver=5.0.0 -pkgrel=3 +pkgver=5.0.1 +pkgrel=0 pkgdesc="The system statistics collection daemon" url="http://collectd.org" arch="all" @@ -16,7 +16,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp $pkgname-curl $pkgname-mysql $pkgname-network" source="http://collectd.org/files/collectd-$pkgver.tar.bz2 - collectd-4.10.3-iptc-check.patch collectd.initd" _builddir="$srcdir"/$pkgname-$pkgver @@ -44,6 +43,7 @@ build() { --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstate=/var \ + --with-libiptc \ || return 1 make LDADD='-lm' || return 1 # disable network plugin by default since its in a subpackage @@ -88,6 +88,5 @@ postgresql() { _plugin postgresql; } mysql() { _plugin mysql; } network() { _plugin network; } -md5sums="7bfea6e82d35b36f16d1da2c71397213 collectd-5.0.0.tar.bz2 -38f2ac1754e0dc0fcc70a04574cc7437 collectd-4.10.3-iptc-check.patch +md5sums="9ad1e4334bd4a671284e8e92a3e3323e collectd-5.0.1.tar.bz2 13a36ae2f92634b5619ab94224e1b77d collectd.initd" diff --git a/main/collectd/collectd-4.10.3-iptc-check.patch b/main/collectd/collectd-4.10.3-iptc-check.patch deleted file mode 100644 index 4358e7f094..0000000000 --- a/main/collectd/collectd-4.10.3-iptc-check.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./configure.orig 2011-03-26 17:09:34.000000000 +0100 -+++ ./configure 2011-03-29 14:23:54.647074988 +0200 -@@ -36343,13 +36343,13 @@ - # Check for the iptc_init symbol in the library. - if test "x$with_libiptc" = "xyes" && test "x$with_own_libiptc" = "xno" - then -- { echo "$as_me:$LINENO: checking for iptc_init in -liptc" >&5 --echo $ECHO_N "checking for iptc_init in -liptc... $ECHO_C" >&6; } --if test "${ac_cv_lib_iptc_iptc_init+set}" = set; then -+ { echo "$as_me:$LINENO: checking for iptc_init in -lip4tc" >&5 -+echo $ECHO_N "checking for iptc_init in -lip4tc... $ECHO_C" >&6; } -+if test "${ac_cv_lib_ip4tc_iptc_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-liptc $LIBS" -+LIBS="-liptc -lip6tc -lip4tc $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF |