Merge branch '5.2.3'

Author: arlake228

toolkit/perfsonar-toolkit/Makefile

@@ -1,7 +1,7 @@
 PACKAGE=perfsonar-toolkit
 ROOTPATH=/usr/lib/perfsonar
 CONFIGPATH=/etc/perfsonar/toolkit
-PERFSONAR_AUTO_VERSION=5.2.2
+PERFSONAR_AUTO_VERSION=5.2.3
 PERFSONAR_AUTO_RELNUM=1
 VERSION=${PERFSONAR_AUTO_VERSION}
 RELEASE=${PERFSONAR_AUTO_RELNUM}

toolkit/perfsonar-toolkit/unibuild-packaging/deb/changelog

@@ -1,3 +1,9 @@
+perfsonar-toolkit (5.2.3-1) perfsonar-5.2; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <[email protected]>  Thu, 18 Sep 2025 14:28:12 -0400
+
 perfsonar-toolkit (5.2.2-1) perfsonar-5.2; urgency=low
 
   * New upstream version.

toolkit/perfsonar-toolkit/unibuild-packaging/deb/patches/chkconfig.diff

@@ -1,7 +1,7 @@
 Index: b/init_scripts/perfsonar-configure_nic_parameters
 ===================================================================
---- a/init_scripts/perfsonar-configure_nic_parameters	2025-09-04 10:35:31.051504221 -0400
-+++ b/init_scripts/perfsonar-configure_nic_parameters	2025-09-04 10:35:31.387755045 -0400
+--- a/init_scripts/perfsonar-configure_nic_parameters	2025-09-18 14:28:12.687374897 -0400
++++ b/init_scripts/perfsonar-configure_nic_parameters	2025-09-18 14:28:13.089740073 -0400
 @@ -9,7 +9,7 @@
  ### END INIT INFO
 
@@ -65,8 +65,8 @@ Index: b/init_scripts/perfsonar-configure_nic_parameters
          ;;
 Index: b/scripts/system_environment/disable_unwanted_services
 ===================================================================
