ports/126432: [PATCH] sysutils/munin-node: update to 1.2.6
Gea-Suan Lin
gslin at gslin.org
Sun Aug 10 18:20:06 UTC 2008
>Number: 126432
>Category: ports
>Synopsis: [PATCH] sysutils/munin-node: update to 1.2.6
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun Aug 10 18:20:05 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Gea-Suan Lin
>Release: FreeBSD 7.0-STABLE amd64
>Organization:
>Environment:
System: FreeBSD host-1.pixnet.tw 7.0-STABLE FreeBSD 7.0-STABLE #1: Wed Jul 16 13:00:27 CST 2008
>Description:
- Update to 1.2.6
- Use fixed GID (494).
- Reduce portlint's errors and warnings.
Removed file(s):
- files/patch-hddtemp_smartctl.in
- files/patch-if_.in
Port maintainer (des at FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- munin-node-1.2.6.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node/Makefile /usr/home/admin/gslin/work/ports/munin-node/Makefile
--- /usr/ports/sysutils/munin-node/Makefile 2008-02-21 01:17:08.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-node/Makefile 2008-08-11 02:08:52.000000000 +0800
@@ -6,8 +6,7 @@
#
PORTNAME= munin
-PORTVERSION= 1.2.5
-PORTREVISION= 3
+PORTVERSION= 1.2.6
CATEGORIES= sysutils perl5
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= munin
@@ -17,11 +16,11 @@
MAINTAINER= des at FreeBSD.org
COMMENT= Node-specific part of Munin
-USE_PERL5= yes
-
RUN_DEPENDS= ${SITE_PERL}/Net/Server/Fork.pm:${PORTSDIR}/net/p5-Net-Server
BUILD_DEPENDS= ${RUN_DEPENDS}
+USE_PERL5= yes
+
.include <bsd.port.pre.mk>
.if ${PERL_LEVEL} < 500800
@@ -32,7 +31,7 @@
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.r/rc/}
PKGMESSAGE= ${WRKDIR}/pkg-message
ALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} build build-man
-INSTALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=$(SITE_PERL_REL) install-node install-node-plugins
+INSTALL_TARGET= DATADIR=${DATADIR} PERL=${PERL} SITE_PERL_REL=${SITE_PERL_REL} install-node install-node-plugins
MAKE_ENV= LANG=C
MAN5= munin-node.conf.5
@@ -40,7 +39,7 @@
SUB_FILES= pkg-message munin-node.sh munin-node-revive.sh
SUB_LIST= RC_SUBR=${RC_SUBR}
-USE_RC_SUBR= YES
+USE_RC_SUBR= munin-node.sh
pre-install:
@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node/distinfo /usr/home/admin/gslin/work/ports/munin-node/distinfo
--- /usr/ports/sysutils/munin-node/distinfo 2006-11-07 06:50:50.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-node/distinfo 2008-08-11 02:02:26.000000000 +0800
@@ -1,3 +1,3 @@
-MD5 (munin_1.2.5.tar.gz) = e863d11693c02bde1c593a6c701e64fd
-SHA256 (munin_1.2.5.tar.gz) = 2d1ea4aa3f0eaf11a5beb0b90f9bbee63e184249e06274fcc9d4c17b70b47a5e
-SIZE (munin_1.2.5.tar.gz) = 353005
+MD5 (munin_1.2.6.tar.gz) = 45f84d58f80642ce914f147232f0d396
+SHA256 (munin_1.2.6.tar.gz) = 3b04d72810317a91225c78652277079ec3cc5791ef8991326da219a05d2477d8
+SIZE (munin_1.2.6.tar.gz) = 360694
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node/files/patch-Makefile.config /usr/home/admin/gslin/work/ports/munin-node/files/patch-Makefile.config
--- /usr/ports/sysutils/munin-node/files/patch-Makefile.config 2007-10-22 20:32:25.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-node/files/patch-Makefile.config 2008-08-11 02:02:54.000000000 +0800
@@ -1,6 +1,6 @@
---- Makefile.config.orig 2005-01-10 11:38:32.000000000 +0100
-+++ Makefile.config 2005-02-03 11:55:51.000000000 +0100
-@@ -7,52 +7,56 @@
+--- Makefile.config.orig 2008-08-11 01:52:03.000000000 +0800
++++ Makefile.config 2008-08-11 01:56:15.000000000 +0800
+@@ -7,46 +7,50 @@
#
# the base of the Munin installation.
#
@@ -51,7 +51,7 @@
# Where Munin should place its logs.
-LOGDIR = $(DESTDIR)/var/log/munin
-+LOGDIR = /var/log
++LOGDIR = /var/log/munin-main
# Location of PID files and other statefiles. On the server, must be
# writable by the user "munin".
@@ -64,14 +64,16 @@
# The python interpreter to use (used by some plugins)
PYTHON = /usr/bin/env python
+@@ -65,7 +69,7 @@
+ BASH = /bin/bash
# Server only - Where to install the perl libraries
--PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d= -f2 | sed "s/[\';]//g")
+-PERLLIB = $(DESTDIR)$(shell $(PERL) -V:sitelib | cut -d"'" -f2)
+PERLLIB = $(PREFIX)/$(SITE_PERL_REL)
# Client only - Install plugins for this architecture
OSTYPE = $(shell uname | tr '[A-Z]' '[a-z]')
-@@ -72,9 +76,8 @@
+@@ -90,9 +94,8 @@
PLUGINUSER = nobody
# Which command to use to check if the USER and GROUP to run Munin as, exists.
@@ -81,5 +83,5 @@
+CHECKUSER:= $(shell /usr/sbin/pw user show $(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
+CHECKGROUP:= $(shell /usr/sbin/pw group show $(GROUP) >/dev/null 2>/dev/null || (echo "echo Group $(GROUP) nonexistant. Create the group and retry; exit 2"))
- CHOWN = chown
- CHMOD = chmod
+ # For OSX, comment out the previous two lines and comment in these
+ #CHECKUSER = $(shell nicl . -read /users/$(USER) >/dev/null 2>/dev/null || (echo "echo User $(USER) nonexistant. Create the user and retry; exit 2"))
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node/files/patch-hddtemp_smartctl.in /usr/home/admin/gslin/work/ports/munin-node/files/patch-hddtemp_smartctl.in
--- /usr/ports/sysutils/munin-node/files/patch-hddtemp_smartctl.in 2007-10-22 20:32:25.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-node/files/patch-hddtemp_smartctl.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,13 +0,0 @@
---- node/node.d/hddtemp_smartctl.in.orig 2006-10-17 14:27:35.000000000 +0200
-+++ node/node.d/hddtemp_smartctl.in 2007-10-04 09:29:43.931425624 +0200
-@@ -109,6 +109,10 @@
- @drives = grep /hd[a-z]/, readdir IDE;
- closedir(IDE);
- }
-+} elsif ($^O eq 'freebsd') {
-+ opendir(DEV, '/dev');
-+ @drives = grep /^ad[0-9]+$/, readdir DEV;
-+ closedir(DEV);
- } elsif ($^O eq 'solaris') {
- @drives = map { s at .*/@@ ; $_ } glob '/dev/rdsk/c*t*d*s2';
- }
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node/files/patch-if_.in /usr/home/admin/gslin/work/ports/munin-node/files/patch-if_.in
--- /usr/ports/sysutils/munin-node/files/patch-if_.in 2008-02-07 05:34:23.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-node/files/patch-if_.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,22 +0,0 @@
---- node/node.d.freebsd/if_.in.orig 2006-10-17 14:27:35.000000000 +0200
-+++ node/node.d.freebsd/if_.in 2007-10-26 10:52:46.000000000 +0200
-@@ -63,7 +63,7 @@
-
- if [ "$1" = "suggest" ]; then
- if [ -x /usr/bin/netstat ]; then
-- netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p'
-+ netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
- exit 0
- else
- exit 1
---- node/node.d.freebsd/if_errcoll_.in.orig 2006-10-17 14:27:35.000000000 +0200
-+++ node/node.d.freebsd/if_errcoll_.in 2007-10-26 10:53:08.000000000 +0200
-@@ -57,7 +57,7 @@
-
- if [ "$1" = "suggest" ]; then
- if [ -x /usr/bin/netstat ]; then
-- netstat -i -b | sed -n -e '/^faith/d' -e '/^lo0/d' -e '/<Link#[0-9]*>/s/\** .*//p'
-+ netstat -i -b | sed -n -e '/^faith/d' -e '/^lo[0-9]/d' -e '/^pflog/d' -e '/<Link#[0-9]*>/s/\** .*//p'
- exit 0
- else
- exit 1
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node/files/patch-munin-node.conf.in /usr/home/admin/gslin/work/ports/munin-node/files/patch-munin-node.conf.in
--- /usr/ports/sysutils/munin-node/files/patch-munin-node.conf.in 2007-10-22 20:32:25.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-node/files/patch-munin-node.conf.in 2008-08-11 02:07:44.000000000 +0800
@@ -1,8 +1,8 @@
---- node/munin-node.conf.in.orig Thu Jan 15 15:28:57 2004
-+++ node/munin-node.conf.in Sun Jan 25 14:26:15 2004
-@@ -12,7 +12,7 @@
- # Which port to bind to;
- host *
+--- node/munin-node.conf.in.orig 2008-08-11 02:05:33.000000000 +0800
++++ node/munin-node.conf.in 2008-08-11 02:05:41.000000000 +0800
+@@ -10,7 +10,7 @@
+ setseid 1
+
user root
-group root
+group wheel
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node/pkg-install /usr/home/admin/gslin/work/ports/munin-node/pkg-install
--- /usr/ports/sysutils/munin-node/pkg-install 2006-11-07 06:50:50.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-node/pkg-install 2008-08-11 02:02:15.000000000 +0800
@@ -33,13 +33,14 @@
local g
g=$1
+ gid=494
if pw group show "${g}" >/dev/null 2>&1; then
echo "You already have a group \"${g}\", so I will use it."
else
echo "You need a group \"${g}\"."
if which -s pw && yesno "Would you like me to create it" y; then
- pw groupadd ${g} || exit
+ pw groupadd ${g} -g ${gid} || exit
echo "Done."
else
echo "Please create it, and try again."
diff -ruN --exclude=CVS /usr/ports/sysutils/munin-node/pkg-plist /usr/home/admin/gslin/work/ports/munin-node/pkg-plist
--- /usr/ports/sysutils/munin-node/pkg-plist 2008-02-21 01:17:08.000000000 +0800
+++ /usr/home/admin/gslin/work/ports/munin-node/pkg-plist 2008-08-11 02:11:53.000000000 +0800
@@ -6,12 +6,32 @@
@unexec if cmp -s %D/etc/munin/munin-node.conf %D/etc/munin/munin-node.conf.sample; then rm -f %D/etc/munin/munin-node.conf; fi
etc/munin/munin-node.conf.sample
@unexec if cmp -s %D/etc/munin/plugin-conf.d/plugins.conf %D/etc/munin/plugin-conf.d/plugins.conf.sample; then rm -f %D/etc/munin/plugin-conf.d/plugins.conf; fi
+bin/munindoc
+etc/munin/VERSION.node
etc/munin/plugin-conf.d/plugins.conf.sample
+etc/munin/plugins/cpu
+etc/munin/plugins/df
+etc/munin/plugins/df_inode
+etc/munin/plugins/if_em0
+etc/munin/plugins/if_em1
+etc/munin/plugins/if_errcoll_em0
+etc/munin/plugins/if_errcoll_em1
+etc/munin/plugins/load
+etc/munin/plugins/memory
+etc/munin/plugins/open_files
+etc/munin/plugins/processes
+etc/munin/plugins/sendmail_mailqueue
+etc/munin/plugins/sendmail_mailstats
+etc/munin/plugins/sendmail_mailtraffic
+etc/munin/plugins/swap
+etc/munin/plugins/vmstat
etc/rc.d/munin-node.sh
sbin/munin-node
sbin/munin-node-configure
sbin/munin-node-configure-snmp
sbin/munin-run
+share/munin/plugins/ntp_offset
+share/munin/plugins/plugin.sh
%%DATADIR%%/plugins/acpi
%%DATADIR%%/plugins/amavis
%%DATADIR%%/plugins/apache_accesses
@@ -106,6 +126,7 @@
%%DATADIR%%/plugins/swap
%%DATADIR%%/plugins/sybase_space
%%DATADIR%%/plugins/vmstat
+%%SITE_PERL%%/Munin/Plugin.pm
@unexec rm -f /var/run/munin/munin-node.pid
@unexec rmdir /var/run/munin 2>/dev/null || true
@dirrmtry var/munin/plugin-state
--- munin-node-1.2.6.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list