New USE flag selinux now depends on the selinux-ftpd policy, wrt #106355.

  Punted the old 1.2.2 ebuild - 2.0.3-r1 stable on all arches :)
(Portage version: 2.0.51.22-r2)

8 files changed, 18 insertions, 132 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 8fc49c0f3594..6ab48f6c3ddb 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.61 2005/09/17 19:24:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.62 2005/09/19 11:46:29 uberlord Exp $
+
+  19 Sep 2005; Roy Marples <uberlord@gentoo.org> -vsftpd-1.2.2.ebuild,
+  vsftpd-2.0.3-r1.ebuild:
+  New USE flag selinux now depends on the selinux-ftpd policy, wrt #106355.
+  
+  Punted the old 1.2.2 ebuild - 2.0.3-r1 stable on all arches :)
 
   17 Sep 2005; Aron Griffis <agriffis@gentoo.org> vsftpd-2.0.3-r1.ebuild:
   Mark 2.0.3-r1 stable on alpha
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index b9a040b1362e..194116ab7eb5 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,27 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f590c5cc8bdad2e0613d0579f816079a vsftpd-2.0.3-r1.ebuild 1984
-MD5 9b0552a6a6a0eb6ab815116dbfde2c6c ChangeLog 8402
-MD5 6bc5f88008d02f6e7f2e80b974eab252 vsftpd-1.2.2.ebuild 2296
+MD5 c088e6fbeeedc05dc4c560b902dcc0e3 ChangeLog 8644
 MD5 0451b23327c004752edf415e25931d07 metadata.xml 344
-MD5 b0551ddc57103f1dcca71524691540a0 files/vsftpd.init.d 1038
-MD5 8578d5c3f50e7b090ba023dfa626ec89 files/vsftpd.xinetd 432
-MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
-MD5 10727329a1de642694a73e3655774015 files/vsftpd-2.0.3-gentoo.diff 5598
-MD5 5a140ccd0017f39fe3c63e6a29e1abcd files/ftpusers 365
+MD5 11ab709a212032817f3090acd3a53a02 vsftpd-2.0.3-r1.ebuild 2030
 MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3-r1 64
+MD5 5a140ccd0017f39fe3c63e6a29e1abcd files/ftpusers 365
+MD5 d0f6c4bc146ade78fdcc3ecc94ffece2 files/vsftpd.conf 3842
+MD5 2ed3e6179c0660f4b836fc5e21611740 files/vsftpd.pam 408
 MD5 e4a0ae5ba000a0e22576618d76760957 files/vsftpd.pam-include 340
+MD5 8578d5c3f50e7b090ba023dfa626ec89 files/vsftpd.xinetd 432
+MD5 10727329a1de642694a73e3655774015 files/vsftpd-2.0.3-gentoo.diff 5598
 MD5 a61f83e896d2058a22f9fb3d2b2b1b25 files/vsftpd.conf.d 294
-MD5 fc1e8a30f8f0ce1b6f0a8c1958fc3e6e files/vsftpd.xinetd.ipv6 451
-MD5 2ed3e6179c0660f4b836fc5e21611740 files/vsftpd.pam 408
-MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080
-MD5 e0e25ba72aea7fb37f3f66f4ca359a82 files/vsftpd-1.2.2-ppc64.diff 479
-MD5 d0f6c4bc146ade78fdcc3ecc94ffece2 files/vsftpd.conf 3842
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDLG2Xj5H05b2HAEkRAujNAJ4lMy77O0nKDTYLMcLpCyTHruvFDgCfYFFZ
-a8rVI9fQbtMoFkIVFngOvmU=
-=ba+y
------END PGP SIGNATURE-----
+MD5 b0551ddc57103f1dcca71524691540a0 files/vsftpd.init.d 1038
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-1.2.2 b/net-ftp/vsftpd/files/digest-vsftpd-1.2.2
deleted file mode 100644
index d8b5d2aa4fb6..000000000000
--- a/net-ftp/vsftpd/files/digest-vsftpd-1.2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5a38e1c69062e7688fbbdae6d1196de2 vsftpd-1.2.2.tar.gz 136669
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
deleted file mode 100644
index 1e44fa480dd7..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-1.2.1-gentoo.diff.bz2
+++ /dev/null
diff --git a/net-ftp/vsftpd/files/vsftpd-1.2.2-ppc64.diff b/net-ftp/vsftpd/files/vsftpd-1.2.2-ppc64.diff
deleted file mode 100644
index ab483fc3bf06..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-1.2.2-ppc64.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- sysdeputil.c.orig	2004-09-28 22:08:30.727084224 -0500
-+++ sysdeputil.c	2004-09-28 22:08:53.719050328 -0500
-@@ -157,7 +157,7 @@
- #include <linux/capability.h>
- #include <errno.h>
- #include <syscall.h>
--_syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data)
-+/* _syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data) */
- /* Gross HACK to avoid warnings - linux headers overlap glibc headers */
- #undef __NFDBITS
- #undef __FDMASK
diff --git a/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6 b/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6
deleted file mode 100644
index 0d294a72f8db..000000000000
--- a/net-ftp/vsftpd/files/vsftpd.xinetd.ipv6
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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.3 2005/06/07 18:34:17 uberlord Exp $
-
-service ftp
-{
-	socket_type     = stream
-	wait            = no
-	user            = root
-	server          = /usr/sbin/vsftpd
-	server_args     = /etc/vsftpd/vsftpd.conf
-	log_on_success  += DURATION
-	nice            = 10
-	disable         = yes
-	flags		= IPv6
-}
diff --git a/net-ftp/vsftpd/vsftpd-1.2.2.ebuild b/net-ftp/vsftpd/vsftpd-1.2.2.ebuild
deleted file mode 100644
index 534544d0d3a6..000000000000
--- a/net-ftp/vsftpd/vsftpd-1.2.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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-1.2.2.ebuild,v 1.11 2005/01/22 20:36:08 solar Exp $
-
-inherit flag-o-matic eutils
-
-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"
-
-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
-	use ppc64 && epatch ${FILESDIR}/vsftpd-1.2.2-ppc64.diff
-}
-
-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
-}
diff --git a/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
index cb7e9f18a56e..4a8f0e81fc46 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.8 2005/09/17 02:22:05 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.3-r1.ebuild,v 1.9 2005/09/19 11:46:29 uberlord Exp $
 
 inherit flag-o-matic eutils
 
@@ -11,13 +11,14 @@ 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 ssl xinetd"
+IUSE="pam tcpd ssl selinux xinetd"
 
 DEPEND="pam? ( || ( virtual/pam sys-libs/pam ) )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? ( >=dev-libs/openssl-0.9.7d )"
 RDEPEND="${DEPEND}
 	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftpd )
 	xinetd? ( sys-apps/xinetd )"
 
 src_unpack() {