[arch-commits] Commit in ntop/trunk (PKGBUILD ntop-rrdtool-1.6.0.patch)

[Antonio Rojas]

    Date: Tuesday, November 1, 2016 @ 10:51:12
  Author: arojas
Revision: 194194

rrdtool 1.6.0 rebuild

Added:
  ntop/trunk/ntop-rrdtool-1.6.0.patch
Modified:
  ntop/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   10 +++++++---
 ntop-rrdtool-1.6.0.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-01 10:34:08 UTC (rev 194193)
+++ PKGBUILD	2016-11-01 10:51:12 UTC (rev 194194)
@@ -3,7 +3,7 @@
 
 pkgname=ntop
 pkgver=5.0.1
-pkgrel=8
+pkgrel=9
 pkgdesc='A network traffic probe that shows the network usage.'
 arch=('i686' 'x86_64')
 url='http://www.ntop.org/'
@@ -13,9 +13,10 @@
 options=('!makeflags')
 install='ntop.install'
 source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz"
-        'ntop.service')
+        'ntop.service' ntop-rrdtool-1.6.0.patch)
 md5sums=('01710b6925a8a5ffe1a41b8b512ebd69'
-         '0e149d20f881600e8387d850ac268483')
+         '0e149d20f881600e8387d850ac268483'
+         'e56f53299eb7386167aedb0ef8f2f8f8')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -23,6 +24,9 @@
   # Python2 fix
   find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
   sed -i 's/python-config/python2-config/' configure.in
+
+  # Fix build with rrdtool 1.6 (Fedora)
+  patch -p1 -i ../ntop-rrdtool-1.6.0.patch
 }
 
 build() {

Added: ntop-rrdtool-1.6.0.patch
===================================================================
--- ntop-rrdtool-1.6.0.patch	                        (rev 0)
+++ ntop-rrdtool-1.6.0.patch	2016-11-01 10:51:12 UTC (rev 194194)
@@ -0,0 +1,29 @@
+diff -up ntop-5.0.1/configure.in.rrdtool ntop-5.0.1/configure.in
+--- ntop-5.0.1/configure.in.rrdtool	2016-10-16 20:32:46.194496951 +0200
++++ ntop-5.0.1/configure.in	2016-10-16 20:32:57.392486940 +0200
+@@ -893,19 +893,19 @@ else
+    fi
+ fi
+ 
+-RRD_LIB="-L${RRD_HOME}/lib -lrrd_th"
++RRD_LIB="-L${RRD_HOME}/lib -lrrd"
+ 
+-if test -f "$RRD_HOME/lib/librrd_th.so"; then
++if test -f "$RRD_HOME/lib/librrd.so"; then
+    AC_MSG_RESULT(checking for rrdtool... yes)
+ else
+-  if test -f "$RRD_HOME/lib/librrd_th.dylib"; then # OSX
++  if test -f "$RRD_HOME/lib/librrd.dylib"; then # OSX
+      AC_MSG_RESULT(checking for rrdtool... yes)
+   else
+-     if test -f "$RRD_HOME/lib/librrd_th.a"; then
++     if test -f "$RRD_HOME/lib/librrd.a"; then
+        AC_MSG_RESULT(checking for rrdtool... yes)
+      else
+-       AC_CHECK_LIB([rrd_th], [main])
+-       if test ".${ac_cv_lib_rrd_th_main}" != ".yes"; then
++       AC_CHECK_LIB([rrd], [main])
++       if test ".${ac_cv_lib_rrd_main}" != ".yes"; then
+          AC_MSG_ERROR(Unable to find RRD at $RRD_HOME: please use --with-rrd-home=DIR);
+ 	 AC_MSG_ERROR(RRD source can be downloaded from http://www.rrdtool.org/);
+        else