AUX vsftpd-2.1.0-caps.patch 575 RMD160 a7b27df472ccbb5068d5f9961fe6bb010063e98c SHA1 f98d3cfbc1eb68f6e852cf9cbf5ad80407be5557 SHA256 4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370

AUX vsftpd-2.1.0-gentoo.patch 7575 RMD160 0695c1e679a8b0a7f1a4d599ee01571c7db0049b SHA1 69cd031c3f958f94ff64b573d4af235e79d84051 SHA256 3bacbc4828edf8d24f08600090ca60c9af8c1603032fc6cf3748960ac971f2bd

diff -ur vsftpd-2.1.0.orig/sysdeputil.c vsftpd-2.1.0/sysdeputil.c

--- vsftpd-2.1.0.orig/sysdeputil.c	2009-02-23 18:23:26.000000000 +0100

+++ vsftpd-2.1.0/sysdeputil.c	2009-02-23 18:23:51.000000000 +0100

@@ -160,10 +160,8 @@

 #include <sys/capability.h>

 #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP)

-#include <linux/unistd.h>

 #include <linux/capability.h>

-#include <errno.h>

-#include <syscall.h>

+#include <sys/syscall.h>

 int capset(cap_user_header_t header, const cap_user_data_t data)

 {

   return syscall(__NR_capset, header, data);

diff -ur vsftpd-2.1.0.orig/defs.h vsftpd-2.1.0/defs.h

--- vsftpd-2.1.0.orig/defs.h	2009-02-23 17:57:17.000000000 +0100

+++ vsftpd-2.1.0/defs.h	2009-02-23 17:57:29.000000000 +0100

@@ -1,7 +1,7 @@

 #ifndef VSF_DEFS_H

 #define VSF_DEFS_H

-#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd.conf"

+#define VSFTP_DEFAULT_CONFIG    "/etc/vsftpd/vsftpd.conf"

 #define VSFTP_COMMAND_FD        0

diff -ur vsftpd-2.1.0.orig/tunables.c vsftpd-2.1.0/tunables.c

--- vsftpd-2.1.0.orig/tunables.c	2009-02-23 17:57:17.000000000 +0100

+++ vsftpd-2.1.0/tunables.c	2009-02-23 17:59:12.000000000 +0100

@@ -242,7 +242,7 @@

   /* -rw------- */

   tunable_chown_upload_mode = 0600;

-  install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);

+  install_str_setting("/usr/share/vsftpd/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);

@@ -250,11 +250,11 @@

   install_str_setting(".message", &tunable_message_file);

   install_str_setting("nobody", &tunable_nopriv_user);

   install_str_setting(0, &tunable_ftpd_banner);

-  install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file);

-  install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file);

+  install_str_setting("/etc/vsftpd/banned_emails", &tunable_banned_email_file);

+  install_str_setting("/etc/vsftpd/chroot_list", &tunable_chroot_list_file);

   install_str_setting("ftp", &tunable_pam_service_name);

   install_str_setting("ftp", &tunable_guest_username);

-  install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file);

+  install_str_setting("/etc/vsftpd/user_list", &tunable_userlist_file);

   install_str_setting(0, &tunable_anon_root);

   install_str_setting(0, &tunable_local_root);

   install_str_setting(0, &tunable_banner_file);

@@ -267,7 +267,7 @@

   install_str_setting(0, &tunable_hide_file);

   install_str_setting(0, &tunable_deny_file);

   install_str_setting(0, &tunable_user_sub_token);

