Skip to content

Commit a78cb72

Browse files
arlake228arlake228
committed
Merge branch '5.0.8'
2 parents e71aa32 + 86bfa6e commit a78cb72

11 files changed

+50
-50
lines changed

‎toolkit/perfsonar-toolkit/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PACKAGE=perfsonar-toolkit
22
ROOTPATH=/usr/lib/perfsonar
33
CONFIGPATH=/etc/perfsonar/toolkit
44
PERFSONAR_AUTO_VERSION=5.0.8
5-
PERFSONAR_AUTO_RELNUM=0.a1.0
5+
PERFSONAR_AUTO_RELNUM=1
66
VERSION=${PERFSONAR_AUTO_VERSION}
77
RELEASE=${PERFSONAR_AUTO_RELNUM}
88
DC_CMD_BASE=docker-compose

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
perfsonar-toolkit (5.0.8~a1.0-1) perfsonar-5.0-snapshot; urgency=low
1+
perfsonar-toolkit (5.0.8-1) perfsonar-5.0; urgency=low
22

33
* New upstream version.
44

5-
-- perfSONAR developers <debian@perfsonar.net> Tue, 12 Dec 2023 13:16:50 -0500
5+
-- perfSONAR developers <debian@perfsonar.net> Mon, 05 Feb 2024 12:54:25 -0500
66

77
perfsonar-toolkit (5.0.7-1) perfsonar-5.0; urgency=low
88

‎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 2023-12-08 15:42:53.373624557 -0500
4-
+++ b/init_scripts/perfsonar-configure_nic_parameters 2023-12-08 15:42:53.484090883 -0500
3+
--- a/init_scripts/perfsonar-configure_nic_parameters 2024-02-05 12:54:26.376263711 -0500
4+
+++ b/init_scripts/perfsonar-configure_nic_parameters 2024-02-05 12:54:26.775936267 -0500
55
@@ -9,7 +9,7 @@
66
### END INIT INFO
77

@@ -83,8 +83,8 @@ Index: b/init_scripts/perfsonar-configure_nic_parameters
8383
;;
8484
Index: b/scripts/system_environment/disable_unwanted_services
8585
===================================================================
86-
--- a/scripts/system_environment/disable_unwanted_services 2023-12-08 15:42:52.310063678 -0500
87-
+++ b/scripts/system_environment/disable_unwanted_services 2023-12-08 15:42:53.484384173 -0500
86+
--- a/scripts/system_environment/disable_unwanted_services 2024-02-05 12:54:17.437425168 -0500
87+
+++ b/scripts/system_environment/disable_unwanted_services 2024-02-05 12:54:26.776496178 -0500
8888
@@ -6,9 +6,9 @@
8989

