Attachment 145382 Details for Bug 192395 – munin-master.patch

[patch] munin-master.patch

munin-master.patch (text/plain), 9.26 KB, created by takefu on 2014-08-05 07:22:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-08-05 07:22:14 UTC

Size: 9.26 KB

patch

obsolete

>diff -ruN /usr/ports/sysutils/munin-master/Makefile ./Makefile
>--- /usr/ports/sysutils/munin-master/Makefile	2014-04-05 20:18:12.000000000 +0900
>+++ ./Makefile	2014-07-29 17:42:26.000000000 +0900
>@@ -19,7 +19,6 @@
> 		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
> 		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
> 		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
>-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
> 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
> 		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
> 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
>@@ -32,7 +31,6 @@
> 		p5-File-Copy-Recursive>=0:${PORTSDIR}/devel/p5-File-Copy-Recursive \
> 		p5-Getopt-Long>=0:${PORTSDIR}/devel/p5-Getopt-Long \
> 		p5-HTML-Template>=0:${PORTSDIR}/www/p5-HTML-Template \
>-		p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6 \
> 		p5-Log-Log4perl>=0:${PORTSDIR}/devel/p5-Log-Log4perl \
> 		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
> 		p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \
>@@ -45,59 +43,53 @@
> 
> PKGMESSAGE=	${WRKDIR}/pkg-message
> 
>-NO_STAGE=	yes
> .include "${.CURDIR}/../munin-common/munin.mk"
> 
> EXTRA_PATCHES=	${MUNIN_PATCHES}
> DISTINFO_FILE=	${MUNIN_DISTINFO}
> ALL_TARGET=	infiles build-master build-man
> INSTALL_TARGET=	install-master-prime
>+MUNIN_CRONMAIL?=	root
> 
>-MAN3=		Munin::Master::Config.3 \
>-		Munin::Master::Group.3 \
>-		Munin::Master::GroupRepository.3 \
>-		Munin::Master::HTMLOld.3 \
>-		Munin::Master::Host.3 \
>-		Munin::Master::LimitsOld.3 \
>-		Munin::Master::Logger.3 \
>-		Munin::Master::Node.3 \
>-		Munin::Master::ProcessManager.3 \
>-		Munin::Master::Update.3 \
>-		Munin::Master::UpdateWorker.3 \
>-		Munin::Master::Utils.3 \
>-		Munin::Master::Worker.3
>-MAN5=		munin.conf.5
>-MAN8=		munin-cron.8 \
>+MAN_8=		munin-cron.8 \
> 		munin-graph.8 \
> 		munin-html.8 \
> 		munin-limits.8 \
> 		munin-update.8
> 
>-PLIST_SUB=	DBDIR=${DBDIR}
>+PLIST_SUB=	DBDIR=${DBDIR} USERS=${USERS}
> SUB_FILES=	pkg-message
> 
> .include <bsd.port.pre.mk>
> 
>+.if ${PORT_OPTIONS:MIPV6}
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-master_extras_munin-update_old.in
>+BUILD_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
>+RUN_DEPENDS+=	p5-IO-Socket-INET6>=0:${PORTSDIR}/net/p5-IO-Socket-INET6
>+.else
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-master_lib_Munin_Master_Node.pm
>+.endif
>+
> pre-install:
> 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
>-		${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
>+		${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL ${MUNIN_CRONMAIL}
> 
> post-install:
>-	@${CHOWN} ${USERS}:${GROUPS} ${DBDIR} ${STATEDIR} ${WWWDIR}
>-	@${CHOWN} ${WWWOWN} ${DBDIR}/cgi-tmp
>+	@${CHOWN} ${USERS}:${GROUPS} ${STAGEDIR}${DBDIR}\
>+		${STAGEDIR}${STATEDIR} ${STAGEDIR}${WWWDIR}
>+	${MKDIR} ${STAGEDIR}${DBDIR}/plugin-state
>+	@${CHOWN} ${WWWOWN} ${STAGEDIR}${DBDIR}/cgi-tmp
>+	${CHMOD} 0775 ${STAGEDIR}${DBDIR}
>+	${CHMOD} 0775 ${STAGEDIR}${DBDIR}/plugin-state
> 	@${INSTALL_DATA} ${WRKSRC}/build/master/munin.conf \
>-		${PREFIX}/etc/munin/munin.conf.sample
>-	@(cd ${WRKSRC}/master/blib/libdoc && for man in ${MAN3}; do \
>-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man3; \
>-	done)
>-	@(cd ${WRKSRC}/build/doc && for man in ${MAN5}; do \
>-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man5; \
>-	done)
>-	@(cd ${WRKSRC}/build/doc && for man in ${MAN8}; do \
>-		${INSTALL_MAN} -C $$man ${PREFIX}/man/man8; \
>+		${STAGEDIR}${PREFIX}/etc/munin/munin.conf.sample
>+	@${INSTALL_MAN} -C ${WRKSRC}/build/doc/munin.conf.5\
>+		${STAGEDIR}${PREFIX}/man/man5/munin.conf.5.gz
>+	@(cd ${WRKSRC}/build/doc && for man in ${MAN_8}; do \
>+		${INSTALL_MAN} -C $$man ${STAGEDIR}${PREFIX}/man/man8; \
> 	done)
> 	@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX=${PREFIX} \
>-		${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
>+		${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL ${MUNIN_CRONMAIL}
> 	@${CAT} ${PKGMESSAGE}
> 
> .include <bsd.port.post.mk>
>diff -ruN /usr/ports/sysutils/munin-master/files/extra-patch-master_extras_munin-update_old.in ./files/extra-patch-master_extras_munin-update_old.in
>--- /usr/ports/sysutils/munin-master/files/extra-patch-master_extras_munin-update_old.in	1970-01-01 09:00:00.000000000 +0900
>+++ ./files/extra-patch-master_extras_munin-update_old.in	2014-02-25 09:30:40.000000000 +0900
>@@ -0,0 +1,26 @@
>+--- master/extras/munin-update_old.in.orig	2009-08-07 19:38:02.000000000 +0900
>++++ master/extras/munin-update_old.in	2011-05-17 18:27:49.000000000 +0900
>+@@ -28,7 +28,7 @@
>+ use Carp;
>+ use English qw(-no_match_vars);
>+ use Getopt::Long;
>+-use IO::Socket;
>++use IO::Socket::INET6;
>+ use Munin::Common::Defaults;
>+ use Munin::Common::Timeout;
>+ use Munin::Common::TLSClient;
>+@@ -504,12 +504,12 @@
>+   
>+   if (munin_get ($newconf, "local_address"))
>+   {
>+-      $socket = new IO::Socket::INET ('PeerAddr' => "$newconf->{address}:".
>++      $socket = new IO::Socket::INET6 ('PeerAddr' => "$newconf->{address}:".
>+ 	          munin_get ($newconf, "port", "4949"), 
>+ 		  'LocalAddr' => munin_get ($newconf, "local_address", undef),
>+ 		  'Proto'    => "tcp", "Timeout" => munin_get($newconf, "timeout", 60));
>+   } else {
>+-      $socket = new IO::Socket::INET ('PeerAddr' => "$newconf->{address}:".
>++      $socket = new IO::Socket::INET6 ('PeerAddr' => "$newconf->{address}:".
>+ 	          munin_get ($newconf, "port", "4949"), 
>+ 		  'Proto'    => "tcp", "Timeout" => munin_get($newconf, "timeout", 60));
>+   }
>diff -ruN /usr/ports/sysutils/munin-master/files/extra-patch-master_lib_Munin_Master_Node.pm ./files/extra-patch-master_lib_Munin_Master_Node.pm
>--- /usr/ports/sysutils/munin-master/files/extra-patch-master_lib_Munin_Master_Node.pm	1970-01-01 09:00:00.000000000 +0900
>+++ ./files/extra-patch-master_lib_Munin_Master_Node.pm	2014-03-21 10:10:49.000000000 +0900
>@@ -0,0 +1,20 @@
>+--- master/lib/Munin/Master/Node.pm.orig	2013-12-07 19:55:16.000000000 +0900
>++++ master/lib/Munin/Master/Node.pm	2013-12-31 15:31:51.000000000 +0900
>+@@ -15,7 +15,7 @@
>+ use Data::Dumper;
>+ use Log::Log4perl qw( :easy );
>+ use Time::HiRes qw( gettimeofday tv_interval );
>+-use IO::Socket::INET6;
>++use IO::Socket::INET;
>+ 
>+ my $config = Munin::Master::Config->instance()->{config};
>+ 
>+@@ -81,7 +81,7 @@
>+     LOGCROAK("[FATAL] '$url' is not a valid address!") unless $uri->scheme;
>+ 
>+     if ($uri->scheme eq "munin") {
>+-        $self->{reader} = $self->{writer} = IO::Socket::INET6->new(
>++        $self->{reader} = $self->{writer} = IO::Socket::INET->new(
>+ 		PeerAddr  => $uri->host,
>+ 		PeerPort  => $self->{port} || 4949,
>+ 		LocalAddr => $config->{local_address},
>diff -ruN /usr/ports/sysutils/munin-master/pkg-install ./pkg-install
>--- /usr/ports/sysutils/munin-master/pkg-install	2014-01-23 00:52:06.000000000 +0900
>+++ ./pkg-install	2014-03-21 10:10:49.000000000 +0900
>@@ -1,4 +1,5 @@
> #! /bin/sh
>+MUNIN_CRONMAIL=${3:-root}
> 
> ask() {
>     local question default answer
>@@ -77,7 +78,7 @@
> 		newsyslog
> 		create_crontab_entries '#BEGIN_MUNIN_MAIN' '#END_MUNIN_MAIN' <<EOT
> #BEGIN_MUNIN_MAIN
>-MAILTO=root
>+MAILTO=${MUNIN_CRONMAIL}
> 
> */5 * * * *     ${PKG_PREFIX}/bin/munin-cron
> #END_MUNIN_MAIN
>diff -ruN /usr/ports/sysutils/munin-master/pkg-plist ./pkg-plist
>--- /usr/ports/sysutils/munin-master/pkg-plist	2013-04-27 08:10:10.000000000 +0900
>+++ ./pkg-plist	2014-07-29 17:58:16.000000000 +0900
>@@ -1,8 +1,6 @@
> bin/munin-check
> bin/munin-cron
>-@unexec if cmp -s %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; then rm -f %D/%%ETCDIR%%/munin.conf ; fi
>-%%ETCDIR%%/munin.conf.sample
>-@exec if [ ! -f %D/%%ETCDIR%%/munin.conf ] ; then cp -p %D/%%ETCDIR%%/munin.conf.sample %D/%%ETCDIR%%/munin.conf ; fi
>+@sample %%ETCDIR%%/munin.conf.sample
> %%ETCDIR%%/static/definitions.html
> %%ETCDIR%%/static/dynazoom.html
> %%ETCDIR%%/static/favicon.ico
>@@ -35,6 +33,25 @@
> %%ETCDIR%%/templates/partial/logo_path.tmpl
> %%ETCDIR%%/templates/partial/navigation.tmpl
> %%ETCDIR%%/templates/partial/path.tmpl
>+man/man3/Munin::Master::Config.3.gz
>+man/man3/Munin::Master::Group.3.gz
>+man/man3/Munin::Master::GroupRepository.3.gz
>+man/man3/Munin::Master::HTMLOld.3.gz
>+man/man3/Munin::Master::Host.3.gz
>+man/man3/Munin::Master::LimitsOld.3.gz
>+man/man3/Munin::Master::Logger.3.gz
>+man/man3/Munin::Master::Node.3.gz
>+man/man3/Munin::Master::ProcessManager.3.gz
>+man/man3/Munin::Master::Update.3.gz
>+man/man3/Munin::Master::UpdateWorker.3.gz
>+man/man3/Munin::Master::Utils.3.gz
>+man/man3/Munin::Master::Worker.3.gz
>+man/man5/munin.conf.5.gz
>+man/man8/munin-cron.8.gz
>+man/man8/munin-graph.8.gz
>+man/man8/munin-html.8.gz
>+man/man8/munin-limits.8.gz
>+man/man8/munin-update.8.gz
> %%SITE_PERL%%/Munin/Master/Config.pm
> %%SITE_PERL%%/Munin/Master/GraphOld.pm
> %%SITE_PERL%%/Munin/Master/Group.pm
>@@ -58,19 +75,25 @@
> %%DATADIR%%/munin-limits
> %%DATADIR%%/munin-storable2datafile
> %%DATADIR%%/munin-update
>+@dirrmtry %%DATADIR%%
>+@owner %%USERS%%
> %%WWWDIR%%/.htaccess
> www/cgi-bin/munin-cgi-graph
> www/cgi-bin/munin-cgi-html
>-@dirrmtry www/cgi-bin
> @dirrmtry %%WWWDIR%%
>-@dirrmtry %%DATADIR%%
>+@owner
>+@dirrmtry www/cgi-bin
> @dirrm %%SITE_PERL%%/Munin/Master
>-@dirrmtry %%SITE_PERL%%/Munin
> @dirrmtry %%ETCDIR%%/static
> @dirrmtry %%ETCDIR%%/templates/partial
> @dirrmtry %%ETCDIR%%/templates
> @exec mkdir -p %D/%%ETCDIR%%/munin-conf.d
> @dirrmtry %%ETCDIR%%/munin-conf.d
> @dirrmtry %%ETCDIR%%
>-@cwd /var
>-@dirrmtry munin/cgi-tmp
>+@dirrmtry %%DBDIR%%/cgi-tmp
>+@group %%GROUPS%%
>+@mode a+rx,ug+w
>+@exec mkdir -p %%DBDIR%%/plugin-state
>+@dirrmtry %%DBDIR%%/plugin-state
>+@group
>+@mode

Actions: View | Diff

Attachments on bug 192395: 145380 | 145382 | 145383