Version bump, bug #290970. Also add net-ftp as herd

Package-Manager: portage-2.2_rc46/cvs/Linux x86_64

4 files changed, 116 insertions, 4 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 51cf4e6d953b..cc9f66e14d9e 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.118 2009/08/24 05:37:00 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.119 2009/10/29 09:38:04 voyageur Exp $
+
+*vsftpd-2.2.1 (29 Oct 2009)
+
+  29 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org> +vsftpd-2.2.1.ebuild,
+  metadata.xml:
+  Version bump, bug #290970. Also add net-ftp as herd
 
   24 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
   +files/vsftpd-2.2.0-dont-link-caps.patch:
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 0c1a229dfb4c..7f36ef9f6fb2 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -16,9 +16,11 @@ DIST vsftpd-2.0.7.tar.gz 162801 RMD160 8947c7ae00214fb30c9d7d2cfba5116643e1d8c7
 DIST vsftpd-2.1.0.tar.gz 178636 RMD160 0066ac526bb184e3ada9d4e53e520d82dfc71633 SHA1 3edd0868e03164eac11ab1fa9eac3ca4a30cd33a SHA256 82fdb75d44f1bbf1ee7930265a772dd13ebd314d389692c6788e9e2b4b116c87
 DIST vsftpd-2.1.2.tar.gz 180958 RMD160 7ec448d445218829401162d31f2910c933563d91 SHA1 dc67e28dd23808c0824105d24a8e426515496dfa SHA256 7964df745247897ed5f57901d4a24ac1ed2f2eafb08f9b5d181028d699b7fbe4
 DIST vsftpd-2.2.0.tar.gz 184700 RMD160 9acb3a0e3102dde0d587ee9ad5d4ccb8b731e1ef SHA1 7833b498e7f2c1c278fe7a365519a34d25974c60 SHA256 38d061d787433165392dbcced58cb397ddff8a7be86c2338a47fda6f2d93a3ba
+DIST vsftpd-2.2.1.tar.gz 185226 RMD160 b78be1239ad90b161d147ca113508af47313a6ad SHA1 ef406c23bfe4ee71aea257b80ebb42cf0021704d SHA256 ad0e4b9f7e18be2ae304db5c8e7d4dbf8cc3be7ebb86fc469b93f2c67472f0a5
 EBUILD vsftpd-2.0.7-r1.ebuild 3044 RMD160 6a0d8b83e13fea5bf8b2a7f8003c0b0f18588ca3 SHA1 92bdbbc14060324db6893b27e5bb3fca534ecc14 SHA256 baee7c94d0f811b09045cf6552a93f0bfbe4eb3a77ca381c4e5aad8b21303488
 EBUILD vsftpd-2.1.0-r1.ebuild 2903 RMD160 c24a353606a41e58580c0b7b2aeff9cf18ccfcf2 SHA1 97e8745c659384a88f5e8a46ee674819b5102b14 SHA256 639b42f9827a12034fbd8941ca91bc3b4c3dad4b4d4fe954c7d562ebe1406c7e
 EBUILD vsftpd-2.1.2.ebuild 2910 RMD160 f0e796918dd4b90312d346d00c8733b852ae0f8e SHA1 1123705c7ab58024d2811cdd69c97592fe13b783 SHA256 5fdf9617ac727881e7a42e81455637a19a51961f7d0185724271f2271c7d2bc7
 EBUILD vsftpd-2.2.0.ebuild 2894 RMD160 10e0682607be1377e077f539bcb734028aa54933 SHA1 adee87e81acbbba946c006a51729b6652b6ba1c2 SHA256 1efd258b38a62de2c257bf90347efa91e271726bc79e952e984937f0e9a03547
-MISC ChangeLog 16737 RMD160 764a493d3f04e9e8b40f44ed399d7d09158dab69 SHA1 4a84dd025a9213845dd2a750cb32a91ff3d55f76 SHA256 a319aadbdbbb67c4785e46074aafcbaa52802ecf8c980ec0eeace38df3398cdb
-MISC metadata.xml 358 RMD160 f8ffc0942c689c54a62b078a9a5bcd44702a5e68 SHA1 a252bf60d812dad06cbe00c324671cfba7b4e991 SHA256 cdc354a30f912a068432b3de197b3886ac05661869e7a0f67ac29f1da04b3b0d
+EBUILD vsftpd-2.2.1.ebuild 2911 RMD160 30b995bebe8f980064fd9fc04bce0c2269834755 SHA1 b4720b4308d427f217666aeadef4afcfcea2120a SHA256 cdd7cd696a3a4ae725ab06aa16fa7ea47617aef9659a1a38853bacb875121439
+MISC ChangeLog 16917 RMD160 69f047d0adaa27ad40c13d7ae00d6c906318f53a SHA1 9cfc93845552b8e238590f11ce89aa90e316ed83 SHA256 db6f275e276fe521ec966be065e6f5c1a38f2b93d1f744fb13bb45c193135836
+MISC metadata.xml 358 RMD160 914e6e8e5397682f8bad3250e3d040970616d931 SHA1 ef0a808f3cc611dfacb98eeb14139b71103ff5ec SHA256 5513af86c83ae97074e940da999a68ad2510fcf990f7be2e57e4c30265a88447
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 1107b34e8e04..243612c33feb 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
+	<herd>net-ftp</herd>
 	<maintainer>
 		<email>maintainer-needed@gentoo.org</email>
 	</maintainer>
diff --git a/net-ftp/vsftpd/vsftpd-2.2.1.ebuild b/net-ftp/vsftpd/vsftpd-2.2.1.ebuild
new file mode 100644
index 000000000000..b884ca69ef95
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.2.1.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.1.ebuild,v 1.1 2009/10/29 09:38:04 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"
+}