Attachment #129590 for bug #173594

View | Details | Raw Unified | Return to bug 173594
Collapse All | Expand All

Lines 6-13 Link Here

(-)net-mgmt/nfsen/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME= nfsen	8	PORTNAME= nfsen
9	PORTVERSION= 1.3.5	9	PORTVERSION= 1.3.6p1
10	PORTREVISION= 3	10	PORTREVISION= 0
11	CATEGORIES= net-mgmt	11	CATEGORIES= net-mgmt
12	MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \	12	MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
13	http://nfsen.sourceforge.net/	13	http://nfsen.sourceforge.net/
Lines 44-50 Link Here
44	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}	44	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
45	${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${PREFIX}/libexec/${PORTNAME}/	45	${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${PREFIX}/libexec/${PORTNAME}/
46	${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${PREFIX}/libexec/${PORTNAME}/	46	${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${PREFIX}/libexec/${PORTNAME}/
47	${RM} -f ${WRKSRC}/libexec/NfSenRC.pm.orig
48	@ if [ -f ${PREFIX}/etc/nfsen.conf ] ; then \	47	@ if [ -f ${PREFIX}/etc/nfsen.conf ] ; then \
49	${ECHO_MSG} "installing with existing nfsen.conf"; \	48	${ECHO_MSG} "installing with existing nfsen.conf"; \
50	cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${PREFIX}/etc/nfsen.conf; \	49	cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${PREFIX}/etc/nfsen.conf; \

Lines 1-2 Link Here

(-)net-mgmt/nfsen/distinfo (-2 / +2 lines)
1	SHA256 (nfsen-1.3.5.tar.gz) = b2afd700818c2f91182d2970a1759f1c0a8c2835990726f15f695514f00b1e43	1	SHA256 (nfsen-1.3.6p1.tar.gz) = 810e95546338622756deb919d7ee6c39721bc9873bb75dc7ec411ec0b87e1265
2	SIZE (nfsen-1.3.5.tar.gz) = 221348	2	SIZE (nfsen-1.3.6p1.tar.gz) = 220620




--- install.pl.orig	2012-01-23 20:36:02.000000000 +0400
+++ install.pl	2012-11-12 15:52:05.000000000 +0400
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!%%PERL%% -I %%PREFIX%%/libexec/nfsen
 #
 #
 #  Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
@@ -88,33 +88,7 @@
 # Get Perl
 sub GetPerl {
 

 
 } # End of GetPerl
 
@@ -200,11 +174,8 @@
 	}
 
 	my @out = `$NfConf::PREFIX/nfdump -V`;
-	if ( scalar @out != 2 ) {
-		die "Error getting nfdump version";
-	}
 	chomp $out[0];
-	my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)\s/;
+	my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)[\.\s]/;
 	if ( defined $major && defined $minor) {
 		if ( $major >= 1 && $minor >= 6 ) {
 			print "Found $out[0]\n";
@@ -212,7 +183,9 @@
 			print "out[0]\n";
 			die "Nfdump version not compatible with current NfSen version.\n";
 		}
-	} 
+	} else {
+	       die "Error getting nfdump version";
+        }	       
 
 	my $www_gid = getgrnam($NfConf::WWWGROUP) || 
 		die "WWW group '$NfConf::WWWGROUP' not found on this system\n";




--- libexec/NfSenRC.pm	2010-09-09 07:56:05.000000000 +0200
+++ libexec/NfSenRC.pm.patched	2011-03-09 13:09:32.000000000 +0100
@@ -54,22 +54,21 @@
 		print "[no collector]";
 		return;
 	}
