Added dependency on ftpbase - fixes #96258

  Changed default options of /etc/vsftpd/vsftpd.something
  to /etc/vsftpd/something - exception is /etc/vsftpd/vsftpd.conf
  This makes is more consistent with the default vsftpd installation.

  Default log file is now /var/log/vsftpd.log - which is the package default

  Default PAM service name is now ftp again

(Portage version: 2.0.51.19)

6 files changed, 256 insertions, 13 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 77ea5310f554..b57ffdd2de94 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,8 +1,23 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.53 2005/06/07 23:04:57 uberlord Exp $
-
-  08 Jun 2005; Roy Marples <uberlord@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.54 2005/06/28 14:53:40 uberlord Exp $
+
+*vsftpd-2.0.3-r1 (28 Jun 2005)
+
+  28 Jun 2005; Roy Marples <uberlord@gentoo.org>
+  +files/vsftpd-2.0.3-gentoo.diff, +vsftpd-2.0.3-r1.ebuild,
+  files/vsftpd.conf:
+  Added dependency on ftpbase - fixes #96258
+  
+  Changed default options of /etc/vsftpd/vsftpd.something
+  to /etc/vsftpd/something - exception is /etc/vsftpd/vsftpd.conf
+  This makes is more consistent with the default vsftpd installation.
+  
+  Default log file is now /var/log/vsftpd.log - which is the package default
+  
+  Default PAM service name is now ftp again
+
+  07 Jun 2005; Roy Marples <uberlord@gentoo.org>
   -files/vsftpd-1.0.1-gentoo.diff, -files/vsftpd-1.2.0-gentoo.diff.bz2,
   metadata.xml, -vsftpd-1.0.1-r1.ebuild, -vsftpd-1.2.0-r1.ebuild,
   -vsftpd-1.2.1.ebuild, -vsftpd-2.0.1.ebuild, vsftpd-2.0.3.ebuild:
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 748c254e5e44..0790453ad6bf 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,17 +1,17 @@
-MD5 956e9a099e660fe8dfc8a4a9d8c3980b ChangeLog 7177
+MD5 b48d1260df6e1b3ba2f965346492949c ChangeLog 7177
 MD5 0451b23327c004752edf415e25931d07 metadata.xml 344
-MD5 6bc5f88008d02f6e7f2e80b974eab252 vsftpd-1.2.2.ebuild 2296
-MD5 611c7876025c64306c0c073cd637d4a6 vsftpd-2.0.2.ebuild 2315
-MD5 375e23134ff7863b8bf410123d0ce756 vsftpd-2.0.3.ebuild 2199
+MD5 aab90ccf2818fb82bd4248027740802b vsftpd-2.0.3-r1.ebuild 1988
+MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3-r1 64
 MD5 5a140ccd0017f39fe3c63e6a29e1abcd files/ftpusers 365
 MD5 e0e25ba72aea7fb37f3f66f4ca359a82 files/vsftpd-1.2.2-ppc64.diff 479
-MD5 3cc28f997500e1b75a080af59ce4c164 files/vsftpd.conf 3893
-MD5 2ed3e6179c0660f4b836fc5e21611740 files/vsftpd.pam 408
+MD5 49e6cb2b2d9af6823043069309fdf24c files/vsftpd.conf 3897
+MD5 cda343e1fee4b15c6e05e9e8e7307e71 files/vsftpd.pam 411
 MD5 e4a0ae5ba000a0e22576618d76760957 files/vsftpd.pam-include 340
 MD5 8578d5c3f50e7b090ba023dfa626ec89 files/vsftpd.xinetd 432
 MD5 fc1e8a30f8f0ce1b6f0a8c1958fc3e6e files/vsftpd.xinetd.ipv6 451
 MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080
 MD5 e0a15cbbb9ee8ae2099c0b267431f2da files/vsftpd-2.0.1-gentoo.diff 6762
+MD5 10727329a1de642694a73e3655774015 files/vsftpd-2.0.3-gentoo.diff 5598
 MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
 MD5 6813de15f73b7782a1061072bbefa98e files/digest-vsftpd-2.0.2 64
 MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3 64
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.3-r1 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.3-r1
new file mode 100644
index 000000000000..24cabb401608
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.3-r1
@@ -0,0 +1 @@
+MD5 74936cbd8e8251deb1cd99c5fb18b6f8 vsftpd-2.0.3.tar.gz 153266
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.diff b/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.diff
new file mode 100644
index 000000000000..4183cc1d24cb
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.diff
@@ -0,0 +1,153 @@
+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
diff --git a/net-ftp/vsftpd/files/vsftpd.conf b/net-ftp/vsftpd/files/vsftpd.conf
index daf044b0871e..5144e4cac76e 100644
--- a/net-ftp/vsftpd/files/vsftpd.conf
+++ b/net-ftp/vsftpd/files/vsftpd.conf
@@ -3,7 +3,7 @@
 #
 # See man 5 vsftpd.conf for more information.
 #
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.conf,v 1.4 2005/06/07 23:04:57 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.conf,v 1.5 2005/06/28 14:53:40 uberlord Exp $
 
 # Enable vsftpd to run as a standalone daemon
 # Comment these two out to run under inetd or xinetd
@@ -51,9 +51,8 @@ xferlog_enable=YES
 # If you want, you can have your log file in standard ftpd xferlog format
 #xferlog_std_format=YES
 
-# You may override where the log file goes if you like. The default is shown
-# below.
-xferlog_file=/var/log/vsftpd/vsftpd.log
+# You may override where the log file goes if you like.
+xferlog_file=/var/log/vsftpd.log
 
 # You may change the default value for timing out an idle session.
 #idle_session_timeout=600
diff --git a/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
new file mode 100644
index 000000000000..0d7c415bfb14
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild,v 1.1 2005/06/28 14:53:40 uberlord Exp $
+
+inherit flag-o-matic eutils
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+HOMEPAGE="http://vsftpd.beasts.org/"
+SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="pam tcpd ssl xinetd"
+
+DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )"
+RDEPEND="${DEPEND}
+	net-ftp/ftpbase
+	xinetd? ( sys-apps/xinetd )"
+
+src_unpack() {
+	unpack "${A}" || die
+	cd "${S}" || die
+
+	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
+	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
+	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
+
+	epatch "${FILESDIR}/vsftpd-2.0.3-gentoo.diff"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	into /usr
+	doman vsftpd.conf.5 vsftpd.8
+	dosbin vsftpd
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL \
+		LICENSE README README.security REWARD SIZE \
+		SPEED TODO TUNING
+	newdoc "${FILESDIR}/vsftpd.conf" vsftpd.conf.example
+
+	docinto security
+	dodoc SECURITY/*
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/*
+
+	insinto /etc/vsftpd
+	newins "${FILESDIR}/vsftpd.conf" vsftpd.conf.example
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
+	fi
+
+	newconfd "${FILESDIR}/vsftpd.conf.d" vsftpd
+	newinitd "${FILESDIR}/vsftpd.init.d" vsftpd
+
+	keepdir /usr/share/vsftpd/empty
+}
+
+pkg_preinst() {
+	# If we use xinetd, then we comment out background=YES and listen=YES
+	# so that our default config works under xinetd - fixes #78347
+	if use xinetd ; then
+		sed -i '/\(background=YES\|listen=YES\)/s/^/#/g' \
+			${IMAGE}/etc/vsftpd/vsftpd.conf.sample
+	fi
+}