diff options
| -rw-r--r-- | net-mgmt/nfsen/Makefile | 4 | ||||
| -rw-r--r-- | net-mgmt/nfsen/distinfo | 4 | ||||
| -rw-r--r-- | net-mgmt/nfsen/files/patch-install.pl | 30 | ||||
| -rw-r--r-- | net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm | 32 |
4 files changed, 6 insertions, 64 deletions
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile index d49e65bc6a16..b269363461da 100644 --- a/net-mgmt/nfsen/Makefile +++ b/net-mgmt/nfsen/Makefile @@ -6,8 +6,7 @@ # PORTNAME= nfsen -PORTVERSION= 1.3.5 -PORTREVISION= 3 +PORTVERSION= 1.3.6p1 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \ http://nfsen.sourceforge.net/ @@ -44,7 +43,6 @@ do-install: @${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 --git a/net-mgmt/nfsen/distinfo b/net-mgmt/nfsen/distinfo index cf2999514a0a..8089a03dc760 100644 --- a/net-mgmt/nfsen/distinfo +++ b/net-mgmt/nfsen/distinfo @@ -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 --git a/net-mgmt/nfsen/files/patch-install.pl b/net-mgmt/nfsen/files/patch-install.pl index 88e8737985e5..7744745b413f 100644 --- a/net-mgmt/nfsen/files/patch-install.pl +++ b/net-mgmt/nfsen/files/patch-install.pl @@ -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 --git a/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm b/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm deleted file mode 100644 index 9d63727d5a85..000000000000 --- a/net-mgmt/nfsen/files/patch-libexec__NFSenRC.pm +++ /dev/null @@ -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; - } - } |