CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

webmin: uprev from 1.620 to 1.700

Browse Source 
Changed:

- Adjust or remake the following patches based on 1.700:
  init-exclude.patch
  exports-lib.pl.patch

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Jackie Huang 2014-08-20 02:24:18 -04:00 committed by Martin Jansa
parent 2d6b021fce
commit bb4fedff5f
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch
View File

@ -24,7 +24,7 @@ index 22891c0..1c67494 100755
# Try exportfs -r first
-if ($config{'apply_cmd'} && &find_byname("nfsd") && &find_byname("mountd")) {
+if ($config{'apply_cmd'} && &find_byname("mountd")) {
local $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null");
my $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null");
if (!$? && $out !~ /invalid|error|failed/i) {
# Looks like it worked!
--

35
meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch
View File

@ -5,9 +5,17 @@
# Upstream-status: Pending
#
# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
--- webmin-1.570.orig/init/index.cgi
+++ webmin-1.570/init/index.cgi
@@ -48,19 +48,20 @@ elsif ($init_mode eq "init" && $access{'
# Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
init/index.cgi | 27 ++++++++++++++-------------
init/init-lib.pl | 5 +++--
2 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/init/index.cgi b/init/index.cgi
index d48b793..30dafd4 100755
--- a/init/index.cgi
+++ b/init/index.cgi
@@ -45,19 +45,20 @@ elsif ($init_mode eq "init" && $access{'bootup'}) {
: "$config{'init_dir'}/$ac[0]");
}
@runlevels = &list_runlevels();
@ -41,11 +49,11 @@
# For each action, look at /etc/rc*.d/* files to see if it is
# started at boot
Index: webmin-1.570/init/init-lib.pl
===================================================================
--- webmin-1.570.orig/init/init-lib.pl
+++ webmin-1.570/init/init-lib.pl
@@ -108,15 +108,17 @@ List boot time action names from init.d,
diff --git a/init/init-lib.pl b/init/init-lib.pl
index ead21ed..b41794b 100755
--- a/init/init-lib.pl
+++ b/init/init-lib.pl
@@ -119,8 +119,9 @@ List boot time action names from init.d, such as httpd and cron.
=cut
sub list_actions
{
@ -56,12 +64,15 @@ Index: webmin-1.570/init/init-lib.pl
opendir(DIR, $dir);
foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) {
if ($f eq "." || $f eq ".." || $f =~ /\.bak$/ || $f eq "functions" ||
$f eq "core" || $f eq "README" || $f eq "rc" || $f eq "rcS" ||
@@ -128,7 +129,7 @@ foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) {
-d "$dir/$f" || $f =~ /\.swp$/ || $f eq "skeleton" ||
$f =~ /\.lock$/ || $f =~ /\.dpkg-(old|dist)$/ ||
- $f =~ /^\.depend\./ || $f eq '.legacy-bootordering') { next; }
+ $f =~ /^\.depend\./ || $f eq '.legacy-bootordering' ||
+ grep {$_ eq $f} @exclude ) { next; }
$f =~ /^\.depend\./ || $f eq '.legacy-bootordering' ||
- $f =~ /^mandrake/) { next; }
+ $f =~ /^mandrake/ || grep {$_ eq $f} @exclude ) { next; }
if (@stbuf = stat("$dir/$f")) {
push(@rv, "$f $stbuf[1]");
}
--
2.0.0

4
meta-webserver/recipes-webadmin/webmin/webmin_1.620.bb → meta-webserver/recipes-webadmin/webmin/webmin_1.700.bb
View File

@ -17,8 +17,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \
file://net-lib.pl.patch \
file://media-tomb.patch"
SRC_URI[md5sum] = "e93bc5057a5b7d7e31ecb2bb228d7044"
SRC_URI[sha256sum] = "3d36153406d8e5d3dcaeadba34dfb5cdbc4060b75c38339174ac97b2277f284b"
SRC_URI[md5sum] = "e5261114a6a6ed10caf570d3239ed5b7"
SRC_URI[sha256sum] = "1a6a8aa62c32c04932b902d17fc1864ee8f3fba03012bd25f709aa65e7e9b0f2"
inherit perlnative update-rc.d