Merge branch '5.1.2'

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.1.1
+PERFSONAR_AUTO_VERSION=5.1.2
 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.1.2-1) perfsonar-5.1; urgency=low
+
+  * New upstream version.
+
+ -- perfSONAR developers <debian@perfsonar.net>  Fri, 19 Jul 2024 14:38:55 -0400
+
 perfsonar-toolkit (5.1.1-1) perfsonar-5.1; 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	2024-06-28 10:51:36.062005556 -0400
-+++ b/init_scripts/perfsonar-configure_nic_parameters	2024-06-28 10:51:36.406154871 -0400
+--- a/init_scripts/perfsonar-configure_nic_parameters	2024-07-19 14:38:55.673700103 -0400
++++ b/init_scripts/perfsonar-configure_nic_parameters	2024-07-19 14:38:56.025150445 -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	2024-06-28 10:51:34.666728309 -0400
-+++ b/scripts/system_environment/disable_unwanted_services	2024-06-28 10:51:36.406712032 -0400
+--- a/scripts/system_environment/disable_unwanted_services	2024-07-19 14:38:54.025830430 -0400
++++ b/scripts/system_environment/disable_unwanted_services	2024-07-19 14:38:56.025722148 -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	2024-06-28 10:51:34.667191930 -0400
-+++ b/scripts/system_environment/testpoint/enable_auto_updates	2024-06-28 10:51:36.407186861 -0400
+--- a/scripts/system_environment/testpoint/enable_auto_updates	2024-07-19 14:38:54.026554548 -0400
++++ b/scripts/system_environment/testpoint/enable_auto_updates	2024-07-19 14:38:56.026287559 -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	2024-06-28 10:51:34.661800607 -0400
-+++ b/bin/config_daemon.pl	2024-06-28 10:51:35.642775922 -0400
+--- a/bin/config_daemon.pl	2024-07-19 14:38:54.021161935 -0400
++++ b/bin/config_daemon.pl	2024-07-19 14:38:55.268640419 -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	2024-06-28 10:51:34.662270727 -0400
-+++ b/etc/configdaemon.conf	2024-06-28 10:51:35.643340500 -0400
+--- a/etc/configdaemon.conf	2024-07-19 14:38:54.021638430 -0400
++++ b/etc/configdaemon.conf	2024-07-19 14:38:55.269337370 -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	2024-06-28 10:51:34.666013150 -0400
-+++ b/scripts/nptoolkit-configure.py	2024-06-28 10:51:36.693474358 -0400
+--- a/scripts/nptoolkit-configure.py	2024-07-19 14:38:54.025106604 -0400
++++ b/scripts/nptoolkit-configure.py	2024-07-19 14:38:56.294044025 -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	2024-06-28 10:51:34.665556112 -0400
-+++ b/scripts/configure_firewall	2024-06-28 10:51:35.847794033 -0400
+--- a/scripts/configure_firewall	2024-07-19 14:38:54.024653234 -0400
++++ b/scripts/configure_firewall	2024-07-19 14:38:55.492438070 -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	2024-06-28 10:51:34.665755235 -0400
-+++ b/scripts/configure_sysctl	2024-06-28 10:51:37.040675185 -0400
+--- a/scripts/configure_sysctl	2024-07-19 14:38:54.024849773 -0400
++++ b/scripts/configure_sysctl	2024-07-19 14:38:56.789462728 -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	2024-06-28 10:51:34.666480895 -0400
-+++ b/scripts/system_environment/configure_fail2ban	2024-06-28 10:51:36.832832184 -0400
+--- a/scripts/system_environment/configure_fail2ban	2024-07-19 14:38:54.025592724 -0400
++++ b/scripts/system_environment/configure_fail2ban	2024-07-19 14:38:56.499501400 -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	2024-06-28 10:51:34.667498760 -0400
-+++ b/scripts/system_environment/upgrade_configdaemon	2024-06-28 10:51:36.833301346 -0400
+--- a/scripts/system_environment/upgrade_configdaemon	2024-07-19 14:38:54.026882170 -0400
++++ b/scripts/system_environment/upgrade_configdaemon	2024-07-19 14:38:56.500144561 -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	2024-06-28 10:51:34.667572093 -0400
-+++ b/scripts/system_environment/upgrade_fix_permissions	2024-06-28 10:51:36.833587969 -0400
+--- a/scripts/system_environment/upgrade_fix_permissions	2024-07-19 14:38:54.026950002 -0400
++++ b/scripts/system_environment/upgrade_fix_permissions	2024-07-19 14:38:56.500481474 -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	2024-06-28 10:51:34.667132680 -0400
-+++ b/scripts/system_environment/testpoint/configure_syslog_local5_location	2024-06-28 10:51:36.833893257 -0400
+--- a/scripts/system_environment/testpoint/configure_syslog_local5_location	2024-07-19 14:38:54.026493382 -0400
++++ b/scripts/system_environment/testpoint/configure_syslog_local5_location	2024-07-19 14:38:56.500861720 -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	2024-06-28 10:51:34.665297240 -0400
-+++ b/scripts/apache-toolkit_web_gui.conf	2024-06-28 10:51:36.060993107 -0400
+--- a/scripts/apache-toolkit_web_gui.conf	2024-07-19 14:38:54.024392444 -0400
++++ b/scripts/apache-toolkit_web_gui.conf	2024-07-19 14:38:55.672870486 -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	2024-06-28 10:51:34.665226365 -0400
-+++ b/scripts/add_pssudo_user	2024-06-28 10:51:36.061630310 -0400
+--- a/scripts/add_pssudo_user	2024-07-19 14:38:54.024315237 -0400
++++ b/scripts/add_pssudo_user	2024-07-19 14:38:55.673392898 -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	2024-06-28 10:51:34.663801254 -0400
-+++ b/init_scripts/perfsonar-configure_nic_parameters	2024-06-28 10:51:36.062005556 -0400
+--- a/init_scripts/perfsonar-configure_nic_parameters	2024-07-19 14:38:54.023041916 -0400
++++ b/init_scripts/perfsonar-configure_nic_parameters	2024-07-19 14:38:55.673700103 -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	2024-06-28 10:51:34.663873295 -0400
-+++ b/init_scripts/perfsonar-generate_motd	2024-06-28 10:51:36.062439344 -0400
+--- a/init_scripts/perfsonar-generate_motd	2024-07-19 14:38:54.023109957 -0400
++++ b/init_scripts/perfsonar-generate_motd	2024-07-19 14:38:55.674054100 -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	2024-06-28 10:51:34.685659752 -0400
-+++ b/web-ng/root/gui/reverse_traceroute.cgi	2024-06-28 10:51:36.063026004 -0400
+--- a/web-ng/root/gui/reverse_traceroute.cgi	2024-07-19 14:38:54.047139760 -0400
++++ b/web-ng/root/gui/reverse_traceroute.cgi	2024-07-19 14:38:55.674550595 -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	2024-06-28 10:51:34.663320759 -0400
-+++ b/etc/perfsonar_ulimit.conf	2024-06-28 10:51:36.063571208 -0400
+--- a/etc/perfsonar_ulimit.conf	2024-07-19 14:38:54.022543505 -0400
++++ b/etc/perfsonar_ulimit.conf	2024-07-19 14:38:55.675024507 -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	2024-06-28 10:51:34.669051829 -0400
-+++ b/t/host-get_metadata.t	2024-06-28 10:51:37.221476654 -0400
+--- a/t/host-get_metadata.t	2024-07-19 14:38:54.028099866 -0400
++++ b/t/host-get_metadata.t	2024-07-19 14:38:56.997273164 -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	2024-06-28 10:51:34.669132911 -0400
-+++ b/t/host-get_services.t	2024-06-28 10:51:37.221946941 -0400
+--- a/t/host-get_services.t	2024-07-19 14:38:54.028176907 -0400
++++ b/t/host-get_services.t	2024-07-19 14:38:56.997830575 -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	2024-06-28 10:51:34.669217285 -0400
-+++ b/t/host-get_system_health.t	2024-06-28 10:51:37.222301771 -0400
+--- a/t/host-get_system_health.t	2024-07-19 14:38:54.028260114 -0400
++++ b/t/host-get_system_health.t	2024-07-19 14:38:56.998202530 -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	2024-06-28 10:51:34.669315618 -0400
-+++ b/t/host-update_metadata.t	2024-06-28 10:51:37.222593810 -0400
+--- a/t/host-update_metadata.t	2024-07-19 14:38:54.028361322 -0400
++++ b/t/host-update_metadata.t	2024-07-19 14:38:56.998499277 -0400
 @@ -13,6 +13,8 @@
  use FindBin qw($Bin);
  use lib "$Bin/lib";

