From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Aug 13 13:00:18 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA3121065672 for ; Sat, 13 Aug 2011 13:00:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AEB228FC13 for ; Sat, 13 Aug 2011 13:00:18 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p7DD0IZq079376 for ; Sat, 13 Aug 2011 13:00:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p7DD0IJe079373; Sat, 13 Aug 2011 13:00:18 GMT (envelope-from gnats) Resent-Date: Sat, 13 Aug 2011 13:00:18 GMT Resent-Message-Id: <201108131300.p7DD0IJe079373@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 [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BD760106564A for ; Sat, 13 Aug 2011 12:58:52 +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 A24528FC1D for ; Sat, 13 Aug 2011 12:58:52 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p7DCwqE2002883 for ; Sat, 13 Aug 2011 12:58:52 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p7DCwqnT002882; Sat, 13 Aug 2011 12:58:52 GMT (envelope-from nobody) Message-Id: <201108131258.p7DCwqnT002882@red.freebsd.org> Date: Sat, 13 Aug 2011 12:58:52 GMT From: Mike Stupalov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/159738: [patch] net-mgmt/nfsen: update to 1.3.5 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Aug 2011 13:00:19 -0000 >Number: 159738 >Category: ports >Synopsis: [patch] net-mgmt/nfsen: update to 1.3.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Aug 13 13:00:18 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Mike Stupalov >Release: >Organization: >Environment: >Description: update net-mgmt/nfsen up to 1.3.5 also fixes compatibility with nfdump 1.6.4 >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ru net-mgmt/nfsen.orig/Makefile net-mgmt/nfsen/Makefile --- net-mgmt/nfsen.orig/Makefile 2010-04-01 00:58:26.000000000 +0400 +++ net-mgmt/nfsen/Makefile 2011-08-13 16:45:17.000000000 +0400 @@ -6,8 +6,7 @@ # PORTNAME= nfsen -PORTVERSION= 1.3.2 -PORTREVISION= 1 +PORTVERSION= 1.3.5 CATEGORIES= net-mgmt MASTER_SITES= SF/${PORTNAME}/stable/${PORTNAME}-${PORTVERSION} \ http://nfsen.sourceforge.net/ @@ -36,7 +35,6 @@ ${WRKSRC}/etc/nfsen-dist.conf @${RM} ${WRKSRC}/etc/nfsen-dist.conf.* @${REINPLACE_CMD} -e 's,%%PERL%%,${PERL},' -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/install.pl - @${RM} ${WRKSRC}/libexec/NfSenRRD.pm.orig do-install: @${MKDIR} ${PREFIX}/var/${PORTNAME}/profiles/live diff -ru net-mgmt/nfsen.orig/distinfo net-mgmt/nfsen/distinfo --- net-mgmt/nfsen.orig/distinfo 2011-03-20 15:54:00.000000000 +0300 +++ net-mgmt/nfsen/distinfo 2011-08-13 15:10:01.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (nfsen-1.3.2.tar.gz) = a51dc81f83ad2273201ba0ca1ee67d598b5a67dc64ea8430ab9ff60d23b259c1 -SIZE (nfsen-1.3.2.tar.gz) = 6539382 +SHA256 (nfsen-1.3.5.tar.gz) = b2afd700818c2f91182d2970a1759f1c0a8c2835990726f15f695514f00b1e43 +SIZE (nfsen-1.3.5.tar.gz) = 221348 diff -ru net-mgmt/nfsen.orig/files/patch-install.pl net-mgmt/nfsen/files/patch-install.pl --- net-mgmt/nfsen.orig/files/patch-install.pl 2006-04-25 22:22:23.000000000 +0400 +++ net-mgmt/nfsen/files/patch-install.pl 2011-08-13 16:39:49.000000000 +0400 @@ -1,15 +1,12 @@ - -$FreeBSD: ports/net-mgmt/nfsen/files/patch-install.pl,v 1.3 2006/04/25 18:22:23 pav Exp $ - ---- install.pl.orig -+++ install.pl +--- install.pl.orig 2010-09-09 09:56:05.000000000 +0400 ++++ install.pl 2011-08-13 16:39:01.000000000 +0400 @@ -1,4 +1,4 @@ -#!/usr/bin/perl +#!%%PERL%% -I %%PREFIX%%/libexec/nfsen # # # Copyright (c) 2004, SWITCH - Teleinformatikdienste fuer Lehre und Forschung -@@ -81,33 +81,7 @@ +@@ -85,33 +85,7 @@ # Get Perl sub GetPerl { @@ -44,3 +41,27 @@ } # 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"; Only in net-mgmt/nfsen.orig/files: patch-libexec_NfSenRRD.pm >Release-Note: >Audit-Trail: >Unformatted: