added init.d and conf.d files for running vsftpd standalone.

5 files changed, 127 insertions, 4 deletions

diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index f1c7c8c5caeb..1f1ce3750f7f 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,10 +1,10 @@
 MD5 297f0cf7a839f5471830f77f9fff74d7 vsftpd-1.1.2.ebuild 1570
 MD5 83c7ee4e71f14024964291676ae02987 vsftpd-1.2.0.ebuild 2015
 MD5 b9087d5dc32704a9c607971cd6679ac0 vsftpd-1.1.3-r1.ebuild 2068
-MD5 1d7d1c5d64b672b680a25a1b0caf62f2 vsftpd-1.2.0-r1.ebuild 2234
+MD5 d1d29f3482347b722a7dcdb57e6e966a vsftpd-1.2.0-r1.ebuild 2236
 MD5 3f5cf714b4de6ff10f590a7239803cc2 vsftpd-1.0.1-r1.ebuild 1341
 MD5 9db5296545956ff6f426197c6be2444c vsftpd-1.1.3.ebuild 1893
-MD5 e0af6c622d460eae780e73bdd4eab453 ChangeLog 1918
+MD5 f057e7b6263f4de20483a78d14479836 ChangeLog 1917
 MD5 26ff667accf732a00069c479e03cb17d files/ftpusers 363
 MD5 11b5ab24b0db00b16094f439702b54df files/digest-vsftpd-1.1.2 64
 MD5 2e7cb33c45be550cd01f69532c0ed419 files/digest-vsftpd-1.1.3 64
@@ -15,9 +15,9 @@ MD5 2e7cb33c45be550cd01f69532c0ed419 files/digest-vsftpd-1.1.3-r1 64
 MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0-r1 64
 MD5 2ef7d85b3290f9d192f9d20045b61052 files/vsftpd.xinetd.ipv6 484
 MD5 12157a137e6633887fad5c7a8e1e1ae3 files/vsftpd-1.2.0-gentoo.diff.bz2 2078
-MD5 afa17c65f6669c9c14bcdd5ff93762a1 files/vsftpd.conf.d 199
+MD5 1a93d49d1cd737194ab7c38ecd62f8ab files/vsftpd.conf.d 295
 MD5 9920815c556713474a590d46aa9889e1 files/vsftpd.conf 3768
-MD5 0177ab99200ef7cf26c0e22f61cd7782 files/vsftpd.init.d 829
+MD5 d2557bf729d4b10f2b82a750e0cebe31 files/vsftpd.init.d 925
 MD5 c5f7799cb5bacb00ea2920976353f3b6 files/vsftpd-1.1.3-gentoo.diff 6302
 MD5 1fbe76ee9788335150f3c31b6c649e29 files/vsftpd.xinetd 466
 MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-1.2.0-r1 b/net-ftp/vsftpd/files/digest-vsftpd-1.2.0-r1
new file mode 100644
index 000000000000..4c8603387787
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-1.2.0-r1
@@ -0,0 +1 @@
+MD5 19c1818c102b63e4b0fea8d5b8b7c51f vsftpd-1.2.0.tar.gz 130025
diff --git a/net-ftp/vsftpd/files/vsftpd.conf.d b/net-ftp/vsftpd/files/vsftpd.conf.d
new file mode 100644
index 000000000000..5ef596e7e5b7
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.conf.d
@@ -0,0 +1,7 @@
+# Copyright 2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.conf.d,v 1.1 2003/09/03 01:41:05 rajiv Exp $
+
+# Config file for /etc/init.d/vsftpd
+
+VSFTPD_CONF=/etc/vsftpd/vsftpd.conf
diff --git a/net-ftp/vsftpd/files/vsftpd.init.d b/net-ftp/vsftpd/files/vsftpd.init.d
new file mode 100644
index 000000000000..77d20d5c357f
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.init.d
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 2003 Gentoo Technologies, Inc.
+# 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.1 2003/09/03 01:41:05 rajiv Exp $
+
+depend() {
+	need net
+	use dns logger
+}
+
+checkconfig() {
+	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
+		source ${VSFTPD_CONF}
+		if [ "${background}" != "YES" ] ; then
+			eerror "${VSFTPD_CONF} must contain background=YES in order to start vsftpd from /etc/init.d/vsftpd"
+			return 2
+		fi
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	ebegin "Starting vsftpd"
+	start-stop-daemon --start --quiet \
+		--exec /usr/sbin/vsftpd ${VSFTPD_CONF}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping vsftpd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/vsftpd
+	eend $?
+}
diff --git a/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild b/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild
new file mode 100644
index 000000000000..11553abdd307
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild,v 1.1 2003/09/03 01:41:05 rajiv Exp $
+
+inherit flag-o-matic eutils
+
+IUSE="pam tcpd ipv6"
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
+HOMEPAGE="http://vsftpd.beasts.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~hppa -alpha"
+
+DEPEND="pam? ( >=sys-libs/pam-0.75 )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )"
+RDEPEND="${DEPEND} || ( sys-apps/xinetd >=sys-apps/ucspi-tcp-0.88-r3 )"
+
+filter-flags "-fPIC"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	epatch ${FILESDIR}/${P}-gentoo.diff.bz2 || die
+	use tcpd && echo '#define VSF_BUILD_TCPWRAPPERS' >> 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 [ ! -n `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
+}