Skip to content

Commit 0333fe8

Browse files
arlake228arlake228
committed
Merge branch '5.1.4'
2 parents 83f6ec7 + 05fce54 commit 0333fe8

11 files changed

+52
-46
lines changed

‎toolkit/perfsonar-toolkit/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PACKAGE=perfsonar-toolkit
22
ROOTPATH=/usr/lib/perfsonar
33
CONFIGPATH=/etc/perfsonar/toolkit
4-
PERFSONAR_AUTO_VERSION=5.1.3
4+
PERFSONAR_AUTO_VERSION=5.1.4
55
PERFSONAR_AUTO_RELNUM=1
66
VERSION=${PERFSONAR_AUTO_VERSION}
77
RELEASE=${PERFSONAR_AUTO_RELNUM}

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

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
perfsonar-toolkit (5.1.4-1) perfsonar-5.1; urgency=low
2+
3+
* New upstream version.
4+
5+
-- perfSONAR developers <debian@perfsonar.net> Tue, 15 Oct 2024 11:56:39 -0400
6+
17
perfsonar-toolkit (5.1.3-1) perfsonar-5.1; urgency=low
28

39
* New upstream version.

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Index: b/init_scripts/perfsonar-configure_nic_parameters
22
===================================================================
3-
--- a/init_scripts/perfsonar-configure_nic_parameters 2024-09-06 11:45:03.412481286 -0400
4-
+++ b/init_scripts/perfsonar-configure_nic_parameters 2024-09-06 11:45:03.779293601 -0400
3+
--- a/init_scripts/perfsonar-configure_nic_parameters 2024-10-15 11:56:40.498883979 -0400
4+
+++ b/init_scripts/perfsonar-configure_nic_parameters 2024-10-15 11:56:40.836896992 -0400
55
@@ -9,7 +9,7 @@
66
### END INIT INFO
77

@@ -65,8 +65,8 @@ Index: b/init_scripts/perfsonar-configure_nic_parameters
6565
;;
6666
Index: b/scripts/system_environment/disable_unwanted_services
6767
===================================================================
68-
--- a/scripts/system_environment/disable_unwanted_services 2024-09-06 11:45:01.820924161 -0400
69-
+++ b/scripts/system_environment/disable_unwanted_services 2024-09-06 11:45:03.779921392 -0400
68+
--- a/scripts/system_environment/disable_unwanted_services 2024-10-15 11:56:39.066370863 -0400
69+
+++ b/scripts/system_environment/disable_unwanted_services 2024-10-15 11:56:40.837503904 -0400
7070
@@ -6,9 +6,9 @@
7171