-
 	my @SourceList;
 	my $type = undef;
 	foreach my $source ( sort keys %NfConf::sources ) {
 		my $_port = $NfConf::sources{$source}{'port'};
 		if ( $_port == $port ) {
 			push @SourceList, $source;
-		}
-		my $_type = exists $NfConf::sources{$source}{'type'} ? $NfConf::sources{$source}{'type'}: 'netflow';
-		if ( defined $type ) {
-			if ( $type ne $_type ) {
-				print "Can not start different type '$type' and '$_type' on same port!\n";
-				return;
+			my $_type = exists $NfConf::sources{$source}{'type'} ? $NfConf::sources{$source}{'type'}: 'netflow';
+			if ( defined $type ) {
+				if ( $type ne $_type ) {
+					print "Can not start different type '$type' and '$_type' on same port!\n";
+					return;
+				}
+			} else {
+				$type = $_type;
 			}
-		} else {
-			$type = $_type;
 		}
 	}

Return to bug 173594

Lines 1-12 Link Here

(-)net-mgmt/nfsen/files/patch-install.pl (-27 / +3 lines)
1	--- install.pl.orig 2010-09-09 09:56:05.000000000 +0400	1	--- install.pl.orig 2012-01-23 20:36:02.000000000 +0400
2	+++ install.pl 2011-08-13 16:39:01.000000000 +0400	2	+++ install.pl 2012-11-12 15:52:05.000000000 +0400
3	@@ -1,4 +1,4 @@	3	@@ -1,4 +1,4 @@
4	-#!/usr/bin/perl	4	-#!/usr/bin/perl
5	+#!%%PERL%% -I %%PREFIX%%/libexec/nfsen	5	+#!%%PERL%% -I %%PREFIX%%/libexec/nfsen
6	#	6	#
7	#	7	#
8	# Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung	8	# Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung
9	@@ -85,33 +85,7 @@	9	@@ -88,33 +88,7 @@
10	# Get Perl	10	# Get Perl
11	sub GetPerl {	11	sub GetPerl {
12		12
Lines 41-67 Link Here
41		41
42	} # End of GetPerl	42	} # End of GetPerl
43		43
44	@@ -200,11 +174,8 @@
45	}
46
47	my @out = `$NfConf::PREFIX/nfdump -V`;
48	- if ( scalar @out != 2 ) {
49	- die "Error getting nfdump version";
50	- }
51	chomp $out[0];
52	- my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)\s/;
53	+ my ($major, $minor) = $out[0] =~ /Version:\s(\d)\.(\d)[\.\s]/;
54	if ( defined $major && defined $minor) {
55	if ( $major >= 1 && $minor >= 6 ) {
56	print "Found $out[0]\n";
57	@@ -212,7 +183,9 @@
58	print "out[0]\n";
59	die "Nfdump version not compatible with current NfSen version.\n";
60	}
61	- }
62	+ } else {
63	+ die "Error getting nfdump version";
64	+ }
65
66	my $www_gid = getgrnam($NfConf::WWWGROUP) \|\|
67	die "WWW group '$NfConf::WWWGROUP' not found on this system\n";

Lines 1-32 Link Here

(-)net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm (-32 lines)
1	--- libexec/NfSenRC.pm 2010-09-09 07:56:05.000000000 +0200
2	+++ libexec/NfSenRC.pm.patched 2011-03-09 13:09:32.000000000 +0100
3	@@ -54,22 +54,21 @@
4	print "[no collector]";
5	return;
6	}
7	-
8	my @SourceList;
9	my $type = undef;
10	foreach my $source ( sort keys %NfConf::sources ) {
11	my $_port = $NfConf::sources{$source}{'port'};
12	if ( $_port == $port ) {
13	push @SourceList, $source;
14	- }
15	- my $_type = exists $NfConf::sources{$source}{'type'} ? $NfConf::sources{$source}{'type'}: 'netflow';
16	- if ( defined $type ) {
17	- if ( $type ne $_type ) {
18	- print "Can not start different type '$type' and '$_type' on same port!\n";
19	- return;
20	+ my $_type = exists $NfConf::sources{$source}{'type'} ? $NfConf::sources{$source}{'type'}: 'netflow';
21	+ if ( defined $type ) {
22	+ if ( $type ne $_type ) {
23	+ print "Can not start different type '$type' and '$_type' on same port!\n";
24	+ return;
25	+ }
26	+ } else {
27	+ $type = $_type;
28	}
29	- } else {
30	- $type = $_type;
31	}
32	}