Version bump. No more ipv6 patch needed. Updated the gentoo patch.

5 files changed, 91 insertions, 11 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 64033edf8065..42f277088e3d 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.13 2003/06/05 04:40:26 woodchip Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.14 2003/06/09 07:46:42 raker Exp $
+
+*vsftpd-1.2.0 (09 Jun 2003)
+
+  09 Jun 2003; Nick Hadaway <raker@gentoo.org> vsftpd-1.2.0.ebuild.
+  files/vsftpd-1.2.0-gentoo.diff.bz2:
+  Version bump.  Fixed ipv6 logic for xinetd.  Now ipv6 support is 
+  included in the source so no patch is needed.  Updated the gentoo 
+  patch for this version.
 
 *vsftpd-1.1.3-r1 (06 Apr 2003)
 
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 0bb616eaaa09..edfcb213a461 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,18 +1,20 @@
-MD5 310a6141363ba66599492266997f0e29 ChangeLog 1303
-MD5 3f5cf714b4de6ff10f590a7239803cc2 vsftpd-1.0.1-r1.ebuild 1341
 MD5 1702821b33b583bbaa5b84e131256d93 vsftpd-1.1.2.ebuild 1573
+MD5 b4a95f2567573f4a4d91cb8e6fdf53c6 vsftpd-1.2.0.ebuild 2000
 MD5 75c2033e59f1d793acfa0bf124de2dc9 vsftpd-1.1.3-r1.ebuild 2073
+MD5 3f5cf714b4de6ff10f590a7239803cc2 vsftpd-1.0.1-r1.ebuild 1341
 MD5 2ecdd087d9cd0514aec3b55cbc7b8f3c vsftpd-1.1.3.ebuild 1897
-MD5 3734a4e9aaa1cc7775943c0c97bedd4b files/digest-vsftpd-1.0.1-r1 63
+MD5 310a6141363ba66599492266997f0e29 ChangeLog 1303
+MD5 26ff667accf732a00069c479e03cb17d files/ftpusers 363
 MD5 11b5ab24b0db00b16094f439702b54df files/digest-vsftpd-1.1.2 64
 MD5 2e7cb33c45be550cd01f69532c0ed419 files/digest-vsftpd-1.1.3 64
-MD5 2e7cb33c45be550cd01f69532c0ed419 files/digest-vsftpd-1.1.3-r1 64
-MD5 26ff667accf732a00069c479e03cb17d files/ftpusers 363
-MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
+MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0 64
 MD5 76cc239220e45f7acc48338d183a370e files/vsftpd-1.1.2-gentoo.diff 5695
-MD5 c5f7799cb5bacb00ea2920976353f3b6 files/vsftpd-1.1.3-gentoo.diff 6302
-MD5 5cdf504bf481bd877ec0aca8ee92a0c6 files/vsftpd-1.1.3-ipv6.patch 41561
+MD5 3734a4e9aaa1cc7775943c0c97bedd4b files/digest-vsftpd-1.0.1-r1 63
+MD5 2e7cb33c45be550cd01f69532c0ed419 files/digest-vsftpd-1.1.3-r1 64
+MD5 2ef7d85b3290f9d192f9d20045b61052 files/vsftpd.xinetd.ipv6 484
 MD5 9920815c556713474a590d46aa9889e1 files/vsftpd.conf 3768
-MD5 5cd84e770cb3dd070b0048f8933edc4e files/vsftpd.pam 479
+MD5 c5f7799cb5bacb00ea2920976353f3b6 files/vsftpd-1.1.3-gentoo.diff 6302
 MD5 1fbe76ee9788335150f3c31b6c649e29 files/vsftpd.xinetd 466
-MD5 2ef7d85b3290f9d192f9d20045b61052 files/vsftpd.xinetd.ipv6 484
+MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
+MD5 5cd84e770cb3dd070b0048f8933edc4e files/vsftpd.pam 479
+MD5 5cdf504bf481bd877ec0aca8ee92a0c6 files/vsftpd-1.1.3-ipv6.patch 41561
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-1.2.0 b/net-ftp/vsftpd/files/digest-vsftpd-1.2.0
new file mode 100644
index 000000000000..4c8603387787
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-1.2.0
@@ -0,0 +1 @@
+MD5 19c1818c102b63e4b0fea8d5b8b7c51f vsftpd-1.2.0.tar.gz 130025
diff --git a/net-ftp/vsftpd/files/vsftpd-1.2.0-gentoo.diff.bz2 b/net-ftp/vsftpd/files/vsftpd-1.2.0-gentoo.diff.bz2
new file mode 100644
index 000000000000..d2916d37fc5d
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-1.2.0-gentoo.diff.bz2
diff --git a/net-ftp/vsftpd/vsftpd-1.2.0.ebuild b/net-ftp/vsftpd/vsftpd-1.2.0.ebuild
new file mode 100644
index 000000000000..d056f8bf7150
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-1.2.0.ebuild
@@ -0,0 +1,69 @@
+# 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.ebuild,v 1.1 2003/06/09 07:46:42 raker 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"
+
+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
+	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
+}
+
+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
+}