7272
function disable_service() {
@@ -81,8 +81,8 @@ Index: b/scripts/system_environment/disable_unwanted_services
8181

8282
Index: b/scripts/system_environment/testpoint/enable_auto_updates
8383
===================================================================
84-
--- a/scripts/system_environment/testpoint/enable_auto_updates 2024-09-06 11:45:01.821444201 -0400
85-
+++ b/scripts/system_environment/testpoint/enable_auto_updates 2024-09-06 11:45:03.780477391 -0400
84+
--- a/scripts/system_environment/testpoint/enable_auto_updates 2024-10-15 11:56:39.067101939 -0400
85+
+++ b/scripts/system_environment/testpoint/enable_auto_updates 2024-10-15 11:56:40.838062856 -0400
8686
@@ -11,22 +11,19 @@
8787
MAJOR=${PREV_VERSION%%\.*}
8888
REST=${PREV_VERSION/${MAJOR}\.}

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Index: b/bin/config_daemon.pl
22
===================================================================
3-
--- a/bin/config_daemon.pl 2024-09-06 11:45:01.815403214 -0400
4-
+++ b/bin/config_daemon.pl 2024-09-06 11:45:02.998522695 -0400
3+
--- a/bin/config_daemon.pl 2024-10-15 11:56:39.061530742 -0400
4+
+++ b/bin/config_daemon.pl 2024-10-15 11:56:40.065281381 -0400
55
@@ -29,7 +29,7 @@
66
use Log::Log4perl qw/:easy/;
77

@@ -22,8 +22,8 @@ Index: b/bin/config_daemon.pl
2222
( $status, $res ) = lockPIDFile( $PIDFILE );
2323
Index: b/etc/configdaemon.conf
2424
===================================================================
25-
--- a/etc/configdaemon.conf 2024-09-06 11:45:01.815912463 -0400
26-
+++ b/etc/configdaemon.conf 2024-09-06 11:45:02.999125069 -0400
25+
--- a/etc/configdaemon.conf 2024-10-15 11:56:39.061973196 -0400
26+
+++ b/etc/configdaemon.conf 2024-10-15 11:56:40.065933000 -0400
2727
@@ -1,6 +1,6 @@
2828
address localhost
2929
port 9000

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Index: b/scripts/nptoolkit-configure.py
22
===================================================================
3-
--- a/scripts/nptoolkit-configure.py 2024-09-06 11:45:01.819911955 -0400
4-
+++ b/scripts/nptoolkit-configure.py 2024-09-06 11:45:04.048026414 -0400
3+
--- a/scripts/nptoolkit-configure.py 2024-10-15 11:56:39.065546704 -0400
4+
+++ b/scripts/nptoolkit-configure.py 2024-10-15 11:56:41.111596029 -0400
55
@@ -99,7 +99,7 @@
66
},
77
{

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Index: b/scripts/configure_firewall
22
===================================================================
3-
--- a/scripts/configure_firewall 2024-09-06 11:45:01.819360872 -0400
4-
+++ b/scripts/configure_firewall 2024-09-06 11:45:03.207397299 -0400
3+
--- a/scripts/configure_firewall 2024-10-15 11:56:39.065016917 -0400
4+
+++ b/scripts/configure_firewall 2024-10-15 11:56:40.290455225 -0400
55
@@ -38,7 +38,7 @@
66
if type firewall-cmd &>/dev/null; then
77
firewall-cmd --quiet --runtime-to-permanent

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Index: b/scripts/configure_sysctl
22
===================================================================
3-
--- a/scripts/configure_sysctl 2024-09-06 11:45:01.819597539 -0400
4-
+++ b/scripts/configure_sysctl 2024-09-06 11:45:04.514896686 -0400
3+
--- a/scripts/configure_sysctl 2024-10-15 11:56:39.065260373 -0400
4+
+++ b/scripts/configure_sysctl 2024-10-15 11:56:41.600218642 -0400
55
@@ -70,7 +70,6 @@
66
#set if centos 6 and 10Gbps or higher
77
$default_sysctl_settings{'net.core.netdev_max_backlog'} = 250000 if($max_speed >= 10000000000);

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Index: b/scripts/system_environment/configure_fail2ban
22
===================================================================
3-
--- a/scripts/system_environment/configure_fail2ban 2024-09-06 11:45:01.820642245 -0400
4-
+++ b/scripts/system_environment/configure_fail2ban 2024-09-06 11:45:04.260776093 -0400
3+
--- a/scripts/system_environment/configure_fail2ban 2024-10-15 11:56:39.066078199 -0400
4+
+++ b/scripts/system_environment/configure_fail2ban 2024-10-15 11:56:41.318293675 -0400
55
@@ -10,5 +10,5 @@
66
echo "" >> /etc/fail2ban/jail.local
77
echo "[sshd]" >> /etc/fail2ban/jail.local
@@ -11,8 +11,8 @@ Index: b/scripts/system_environment/configure_fail2ban
1111
fi
1212
Index: b/scripts/system_environment/upgrade_configdaemon
1313
===================================================================
14-
--- a/scripts/system_environment/upgrade_configdaemon 2024-09-06 11:45:01.821780909 -0400
15-
+++ b/scripts/system_environment/upgrade_configdaemon 2024-09-06 11:45:04.261480925 -0400
14+
--- a/scripts/system_environment/upgrade_configdaemon 2024-10-15 11:56:39.067446561 -0400
15+
+++ b/scripts/system_environment/upgrade_configdaemon 2024-10-15 11:56:41.318752337 -0400
1616
@@ -87,5 +87,5 @@
1717
EOF
1818

@@ -22,8 +22,8 @@ Index: b/scripts/system_environment/upgrade_configdaemon
2222
fi
2323
Index: b/scripts/system_environment/upgrade_fix_permissions
2424
===================================================================
25-
--- a/scripts/system_environment/upgrade_fix_permissions 2024-09-06 11:45:01.821845326 -0400
26-
+++ b/scripts/system_environment/upgrade_fix_permissions 2024-09-06 11:45:04.261844632 -0400
25+
--- a/scripts/system_environment/upgrade_fix_permissions 2024-10-15 11:56:39.067510143 -0400
26+
+++ b/scripts/system_environment/upgrade_fix_permissions 2024-10-15 11:56:41.319010668 -0400
2727
@@ -8,10 +8,10 @@
2828
chown -R perfsonar:perfsonar /var/log/perfsonar
2929

@@ -49,8 +49,8 @@ Index: b/scripts/system_environment/upgrade_fix_permissions
4949
+chown -R www-data /var/lib/cacti/rra 2> /dev/null
5050
Index: b/scripts/system_environment/testpoint/configure_syslog_local5_location
5151
===================================================================
52-
--- a/scripts/system_environment/testpoint/configure_syslog_local5_location 2024-09-06 11:45:01.821376618 -0400
53-
+++ b/scripts/system_environment/testpoint/configure_syslog_local5_location 2024-09-06 11:45:04.262226048 -0400
52+
--- a/scripts/system_environment/testpoint/configure_syslog_local5_location 2024-10-15 11:56:39.067022690 -0400
53+
+++ b/scripts/system_environment/testpoint/configure_syslog_local5_location 2024-10-15 11:56:41.319286332 -0400
5454
@@ -11,32 +11,17 @@
5555
mv /var/log/perfsonar/owamp.log /var/log/perfsonar/owamp.log.old
5656
fi

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

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Index: b/scripts/apache-toolkit_web_gui.conf
22
===================================================================
3-
--- a/scripts/apache-toolkit_web_gui.conf 2024-09-06 11:45:01.819018123 -0400
4-
+++ b/scripts/apache-toolkit_web_gui.conf 2024-09-06 11:45:03.411515288 -0400
3+
--- a/scripts/apache-toolkit_web_gui.conf 2024-10-15 11:56:39.064732337 -0400
4+
+++ b/scripts/apache-toolkit_web_gui.conf 2024-10-15 11:56:40.497810114 -0400
55
@@ -13,6 +13,11 @@
66
# New link to the plot schedule graph
77
Alias /toolkit/plot /usr/lib/perfsonar/web-ng/root/admin/plot.cgi
@@ -72,8 +72,8 @@ Index: b/scripts/apache-toolkit_web_gui.conf
7272
ServerTokens Prod
7373
Index: b/scripts/add_pssudo_user
7474
===================================================================
75-
--- a/scripts/add_pssudo_user 2024-09-06 11:45:01.818925040 -0400
76-
+++ b/scripts/add_pssudo_user 2024-09-06 11:45:03.412133620 -0400
75+
--- a/scripts/add_pssudo_user 2024-10-15 11:56:39.064659046 -0400
76+
+++ b/scripts/add_pssudo_user 2024-10-15 11:56:40.498533358 -0400
7777
@@ -104,7 +104,7 @@
7878
fout.write(buffer)
7979

@@ -85,8 +85,8 @@ Index: b/scripts/add_pssudo_user
8585
sys.exit(1)
8686
Index: b/init_scripts/perfsonar-configure_nic_parameters
8787
===================================================================
88-
--- a/init_scripts/perfsonar-configure_nic_parameters 2024-09-06 11:45:01.817423210 -0400
89-
+++ b/init_scripts/perfsonar-configure_nic_parameters 2024-09-06 11:45:03.412481286 -0400
88+
--- a/init_scripts/perfsonar-configure_nic_parameters 2024-10-15 11:56:39.063402891 -0400
89+
+++ b/init_scripts/perfsonar-configure_nic_parameters 2024-10-15 11:56:40.498883979 -0400
9090
@@ -1,17 +1,12 @@
9191
#!/bin/sh
9292
-#
@@ -126,8 +126,8 @@ Index: b/init_scripts/perfsonar-configure_nic_parameters
126126
RETVAL=2
127127
Index: b/init_scripts/perfsonar-generate_motd
128128
===================================================================
129-
--- a/init_scripts/perfsonar-generate_motd 2024-09-06 11:45:01.817499876 -0400
130-
+++ b/init_scripts/perfsonar-generate_motd 2024-09-06 11:45:03.412842119 -0400
129+
--- a/init_scripts/perfsonar-generate_motd 2024-10-15 11:56:39.063471349 -0400
130+
+++ b/init_scripts/perfsonar-generate_motd 2024-10-15 11:56:40.499304100 -0400
131131
@@ -1,11 +1,15 @@
132132
#!/usr/bin/perl
133133
-#
@@ -153,8 +153,8 @@ Index: b/init_scripts/perfsonar-generate_motd
153153
use warnings;
154154
Index: b/web-ng/root/gui/reverse_traceroute.cgi
155155
===================================================================
156-
--- a/web-ng/root/gui/reverse_traceroute.cgi 2024-09-06 11:45:01.841066702 -0400
157-
+++ b/web-ng/root/gui/reverse_traceroute.cgi 2024-09-06 11:45:03.413389201 -0400
156+
--- a/web-ng/root/gui/reverse_traceroute.cgi 2024-10-15 11:56:39.083650947 -0400
157+
+++ b/web-ng/root/gui/reverse_traceroute.cgi 2024-10-15 11:56:40.499844762 -0400
158158
@@ -273,7 +273,7 @@
159159
#########################################################################
160160
# Build the executable function for tracepath
@@ -166,8 +166,8 @@ Index: b/web-ng/root/gui/reverse_traceroute.cgi
166166
#########################################################################
167167
Index: b/etc/perfsonar_ulimit.conf
168168
===================================================================
169-
--- a/etc/perfsonar_ulimit.conf 2024-09-06 11:45:01.816926211 -0400
170-
+++ b/etc/perfsonar_ulimit.conf 2024-09-06 11:45:03.413895617 -0400
169+
--- a/etc/perfsonar_ulimit.conf 2024-10-15 11:56:39.062922104 -0400
170+
+++ b/etc/perfsonar_ulimit.conf 2024-10-15 11:56:40.500376882 -0400
171171
@@ -1,8 +1,8 @@
172172
# Increases process limit and number of files open for various perfsonar tools
173173

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Index: b/t/host-get_metadata.t
22
===================================================================
3-
--- a/t/host-get_metadata.t 2024-09-06 11:45:01.823149198 -0400
4-
+++ b/t/host-get_metadata.t 2024-09-06 11:45:04.694095310 -0400
3+
--- a/t/host-get_metadata.t 2024-10-15 11:56:39.068708590 -0400
4+
+++ b/t/host-get_metadata.t 2024-10-15 11:56:41.814254092 -0400
55
@@ -6,6 +6,8 @@
66
use FindBin qw($Bin);
77
use lib "$Bin/lib";
@@ -13,8 +13,8 @@ Index: b/t/host-get_metadata.t
1313

1414
Index: b/t/host-get_services.t
1515
===================================================================
16-
--- a/t/host-get_services.t 2024-09-06 11:45:01.823235948 -0400
17-
+++ b/t/host-get_services.t 2024-09-06 11:45:04.694663768 -0400
16+
--- a/t/host-get_services.t 2024-10-15 11:56:39.068793714 -0400
17+
+++ b/t/host-get_services.t 2024-10-15 11:56:41.814817045 -0400
1818
@@ -6,6 +6,8 @@
1919
use FindBin qw($Bin);
2020
use lib "$Bin/lib";
@@ -26,8 +26,8 @@ Index: b/t/host-get_services.t
2626

2727
Index: b/t/host-get_system_health.t
2828
===================================================================
29-
--- a/t/host-get_system_health.t 2024-09-06 11:45:01.823333531 -0400
30-
+++ b/t/host-get_system_health.t 2024-09-06 11:45:04.695111433 -0400
29+
--- a/t/host-get_system_health.t 2024-10-15 11:56:39.068876755 -0400
30+
+++ b/t/host-get_system_health.t 2024-10-15 11:56:41.815317082 -0400
3131
@@ -9,10 +9,12 @@
3232
use FindBin qw($Bin);
3333
use lib "$Bin/lib";
@@ -67,8 +67,8 @@ Index: b/t/host-get_system_health.t
6767
ok( nonnegative_number( $data->{'load_avg'}->{'avg_5'} ), 'Load average (5 minute) is a positive number');
6868
Index: b/t/host-update_metadata.t
6969
===================================================================
70-
--- a/t/host-update_metadata.t 2024-09-06 11:45:01.823439531 -0400
71-
+++ b/t/host-update_metadata.t 2024-09-06 11:45:04.695419266 -0400
70+
--- a/t/host-update_metadata.t 2024-10-15 11:56:39.068973713 -0400
71+
+++ b/t/host-update_metadata.t 2024-10-15 11:56:41.815757245 -0400
7272
@@ -13,6 +13,8 @@
7373
use FindBin qw($Bin);
7474
use lib "$Bin/lib";

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
%define init_script_2 perfsonar-generate_motd
1414
%define init_script_3 perfsonar-configure_nic_parameters
1515

16-
%define perfsonar_auto_version 5.1.3
16+
%define perfsonar_auto_version 5.1.4
1717
%define perfsonar_auto_relnum 1
1818

1919
Name: perfsonar-toolkit

0 commit comments

Comments
 (0)