From owner-svn-ports-all@freebsd.org Mon Aug 8 19:38:46 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1F5B4BB221F; Mon, 8 Aug 2016 19:38:46 +0000 (UTC) (envelope-from brd@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 mx1.freebsd.org (Postfix) with ESMTPS id F15E61233; Mon, 8 Aug 2016 19:38:45 +0000 (UTC) (envelope-from brd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u78Jcjwj030236; Mon, 8 Aug 2016 19:38:45 GMT (envelope-from brd@FreeBSD.org) Received: (from brd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u78Jcioh030232; Mon, 8 Aug 2016 19:38:44 GMT (envelope-from brd@FreeBSD.org) Message-Id: <201608081938.u78Jcioh030232@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brd set sender to brd@FreeBSD.org using -f From: Brad Davis Date: Mon, 8 Aug 2016 19:38:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r419893 - in branches/2016Q3/net-mgmt/collectd5: . files X-SVN-Group: ports-branches 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.22 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: Mon, 08 Aug 2016 19:38:46 -0000 Author: brd Date: Mon Aug 8 19:38:44 2016 New Revision: 419893 URL: https://svnweb.freebsd.org/changeset/ports/419893 Log: MFH: r419862 net-mgmt/collectd5: Update net-mgmt/collectd5 to 5.5.2 PR: 211613 Submitted by: brd Approved by: ports-secteam (feld) Security: 6da45e38-5b55-11e6-8859-000c292ee6b8 Modified: branches/2016Q3/net-mgmt/collectd5/Makefile branches/2016Q3/net-mgmt/collectd5/distinfo branches/2016Q3/net-mgmt/collectd5/files/patch-src_zfs__arc.c branches/2016Q3/net-mgmt/collectd5/files/patch-version-gen.sh Directory Properties: branches/2016Q3/ (props changed) Modified: branches/2016Q3/net-mgmt/collectd5/Makefile ============================================================================== --- branches/2016Q3/net-mgmt/collectd5/Makefile Mon Aug 8 19:22:37 2016 (r419892) +++ branches/2016Q3/net-mgmt/collectd5/Makefile Mon Aug 8 19:38:44 2016 (r419893) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= collectd -PORTVERSION= 5.5.1 -PORTREVISION= 4 +PORTVERSION= 5.5.2 CATEGORIES= net-mgmt MASTER_SITES= https://collectd.org/files/ \ http://collectd.org/files/ Modified: branches/2016Q3/net-mgmt/collectd5/distinfo ============================================================================== --- branches/2016Q3/net-mgmt/collectd5/distinfo Mon Aug 8 19:22:37 2016 (r419892) +++ branches/2016Q3/net-mgmt/collectd5/distinfo Mon Aug 8 19:38:44 2016 (r419893) @@ -1,2 +1,3 @@ -SHA256 (collectd-5.5.1.tar.bz2) = f9c5d526e1f0429a7db1ccd90bdf9e23923a2fd43b7285cfda8f0341e5c0bc3f -SIZE (collectd-5.5.1.tar.bz2) = 1797852 +TIMESTAMP = 1469564676 +SHA256 (collectd-5.5.2.tar.bz2) = 017f3a4062187e594d8ab6af685655fb82a8a942dc574668e68242bdb8ba820f +SIZE (collectd-5.5.2.tar.bz2) = 1800476 Modified: branches/2016Q3/net-mgmt/collectd5/files/patch-src_zfs__arc.c ============================================================================== --- branches/2016Q3/net-mgmt/collectd5/files/patch-src_zfs__arc.c Mon Aug 8 19:22:37 2016 (r419892) +++ branches/2016Q3/net-mgmt/collectd5/files/patch-src_zfs__arc.c Mon Aug 8 19:38:44 2016 (r419893) @@ -1,14 +1,13 @@ ---- src/zfs_arc.c.orig 2016-01-22 09:51:17 UTC +--- src/zfs_arc.c.orig 2016-07-26 05:57:19 UTC +++ src/zfs_arc.c -@@ -270,8 +270,11 @@ static int za_read (void) +@@ -270,10 +270,6 @@ static int za_read (void) za_read_derive (ksp, "deleted", "cache_operation", "deleted"); #if __FreeBSD__ za_read_derive (ksp, "allocated","cache_operation", "allocated"); -+#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501) -+ /* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */ - za_read_derive (ksp, "stolen", "cache_operation", "stolen"); +-#if defined(__FreeBSD_version) && (__FreeBSD_version < 1002501) +- /* stolen removed from sysctl kstat.zfs.misc.arcstats on FreeBSD 10.2+ */ +- za_read_derive (ksp, "stolen", "cache_operation", "stolen"); +-#endif #endif -+#endif /* Issue indicators */ - za_read_derive (ksp, "mutex_miss", "mutex_operations", "miss"); Modified: branches/2016Q3/net-mgmt/collectd5/files/patch-version-gen.sh ============================================================================== --- branches/2016Q3/net-mgmt/collectd5/files/patch-version-gen.sh Mon Aug 8 19:22:37 2016 (r419892) +++ branches/2016Q3/net-mgmt/collectd5/files/patch-version-gen.sh Mon Aug 8 19:38:44 2016 (r419893) @@ -1,9 +1,9 @@ ---- version-gen.sh.orig 2016-01-22 09:51:17 UTC +--- version-gen.sh.orig 2016-08-05 21:19:57 UTC +++ version-gen.sh @@ -1,13 +1,3 @@ #!/bin/sh --DEFAULT_VERSION="5.5.1.git" +-DEFAULT_VERSION="5.5.2.git" - -VERSION="`git describe 2> /dev/null | grep collectd | sed -e 's/^collectd-//'`" - @@ -14,4 +14,4 @@ -VERSION="`echo \"$VERSION\" | sed -e 's/-/./g'`" - -printf "%s" "$VERSION" -+echo -n "5.5.1.git" ++echo -n '5.5.2.git'