summaryrefslogtreecommitdiffstats
path: root/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 13:33:53 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:38 -0700
commit1fd6c706a47a815583bc1e14e4e7a669aa2a235c (patch)
tree69ea135f73373f36c9470f81e2afd98b256fecb4 /meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
parenta3a88094a5c3aef30274a8ee66869ad35151e71b (diff)
downloadmeta-openembedded-1fd6c706a47a815583bc1e14e4e7a669aa2a235c.tar.gz
vsftpd: refresh patches
WARNING: 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: checking file Makefile Hunk #1 succeeded at 29 with fuzz 1 (offset 5 lines). and others Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch')
-rw-r--r--meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch37
1 files changed, 22 insertions, 15 deletions
diff --git a/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch b/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
index 5f2860e846..b69de1d1c3 100644
--- a/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
+++ b/meta-networking/recipes-daemons/vsftpd/files/change-secure_chroot_dir.patch
@@ -1,20 +1,25 @@
1vsftpd: change default value of secure_chroot_dir 1From ce2be5d4967445828d5ae9d9462cfaa78ae03c73 Mon Sep 17 00:00:00 2001
2From: Ming Liu <ming.liu@windriver.com>
3Date: Wed, 18 Sep 2013 09:44:20 +0800
4Subject: [PATCH] vsftpd: change default value of secure_chroot_dir
2 5
3Upstream-Status: Pending 6Upstream-Status: Pending
4 7
5Change secure_chroot_dir pointing to a volatile directory. 8Change secure_chroot_dir pointing to a volatile directory.
6 9
7Signed-off-by: Ming Liu <ming.liu@windriver.com> 10Signed-off-by: Ming Liu <ming.liu@windriver.com>
11
8--- 12---
9 INSTALL | 6 +++--- 13 INSTALL | 6 +++---
10 tunables.c | 2 +- 14 tunables.c | 2 +-
11 vsftpd.conf.5 | 2 +- 15 vsftpd.conf.5 | 2 +-
12 3 files changed, 5 insertions(+), 5 deletions(-) 16 3 files changed, 5 insertions(+), 5 deletions(-)
13 17
14diff -urpN a/INSTALL b/INSTALL 18diff --git a/INSTALL b/INSTALL
15--- a/INSTALL 2013-09-13 10:23:57.504972397 +0800 19index 4f811aa..427122a 100644
16+++ b/INSTALL 2013-09-13 10:25:25.664971779 +0800 20--- a/INSTALL
17@@ -27,11 +27,11 @@ user in case it does not already exist. 21+++ b/INSTALL
22@@ -27,11 +27,11 @@ user in case it does not already exist. e.g.:
18 [root@localhost root]# useradd nobody 23 [root@localhost root]# useradd nobody
19 useradd: user nobody exists 24 useradd: user nobody exists
20 25
@@ -29,9 +34,10 @@ diff -urpN a/INSTALL b/INSTALL
29 34
30 2c) For anonymous FTP, you will need the user "ftp" to exist, and have a 35 2c) For anonymous FTP, you will need the user "ftp" to exist, and have a
31 valid home directory (which is NOT owned or writable by the user "ftp"). 36 valid home directory (which is NOT owned or writable by the user "ftp").
32diff -urpN a/tunables.c b/tunables.c 37diff --git a/tunables.c b/tunables.c
33--- a/tunables.c 2013-09-13 10:26:29.554972817 +0800 38index 284a10d..8c63c3f 100644
34+++ b/tunables.c 2013-09-13 10:27:18.104972210 +0800 39--- a/tunables.c
40+++ b/tunables.c
35@@ -254,7 +254,7 @@ tunables_load_defaults() 41@@ -254,7 +254,7 @@ tunables_load_defaults()
36 /* -rw------- */ 42 /* -rw------- */
37 tunable_chown_upload_mode = 0600; 43 tunable_chown_upload_mode = 0600;
@@ -41,10 +47,11 @@ diff -urpN a/tunables.c b/tunables.c
41 install_str_setting("ftp", &tunable_ftp_username); 47 install_str_setting("ftp", &tunable_ftp_username);
42 install_str_setting("root", &tunable_chown_username); 48 install_str_setting("root", &tunable_chown_username);
43 install_str_setting("/var/log/xferlog", &tunable_xferlog_file); 49 install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
44diff -urpN a/vsftpd.conf.5 b/vsftpd.conf.5 50diff --git a/vsftpd.conf.5 b/vsftpd.conf.5
45--- a/vsftpd.conf.5 2013-09-13 10:09:33.774972462 +0800 51index fcc6022..e4ffdee 100644
46+++ b/vsftpd.conf.5 2013-09-13 10:10:41.914971989 +0800 52--- a/vsftpd.conf.5
47@@ -969,7 +969,7 @@ This option should be the name of a dire 53+++ b/vsftpd.conf.5
54@@ -969,7 +969,7 @@ This option should be the name of a directory which is empty. Also, the
48 directory should not be writable by the ftp user. This directory is used 55 directory should not be writable by the ftp user. This directory is used
49 as a secure chroot() jail at times vsftpd does not require filesystem access. 56 as a secure chroot() jail at times vsftpd does not require filesystem access.
50 57