From owner-svn-ports-all@freebsd.org Fri Jul 27 10:38:14 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 665981045EBB; Fri, 27 Jul 2018 10:38:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 14C768E8BA; Fri, 27 Jul 2018 10:38:14 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DF0ED16C25; Fri, 27 Jul 2018 10:38:13 +0000 (UTC) (envelope-from eugen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6RAcDU9071772; Fri, 27 Jul 2018 10:38:13 GMT (envelope-from eugen@FreeBSD.org) Received: (from eugen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6RAcDCa071770; Fri, 27 Jul 2018 10:38:13 GMT (envelope-from eugen@FreeBSD.org) Message-Id: <201807271038.w6RAcDCa071770@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: eugen set sender to eugen@FreeBSD.org using -f From: Eugene Grosbein Date: Fri, 27 Jul 2018 10:38:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475423 - in head/net/mpd5: . files X-SVN-Group: ports-head X-SVN-Commit-Author: eugen X-SVN-Commit-Paths: in head/net/mpd5: . files X-SVN-Commit-Revision: 475423 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jul 2018 10:38:14 -0000 Author: eugen Date: Fri Jul 27 10:38:13 2018 New Revision: 475423 URL: https://svnweb.freebsd.org/changeset/ports/475423 Log: net/mpd5: add a fix from upstream r2247 Prevent reporting wrong traffic accounting data in very rare case of failure of netgraph statistical socket data flow. Added: head/net/mpd5/files/patch-fixstats (contents, props changed) Modified: head/net/mpd5/Makefile Modified: head/net/mpd5/Makefile ============================================================================== --- head/net/mpd5/Makefile Fri Jul 27 10:27:40 2018 (r475422) +++ head/net/mpd5/Makefile Fri Jul 27 10:38:13 2018 (r475423) @@ -3,7 +3,7 @@ PORTNAME= mpd DISTVERSION= 5.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION} PKGNAMESUFFIX= 5 Added: head/net/mpd5/files/patch-fixstats ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/mpd5/files/patch-fixstats Fri Jul 27 10:38:13 2018 (r475423) @@ -0,0 +1,30 @@ +Index: src/bund.c +=================================================================== +--- src/bund.c (revision 2246) ++++ src/bund.c (revision 2247) +@@ -1394,9 +1394,9 @@ BundUpdateStats(Bund b) + b->stats.runts += abs(stats.runts - b->oldStats.runts); + b->stats.dupFragments += abs(stats.dupFragments - b->oldStats.dupFragments); + b->stats.dropFragments += abs(stats.dropFragments - b->oldStats.dropFragments); ++ b->oldStats = stats; + } + +- b->oldStats = stats; + #else + NgFuncGetStats64(b, l, &b->stats); + #endif +Index: src/link.c +=================================================================== +--- src/link.c (revision 2246) ++++ src/link.c (revision 2247) +@@ -1359,9 +1359,9 @@ LinkUpdateStats(Link l) + l->stats.runts += abs(stats.runts - l->oldStats.runts); + l->stats.dupFragments += abs(stats.dupFragments - l->oldStats.dupFragments); + l->stats.dropFragments += abs(stats.dropFragments - l->oldStats.dropFragments); ++ l->oldStats = stats; + } + +- l->oldStats = stats; + #else + NgFuncGetStats64(l->bund, l->bundleIndex, &l->stats); + #endif