Attachment #245954 for bug #274776




PORTNAME=	nfsen
PORTVERSION=	1.3.11
PORTREVISION=	0
DISTVERSIONPREFIX=v.
CATEGORIES=	net-mgmt
MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
		http://nfsen.sourceforge.net/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Web based frontend to nfdump netflow collector
WWW=		https://github.com/phaag/nfsen

LICENSE=	BSD3CLAUSE
LICENSE_FILE=	${WRKSRC}/BSD-license.txt

USE_GITHUB=	yes
GH_ACCOUNT=	phaag

RUN_DEPENDS=	rrdtool>=0:databases/rrdtool \
		p5-Mail-Tools>=0:mail/p5-Mail-Tools \
		p5-Socket6>=0:net/p5-Socket6 \
		nfdump>=1.7:net-mgmt/nfdump

USES=		cpe iconv shebangfix perl5 php
CPE_VENDOR=	nfsen

PLIST_SUB+=	NFSENOWN=${NFSENOWN}
USE_RC_SUBR=	nfsen
perl_OLD_CMD=	%%PERL%%
SHEBANG_FILES=	bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend
		libexec/NfAlert.pm libexec/NfProfile.pm libexec/Notification.pm libexec/NfSen.pm \
		libexec/NfConf.pm libexec/Lookup.pm libexec/AbuseWhois.pm libexec/NfSenRC.pm \
		libexec/Nfsources.pm
REINPLACE_ARGS=	-i ''
REINPLACE_LIST=	bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend etc/nfsen-dist.conf libexec/NfConf.pm
SUB_LIST+=	"CONFDIR=${PREFIX}/etc"

SUB_LIST+=	"PORTNAME=${PORTNAME}"
SUB_LIST+=	"NFSENOWN=${NFSENOWN}"

SUB_FILES=	pkg-message

PKGMESSAGE=	${WRKDIR}/pkg-message

post-patch:
.for nfsenfile in ${REINPLACE_LIST}
	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/${nfsenfile}

Lines 1-3 Link Here

(-)b/net-mgmt/nfsen/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1485556082	1	TIMESTAMP = 1697496763
2	SHA256 (nfsen-1.3.8.tar.gz) = a7612e430357e683af81dbc07335b770b4ada115a6a88591e086ff5b6ed593a9	2	SHA256 (phaag-nfsen-v.1.3.11_GH0.tar.gz) = a842531f4023913870d0fccf2d375bc335d7ecac9b2eeb7c2aff689a5c1ae962
3	SIZE (nfsen-1.3.8.tar.gz) = 221769	3	SIZE (phaag-nfsen-v.1.3.11_GH0.tar.gz) = 217135




--- etc/nfsen-dist.conf.orig	2023-10-06 08:13:20.000000000 -0700
+++ etc/nfsen-dist.conf	2023-10-16 15:55:15.937534000 -0700
@@ -18,7 +18,7 @@
 
 #

-$VARDIR="${BASEDIR}/var";
+$VARDIR="${BASEDIR}/var/%%PORTNAME%%";
 
 #
 # directory for all pid files
 # $PIDDIR="$VARDIR/run";
@@ -60,15 +60,15 @@
 #
 # The Profiles stat directory, where all profile information
 # RRD DBs and png pictures of the profile are stored

 
 #
 # Where go all the frontend plugins
@@ -76,7 +76,7 @@
 
 #
 # nfdump tools path

 
 #
 # nfsend communication socket
@@ -88,7 +88,7 @@
 # This may be a different or the same uid than your web server.
 # Note: This user must be in group $WWWGROUP, otherwise nfcapd
 #       is not able to write data files!

Removed Link Here

