diff --git a/pkgbuild/cacti-spine/PKGBUILD b/pkgbuild/cacti-spine/PKGBUILD index efe0bfd..28c1d24 100644 --- a/pkgbuild/cacti-spine/PKGBUILD +++ b/pkgbuild/cacti-spine/PKGBUILD @@ -1,26 +1,33 @@ # Maintainer: Cedric Girard # Contributor: Tom pkgname=cacti-spine -pkgver=0.8.8_c -pkgrel=1 +pkgver=0.8.8_d +pkgrel=2 pkgdesc="Faster poller for Cacti." arch=('i686' 'x86_64') url="http://cacti.net/spine_info.php" license=('GPL') depends=('libmariadbclient' 'net-snmp' "cacti=${pkgver}") backup=('etc/spine.conf') -source=("http://www.cacti.net/downloads/spine/${pkgname}-${pkgver/_/}.tar.gz") -md5sums=('448c813422f943dc09b237bd8022002a') +source=("make.patch" "http://www.cacti.net/downloads/spine/${pkgname}-${pkgver/_/}.tar.gz") +md5sums=('c36d7a35a9b9760fb6a8c53a007f06a7' + '7724218aff3695369a20f05d2aeb993b') -build() { +prepare() { cd "${srcdir}/${pkgname}-${pkgver/_/}" - sed -i 's!AM_CONFIG_HEADER!AC_CONFIG_HEADERS!g' configure.ac + + patch -p1 -i ../make.patch + /usr/bin/aclocal /usr/bin/libtoolize --force --copy /usr/bin/autoheader /usr/bin/autoconf /usr/bin/automake --add-missing --copy --force-missing - /bin/chmod +x ./configure +} + +build() { + cd "${srcdir}/${pkgname}-${pkgver/_/}" + export CFLAGS="$CFLAGS -lpthread -lm" ./configure --prefix=/usr --sysconfdir=/etc make } diff --git a/pkgbuild/cacti-spine/make.patch b/pkgbuild/cacti-spine/make.patch new file mode 100644 index 0000000..434e2d9 --- /dev/null +++ b/pkgbuild/cacti-spine/make.patch @@ -0,0 +1,40 @@ +diff -Naur cacti-spine-0.8.8d/configure.ac cacti-spine-0.8.8d-patched/configure.ac +--- cacti-spine-0.8.8d/configure.ac 2015-06-08 20:26:02.000000000 +0200 ++++ cacti-spine-0.8.8d-patched/configure.ac 2015-06-12 16:41:21.401118417 +0200 +@@ -9,8 +9,8 @@ + AC_PREFIX_DEFAULT(/usr/local/spine) + AC_LANG(C) + +-AM_INIT_AUTOMAKE(spine, 0.8.8d) +-AM_CONFIG_HEADER(config/config.h) ++AM_INIT_AUTOMAKE ++AC_CONFIG_HEADER(config/config.h) + + # static libraries + AC_ARG_WITH(static, +@@ -272,7 +272,12 @@ + ) + AC_DEFINE_UNQUOTED(SNMP_LOCALNAME, $havelocalname, If snmp localname session structure member exists) + +-AC_CHECK_LIB(netsnmp, snmp_timeout) ++AC_CHECK_LIB(netsnmp, snmp_timeout, ++ [ LIBS="-lnetsnmp $LIBS" ++ AC_DEFINE(USE_NET_SNMP, 1, New Net SNMP Version) ++ ], ++ AC_MSG_RESULT(Cannot find NET-SNMP libraries(snmp)) ++) + + # ****************** Spine Result Buffer Check *********************** + # Check for the default spine output buffer size +diff -Naur cacti-spine-0.8.8d/Makefile.am cacti-spine-0.8.8d-patched/Makefile.am +--- cacti-spine-0.8.8d/Makefile.am 2015-06-08 20:26:02.000000000 +0200 ++++ cacti-spine-0.8.8d-patched/Makefile.am 2015-06-12 16:41:39.961073148 +0200 +@@ -5,4 +5,6 @@ + configdir = $(sysconfdir) + config_DATA = spine.conf.dist + +-bin_PROGRAMS = spine +\ No newline at end of file ++bin_PROGRAMS = spine ++ ++ACLOCAL_AMFLAGS = -I m4