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 <recipe>
    devtool finish --force-patch-refresh <recipe> <layer_path>

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 <akuster...@gmail.com>
---
 .../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(-)

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 1ca1480..9aad894 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.eggle...@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 177d8a3..d5dfed5 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.stras...@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 5563227..4212917 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 7d20aff..5549392 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.eggle...@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� Yap�land�rmas�
  desc_de=Netzwerkkonfiguration
@@ -14,8 +16,10 @@
  desc_sk=Konfigur�cia 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 c17e3b2..426d637 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...@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'});
-- 
2.7.4

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Reply via email to