Version bump, bug #294325

(Portage version: 2.2_rc54/cvs/Linux x86_64)

2 files changed, 110 insertions, 1 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index cc9f66e14d9e..aa7effac6486 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.119 2009/10/29 09:38:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.120 2009/11/30 16:53:09 voyageur Exp $
+
+*vsftpd-2.2.2 (30 Nov 2009)
+
+  30 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org> +vsftpd-2.2.2.ebuild:
+  Version bump, bug #294325
 
 *vsftpd-2.2.1 (29 Oct 2009)
 
diff --git a/net-ftp/vsftpd/vsftpd-2.2.2.ebuild b/net-ftp/vsftpd/vsftpd-2.2.2.ebuild
new file mode 100644
index 000000000000..194127c4b477
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.2.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.2.2.ebuild,v 1.1 2009/11/30 16:53:09 voyageur Exp $
+
+inherit eutils toolchain-funcs
+
+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 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps pam tcpd ssl selinux xinetd"
+
+DEPEND="caps? ( >=sys-libs/libcap-2 )
+	pam? ( virtual/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() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patch the source, config and the manpage to use /etc/vsftpd/
+	epatch "${FILESDIR}/${PN}-2.2.0-gentoo.patch"
+
+	# Fix building without the libcap
+	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
+
+	# Configure vsftpd build defaults
+	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
+	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
+	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
+
+	# Ensure that we don't link against libcap unless asked
+	if ! use caps ; then
+		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
+		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
+	fi
+
+	# Let portage control stripping
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	into /usr
+	doman vsftpd.conf.5 vsftpd.8
+	dosbin vsftpd || die
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		README README.security REWARD SIZE \
+		SPEED TODO TUNING
+	newdoc vsftpd.conf vsftpd.conf.example
+
+	docinto security
+	dodoc SECURITY/*
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/*
+
+	insinto /etc/vsftpd
+	newins vsftpd.conf vsftpd.conf.example
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/vsftpd.xinetd" vsftpd
+	fi
+
+	newinitd "${FILESDIR}/vsftpd.init" vsftpd
+
+	keepdir /usr/share/vsftpd/empty
+}
+
+pkg_preinst() {
+	# If we use xinetd, then we set listen=NO
+	# so that our default config works under xinetd - fixes #78347
+	if use xinetd ; then
+		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
+	fi
+}
+
+pkg_postinst() {
+	einfo "vsftpd init script can now be multiplexed."
+	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
+	einfo "If you symlink the init script to another one, say vsftpd.foo"
+	einfo "then that uses /etc/vsftpd/foo.conf instead."
+	einfo
+	einfo "Example:"
+	einfo "   cd /etc/init.d"
+	einfo "   ln -s vsftpd vsftpd.foo"
+	einfo "You can now treat vsftpd.foo like any other service"
+}