Attachment 149414 Details for Bug 195015 – patch

[patch] patch

pnp-0.6.24.diff (text/plain), 10.68 KB, created by Lars Engels on 2014-11-14 18:37:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lars Engels

Created: 2014-11-14 18:37:54 UTC

Size: 10.68 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 372564)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	pnp
>-PORTVERSION=	0.6.21
>+PORTVERSION=	0.6.24
> CATEGORIES=	net-mgmt
> MASTER_SITES=	SF
> MASTER_SITE_SUBDIR=pnp4nagios/PNP-0.6
>@@ -41,7 +41,6 @@
> PNP_SPOOL=	${PNP_STATE}/perfspool
> PNP_URL?=	${NAGIOSHTMURL}/pnp
> FPDF_DIR?=	share/fpdf
>-SPOOL_DIRS=	${PNP_STATE}:${NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_RRDS}:${NAGIOSUSER}:${NAGIOSGROUP}:0750%${PNP_SPOOL}:${NAGIOSUSER}:${NAGIOSGROUP}:0750
> 
> .if ! ${PORT_OPTIONS:MPDF}
> EXTRA_PATCHES+=	${FILESDIR}/extra-patch-disable-pdf
>@@ -64,16 +63,15 @@
> MAKE_ARGS=	INSTALL_OPTS=
> INSTALL_TARGET=	install install-config
> 
>-PLIST_SUB+=	NAGIOSDIR=${NAGIOSDIR}
>-SUB_FILES=	pkg-install \
>-		pkg-deinstall \
>-		pkg-message
>-SUB_LIST=	SPOOL_DIRS=${SPOOL_DIRS} \
>-		PNP_RRDS=${PNP_RRDS} \
>-		PNP_URL=${PNP_URL} \
>+PLIST_SUB+=	NAGIOSDIR=${NAGIOSDIR} \
> 		NAGIOSUSER=${NAGIOSUSER} \
> 		NAGIOSGROUP=${NAGIOSGROUP}
> 
>+SUB_FILES=	pkg-message
>+SUB_LIST=	PNP_RRDS=${PNP_RRDS} \
>+		PNP_URL=${PNP_URL} \
>+		NAGIOSGROUP=${NAGIOSGROUP}
>+
> .if ${PORT_OPTIONS:MPDF}
> PNP_USE_FPDF=	1
> .else
>@@ -90,6 +88,10 @@
> 	@${LN} -fs ../en_US/dwnld.html ${WRKSRC}/share/pnp/documents/de_DE/dwnld.html
> 
> post-install:
>+	@${MKDIR} ${STAGEDIR}${NAGIOSDIR}
>+	@${MKDIR} ${STAGEDIR}${NAGIOSDIR}/pnp
>+	@${MKDIR} ${STAGEDIR}${NAGIOSDIR}/pnp/rrd
>+	@${MKDIR} ${STAGEDIR}${NAGIOSDIR}/pnp/perfspool
> 	${INSTALL_MAN} ${WRKSRC}/man/npcd.8 ${STAGEDIR}${MAN8PREFIX}/man/man8
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 372564)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (pnp4nagios-0.6.21.tar.gz) = bb5d36a7cc49dcbcfcb424d437dc3739baa647816cffc610fb621216c4f5992a
>-SIZE (pnp4nagios-0.6.21.tar.gz) = 2917588
>+SHA256 (pnp4nagios-0.6.24.tar.gz) = 87412ef01257c6096aa5c84fdb47db950b851c596e1306180be8ba45401793cf
>+SIZE (pnp4nagios-0.6.24.tar.gz) = 2919182
>Index: files/patch-sample-config__Makefile.in
>===================================================================
>--- files/patch-sample-config__Makefile.in	(revision 372564)
>+++ files/patch-sample-config__Makefile.in	(working copy)
>@@ -1,6 +1,6 @@
>---- ./sample-config/Makefile.in.orig	2013-03-24 17:25:56.000000000 +0100
>-+++ ./sample-config/Makefile.in	2014-05-02 09:00:07.000000000 +0200
>-@@ -40,35 +40,18 @@
>+--- sample-config/Makefile.in.orig	2014-07-30 12:32:23.000000000 +0200
>++++ sample-config/Makefile.in	2014-09-30 21:11:55.006201973 +0200
>+@@ -40,42 +40,25 @@
>  	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/check_commands
>  	$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(SYSCONFDIR)/pages
>  	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/pnp4nagios_release $(DESTDIR)$(SYSCONFDIR)
>@@ -7,8 +7,8 @@
> -	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)
> -	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php.$(PKG_VERSION); \
> -	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR); \
>-+	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf-sample
>-+	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/background.pdf $(DESTDIR)$(SYSCONFDIR)/background.pdf.sample
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config.php.sample
>  
>  install-config: 
>  
>@@ -35,9 +35,23 @@
> -		$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg; \
> -	fi
>  		
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  misccommands.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  nagios.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/check_commands/check_nrpe.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/check_commands/check_all_local_disks.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands
>+-	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(SYSCONFDIR)/pages
> +	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/config.php $(DESTDIR)$(SYSCONFDIR)/config_local.php.sample
> +	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/process_perfdata.cfg-sample $(DESTDIR)$(SYSCONFDIR)/process_perfdata.cfg.sample
> +	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/npcd.cfg-sample $(DESTDIR)$(SYSCONFDIR)/npcd.cfg.sample
>- 	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>- 	$(INSTALL) -m 644 $(INSTALL_OPTS)  misccommands.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>- 	$(INSTALL) -m 644 $(INSTALL_OPTS)  nagios.cfg-sample $(DESTDIR)$(SYSCONFDIR)
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/rra.cfg-sample $(DESTDIR)$(SYSCONFDIR)/rra.cfg.sample
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  misccommands.cfg-sample $(DESTDIR)$(SYSCONFDIR)/misccommands.cfg.sample
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  nagios.cfg-sample $(DESTDIR)$(SYSCONFDIR)/nagios.cfg.sample
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/check_commands/check_nwstat.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands/check_nwstat.cfg.sample
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/check_commands/check_nrpe.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands/check_nrpe.cfg.sample
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/check_commands/check_all_local_disks.cfg-sample $(DESTDIR)$(SYSCONFDIR)/check_commands/check_all_local_disks.cfg.sample
>++	$(INSTALL) -m 644 $(INSTALL_OPTS)  pnp/pages/web_traffic.cfg-sample $(DESTDIR)$(SYSCONFDIR)/pages/web_traffic.cfg.sample
>+ 
>+ install-webconf: 
>+ 
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 372564)
>+++ pkg-plist	(working copy)
>@@ -1,17 +1,17 @@
> bin/npcd
>-%%ETCDIR%%/background.pdf-sample
>-%%ETCDIR%%/check_commands/check_all_local_disks.cfg-sample
>-%%ETCDIR%%/check_commands/check_nrpe.cfg-sample
>-%%ETCDIR%%/check_commands/check_nwstat.cfg-sample
>-%%ETCDIR%%/config.php
>+%%ETCDIR%%/pnp4nagios_release
>+@sample %%ETCDIR%%/background.pdf.sample
>+@sample %%ETCDIR%%/check_commands/check_all_local_disks.cfg.sample
>+@sample %%ETCDIR%%/check_commands/check_nrpe.cfg.sample
>+@sample %%ETCDIR%%/check_commands/check_nwstat.cfg.sample
>+@sample %%ETCDIR%%/config.php.sample
> @sample %%ETCDIR%%/config_local.php.sample
>-%%ETCDIR%%/misccommands.cfg-sample
>-%%ETCDIR%%/nagios.cfg-sample
>+@sample %%ETCDIR%%/misccommands.cfg.sample
>+@sample %%ETCDIR%%/nagios.cfg.sample
> @sample %%ETCDIR%%/npcd.cfg.sample
>-%%ETCDIR%%/pages/web_traffic.cfg-sample
>-%%ETCDIR%%/pnp4nagios_release
>+@sample %%ETCDIR%%/pages/web_traffic.cfg.sample
> @sample %%ETCDIR%%/process_perfdata.cfg.sample
>-%%ETCDIR%%/rra.cfg-sample
>+@sample %%ETCDIR%%/rra.cfg.sample
> lib/kohana/system/config/cache.php
> lib/kohana/system/config/cache_memcache.php
> lib/kohana/system/config/cache_sqlite.php
>@@ -346,6 +346,7 @@
> %%WWWDIR%%/application/views/graph.php
> %%WWWDIR%%/application/views/graph_content.php
> %%WWWDIR%%/application/views/graph_content_special.php
>+%%WWWDIR%%/application/views/graph_tiny.php
> %%WWWDIR%%/application/views/header.php
> %%WWWDIR%%/application/views/host_box.php
> %%WWWDIR%%/application/views/icon_box.php
>@@ -655,81 +656,13 @@
> %%WWWDIR%%/templates.special/advanced_loop.php-sample
> %%WWWDIR%%/templates.special/loop.php-sample
> %%WWWDIR%%/templates.special/static.php-sample
>-@dirrmtry %%ETCDIR%%/check_commands
>-@dirrmtry %%ETCDIR%%/config.d
>-@dirrmtry %%ETCDIR%%/pages
>-@dirrmtry %%ETCDIR%%
>-@dirrm lib/kohana/system/config
>-@dirrm lib/kohana/system/controllers
>-@dirrm lib/kohana/system/core/utf8
>-@dirrm lib/kohana/system/core
>-@dirrm lib/kohana/system/fonts
>-@dirrm lib/kohana/system/helpers
>-@dirrm lib/kohana/system/i18n/de_DE
>-@dirrm lib/kohana/system/i18n/en_US
>-@dirrm lib/kohana/system/i18n/es_ES
>-@dirrm lib/kohana/system/i18n/fr_FR
>-@dirrm lib/kohana/system/i18n/it_IT
>-@dirrm lib/kohana/system/i18n/nl_NL
>-@dirrm lib/kohana/system/i18n/ru_RU
>-@dirrm lib/kohana/system/i18n
>-@dirrm lib/kohana/system/libraries/drivers/Cache
>-@dirrm lib/kohana/system/libraries/drivers/Captcha
>-@dirrm lib/kohana/system/libraries/drivers/Database
>-@dirrm lib/kohana/system/libraries/drivers/Image
>-@dirrm lib/kohana/system/libraries/drivers/Session
>-@dirrm lib/kohana/system/libraries/drivers
>-@dirrm lib/kohana/system/libraries
>-@dirrm lib/kohana/system/views/kohana
>-@dirrm lib/kohana/system/views/pagination
>-@dirrm lib/kohana/system/views
>-@dirrm lib/kohana/system
>-@dirrm lib/kohana
>-@dirrm %%WWWDIR%%/application/cache
>-@dirrm %%WWWDIR%%/application/config
>-@dirrm %%WWWDIR%%/application/controllers
>-@dirrm %%WWWDIR%%/application/helpers
>-@dirrm %%WWWDIR%%/application/hooks
>-@dirrm %%WWWDIR%%/application/i18n/de_DE
>-@dirrm %%WWWDIR%%/application/i18n/en_US
>-@dirrm %%WWWDIR%%/application/i18n/es_ES
>-@dirrm %%WWWDIR%%/application/i18n/fr_FR
>-@dirrm %%WWWDIR%%/application/i18n/ru_RU
>-@dirrm %%WWWDIR%%/application/i18n
>-@dirrm %%WWWDIR%%/application/lib
>-@dirrm %%WWWDIR%%/application/models
>-@dirrm %%WWWDIR%%/application/vendor/fpdf/filters
>-@dirrm %%WWWDIR%%/application/vendor/fpdf/font
>-@dirrm %%WWWDIR%%/application/vendor/fpdf
>-@dirrm %%WWWDIR%%/application/vendor
>-@dirrm %%WWWDIR%%/application/views
>-@dirrm %%WWWDIR%%/application
>-@dirrm %%WWWDIR%%/documents/_media
>-@dirrm %%WWWDIR%%/documents/de_DE
>-@dirrm %%WWWDIR%%/documents/en_US
>-@dirrm %%WWWDIR%%/documents/images/smileys
>-@dirrm %%WWWDIR%%/documents/images
>-@dirrm %%WWWDIR%%/documents
>-@dirrm %%WWWDIR%%/media/css/images
>-@dirrm %%WWWDIR%%/media/css/ui-lightness/images
>-@dirrm %%WWWDIR%%/media/css/ui-lightness
>-@dirrm %%WWWDIR%%/media/css/ui-multisite/images
>-@dirrm %%WWWDIR%%/media/css/ui-multisite
>-@dirrm %%WWWDIR%%/media/css/ui-redmond/images
>-@dirrm %%WWWDIR%%/media/css/ui-redmond
>-@dirrm %%WWWDIR%%/media/css/ui-smoothness/images
>-@dirrm %%WWWDIR%%/media/css/ui-smoothness
>-@dirrm %%WWWDIR%%/media/css
>-@dirrm %%WWWDIR%%/media/images
>-@dirrm %%WWWDIR%%/media/js
>-@dirrm %%WWWDIR%%/media
>-@dirrmtry %%WWWDIR%%/templates
>-@dirrm %%WWWDIR%%/templates.dist
>-@dirrmtry %%WWWDIR%%/templates.special
>-@dirrmtry %%WWWDIR%%
>-@unexec rmdir "/var/log/kohana" >/dev/null 2>&1 || :
>-@unexec rmdir "/var/log/stats" >/dev/null 2>&1 || :
>-@unexec rmdir "%%NAGIOSDIR%%/pnp/perfspool" >/dev/null 2>&1 || :
>-@unexec rmdir "%%NAGIOSDIR%%/pnp/rrd" >/dev/null 2>&1 || :
>-@unexec rmdir "%%NAGIOSDIR%%/pnp" >/dev/null 2>&1 || :
>-@unexec rmdir "%%NAGIOSDIR%%" >/dev/null 2>&1 || :
>+@dir %%ETCDIR%%/config.d
>+@dir %%WWWDIR%%/application/cache
>+@dir %%WWWDIR%%/application/hooks
>+@dir %%WWWDIR%%/templates
>+@dir /var/log/kohana
>+@dir /var/log/stats
>+@dir %%NAGIOSDIR%%/pnp/perfspool
>+@dir %%NAGIOSDIR%%/pnp/rrd
>+@dir %%NAGIOSDIR%%/pnp
>+@dir %%NAGIOSDIR%%

Actions: View | Diff

Attachments on bug 195015: 149414 | 150309