Index: Makefile
===================================================================
RCS file: /cvs/ports/www/pnp4nagios/Makefile,v
diff -u -p -u -p -r1.18 Makefile
--- Makefile 27 Sep 2023 19:13:05 -0000 1.18
+++ Makefile 29 May 2024 18:45:33 -0000
@@ -1,17 +1,13 @@
COMMENT-main = Nagios/Icinga addon which graphs performance data
COMMENT-cgi = pnp4nagios CGI scripts
-V = 0.6.26
-DISTNAME = pnp4nagios-${V}
-MODPHP_VERSION = 7.4
-PKGNAME-main = ${DISTNAME}
+V = 0.6.27
+PKGNAME-main = pnp4nagios-${V}
PKGNAME-cgi = pnp4nagios-cgi-${V}
-REVISION-main = 3
-REVISION-cgi = 3
-CATEGORIES = www
+DIST_TUPLE = github pnp4nagios pnp4nagios v${V} .
-HOMEPAGE = https://docs.pnp4nagios.org/
+CATEGORIES = www
MAINTAINER = Kirill Bychkov <kirby@openbsd.org>
# GPLv2
@@ -19,8 +15,6 @@ PERMIT_PACKAGE = Yes
WANTLIB-main = c pthread
-SITES = ${SITE_SOURCEFORGE:=pnp4nagios/}
-
MODULES = lang/php
BUILD_DEPENDS = net/rrdtool
RUN_DEPENDS-main = net/rrdtool
@@ -50,12 +44,8 @@ PKG_ARCH-cgi = *
INSTALL_TARGET = install install-config
-SUBST_VARS += VARBASE
+SUBST_VARS += VARBASE V
-# fix broken symlink in tarbal
-post-extract:
- ln -sf ${WRKSRC}/share/pnp/documents/en_US/dwnld.html \
- ${WRKSRC}/share/pnp/documents/de_DE/dwnld.html
post-install:
${INSTALL_DATA_DIR} ${WRKINST}/${VARBASE}/www/conf/modules.sample/
${INSTALL_DATA} ${WRKSRC}/sample-config/httpd.conf \
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/pnp4nagios/distinfo,v
diff -u -p -u -p -r1.2 distinfo
--- distinfo 23 Aug 2017 14:28:31 -0000 1.2
+++ distinfo 29 May 2024 18:45:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (pnp4nagios-0.6.26.tar.gz) = q1mooC0PcN48+JsS/h6SFuSxEnvCnASgNs0G3ecu6Ps=
-SIZE (pnp4nagios-0.6.26.tar.gz) = 3039265
+SHA256 (pnp4nagios-pnp4nagios-v0.6.27.tar.gz) = OSQecVkYxWZhxG16uVq2mu7Azkcyb5eZktELJ78Nf04=
+SIZE (pnp4nagios-pnp4nagios-v0.6.27.tar.gz) = 3046284
Index: patches/patch-sample-config_httpd_conf_in
===================================================================
RCS file: patches/patch-sample-config_httpd_conf_in
diff -N patches/patch-sample-config_httpd_conf_in
--- patches/patch-sample-config_httpd_conf_in 11 Mar 2022 20:10:43 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Use Apache 2.4 syntax
-
---- sample-config/httpd.conf.in.orig Sat Jan 3 16:09:06 2015
-+++ sample-config/httpd.conf.in Mon May 16 13:58:22 2016
-@@ -4,8 +4,7 @@ Alias @BASE_URL@ "@datarootdir@"
-
- <Directory "@datarootdir@">
- AllowOverride None
-- Order allow,deny
-- Allow from all
-+ Require all granted
- #
- # Use the same value as defined in nagios.conf
- #
Index: patches/patch-share_Makefile_in
===================================================================
RCS file: /cvs/ports/www/pnp4nagios/patches/patch-share_Makefile_in,v
diff -u -p -u -p -r1.2 patch-share_Makefile_in
--- patches/patch-share_Makefile_in 11 Mar 2022 20:10:43 -0000 1.2
+++ patches/patch-share_Makefile_in 29 May 2024 18:45:33 -0000
@@ -1,8 +1,9 @@
Do not install templates directory. @sample it from templates.dist instead.
---- share/Makefile.in.orig Mon May 16 17:07:11 2016
-+++ share/Makefile.in Mon May 16 17:07:37 2016
-@@ -166,7 +166,6 @@ install:
+Index: share/Makefile.in
+--- share/Makefile.in.orig
++++ share/Makefile.in
+@@ -163,7 +163,6 @@ install:
for file in pnp/templates.special/*; \
do $(INSTALL) -m 644 $(INSTALL_OPTS) $$file $(DESTDIR)$(DATAROOTDIR)/templates.special; done
Index: patches/patch-share_pnp_index_php_in
===================================================================
RCS file: patches/patch-share_pnp_index_php_in
diff -N patches/patch-share_pnp_index_php_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-share_pnp_index_php_in 29 May 2024 18:45:33 -0000
@@ -0,0 +1,12 @@
+Index: share/pnp/index.php.in
+--- share/pnp/index.php.in.orig
++++ share/pnp/index.php.in
+@@ -130,8 +130,6 @@ $kohana_system = file_exists($kohana_system) ? $kohana
+ define('APPPATH', str_replace('\\', '/', realpath($kohana_application)).'/');
+ define('MODPATH', str_replace('\\', '/', realpath($kohana_modules)).'/');
+ define('SYSPATH', str_replace('\\', '/', realpath($kohana_system)).'/');
+-// JSON Wrapper used for PHP 5.1.x
+-require('application/lib/jsonwrapper.php');
+ // Clean up
+ unset($kohana_application, $kohana_modules, $kohana_system);
+
Index: patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/www/pnp4nagios/patches/patch-src_Makefile_in,v
diff -u -p -u -p -r1.2 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 11 Mar 2022 20:10:43 -0000 1.2
+++ patches/patch-src_Makefile_in 29 May 2024 18:45:33 -0000
@@ -1,11 +1,12 @@
---- src/Makefile.in.orig Fri Feb 5 17:22:57 2016
-+++ src/Makefile.in Fri Feb 5 17:23:26 2016
+Index: src/Makefile.in
+--- src/Makefile.in.orig
++++ src/Makefile.in
@@ -128,7 +128,7 @@ install-basic:
$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBDIR)
$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
$(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_DIR)
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR)
+# $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(PERFDATA_SPOOL_DIR)
- $(INSTALL) -m 754 $(INSTALL_OPTS) @npcd_name@ $(DESTDIR)$(BINDIR)
+ $(INSTALL) -m 754 @npcd_name@ $(DESTDIR)$(BINDIR)
$(INSTALL) -m 754 $(INSTALL_OPTS) npcdmod.o $(DESTDIR)$(LIBDIR)
Index: pkg/PLIST-cgi
===================================================================
RCS file: /cvs/ports/www/pnp4nagios/pkg/PLIST-cgi,v
diff -u -p -u -p -r1.5 PLIST-cgi
--- pkg/PLIST-cgi 11 Mar 2022 20:10:43 -0000 1.5
+++ pkg/PLIST-cgi 29 May 2024 18:45:33 -0000
@@ -1,4 +1,5 @@
@extraunexec rm -rf %D/pnp4nagios/rrd
+conf/modules.sample/
conf/modules.sample/pnp4nagios.conf.dist
@sample conf/modules.sample/pnp4nagios.conf
pnp4nagios/
@@ -49,9 +50,6 @@ pnp4nagios/application/i18n/ru_RU/
pnp4nagios/application/i18n/ru_RU/common.php
pnp4nagios/application/i18n/ru_RU/error.php
pnp4nagios/application/lib/
-pnp4nagios/application/lib/json.php
-pnp4nagios/application/lib/jsonwrapper.php
-pnp4nagios/application/lib/jsonwrapper_inner.php
pnp4nagios/application/models/
pnp4nagios/application/models/auth.php
pnp4nagios/application/models/auth_multisite.php
@@ -363,6 +361,7 @@ pnp4nagios/rrd/
@group
pnp4nagios/templates.dist/
@sample pnp4nagios/templates/
+pnp4nagios/templates.dist/arrayfix.php
pnp4nagios/templates.dist/check-host-alive.php
@sample pnp4nagios/templates/check-host-alive.php
pnp4nagios/templates.dist/check_apachestatus.php
@@ -477,6 +476,7 @@ pnp4nagios/templates.dist/check_smtp.php
@sample pnp4nagios/templates/check_smtp.php
pnp4nagios/templates.dist/check_snmp_int-bits.php
@sample pnp4nagios/templates/check_snmp_int-bits.php
+pnp4nagios/templates.dist/check_snmp_int-full.php
pnp4nagios/templates.dist/check_snmp_int.php
@sample pnp4nagios/templates/check_snmp_int.php
pnp4nagios/templates.dist/check_swap.php
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/www/pnp4nagios/pkg/PLIST-main,v
diff -u -p -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 11 Mar 2022 20:10:43 -0000 1.5
+++ pkg/PLIST-main 29 May 2024 18:45:33 -0000
@@ -1,39 +1,6 @@
@extraunexec rm -rf /var/log/pnp4nagios
@extraunexec rm -rf ${LOCALSTATEDIR}/stats/*
@bin bin/npcd
-share/doc/pkg-readmes/${PKGSTEM}
-share/examples/pnp4nagios/
-@sample ${SYSCONFDIR}/
-share/examples/pnp4nagios/background.pdf
-@sample ${SYSCONFDIR}/background.pdf
-share/examples/pnp4nagios/check_commands/
-@sample ${SYSCONFDIR}/check_commands/
-share/examples/pnp4nagios/check_commands/check_all_local_disks.cfg-sample
-@sample ${SYSCONFDIR}/check_commands/check_all_local_disks.cfg
-share/examples/pnp4nagios/check_commands/check_nrpe.cfg-sample
-@sample ${SYSCONFDIR}/check_commands/check_nrpe.cfg
-share/examples/pnp4nagios/check_commands/check_nwstat.cfg-sample
-@sample ${SYSCONFDIR}/check_commands/check_nwstat.cfg
-share/examples/pnp4nagios/config.d/
-@sample ${SYSCONFDIR}/config.d/
-share/examples/pnp4nagios/config.php
-@sample ${SYSCONFDIR}/config.php
-@comment share/examples/pnp4nagios/config.php.0.6.26
-share/examples/pnp4nagios/config_local.php
-share/examples/pnp4nagios/misccommands.cfg-sample
-@sample ${SYSCONFDIR}/misccommands.cfg
-share/examples/pnp4nagios/nagios.cfg-sample
-share/examples/pnp4nagios/npcd.cfg
-@sample ${SYSCONFDIR}/npcd.cfg
-share/examples/pnp4nagios/pages/
-@sample ${SYSCONFDIR}/pages/
-share/examples/pnp4nagios/pages/web_traffic.cfg-sample
-@sample ${SYSCONFDIR}/pages/web_traffic.cfg
-@comment share/examples/pnp4nagios/pnp4nagios_release
-share/examples/pnp4nagios/process_perfdata.cfg
-@sample ${SYSCONFDIR}/process_perfdata.cfg
-share/examples/pnp4nagios/rra.cfg-sample
-@sample ${SYSCONFDIR}/rra.cfg
lib/kohana/
lib/kohana/system/
lib/kohana/system/config/
@@ -68,6 +35,7 @@ lib/kohana/system/core/Benchmark.php
lib/kohana/system/core/Bootstrap.php
lib/kohana/system/core/Event.php
lib/kohana/system/core/Kohana.php
+lib/kohana/system/core/Security.php
lib/kohana/system/core/utf8/
lib/kohana/system/core/utf8.php
lib/kohana/system/core/utf8/from_unicode.php
@@ -322,6 +290,39 @@ libexec/nagios/rrd_convert.pl
libexec/nagios/rrd_modify.pl
libexec/nagios/verify_pnp_config.pl
@man man/man8/npcd.8
+share/doc/pkg-readmes/${PKGSTEM}
+share/examples/pnp4nagios/
+@sample ${SYSCONFDIR}/
+share/examples/pnp4nagios/background.pdf
+@sample ${SYSCONFDIR}/background.pdf
+share/examples/pnp4nagios/check_commands/
+@sample ${SYSCONFDIR}/check_commands/
+share/examples/pnp4nagios/check_commands/check_all_local_disks.cfg-sample
+@sample ${SYSCONFDIR}/check_commands/check_all_local_disks.cfg
+share/examples/pnp4nagios/check_commands/check_nrpe.cfg-sample
+@sample ${SYSCONFDIR}/check_commands/check_nrpe.cfg
+share/examples/pnp4nagios/check_commands/check_nwstat.cfg-sample
+@sample ${SYSCONFDIR}/check_commands/check_nwstat.cfg
+share/examples/pnp4nagios/config.d/
+@sample ${SYSCONFDIR}/config.d/
+share/examples/pnp4nagios/config.php
+@sample ${SYSCONFDIR}/config.php
+@comment share/examples/pnp4nagios/config.php.${V}
+share/examples/pnp4nagios/config_local.php
+share/examples/pnp4nagios/misccommands.cfg-sample
+@sample ${SYSCONFDIR}/misccommands.cfg
+share/examples/pnp4nagios/nagios.cfg-sample
+share/examples/pnp4nagios/npcd.cfg
+@sample ${SYSCONFDIR}/npcd.cfg
+share/examples/pnp4nagios/pages/
+@sample ${SYSCONFDIR}/pages/
+share/examples/pnp4nagios/pages/web_traffic.cfg-sample
+@sample ${SYSCONFDIR}/pages/web_traffic.cfg
+@comment share/examples/pnp4nagios/pnp4nagios_release
+share/examples/pnp4nagios/process_perfdata.cfg
+@sample ${SYSCONFDIR}/process_perfdata.cfg
+share/examples/pnp4nagios/rra.cfg-sample
+@sample ${SYSCONFDIR}/rra.cfg
@owner _icinga
@sample ${LOCALSTATEDIR}/
@sample ${LOCALSTATEDIR}/stats/
On Wed, May 22, 2024 14:43, Stuart Henderson wrote:
> I intend to drop php/7.4 and php/8.0 soon (both are out of security
> support). The following ports/subpackages are setup to use 7.4 at the
> moment, if anyone's interested in them could you take a look at updating
> or patching to support 8.1+ please?
>
> databases/pg_stats_reporter (see https://github.com/ossc-db/pg_stats_reporter)
> databases/pgfouine (pea@)
> devel/boris (long dead upstream)
> misc/gpsd,-php (is anyone using the php part? does it already work?)
> www/phppgadmin (pea@, upstream doesn't seem very alive)
> www/phpvirtualbox (aja@, last upstream commit Jan 2021)
> www/pnp4nagios,-cgi (kirby@, still active upstream)
Hi!
I've found an active fork but it seems no other distro uses it.
All stuck on original 0.6.26 according to repology.
Attached is a diff which needs testing (can't do it right now, sorry)
Will try to configure icinga2 for testing till the end of this week.
> www/racktables (still active upstream, looks like it has php8+ fixes)
> www/selfoss (still active upstream, looks like it has php8+ fixes)
>
> (also net/nfsen and net/php-weathermap which I'll look at)
>
No comments:
Post a Comment