Post by Michael PriceIt seems nfdump in ports is a bit behind the latest version though. 1.6.15
in particular fixed a few security issues in nfcapd.
Is sthen still the contact person for the port? I suppose I could submit a
patch.
Oh, it moved so portroach no longer picks it up. Can you try this diff please?
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/nfdump/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile 10 Sep 2016 13:03:42 -0000 1.21
+++ Makefile 16 Mar 2018 16:30:05 -0000
@@ -3,24 +3,23 @@
COMMENT-main = tools to collect and process netflow data
COMMENT-nfprofile = filters data from nfdump according to profiles
-V = 1.6.13
-DISTNAME = nfdump-$V
+V = 1.6.16
+GH_ACCOUNT = phaag
+GH_PROJECT = nfdump
+GH_TAGNAME = v$V
FULLPKGNAME-main = nfdump-$V
FULLPKGNAME-nfprofile = nfprofile-$V
-REVISION-main = 0
-REVISION-nfprofile = 0
+
+SHARED_LIBS += nfdump 0.0 # 0.0
CATEGORIES = net
-HOMEPAGE = http://nfdump.sourceforge.net/
MAINTAINER = Stuart Henderson <***@openbsd.org>
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c z
-
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=nfdump/}
+WANTLIB = bz2 c z
CONFIGURE_STYLE = gnu
@@ -35,11 +34,18 @@ CONFIGURE_ARGS += --enable-compat15 \
MULTI_PACKAGES = -main -nfprofile
-LIB_DEPENDS-main = net/flow-tools>=0.68.5
+LIB_DEPENDS-main = archivers/bzip2 \
+ net/flow-tools>=0.68.5
WANTLIB-main = ${WANTLIB} ft
+
LIB_DEPENDS-nfprofile = net/rrdtool
-WANTLIB-nfprofile = ${WANTLIB} pthread rrd
RUN_DEPENDS-nfprofile = nfdump-$V:net/nfdump,-main
+WANTLIB-nfprofile = ${WANTLIB}
+WANTLIB-nfprofile += X11 Xext Xrender cairo expat ffi fontconfig freetype
+WANTLIB-nfprofile += glib-2.0 gobject-2.0 graphite2 gthread-2.0 harfbuzz
+WANTLIB-nfprofile += iconv intl lzma m nfdump pango-1.0 pangocairo-1.0
+WANTLIB-nfprofile += pangoft2-1.0 pcre pixman-1 png pthread rrd xcb
+WANTLIB-nfprofile += xcb-render xcb-shm xml2
REORDER_DEPENDENCIES += ${PORTSDIR}/infrastructure/mk/automake.dep
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/nfdump/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 17 Dec 2014 14:53:43 -0000 1.9
+++ distinfo 16 Mar 2018 16:30:05 -0000
@@ -1,2 +1,2 @@
-SHA256 (nfdump-1.6.13.tar.gz) = JRUzwxbJ/llTEvR3zbBR6cZnUX9J+3rFtDJJVzDkVpM=
-SIZE (nfdump-1.6.13.tar.gz) = 662006
+SHA256 (nfdump-1.6.16.tar.gz) = sYR5IVxRqY+9+XPvVIRkeA56nZ9/5z5Pq5q37Io73I8=
+SIZE (nfdump-1.6.16.tar.gz) = 1814857
Index: patches/patch-bin_Makefile_in
===================================================================
RCS file: patches/patch-bin_Makefile_in
diff -N patches/patch-bin_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bin_Makefile_in 16 Mar 2018 16:30:05 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: bin/Makefile.in
+--- bin/Makefile.in.orig
++++ bin/Makefile.in
+@@ -709,7 +709,7 @@ launch = launch.c launch.h
+ lib_LTLIBRARIES = libnfdump.la
+ libnfdump_la_SOURCES = $(common) $(util) $(filelzo) $(nflist) $(filter) $(exporter)
+ #libnfdump_la_LIBADD = -lz
+-libnfdump_la_LDFLAGS = -release 1.6.15
++libnfdump_la_LDFLAGS =
+ nfdump_SOURCES = nfdump.c nfdump.h nfstat.c nfstat.h nfexport.c nfexport.h \
+ $(nflowcache) $(nfprof)
+
Index: patches/patch-bin_util_c
===================================================================
RCS file: /cvs/ports/net/nfdump/patches/patch-bin_util_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bin_util_c
--- patches/patch-bin_util_c 10 Sep 2016 13:03:42 -0000 1.1
+++ patches/patch-bin_util_c 16 Mar 2018 16:30:05 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-bin_util_c,v 1.1 2016/09/10 13:03:42 ajacoutot Exp $
---- bin/util.c.orig Sat Sep 10 10:34:01 2016
-+++ bin/util.c Sat Sep 10 10:35:46 2016
-@@ -41,6 +41,7 @@
+Index: bin/util.c
+--- bin/util.c.orig
++++ bin/util.c
+@@ -38,6 +38,7 @@
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/net/nfdump/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 3 May 2013 01:16:36 -0000 1.5
+++ pkg/PLIST-main 16 Mar 2018 16:30:05 -0000
@@ -8,6 +8,9 @@
@bin bin/nfexpire
@bin bin/nfreplay
@bin bin/sfcapd
+lib/libnfdump.a
+lib/libnfdump.la
+@lib lib/libnfdump.so.${LIBnfdump_VERSION}
@man man/man1/ft2nfdump.1
@man man/man1/nfanon.1
@man man/man1/nfcapd.1