[arch-commits] Commit in ntop/repos (10 files)

[Jelle van der Waa]

Date: Thursday, March 16, 2017 @ 19:17:26
  Author: jelle
Revision: 216794

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  ntop/repos/community-staging-i686/
  ntop/repos/community-staging-i686/PKGBUILD
(from rev 216793, ntop/trunk/PKGBUILD)
  ntop/repos/community-staging-i686/ntop-rrdtool-1.6.0.patch
(from rev 216793, ntop/trunk/ntop-rrdtool-1.6.0.patch)
  ntop/repos/community-staging-i686/ntop.install
(from rev 216793, ntop/trunk/ntop.install)
  ntop/repos/community-staging-i686/ntop.service
(from rev 216793, ntop/trunk/ntop.service)
  ntop/repos/community-staging-x86_64/
  ntop/repos/community-staging-x86_64/PKGBUILD
(from rev 216793, ntop/trunk/PKGBUILD)
  ntop/repos/community-staging-x86_64/ntop-rrdtool-1.6.0.patch
(from rev 216793, ntop/trunk/ntop-rrdtool-1.6.0.patch)
  ntop/repos/community-staging-x86_64/ntop.install
(from rev 216793, ntop/trunk/ntop.install)
  ntop/repos/community-staging-x86_64/ntop.service
(from rev 216793, ntop/trunk/ntop.service)

---+
 community-staging-i686/PKGBUILD   |   53 
 community-staging-i686/ntop-rrdtool-1.6.0.patch   |   29 ++
 community-staging-i686/ntop.install   |8 +++
 community-staging-i686/ntop.service   |   14 +
 community-staging-x86_64/PKGBUILD |   53 
 community-staging-x86_64/ntop-rrdtool-1.6.0.patch |   29 ++
 community-staging-x86_64/ntop.install |8 +++
 community-staging-x86_64/ntop.service |   14 +
 8 files changed, 208 insertions(+)

Copied: ntop/repos/community-staging-i686/PKGBUILD (from rev 216793, 
ntop/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-03-16 19:17:26 UTC (rev 216794)
@@ -0,0 +1,53 @@
+# Maintainer: Lukas Fleischer 
+# Contributor: Douglas Soares de Andrade 
+
+pkgname=ntop
+pkgver=5.0.1
+pkgrel=10
+pkgdesc='A network traffic probe that shows the network usage.'
+arch=('i686' 'x86_64')
+url='http://www.ntop.org/'
+license=('GPL')
+depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 
'pcre' 'geoip' 'lua' 'python2')
+makedepends=('subversion' 'wget' 'ca-certificates')
+options=('!makeflags')
+install='ntop.install'
+source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz;
+'ntop.service' ntop-rrdtool-1.6.0.patch)
+md5sums=('01710b6925a8a5ffe1a41b8b512ebd69'
+ '0e149d20f881600e8387d850ac268483'
+ 'e56f53299eb7386167aedb0ef8f2f8f8')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # 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() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/usr/share --localstatedir=/var/lib 
--disable-snmp
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install-recursive
+
+  install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop"
+  install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop/rrd"
+
+  for _f in "${pkgdir}/usr/lib/ntop/plugins/"*.so; do
+_plug="$(basename ${_f})"
+ln -sf "../../lib${_plug}" "${_f}"
+  done
+
+  install -Dm0644 "${srcdir}/ntop.service" 
"${pkgdir}/usr/lib/systemd/system/ntop.service"
+}

Copied: ntop/repos/community-staging-i686/ntop-rrdtool-1.6.0.patch (from rev 
216793, ntop/trunk/ntop-rrdtool-1.6.0.patch)
===
--- community-staging-i686/ntop-rrdtool-1.6.0.patch 
(rev 0)
+++ community-staging-i686/ntop-rrdtool-1.6.0.patch 2017-03-16 19:17:26 UTC 
(rev 216794)
@@ -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.rrdtool2016-10-16 20:32:46.194496951 +0200
 ntop-5.0.1/configure.in2016-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 

[arch-commits] Commit in ntop/repos (10 files)

[Antonio Rojas]

Date: Tuesday, November 1, 2016 @ 10:51:43
  Author: arojas
Revision: 194195

