version bump. fixes bug #33648.

5 files changed, 90 insertions, 3 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 14ba3d8ab5d5..d916ddfb3d2a 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.21 2003/12/10 08:31:09 rajiv Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.22 2003/12/10 08:48:22 rajiv Exp $
+
+*vsftpd-1.2.1 (10 Dec 2003)
+
+  10 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.2.1.ebuild,
+  files/vsftpd-1.2.1-gentoo.diff.bz2:
+  version bump. thanks to matt taylor for a new patch file.
+  fixes bug #33648.
 
   10 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.1.2.ebuild,
   vsftpd-1.1.3-r1.ebuild, vsftpd-1.1.3.ebuild, vsftpd-1.2.0.ebuild,
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 0e404959728b..6f61ab10c9cf 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,7 +1,7 @@
 MD5 191a04cdbe5134583744b69e7548cb61 vsftpd-1.2.0-r1.ebuild 2235
 MD5 3f5cf714b4de6ff10f590a7239803cc2 vsftpd-1.0.1-r1.ebuild 1341
-MD5 8aa1884b295e724367df16644b48abd7 vsftpd-1.2.1.ebuild 2216
-MD5 28f99b88b15a83af4ff14a273091a79a ChangeLog 2821
+MD5 dc584fe03fb2dbec5b1d6a4764653b5e vsftpd-1.2.1.ebuild 2212
+MD5 864f6245b910997c960a64ffc35e5b8b ChangeLog 2821
 MD5 d161cb0e313c1619fc61077d5b0c8821 metadata.xml 251
 MD5 26ff667accf732a00069c479e03cb17d files/ftpusers 363
 MD5 fd342c037bab05b6fcdd20c0d8fd6720 files/digest-vsftpd-1.2.1 64
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-1.2.1 b/net-ftp/vsftpd/files/digest-vsftpd-1.2.1
new file mode 100644
index 000000000000..02ac21fe5d5e
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-1.2.1
@@ -0,0 +1 @@
+MD5 3dd254f9c9c1aea370b2f1ff6212af6e vsftpd-1.2.1.tar.gz 136041
diff --git a/net-ftp/vsftpd/files/vsftpd-1.2.1-gentoo.diff.bz2 b/net-ftp/vsftpd/files/vsftpd-1.2.1-gentoo.diff.bz2
new file mode 100644
index 000000000000..1e44fa480dd7
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-1.2.1-gentoo.diff.bz2
diff --git a/net-ftp/vsftpd/vsftpd-1.2.1.ebuild b/net-ftp/vsftpd/vsftpd-1.2.1.ebuild
new file mode 100644
index 000000000000..4816203e1be1
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-1.2.1.ebuild
@@ -0,0 +1,79 @@
+# 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.1.ebuild,v 1.1 2003/12/10 08:48:22 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"
+
+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
+}