(-)a/net-mgmt/nfsen/files/patch-libexec_NfSenRRD.pm (-11 lines)
1	--- libexec/NfSenRRD.pm.orig 2017-01-27 22:36:32 UTC
2	+++ libexec/NfSenRRD.pm
3	@@ -73,7 +73,7 @@ sub GetRRDoffset {
4	if ( $rrd_version < 1.1 ) { # it's RRD 1.0.x
5	$RRDoffset = 77;
6	}
7	- if ( $rrd_version >= 1.2 && $rrd_version < 1.6 ) {
8	+ if ( $rrd_version >= 1.2 ) {
9	$RRDoffset = 67;
10	}
11





**** From nfdump/README.md ****

Compatibility

nfdump-1.7.x is compatible to nfdump-1.6.18, which means it can read files created with nfdump-1.6.18 or newer. Flow files created with earlier nfdump versions may not contain all flow elements. If you have older files, it is recommended to use nfdump-1.6.17 to update the records.

Nfdump 1.7.x provides the same set of programs as 1.6.x and can be used almost as a drop-in replacement. This may change in future and older legacy programs may be removed. You can convert any old files from nfdump-1.6 to nfdump-1.7 format by reading/writing files: ./nfdump -r old-flowfile -y -w new-flowfile

Please note, that only nfdump may read older flow files. All other programs relay on the new file format.

Note for NfSen users: If you use NfSen, you must upgrade NfSen to the latest Github version https://github.com/phaag/nfsen. All specific binaries such as nfprofile and nftrack are still available with nfdump-1.7 but may be removed in future.

Return to bug 274776

Lines 1-21 Link Here

(-)b/net-mgmt/nfsen/Makefile (-10 / +13 lines)
1	PORTNAME= nfsen	1	PORTNAME= nfsen
2	PORTVERSION= 1.3.8	2	PORTVERSION= 1.3.11
3	PORTREVISION= 1	3	PORTREVISION= 0
		4	DISTVERSIONPREFIX=v.
4	CATEGORIES= net-mgmt	5	CATEGORIES= net-mgmt
5	MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
6	http://nfsen.sourceforge.net/
7		6
8	MAINTAINER= ports@FreeBSD.org	7	MAINTAINER= ports@FreeBSD.org
9	COMMENT= Web based frontend to nfdump netflow collector	8	COMMENT= Web based frontend to nfdump netflow collector
10	WWW= http://nfsen.sourceforge.net/	9	WWW= https://github.com/phaag/nfsen
11		10
12	LICENSE= BSD3CLAUSE	11	LICENSE= BSD3CLAUSE
13	LICENSE_FILE= ${WRKSRC}/BSD-license.txt	12	LICENSE_FILE= ${WRKSRC}/BSD-license.txt
14		13
		14	USE_GITHUB= yes
		15	GH_ACCOUNT= phaag
		16
15	RUN_DEPENDS= rrdtool>=0:databases/rrdtool \	17	RUN_DEPENDS= rrdtool>=0:databases/rrdtool \
16	p5-Mail-Tools>=0:mail/p5-Mail-Tools \	18	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
17	p5-Socket6>=0:net/p5-Socket6 \	19	p5-Socket6>=0:net/p5-Socket6 \
18	nfdump>=0:net-mgmt/nfdump	20	nfdump>=1.7:net-mgmt/nfdump
19		21
20	USES= cpe iconv shebangfix perl5 php	22	USES= cpe iconv shebangfix perl5 php
21	CPE_VENDOR= nfsen	23	CPE_VENDOR= nfsen
Lines 28-37 PLIST_SUB+= PORTNAME=${PORTNAME} Link Here
28	PLIST_SUB+= NFSENOWN=${NFSENOWN}	30	PLIST_SUB+= NFSENOWN=${NFSENOWN}
29	USE_RC_SUBR= nfsen	31	USE_RC_SUBR= nfsen
30	perl_OLD_CMD= %%PERL%%	32	perl_OLD_CMD= %%PERL%%
31	SHEBANG_FILES= bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend libexec/NfSenRRD.pm \	33	SHEBANG_FILES= bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend
32	libexec/NfAlert.pm libexec/NfProfile.pm libexec/Notification.pm libexec/NfSen.pm \
33	libexec/NfConf.pm libexec/Lookup.pm libexec/AbuseWhois.pm libexec/NfSenRC.pm \
34	libexec/Nfsources.pm
35	REINPLACE_ARGS= -i ''	34	REINPLACE_ARGS= -i ''
36	REINPLACE_LIST= bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend etc/nfsen-dist.conf libexec/NfConf.pm	35	REINPLACE_LIST= bin/testPlugin bin/RebuildHierarchy.pl bin/nfsen bin/nfsend etc/nfsen-dist.conf libexec/NfConf.pm
37	SUB_LIST+= "CONFDIR=${PREFIX}/etc"	36	SUB_LIST+= "CONFDIR=${PREFIX}/etc"
Lines 42-47 SUB_LIST+= "WWWDIR=${WWWDIR}" Link Here
42	SUB_LIST+= "PORTNAME=${PORTNAME}"	41	SUB_LIST+= "PORTNAME=${PORTNAME}"
43	SUB_LIST+= "NFSENOWN=${NFSENOWN}"	42	SUB_LIST+= "NFSENOWN=${NFSENOWN}"
44		43
		44	SUB_FILES= pkg-message
		45
		46	PKGMESSAGE= ${WRKDIR}/pkg-message
		47
45	post-patch:	48	post-patch:
46	.for nfsenfile in ${REINPLACE_LIST}	49	.for nfsenfile in ${REINPLACE_LIST}
47	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/${nfsenfile}	50	@${REINPLACE_CMD} ${_SUB_LIST_TEMP} ${WRKSRC}/${nfsenfile}

Lines 1-5 Link Here

(-)b/net-mgmt/nfsen/files/patch-etc_nfsen-dist.conf (-6 / +6 lines)
1	--- etc/nfsen-dist.conf.ori 2008-05-29 13:33:01.000000000 -0700	1	--- etc/nfsen-dist.conf.orig 2023-10-06 08:13:20.000000000 -0700
2	+++ etc/nfsen-dist.conf 2008-05-29 13:56:53.000000000 -0700	2	+++ etc/nfsen-dist.conf 2023-10-16 15:55:15.937534000 -0700
3	@@ -18,7 +18,7 @@	3	@@ -18,7 +18,7 @@
4		4
5	#	5	#
Lines 34-42 Link Here
34	-$VARDIR="${BASEDIR}/var";	34	-$VARDIR="${BASEDIR}/var";
35	+$VARDIR="${BASEDIR}/var/%%PORTNAME%%";	35	+$VARDIR="${BASEDIR}/var/%%PORTNAME%%";
36		36
37	#
38	# directory for all pid files	37	# directory for all pid files
39	@@ -53,15 +53,15 @@	38	# $PIDDIR="$VARDIR/run";
		39	@@ -60,15 +60,15 @@
40	#	40	#
41	# The Profiles stat directory, where all profile information	41	# The Profiles stat directory, where all profile information
42	# RRD DBs and png pictures of the profile are stored	42	# RRD DBs and png pictures of the profile are stored
Lines 55-61 Link Here
55		55
56	#	56	#
57	# Where go all the frontend plugins	57	# Where go all the frontend plugins
58	@@ -69,7 +69,7 @@	58	@@ -76,7 +76,7 @@
59		59
60	#	60	#
61	# nfdump tools path	61	# nfdump tools path
Lines 64-70 Link Here
64		64
65	#	65	#
66	# nfsend communication socket	66	# nfsend communication socket
67	@@ -81,7 +81,7 @@	67	@@ -88,7 +88,7 @@
68	# This may be a different or the same uid than your web server.	68	# This may be a different or the same uid than your web server.
69	# Note: This user must be in group $WWWGROUP, otherwise nfcapd	69	# Note: This user must be in group $WWWGROUP, otherwise nfcapd
70	# is not able to write data files!	70	# is not able to write data files!

Line 0 Link Here

(-)b/net-mgmt/nfsen/files/pkg-message.in (+12 lines)
	1
	2	** From nfdump/README.md **
	3
	4	Compatibility
	5
	6	nfdump-1.7.x is compatible to nfdump-1.6.18, which means it can read files created with nfdump-1.6.18 or newer. Flow files created with earlier nfdump versions may not contain all flow elements. If you have older files, it is recommended to use nfdump-1.6.17 to update the records.
	7
	8	Nfdump 1.7.x provides the same set of programs as 1.6.x and can be used almost as a drop-in replacement. This may change in future and older legacy programs may be removed. You can convert any old files from nfdump-1.6 to nfdump-1.7 format by reading/writing files: ./nfdump -r old-flowfile -y -w new-flowfile
	9
	10	Please note, that only nfdump may read older flow files. All other programs relay on the new file format.
	11
	12	Note for NfSen users: If you use NfSen, you must upgrade NfSen to the latest Github version https://github.com/phaag/nfsen. All specific binaries such as nfprofile and nftrack are still available with nfdump-1.7 but may be removed in future.