Attachment 120393 Details for Bug 163190 – collectd5.patch

[patch] collectd5.patch

collectd5.patch (text/plain), 5.17 KB, created by Krzysztof on 2011-12-11 22:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Krzysztof

Created: 2011-12-11 22:00:02 UTC

Size: 5.17 KB

patch

obsolete

>diff -ruN collectd5.orig/Makefile collectd5/Makefile
>--- collectd5.orig/Makefile	2011-09-25 05:20:37.000000000 +0200
>+++ collectd5/Makefile	2011-12-11 22:30:01.000000000 +0100
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	collectd
>-PORTVERSION=	5.0.0
>+PORTVERSION=	5.0.1
> CATEGORIES=	net-mgmt
> MASTER_SITES=	http://collectd.org/files/
> 
>@@ -42,7 +42,8 @@
> 		PING		"Input: Network latency (liboping)" 		On  \
> 		SNMP		"Input: SNMP" 					On  \
> 		XMMS		"Input: XMMS" 					Off \
>-		RRDTOOL		"Output: RRDTool" 				On
>+		RRDTOOL		"Output: RRDTool"				On \
>+		RRDCACHED	"Output: RRDTool Cached (require RRDTOOL)"	On
> 
> MAN1=		collectd.1 collectd-nagios.1 collectdmon.1 collectdctl.1
> MAN5=		collectd.conf.5 collectd-email.5 collectd-exec.5 \
>@@ -112,7 +113,6 @@
> 		--disable-python \
> 		--disable-protocols \
> 		--disable-routeros \
>-		--disable-rrdcached \
> 		--disable-sensors \
> 		--disable-serial \
> 		--disable-table \
>@@ -131,7 +131,8 @@
> 		--disable-wireless \
> 		--disable-write_http \
> 		--disable-zfs_arc \
>-		--without-perl-bindings
>+		--without-perl-bindings \
>+		--disable-static
> 
> .if defined(WITH_DEBUG)
> CONFIGURE_ARGS+=--enable-debug
>@@ -323,6 +324,14 @@
> PLIST_SUB+=	RRD="@comment "
> .endif
> 
>+.if defined(WITH_RRDCACHED) && defined(WITH_RRDTOOL)
>+CONFIGURE_ARGS+=--enable-rrdcached
>+PLIST_SUB+=	RRDCACHED=""
>+.else
>+CONFIGURE_ARGS+=--disable--rrdcached
>+PLIST_SUB+=	RRDCACHED="@comment "
>+.endif
>+
> .if defined(WITH_SNMP)
> LIB_DEPENDS+=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
> CONFIGURE_ARGS+=--enable-snmp
>diff -ruN collectd5.orig/distinfo collectd5/distinfo
>--- collectd5.orig/distinfo	2011-09-07 04:23:40.000000000 +0200
>+++ collectd5/distinfo	2011-12-11 22:30:01.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (collectd-5.0.0.tar.gz) = d2106b2c85d16292b6b8bb9693c99f5659eced35b406da3c67e852100fdee2db
>-SIZE (collectd-5.0.0.tar.gz) = 1784800
>+SHA256 (collectd-5.0.1.tar.gz) = 380f98a50eba9453eb84fbb8b847df8ee6eff69bf05a4d61c996cf8256712c42
>+SIZE (collectd-5.0.1.tar.gz) = 1680960
>diff -ruN collectd5.orig/files/patch-src__meta_data.c collectd5/files/patch-src__meta_data.c
>--- collectd5.orig/files/patch-src__meta_data.c	2011-05-30 22:18:19.000000000 +0200
>+++ collectd5/files/patch-src__meta_data.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,10 +0,0 @@
>---- ./src/meta_data.c.orig	2011-05-30 06:58:07.055492500 -0400
>-+++ ./src/meta_data.c	2011-05-30 06:59:10.383490225 -0400
>-@@ -215,6 +215,7 @@
>-     return;
>- 
>-   md_entry_free (md->head);
>-+  pthread_mutex_destroy(&md->lock);
>-   free (md);
>- } /* }}} void meta_data_destroy */
>- 
>diff -ruN collectd5.orig/pkg-plist collectd5/pkg-plist
>--- collectd5.orig/pkg-plist	2011-09-07 04:23:40.000000000 +0200
>+++ collectd5/pkg-plist	2011-12-11 22:30:01.000000000 +0100
>@@ -13,12 +13,26 @@
> bin/collectdctl
> include/collectd/client.h
> include/collectd/lcc_features.h
>-lib/collectd/bind.la
>-lib/collectd/bind.so
>+%%APACHE%%lib/collectd/apache.la
>+%%APACHE%%lib/collectd/apache.so
>+%%APCUPS%%lib/collectd/apcups.la
>+%%APCUPS%%lib/collectd/apcups.so
>+%%BIND%%lib/collectd/bind.la
>+%%BIND%%lib/collectd/bind.so
> lib/collectd/cpu.la
> lib/collectd/cpu.so
> lib/collectd/csv.la
> lib/collectd/csv.so
>+%%CURL%%lib/collectd/curl.la
>+%%CURL%%lib/collectd/curl.so
>+%%CURL_JSON%%lib/collectd/curl_json.la
>+%%CURL_JSON%%lib/collectd/curl_json.so
>+%%CURL_XML%%lib/collectd/curl_xml.la
>+%%CURL_XML%%lib/collectd/curl_xml.so
>+%%DBI%%lib/collectd/dbi.la
>+%%DBI%%lib/collectd/dbi.so
>+%%DISK%%lib/collectd/disk.la
>+%%DISK%%lib/collectd/disk.so
> lib/collectd/df.la
> lib/collectd/df.so
> lib/collectd/dns.la
>@@ -29,28 +43,46 @@
> lib/collectd/exec.so
> lib/collectd/filecount.la
> lib/collectd/filecount.so
>-lib/collectd/interface.la
>-lib/collectd/interface.so
>+%%INTERFACE%%lib/collectd/interface.la
>+%%INTERFACE%%lib/collectd/interface.so
> lib/collectd/load.la
> lib/collectd/load.so
> lib/collectd/logfile.la
> lib/collectd/logfile.so
>+%%MBMON%%lib/collectd/mbmon.la
>+%%MBMON%%lib/collectd/mbmon.so
> lib/collectd/memcached.la
> lib/collectd/memcached.so
> lib/collectd/memory.la
> lib/collectd/memory.so
>+%%MYSQL%%lib/collectd/mysql.la
>+%%MYSQL%%lib/collectd/mysql.so
>+%%NGINX%%lib/collectd/nginx.la
>+%%NGINX%%lib/collectd/nginx.so
> lib/collectd/network.la
> lib/collectd/network.so
>+%%NUTUPS%%lib/collectd/nut.la
>+%%NUTUPS%%lib/collectd/nut.so
> lib/collectd/ntpd.la
> lib/collectd/ntpd.so
>+%%OPENVPN%%lib/collectd/openvpn.la
>+%%OPENVPN%%lib/collectd/openvpn.so
>+%%PGSQL%%lib/collectd/postgresql.la
>+%%PGSQL%%lib/collectd/postgresql.so
>+%%PING%%lib/collectd/ping.la
>+%%PING%%lib/collectd/ping.so
>+%%PDNS%%lib/collectd/powerdns.so
>+%%PDNS%%lib/collectd/powerdns.la
> lib/collectd/ping.la
> lib/collectd/ping.so
> lib/collectd/processes.la
> lib/collectd/processes.so
>-lib/collectd/rrdtool.la
>-lib/collectd/rrdtool.so
>-lib/collectd/snmp.la
>-lib/collectd/snmp.so
>+%%RRD%%lib/collectd/rrdtool.la
>+%%RRD%%lib/collectd/rrdtool.so
>+%%RRDCACHED%%lib/collectd/rrdcached.la
>+%%RRDCACHED%%lib/collectd/rrdcached.so
>+%%SNMP%%lib/collectd/snmp.la
>+%%SNMP%%lib/collectd/snmp.so
> lib/collectd/swap.la
> lib/collectd/swap.so
> lib/collectd/syslog.la
>@@ -73,6 +105,8 @@
> lib/libcollectdclient.so
> lib/libcollectdclient.so.0
> libdata/pkgconfig/libcollectdclient.pc
>+%%XMMS%%lib/collectd/xmms.la
>+%%XMMS%%lib/collectd/xmms.so
> %%DATADIR%%/postgresql_default.conf
> %%DATADIR%%/types.db
> @dirrm lib/collectd

Actions: View | Diff

Attachments on bug 163190: 120393