security version bump bug #53116

4 files changed, 98 insertions, 12 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index e12665514f9a..6bcc794af26e 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.33 2004/06/10 16:54:07 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.34 2004/06/15 08:02:55 solar Exp $
+
+*vsftpd-1.2.2 (15 Jun 2004)
+
+  15 Jun 2004; <solar@gentoo.org> vsftpd-1.2.2.ebuild:
+  security version bump bug #53116
 
   10 Jun 2004; Aron Griffis <agriffis@gentoo.org> vsftpd-1.2.0-r1.ebuild,
   vsftpd-1.2.1.ebuild:
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index a0edc5e3119a..cc69b738a4f6 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,18 +1,20 @@
 MD5 2b520c4eafea3b74ffba922daae87e65 ChangeLog 3941
-MD5 d161cb0e313c1619fc61077d5b0c8821 metadata.xml 251
 MD5 e6fa2bacc60f21012f1d5f70f451aa98 vsftpd-1.0.1-r1.ebuild 1340
-MD5 eacf56df0890648e7fac2375a915cf24 vsftpd-1.2.0-r1.ebuild 2226
 MD5 ecb31bff03ddcc94d38c9f854d08b884 vsftpd-1.2.1.ebuild 2245
+MD5 1bc4e1de99b27c07b04d798c88e6dacf vsftpd-1.2.2.ebuild 2252
+MD5 eacf56df0890648e7fac2375a915cf24 vsftpd-1.2.0-r1.ebuild 2226
+MD5 d161cb0e313c1619fc61077d5b0c8821 metadata.xml 251
 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 d22c753c26a1481e33a0f5f50187d3e2 files/ftpusers 362
+MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080
+MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
+MD5 26ff667accf732a00069c479e03cb17d files/ftpusers 363
 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 5027d8a674824c20a806c8b3fee98016 files/vsftpd.conf 3767
-MD5 43967293ffc2af9a073b0079e3777dbc files/vsftpd.conf.d 294
-MD5 89e8c02cdd8c51b6956f3c30f6350133 files/vsftpd.init.d 979
-MD5 d548e473f6f941cd8d1a4b98eda6dda3 files/vsftpd.pam 478
-MD5 9fab15bf99502383dd64fa752bb881eb files/vsftpd.xinetd 465
-MD5 47ad38804b499cec3593e5a62ff5bb85 files/vsftpd.xinetd.ipv6 483
+MD5 9920815c556713474a590d46aa9889e1 files/vsftpd.conf 3768
+MD5 5cd84e770cb3dd070b0048f8933edc4e files/vsftpd.pam 479
+MD5 1fbe76ee9788335150f3c31b6c649e29 files/vsftpd.xinetd 466
+MD5 2ef7d85b3290f9d192f9d20045b61052 files/vsftpd.xinetd.ipv6 484
+MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0-r1 64
+MD5 1a93d49d1cd737194ab7c38ecd62f8ab files/vsftpd.conf.d 295
+MD5 dab305a7002358f4f298c8e1fe59f3bf files/vsftpd.init.d 980
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-1.2.2 b/net-ftp/vsftpd/files/digest-vsftpd-1.2.2
new file mode 100644
index 000000000000..d8b5d2aa4fb6
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-1.2.2
@@ -0,0 +1 @@
+MD5 5a38e1c69062e7688fbbdae6d1196de2 vsftpd-1.2.2.tar.gz 136669
diff --git a/net-ftp/vsftpd/vsftpd-1.2.2.ebuild b/net-ftp/vsftpd/vsftpd-1.2.2.ebuild
new file mode 100644
index 000000000000..6ac09f958972
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-1.2.2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2004 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.2.ebuild,v 1.1 2004/06/15 08:02:55 solar 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 ~amd64 alpha ia64 sparc s390 ppc64 ~ppc"
+
+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 )"
+
+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
+}
+
+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
+}