diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-03 18:50:06 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-06 05:19:23 +0000 |
| commit | faea644ba4bbb2a287074f26b770e12f97c649fe (patch) | |
| tree | 3b908cac16389d227e430901cf9d81180c303c34 /main/ntop | |
| parent | c4940062a67382272b56cb6024014961cc537433 (diff) | |
| download | aports-faea644ba4bbb2a287074f26b770e12f97c649fe.tar.bz2 aports-faea644ba4bbb2a287074f26b770e12f97c649fe.tar.xz | |
main/ntop: libressl-2.7 rebuild and fix rrdtool-1.6 support
Diffstat (limited to 'main/ntop')
| -rw-r--r-- | main/ntop/APKBUILD | 16 | ||||
| -rw-r--r-- | main/ntop/ntop-rrdtool-1.6.0.patch | 29 |
2 files changed, 32 insertions, 13 deletions
diff --git a/main/ntop/APKBUILD b/main/ntop/APKBUILD index 88ef6d9de9..556d531797 100644 --- a/main/ntop/APKBUILD +++ b/main/ntop/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org> pkgname=ntop pkgver=5.0.1 -pkgrel=11 +pkgrel=12 pkgdesc="Network traffic probe" url="http://www.ntop.org" arch="all" @@ -18,6 +18,7 @@ subpackages="$pkgname-dev $pkgname-doc" source="https://sourceforge.net/projects/$pkgname/files/$pkgname/Stable/$pkgname-$pkgver.tar.gz include-sys-types.h.patch automake.patch + ntop-rrdtool-1.6.0.patch ntop.initd ntop.confd ntop-update-geoip-db" @@ -48,21 +49,10 @@ package() { chown -R ntop.ntop "$pkgdir"/usr/share/ntop } -md5sums="01710b6925a8a5ffe1a41b8b512ebd69 ntop-5.0.1.tar.gz -a2729d5c8f132974c2720112364a924e include-sys-types.h.patch -86eeacb33ececc416e66fc4260518f05 automake.patch -af32215f664231f37a9a8147d89d97f0 ntop.initd -1303915a8435560acf27748ea0cea484 ntop.confd -080de490aeed421775e6f2472d86cb94 ntop-update-geoip-db" -sha256sums="7e8e84cb14d2173beaca4d4cb991a14d84a4bef84ec37b2276bc363f45c52ef8 ntop-5.0.1.tar.gz -2419f7ace6ad93db47a4bccd3e50350f5f837d0b269d4237d6c58d1b28d6b8c8 include-sys-types.h.patch -5e8ddd9d269c4fc23a2376091dcd7a1afedb3d1e15aa4d1ab5d13bb11173f3f7 automake.patch -e1a859b168287950d828ba4d31a9bbeb46e46d1ea3cc1e43f20fa2ef2742d478 ntop.initd -b582253490df4cde55dda97585d45d16b2968296da7e9bc996dde932cf42584d ntop.confd -3604d0a728b203211fab05eca829a7e93bc05c04f252937ffbf630813420eef6 ntop-update-geoip-db" sha512sums="f52c40e6c00c8d2f46b68078c5f9aef8ed78670f92a0a81f66f2f44c71d41bc4c001b4550f19b71c546f7c07cbbed15e0aa1ee13873ac63a11678bf2b8483f2a ntop-5.0.1.tar.gz b67705152cd8723ba3e1c340ca55267134dddae04dd281fae262d07ce273a78d24bf40c297fe61ea7f70deb9cb7d59445e8a3ce360ed7810497e63052e1a9214 include-sys-types.h.patch ce284679f9ecf589139b6cfdba95a76df5205f5292a5ff88b7cdeb39fe01b4fef27fb097a6a594017aa015a2474fea6c5729917423398a911e1732329ec1504a automake.patch +3532acc6e54a1abdefeba42b3adb68cba1a0d1d2d6422e5b33fb9823b48481bb83696f097e65288c5811a6dd65ce20bff6d285d152776156b0690610d4026245 ntop-rrdtool-1.6.0.patch 22b61d88e1fc30106d07ee87701ff46b7f63f1ee2aa7bb5666d9cb5cb6251c583f793c80a5d799ac27fcb63650e7ecacb37e7992feb8aa8cbc2d326b36b05a8f ntop.initd 8693050cab03eeb29b59e0a7b173c7791625e8cd6bc33eaa5d74a50ab3ecf435577d7918626cfe3963a0d23d4522a737737b2b9fd8335df29784858a6191813d ntop.confd 7b5ae8dbd7d5d084c7278af1deb64a903b106663c3195df70acead3e8d7e14fbd996e69d5132c0ddac9147b3e70892c91695d834ab7b22fec2569efcd52df5f6 ntop-update-geoip-db" diff --git a/main/ntop/ntop-rrdtool-1.6.0.patch b/main/ntop/ntop-rrdtool-1.6.0.patch new file mode 100644 index 0000000000..51439390f1 --- /dev/null +++ b/main/ntop/ntop-rrdtool-1.6.0.patch @@ -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 |