Attachment 129590 Details for Bug 173594 – file.diff

[patch] file.diff

file.diff (text/plain), 4.11 KB, created by landy2005 on 2012-11-13 06:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: landy2005

Created: 2012-11-13 06:10:00 UTC

Size: 4.11 KB

patch

obsolete

>diff -ruN net-mgmt/nfsen.orig/Makefile net-mgmt/nfsen/Makefile
>--- net-mgmt/nfsen.orig/Makefile	2012-09-23 22:28:35.000000000 +0400
>+++ net-mgmt/nfsen/Makefile	2012-11-12 16:06:12.000000000 +0400
>@@ -6,8 +6,8 @@
> #
> 
> PORTNAME=	nfsen
>-PORTVERSION=	1.3.5
>-PORTREVISION=	3
>+PORTVERSION=	1.3.6p1
>+PORTREVISION=	0
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \
> 		http://nfsen.sourceforge.net/
>@@ -44,7 +44,6 @@
> 	@${MKDIR} ${PREFIX}/libexec/${PORTNAME}
> 	${INSTALL_DATA} ${WRKSRC}/installer-items/CopyRecursive.pm ${PREFIX}/libexec/${PORTNAME}/
> 	${INSTALL_DATA} ${WRKSRC}/installer-items/RRDconvertv1.pm ${PREFIX}/libexec/${PORTNAME}/
>-	${RM} -f ${WRKSRC}/libexec/NfSenRC.pm.orig
> 	@ if [ -f ${PREFIX}/etc/nfsen.conf ] ; then \
> 	${ECHO_MSG} "installing with existing nfsen.conf"; \
> 	cd ${WRKSRC} ;${PERL} ${WRKSRC}/install.pl ${PREFIX}/etc/nfsen.conf; \
>diff -ruN net-mgmt/nfsen.orig/distinfo net-mgmt/nfsen/distinfo
>--- net-mgmt/nfsen.orig/distinfo	2011-09-25 21:35:41.000000000 +0400
>+++ net-mgmt/nfsen/distinfo	2012-11-12 15:05:08.000000000 +0400
>@@ -1,2 +1,2 @@
>-SHA256 (nfsen-1.3.5.tar.gz) = b2afd700818c2f91182d2970a1759f1c0a8c2835990726f15f695514f00b1e43
>-SIZE (nfsen-1.3.5.tar.gz) = 221348
>+SHA256 (nfsen-1.3.6p1.tar.gz) = 810e95546338622756deb919d7ee6c39721bc9873bb75dc7ec411ec0b87e1265
>+SIZE (nfsen-1.3.6p1.tar.gz) = 220620
>diff -ruN net-mgmt/nfsen.orig/files/patch-install.pl net-mgmt/nfsen/files/patch-install.pl
>--- net-mgmt/nfsen.orig/files/patch-install.pl	2011-09-25 21:35:41.000000000 +0400
>+++ net-mgmt/nfsen/files/patch-install.pl	2012-11-12 16:02:40.000000000 +0400
>@@ -1,12 +1,12 @@
>---- install.pl.orig	2010-09-09 09:56:05.000000000 +0400
>-+++ install.pl	2011-08-13 16:39:01.000000000 +0400
>+--- 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
>-@@ -85,33 +85,7 @@
>+@@ -88,33 +88,7 @@
>  # Get Perl
>  sub GetPerl {
>  
>@@ -41,27 +41,3 @@
>  
>  } # 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";
>diff -ruN net-mgmt/nfsen.orig/files/patch-libexec__NFSenRC.pm net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm
>--- net-mgmt/nfsen.orig/files/patch-libexec__NFSenRC.pm	2012-06-10 03:35:21.000000000 +0400
>+++ net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm	1970-01-01 03:00:00.000000000 +0300
>@@ -1,32 +0,0 @@
>---- 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;
>- 		}
>- 	}

Actions: View | Diff

Attachments on bug 173594: 129590