4 files changed, 88 insertions, 13 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index ca5252b07f20..0369b1870a33 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.39 2004/07/14 02:59:58 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.40 2004/09/23 12:36:57 jforman Exp $
+
+  23 Sep 2004; Jeffrey Forman <jforman@gentoo.org> :
+  New ebuild, vsftp-2.0.1, -$arch on all. Adds SSL/TLS support
 
   13 Jul 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.2.ebuild:
   stable on ppc64, bug #53116
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index fe4e7bcc4da1..dee3a7572d79 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,15 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 7dac24dc4104e05c98f32f71dad57c46 ChangeLog 4455
+MD5 22c4f20ad1fd61f580d9db0d91d4c0ef ChangeLog 4572
 MD5 d161cb0e313c1619fc61077d5b0c8821 metadata.xml 251
 MD5 d1a2ec32b0639d78243cc5aee840eb9f vsftpd-1.0.1-r1.ebuild 1325
 MD5 213703fc92069b2036caf192afb39068 vsftpd-1.2.0-r1.ebuild 2218
 MD5 284ab51c778b56a5f4155fbb7eb7492e vsftpd-1.2.1.ebuild 2237
 MD5 8db5a76f69189b1fc1bbbcce8f18e517 vsftpd-1.2.2.ebuild 2238
+MD5 6011c0f897eba83859503415f2e93d02 vsftpd-2.0.1.ebuild 2345
 MD5 3734a4e9aaa1cc7775943c0c97bedd4b files/digest-vsftpd-1.0.1-r1 63
 MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0-r1 64
 MD5 fd342c037bab05b6fcdd20c0d8fd6720 files/digest-vsftpd-1.2.1 64
+MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
 MD5 5a140ccd0017f39fe3c63e6a29e1abcd files/ftpusers 365
 MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
 MD5 12157a137e6633887fad5c7a8e1e1ae3 files/vsftpd-1.2.0-gentoo.diff.bz2 2078
@@ -20,11 +19,4 @@ MD5 73da8f18451d3c3770c539e5dde163ef files/vsftpd.init.d 979
 MD5 aaa55785aee7dd51daf75a72232693f9 files/vsftpd.pam 481
 MD5 e50b10a57c22f7b27de250b8b65038a0 files/vsftpd.xinetd 468
 MD5 32951e2e5a1c743fa96533989167c54a files/vsftpd.xinetd.ipv6 488
-MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
-
-iD8DBQFBUlWVHTu7gpaalycRAv7jAJ4+aEt2TKVky+ASsL3qRiOA6xMi0gCcCIkn
-OGALcZOlciYN5CN3eNUlN/g=
-=dAEV
------END PGP SIGNATURE-----
+MD5 2b36bc74604934d6ce3ef5c6b2d77485 files/digest-vsftpd-2.0.1 64
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.1 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.1
new file mode 100644
index 000000000000..7ce7b2af3fc3
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.1
@@ -0,0 +1 @@
+MD5 63838791ec8b1375ed154fb2603e52e9 vsftpd-2.0.1.tar.gz 146231
diff --git a/net-ftp/vsftpd/vsftpd-2.0.1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.1.ebuild
new file mode 100644
index 000000000000..0a6c97af0224
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.0.1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.1.ebuild,v 1.1 2004/09/23 12:36:57 jforman 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() {
+	filter-flags "-fPIC"
+	unpack ${A} || die
+	cd ${S} || die
+	epatch ${FILESDIR}/${PN}-1.2.1-gentoo.diff.bz2 || die
+	use tcpd && echo '#define VSF_BUILD_TCPWRAPPERS' >> builddefs.h
+	use ssl && echo '#define VSF_BUILD_SSL' >> builddefs.h
+}
+
+src_compile() {
+	if use pam; then
+		emake CFLAGS="${CFLAGS} -DUSE_PAM" || die
+	else
+		emake CFLAGS="${CFLAGS}" \
+		LIBS='`./vsf_findlibs.sh | sed "/[/-]\<.*pam.*\>/d"`' || die
+	fi
+}
+
+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
+}