From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Nov 13 06:10:00 2012 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E4EEB9E0 for ; Tue, 13 Nov 2012 06:10:00 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) by mx1.freebsd.org (Postfix) with ESMTP id B9AFC8FC14 for ; Tue, 13 Nov 2012 06:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id qAD6A0rn078731 for ; Tue, 13 Nov 2012 06:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id qAD6A0xR078726; Tue, 13 Nov 2012 06:10:00 GMT (envelope-from gnats) Resent-Date: Tue, 13 Nov 2012 06:10:00 GMT Resent-Message-Id: <201211130610.qAD6A0xR078726@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Mike Stupalov Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C36F49BB for ; Tue, 13 Nov 2012 06:09:23 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id A9A4D8FC08 for ; Tue, 13 Nov 2012 06:09:23 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.5/8.14.5) with ESMTP id qAD69NmL001895 for ; Tue, 13 Nov 2012 06:09:23 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.5/8.14.5/Submit) id qAD69NhJ001894; Tue, 13 Nov 2012 06:09:23 GMT (envelope-from nobody) Message-Id: <201211130609.qAD69NhJ001894@red.freebsd.org> Date: Tue, 13 Nov 2012 06:09:23 GMT From: Mike Stupalov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/173594: Update version of port nfsen to 1.3.6p1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Nov 2012 06:10:01 -0000 >Number: 173594 >Category: ports >Synopsis: Update version of port nfsen to 1.3.6p1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Nov 13 06:10:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Mike Stupalov >Release: 9.0-RELEASE-p3 >Organization: Hosting Community Group (Russia) >Environment: FreeBSD hidden.ru 9.0-RELEASE-p3 FreeBSD 9.0-RELEASE-p3 #0: Tue Jun 12 02:52:29 UTC 2012 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: Included patch for subj. >How-To-Repeat: >Fix: Patch attached with submission follows: 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; - } - } >Release-Note: >Audit-Trail: >Unformatted: