feature/rocky9

SOURCES/docsis_dialplan.patch

@@ -159,20 +159,20 @@ diff --git a/src/docsis_common.h b/src/docsis_common.h
 index a3aeefe..b94460e 100644
 --- a/src/docsis_common.h
 +++ b/src/docsis_common.h
-@@ -32,11 +32,11 @@
+@@ -25,10 +25,10 @@
+ #define _DOCSIS_COMMON_H
 
-
- #ifndef NUM_IDENTIFIERS
--#define NUM_IDENTIFIERS 1427
+ /* needed in docsis_symtable.h */
+-#define NUM_IDENTIFIERS 1539
 +#define NUM_IDENTIFIERS 9000
- #endif /*  NUM_IDENTIFIERS, needed in docsis_symtable.h  */
 
  #define MAXINT 2000000000
 -#define TLV_VSIZE 1024
 +#define TLV_VSIZE 16384
  #define TRUE 1
  #define FALSE 0
 
+
 diff --git a/src/docsis_decode.c b/src/docsis_decode.c
 index b0a5b77..f4e6ce5 100644
 --- a/src/docsis_decode.c

SOURCES/docsis_edge.patch

@@ -0,0 +1,27 @@
+diff --git a/src/docsis_common.h b/src/docsis_common.h
+index 424418e..3e626da 100644
+--- a/src/docsis_common.h
++++ b/src/docsis_common.h
+@@ -25,7 +25,7 @@
+ #define _DOCSIS_COMMON_H
+
+ /* needed in docsis_symtable.h */
+-#define NUM_IDENTIFIERS 1536
++#define NUM_IDENTIFIERS 1539
+
+ #define MAXINT 2000000000
+ #define TLV_VSIZE 1024
+diff --git a/src/docsis_symtable.h b/src/docsis_symtable.h
+index bb2b070..b8a1d76 100644
+--- a/src/docsis_symtable.h
++++ b/src/docsis_symtable.h
+@@ -106,6 +106,9 @@ symbol_type symtable[NUM_IDENTIFIERS] =  {
+ { 271,    "EnergyManagementCapabilities",      44,     144,    (encode_hexstr),         (decode_hexstr),         4,           4             }, /* TLV 5.44 MULPIv3.0-I24 Annex C.1.3.1.43 */
+ { 272,    "CDOCSISCapabilityEncoding",         45,     144,    (encode_hexstr),         (decode_hexstr),         0,           0             }, /* TLV 5.45 MULPIv3.0-I24 Annex C.1.3.1.44 */
+ { 273,    "CMSTATUSACK",                       46,     144,    (encode_uchar),          (decode_uchar),          0,           1             }, /* TLV 5.46 MULPIv3.0-I24 Annex C.1.3.1.45 */
++{ 1536,   "DownstreamLowerBandEdgeSupport",    54,     144,    (encode_hexstr),         (decode_hexstr),         0,           1             }, /* TLV 5.54 MULPIv3.1-I25 Annex C.1.3.1.53 */
++{ 1537,   "DownstreamUpperBandEdgeSupport",    55,     144,    (encode_hexstr),         (decode_hexstr),         0,           1             }, /* TLV 5.55 MULPIv3.1-I25 Annex C.1.3.1.54 */
++{ 1538,   "DiplexerUpperBandEdgeSupport",      56,     144,    (encode_uchar),          (decode_uchar),          0,           4             }, /* TLV 5.56 MULPIv3.1-I25 Annex C.1.3.1.55 */
+ { 4,      "CmMic",                             6,      0,      (encode_nothing),        (decode_md5),            0,           0             }, /* TLV 6 MULPIv3.0-I24 Annex C.1.1.5 */
+ { 5,      "CmtsMic",                           7,      0,      (encode_nothing),        (decode_md5),            0,           0             }, /* TLV 7 MULPIv3.0-I24 Annex C.1.1.6 */
+ { 14,     "SwUpgradeFilename",                 9,      0,      (encode_string),         (decode_string),         0,           0             }, /* TLV 9 MULPIv3.0-I24 Annex C.1.2.3 */

SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-commands.conf

@@ -242,5 +242,5 @@ object CheckCommand "latest_configfiles" {
 }
 
 object CheckCommand "laravel_debug_status" {
-  command = [ "/usr/bin/sudo", "/opt/remi/php80/root/usr/bin/php", "/var/www/nmsprime/artisan", "nms:debug-status" ]
+  command = [ "/usr/bin/sudo", "php", "/var/www/nmsprime/artisan", "nms:debug-status" ]
 }

SOURCES/icingaweb2-module-director-common/conf.d/nmsprime-services.conf

@@ -140,7 +140,7 @@ apply Service "ip_conntrack" {
   assign where host.name == NodeName
 }
 
-apply Service "systemd_service_" for (service in [ "named", "dhcpd", "xinetd", "firewalld", "nmsprimed", "httpd", "crond", "mariadb", "sshd", "php80-php-fpm", "icinga2", "radiusd", "mongod", "genieacs-cwmp", "genieacs-fs", "genieacs-nbi", "kea-dhcp6" ]) {
+apply Service "systemd_service_" for (service in [ "named", "dhcpd", "tftp", "time-nmsprime", "firewalld", "nmsprimed", "httpd", "crond", "mariadb", "sshd", "icinga2", "radiusd", "mongod", "genieacs-cwmp", "genieacs-fs", "genieacs-nbi", "kea-dhcp6" ]) {
   import "generic-service"
 
   check_command = "systemd_service"

SOURCES/icingaweb2-module-director-common/icinga2-refresh-dhcpd

@@ -1 +1 @@
-*/5 * * * * root /usr/bin/bash -c 'test -z "$(icingacli monitoring list services --service=systemd_service_dhcpd --problems)" || /usr/bin/scl enable php80 "php /var/www/nmsprime/artisan nms:dhcp"' > /dev/null 2>&1
+*/5 * * * * root /usr/bin/bash -c 'test -z "$(icingacli monitoring list services --service=systemd_service_dhcpd --problems)" || php /var/www/nmsprime/artisan nms:dhcp' > /dev/null 2>&1

SOURCES/icingaweb2-module-director-common/nmsprime-icinga

@@ -1,4 +1,4 @@
 Defaults:icinga lecture=never,!requiretty
 icinga ALL=(root) NOPASSWD: /usr/lib64/nagios/plugins/check_dhcpd-pools.sh
-icinga ALL=(root) NOPASSWD: /opt/remi/php80/root/usr/bin/php /var/www/nmsprime/artisan nms\:debug-status
+icinga ALL=(root) NOPASSWD: /usr/bin/php /var/www/nmsprime/artisan nms\:debug-status
 icinga ALL=(root) NOPASSWD: /usr/bin/supervisorctl status

SPECS/alertmanager.spec

@@ -1,5 +1,5 @@
 Name: alertmanager
-Version: 0.24.0
+Version: 0.28.0
 Release: 1
 Summary: Prometheus Alertmanager
 
@@ -79,5 +79,11 @@ install -dm755 %{buildroot}%{_sharedstatedir}/%{name}
 %attr(0755,prometheus,prometheus) %dir %{_sharedstatedir}/%{name}
 
 %changelog
+* Wed Feb 19 2025 Ole Ernst <ole.ernst@nmsprime.com> - 0.28.0-1
+- Update to version v0.28.0
+
+* Tue Oct 15 2024 Ole Ernst <ole.ernst@nmsprime.com> - 0.27.0-1
+- Update to version v0.27.0
+
 * Fri Jun 24 2022 Ole Ernst <ole.ernst@nmsprime.com> - 0.24.0-1
 - Initial RPM release