diff options
| author |   Roy Li <rongqing.li@windriver.com> | 2015-06-01 13:18:25 +0800 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-06-08 14:15:23 +0200 |
| commit | b3e16dfaf9c700bd52b5e26092901f1ab789e92c (patch) | |
| tree | 209491b46c94680727b70bf26679ea8c8e297734 /meta-webserver/recipes-webadmin | |
| parent | f6176c913c0a78603cfc0177e85f614812c38dce (diff) | |
| download | meta-openembedded-contrib-b3e16dfaf9c700bd52b5e26092901f1ab789e92c.tar.gz | |
webmin: upgrade to 1.750
1. Upgrade to fix the CVE:
https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1377
2. update the patch remove-startup-option.patch
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-webadmin')
| -rw-r--r-- | meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch | 2 | ||||
| -rw-r--r-- | meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb (renamed from meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb) | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch index 8493af8526..d957f4a3bc 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/remove-startup-option.patch @@ -11,7 +11,7 @@ &get_miniserv_config(\%miniserv); -if (&foreign_check("init")) { -- &foreign_require("init", "init-lib.pl"); +- &foreign_require("init"); - my $starting = &init::action_status("webmin"); - print &ui_buttons_row("bootup.cgi", - $text{'index_boot'}, diff --git a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb b/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb index c6523c53d8..b6fbb0a718 100644 --- a/meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb +++ b/meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb @@ -19,8 +19,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://remove-python2.3.patch \ " -SRC_URI[md5sum] = "e5261114a6a6ed10caf570d3239ed5b7" -SRC_URI[sha256sum] = "1a6a8aa62c32c04932b902d17fc1864ee8f3fba03012bd25f709aa65e7e9b0f2" +SRC_URI[md5sum] = "4007c390323d840f26c2e0f43c5c81a3" +SRC_URI[sha256sum] = "5111f820adc6fbca997a58d4b2fa186dac6cded9cff0e70724f8cae6021123d9" inherit perlnative update-rc.d |