[oe-commits] Roy Li : webmin: upgrade to 1.750

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master-next
Commit: f55eb83636f720851d8b53f21ca2dcbcddba1780
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=f55eb83636f720851d8b53f21ca2dcbcddba1780

Author: Roy Li <rongqing.li at windriver.com>
Date:   Mon Jun  1 13:18:25 2015 +0800

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 at windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 .../recipes-webadmin/webmin/files/remove-startup-option.patch         | 2 +-
 .../recipes-webadmin/webmin/{webmin_1.700.bb => webmin_1.750.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 8493af8..d957f4a 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
similarity index 97%
rename from meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
rename to meta-webserver/recipes-webadmin/webmin/webmin_1.750.bb
index c6523c5..b6fbb0a 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