sync ports with The Matrix

net/librenms/Makefile

@@ -3,7 +3,7 @@ COMMENT=	auto-discovering network management/monitoring system
 # changelogs at https://github.com/librenms/librenms/releases
 GH_ACCOUNT=	librenms
 GH_PROJECT=	librenms
-GH_TAGNAME=	23.7.0
+GH_TAGNAME=	23.8.0
 
 DISTFILES=	${GH_DISTFILE} \
 		${PKGNAME}-vendor.tar.xz:0

net/librenms/distinfo

@@ -1,4 +1,4 @@
-SHA256 (librenms-23.7.0-vendor.tar.xz) = 4kz5a/jXlxDiaK/PhRAkjHPh4RMOsHwxZ1CaKV1QAOU=
-SHA256 (librenms-23.7.0.tar.gz) = yai+ioMLKSpJDutJE2e4MaRjM2k0YpJyxMHyBeeS2uM=
-SIZE (librenms-23.7.0-vendor.tar.xz) = 21678820
-SIZE (librenms-23.7.0.tar.gz) = 57749912
+SHA256 (librenms-23.8.0-vendor.tar.xz) = Y4SgGQj3L2oqjkHqJiPHiKKTHblR3uzwI/FqBVojoPk=
+SHA256 (librenms-23.8.0.tar.gz) = RKWmfuSEJwuTm+Bk/F0o7YEsh/FKB83TEVWj2xHoJrk=
+SIZE (librenms-23.8.0-vendor.tar.xz) = 21817496
+SIZE (librenms-23.8.0.tar.gz) = 57970955

net/librenms/patches/patch-LibreNMS_wrapper_py

@@ -1,12 +1,12 @@
 Index: LibreNMS/wrapper.py
 --- LibreNMS/wrapper.py.orig
 +++ LibreNMS/wrapper.py
-@@ -278,7 +278,7 @@ def poll_worker(
+@@ -280,7 +280,7 @@ def poll_worker(
                      os.path.dirname(os.path.dirname(os.path.realpath(__file__))),
                      wrappers[wrapper_type]["executable"],
                  )
 -                command = "/usr/bin/env php {} -h {}".format(executable, device_id)
 +                command = "${MODPHP_BIN} {} -h {}".format(executable, device_id)
-                 if debug:
-                     command = command + " -d"
-                 exit_code, output = command_runner(
+                 if modules is not None and len(str(modules).strip()):
+                     module_str = re.sub("\s", "", str(modules).strip())
+                     command = command + " -m {}".format(module_str)

net/librenms/patches/patch-daily_sh

@@ -85,21 +85,3 @@ Index: daily.sh
  
          update_res=0
          if [[ "$up" == "1" ]] || [[ "$php_ver_ret" == "1" ]]; then
-@@ -339,7 +339,7 @@ main () {
-             no-code-update)
-                 # Updates of the code are disabled, just check for schema updates
-                 # and clean up the db.
--                status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
-+                status_run 'Updating SQL-Schema' '${MODPHP_BIN} includes/sql-schema/update.php'
-                 status_run 'Cleaning up DB' "'$DAILY_SCRIPT' cleanup"
-                 status_run 'Caching Mac OUI data' "$DAILY_SCRIPT mac_oui"
-             ;;
-@@ -366,7 +366,7 @@ main () {
-                 fi
- 
-                 # List all tasks to do after pull in the order of execution
--                status_run 'Updating SQL-Schema' 'php includes/sql-schema/update.php'
-+                status_run 'Updating SQL-Schema' '${MODPHP_BIN} includes/sql-schema/update.php'
-                 status_run 'Updating submodules' "$DAILY_SCRIPT submodules"
-                 status_run 'Cleaning up DB' "$DAILY_SCRIPT cleanup"
-                 status_run 'Fetching notifications' "$DAILY_SCRIPT notifications"

net/librenms/patches/patch-misc_config_definitions_json

@@ -1,7 +1,7 @@
 Index: misc/config_definitions.json
 --- misc/config_definitions.json.orig
 +++ misc/config_definitions.json
-@@ -4257,7 +4257,7 @@
+@@ -4264,7 +4264,7 @@
          },
          "nfsen_rrds": {
              "default": [

net/librenms/patches/patch-sql-schema_079_sql

@@ -1,6 +0,0 @@
-Index: sql-schema/079.sql
---- sql-schema/079.sql.orig
-+++ sql-schema/079.sql
-@@ -1 +1 @@
--INSERT INTO config (config_name,config_value,config_default,config_descr,config_group,config_group_order,config_sub_group,config_sub_group_order,config_hidden,config_disabled) values ('rrdtool','/usr/bin/rrdtool','/usr/bin/rrdtool','Path to rrdtool','external',0,'rrdtool',0,'0','0'), ('rrdtool_tune','false','false','Auto tune maximum value for rrd port files','external',0,'rrdtool',0,'0','0');
-+INSERT INTO config (config_name,config_value,config_default,config_descr,config_group,config_group_order,config_sub_group,config_sub_group_order,config_hidden,config_disabled) values ('rrdtool','/usr/local/bin/rrdtool','/usr/local/bin/rrdtool','Path to rrdtool','external',0,'rrdtool',0,'0','0'), ('rrdtool_tune','false','false','Auto tune maximum value for rrd port files','external',0,'rrdtool',0,'0','0');