summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-webadmin
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 23:12:58 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:42 -0700
commit3ab88a7f4374e1cac2020d63e10c3a8d31a81092 (patch)
treec4330e8a05e947e23bc120a31fd7f3ae6359672b /meta-webserver/recipes-webadmin
parent527ed0682cdbd10292d82bf67b8820d8a992d105 (diff)
downloadmeta-openembedded-3ab88a7f4374e1cac2020d63e10c3a8d31a81092.tar.gz
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 <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 <akuster808@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-webadmin')
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch11
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/exports-lib.pl.patch13
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch25
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/net-generic.patch12
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch20
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 1ca1480c3..9aad894e0 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
7 7
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9 9
10diff --git a/webmin/webmin-lib.pl b/webmin/webmin-lib.pl 10Index: webmin-1.850/webmin/webmin-lib.pl
11index 57a37f7..838b944 100755 11===================================================================
12--- a/webmin/webmin-lib.pl 12--- webmin-1.850.orig/webmin/webmin-lib.pl
13+++ b/webmin/webmin-lib.pl 13+++ webmin-1.850/webmin/webmin-lib.pl
14@@ -1086,28 +1086,28 @@ 14@@ -1112,28 +1112,28 @@ my %miniserv;
15 &load_theme_library(); # So that UI functions work 15 &load_theme_library(); # So that UI functions work
16 16
17 # Need OS upgrade 17 # Need OS upgrade
@@ -62,4 +62,3 @@ index 57a37f7..838b944 100755
62 62
63 # Password close to expiry 63 # Password close to expiry
64 my $warn_days = $config{'warn_days'}; 64 my $warn_days = $config{'warn_days'};
65
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 177d8a372..d5dfed5ad 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>
14 exports/exports-lib.pl | 2 +- 14 exports/exports-lib.pl | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/exports/exports-lib.pl b/exports/exports-lib.pl 17Index: webmin-1.850/exports/exports-lib.pl
18index 22891c0..1c67494 100755 18===================================================================
19--- a/exports/exports-lib.pl 19--- webmin-1.850.orig/exports/exports-lib.pl
20+++ b/exports/exports-lib.pl 20+++ webmin-1.850/exports/exports-lib.pl
21@@ -273,7 +273,7 @@ return !&has_command("rpc.nfsd") && !&has_command("nfsd") && 21@@ -301,7 +301,7 @@ return !&has_command("rpc.nfsd") && !&ha
22 sub restart_mountd 22 sub restart_mountd
23 { 23 {
24 # Try exportfs -r first 24 # Try exportfs -r first
@@ -27,6 +27,3 @@ index 22891c0..1c67494 100755
27 my $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null"); 27 my $out = &backquote_logged("$config{'apply_cmd'} 2>&1 </dev/null");
28 if (!$? && $out !~ /invalid|error|failed/i) { 28 if (!$? && $out !~ /invalid|error|failed/i) {
29 # Looks like it worked! 29 # Looks like it worked!
30--
311.7.9.5
32
diff --git a/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch b/meta-webserver/recipes-webadmin/webmin/files/init-exclude.patch
index 5563227d5..4212917f6 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 @@
11 init/init-lib.pl | 5 +++-- 11 init/init-lib.pl | 5 +++--
12 2 files changed, 17 insertions(+), 15 deletions(-) 12 2 files changed, 17 insertions(+), 15 deletions(-)
13 13
14diff --git a/init/index.cgi b/init/index.cgi 14Index: webmin-1.850/init/index.cgi
15index d48b793..30dafd4 100755 15===================================================================
16--- a/init/index.cgi 16--- webmin-1.850.orig/init/index.cgi
17+++ b/init/index.cgi 17+++ webmin-1.850/init/index.cgi
18@@ -45,19 +45,20 @@ elsif ($init_mode eq "init" && $access{'bootup'}) { 18@@ -45,19 +45,20 @@ elsif ($init_mode eq "init" && $access{'
19 : "$config{'init_dir'}/$ac[0]"); 19 : "$config{'init_dir'}/$ac[0]");
20 } 20 }
21 @runlevels = &list_runlevels(); 21 @runlevels = &list_runlevels();
@@ -49,11 +49,11 @@ index d48b793..30dafd4 100755
49 49
50 # For each action, look at /etc/rc*.d/* files to see if it is 50 # For each action, look at /etc/rc*.d/* files to see if it is
51 # started at boot 51 # started at boot
52diff --git a/init/init-lib.pl b/init/init-lib.pl 52Index: webmin-1.850/init/init-lib.pl
53index ead21ed..b41794b 100755 53===================================================================
54--- a/init/init-lib.pl 54--- webmin-1.850.orig/init/init-lib.pl
55+++ b/init/init-lib.pl 55+++ webmin-1.850/init/init-lib.pl
56@@ -119,8 +119,9 @@ List boot time action names from init.d, such as httpd and cron. 56@@ -124,8 +124,9 @@ List boot time action names from init.d,
57 =cut 57 =cut
58 sub list_actions 58 sub list_actions
59 { 59 {
@@ -64,7 +64,7 @@ index ead21ed..b41794b 100755
64 opendir(DIR, $dir); 64 opendir(DIR, $dir);
65 foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { 65 foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) {
66 if ($f eq "." || $f eq ".." || $f =~ /\.bak$/ || $f eq "functions" || 66 if ($f eq "." || $f eq ".." || $f =~ /\.bak$/ || $f eq "functions" ||
67@@ -128,7 +129,7 @@ foreach $f (sort { lc($a) cmp lc($b) } readdir(DIR)) { 67@@ -133,7 +134,7 @@ foreach $f (sort { lc($a) cmp lc($b) } r
68 -d "$dir/$f" || $f =~ /\.swp$/ || $f eq "skeleton" || 68 -d "$dir/$f" || $f =~ /\.swp$/ || $f eq "skeleton" ||
69 $f =~ /\.lock$/ || $f =~ /\.dpkg-(old|dist)$/ || 69 $f =~ /\.lock$/ || $f =~ /\.dpkg-(old|dist)$/ ||
70 $f =~ /^\.depend\./ || $f eq '.legacy-bootordering' || 70 $f =~ /^\.depend\./ || $f eq '.legacy-bootordering' ||
@@ -73,6 +73,3 @@ index ead21ed..b41794b 100755
73 if (@stbuf = stat("$dir/$f")) { 73 if (@stbuf = stat("$dir/$f")) {
74 push(@rv, "$f $stbuf[1]"); 74 push(@rv, "$f $stbuf[1]");
75 } 75 }
76--
772.0.0
78
diff --git a/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
index 7d20affb2..554939285 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 @@
3# Upstream-status: Not appropriate [config] 3# Upstream-status: Not appropriate [config]
4# 4#
5# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 5# Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
6--- webmin-1.570.orig/net/module.info 6Index: webmin-1.850/net/module.info
7+++ webmin-1.570/net/module.info 7===================================================================
8@@ -11,7 +11,7 @@ desc_ko_KR.UTF-8=네트워크 구성 8--- webmin-1.850.orig/net/module.info
9+++ webmin-1.850/net/module.info
10@@ -14,7 +14,7 @@ desc_ko_KR.UTF-8=네트워크 구성
9 name=Networking 11 name=Networking
10 desc_tr=A Yaplandrmas 12 desc_tr=A Yaplandrmas
11 desc_de=Netzwerkkonfiguration 13 desc_de=Netzwerkkonfiguration
@@ -14,8 +16,10 @@
14 desc_sk=Konfigurcia siete 16 desc_sk=Konfigurcia siete
15 desc_zh_CN= 17 desc_zh_CN=
16 risk=low medium high 18 risk=low medium high
19Index: webmin-1.850/net/generic-linux-lib.pl
20===================================================================
17--- /dev/null 21--- /dev/null
18+++ webmin-1.570/net/generic-linux-lib.pl 22+++ webmin-1.850/net/generic-linux-lib.pl
19@@ -0,0 +1,2 @@ 23@@ -0,0 +1,2 @@
20+do 'linux-lib.pl'; 24+do 'linux-lib.pl';
21+ 25+
diff --git a/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch b/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch
index c17e3b216..426d63737 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
12 12
13Signed-off-by: Yu Ke <ke.yu@intel.com> 13Signed-off-by: Yu Ke <ke.yu@intel.com>
14 14
15diff --git a/exports/save_export.cgi b/exports/save_export.cgi 15Index: webmin-1.850/exports/save_export.cgi
16index 3bc2f97..3e60298 100755 16===================================================================
17--- a/exports/save_export.cgi 17--- webmin-1.850.orig/exports/save_export.cgi
18+++ b/exports/save_export.cgi 18+++ webmin-1.850/exports/save_export.cgi
19@@ -40,7 +40,7 @@ else { 19@@ -50,7 +50,7 @@ else {
20 &error(&text('save_enetmask', $in{'netmask'})); 20 &error(&text('save_enetmask', $in{'netmask'}));
21 $exp{'host'} = $in{'network'}."/".$in{'netmask'}; 21 $exp{'host'} = $in{'network'}."/".$in{'netmask'};
22 } 22 }
@@ -25,9 +25,9 @@ index 3bc2f97..3e60298 100755
25 else { 25 else {
26 $in{'host'} =~ /\*/ || &to_ipaddress($in{'host'}) || 26 $in{'host'} =~ /\*/ || &to_ipaddress($in{'host'}) ||
27 &error(&text('save_ehost', $in{'host'})); 27 &error(&text('save_ehost', $in{'host'}));
28@@ -70,6 +70,11 @@ else { 28@@ -87,6 +87,11 @@ else {
29 29 delete($opts{'no_subtree_check'});
30 delete($opts{'no_subtree_check'}); delete($opts{'subtree_check'}); 30 delete($opts{'subtree_check'});
31 $opts{'no_subtree_check'} = "" if ($in{'no_subtree_check'}); 31 $opts{'no_subtree_check'} = "" if ($in{'no_subtree_check'});
32+ if ($in{'no_subtree_check'}) { 32+ if ($in{'no_subtree_check'}) {
33+ $opts{'no_subtree_check'} = ""; 33+ $opts{'no_subtree_check'} = "";
@@ -35,5 +35,5 @@ index 3bc2f97..3e60298 100755
35+ $opts{'subtree_check'} = ""; 35+ $opts{'subtree_check'} = "";
36+ } 36+ }
37 37
38 delete($opts{'nohide'}); delete($opts{'hide'}); 38 delete($opts{'nohide'});
39 $opts{'nohide'} = "" if ($in{'nohide'}); 39 delete($opts{'hide'});