Attachment #178476 for bug #215731

View | Details | Raw Unified | Return to bug 215731
Collapse All | Expand All

Lines 2-9 Link Here

(-)net-mgmt/collectd5/Makefile (-2 / +1 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= collectd	4	PORTNAME= collectd
5	PORTVERSION= 5.6.0	5	PORTVERSION= 5.7.0
6	PORTREVISION= 2
7	CATEGORIES= net-mgmt	6	CATEGORIES= net-mgmt
8	MASTER_SITES= https://collectd.org/files/ \	7	MASTER_SITES= https://collectd.org/files/ \
9	http://collectd.org/files/	8	http://collectd.org/files/

Lines 1-3 Link Here

(-)net-mgmt/collectd5/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1474290609	1	TIMESTAMP = 1483447838
2	SHA256 (collectd-5.6.0.tar.bz2) = f0ffbbd91fac3682bd324a74b9b4c9eabe781394b303b5cfd457c4cfbe748623	2	SHA256 (collectd-5.7.0.tar.bz2) = 25a05fbdc6baad571554342bbac6141928bf95a47fc60ee3b32e46d0c89ef2b2
3	SIZE (collectd-5.6.0.tar.bz2) = 1818470	3	SIZE (collectd-5.7.0.tar.bz2) = 1861882




--- 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"
 #endif
 
 #ifndef PKGLOCALSTATEDIR
-#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"
 #endif
 
 #ifndef PLUGINDIR




--- 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);
+  }
+#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",




--- 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 <sys/socket.h>
 #include <modbus.h>

Lines 1-10 Link Here

