diff options
Diffstat (limited to 'net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.diff')
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.diff | 153 |
1 files changed, 0 insertions, 153 deletions
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.diff b/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.diff deleted file mode 100644 index 4183cc1d24cb..000000000000 --- a/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.diff +++ /dev/null @@ -1,153 +0,0 @@ -diff --unified defs.h defs.h ---- defs.h 2004-06-04 16:37:29.000000000 +0200 -+++ defs.h 2004-09-24 11:36:16.443227600 +0200 -@@ -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 - ---- tunables.c.orig 2005-06-08 11:29:01.261176985 +0100 -+++ tunables.c 2005-06-08 11:30:33.521084952 +0100 -@@ -89,7 +89,7 @@ - unsigned int tunable_max_per_ip = 0; - unsigned int tunable_trans_chunk_size = 0; - --const char* tunable_secure_chroot_dir = "/usr/share/empty"; -+const char* tunable_secure_chroot_dir = "/usr/share/vsftpd/empty"; - const char* tunable_ftp_username = "ftp"; - const char* tunable_chown_username = "root"; - const char* tunable_xferlog_file = "/var/log/xferlog"; -@@ -97,11 +97,11 @@ - const char* tunable_message_file = ".message"; - const char* tunable_nopriv_user = "nobody"; - const char* tunable_ftpd_banner = 0; --const char* tunable_banned_email_file = "/etc/vsftpd.banned_emails"; --const char* tunable_chroot_list_file = "/etc/vsftpd.chroot_list"; -+const char* tunable_banned_email_file = "/etc/vsftpd/banned_emails"; -+const char* tunable_chroot_list_file = "/etc/vsftpd/chroot_list"; - const char* tunable_pam_service_name = "ftp"; - const char* tunable_guest_username = "ftp"; --const char* tunable_userlist_file = "/etc/vsftpd.user_list"; -+const char* tunable_userlist_file = "/etc/vsftpd/user_list"; - const char* tunable_anon_root = 0; - const char* tunable_local_root = 0; - const char* tunable_banner_file = 0; -@@ -113,7 +113,7 @@ - const char* tunable_hide_file = 0; - const char* tunable_deny_file = 0; - const char* tunable_user_sub_token = 0; --const char* tunable_email_password_file = "/etc/vsftpd.email_passwords"; -+const char* tunable_email_password_file = "/etc/vsftpd/email_passwords"; - const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem"; - const char* tunable_dsa_cert_file = 0; - const char* tunable_ssl_ciphers = "DES-CBC3-SHA"; ---- vsftpd.8.orig 2005-06-08 12:12:51.753585388 +0100 -+++ vsftpd.8 2005-06-08 12:13:21.411085181 +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. -@@ -29,6 +29,6 @@ - An optional - .Op configuration file - may be given on the command line. The default configuration file is --.Pa /etc/vsftpd.conf . -+.Pa /etc/vsftpd/vsftpd.conf . - .Sh SEE ALSO - .Xr vsftpd.conf 5 ---- vsftpd.conf.5.orig 2005-06-08 12:13:29.831523597 +0100 -+++ vsftpd.conf.5 2005-06-08 12:15:04.012059074 +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 -@@ -136,7 +136,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. - -@@ -164,7 +164,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. - -@@ -371,7 +371,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 -@@ -651,7 +651,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 -@@ -680,7 +680,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 -@@ -732,7 +732,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 -@@ -852,10 +852,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 -@@ -891,7 +891,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 |