9090
function disable_service() {
@@ -99,8 +99,8 @@ Index: b/scripts/system_environment/disable_unwanted_services
9999

100100
Index: b/scripts/system_environment/testpoint/enable_auto_updates
101101
===================================================================
102-
--- a/scripts/system_environment/testpoint/enable_auto_updates 2023-12-08 15:42:52.310463842 -0500
103-
+++ b/scripts/system_environment/testpoint/enable_auto_updates 2023-12-08 15:42:53.484650630 -0500
102+
--- a/scripts/system_environment/testpoint/enable_auto_updates 2024-02-05 12:54:17.437872079 -0500
103+
+++ b/scripts/system_environment/testpoint/enable_auto_updates 2024-02-05 12:54:26.776981214 -0500
104104
@@ -11,22 +11,19 @@
105105
MAJOR=${PREV_VERSION%%\.*}
106106
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 2023-12-08 15:42:52.306016781 -0500
4-
+++ b/bin/config_daemon.pl 2023-12-08 15:42:53.222010894 -0500
3+
--- a/bin/config_daemon.pl 2024-02-05 12:54:17.432456432 -0500
4+
+++ b/bin/config_daemon.pl 2024-02-05 12:54:25.868956999 -0500
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 2023-12-08 15:42:52.306395612 -0500
26-
+++ b/etc/configdaemon.conf 2023-12-08 15:42:53.222384518 -0500
25+
--- a/etc/configdaemon.conf 2024-02-05 12:54:17.432975343 -0500
26+
+++ b/etc/configdaemon.conf 2024-02-05 12:54:25.869453869 -0500
2727
@@ -1,6 +1,6 @@
2828
address 127.0.0.1
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 2023-12-08 15:42:52.309411639 -0500
4-
+++ b/scripts/nptoolkit-configure.py 2023-12-08 15:42:53.570910368 -0500
3+
--- a/scripts/nptoolkit-configure.py 2024-02-05 12:54:17.436708301 -0500
4+
+++ b/scripts/nptoolkit-configure.py 2024-02-05 12:54:27.078611630 -0500
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 2023-12-08 15:42:52.308912475 -0500
4-
+++ b/scripts/configure_firewall 2023-12-08 15:42:53.302556619 -0500
3+
--- a/scripts/configure_firewall 2024-02-05 12:54:17.436153807 -0500
4+
+++ b/scripts/configure_firewall 2024-02-05 12:54:26.129975876 -0500
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 2023-12-08 15:42:52.309075224 -0500
4-
+++ b/scripts/configure_sysctl 2023-12-08 15:42:53.747145366 -0500
3+
--- a/scripts/configure_sysctl 2024-02-05 12:54:17.436344763 -0500
4+
+++ b/scripts/configure_sysctl 2024-02-05 12:54:27.684298353 -0500
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

+10-10
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 2023-12-08 15:42:52.309876345 -0500
4-
+++ b/scripts/system_environment/configure_fail2ban 2023-12-08 15:42:53.643753547 -0500
3+
--- a/scripts/system_environment/configure_fail2ban 2024-02-05 12:54:17.437208295 -0500
4+
+++ b/scripts/system_environment/configure_fail2ban 2024-02-05 12:54:27.314261794 -0500
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 2023-12-08 15:42:52.310712508 -0500
15-
+++ b/scripts/system_environment/upgrade_configdaemon 2023-12-08 15:42:53.644074962 -0500
14+
--- a/scripts/system_environment/upgrade_configdaemon 2024-02-05 12:54:17.438165368 -0500
15+
+++ b/scripts/system_environment/upgrade_configdaemon 2024-02-05 12:54:27.314847913 -0500
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 2023-12-08 15:42:52.310764799 -0500
26-
+++ b/scripts/system_environment/upgrade_fix_permissions 2023-12-08 15:42:53.644257670 -0500
25+
--- a/scripts/system_environment/upgrade_fix_permissions 2024-02-05 12:54:17.438224200 -0500
26+
+++ b/scripts/system_environment/upgrade_fix_permissions 2024-02-05 12:54:27.315150826 -0500
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/configure_apache_security
5151
===================================================================
52-
--- a/scripts/configure_apache_security 2023-12-08 15:42:52.308836767 -0500
53-
+++ b/scripts/configure_apache_security 2023-12-08 15:42:53.644462627 -0500
52+
--- a/scripts/configure_apache_security 2024-02-05 12:54:17.436065350 -0500
53+
+++ b/scripts/configure_apache_security 2024-02-05 12:54:27.315478614 -0500
5454
@@ -5,14 +5,18 @@
5555
# updates. Settings will be in apache-security.conf but if someone wants
5656
# to override those settings then they can do so in ssl.comnf after first install
@@ -80,8 +80,8 @@ Index: b/scripts/configure_apache_security
8080
+done
8181
Index: b/scripts/system_environment/testpoint/configure_syslog_local5_location
8282
===================================================================
83-
--- a/scripts/system_environment/testpoint/configure_syslog_local5_location 2023-12-08 15:42:52.310410968 -0500
84-
+++ b/scripts/system_environment/testpoint/configure_syslog_local5_location 2023-12-08 15:42:53.644677543 -0500
83+
--- a/scripts/system_environment/testpoint/configure_syslog_local5_location 2024-02-05 12:54:17.437816455 -0500
84+
+++ b/scripts/system_environment/testpoint/configure_syslog_local5_location 2024-02-05 12:54:27.315836235 -0500
8585
@@ -11,32 +11,17 @@
8686
mv /var/log/perfsonar/owamp.log /var/log/perfsonar/owamp.log.old
8787
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 2023-12-08 15:42:52.308676976 -0500
4-
+++ b/scripts/apache-toolkit_web_gui.conf 2023-12-08 15:42:53.373099352 -0500
3+
--- a/scripts/apache-toolkit_web_gui.conf 2024-02-05 12:54:17.435883393 -0500
4+
+++ b/scripts/apache-toolkit_web_gui.conf 2024-02-05 12:54:26.375224264 -0500
55
@@ -11,6 +11,11 @@
66
Alias /toolkit/plot /usr/lib/perfsonar/web-ng/root/admin/plot.cgi
77

@@ -85,8 +85,8 @@ Index: b/scripts/apache-toolkit_web_gui.conf
8585
##
8686
Index: b/scripts/add_pssudo_user
8787
===================================================================
88-
--- a/scripts/add_pssudo_user 2023-12-08 15:42:52.308619643 -0500
89-
+++ b/scripts/add_pssudo_user 2023-12-08 15:42:53.373425767 -0500
88+
--- a/scripts/add_pssudo_user 2024-02-05 12:54:17.435819269 -0500
89+
+++ b/scripts/add_pssudo_user 2024-02-05 12:54:26.375915423 -0500
9090
@@ -104,7 +104,7 @@
9191
fout.write(buffer)
9292

@@ -98,8 +98,8 @@ Index: b/scripts/add_pssudo_user
9898
sys.exit(1)
9999
Index: b/init_scripts/perfsonar-configure_nic_parameters
100100
===================================================================
101-
--- a/init_scripts/perfsonar-configure_nic_parameters 2023-12-08 15:42:52.307580065 -0500
102-
+++ b/init_scripts/perfsonar-configure_nic_parameters 2023-12-08 15:42:53.373624557 -0500
101+
--- a/init_scripts/perfsonar-configure_nic_parameters 2024-02-05 12:54:17.434605950 -0500
102+
+++ b/init_scripts/perfsonar-configure_nic_parameters 2024-02-05 12:54:26.376263711 -0500
103103
@@ -1,17 +1,12 @@
104104
#!/bin/sh
105105
-#
@@ -139,8 +139,8 @@ Index: b/init_scripts/perfsonar-configure_nic_parameters
139139
RETVAL=2
140140
Index: b/init_scripts/perfsonar-generate_motd
141141
===================================================================
142-
--- a/init_scripts/perfsonar-generate_motd 2023-12-08 15:42:52.307638523 -0500
143-
+++ b/init_scripts/perfsonar-generate_motd 2023-12-08 15:42:53.373841348 -0500
142+
--- a/init_scripts/perfsonar-generate_motd 2024-02-05 12:54:17.434672616 -0500
143+
+++ b/init_scripts/perfsonar-generate_motd 2024-02-05 12:54:26.376647248 -0500
144144
@@ -1,11 +1,15 @@
145145
#!/usr/bin/perl
146146
-#
@@ -166,8 +166,8 @@ Index: b/init_scripts/perfsonar-generate_motd
166166
use warnings;
167167
Index: b/web-ng/root/gui/reverse_traceroute.cgi
168168
===================================================================
169-
--- a/web-ng/root/gui/reverse_traceroute.cgi 2023-12-08 15:42:52.323786984 -0500
170-
+++ b/web-ng/root/gui/reverse_traceroute.cgi 2023-12-08 15:42:53.374161180 -0500
169+
--- a/web-ng/root/gui/reverse_traceroute.cgi 2024-02-05 12:54:17.456639867 -0500
170+
+++ b/web-ng/root/gui/reverse_traceroute.cgi 2024-02-05 12:54:26.377190242 -0500
171171
@@ -273,7 +273,7 @@
172172
#########################################################################
173173
# Build the executable function for tracepath
@@ -179,8 +179,8 @@ Index: b/web-ng/root/gui/reverse_traceroute.cgi
179179
#########################################################################
180180
Index: b/etc/perfsonar_ulimit.conf
181181
===================================================================
182-
--- a/etc/perfsonar_ulimit.conf 2023-12-08 15:42:52.307127942 -0500
183-
+++ b/etc/perfsonar_ulimit.conf 2023-12-08 15:42:53.374454928 -0500
182+
--- a/etc/perfsonar_ulimit.conf 2024-02-05 12:54:17.434025165 -0500
183+
+++ b/etc/perfsonar_ulimit.conf 2024-02-05 12:54:26.377697736 -0500
184184
@@ -1,8 +1,8 @@
185185
# Increases process limit and number of files open for various perfsonar tools
186186

‎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 2023-12-08 15:42:52.311699169 -0500
4-
+++ b/t/host-get_metadata.t 2023-12-08 15:42:53.822751157 -0500
3+
--- a/t/host-get_metadata.t 2024-02-05 12:54:17.439260647 -0500
4+
+++ b/t/host-get_metadata.t 2024-02-05 12:54:27.927484890 -0500
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 2023-12-08 15:42:52.311760252 -0500
17-
+++ b/t/host-get_services.t 2023-12-08 15:42:53.823050572 -0500
16+
--- a/t/host-get_services.t 2024-02-05 12:54:17.439331438 -0500
17+
+++ b/t/host-get_services.t 2024-02-05 12:54:27.928028675 -0500
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 2023-12-08 15:42:52.311832752 -0500
30-
+++ b/t/host-get_system_health.t 2023-12-08 15:42:53.823299488 -0500
29+
--- a/t/host-get_system_health.t 2024-02-05 12:54:17.439401854 -0500
30+
+++ b/t/host-get_system_health.t 2024-02-05 12:54:27.928417254 -0500
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 2023-12-08 15:42:52.311909127 -0500
71-
+++ b/t/host-update_metadata.t 2023-12-08 15:42:53.823480945 -0500
70+
--- a/t/host-update_metadata.t 2024-02-05 12:54:17.439478061 -0500
71+
+++ b/t/host-update_metadata.t 2024-02-05 12:54:27.928734834 -0500
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
@@ -17,7 +17,7 @@
1717
%define crontab_1 cron-service_watcher
1818

1919
%define perfsonar_auto_version 5.0.8
20-
%define perfsonar_auto_relnum 0.a1.0
20+
%define perfsonar_auto_relnum 1
2121

2222
Name: perfsonar-toolkit
2323
Version: %{perfsonar_auto_version}

0 commit comments

Comments
 (0)