diff options
Diffstat (limited to 'meta-webserver')
5 files changed, 39 insertions, 42 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 1ca1480c31..9aad894e0c 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch @@ -7,11 +7,11 @@ Upstream-status: Inappropriate Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -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 -@@ -1086,28 +1086,28 @@ +Index: webmin-1.850/webmin/webmin-lib.pl +=================================================================== +--- webmin-1.850.orig/webmin/webmin-lib.pl ++++ webmin-1.850/webmin/webmin-lib.pl +@@ -1112,28 +1112,28 @@ my %miniserv; &load_theme_library(); # So that UI functions work # Need OS upgrade @@ -62,4 +62,3 @@ index 57a37f7..838b944 100755 # Password close to expiry my $warn_days = $config{'warn_days'}; - diff --git a/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch b/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch index 177d8a372e..d5dfed5ad4 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch @@ -14,11 +14,11 @@ Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com> exports/exports-lib.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/exports/exports-lib.pl b/exports/exports-lib.pl -index 22891c0..1c67494 100755 ---- a/exports/exports-lib.pl -+++ b/exports/exports-lib.pl -@@ -273,7 +273,7 @@ return !&has_command("rpc.nfsd") && !&has_command("nfsd") && +Index: webmin-1.850/exports/exports-lib.pl +=================================================================== +--- webmin-1.850.orig/exports/exports-lib.pl ++++ webmin-1.850/exports/exports-lib.pl +@@ -301,7 +301,7 @@ return !&has_command("rpc.nfsd") && !&ha sub restart_mountd { # Try exportfs -r first @@ -27,6 +27,3 @@ index 22891c0..1c67494 100755 my $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null"); if (!$? && $out !~ /invalid|error|failed/i) { # Looks like it worked! --- -1.7.9.5 - diff --git a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch index 5563227d55..4212917f6e 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch @@ -11,11 +11,11 @@ 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'}) { +Index: webmin-1.850/init/index.cgi +=================================================================== +--- webmin-1.850.orig/init/index.cgi ++++ webmin-1.850/init/index.cgi +@@ -45,19 +45,20 @@ elsif ($init_mode eq "init" && $access{' : "$config{'init_dir'}/$ac[0]"); } @runlevels = &list_runlevels(); @@ -49,11 +49,11 @@ index d48b793..30dafd4 100755 # For each action, look at /etc/rc*.d/* files to see if it is # started at boot -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. +Index: webmin-1.850/init/init-lib.pl +=================================================================== +--- webmin-1.850.orig/init/init-lib.pl ++++ webmin-1.850/init/init-lib.pl +@@ -124,8 +124,9 @@ List boot time action names from init.d, =cut sub list_actions { @@ -64,7 +64,7 @@ index ead21ed..b41794b 100755 opendir(DIR, $dir); foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { if ($f eq "." || $f eq ".." || $f =~ /\.bak$/ || $f eq "functions" || -@@ -128,7 +129,7 @@ foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { +@@ -133,7 +134,7 @@ foreach $f (sort { lc($a) cmp lc($b) } r -d "$dir/$f" || $f =~ /\.swp$/ || $f eq "skeleton" || $f =~ /\.lock$/ || $f =~ /\.dpkg-(old|dist)$/ || $f =~ /^\.depend\./ || $f eq '.legacy-bootordering' || @@ -73,6 +73,3 @@ index ead21ed..b41794b 100755 if (@stbuf = stat("$dir/$f")) { push(@rv, "$f $stbuf[1]"); } --- -2.0.0 - diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch index 7d20affb22..5549392851 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch @@ -3,9 +3,11 @@ # Upstream-status: Not appropriate [config] # # Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> ---- webmin-1.570.orig/net/module.info -+++ webmin-1.570/net/module.info -@@ -11,7 +11,7 @@ desc_ko_KR.UTF-8=네트워크 구성 +Index: webmin-1.850/net/module.info +=================================================================== +--- webmin-1.850.orig/net/module.info ++++ webmin-1.850/net/module.info +@@ -14,7 +14,7 @@ desc_ko_KR.UTF-8=네트워크 구성 name=Networking desc_tr=A Yaplandrmas desc_de=Netzwerkkonfiguration @@ -14,8 +16,10 @@ desc_sk=Konfigurcia siete desc_zh_CN= risk=low medium high +Index: webmin-1.850/net/generic-linux-lib.pl +=================================================================== --- /dev/null -+++ webmin-1.570/net/generic-linux-lib.pl ++++ webmin-1.850/net/generic-linux-lib.pl @@ -0,0 +1,2 @@ +do 'linux-lib.pl'; + diff --git a/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch b/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch index c17e3b2167..426d63737e 100644 --- a/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch +++ b/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch @@ -12,11 +12,11 @@ Upstream-Status: Pending Signed-off-by: Yu Ke <ke.yu@intel.com> -diff --git a/exports/save_export.cgi b/exports/save_export.cgi -index 3bc2f97..3e60298 100755 ---- a/exports/save_export.cgi -+++ b/exports/save_export.cgi -@@ -40,7 +40,7 @@ else { +Index: webmin-1.850/exports/save_export.cgi +=================================================================== +--- webmin-1.850.orig/exports/save_export.cgi ++++ webmin-1.850/exports/save_export.cgi +@@ -50,7 +50,7 @@ else { &error(&text('save_enetmask', $in{'netmask'})); $exp{'host'} = $in{'network'}."/".$in{'netmask'}; } @@ -25,9 +25,9 @@ index 3bc2f97..3e60298 100755 else { $in{'host'} =~ /\*/ || &to_ipaddress($in{'host'}) || &error(&text('save_ehost', $in{'host'})); -@@ -70,6 +70,11 @@ else { - - delete($opts{'no_subtree_check'}); delete($opts{'subtree_check'}); +@@ -87,6 +87,11 @@ else { + delete($opts{'no_subtree_check'}); + delete($opts{'subtree_check'}); $opts{'no_subtree_check'} = "" if ($in{'no_subtree_check'}); + if ($in{'no_subtree_check'}) { + $opts{'no_subtree_check'} = ""; @@ -35,5 +35,5 @@ index 3bc2f97..3e60298 100755 + $opts{'subtree_check'} = ""; + } - delete($opts{'nohide'}); delete($opts{'hide'}); - $opts{'nohide'} = "" if ($in{'nohide'}); + delete($opts{'nohide'}); + delete($opts{'hide'}); |