From 56eac86335f812f41aa8f4828d2552f7563b2e34 Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Tue, 7 Jun 2005 23:04:57 +0000 Subject: punted old versions ipv6 flag dropped for 2.0.3 - I'm sure xinetd users can add the ipv6 flag to the /etc/xinetd.d/vsftpd themselves if needed - fixes #75609 added background=YES and listen=YES to the default config - fixes #78347 tweaked DEPEND to work with sys-libs/pam and virtual/pam (Portage version: 2.0.51.22-r1) --- net-ftp/vsftpd/files/digest-vsftpd-1.0.1-r1 | 1 - net-ftp/vsftpd/files/digest-vsftpd-1.2.0-r1 | 1 - net-ftp/vsftpd/files/digest-vsftpd-1.2.1 | 1 - net-ftp/vsftpd/files/digest-vsftpd-2.0.1 | 1 - net-ftp/vsftpd/files/vsftpd-1.0.1-gentoo.diff | 144 ---------------------- net-ftp/vsftpd/files/vsftpd-1.2.0-gentoo.diff.bz2 | Bin 2078 -> 0 bytes net-ftp/vsftpd/files/vsftpd.conf | 7 +- net-ftp/vsftpd/files/vsftpd.pam | 12 +- 8 files changed, 12 insertions(+), 155 deletions(-) delete mode 100644 net-ftp/vsftpd/files/digest-vsftpd-1.0.1-r1 delete mode 100644 net-ftp/vsftpd/files/digest-vsftpd-1.2.0-r1 delete mode 100644 net-ftp/vsftpd/files/digest-vsftpd-1.2.1 delete mode 100644 net-ftp/vsftpd/files/digest-vsftpd-2.0.1 delete mode 100644 net-ftp/vsftpd/files/vsftpd-1.0.1-gentoo.diff delete mode 100644 net-ftp/vsftpd/files/vsftpd-1.2.0-gentoo.diff.bz2 (limited to 'net-ftp/vsftpd/files') diff --git a/net-ftp/vsftpd/files/digest-vsftpd-1.0.1-r1 b/net-ftp/vsftpd/files/digest-vsftpd-1.0.1-r1 deleted file mode 100644 index 12e93b0e105f..000000000000 --- a/net-ftp/vsftpd/files/digest-vsftpd-1.0.1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 a30724a5e56091164f538bbdce10cdf4 vsftpd-1.0.1.tar.gz 92976 diff --git a/net-ftp/vsftpd/files/digest-vsftpd-1.2.0-r1 b/net-ftp/vsftpd/files/digest-vsftpd-1.2.0-r1 deleted file mode 100644 index 4c8603387787..000000000000 --- a/net-ftp/vsftpd/files/digest-vsftpd-1.2.0-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 19c1818c102b63e4b0fea8d5b8b7c51f vsftpd-1.2.0.tar.gz 130025 diff --git a/net-ftp/vsftpd/files/digest-vsftpd-1.2.1 b/net-ftp/vsftpd/files/digest-vsftpd-1.2.1 deleted file mode 100644 index 02ac21fe5d5e..000000000000 --- a/net-ftp/vsftpd/files/digest-vsftpd-1.2.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 3dd254f9c9c1aea370b2f1ff6212af6e vsftpd-1.2.1.tar.gz 136041 diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.1 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.1 deleted file mode 100644 index 7ce7b2af3fc3..000000000000 --- a/net-ftp/vsftpd/files/digest-vsftpd-2.0.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 63838791ec8b1375ed154fb2603e52e9 vsftpd-2.0.1.tar.gz 146231 diff --git a/net-ftp/vsftpd/files/vsftpd-1.0.1-gentoo.diff b/net-ftp/vsftpd/files/vsftpd-1.0.1-gentoo.diff deleted file mode 100644 index fa2e3c56ef9f..000000000000 --- a/net-ftp/vsftpd/files/vsftpd-1.0.1-gentoo.diff +++ /dev/null @@ -1,144 +0,0 @@ -diff -ur vsftpd-1.0.1.orig/defs.h vsftpd-1.0.1/defs.h ---- vsftpd-1.0.1.orig/defs.h Sat Aug 4 18:53:32 2001 -+++ vsftpd-1.0.1/defs.h Tue Nov 20 22:56:43 2001 -@@ -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-1.0.1.orig/tunables.c vsftpd-1.0.1/tunables.c ---- vsftpd-1.0.1.orig/tunables.c Wed Nov 7 20:24:53 2001 -+++ vsftpd-1.0.1/tunables.c Tue Nov 20 22:57:11 2001 -@@ -50,19 +50,19 @@ - unsigned int tunable_anon_max_rate = 0; - unsigned int tunable_local_max_rate = 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/vsftpd.log"; -+const char* tunable_xferlog_file = "/var/log/vsftpd/vsftpd.log"; - const char* tunable_message_file = ".message"; - /* XXX -> "secure"? */ - 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_pam_service_name = "ftp"; -+const char* tunable_banned_email_file = "/etc/vsftpd/vsftpd.banned_emails"; -+const char* tunable_chroot_list_file = "/etc/vsftpd/vsftpd.chroot_list"; -+const char* tunable_pam_service_name = "vsftpd"; - const char* tunable_guest_username = "ftp"; --const char* tunable_userlist_file = "/etc/vsftpd.user_list"; -+const char* tunable_userlist_file = "/etc/vsftpd/vsftpd.user_list"; - const char* tunable_anon_root = 0; - const char* tunable_local_root = 0; - -diff -ur vsftpd-1.0.1.orig/vsftpd.8 vsftpd-1.0.1/vsftpd.8 ---- vsftpd-1.0.1.orig/vsftpd.8 Sun Mar 11 20:14:07 2001 -+++ vsftpd-1.0.1/vsftpd.8 Tue Nov 20 22:56:43 2001 -@@ -20,7 +20,7 @@ - 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 - -diff -ur vsftpd-1.0.1.orig/vsftpd.conf.5 vsftpd-1.0.1/vsftpd.conf.5 ---- vsftpd-1.0.1.orig/vsftpd.conf.5 Wed Nov 7 20:30:21 2001 -+++ vsftpd-1.0.1/vsftpd.conf.5 Tue Nov 20 22:58:09 2001 -@@ -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 -@@ -109,7 +109,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/vsftpd.chroot_list, but you may override this with the - .BR chroot_list_file - setting. - -@@ -135,7 +135,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/vsftpd.banned_emails, but you may override this with the - .BR banned_email_file - setting. - -@@ -249,7 +249,7 @@ - .TP - .B xferlog_enable - If enabled, a log file will be maintained detailling uploads and downloads. --By default, this file will be placed at /var/log/vsftpd.log, but this location -+By default, this file will be placed at /var/log/vsftpd/vsftpd.log, but this location - may be overridden using the configuration setting - .BR xferlog_file . - -@@ -355,7 +355,7 @@ - .BR deny_email_enable - is enabled. - --Default: /etc/vsftpd.banned_emails -+Default: /etc/vsftpd/vsftpd.banned_emails - .TP - .B chown_username - This is the name of the user who is given ownership of anonymously uploaded -@@ -374,7 +374,7 @@ - .BR chroot_local_user - is disabled. - --Default: /etc/vsftpd.chroot_list -+Default: /etc/vsftpd/vsftpd.chroot_list - .TP - .B guest_username - See the boolean setting -@@ -422,21 +422,21 @@ - .B pam_service_name - This string is the name of the PAM service vsftpd will use. - --Default: ftp -+Default: vsftpd - .TP - .B secure_chroot_dir - This option should be the name of a directory which is empty. Also, the - directory should not be writable by the ftp user. This directory is used - as a secure chroot() jail at times vsftpd does not require filesystem access. - --Default: /usr/share/empty -+Default: /usr/share/vsftpd/empty - .TP - .B userlist_file - This option is the name of the file loaded when the - .BR userlist_enable - option is active. - --Default: /etc/vsftpd.user_list -+Default: /etc/vsftpd/vsftpd.user_list - .TP - .B xferlog_file - This option is the name of the file to which we write the transfer log. The -@@ -444,7 +444,7 @@ - .BR xferlog_enable - is set. - --Default: /var/log/vsftpd.log -+Default: /var/log/vsftpd/vsftpd.log - - .SH AUTHOR - chris@scary.beasts.org diff --git a/net-ftp/vsftpd/files/vsftpd-1.2.0-gentoo.diff.bz2 b/net-ftp/vsftpd/files/vsftpd-1.2.0-gentoo.diff.bz2 deleted file mode 100644 index d2916d37fc5d..000000000000 Binary files a/net-ftp/vsftpd/files/vsftpd-1.2.0-gentoo.diff.bz2 and /dev/null differ diff --git a/net-ftp/vsftpd/files/vsftpd.conf b/net-ftp/vsftpd/files/vsftpd.conf index 890fb6b14bd9..daf044b0871e 100644 --- a/net-ftp/vsftpd/files/vsftpd.conf +++ b/net-ftp/vsftpd/files/vsftpd.conf @@ -3,7 +3,12 @@ # # See man 5 vsftpd.conf for more information. # -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.conf,v 1.3 2004/07/18 03:56:09 dragonheart Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.conf,v 1.4 2005/06/07 23:04:57 uberlord Exp $ + +# Enable vsftpd to run as a standalone daemon +# Comment these two out to run under inetd or xinetd +background=YES +listen=YES # Allow anonymous FTP? anonymous_enable=YES diff --git a/net-ftp/vsftpd/files/vsftpd.pam b/net-ftp/vsftpd/files/vsftpd.pam index adbb770dc26a..58d1add480f6 100644 --- a/net-ftp/vsftpd/files/vsftpd.pam +++ b/net-ftp/vsftpd/files/vsftpd.pam @@ -1,7 +1,7 @@ #%PAM-1.0 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.pam,v 1.4 2004/07/18 03:56:09 dragonheart Exp $ -auth required /lib/security/pam_listfile.so item=user sense=deny file=/etc/vsftpd/ftpusers onerr=succeed -auth required /lib/security/pam_stack.so service=system-auth -auth required /lib/security/pam_shells.so -account required /lib/security/pam_stack.so service=system-auth -session required /lib/security/pam_stack.so service=system-auth +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.pam,v 1.5 2005/06/07 23:04:57 uberlord Exp $ +auth required pam_listfile.so item=user sense=deny file=/etc/vsftpd/ftpusers onerr=succeed +auth required pam_stack.so service=system-auth +auth required pam_shells.so +account required pam_stack.so service=system-auth +session required pam_stack.so service=system-auth -- cgit v1.2.3-65-gdbad