Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 12 May 2014 21:20:51 +0100 (BST)
From:      Tim Bishop <tim@bishnet.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        ports@bsdserwis.com
Subject:   ports/189738: [PATCH] net-mgmt/collectd5: Fix build with libstatgrab 0.90
Message-ID:  <201405122020.s4CKKpl2005438@aberfal.kent.ac.uk>
Resent-Message-ID: <201405122130.s4CLU0qP021223@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         189738
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/collectd5: Fix build with libstatgrab 0.90
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 12 21:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Tim Bishop
>Release:        FreeBSD 10.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD aberfal.kent.ac.uk 10.0-STABLE FreeBSD 10.0-STABLE #0 r264471: Wed Apr 16 12:43:29 BST
>Description:
- Fix build with libstatgrab 0.90

Port maintainer (ports@bsdserwis.com) is cc'd.

Generated with FreeBSD Port Tools 1.02 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- collectd5-5.4.1.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 353892)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	collectd
 PORTVERSION=	5.4.1
-PORTREVISION=	1
+PORTREVISION=	2
 PKGNAMESUFFIX=	5
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://collectd.org/files/
Index: files/patch-src__collectd.c
===================================================================
--- files/patch-src__collectd.c	(revision 0)
+++ files/patch-src__collectd.c	(working copy)
@@ -0,0 +1,11 @@
+--- ./src/collectd.c.orig	2014-01-26 08:09:14.840391000 +0000
++++ ./src/collectd.c	2014-05-10 23:35:17.226683756 +0100
+@@ -288,7 +288,7 @@
+ #endif
+ 
+ #if HAVE_LIBSTATGRAB
+-	if (sg_init ())
++	if (sg_init (0))
+ 	{
+ 		ERROR ("sg_init: %s", sg_str_error (sg_get_error ()));
+ 		return (-1);

Property changes on: files/patch-src__collectd.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: files/patch-src__disk.c
===================================================================
--- files/patch-src__disk.c	(revision 0)
+++ files/patch-src__disk.c	(working copy)
@@ -0,0 +1,12 @@
+--- ./src/disk.c.orig	2014-01-26 08:09:14.856391000 +0000
++++ ./src/disk.c	2014-05-10 23:35:17.232681397 +0100
+@@ -732,7 +732,8 @@
+ 
+ #elif defined(HAVE_LIBSTATGRAB)
+ 	sg_disk_io_stats *ds;
+-	int disks, counter;
++	size_t disks;
++	int counter;
+ 	char name[DATA_MAX_NAME_LEN];
+ 	
+ 	if ((ds = sg_get_disk_io_stats(&disks)) == NULL)

Property changes on: files/patch-src__disk.c
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
--- collectd5-5.4.1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201405122020.s4CKKpl2005438>