toolkit/perfsonar-toolkit/unibuild-packaging/deb/perfsonar-toolkit-config-daemon.init.d

@@ -10,7 +10,7 @@
 #                    configuration file and services for perfSONAR Toolkit.
 ### END INIT INFO
 
-# Author: Antoine Delvaux <adelvaux@man.poznan.pl>
+# Author: Lætitia Delvaux <adelvaux@man.poznan.pl>
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin

toolkit/perfsonar-toolkit/unibuild-packaging/deb/perfsonar-toolkit-config-daemon.postinst

@@ -23,9 +23,8 @@ case "$1" in
         # Set executable bit
         chmod +x /usr/lib/perfsonar/bin/configdaemon.pl
 
-        if [ -x "/etc/init.d/perfsonar-toolkit-config-daemon" ]; then
-            invoke-rc.d perfsonar-toolkit-config-daemon restart || true
-        fi
+        systemctl daemon-reload
+        service perfsonar-toolkit-config-daemon start
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

toolkit/perfsonar-toolkit/unibuild-packaging/rpm/perfsonar-toolkit.spec

@@ -13,7 +13,7 @@
 %define init_script_2 perfsonar-generate_motd
 %define init_script_3 perfsonar-configure_nic_parameters
 
-%define perfsonar_auto_version 5.1.1
+%define perfsonar_auto_version 5.1.2
 %define perfsonar_auto_relnum 1
 
 Name:           perfsonar-toolkit