update NfDump to 1.6.3p1
This commit is contained in:
sthen
parent
9abb8cd3fa
commit
0a2c55eb28
@ -1,16 +1,17 @@
|
||||
# $OpenBSD: Makefile,v 1.11 2010/11/19 22:31:35 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.12 2011/03/24 23:03:23 sthen Exp $
|
||||
|
||||
COMMENT-main = tools to collect and process netflow data
|
||||
COMMENT-nfprofile = filters data from nfdump according to profiles
|
||||
|
||||
V = 1.5.8
|
||||
DISTNAME = nfdump-$V
|
||||
NFSEN = nfsen-1.3.2
|
||||
V = ${DISTNAME:S/nfdump-//:S/p/./}
|
||||
DISTNAME = nfdump-1.6.3p1
|
||||
NFSEN = nfsen-1.3.5
|
||||
FULLPKGNAME-main = nfdump-$V
|
||||
FULLPKGNAME-nfprofile = nfprofile-$V
|
||||
REVISION-main = 2
|
||||
REVISION-nfprofile = 1
|
||||
|
||||
# we want a contrib file from the nfsen distfile to build nftrack,
|
||||
# however because nfdump/nfprofile are build dependencies of nfsen,
|
||||
# we can't use "BUILD_DEPENDS=net/nfsen:patch" here.
|
||||
DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
|
||||
${NFSEN}${EXTRACT_SUFX}:0
|
||||
|
||||
@ -22,7 +23,7 @@ MAINTAINER = Stuart Henderson <sthen@openbsd.org>
|
||||
# BSD
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
PERMIT_PACKAGE_FTP = Yes
|
||||
PERMIT_DISTFILES_CDROM =Yes
|
||||
PERMIT_DISTFILES_CDROM = Yes
|
||||
PERMIT_DISTFILES_FTP = Yes
|
||||
|
||||
WANTLIB = c z
|
||||
@ -30,16 +31,14 @@ WANTLIB = c z
|
||||
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=nfdump/}
|
||||
MASTER_SITES0 = ${MASTER_SITE_SOURCEFORGE:=nfsen/}
|
||||
|
||||
CONFIGURE_STYLE = autoconf
|
||||
AUTOCONF_VERSION = 2.61
|
||||
CONFIGURE_STYLE = gnu
|
||||
|
||||
CONFIGURE_ARGS += ${CONFIGURE_SHARED} \
|
||||
--enable-nfprofile \
|
||||
CONFIGURE_ARGS += --enable-nfprofile \
|
||||
--with-rrdpath=${LOCALBASE} \
|
||||
--enable-ftconv \
|
||||
--with-ftpath=${LOCALBASE} \
|
||||
--enable-sflow
|
||||
USE_GROFF = Yes
|
||||
--enable-sflow \
|
||||
--enable-compat15
|
||||
|
||||
MULTI_PACKAGES = -main -nfprofile
|
||||
|
||||
@ -52,6 +51,9 @@ RUN_DEPENDS-nfprofile = nfdump-$V:net/nfdump,-main
|
||||
post-build:
|
||||
perl -pi -e 's,/usr/local,${LOCALBASE},g;' \
|
||||
-e 's,/usr/X11R6,${X11BASE},g;' \
|
||||
-e 's,^CC=.*,CC="${CC} -c ${CFLAGS}",;' \
|
||||
-e 's,^gcc -o,${CC} -o,;' \
|
||||
-e 's,/path/to/nfdump.*",../../../${DISTNAME}",g;' \
|
||||
${WRKSRC}/../${NFSEN}/contrib/PortTracker/do_compile
|
||||
cd ${WRKSRC}/../${NFSEN}/contrib/PortTracker; \
|
||||
./do_compile
|
||||
@ -61,10 +63,9 @@ post-install:
|
||||
${PREFIX}/bin/
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nfdump
|
||||
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nfdump
|
||||
head -119 ${WRKSRC}/sflow.c > ${PREFIX}/share/doc/nfdump/COPYRIGHT
|
||||
head -119 ${WRKSRC}/bin/sflow.c > ${PREFIX}/share/doc/nfdump/COPYRIGHT
|
||||
|
||||
CONFIGURE_ENV = LDFLAGS="${LDFLAGS} -L${X11BASE}/lib"
|
||||
REGRESS_TARGET = test
|
||||
REGRESS_FLAGS = TZ=CET
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
MD5 (nfdump-1.5.8.tar.gz) = 8xRRNlLfGCWfgwPFQpGMuw==
|
||||
MD5 (nfsen-1.3.2.tar.gz) = OoI6ONbncX4VY/vNnU0t4A==
|
||||
RMD160 (nfdump-1.5.8.tar.gz) = O5GHQIjOxw6uaX+kX56MKDLaQ7k=
|
||||
RMD160 (nfsen-1.3.2.tar.gz) = 8eKT/kEniqwlj5owu9R0AeJloQg=
|
||||
SHA1 (nfdump-1.5.8.tar.gz) = c6GPPqu3+SjY7ZwqMFkUyVP5RX4=
|
||||
SHA1 (nfsen-1.3.2.tar.gz) = KbopYqUZyTH/ooWu688szLJi9pI=
|
||||
SHA256 (nfdump-1.5.8.tar.gz) = P7+4dDdzFs8yLPE8+rZnIH/njgkQu8groBLjp3wA3jY=
|
||||
SHA256 (nfsen-1.3.2.tar.gz) = pR3IH4OtInMgG6DKHuZ9WYtaZ9xk6oQwq5/2DSOyWcE=
|
||||
SIZE (nfdump-1.5.8.tar.gz) = 331279
|
||||
SIZE (nfsen-1.3.2.tar.gz) = 6539382
|
||||
MD5 (nfdump-1.6.3p1.tar.gz) = z0AYE7pt6eUzcU1kbE5etg==
|
||||
MD5 (nfsen-1.3.5.tar.gz) = iX8hzSiFLzHF/4fY6a96SA==
|
||||
RMD160 (nfdump-1.6.3p1.tar.gz) = LBrdUmiwQQmjOmO5taMIvJyjtmE=
|
||||
RMD160 (nfsen-1.3.5.tar.gz) = 6zQxY5XG8L8ic+G/TIgSIgVuJm8=
|
||||
SHA1 (nfdump-1.6.3p1.tar.gz) = hl4wwQgIpIdfIg8g6MsyLlUk5HY=
|
||||
SHA1 (nfsen-1.3.5.tar.gz) = WRcjQB1DsaQHH/xabkK7nd0u8js=
|
||||
SHA256 (nfdump-1.6.3p1.tar.gz) = aIODeQE+Fbbylu8GkS9upaZJ32l9LvsahS8xia1nF0k=
|
||||
SHA256 (nfsen-1.3.5.tar.gz) = sq/XAIGML5EYLSlwoXWfHAqMKDWZBybxX2lVFPALHkM=
|
||||
SIZE (nfdump-1.6.3p1.tar.gz) = 598839
|
||||
SIZE (nfsen-1.3.5.tar.gz) = 221348
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-configure_in,v 1.1 2010/05/06 21:42:24 sthen Exp $
|
||||
--- configure.in.orig Sat May 1 15:02:27 2010
|
||||
+++ configure.in Sat May 1 15:03:26 2010
|
||||
@@ -84,7 +84,7 @@ AC_CHECK_LIB(z, zlibVersion,,
|
||||
AC_MSG_ERROR(Link with "-lz" failed! (Need zlib >= 1.0.2))
|
||||
)
|
||||
if test -d "$WHERE_FTPATH"; then
|
||||
- if test ! -f "$WHERE_FTPATH/lib/ftlib.h"; then
|
||||
+ if test ! -f "$WHERE_FTPATH/include/ftlib.h"; then
|
||||
AC_MSG_ERROR(ftlib.h file not found in flow-tools directory '$WHERE_FTPATH'. Use --with-ftpath=PATH)
|
||||
fi
|
||||
if test ! -f "$WHERE_FTPATH/lib/libft.a"; then
|
||||
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-ft2nfdump_c,v 1.1 2010/05/06 21:42:24 sthen Exp $
|
||||
--- ft2nfdump.c.orig Sat May 1 15:07:28 2010
|
||||
+++ ft2nfdump.c Sat May 1 15:08:03 2010
|
||||
@@ -66,7 +66,9 @@
|
||||
#include "nffile.h"
|
||||
#include "launch.h"
|
||||
|
||||
-#include "ftbuild.h"
|
||||
+#define u_int8 u_int8_t
|
||||
+#define u_int16 u_int16_t
|
||||
+#define u_int32 u_int32_t
|
||||
|
||||
/* Global defines */
|
||||
#define MAXRECORDS 30
|
||||
@ -1,7 +1,8 @@
|
||||
@comment $OpenBSD: PLIST-main,v 1.3 2010/04/30 11:50:20 sthen Exp $
|
||||
@comment $OpenBSD: PLIST-main,v 1.4 2011/03/24 23:03:23 sthen Exp $
|
||||
@newgroup _nfcapd:649
|
||||
@newuser _nfcapd:649:_nfcapd:daemon:nfcapd user:/nonexistent:/sbin/nologin
|
||||
@bin bin/ft2nfdump
|
||||
@bin bin/nfanon
|
||||
@bin bin/nfcapd
|
||||
@bin bin/nfdump
|
||||
@bin bin/nfexpire
|
||||
|
||||
Loading…
Reference in New Issue
Block a user