diff options
Diffstat (limited to 'meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch')
| -rw-r--r-- | meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch | 76 |
1 files changed, 31 insertions, 45 deletions
diff --git a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch index 1ca26ca0dd..46b1f7c7b8 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch | |||
| @@ -7,58 +7,44 @@ Upstream-Status: Inappropriate | |||
| 7 | 7 | ||
| 8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | 8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> |
| 9 | 9 | ||
| 10 | Index: webmin-1.850/webmin/webmin-lib.pl | 10 | --- a/webmin/webmin-lib.pl |
| 11 | =================================================================== | 11 | +++ b/webmin/webmin-lib.pl |
| 12 | --- webmin-1.850.orig/webmin/webmin-lib.pl | 12 | @@ -1170,38 +1170,6 @@ my %miniserv; |
| 13 | +++ webmin-1.850/webmin/webmin-lib.pl | 13 | &get_miniserv_config(\%miniserv); |
| 14 | @@ -1112,28 +1112,28 @@ my %miniserv; | ||
| 15 | &load_theme_library(); # So that UI functions work | 14 | &load_theme_library(); # So that UI functions work |
| 16 | 15 | ||
| 17 | # Need OS upgrade | 16 | -# Need OS upgrade, but only once per day or if the system was rebooted |
| 18 | -my %realos = &detect_operating_system(undef, 1); | 17 | -my $now = time(); |
| 19 | -if (($realos{'os_version'} ne $gconfig{'os_version'} || | 18 | -my $uptime = &get_system_uptime(); |
| 20 | - $realos{'os_type'} ne $gconfig{'os_type'}) && | 19 | -if (&foreign_available("webmin")) { |
| 21 | - $realos{'os_version'} && $realos{'os_type'} && | 20 | - my %realos; |
| 22 | - &foreign_available("webmin")) { | 21 | - my @st = stat($realos_cache_file); |
| 23 | - my ($realminor) = split(/\./, $realos{'os_version'}); | 22 | - if (!@st || $now - $st[9] > 24*60*60 || |
| 24 | - my ($minor) = split(/\./, $gconfig{'os_version'}); | 23 | - $uptime && $now - $st[9] > $uptime) { |
| 25 | - if ($realos{'os_type'} eq $gconfig{'os_type'} && | 24 | - %realos = &detect_operating_system(undef, 1); |
| 26 | - $realminor == $minor) { | 25 | - &write_file($realos_cache_file, \%realos); |
| 27 | - # Only the minor version number changed - no need to apply | ||
| 28 | - &apply_new_os_version(\%realos); | ||
| 29 | - } | 26 | - } |
| 30 | - else { | 27 | - else { |
| 31 | - # Large enough change to tell the user | 28 | - &read_file($realos_cache_file, \%realos); |
| 32 | - push(@notifs, | 29 | - } |
| 33 | - &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). | 30 | - if (($realos{'os_version'} ne $gconfig{'os_version'} || |
| 34 | - &text('os_incorrect', $realos{'real_os_type'}, | 31 | - $realos{'real_os_version'} ne $gconfig{'real_os_version'} || |
| 35 | - $realos{'real_os_version'})."<p>\n". | 32 | - $realos{'os_type'} ne $gconfig{'os_type'}) && |
| 33 | - $realos{'os_version'} && $realos{'os_type'} && | ||
| 34 | - &foreign_available("webmin")) { | ||
| 35 | - # Tell the user that OS version was updated | ||
| 36 | - push(@notifs, | ||
| 37 | - &ui_form_start("@{[&get_webprefix()]}/webmin/fix_os.cgi"). | ||
| 38 | - &text('os_incorrect', | ||
| 39 | - $realos{'real_os_type'}, | ||
| 40 | - $realos{'real_os_version'}). | ||
| 41 | - &show_os_release_notes($realos{'real_os_version'}). | ||
| 42 | - "<p>\n". | ||
| 36 | - &ui_form_end([ [ undef, $text{'os_fix'} ] ]) | 43 | - &ui_form_end([ [ undef, $text{'os_fix'} ] ]) |
| 37 | - ); | 44 | - ); |
| 38 | - } | 45 | - } |
| 39 | - } | 46 | - } |
| 40 | +#my %realos = &detect_operating_system(undef, 1); | 47 | - |
| 41 | +#if (($realos{'os_version'} ne $gconfig{'os_version'} || | ||
| 42 | +# $realos{'os_type'} ne $gconfig{'os_type'}) && | ||
| 43 | +# $realos{'os_version'} && $realos{'os_type'} && | ||
| 44 | +# &foreign_available("webmin")) { | ||
| 45 | +# my ($realminor) = split(/\./, $realos{'os_version'}); | ||
| 46 | +# my ($minor) = split(/\./, $gconfig{'os_version'}); | ||
| 47 | +# if ($realos{'os_type'} eq $gconfig{'os_type'} && | ||
| 48 | +# $realminor == $minor) { | ||
| 49 | +# # Only the minor version number changed - no need to apply | ||
| 50 | +# &apply_new_os_version(\%realos); | ||
| 51 | +# } | ||
| 52 | +# else { | ||
| 53 | +# # Large enough change to tell the user | ||
| 54 | +# push(@notifs, | ||
| 55 | +# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). | ||
| 56 | +# &text('os_incorrect', $realos{'real_os_type'}, | ||
| 57 | +# $realos{'real_os_version'})."<p>\n". | ||
| 58 | +# &ui_form_end([ [ undef, $text{'os_fix'} ] ]) | ||
| 59 | +# ); | ||
| 60 | +# } | ||
| 61 | +# } | ||
| 62 | |||
| 63 | # Password close to expiry | 48 | # Password close to expiry |
| 64 | my $warn_days = $config{'warn_days'}; | 49 | my $warn_days = $config{'warn_days'}; |
| 50 | if (&foreign_check("acl")) { | ||