Date: Sun, 26 Oct 2008 02:58:56 +0100 (CET) From: Daniel Roethlisberger <daniel@roe.ch> To: FreeBSD-gnats-submit@FreeBSD.org Cc: daniel@roe.ch Subject: ports/128391: [maintainer] Update net-mgmt/collectd to 4.5.1 Message-ID: <200810260158.m9Q1wu6e095512@marvin.ustcor.roe.ch> Resent-Message-ID: <200810261240.m9QCe5VM013899@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 128391 >Category: ports >Synopsis: [maintainer] Update net-mgmt/collectd to 4.5.1 >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: Sun Oct 26 12:40:05 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Daniel Roethlisberger >Release: FreeBSD 7.0-RELEASE-p5 i386 >Organization: >Environment: System: FreeBSD marvin.ustcor.roe.ch 7.0-RELEASE-p5 FreeBSD 7.0-RELEASE-p5 #0: Wed Oct 1 10:10:12 UTC 2008 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: svn add files/collectdmon.in Update collectd to the latest release, 4.5.1. This brings tons of bugfixes, some new plugins such as `tail', and collectdmon, a monitoring daemon which will start collectd and restart it in case it crashes. >How-To-Repeat: >Fix: --- collectd.diff begins here --- diff -ruN collectd.orig/Makefile collectd/Makefile --- collectd.orig/Makefile 2008-06-24 14:34:52.000000000 +0200 +++ collectd/Makefile 2008-10-26 02:12:51.000000000 +0200 @@ -6,8 +6,7 @@ # PORTNAME= collectd -PORTVERSION= 4.1.2 -PORTREVISION= 3 +PORTVERSION= 4.5.1 CATEGORIES= net-mgmt MASTER_SITES= http://collectd.org/files/ \ http://mirror.roe.ch/dist/${PORTNAME}/ @@ -31,10 +30,11 @@ XMMS "Input: XMMS" Off \ RRDTOOL "Output: RRDTool" On -MAN1= collectd.1 collectd-nagios.1 +MAN1= collectd.1 collectd-nagios.1 collectdmon.1 MAN5= collectd.conf.5 collectd-email.5 collectd-exec.5 \ - collectd-snmp.5 collectd-unixsock.5 collectd-perl.5 -USE_RC_SUBR= collectd + collectd-snmp.5 collectd-unixsock.5 collectd-perl.5 \ + types.db.5 +USE_RC_SUBR= collectd collectdmon CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" @@ -45,17 +45,43 @@ BROKEN= Need bind9 import post 6.1 .endif +# NOTE: Feel free to submit patches adding support for any of these +# disabled plugins. If a plugin requires external dependencies, +# make it optional through OPTIONS. Some of these are Linux +# specific, but others will probably run on FreeBSD as well, +# given a bit of careful attention. CONFIGURE_ARGS= --localstatedir=/var \ --disable-apple_sensors \ + --disable-ascent \ --disable-battery \ + --disable-cpufreq \ + --disable-disk \ + --disable-entropy \ --disable-hddtemp \ - --disable-multimeter \ --disable-iptables \ + --disable-ipmi \ + --disable-ipvs \ + --disable-irq \ + --disable-libvirt \ + --disable-multimeter \ + --disable-netlink \ + --disable-nfs \ + --disable-nginx \ + --disable-notify_desktop \ + --disable-notify_email \ + --disable-nut \ + --disable-onewire \ --disable-perl \ + --disable-postgresql \ --disable-sensors \ --disable-serial \ + --disable-tape \ + --disable-thermal \ + --disable-users \ + --disable-vmem \ --disable-vserver \ - --disable-wireless + --disable-wireless \ + --without-perl-bindings .if defined(WITH_DEBUG) CONFIGURE_ARGS+=--enable-debug diff -ruN collectd.orig/distinfo collectd/distinfo --- collectd.orig/distinfo 2007-10-08 20:28:19.000000000 +0200 +++ collectd/distinfo 2008-10-26 00:07:20.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (collectd-4.1.2.tar.gz) = 40458dabe8ec5df87323c1862a03cb94 -SHA256 (collectd-4.1.2.tar.gz) = fba4423378a8a270de8b48f98dc2f102f4f3c630381672267344776885a6e690 -SIZE (collectd-4.1.2.tar.gz) = 999229 +MD5 (collectd-4.5.1.tar.gz) = ab900d15662859b8793abf99eda15c29 +SHA256 (collectd-4.5.1.tar.gz) = 9ab967b7909d9c229cfcd4d1a5503da42f38a1246a53fc5cfaaf1dfde6fae8a1 +SIZE (collectd-4.5.1.tar.gz) = 1279434 diff -ruN collectd.orig/files/collectd.in collectd/files/collectd.in --- collectd.orig/files/collectd.in 2008-05-06 12:45:17.000000000 +0200 +++ collectd/files/collectd.in 2008-10-26 02:07:08.000000000 +0200 @@ -9,7 +9,7 @@ # collectd_enable (bool): Set to NO by default. # Set it to YES to enable collectd. # collectd_flags (string): Set to "" by default. -# Additional flags to collecd, see manual page. +# Additional flags to collectd, see manual page. # . %%RC_SUBR%% diff -ruN collectd.orig/files/collectdmon.in collectd/files/collectdmon.in --- collectd.orig/files/collectdmon.in 1970-01-01 01:00:00.000000000 +0100 +++ collectd/files/collectdmon.in 2008-10-26 02:12:38.000000000 +0200 @@ -0,0 +1,27 @@ +#!/bin/sh + +# PROVIDE: collectdmon +# REQUIRE: LOGIN +# +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# collectdmon_enable (bool): Set to NO by default. +# Set it to YES to enable collectd. +# collectdmon_flags (string): Set to "-c %%PREFIX%%/sbin/collectd" by default. +# Additional flags to collectdmon, see manual page. +# + +. %%RC_SUBR%% + +name="collectdmon" +rcvar=${name}_enable + +command=%%PREFIX%%/sbin/${name} + +load_rc_config $name + +: ${collectdmon_enable="NO"} +: ${collectdmon_flags="-c %%PREFIX%%/sbin/collectd"} + +run_rc_command "$1" diff -ruN collectd.orig/pkg-plist collectd/pkg-plist --- collectd.orig/pkg-plist 2008-05-06 12:45:17.000000000 +0200 +++ collectd/pkg-plist 2008-10-26 01:46:25.000000000 +0200 @@ -1,5 +1,6 @@ @stopdaemon collectd sbin/collectd +sbin/collectdmon @unexec if cmp -s %D/etc/collectd.conf.sample %D/etc/collectd.conf; then rm -f %D/etc/collectd.conf; fi etc/collectd.conf.sample @exec if [ ! -f %B/collectd.conf ] ; then cp -p %B/%f %B/collectd.conf; fi @@ -26,6 +27,8 @@ lib/collectd/email.so lib/collectd/exec.la lib/collectd/exec.so +lib/collectd/filecount.so +lib/collectd/filecount.la %%INTERFACE%%lib/collectd/interface.la %%INTERFACE%%lib/collectd/interface.so lib/collectd/load.la @@ -34,6 +37,8 @@ lib/collectd/logfile.so %%MBMON%%lib/collectd/mbmon.la %%MBMON%%lib/collectd/mbmon.so +lib/collectd/memcached.so +lib/collectd/memcached.la lib/collectd/memory.la lib/collectd/memory.so %%MYSQL%%lib/collectd/mysql.la @@ -44,6 +49,10 @@ lib/collectd/ntpd.so %%PING%%lib/collectd/ping.la %%PING%%lib/collectd/ping.so +lib/collectd/powerdns.so +lib/collectd/powerdns.la +lib/collectd/processes.so +lib/collectd/processes.la %%RRD%%lib/collectd/rrdtool.la %%RRD%%lib/collectd/rrdtool.so %%SNMP%%lib/collectd/snmp.la @@ -52,10 +61,20 @@ lib/collectd/swap.so lib/collectd/syslog.la lib/collectd/syslog.so +lib/collectd/tail.so +lib/collectd/tail.la +lib/collectd/tcpconns.so +lib/collectd/tcpconns.la +lib/collectd/teamspeak2.so +lib/collectd/teamspeak2.la lib/collectd/unixsock.la lib/collectd/unixsock.so +lib/collectd/uuid.so +lib/collectd/uuid.la %%XMMS%%lib/collectd/xmms.la %%XMMS%%lib/collectd/xmms.so +share/collectd/postgresql_default.conf @dirrm lib/collectd +@dirrm share/collectd @exec mkdir -p /var/db/collectd @unexec rmdir /var/db/collectd 2>/dev/null || true --- collectd.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200810260158.m9Q1wu6e095512>