aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorprspkt <prspkt@protonmail.com>2018-04-23 07:29:09 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2018-05-08 08:39:26 +0000
commita8001a61cfe86851cad11ba8785afe3c9e6eee28 (patch)
tree0711dbba6bd9fb98ee0bd6efd11c90bd39d4b7bb /main
parentefcb48812cf78d542334b5d11dcc16fefbe0957e (diff)
downloadaports-a8001a61cfe86851cad11ba8785afe3c9e6eee28.tar.bz2
aports-a8001a61cfe86851cad11ba8785afe3c9e6eee28.tar.xz
main/nfdump: upgrade to 1.6.17
Add autoconf, automake and libtool dependencies for the autotools framework.
Diffstat (limited to 'main')
-rw-r--r--main/nfdump/APKBUILD19
-rw-r--r--main/nfdump/fix-64bit-fts-compat.patch12
2 files changed, 6 insertions, 25 deletions
diff --git a/main/nfdump/APKBUILD b/main/nfdump/APKBUILD
index 08d99fed64..59e2ad5d5f 100644
--- a/main/nfdump/APKBUILD
+++ b/main/nfdump/APKBUILD
@@ -1,19 +1,18 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=nfdump
-pkgver=1.6.16
-pkgrel=1
+pkgver=1.6.17
+pkgrel=0
pkgdesc="The nfdump tools collect and process netflow data on the command line."
url="http://nfdump.sourceforge.net/"
arch="all"
license="BSD"
depends=""
depends_dev=""
-makedepends="bison bzip2-dev flex $depends_dev rrdtool-dev"
+makedepends="autoconf automake libtool bison bzip2-dev flex $depends_dev rrdtool-dev"
install=""
subpackages="$pkgname-doc $pkgname-dbg nfprofile sfcapd"
source="$pkgname-$pkgver.tar.gz::https://github.com/phaag/nfdump/archive/v$pkgver.tar.gz
- fix-64bit-fts-compat.patch
nfcapd.confd
nfcapd.initd
sfcapd.confd
@@ -22,13 +21,8 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/phaag/nfdump/archive/v$pkgve
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
+ default_prepare
+ ./autogen.sh
}
build() {
@@ -73,8 +67,7 @@ sfcapd() {
"$subpkgdir"/etc/init.d/sfcapd
}
-sha512sums="c1af3cf984c7eaaf1012c71c061e00f12dbcdf276306096436eb707552932c65b9f03e7a22b4cc0989d951c433f32c5c927600a8248826227f10b4fb2d906a32 nfdump-1.6.16.tar.gz
-71a838d493658a3a8479bc9eca70a857fd8629937d4954d21c1d5453d6cc122c089f72e3e109425c902439ee8cfaa273b4089ac347d1fe926473ce6062b7c49a fix-64bit-fts-compat.patch
+sha512sums="dd015665c49d40e0bc4395d6041b32d7a53c7e71db77347f08082806c0a13633cd0100f1fb2c63898c565754a00dd389d4235a148715cd157f4ec865246fa97b nfdump-1.6.17.tar.gz
fcb467f819f2b73ac0e13de6de4d6c94cafd3866a7a56685d5d4a048fa975135299655e896ff8370c8c5061d03ab38644623f8be455c08dfe5f630f152820148 nfcapd.confd
97e432e884dd1cc8f27c2d7398bb0320164d46dea06c64ad72fa385d190998b3d62356634962f42652daf6e31f237baa2f3f3efad47c3fc38cc6bea799db61cc nfcapd.initd
abe594a95a9320bec1d6ee6af6b75cd4d176526d4b10d07aa7ed79fc292b51c341339ba8e1e468df9ec2aae138b1dd66e3a291921938217835ac33819da9d153 sfcapd.confd
diff --git a/main/nfdump/fix-64bit-fts-compat.patch b/main/nfdump/fix-64bit-fts-compat.patch
deleted file mode 100644
index 54afdb17fd..0000000000
--- a/main/nfdump/fix-64bit-fts-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru nfdump-1.6.9.orig/bin/fts_compat.c nfdump-1.6.9/bin/fts_compat.c
---- nfdump-1.6.9.orig/bin/fts_compat.c 2014-11-18 11:55:29.794283835 -0200
-+++ nfdump-1.6.9/bin/fts_compat.c 2011-12-29 17:11:27.000000000 -0200
-@@ -949,7 +949,7 @@
- #endif
-
- #ifndef ALIGN
--#define ALIGN(p) (((u_int)(p) + ALIGNBYTES) &~ ALIGNBYTES)
-+#define ALIGN(p) (((u_long)(p) + ALIGNBYTES) &~ ALIGNBYTES)
- #endif
-
- size_t len;