diff -uwdr observium.orig/Makefile observium/Makefile --- observium.orig/Makefile 2023-12-26 19:56:28.468520000 +0100 +++ observium/Makefile 2023-12-31 11:10:26.862077000 +0100 @@ -1,10 +1,11 @@ # Observium version can be found by looking at ${WRKSRC}/includes/definitions/version.inc.php PORTNAME= observium -PORTVERSION= 0.19.8 +PORTVERSION= 0.23.9 +#23.9.13005 PORTREVISION= 2 CATEGORIES= net-mgmt -MASTER_SITES= http://www.observium.org/ +MASTER_SITES= https://www.observium.org/ DISTNAME= ${PORTNAME}-community-latest DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} PKGNAMESUFFIX= ${PHP_PKGNAMESUFFIX} @@ -21,13 +22,14 @@ WRKSRC= ${WRKDIR}/${PORTNAME} USES= cpe php:cli,flavors python shebangfix -IGNORE_WITH_PHP= 82 83 +#IGNORE_WITH_PHP= 82 83 SHEBANG_FILES= \ poller-wrapper.py \ poller.php \ scripts/ -USE_PHP= ctype filter gd iconv mcrypt mysqli posix session snmp tokenizer xml zlib +USE_PHP= ctype filter gd iconv mysqli posix session snmp tokenizer xml zlib +#USE_PHP= ctype filter gd iconv mcrypt mysqli posix session snmp tokenizer xml zlib NO_ARCH= yes NO_BUILD= yes @@ -65,11 +67,11 @@ SUB_LIST+= PHP="${PREFIX}/bin/php" PYTHON="${PYTHON_CMD}" ROOT_FILES= add_device.php adduser.php alerter.php \ - check-errors.php check-services.php config_to_json.php \ - config.php.default delete_device.php discovery.php housekeeping.php \ - irc.php poller-wrapper.py poller.php rename_device.php \ + check-errors.php config.php.default config_to_json.php \ + delete_device.php discovery.php housekeeping.php \ + irc.php notifications.php poller-wrapper.py poller.php rename_device.php \ snmp.conf.example snmpd.conf.example \ - snmptrap.php snmptrap.php syslog.php test_alert.php test_code.php VERSION + snmptrap.php syslog.php test_alert.php test_code.php test_db.php test_geo.php VERSION ROOT_DIRS= html includes libs logs mibs rrd scripts templates tests update PORTDOCS= INSTALL README VERSION @@ -81,7 +83,7 @@ .if !defined(PACKAGE_BUILDING) USES+= php:mod .else -# Package builder doesn't create php5 with module +# Package builder doesn't create php8 with module USES+= php:web .endif diff -uwdr observium.orig/distinfo observium/distinfo --- observium.orig/distinfo 2023-12-26 19:56:28.468567000 +0100 +++ observium/distinfo 2023-12-26 20:45:50.148471000 +0100 @@ -1,3 +1,3 @@ -TIMESTAMP = 1577933625 -SHA256 (observium-0.19.8/observium-community-latest.tar.gz) = 0603cc81c1fede6b87b187fde64843e11d6ed44f32705c68c41ddccf05d90d5b -SIZE (observium-0.19.8/observium-community-latest.tar.gz) = 85994042 +TIMESTAMP = 1703619939 +SHA256 (observium-0.23.9/observium-community-latest.tar.gz) = 30eb316818671cfa6e530aa6a25764c9b59974c75d351f6725358f8c4f758671 +SIZE (observium-0.23.9/observium-community-latest.tar.gz) = 123667068 diff -uwdr observium.orig/files/observium.conf.sample.in observium/files/observium.conf.sample.in --- observium.orig/files/observium.conf.sample.in 2023-12-26 19:56:28.468618000 +0100 +++ observium/files/observium.conf.sample.in 2023-12-31 15:56:33.485482000 +0100 @@ -12,8 +12,8 @@ LoadModule rewrite_module libexec/apache24/mod_rewrite.so - -LoadModule php7_module libexec/apache24/libphp7.so + +LoadModule php_module libexec/apache24/libphp.so Listen *:8080 diff -uwdr observium.orig/files/patch-includes_defaults.inc.php observium/files/patch-includes_defaults.inc.php --- observium.orig/files/patch-includes_defaults.inc.php 2023-12-26 19:56:28.468665000 +0100 +++ observium/files/patch-includes_defaults.inc.php 2023-12-26 20:57:41.882588000 +0100 @@ -1,6 +1,6 @@ --- includes/defaults.inc.php.orig 2019-08-23 07:09:46 UTC +++ includes/defaults.inc.php -@@ -57,7 +57,7 @@ $config['db']['debug'] = TRUE; // If TRUE +@@ -74,7 +74,7 @@ // Default directories @@ -9,13 +9,13 @@ #$config['html_dir'] = $config['install_dir'] . "/html"; #$config['rrd_dir'] = $config['install_dir'] . "/rrd"; #$config['template_dir'] = $config['install_dir'] . "/templates"; -@@ -71,30 +71,30 @@ $config['db']['debug'] = TRUE; // If TRUE +@@ -90,30 +90,30 @@ // Location of executables -$config['rrdtool'] = "/usr/bin/rrdtool"; -$config['fping'] = "/usr/bin/fping"; --$config['fping6'] = "/usr/bin/fping6"; +-$config['fping6'] = "/usr/bin/fping6"; // Note, for version 4+ not required -$config['snmpwalk'] = "/usr/bin/snmpwalk"; -$config['snmpget'] = "/usr/bin/snmpget"; -$config['snmpgetnext'] = "/usr/bin/snmpgetnext"; @@ -24,7 +24,7 @@ -$config['snmptranslate'] = "/usr/bin/snmptranslate"; +$config['rrdtool'] = "/usr/local/bin/rrdtool"; +$config['fping'] = "/usr/local/sbin/fping"; -+$config['fping6'] = "/usr/local/sbin/fping6"; ++$config['fping6'] = "/usr/local/sbin/fping6"; // Note, for version 4+ not required +$config['snmpwalk'] = "/usr/local/bin/snmpwalk"; +$config['snmpget'] = "/usr/local/bin/snmpget"; +$config['snmpgetnext'] = "/usr/local/bin/snmpgetnext"; diff -uwdr observium.orig/files/patch-poller-wrapper.py observium/files/patch-poller-wrapper.py --- observium.orig/files/patch-poller-wrapper.py 2023-12-26 19:56:28.468707000 +0100 +++ observium/files/patch-poller-wrapper.py 2023-12-31 15:59:40.404897000 +0100 @@ -1,11 +1,10 @@ ---- poller-wrapper.py.orig 2017-12-02 14:04:45 UTC -+++ poller-wrapper.py -@@ -72,6 +72,8 @@ except: - print("threading, sys, subprocess, os, json") +--- poller-wrapper.py.orig 2023-12-31 15:58:14.965904000 +0100 ++++ poller-wrapper.py 2023-12-31 15:58:57.579855000 +0100 +@@ -79,6 +79,7 @@ + print("threading, sys, subprocess, os, json, stat") sys.exit(2) +os.environ['PATH'] += ':%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin' -+ + + def new_except_hook(exctype, value, traceback): """ - Register global exepthook for ability stop execute wrapper by Ctrl+C - See: https://stackoverflow.com/questions/6598053/python-global-exception-handling