---- a/scripts/system_environment/disable_unwanted_services	2025-09-04 10:35:29.110030488 -0400
-+++ b/scripts/system_environment/disable_unwanted_services	2025-09-04 10:35:31.388354585 -0400
+--- a/scripts/system_environment/disable_unwanted_services	2025-09-18 14:28:10.786634950 -0400
++++ b/scripts/system_environment/disable_unwanted_services	2025-09-18 14:28:13.090478744 -0400
 @@ -6,9 +6,9 @@
 
  function disable_service() {
@@ -81,8 +81,8 @@ Index: b/scripts/system_environment/disable_unwanted_services
 
 Index: b/scripts/system_environment/testpoint/enable_auto_updates
 ===================================================================
---- a/scripts/system_environment/testpoint/enable_auto_updates	2025-09-04 10:35:29.110891485 -0400
-+++ b/scripts/system_environment/testpoint/enable_auto_updates	2025-09-04 10:35:31.388843375 -0400
+--- a/scripts/system_environment/testpoint/enable_auto_updates	2025-09-18 14:28:10.787192286 -0400
++++ b/scripts/system_environment/testpoint/enable_auto_updates	2025-09-18 14:28:13.091144164 -0400
 @@ -11,22 +11,19 @@
  MAJOR=${PREV_VERSION%%\.*}
  REST=${PREV_VERSION/${MAJOR}\.}

toolkit/perfsonar-toolkit/unibuild-packaging/deb/patches/debian-config-daemon.diff

@@ -1,7 +1,7 @@
 Index: b/bin/config_daemon.pl
 ===================================================================
---- a/bin/config_daemon.pl	2025-09-04 10:35:29.103250218 -0400
-+++ b/bin/config_daemon.pl	2025-09-04 10:35:30.560677566 -0400
+--- a/bin/config_daemon.pl	2025-09-18 14:28:10.780855294 -0400
++++ b/bin/config_daemon.pl	2025-09-18 14:28:12.156729943 -0400
 @@ -29,7 +29,7 @@
  use Log::Log4perl qw/:easy/;
 
@@ -22,8 +22,8 @@ Index: b/bin/config_daemon.pl
  ( $status, $res ) = lockPIDFile( $PIDFILE );
 Index: b/etc/configdaemon.conf
 ===================================================================
---- a/etc/configdaemon.conf	2025-09-04 10:35:29.103966466 -0400
-+++ b/etc/configdaemon.conf	2025-09-04 10:35:30.561478813 -0400
+--- a/etc/configdaemon.conf	2025-09-18 14:28:10.781409047 -0400
++++ b/etc/configdaemon.conf	2025-09-18 14:28:12.157585573 -0400
 @@ -1,6 +1,6 @@
  address     localhost
  port        9000

toolkit/perfsonar-toolkit/unibuild-packaging/deb/patches/debian-install.diff

@@ -1,7 +1,7 @@
 Index: b/scripts/nptoolkit-configure.py
 ===================================================================
---- a/scripts/nptoolkit-configure.py	2025-09-04 10:35:29.109001491 -0400
-+++ b/scripts/nptoolkit-configure.py	2025-09-04 10:35:31.659348788 -0400
+--- a/scripts/nptoolkit-configure.py	2025-09-18 14:28:10.785740403 -0400
++++ b/scripts/nptoolkit-configure.py	2025-09-18 14:28:13.422462207 -0400
 @@ -99,7 +99,7 @@
                      },
                      {

toolkit/perfsonar-toolkit/unibuild-packaging/deb/patches/debian-security.diff

@@ -1,7 +1,7 @@
 Index: b/scripts/configure_firewall
 ===================================================================
---- a/scripts/configure_firewall	2025-09-04 10:35:29.108202577 -0400
-+++ b/scripts/configure_firewall	2025-09-04 10:35:30.816308652 -0400
+--- a/scripts/configure_firewall	2025-09-18 14:28:10.785061608 -0400
++++ b/scripts/configure_firewall	2025-09-18 14:28:12.418989195 -0400
 @@ -38,7 +38,7 @@
      if type firewall-cmd &>/dev/null; then
          firewall-cmd --quiet --runtime-to-permanent

toolkit/perfsonar-toolkit/unibuild-packaging/deb/patches/debian-sysctl.diff

@@ -1,7 +1,7 @@
 Index: b/scripts/configure_sysctl
 ===================================================================
---- a/scripts/configure_sysctl	2025-09-04 10:35:29.108494909 -0400
-+++ b/scripts/configure_sysctl	2025-09-04 10:35:32.161665239 -0400
+--- a/scripts/configure_sysctl	2025-09-18 14:28:10.785319193 -0400
++++ b/scripts/configure_sysctl	2025-09-18 14:28:13.938436164 -0400
 @@ -70,7 +70,6 @@
              #set if centos 6 and 10Gbps or higher
              $default_sysctl_settings{'net.core.netdev_max_backlog'} = 250000 if($max_speed >= 10000000000);

toolkit/perfsonar-toolkit/unibuild-packaging/deb/patches/debian-systemenv.diff

@@ -1,7 +1,7 @@
 Index: b/scripts/system_environment/configure_fail2ban
 ===================================================================
---- a/scripts/system_environment/configure_fail2ban	2025-09-04 10:35:29.109690989 -0400
-+++ b/scripts/system_environment/configure_fail2ban	2025-09-04 10:35:31.903456245 -0400
+--- a/scripts/system_environment/configure_fail2ban	2025-09-18 14:28:10.786350615 -0400
++++ b/scripts/system_environment/configure_fail2ban	2025-09-18 14:28:13.687973351 -0400
 @@ -10,5 +10,5 @@
      echo "" >> /etc/fail2ban/jail.local
      echo "[sshd]" >> /etc/fail2ban/jail.local
@@ -11,8 +11,8 @@ Index: b/scripts/system_environment/configure_fail2ban
  fi
 Index: b/scripts/system_environment/upgrade_configdaemon
 ===================================================================
---- a/scripts/system_environment/upgrade_configdaemon	2025-09-04 10:35:29.111657691 -0400
-+++ b/scripts/system_environment/upgrade_configdaemon	2025-09-04 10:35:31.904159451 -0400
+--- a/scripts/system_environment/upgrade_configdaemon	2025-09-18 14:28:10.787598497 -0400
++++ b/scripts/system_environment/upgrade_configdaemon	2025-09-18 14:28:13.688727605 -0400
 @@ -87,5 +87,5 @@
  EOF
 
@@ -22,8 +22,8 @@ Index: b/scripts/system_environment/upgrade_configdaemon
  fi
 Index: b/scripts/system_environment/upgrade_fix_permissions
 ===================================================================
---- a/scripts/system_environment/upgrade_fix_permissions	2025-09-04 10:35:29.111780899 -0400
-+++ b/scripts/system_environment/upgrade_fix_permissions	2025-09-04 10:35:31.904525491 -0400
+--- a/scripts/system_environment/upgrade_fix_permissions	2025-09-18 14:28:10.787682914 -0400
++++ b/scripts/system_environment/upgrade_fix_permissions	2025-09-18 14:28:13.689104524 -0400
 @@ -8,10 +8,10 @@
  chown -R perfsonar:perfsonar /var/log/perfsonar
 
@@ -49,8 +49,8 @@ Index: b/scripts/system_environment/upgrade_fix_permissions
 +chown -R www-data /var/lib/cacti/rra 2> /dev/null
 Index: b/scripts/system_environment/testpoint/configure_syslog_local5_location
 ===================================================================
---- a/scripts/system_environment/testpoint/configure_syslog_local5_location	2025-09-04 10:35:29.110797860 -0400
-+++ b/scripts/system_environment/testpoint/configure_syslog_local5_location	2025-09-04 10:35:31.904966240 -0400
+--- a/scripts/system_environment/testpoint/configure_syslog_local5_location	2025-09-18 14:28:10.787119119 -0400
++++ b/scripts/system_environment/testpoint/configure_syslog_local5_location	2025-09-18 14:28:13.689511818 -0400
 @@ -11,32 +11,17 @@
      mv /var/log/perfsonar/owamp.log /var/log/perfsonar/owamp.log.old  
  fi

toolkit/perfsonar-toolkit/unibuild-packaging/deb/patches/debian-toolkit.diff

@@ -1,7 +1,7 @@
 Index: b/scripts/apache-toolkit_web_gui.conf
 ===================================================================
---- a/scripts/apache-toolkit_web_gui.conf	2025-09-04 10:35:29.107705620 -0400
-+++ b/scripts/apache-toolkit_web_gui.conf	2025-09-04 10:35:31.050312016 -0400
+--- a/scripts/apache-toolkit_web_gui.conf	2025-09-18 14:28:10.784698106 -0400
++++ b/scripts/apache-toolkit_web_gui.conf	2025-09-18 14:28:12.686081974 -0400
 @@ -13,6 +13,11 @@
  # New link to the plot schedule graph
  Alias /toolkit/plot /usr/lib/perfsonar/web-ng/root/admin/plot.cgi
@@ -72,8 +72,8 @@ Index: b/scripts/apache-toolkit_web_gui.conf
  ServerTokens Prod
 Index: b/scripts/add_pssudo_user
 ===================================================================
---- a/scripts/add_pssudo_user	2025-09-04 10:35:29.107581287 -0400
-+++ b/scripts/add_pssudo_user	2025-09-04 10:35:31.051084972 -0400
+--- a/scripts/add_pssudo_user	2025-09-18 14:28:10.784570105 -0400
++++ b/scripts/add_pssudo_user	2025-09-18 14:28:12.686914603 -0400
 @@ -104,7 +104,7 @@
      fout.write(buffer)
 
@@ -85,8 +85,8 @@ Index: b/scripts/add_pssudo_user
      sys.exit(1)
 Index: b/init_scripts/perfsonar-configure_nic_parameters
 ===================================================================
---- a/init_scripts/perfsonar-configure_nic_parameters	2025-09-04 10:35:29.106017292 -0400
-+++ b/init_scripts/perfsonar-configure_nic_parameters	2025-09-04 10:35:31.051504221 -0400
+--- a/init_scripts/perfsonar-configure_nic_parameters	2025-09-18 14:28:10.783023555 -0400
++++ b/init_scripts/perfsonar-configure_nic_parameters	2025-09-18 14:28:12.687374897 -0400
 @@ -1,17 +1,12 @@
  #!/bin/sh
 -#
@@ -126,8 +126,8 @@ Index: b/init_scripts/perfsonar-configure_nic_parameters
          RETVAL=2
 Index: b/init_scripts/perfsonar-generate_motd
 ===================================================================
---- a/init_scripts/perfsonar-generate_motd	2025-09-04 10:35:29.106095584 -0400
-+++ b/init_scripts/perfsonar-generate_motd	2025-09-04 10:35:31.051929719 -0400
+--- a/init_scripts/perfsonar-generate_motd	2025-09-18 14:28:10.783111764 -0400
++++ b/init_scripts/perfsonar-generate_motd	2025-09-18 14:28:12.687886400 -0400
 @@ -1,11 +1,15 @@
  #!/usr/bin/perl
 -#
@@ -153,8 +153,8 @@ Index: b/init_scripts/perfsonar-generate_motd
  use warnings;
 Index: b/web-ng/root/gui/reverse_traceroute.cgi
 ===================================================================
---- a/web-ng/root/gui/reverse_traceroute.cgi	2025-09-04 10:35:29.133159788 -0400
-+++ b/web-ng/root/gui/reverse_traceroute.cgi	2025-09-04 10:35:31.052444218 -0400
+--- a/web-ng/root/gui/reverse_traceroute.cgi	2025-09-18 14:28:10.804629421 -0400
++++ b/web-ng/root/gui/reverse_traceroute.cgi	2025-09-18 14:28:12.688550612 -0400
 @@ -273,7 +273,7 @@
  #########################################################################
  # Build the executable function for tracepath
@@ -166,8 +166,8 @@ Index: b/web-ng/root/gui/reverse_traceroute.cgi
  #########################################################################
 Index: b/etc/perfsonar_ulimit.conf
 ===================================================================
---- a/etc/perfsonar_ulimit.conf	2025-09-04 10:35:29.105336628 -0400
-+++ b/etc/perfsonar_ulimit.conf	2025-09-04 10:35:31.053060424 -0400
+--- a/etc/perfsonar_ulimit.conf	2025-09-18 14:28:10.782489969 -0400
++++ b/etc/perfsonar_ulimit.conf	2025-09-18 14:28:12.689316616 -0400
 @@ -1,8 +1,8 @@
  # Increases process limit and number of files open for various perfsonar tools
 

toolkit/perfsonar-toolkit/unibuild-packaging/deb/patches/debian-unittest.diff

@@ -1,7 +1,7 @@
 Index: b/t/host-get_metadata.t
 ===================================================================
---- a/t/host-get_metadata.t	2025-09-04 10:35:29.113339310 -0400
-+++ b/t/host-get_metadata.t	2025-09-04 10:35:32.325417623 -0400
+--- a/t/host-get_metadata.t	2025-09-18 14:28:10.789138213 -0400
++++ b/t/host-get_metadata.t	2025-09-18 14:28:14.136309401 -0400
 @@ -6,6 +6,8 @@
  use FindBin qw($Bin);
  use lib "$Bin/lib";
@@ -13,8 +13,8 @@ Index: b/t/host-get_metadata.t
 
 Index: b/t/host-get_services.t
 ===================================================================
---- a/t/host-get_services.t	2025-09-04 10:35:29.113454685 -0400
-+++ b/t/host-get_services.t	2025-09-04 10:35:32.325999830 -0400
+--- a/t/host-get_services.t	2025-09-18 14:28:10.789263589 -0400
++++ b/t/host-get_services.t	2025-09-18 14:28:14.136903696 -0400
 @@ -6,6 +6,8 @@
  use FindBin qw($Bin);
  use lib "$Bin/lib";
@@ -26,8 +26,8 @@ Index: b/t/host-get_services.t
 
 Index: b/t/host-get_system_health.t
 ===================================================================
---- a/t/host-get_system_health.t	2025-09-04 10:35:29.113548476 -0400
-+++ b/t/host-get_system_health.t	2025-09-04 10:35:32.326499328 -0400
+--- a/t/host-get_system_health.t	2025-09-18 14:28:10.789355298 -0400
++++ b/t/host-get_system_health.t	2025-09-18 14:28:14.137430115 -0400
 @@ -9,10 +9,12 @@
  use FindBin qw($Bin);
  use lib "$Bin/lib";
@@ -67,8 +67,8 @@ Index: b/t/host-get_system_health.t
  ok( nonnegative_number( $data->{'load_avg'}->{'avg_5'} ), 'Load average (5 minute) is a positive number');
 Index: b/t/host-update_metadata.t
 ===================================================================
---- a/t/host-update_metadata.t	2025-09-04 10:35:29.113724517 -0400
-+++ b/t/host-update_metadata.t	2025-09-04 10:35:32.326835077 -0400
+--- a/t/host-update_metadata.t	2025-09-18 14:28:10.789466132 -0400
++++ b/t/host-update_metadata.t	2025-09-18 14:28:14.137788075 -0400
 @@ -13,6 +13,8 @@
  use FindBin qw($Bin);
  use lib "$Bin/lib";