archrelease: copy trunk to community-staging-i686, community-staging-x86_64

Added:
  ntop/repos/community-staging-i686/
  ntop/repos/community-staging-i686/PKGBUILD
(from rev 194194, ntop/trunk/PKGBUILD)
  ntop/repos/community-staging-i686/ntop-rrdtool-1.6.0.patch
(from rev 194194, ntop/trunk/ntop-rrdtool-1.6.0.patch)
  ntop/repos/community-staging-i686/ntop.install
(from rev 194194, ntop/trunk/ntop.install)
  ntop/repos/community-staging-i686/ntop.service
(from rev 194194, ntop/trunk/ntop.service)
  ntop/repos/community-staging-x86_64/
  ntop/repos/community-staging-x86_64/PKGBUILD
(from rev 194194, ntop/trunk/PKGBUILD)
  ntop/repos/community-staging-x86_64/ntop-rrdtool-1.6.0.patch
(from rev 194194, ntop/trunk/ntop-rrdtool-1.6.0.patch)
  ntop/repos/community-staging-x86_64/ntop.install
(from rev 194194, ntop/trunk/ntop.install)
  ntop/repos/community-staging-x86_64/ntop.service
(from rev 194194, ntop/trunk/ntop.service)

---+
 community-staging-i686/PKGBUILD   |   53 
 community-staging-i686/ntop-rrdtool-1.6.0.patch   |   29 ++
 community-staging-i686/ntop.install   |8 +++
 community-staging-i686/ntop.service   |   14 +
 community-staging-x86_64/PKGBUILD |   53 
 community-staging-x86_64/ntop-rrdtool-1.6.0.patch |   29 ++
 community-staging-x86_64/ntop.install |8 +++
 community-staging-x86_64/ntop.service |   14 +
 8 files changed, 208 insertions(+)

Copied: ntop/repos/community-staging-i686/PKGBUILD (from rev 194194, 
ntop/trunk/PKGBUILD)
===
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-11-01 10:51:43 UTC (rev 194195)
@@ -0,0 +1,53 @@
+# Maintainer: Lukas Fleischer 
+# Contributor: Douglas Soares de Andrade 
+
+pkgname=ntop
+pkgver=5.0.1
+pkgrel=9
+pkgdesc='A network traffic probe that shows the network usage.'
+arch=('i686' 'x86_64')
+url='http://www.ntop.org/'
+license=('GPL')
+depends=('libevent' 'libpcap' 'gd' 'glibc' 'libxml2' 'openssl' 'rrdtool' 
'pcre' 'geoip' 'lua' 'python2')
+makedepends=('subversion' 'wget' 'ca-certificates')
+options=('!makeflags')
+install='ntop.install'
+source=("http://sourceforge.net/projects/${pkgname}/files/${pkgname}/Stable/${pkgname}-${pkgver}.tar.gz;
+'ntop.service' ntop-rrdtool-1.6.0.patch)
+md5sums=('01710b6925a8a5ffe1a41b8b512ebd69'
+ '0e149d20f881600e8387d850ac268483'
+ 'e56f53299eb7386167aedb0ef8f2f8f8')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # 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() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/usr/share --localstatedir=/var/lib 
--disable-snmp
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" install-recursive
+
+  install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop"
+  install -dm0755 -o nobody -g nobody "${pkgdir}/var/lib/ntop/rrd"
+
+  for _f in "${pkgdir}/usr/lib/ntop/plugins/"*.so; do
+_plug="$(basename ${_f})"
+ln -sf "../../lib${_plug}" "${_f}"
+  done
+
+  install -Dm0644 "${srcdir}/ntop.service" 
"${pkgdir}/usr/lib/systemd/system/ntop.service"
+}

Copied: ntop/repos/community-staging-i686/ntop-rrdtool-1.6.0.patch (from rev 
194194, ntop/trunk/ntop-rrdtool-1.6.0.patch)
===
--- community-staging-i686/ntop-rrdtool-1.6.0.patch 
(rev 0)
+++ community-staging-i686/ntop-rrdtool-1.6.0.patch 2016-11-01 10:51:43 UTC 
(rev 194195)
@@ -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.rrdtool2016-10-16 20:32:46.194496951 +0200
 ntop-5.0.1/configure.in2016-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