aboutsummaryrefslogtreecommitdiffstats
path: root/meta-webserver
diff options
context:
space:
mode:
authorDerek Straka <derek@asterius.io>2016-07-27 11:54:38 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2016-08-05 12:16:38 +0200
commit181f5f81a39fef8658625394ddbb216fc2f4fe79 (patch)
tree916d2437bd97fb5973af0006ae5f316d8fba105b /meta-webserver
parentdf5141af8dfd19c2b2dbfb65f58eda7a509fafd8 (diff)
downloadmeta-openembedded-contrib-181f5f81a39fef8658625394ddbb216fc2f4fe79.tar.gz
webmin: upgrade to version 1.801
Signed-off-by: Derek Straka <derek@asterius.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver')
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch48
-rw-r--r--meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb (renamed from meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb)4
2 files changed, 36 insertions, 16 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 a9ee405075..1ca1480c31 100644
--- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
+++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch
@@ -11,7 +11,7 @@ diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl
index 57a37f7..838b944 100755
--- a/webmin/webmin-lib.pl
+++ b/webmin/webmin-lib.pl
-@@ -1059,18 +1059,19 @@ my %miniserv;
+@@ -1086,28 +1086,28 @@
&load_theme_library(); # So that UI functions work
# Need OS upgrade
@@ -20,26 +20,46 @@ index 57a37f7..838b944 100755
- $realos{'os_type'} ne $gconfig{'os_type'}) &&
- $realos{'os_version'} && $realos{'os_type'} &&
- &foreign_available("webmin")) {
-- 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'} ] ])
-- );
+- 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'} ] ])
+- );
+- }
- }
-+# Disabled for now as os-chooser.pl does not work on our system
+#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")) {
-+# 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'} ] ])
-+# );
++# 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'};
+
diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb
index 34052a147b..3fc083a36b 100644
--- a/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb
+++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.801.bb
@@ -20,8 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://mysql-config-fix.patch \
"
-SRC_URI[md5sum] = "4007c390323d840f26c2e0f43c5c81a3"
-SRC_URI[sha256sum] = "5111f820adc6fbca997a58d4b2fa186dac6cded9cff0e70724f8cae6021123d9"
+SRC_URI[md5sum] = "91d05b4e31ad1bd14bab14e0f155c088"
+SRC_URI[sha256sum] = "ad477edb41dc1a900448afc8b5528e136b3778d2d303f23bc564afb975eb5bed"
inherit perlnative update-rc.d