Attachment 178476 Details for Bug 215731 – patch to update to 5.7

[patch] patch to update to 5.7

collectd5_5.7.diff (text/plain), 6.52 KB, created by Steve Wills on 2017-01-03 14:18:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2017-01-03 14:18:56 UTC

Size: 6.52 KB

patch

obsolete

>Index: net-mgmt/collectd5/Makefile
>===================================================================
>--- net-mgmt/collectd5/Makefile	(revision 430434)
>+++ net-mgmt/collectd5/Makefile	(working copy)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	collectd
>-PORTVERSION=	5.6.0
>-PORTREVISION=	2
>+PORTVERSION=	5.7.0
> CATEGORIES=	net-mgmt
> MASTER_SITES=	https://collectd.org/files/ \
> 		http://collectd.org/files/
>Index: net-mgmt/collectd5/distinfo
>===================================================================
>--- net-mgmt/collectd5/distinfo	(revision 430434)
>+++ net-mgmt/collectd5/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1474290609
>-SHA256 (collectd-5.6.0.tar.bz2) = f0ffbbd91fac3682bd324a74b9b4c9eabe781394b303b5cfd457c4cfbe748623
>-SIZE (collectd-5.6.0.tar.bz2) = 1818470
>+TIMESTAMP = 1483447838
>+SHA256 (collectd-5.7.0.tar.bz2) = 25a05fbdc6baad571554342bbac6141928bf95a47fc60ee3b32e46d0c89ef2b2
>+SIZE (collectd-5.7.0.tar.bz2) = 1861882
>Index: net-mgmt/collectd5/files/patch-src__daemon__collectd.h
>===================================================================
>--- net-mgmt/collectd5/files/patch-src__daemon__collectd.h	(revision 430434)
>+++ net-mgmt/collectd5/files/patch-src__daemon__collectd.h	(working copy)
>@@ -1,21 +1,21 @@
>---- src/daemon/collectd.h.orig	2016-09-11 08:10:25 UTC
>-+++ src/daemon/collectd.h
>-@@ -243,15 +243,15 @@ typedef int _Bool;
>+--- src/daemon/collectd.h.orig	2016-12-12 03:03:36.704279144 -0500
>++++ src/daemon/collectd.h	2017-01-03 07:53:41.101884000 -0500
>+@@ -243,15 +243,15 @@
>  #endif
>  
>  #ifndef LOCALSTATEDIR
>--# define LOCALSTATEDIR PREFIX "/var"
>-+# define LOCALSTATEDIR "/var"
>+-#define LOCALSTATEDIR PREFIX "/var"
>++#define LOCALSTATEDIR "/var"
>  #endif
>  
>  #ifndef PKGLOCALSTATEDIR
>--# define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
>-+# define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME
>+-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
>++#define PKGLOCALSTATEDIR "/var/db/" PACKAGE_NAME
>  #endif
>  
>  #ifndef PIDFILE
>--# define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
>-+# define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
>+-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
>++#define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
>  #endif
>  
>  #ifndef PLUGINDIR
>Index: net-mgmt/collectd5/files/patch-src__dns.c
>===================================================================
>--- net-mgmt/collectd5/files/patch-src__dns.c	(revision 430434)
>+++ net-mgmt/collectd5/files/patch-src__dns.c	(working copy)
>@@ -1,18 +1,18 @@
>---- src/dns.c.orig	2016-09-11 08:10:25 UTC
>-+++ src/dns.c
>-@@ -225,6 +225,15 @@ static int dns_run_pcap_loop (void)
>- 		pthread_sigmask (SIG_SETMASK, &sigmask, NULL);
>- 	}
>+--- src/dns.c.orig	2016-12-12 03:03:36.708279115 -0500
>++++ src/dns.c	2017-01-03 08:10:33.137711000 -0500
>+@@ -198,6 +198,15 @@
>+     pthread_sigmask(SIG_SETMASK, &sigmask, NULL);
>+   }
>  
> +	/* Check for pcap_device, if needed */
> +#ifdef __sparc64__
>-+	if (pcap_device == NULL)
>-+	{
>-+		ERROR ("dns plugin: Interface required");
>-+		return (NULL);
>-+	}
>++  if (pcap_device == NULL)
>++  {
>++    ERROR ("dns plugin: Interface required");
>++    return (NULL);
>++  }
> +#endif
> +
>- 	/* Passing `pcap_device == NULL' is okay and the same as passign "any" */
>- 	DEBUG ("dns plugin: Creating PCAP object..");
>- 	pcap_obj = pcap_open_live ((pcap_device != NULL) ? pcap_device : "any",
>+   /* Passing `pcap_device == NULL' is okay and the same as passign "any" */
>+   DEBUG("dns plugin: Creating PCAP object..");
>+   pcap_obj = pcap_open_live((pcap_device != NULL) ? pcap_device : "any",
>Index: net-mgmt/collectd5/files/patch-src__modbus.c
>===================================================================
>--- net-mgmt/collectd5/files/patch-src__modbus.c	(revision 430434)
>+++ net-mgmt/collectd5/files/patch-src__modbus.c	(working copy)
>@@ -1,12 +1,12 @@
>---- src/modbus.c.orig	2016-09-11 08:10:25 UTC
>-+++ src/modbus.c
>-@@ -25,6 +25,9 @@
>- #include "common.h"
>+--- src/modbus.c.orig	2016-12-12 03:03:36.712279086 -0500
>++++ src/modbus.c	2017-01-03 08:12:39.318883000 -0500
>+@@ -26,6 +26,9 @@
>+ #include "configfile.h"
>  #include "plugin.h"
>  
> +/* FreeBSD needs this */
> +#include <sys/socket.h> 
> +
>+ #include <modbus.h>
>  #include <netdb.h>
>- 
>- #include <modbus.h>
>+ #include <sys/socket.h>
>Index: net-mgmt/collectd5/files/patch-src_zfs__arc.c
>===================================================================
>--- net-mgmt/collectd5/files/patch-src_zfs__arc.c	(revision 430434)
>+++ net-mgmt/collectd5/files/patch-src_zfs__arc.c	(working copy)
>@@ -1,10 +1,11 @@
>---- src/zfs_arc.c.orig	2016-09-11 08:10:25 UTC
>-+++ src/zfs_arc.c
>-@@ -314,7 +314,6 @@ static int za_read (void)
>- 	za_read_derive (ksp, "demand_data_misses",       "cache_result", "demand_data-miss");
>- 	za_read_derive (ksp, "demand_metadata_misses",   "cache_result", "demand_metadata-miss");
>- 	za_read_derive (ksp, "prefetch_data_misses",     "cache_result", "prefetch_data-miss");
>--	za_read_derive (ksp, "prefetch_metadata_misses", "cache_result", "prefetch_metadata-miss");
>- 	za_read_derive (ksp, "mfu_hits",                 "cache_result", "mfu-hit");
>- 	za_read_derive (ksp, "mfu_ghost_hits",           "cache_result", "mfu_ghost-hit");
>- 	za_read_derive (ksp, "mru_hits",                 "cache_result", "mru-hit");
>+--- src/zfs_arc.c.orig	2016-12-12 03:03:36.728278972 -0500
>++++ src/zfs_arc.c	2017-01-03 08:15:23.751003000 -0500
>+@@ -286,8 +286,6 @@
>+   za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",
>+                  "prefetch_metadata-hit");
>+   za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");
>+-  za_read_derive(ksp, "demand_metadata_misses", "cache_result",
>+-                 "demand_metadata-miss");
>+   za_read_derive(ksp, "prefetch_data_misses", "cache_result",
>+                  "prefetch_data-miss");
>+   za_read_derive(ksp, "prefetch_metadata_misses", "cache_result",
>Index: net-mgmt/collectd5/files/patch-version-gen.sh
>===================================================================
>--- net-mgmt/collectd5/files/patch-version-gen.sh	(revision 430434)
>+++ net-mgmt/collectd5/files/patch-version-gen.sh	(working copy)
>@@ -1,9 +1,9 @@
>---- version-gen.sh.orig	2016-09-11 08:10:25 UTC
>-+++ version-gen.sh
>+--- version-gen.sh.orig	2017-01-03 08:18:24.963614000 -0500
>++++ version-gen.sh	2017-01-03 08:19:07.743161000 -0500
> @@ -1,13 +1,2 @@
>  #!/bin/sh
> -
>--DEFAULT_VERSION="5.6.0.git"
>+-DEFAULT_VERSION="5.7.0.git"
> -
> -if [ -d .git ]; then
> -	VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null | grep collectd | sed -e 's/^collectd-//' -e 's/-/./g'`"
>@@ -14,4 +14,4 @@
> -fi
> -
> -printf "%s" "$VERSION"
>-+echo -n '5.6.0.git'
>++echo -n '5.7.0.git'

Actions: View | Diff

Attachments on bug 215731: 178476