init.d script now checks for listen=YES or listen_ipv6=YES - fixes #54228

xinetd USE flag added to make support of it optional - fixes #75892
USERID removed from xinetd files - fixes #78764
init.d script now does a "killall vsftpd" when stopping - fixes #81819
cleaner ebuild - fixes #84733
(Portage version: 2.0.51.19)

9 files changed, 140 insertions, 54 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index a0805614edc5..253d0410b5d9 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,17 @@
 # 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.51 2005/03/13 14:44:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.52 2005/06/07 18:34:17 uberlord Exp $
+
+*vsftpd-2.0.3 (07 Jun 2005)
+
+  07 Jun 2005; Roy Marples <uberlord@gentoo.org> files/vsftpd.init.d,
+  +files/vsftpd.pam-include, files/vsftpd.xinetd, files/vsftpd.xinetd.ipv6,
+  metadata.xml, +vsftpd-2.0.3.ebuild:
+  init.d script now checks for listen=YES or listen_ipv6=YES - fixes #54228
+  xinetd USE flag added to make support of it optional - fixes #75892
+  USERID removed from xinetd files - fixes #78764
+  init.d script now does a "killall vsftpd" when stopping - fixes #81819
+  cleaner ebuild - fixes #84733 thanks to Diego Petteno <flameeyes@gentoo.org>
 
 *vsftpd-2.0.2 (13 Mar 2005)
 
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index f4c02d26bb08..73ac2fd4ef5b 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,38 +1,29 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 611c7876025c64306c0c073cd637d4a6 vsftpd-2.0.2.ebuild 2315
-MD5 6bc5f88008d02f6e7f2e80b974eab252 vsftpd-1.2.2.ebuild 2296
-MD5 b59c24ad332464dd05044ac7c030248e vsftpd-2.0.1.ebuild 2338
-MD5 85c91beaad705e75c0a45baa3b445b86 vsftpd-1.2.0-r1.ebuild 2217
+MD5 b5603e23a097b583d77afdb63ee813e6 ChangeLog 6059
+MD5 2f898b6592a8fc8ec507ca1ea2e2dfef metadata.xml 291
 MD5 95428c20e767e1f9daef82970a5e4d49 vsftpd-1.0.1-r1.ebuild 1324
+MD5 85c91beaad705e75c0a45baa3b445b86 vsftpd-1.2.0-r1.ebuild 2217
 MD5 425ecc7dab6af4626596d302f0f8e00b vsftpd-1.2.1.ebuild 2236
-MD5 b5603e23a097b583d77afdb63ee813e6 ChangeLog 6059
-MD5 d161cb0e313c1619fc61077d5b0c8821 metadata.xml 251
+MD5 6bc5f88008d02f6e7f2e80b974eab252 vsftpd-1.2.2.ebuild 2296
+MD5 b59c24ad332464dd05044ac7c030248e vsftpd-2.0.1.ebuild 2338
+MD5 611c7876025c64306c0c073cd637d4a6 vsftpd-2.0.2.ebuild 2315
+MD5 0b899a587a9c1036e43aca9fd83c6d7a vsftpd-2.0.3.ebuild 1914
+MD5 3734a4e9aaa1cc7775943c0c97bedd4b files/digest-vsftpd-1.0.1-r1 63
+MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0-r1 64
 MD5 5a140ccd0017f39fe3c63e6a29e1abcd files/ftpusers 365
+MD5 e0e25ba72aea7fb37f3f66f4ca359a82 files/vsftpd-1.2.2-ppc64.diff 479
+MD5 eb057c63bffcf702e1b8d0f9e406b6e5 files/vsftpd.conf 3770
+MD5 aaa55785aee7dd51daf75a72232693f9 files/vsftpd.pam 481
+MD5 e69b1d733cc4a5f9bb39cbe2af8e9467 files/vsftpd.pam-include 335
+MD5 e360782fe790d11706f2bf75ebd99d52 files/vsftpd.xinetd 435
+MD5 aff5dfdea7d5f6a4102ba07901c62384 files/vsftpd.xinetd.ipv6 454
+MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
+MD5 12157a137e6633887fad5c7a8e1e1ae3 files/vsftpd-1.2.0-gentoo.diff.bz2 2078
+MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080
+MD5 e0a15cbbb9ee8ae2099c0b267431f2da files/vsftpd-2.0.1-gentoo.diff 6762
 MD5 fd342c037bab05b6fcdd20c0d8fd6720 files/digest-vsftpd-1.2.1 64
-MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
 MD5 2b36bc74604934d6ce3ef5c6b2d77485 files/digest-vsftpd-2.0.1 64
+MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
 MD5 6813de15f73b7782a1061072bbefa98e files/digest-vsftpd-2.0.2 64
-MD5 e0a15cbbb9ee8ae2099c0b267431f2da files/vsftpd-2.0.1-gentoo.diff 6762
-MD5 3734a4e9aaa1cc7775943c0c97bedd4b files/digest-vsftpd-1.0.1-r1 63
-MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0-r1 64
-MD5 32951e2e5a1c743fa96533989167c54a files/vsftpd.xinetd.ipv6 488
-MD5 12157a137e6633887fad5c7a8e1e1ae3 files/vsftpd-1.2.0-gentoo.diff.bz2 2078
+MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3 64
 MD5 a61f83e896d2058a22f9fb3d2b2b1b25 files/vsftpd.conf.d 294
-MD5 eb057c63bffcf702e1b8d0f9e406b6e5 files/vsftpd.conf 3770
-MD5 d2bbf1b4e07a4f1f51f313274eb2e320 files/vsftpd.init.d 974
-MD5 e50b10a57c22f7b27de250b8b65038a0 files/vsftpd.xinetd 468
-MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080
-MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
-MD5 aaa55785aee7dd51daf75a72232693f9 files/vsftpd.pam 481
-MD5 e0e25ba72aea7fb37f3f66f4ca359a82 files/vsftpd-1.2.2-ppc64.diff 479
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0 (GNU/Linux)
-
-iQCVAwUBQjRSKp4WFLgrx1GWAQLJvgQAsxNG6Katt/37S2qEeEokxCRokg8lQWi8
-8CzAgwHTXpFXb0Z4ztwiuYi7/R5bUK6aPAddIaeVw2E3mPQ54DmAxRsnwdsDm8aH
-NKUW4B4PKxtVHaUiXiGTlGWf55hMkXksVD+tj/imu85XdZXV52h9dvHVhlPMkiaT
-vQ7Q5Yj/75w=
-=i4Oj
------END PGP SIGNATURE-----
+MD5 3f73a9113ac7e7005e290508153a5660 files/vsftpd.init.d 1034
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.3 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.3
new file mode 100644
index 000000000000..24cabb401608
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.3
@@ -0,0 +1 @@
+MD5 74936cbd8e8251deb1cd99c5fb18b6f8 vsftpd-2.0.3.tar.gz 153266
diff --git a/net-ftp/vsftpd/files/vsftpd.init.d b/net-ftp/vsftpd/files/vsftpd.init.d
index 5f1c4ca527e9..26c650492e7f 100644
--- a/net-ftp/vsftpd/files/vsftpd.init.d
+++ b/net-ftp/vsftpd/files/vsftpd.init.d
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 2003-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init.d,v 1.4 2004/10/01 03:16:13 jforman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init.d,v 1.5 2005/06/07 18:34:17 uberlord Exp $
 
 depend() {
 	need net
@@ -9,29 +9,33 @@ depend() {
 }
 
 checkconfig() {
-	if [ ! -e ${VSFTPD_CONF} ] ; then
+	if [[ ! -e ${VSFTPD_CONF} ]] ; then
 		eerror "Please setup ${VSFTPD_CONF} before starting vsftpd"
 		eerror "There are sample configurations in /usr/share/doc/vsftpd"
 		return 1
-	else
-		( grep -q "^background=YES" ${VSFTPD_CONF}  && grep -q "^listen=YES" ${VSFTPD_CONF} )  || {
-		eerror "${VSFTPD_CONF} must contain background=YES and listen=YES"
-		eerror "in order to start vsftpd from /etc/init.d/vsftpd"
-		return 2
-	}
 	fi
+
+	if grep -q "^background=YES" ${VSFTPD_CONF} ; then
+		local c=$( grep -c "^\(listen\|listen_ipv6\)=YES" "${VSFTPD_CONF}" )
+		[[ ${c} == "1" ]] && return 0
+	fi
+		
+	eerror "${VSFTPD_CONF} must contain background=YES and either"
+	eerror "listen=YES or listen_ipv6=YES (but not both)"
+	eerror "in order to start vsftpd from /etc/init.d/vsftpd"
+	return 1
 }
 
 start() {
 	checkconfig || return 1
 	ebegin "Starting vsftpd"
-	start-stop-daemon --start --quiet \
+	start-stop-daemon --start \
 		--exec /usr/sbin/vsftpd ${VSFTPD_CONF}
 	eend $?
 }
 
 stop() {
 	ebegin "Stopping vsftpd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/vsftpd
+	killall vsftpd
 	eend $?
 }
diff --git a/net-ftp/vsftpd/files/vsftpd.pam-include b/net-ftp/vsftpd/files/vsftpd.pam-include
new file mode 100644
index 000000000000..8ecb27573e61
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.pam-include
@@ -0,0 +1,7 @@
+#%PAM-1.0
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.pam-include,v 1.1 2005/06/07 18:34:17 uberlord Exp $
+auth     required	pam_listfile.so item=user sense=deny file=/etc/vsftpd/ftpusers onerr=succeed
+auth     include	system-auth
+auth     required	pam_shells.so
+account  include	system-auth
+session  include	system-auth
diff --git a/net-ftp/vsftpd/files/vsftpd.xinetd b/net-ftp/vsftpd/files/vsftpd.xinetd
index 59dcf3ca6347..d1d88e93daae 100644
--- a/net-ftp/vsftpd/files/vsftpd.xinetd
+++ b/net-ftp/vsftpd/files/vsftpd.xinetd
@@ -1,6 +1,6 @@
 # default: off
 # description: Vsftpd is an FTP server, designed to be secure.
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd,v 1.3 2004/07/18 03:56:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd,v 1.4 2005/06/07 18:34:17 uberlord Exp $
 
 service ftp
 {
@@ -9,8 +9,7 @@ service ftp
 	user            = root
 	server          = /usr/sbin/vsftpd
 	server_args     = /etc/vsftpd/vsftpd.conf
-	log_on_success  += DURATION USERID
-	log_on_failure  += USERID
+	log_on_success  += DURATION 
 	nice            = 10
 	disable         = yes
 }
diff --git a/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6 b/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6
index 3fabd5dbdcd0..0d294a72f8db 100644
--- a/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6
+++ b/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6
@@ -1,6 +1,6 @@
 # default: off
 # description: Vsftpd is an FTP server, designed to be secure.
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6,v 1.2 2004/07/18 03:56:09 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6,v 1.3 2005/06/07 18:34:17 uberlord Exp $
 
 service ftp
 {
@@ -9,8 +9,7 @@ service ftp
 	user            = root
 	server          = /usr/sbin/vsftpd
 	server_args     = /etc/vsftpd/vsftpd.conf
-	log_on_success  += DURATION USERID
-	log_on_failure  += USERID
+	log_on_success  += DURATION
 	nice            = 10
 	disable         = yes
 	flags		= IPv6
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index fe80010c2d52..fd42fb42a82a 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
-<maintainer>
-  <email>rajiv@gentoo.org</email>
-  <name>Rajiv Manglani</name>
-</maintainer>
+	<maintainer>
+		<email>uberlord@gentoo.org</email>
+		<name>Roy Marples</name>
+	</maintainer>
+	<longdescription>Very Secure FTP Daemon</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/vsftpd/vsftpd-2.0.3.ebuild b/net-ftp/vsftpd/vsftpd-2.0.3.ebuild
new file mode 100644
index 000000000000..e2105573efee
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.0.3.ebuild
@@ -0,0 +1,74 @@
+# 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.1 2005/06/07 18:34:17 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 ipv6 ssl xinetd"
+
+DEPEND="pam? ( virtual/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
+	newdoc vsftpd.conf vsftpd.conf.dist.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
+		if ! use ipv6; then
+			newins ${FILESDIR}/vsftpd.xinetd.ipv6 vsftpd
+		else
+			newins ${FILESDIR}/vsftpd.xinetd vsftpd
+		fi
+	fi
+
+	newpamd ${FILESDIR}/vsftpd.pam-include vsftpd
+
+	newconfd ${FILESDIR}/vsftpd.conf.d vsftpd
+	newinitd ${FILESDIR}/vsftpd.init.d vsftpd
+
+	keepdir /home/ftp
+	keepdir /usr/share/vsftpd/empty
+	keepdir /var/log/vsftpd
+}