-  install_str_setting("/etc/vsftpd.email_passwords",

+  install_str_setting("/etc/vsftpd/email_passwords",

                       &tunable_email_password_file);

   install_str_setting("/usr/share/ssl/certs/vsftpd.pem",

                       &tunable_rsa_cert_file);

diff -ur vsftpd-2.1.0.orig/vsftpd.8 vsftpd-2.1.0/vsftpd.8

--- vsftpd-2.1.0.orig/vsftpd.8	2009-02-23 17:57:17.000000000 +0100

+++ vsftpd-2.1.0/vsftpd.8	2009-02-23 18:00:03.000000000 +0100

@@ -21,7 +21,7 @@

 recommended. It is activated by setting

 .Pa listen=YES

 in

-.Pa /etc/vsftpd.conf .

+.Pa /etc/vsftpd/vsftpd.conf .

 Direct execution of the

 .Nm vsftpd

 binary will then launch the FTP service ready for immediate client connections.

@@ -30,6 +30,6 @@

 .Op configuration file

 may be given on the command line. This file must be owned as root if running as

 root. The default configuration file is

-.Pa /etc/vsftpd.conf .

+.Pa /etc/vsftpd/vsftpd.conf .

 .Sh SEE ALSO

 .Xr vsftpd.conf 5

diff -ur vsftpd-2.1.0.orig/vsftpd.conf vsftpd-2.1.0/vsftpd.conf

--- vsftpd-2.1.0.orig/vsftpd.conf	2009-02-23 17:57:17.000000000 +0100

+++ vsftpd-2.1.0/vsftpd.conf	2009-02-23 18:00:56.000000000 +0100

@@ -1,4 +1,4 @@

-# Example config file /etc/vsftpd.conf

+# Example config file /etc/vsftpd/vsftpd.conf

 #

 # The default compiled in settings are fairly paranoid. This sample file

 # loosens things up a bit, to make the ftp daemon more usable.

@@ -8,6 +8,10 @@

 # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's

 # capabilities.

 #

+# Listen on IPv4. xinet users must set NO or comment out

+# otherwise it must be set YES

+listen=YES

+#

 # Allow anonymous FTP? (Beware - allowed by default if you comment this out).

 anonymous_enable=YES

 #

@@ -87,14 +91,14 @@

 # useful for combatting certain DoS attacks.

 #deny_email_enable=YES

 # (default follows)

-#banned_email_file=/etc/vsftpd.banned_emails

+#banned_email_file=/etc/vsftpd/banned_emails

 #

 # You may specify an explicit list of local users to chroot() to their home

 # directory. If chroot_local_user is YES, then this list becomes a list of

 # users to NOT chroot().

 #chroot_list_enable=YES

 # (default follows)

-#chroot_list_file=/etc/vsftpd.chroot_list

+#chroot_list_file=/etc/vsftpd/chroot_list

 #

 # You may activate the "-R" option to the builtin ls. This is disabled by

 # default to avoid remote users being able to cause excessive I/O on large

diff -ur vsftpd-2.1.0.orig/vsftpd.conf.5 vsftpd-2.1.0/vsftpd.conf.5

--- vsftpd-2.1.0.orig/vsftpd.conf.5	2009-02-23 17:57:17.000000000 +0100

+++ vsftpd-2.1.0/vsftpd.conf.5	2009-02-23 17:57:29.000000000 +0100

@@ -4,7 +4,7 @@

 .SH DESCRIPTION

 vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By

 default, vsftpd looks for this file at the location

-.BR /etc/vsftpd.conf .

+.BR /etc/vsftpd/vsftpd.conf .

 However, you may override this by specifying a command line argument to

 vsftpd. The command line argument is the pathname of the configuration file

 for vsftpd. This behaviour is useful because you may wish to use an advanced

@@ -138,7 +138,7 @@

 different if chroot_local_user is set to YES. In this case, the list becomes

 a list of users which are NOT to be placed in a chroot() jail.

 By default, the file containing this list is

-/etc/vsftpd.chroot_list, but you may override this with the

+/etc/vsftpd/chroot_list, but you may override this with the

 .BR chroot_list_file

 setting.

@@ -177,7 +177,7 @@

 .B deny_email_enable

 If activated, you may provide a list of anonymous password e-mail responses

 which cause login to be denied. By default, the file containing this list is

-/etc/vsftpd.banned_emails, but you may override this with the

+/etc/vsftpd/banned_emails, but you may override this with the

 .BR banned_email_file

 setting.

@@ -430,7 +430,7 @@

 file specified by the

 .BR email_password_file

 setting. The file format is one password per line, no extra whitespace. The

-default filename is /etc/vsftpd.email_passwords.

+default filename is /etc/vsftpd/email_passwords.

 Default: NO

 .TP

@@ -761,7 +761,7 @@

 .BR deny_email_enable

 is enabled.

-Default: /etc/vsftpd.banned_emails

+Default: /etc/vsftpd/banned_emails

 .TP

 .B banner_file

 This option is the name of a file containing text to display when someone

@@ -798,7 +798,7 @@

 is enabled, then the list file becomes a list of users to NOT place in a

 chroot() jail.

-Default: /etc/vsftpd.chroot_list

+Default: /etc/vsftpd/chroot_list

 .TP

 .B cmds_allowed

 This options specifies a comma separated list of allowed FTP commands (post

@@ -859,7 +859,7 @@

 .BR secure_email_list_enable

 setting.

-Default: /etc/vsftpd.email_passwords

+Default: /etc/vsftpd/email_passwords

 .TP

 .B ftp_username

 This is the name of the user we use for handling anonymous FTP. The home

@@ -982,10 +982,10 @@

 with an example. If you set

 .BR user_config_dir

 to be

-.BR /etc/vsftpd_user_conf

+.BR /etc/vsftpd/user_conf

 and then log on as the user "chris", then vsftpd will apply the settings in

 the file

-.BR /etc/vsftpd_user_conf/chris

+.BR /etc/vsftpd/user_conf/chris

 for the duration of the session. The format of this file is as detailed in

 this manual page! PLEASE NOTE that not all settings are effective on a

 per-user basis. For example, many settings only prior to the user's session

@@ -1021,7 +1021,7 @@

 .BR userlist_enable

 option is active.

-Default: /etc/vsftpd.user_list

+Default: /etc/vsftpd/user_list

 .TP

 .B vsftpd_log_file

 This option is the name of the file to which we write the vsftpd style