From 3ab88a7f4374e1cac2020d63e10c3a8d31a81092 Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Sat, 7 Apr 2018 23:12:58 -0700 Subject: webmin: refresh patches WARNING: webmin-1.850-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify devtool finish --force-patch-refresh Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch nfs-export.patch patching file exports/save_export.cgi Hunk #1 succeeded at 50 (offset 10 lines). Hunk #2 succeeded at 87 with fuzz 2 (offset 17 lines). Now at patch nfs-export.patch Signed-off-by: Armin Kuster --- .../webmin/files/disable-version-check.patch | 11 +++++----- .../webmin/files/exports-lib.pl.patch | 13 +++++------ .../webmin/files/init-exclude.patch | 25 ++++++++++------------ .../webmin/files/net-generic.patch | 12 +++++++---- .../recipes-webadmin/webmin/files/nfs-export.patch | 20 ++++++++--------- 5 files changed, 39 insertions(+), 42 deletions(-) (limited to 'meta-webserver') 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 -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 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 ---- 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 -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'}); -- cgit 1.2.3-korg