mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

webmin: Upgrade to 2.111 release

Browse Source 
Drop remove-python2.3.patch since corresponding script is gone

License-Update: Formatting changes

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2024-07-11 16:43:07 -07:00
parent 85132c1621
commit 294c0251f8
7 changed files with 51 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
+31 -45
View File
@@ -7,58 +7,44 @@ Upstream-Status: Inappropriate
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Index: webmin-1.850/webmin/webmin-lib.pl
===================================================================
--- webmin-1.850.orig/webmin/webmin-lib.pl
+++ webmin-1.850/webmin/webmin-lib.pl
@@ -1112,28 +1112,28 @@ my %miniserv;
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
@@ -1170,38 +1170,6 @@ my %miniserv;
&get_miniserv_config(\%miniserv);
&load_theme_library(); # So that UI functions work
# Need OS upgrade
-my %realos = &detect_operating_system(undef, 1);
-if (($realos{'os_version'} ne $gconfig{'os_version'} ||
- $realos{'os_type'} ne $gconfig{'os_type'}) &&
- $realos{'os_version'} && $realos{'os_type'} &&
- &foreign_available("webmin")) {
- my ($realminor) = split(/\./, $realos{'os_version'});
- my ($minor) = split(/\./, $gconfig{'os_version'});
- if ($realos{'os_type'} eq $gconfig{'os_type'} &&
- $realminor == $minor) {
- # Only the minor version number changed - no need to apply
- &apply_new_os_version(\%realos);
-# Need OS upgrade, but only once per day or if the system was rebooted
-my $now = time();
-my $uptime = &get_system_uptime();
-if (&foreign_available("webmin")) {
- my %realos;
- my @st = stat($realos_cache_file);
- if (!@st || $now - $st[9] > 24*60*60 ||
- $uptime && $now - $st[9] > $uptime) {
- %realos = &detect_operating_system(undef, 1);
- &write_file($realos_cache_file, \%realos);
- }
- else {
- # Large enough change to tell the user
- push(@notifs,
- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi").
- &text('os_incorrect', $realos{'real_os_type'},
- $realos{'real_os_version'})."<p>\n".
- &read_file($realos_cache_file, \%realos);
- }
- if (($realos{'os_version'} ne $gconfig{'os_version'} ||
- $realos{'real_os_version'} ne $gconfig{'real_os_version'} ||
- $realos{'os_type'} ne $gconfig{'os_type'}) &&
- $realos{'os_version'} && $realos{'os_type'} &&
- &foreign_available("webmin")) {
- # Tell the user that OS version was updated
- push(@notifs,
- &ui_form_start("@{[&get_webprefix()]}/webmin/fix_os.cgi").
- &text('os_incorrect',
- $realos{'real_os_type'},
- $realos{'real_os_version'}).
- &show_os_release_notes($realos{'real_os_version'}).
- "<p>\n".
- &ui_form_end([ [ undef, $text{'os_fix'} ] ])
- );
- }
- }
+#my %realos = &detect_operating_system(undef, 1);
+#if (($realos{'os_version'} ne $gconfig{'os_version'} ||
+# $realos{'os_type'} ne $gconfig{'os_type'}) &&
+# $realos{'os_version'} && $realos{'os_type'} &&
+# &foreign_available("webmin")) {
+# my ($realminor) = split(/\./, $realos{'os_version'});
+# my ($minor) = split(/\./, $gconfig{'os_version'});
+# if ($realos{'os_type'} eq $gconfig{'os_type'} &&
+# $realminor == $minor) {
+# # Only the minor version number changed - no need to apply
+# &apply_new_os_version(\%realos);
+# }
+# else {
+# # Large enough change to tell the user
+# push(@notifs,
+# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi").
+# &text('os_incorrect', $realos{'real_os_type'},
+# $realos{'real_os_version'})."<p>\n".
+# &ui_form_end([ [ undef, $text{'os_fix'} ] ])
+# );
+# }
+# }
-
# Password close to expiry
my $warn_days = $config{'warn_days'};
if (&foreign_check("acl")) {