diff --git a/srcpkgs/vsftpd/patches/003-chroot.patch b/srcpkgs/vsftpd/patches/003-chroot.patch index 84116c4ad9..547315fbbd 100644 --- a/srcpkgs/vsftpd/patches/003-chroot.patch +++ b/srcpkgs/vsftpd/patches/003-chroot.patch @@ -1,11 +1,11 @@ ---- tunables.c.orig -+++ tunables.c +--- tunables.c.orig 2015-12-03 23:13:22.888994282 +0100 ++++ tunables.c 2015-12-03 23:13:33.716994236 +0100 @@ -254,7 +254,7 @@ tunables_load_defaults() /* -rw------- */ tunable_chown_upload_mode = 0600; - install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir); -+ install_str_setting("/var/run/vsftpd", &tunable_secure_chroot_dir); ++ install_str_setting("/var/empty", &tunable_secure_chroot_dir); install_str_setting("ftp", &tunable_ftp_username); install_str_setting("root", &tunable_chown_username); install_str_setting("/var/log/xferlog", &tunable_xferlog_file); diff --git a/srcpkgs/vsftpd/patches/var_empty.patch b/srcpkgs/vsftpd/patches/var_empty.patch deleted file mode 100644 index 547315fbbd..0000000000 --- a/srcpkgs/vsftpd/patches/var_empty.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tunables.c.orig 2015-12-03 23:13:22.888994282 +0100 -+++ tunables.c 2015-12-03 23:13:33.716994236 +0100 -@@ -254,7 +254,7 @@ tunables_load_defaults() - /* -rw------- */ - tunable_chown_upload_mode = 0600; - -- install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir); -+ install_str_setting("/var/empty", &tunable_secure_chroot_dir); - install_str_setting("ftp", &tunable_ftp_username); - install_str_setting("root", &tunable_chown_username); - install_str_setting("/var/log/xferlog", &tunable_xferlog_file); diff --git a/srcpkgs/vsftpd/template b/srcpkgs/vsftpd/template index 1ec8398414..53bc2a7a08 100644 --- a/srcpkgs/vsftpd/template +++ b/srcpkgs/vsftpd/template @@ -1,7 +1,7 @@ # Template file for 'vsftpd' pkgname=vsftpd version=3.0.3 -revision=1 +revision=2 build_style=gnu-makefile makedepends="pam-devel libcap-devel libressl-devel" short_desc="FTP deamon with focus on security"