Date: Thu, 6 Dec 2012 15:28:01 +0100 (CET) From: Krzysztof Stryjek <ports@bsdserwis.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174233: net-mgmt/collectd update Message-ID: <20121206142801.9787D2CB2E93@mx1.bsdserwis.com> Resent-Message-ID: <201212061430.qB6EU02K046255@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174233 >Category: ports >Synopsis: net-mgmt/collectd update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Dec 06 14:30:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Krzysztof Stryjek >Release: FreeBSD 7.3-STABLE amd64 >Organization: private >Environment: System: FreeBSD aqq.bsdserwis.com 7.3-STABLE FreeBSD 7.3-STABLE #1: Fri May 7 15:18:19 CEST 2010 toor@cmd.bsdserwis.com:/home/usr/obj/home/usr/src/sys/AQQ amd64 >Description: There is new version of net-mgmt/collectd. >How-To-Repeat: >Fix: Please apply following patch: diff -ruN collectd.orig/Makefile collectd/Makefile --- collectd.orig/Makefile 2012-11-17 07:00:31.000000000 +0100 +++ collectd/Makefile 2012-12-06 13:16:50.000000000 +0100 @@ -2,8 +2,7 @@ # $FreeBSD: ports/net-mgmt/collectd/Makefile,v 1.48 2012/11/17 06:00:31 svnexp Exp $ PORTNAME= collectd -PORTVERSION= 4.10.4 -PORTREVISION= 7 +PORTVERSION= 4.10.8 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ diff -ruN collectd.orig/distinfo collectd/distinfo --- collectd.orig/distinfo 2011-12-13 17:57:26.000000000 +0100 +++ collectd/distinfo 2012-12-06 13:15:51.000000000 +0100 @@ -1,2 +1,2 @@ -SHA256 (collectd-4.10.4.tar.gz) = ee63dfbd519dd4cae3b682e7379c5e01ac3a615d48ec5871b6ab4921ec0a9b12 -SIZE (collectd-4.10.4.tar.gz) = 1632601 +SHA256 (collectd-4.10.8.tar.gz) = 018e28747e6dd1c581ec61636e178b067fee88c2cc72de0e6c1a801478f00969 +SIZE (collectd-4.10.8.tar.gz) = 1644712 diff -ruN collectd.orig/files/patch-src__network.c collectd/files/patch-src__network.c --- collectd.orig/files/patch-src__network.c 2012-09-13 00:07:07.000000000 +0200 +++ collectd/files/patch-src__network.c 1970-01-01 01:00:00.000000000 +0100 @@ -1,41 +0,0 @@ ---- src/network.c.orig 2011-07-14 15:41:32.000000000 +0200 -+++ src/network.c 2011-07-14 15:41:37.000000000 +0200 -@@ -58,7 +58,9 @@ - #endif - - #if HAVE_LIBGCRYPT -+#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - # include <gcrypt.h> -+#pragma GCC diagnostic warning "-Wdeprecated-declarations" - GCRY_THREAD_OPTION_PTHREAD_IMPL; - #endif - ---- src/network.c -+++ src/network.c -@@ -704,7 +704,7 @@ static int parse_part_values (void **ret_buffer, size_t *ret_buffer_len, - - exp_size = 3 * sizeof (uint16_t) - + pkg_numval * (sizeof (uint8_t) + sizeof (value_t)); -- if ((buffer_len < 0) || (buffer_len < exp_size)) -+ if (buffer_len < exp_size) - { - WARNING ("network plugin: parse_part_values: " - "Packet too short: " -@@ -789,7 +789,7 @@ static int parse_part_number (void **ret_buffer, size_t *ret_buffer_len, - - uint16_t pkg_length; - -- if ((buffer_len < 0) || ((size_t) buffer_len < exp_size)) -+ if (buffer_len < exp_size) - { - WARNING ("network plugin: parse_part_number: " - "Packet too short: " -@@ -828,7 +828,7 @@ static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len, - - uint16_t pkg_length; - -- if ((buffer_len < 0) || (buffer_len < header_size)) -+ if (buffer_len < header_size) - { - WARNING ("network plugin: parse_part_string: " - "Packet too short: " diff -ruN collectd.orig/files/patch-version-gen.sh collectd/files/patch-version-gen.sh --- collectd.orig/files/patch-version-gen.sh 1970-01-01 01:00:00.000000000 +0100 +++ collectd/files/patch-version-gen.sh 2012-12-06 14:50:50.000000000 +0100 @@ -0,0 +1,8 @@ +--- version-gen.sh.orig 2012-11-11 11:43:05.000000000 +0100 ++++ version-gen.sh 2012-12-06 14:49:39.204586447 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env bash ++#!/usr/bin/env sh + + DEFAULT_VERSION="4.10.8.git" + >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121206142801.9787D2CB2E93>