(-)net-mgmt/collectd5/files/patch-src_zfs__arc.c (-10 / +11 lines)
1	--- src/zfs_arc.c.orig 2016-09-11 08:10:25 UTC	1	--- src/zfs_arc.c.orig 2016-12-12 03:03:36.728278972 -0500
2	+++ src/zfs_arc.c	2	+++ src/zfs_arc.c 2017-01-03 08:15:23.751003000 -0500
3	@@ -314,7 +314,6 @@ static int za_read (void)	3	@@ -286,8 +286,6 @@
4	za_read_derive (ksp, "demand_data_misses", "cache_result", "demand_data-miss");	4	za_read_derive(ksp, "prefetch_metadata_hits", "cache_result",
5	za_read_derive (ksp, "demand_metadata_misses", "cache_result", "demand_metadata-miss");	5	"prefetch_metadata-hit");
6	za_read_derive (ksp, "prefetch_data_misses", "cache_result", "prefetch_data-miss");	6	za_read_derive(ksp, "demand_data_misses", "cache_result", "demand_data-miss");
7	- za_read_derive (ksp, "prefetch_metadata_misses", "cache_result", "prefetch_metadata-miss");	7	- za_read_derive(ksp, "demand_metadata_misses", "cache_result",
8	za_read_derive (ksp, "mfu_hits", "cache_result", "mfu-hit");	8	- "demand_metadata-miss");
9	za_read_derive (ksp, "mfu_ghost_hits", "cache_result", "mfu_ghost-hit");	9	za_read_derive(ksp, "prefetch_data_misses", "cache_result",
10	za_read_derive (ksp, "mru_hits", "cache_result", "mru-hit");	10	"prefetch_data-miss");
		11	za_read_derive(ksp, "prefetch_metadata_misses", "cache_result",

Lines 1-9 Link Here

(-)net-mgmt/collectd5/files/patch-version-gen.sh (-4 / +4 lines)
1	--- version-gen.sh.orig 2016-09-11 08:10:25 UTC	1	--- version-gen.sh.orig 2017-01-03 08:18:24.963614000 -0500
2	+++ version-gen.sh	2	+++ version-gen.sh 2017-01-03 08:19:07.743161000 -0500
3	@@ -1,13 +1,2 @@	3	@@ -1,13 +1,2 @@
4	#!/bin/sh	4	#!/bin/sh
5	-	5	-
6	-DEFAULT_VERSION="5.6.0.git"	6	-DEFAULT_VERSION="5.7.0.git"
7	-	7	-
8	-if [ -d .git ]; then	8	-if [ -d .git ]; then
9	- VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null \| grep collectd \| sed -e 's/^collectd-//' -e 's/-/./g'`"	9	- VERSION="`git describe --dirty=+ --abbrev=7 2> /dev/null \| grep collectd \| sed -e 's/^collectd-//' -e 's/-/./g'`"
Lines 14-17 Link Here
14	-fi	14	-fi
15	-	15	-
16	-printf "%s" "$VERSION"	16	-printf "%s" "$VERSION"
17	+echo -n '5.6.0.git'	17	+echo -n '5.7.0.git'

Return to bug 215731

Lines 1-21 Link Here

(-)net-mgmt/collectd5/files/patch-src__daemon__collectd.h (-9 / +9 lines)
1	--- src/daemon/collectd.h.orig 2016-09-11 08:10:25 UTC	1	--- src/daemon/collectd.h.orig 2016-12-12 03:03:36.704279144 -0500
2	+++ src/daemon/collectd.h	2	+++ src/daemon/collectd.h 2017-01-03 07:53:41.101884000 -0500
3	@@ -243,15 +243,15 @@ typedef int _Bool;	3	@@ -243,15 +243,15 @@
4	#endif	4	#endif
5		5
6	#ifndef LOCALSTATEDIR	6	#ifndef LOCALSTATEDIR
7	-# define LOCALSTATEDIR PREFIX "/var"	7	-#define LOCALSTATEDIR PREFIX "/var"
8	+# define LOCALSTATEDIR "/var"	8	+#define LOCALSTATEDIR "/var"
9	#endif	9	#endif
10		10
11	#ifndef PKGLOCALSTATEDIR	11	#ifndef PKGLOCALSTATEDIR
12	-# define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME	12	-#define PKGLOCALSTATEDIR PREFIX "/var/lib/" PACKAGE_NAME
13	+# define PKGLOCALSTATEDIR PREFIX "/var/db/" PACKAGE_NAME	13	+#define PKGLOCALSTATEDIR "/var/db/" PACKAGE_NAME
14	#endif	14	#endif
15		15
16	#ifndef PIDFILE	16	#ifndef PIDFILE
17	-# define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"	17	-#define PIDFILE PREFIX "/var/run/" PACKAGE_NAME ".pid"
18	+# define PIDFILE "/var/run/" PACKAGE_NAME ".pid"	18	+#define PIDFILE "/var/run/" PACKAGE_NAME ".pid"
19	#endif	19	#endif
20		20
21	#ifndef PLUGINDIR	21	#ifndef PLUGINDIR

Lines 1-18 Link Here

(-)net-mgmt/collectd5/files/patch-src__dns.c (-13 / +13 lines)
1	--- src/dns.c.orig 2016-09-11 08:10:25 UTC	1	--- src/dns.c.orig 2016-12-12 03:03:36.708279115 -0500
2	+++ src/dns.c	2	+++ src/dns.c 2017-01-03 08:10:33.137711000 -0500
3	@@ -225,6 +225,15 @@ static int dns_run_pcap_loop (void)	3	@@ -198,6 +198,15 @@
4	pthread_sigmask (SIG_SETMASK, &sigmask, NULL);	4	pthread_sigmask(SIG_SETMASK, &sigmask, NULL);
5	}	5	}
6		6
7	+ /* Check for pcap_device, if needed */	7	+ /* Check for pcap_device, if needed */
8	+#ifdef __sparc64__	8	+#ifdef __sparc64__
9	+ if (pcap_device == NULL)	9	+ if (pcap_device == NULL)
10	+ {	10	+ {
11	+ ERROR ("dns plugin: Interface required");	11	+ ERROR ("dns plugin: Interface required");
12	+ return (NULL);	12	+ return (NULL);
13	+ }	13	+ }
14	+#endif	14	+#endif
15	+	15	+
16	/* Passing `pcap_device == NULL' is okay and the same as passign "any" */	16	/* Passing `pcap_device == NULL' is okay and the same as passign "any" */
17	DEBUG ("dns plugin: Creating PCAP object..");	17	DEBUG("dns plugin: Creating PCAP object..");
18	pcap_obj = pcap_open_live ((pcap_device != NULL) ? pcap_device : "any",	18	pcap_obj = pcap_open_live((pcap_device != NULL) ? pcap_device : "any",

Lines 1-12 Link Here

(-)net-mgmt/collectd5/files/patch-src__modbus.c (-6 / +6 lines)
1	--- src/modbus.c.orig 2016-09-11 08:10:25 UTC	1	--- src/modbus.c.orig 2016-12-12 03:03:36.712279086 -0500
2	+++ src/modbus.c	2	+++ src/modbus.c 2017-01-03 08:12:39.318883000 -0500
3	@@ -25,6 +25,9 @@	3	@@ -26,6 +26,9 @@
4	#include "common.h"	4	#include "configfile.h"
5	#include "plugin.h"	5	#include "plugin.h"
6		6
7	+/* FreeBSD needs this */	7	+/* FreeBSD needs this */
8	+#include <sys/socket.h>	8	+#include <sys/socket.h>
9	+	9	+
		10	#include <modbus.h>
10	#include <netdb.h>	11	#include <netdb.h>
11		12	#include <sys/socket.h>
12	#include <modbus.h>