svn commit: r419862 - in head/net-mgmt/collectd5: . files

[Brad Davis]

Author: brd
Date: Mon Aug  8 15:50:17 2016
New Revision: 419862
URL: https://svnweb.freebsd.org/changeset/ports/419862

Log:
  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:
  head/net-mgmt/collectd5/Makefile
  head/net-mgmt/collectd5/distinfo
  head/net-mgmt/collectd5/files/patch-src_zfs__arc.c
  head/net-mgmt/collectd5/files/patch-version-gen.sh

Modified: head/net-mgmt/collectd5/Makefile
==============================================================================
--- head/net-mgmt/collectd5/Makefile	Mon Aug  8 15:47:23 2016	(r419861)
+++ head/net-mgmt/collectd5/Makefile	Mon Aug  8 15:50:17 2016	(r419862)
@@ -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: head/net-mgmt/collectd5/distinfo
==============================================================================
--- head/net-mgmt/collectd5/distinfo	Mon Aug  8 15:47:23 2016	(r419861)
+++ head/net-mgmt/collectd5/distinfo	Mon Aug  8 15:50:17 2016	(r419862)
@@ -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: head/net-mgmt/collectd5/files/patch-src_zfs__arc.c
==============================================================================
--- head/net-mgmt/collectd5/files/patch-src_zfs__arc.c	Mon Aug  8 15:47:23 2016	(r419861)
+++ head/net-mgmt/collectd5/files/patch-src_zfs__arc.c	Mon Aug  8 15:50:17 2016	(r419862)
@@ -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: head/net-mgmt/collectd5/files/patch-version-gen.sh
==============================================================================
--- head/net-mgmt/collectd5/files/patch-version-gen.sh	Mon Aug  8 15:47:23 2016	(r419861)
+++ head/net-mgmt/collectd5/files/patch-version-gen.sh	Mon Aug  8 15:50:17 2016	(r419862)
@@ -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'