Stable on amd64 and x86.

(Portage version: 2.0.51.22-r2)

7 files changed, 8 insertions, 349 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index b57ffdd2de94..af1495b6f910 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.54 2005/06/28 14:53:40 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.55 2005/07/27 20:30:55 uberlord Exp $
+
+  27 Jul 2005; Roy Marples <uberlord@gentoo.org>
+  -files/vsftpd-2.0.1-gentoo.diff, -vsftpd-2.0.2.ebuild,
+  -vsftpd-2.0.3.ebuild, vsftpd-2.0.3-r1.ebuild:
+  Stable on amd64 and x86.
 
 *vsftpd-2.0.3-r1 (28 Jun 2005)
 
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.2 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.2
deleted file mode 100644
index 8385964ccebf..000000000000
--- a/net-ftp/vsftpd/files/digest-vsftpd-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 470ebbdfd5f67677eb4d2fcec80d0ed4 vsftpd-2.0.2.tar.gz 151178
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.3 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.3
deleted file mode 100644
index 24cabb401608..000000000000
--- a/net-ftp/vsftpd/files/digest-vsftpd-2.0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 74936cbd8e8251deb1cd99c5fb18b6f8 vsftpd-2.0.3.tar.gz 153266
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.1-gentoo.diff b/net-ftp/vsftpd/files/vsftpd-2.0.1-gentoo.diff
deleted file mode 100644
index 14ea0b8d7ecf..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.0.1-gentoo.diff
+++ /dev/null
@@ -1,182 +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
- 
-Common subdirectories: dummyinc and dummyinc
-Common subdirectories: EXAMPLE and EXAMPLE
-Only in : gentoo.diff
-Common subdirectories: port and port
-Common subdirectories: RedHat and RedHat
-Common subdirectories: SECURITY and SECURITY
-diff --unified tunables.c tunables.c
---- tunables.c	2004-07-02 13:26:17.000000000 +0200
-+++ tunables.c	2004-09-24 11:43:21.714576528 +0200
-@@ -87,19 +87,19 @@
- 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";
--const char* tunable_vsftpd_log_file = "/var/log/vsftpd.log";
-+const char* tunable_vsftpd_log_file = "/var/log/vsftpd/vsftpd.log";
- 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_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;
- const char* tunable_banner_file = 0;
-@@ -111,7 +111,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/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";
-diff --unified vsftpd.8 vsftpd.8
---- vsftpd.8	2003-08-29 00:34:54.000000000 +0200
-+++ vsftpd.8	2004-09-24 11:44:42.429306024 +0200
-@@ -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
-diff --unified vsftpd.conf.5 vsftpd.conf.5
---- vsftpd.conf.5	2004-07-02 12:39:11.000000000 +0200
-+++ vsftpd.conf.5	2004-09-24 11:47:19.060494464 +0200
-@@ -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/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/vsftpd.banned_emails, but you may override this with the
- .BR banned_email_file
- setting.
- 
-@@ -192,7 +192,7 @@
- If enabled, two log files are generated in parallel, going by default to
- .BR /var/log/xferlog
- and
--.BR /var/log/vsftpd.log .
-+.BR /var/log/vsftpd/vsftpd.log .
- The former is a wu-ftpd style transfer log, parseable by standard tools. The
- latter is vsftpd's own style log.
- 
-@@ -355,7 +355,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/vsftpd.email_passwords.
- 
- Default: NO
- .TP
-@@ -635,7 +635,7 @@
- .BR deny_email_enable
- is enabled.
- 
--Default: /etc/vsftpd.banned_emails
-+Default: /etc/vsftpd/vsftpd.banned_emails
- .TP
- .B banner_file
- This option is the name of a file containing text to display when someone
-@@ -664,7 +664,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/vsftpd.chroot_list
- .TP
- .B cmds_allowed
- This options specifies a comma separated list of allowed FTP commands (post
-@@ -706,7 +706,7 @@
- .BR secure_email_list_enable
- setting.
- 
--Default: /etc/vsftpd.email_passwords
-+Default: /etc/vsftpd/vsftpd.email_passwords
- .TP
- .B ftp_username
- This is the name of the user we use for handling anonymous FTP. The home
-@@ -816,10 +816,10 @@
- with an example. If you set
- .BR user_config_dir
- to be
--.BR /etc/vsftpd_user_conf
-+.BR /etc/vsftpd/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/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
-@@ -855,7 +855,7 @@
- .BR userlist_enable
- option is active.
- 
--Default: /etc/vsftpd.user_list
-+Default: /etc/vsftpd/vsftpd.user_list
- .TP
- .B vsftpd_log_file
- This option is the name of the file to which we write the vsftpd style
-@@ -869,7 +869,7 @@
- .BR syslog_enable ,
- then this file is not written and output is sent to the system log instead.
- 
--Default: /var/log/vsftpd.log
-+Default: /var/log/vsftpd/vsftpd.log
- .TP
- .B xferlog_file
- This option is the name of the file to which we write the wu-ftpd style
diff --git a/net-ftp/vsftpd/vsftpd-2.0.2.ebuild b/net-ftp/vsftpd/vsftpd-2.0.2.ebuild
deleted file mode 100644
index 80a535215a81..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.0.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# 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.2.ebuild,v 1.1 2005/03/13 14:44:59 solar 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 ipv6 ssl"
-
-DEPEND="pam? ( >=sys-libs/pam-0.75 )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	ssl? ( >=dev-libs/openssl-0.9.7d-r1 )"
-RDEPEND="${DEPEND} || ( sys-apps/xinetd >=sys-apps/ucspi-tcp-0.88-r3 )"
-
-src_unpack() {
-	unpack ${A} || die
-	cd ${S} || die
-	epatch ${FILESDIR}/${PN}-2.0.1-gentoo.diff || die
-	use tcpd && echo '#define VSF_BUILD_TCPWRAPPERS' >> builddefs.h
-	use ssl && echo '#define VSF_BUILD_SSL' >> builddefs.h
-	if ! use pam; then
-		echo '#undef VSF_BUILD_PAM' >> builddefs.h
-	fi
-
-}
-
-src_compile() {
-	if ! use pam; then
-		einfo "PAM support is DISABLED"
-	fi
-	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.sample
-	newdoc vsftpd.conf vsftpd.conf.dist.sample
-	docinto security ; dodoc SECURITY/*
-	cp -a EXAMPLE ${D}/usr/share/doc/${PF}/examples
-	chown -R root:root ${D}/usr/share/doc/${PF} # :\
-
-	insinto /etc/vsftpd ; doins ${FILESDIR}/ftpusers
-	insinto /etc/vsftpd ; newins ${FILESDIR}/vsftpd.conf vsftpd.conf.sample
-
-	# for running vsftpd from xinetd
-	insinto /etc/xinetd.d
-	if ! use ipv6; then
-		newins ${FILESDIR}/vsftpd.xinetd.ipv6 vsftpd
-	else
-		newins ${FILESDIR}/vsftpd.xinetd vsftpd
-	fi
-	insinto /etc/pam.d ; newins ${FILESDIR}/vsftpd.pam vsftpd
-
-	# for running vsftpd standalone
-	insinto /etc/conf.d
-	newins ${FILESDIR}/vsftpd.conf.d vsftpd
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/vsftpd.init.d vsftpd
-}
-
-pkg_postinst() {
-	# empty dirs...
-	install -m0755 -o root -g root -d ${ROOT}/home/ftp
-	install -m0755 -o root -g root -d ${ROOT}/usr/share/vsftpd/empty
-	install -m0755 -o root -g root -d ${ROOT}/var/log/vsftpd
-
-	/etc/init.d/depscan.sh
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
index 0d7c415bfb14..e17043e7ed3e 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild,v 1.2 2005/07/27 20:30:56 uberlord Exp $
 
 inherit flag-o-matic eutils
 
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="pam tcpd ssl xinetd"
 
 DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
diff --git a/net-ftp/vsftpd/vsftpd-2.0.3.ebuild b/net-ftp/vsftpd/vsftpd-2.0.3.ebuild
deleted file mode 100644
index 2fd4929cce6a..000000000000
--- a/net-ftp/vsftpd/vsftpd-2.0.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# 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.ebuild,v 1.2 2005/06/07 23:04:57 uberlord Exp $
-
-inherit flag-o-matic eutils pam
-
-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}
-	xinetd? ( sys-apps/xinetd )"
-
-src_unpack() {
-	unpack "${A}" || die
-	cd "${S}" || die
-	epatch "${FILESDIR}/${PN}-2.0.1-gentoo.diff" || 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
-}
-
-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.sample
-
-	docinto security
-	dodoc SECURITY/*
-
-	insinto "/usr/share/doc/${PF}/examples"
-	doins -r EXAMPLE/*
-
-	insinto /etc/vsftpd
-	doins "${FILESDIR}/ftpusers"
-	newins "${FILESDIR}/vsftpd.conf" vsftpd.conf.sample
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
-	fi
-
-	if has_version "<sys-libs/pam-0.78" ; then
-		newpamd "${FILESDIR}/vsftpd.pam" vsftpd
-	else
-		newpamd "${FILESDIR}/vsftpd.pam-include" vsftpd
-	fi
-
-	newconfd "${FILESDIR}/vsftpd.conf.d" vsftpd
-	newinitd "${FILESDIR}/vsftpd.init.d" vsftpd
-
-	keepdir /home/ftp
-	keepdir /usr/share/vsftpd/empty
-	keepdir /var/log/vsftpd
-}
-
-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
-}