webmin: upgrade 2.300 -> 2.303

net-generic.patch : lines changed order in the new version

disable-version-check.patch : additional code to be removed from the
  function which is being deleted.

Changelog: https://github.com/webmin/webmin/releases/tag/2.303
Changelog: https://github.com/webmin/webmin/releases/tag/2.302
Changelog: https://github.com/webmin/webmin/releases/tag/2.301

Signed-off-by: Jason Schonberg <schonm@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Jason Schonberg
2025-10-24 01:11:51 -04:00
committed by Khem Raj
parent 6a21bd735b
commit 2278f23482
3 changed files with 20 additions and 7 deletions
@@ -9,7 +9,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
@@ -1170,38 +1170,6 @@ my %miniserv;
@@ -1234,52 +1234,6 @@ my %miniserv;
&get_miniserv_config(\%miniserv);
&load_theme_library(); # So that UI functions work
@@ -27,6 +27,20 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
- else {
- &read_file($realos_cache_file, \%realos);
- }
- my $new_real = $realos{'real_os_version'};
- my $old_real = $gconfig{'real_os_version'};
- $new_real =~ s/\.\d+$//;
- $old_real =~ s/\.\d+$//;
- if ($realos{'real_os_type'} eq $gconfig{'real_os_type'} &&
- $new_real eq $old_real &&
- $realos{'real_os_version'} ne $gconfig{'real_os_version'}) {
- # Only the minor OS version has changed, just silently update it
- &lock_file("$config_directory/config");
- $gconfig{'real_os_version'} = $realos{'real_os_version'};
- $gconfig{'os_version'} = $realos{'os_version'};
- &write_file("$config_directory/config", \%gconfig);
- &unlock_file("$config_directory/config");
- }
- if (($realos{'os_version'} ne $gconfig{'os_version'} ||
- $realos{'real_os_version'} ne $gconfig{'real_os_version'} ||
- $realos{'os_type'} ne $gconfig{'os_type'}) &&