Version bump. Bug #331441. Johan Bergström <bugs@bergstroem.nu> will be proxy-maintainer

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

4 files changed, 124 insertions, 6 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 75741854b103..08f2f1666563 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.126 2010/08/20 08:49:15 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.127 2010/08/20 09:15:42 hwoarang Exp $
+
+*vsftpd-2.3.2 (20 Aug 2010)
+
+  20 Aug 2010; Markos Chandras <hwoarang@gentoo.org> +vsftpd-2.3.2.ebuild,
+  metadata.xml:
+  Version bump. Bug #331441. Johan Bergström <bugs@bergstroem.nu> will be
+  proxy-maintainer
 
   20 Aug 2010; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
   Taking over maintainership
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 767c1cb44892..8abaadb30af6 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -9,13 +9,15 @@ AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f
 AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3
 AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
 DIST vsftpd-2.2.2.tar.gz 185562 RMD160 2703291a9ce76f68cc8ef82f04cb28c471946f53 SHA1 43976c6dbffe8e4bdc5f4add73a0c1431662a6c6 SHA256 05665dfa43a268e6fe422b89f6c3cb1a63e4e989b456922508f3f89d4b276eab
+DIST vsftpd-2.3.2.tar.gz 187229 RMD160 27bdc9d3065390a9dc85b3ef5926ad16d3544d2d SHA1 d525974514ecf61cbbf9cb51066aa68d5a52033b SHA256 a4e04836d8e271f361030e6a679ad001046c3e37f59e9fee5114189f9e065336
 EBUILD vsftpd-2.2.2.ebuild 2900 RMD160 2eacd78fe47174ef7689485b097375ddf304953f SHA1 ebd0cc1cfd7c54564752005c623e6832b91953d2 SHA256 d1fe9acd8219e8284f4de9153f526e3c12cb91d73bdfe156c67d52fcf9ea9fc1
-MISC ChangeLog 18025 RMD160 4054619e8e0ef04ea59aa2fbac19939ce86af6e3 SHA1 f98b31606c71a780885979f834c256ff62b269eb SHA256 9e05ad063b57f63bfecd74b952e87b997dfa2e11fdb0dd2e85c58213dce2d5d1
-MISC metadata.xml 380 RMD160 60299b0b1cbe7838a6f82f49ae30566fe74f33db SHA1 d148818008ee04a901beaf50da7cee22adcccf3e SHA256 c53e949e1ebde38c40e01bd29a3160e91e2bd6de35819c0f0788d5955b763e41
+EBUILD vsftpd-2.3.2.ebuild 3132 RMD160 f6788a86d59e82998f52d9b084693addac5b537e SHA1 b545a3ad50aa82f934e3d3f7111602d8debe6d99 SHA256 d4c2b375812e0c36887e05880fdfc5bce26518290312f47449cd1b96434a6d02
+MISC ChangeLog 18240 RMD160 806d153f332ba9bf56eb78fcc4ec47a6ff81d08b SHA1 25331cee087fb9a81cb041f93de1e7cb5de8ff76 SHA256 233e3d28a6496793afcf0b55ad7635862f591d2c4804f96c05c08cf88464dd67
+MISC metadata.xml 539 RMD160 271e95c4ab7277e56e513e58143473cbc28af7fd SHA1 5ac0d611bf94c7cd1d218589b30b7f39d3fdf2dc SHA256 5ef5b9121abd0afdc73311cd08fb87bc0f1735eba8eaaa82e2b44f0fe92a71f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkxuQkEACgkQ9/cejkQaxBADeACaA/+T9JFMhgSpQq4pvEzUfma+
-eLYAnj0P6NbkjfMHWJypmq8jdPQ/mr1b
-=6GCw
+iEYEARECAAYFAkxuSHYACgkQ9/cejkQaxBBWSQCfSoaVj5+NdC2eRKXJcnR0U8BR
+bIUAnA+H+bVe7BHoM0YbUsZMlK+RzREp
+=icin
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 3169e28b5479..b75518655289 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -6,6 +6,11 @@
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
+	<maintainer>
+		<email>bugs@bergstroem.nu</email>
+		<name>Johan Bergström</name>
+		<description>Proxy Maintainer. CC him on bugs</description>
+	</maintainer>
 	<longdescription lang="en">
 		Very Secure FTP Daemon written with speed, size and security
 		in mind
diff --git a/net-ftp/vsftpd/vsftpd-2.3.2.ebuild b/net-ftp/vsftpd/vsftpd-2.3.2.ebuild
new file mode 100644
index 000000000000..9b36f498f5bc
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.3.2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.2.ebuild,v 1.1 2010/08/20 09:15:42 hwoarang 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 || die "doman failed"
+	dosbin vsftpd || die "disbin failed"
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		README README.security REWARD SIZE \
+		SPEED TODO TUNING || die "dodoc failed"
+	newdoc vsftpd.conf vsftpd.conf.example || die "newdoc failed"
+
+	docinto security
+	dodoc SECURITY/* || die "dodoc failed"
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/* || die "doins faileD"
+
+	insinto /etc/vsftpd
+	newins vsftpd.conf vsftpd.conf.example || die "newins failed"
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/vsftpd.logrotate" vsftpd || die "newins failed"
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/vsftpd.xinetd" vsftpd || die "newins failed"
+	fi
+
+	newinitd "${FILESDIR}/vsftpd.init" vsftpd || die "newinitd failed"
+
+	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"
+}