Attachment 173344 Details for Bug 211613 – patch

[patch] patch

collectd.diff (text/plain), 2.75 KB, created by Brad Davis on 2016-08-05 21:29:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Brad Davis

Created: 2016-08-05 21:29:54 UTC

Size: 2.75 KB

patch

obsolete

>Index: net-mgmt/collectd5/Makefile
>===================================================================
>--- net-mgmt/collectd5/Makefile	(revision 419701)
>+++ net-mgmt/collectd5/Makefile	(working copy)
>@@ -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/
>Index: net-mgmt/collectd5/distinfo
>===================================================================
>--- net-mgmt/collectd5/distinfo	(revision 419701)
>+++ net-mgmt/collectd5/distinfo	(working copy)
>@@ -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
>Index: net-mgmt/collectd5/files/patch-src_zfs__arc.c
>===================================================================
>--- net-mgmt/collectd5/files/patch-src_zfs__arc.c	(revision 419701)
>+++ net-mgmt/collectd5/files/patch-src_zfs__arc.c	(working copy)
>@@ -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");
>Index: net-mgmt/collectd5/files/patch-version-gen.sh
>===================================================================
>--- net-mgmt/collectd5/files/patch-version-gen.sh	(revision 419701)
>+++ net-mgmt/collectd5/files/patch-version-gen.sh	(working copy)
>@@ -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'

Actions: View | Diff

Attachments on bug 211613: 173344