summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch
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/webmin/files/net-generic.patch
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/webmin/files/net-generic.patch')
-rw-r--r--meta-webserver/recipes-webadmin/webmin/files/net-generic.patch12
1 files changed, 8 insertions, 4 deletions
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+