Version bump

Package-Manager: portage-2.1.1_pre2-r8

4 files changed, 127 insertions, 15 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index e3ed24912877..0a68db9a06be 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.73 2006/05/16 20:01:00 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.74 2006/07/14 09:12:19 uberlord Exp $
+
+*vsftpd-2.0.5 (14 Jul 2006)
+
+  14 Jul 2006; Roy Marples <uberlord@gentoo.org> +vsftpd-2.0.5.ebuild:
+  Version bump.
 
   16 May 2006; Markus Rothe <corsair@gentoo.org> vsftpd-2.0.4-r1.ebuild:
   Stable on ppc64; bug #132650
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 679f52bdf4c8..0b00bcecd8cc 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX vsftpd-2.0.3-gentoo.diff 5598 RMD160 be988bf91b6cbd888b6babe469ca1e58aaa738f7 SHA1 bb220803bc093c153b4ca373e969395cc9b77f0e SHA256 84d59b6332243808876609e0dbaef8b5e07ef2d74716c5a50849a978586da3ac
 MD5 10727329a1de642694a73e3655774015 files/vsftpd-2.0.3-gentoo.diff 5598
 RMD160 be988bf91b6cbd888b6babe469ca1e58aaa738f7 files/vsftpd-2.0.3-gentoo.diff 5598
@@ -35,6 +32,7 @@ RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 files/vsftpd.xinetd 432
 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f files/vsftpd.xinetd 432
 DIST vsftpd-2.0.3.tar.gz 153266
 DIST vsftpd-2.0.4.tar.gz 154857 RMD160 e8f07c125c0c3a8f0d457b47fd0062d6431c480b SHA256 3bd3d8750460cf724b4589589eb37ab0d398f0c4d3d7492468c66d3617052af6
+DIST vsftpd-2.0.5.tar.gz 155985 RMD160 297c383aae9fd90f75d5d6a62b2ed5e54adf25d4 SHA1 9b6a079699aaeb01219665acf203c093f94faef0 SHA256 5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b
 EBUILD vsftpd-2.0.3-r1.ebuild 2032 RMD160 0aafff8a44214c623b5c11395d95f98ee7c12f93 SHA1 524e287bbcea52fb844869a6157f37e0128e3168 SHA256 0bedc5a1d833f0991360c20e50c1c9016a478ccdaa7b5515ccffd62219fd90b7
 MD5 dc7c446f859492b83b73eb59ee07e560 vsftpd-2.0.3-r1.ebuild 2032
 RMD160 0aafff8a44214c623b5c11395d95f98ee7c12f93 vsftpd-2.0.3-r1.ebuild 2032
@@ -51,10 +49,14 @@ EBUILD vsftpd-2.0.4.ebuild 2556 RMD160 925cdf69d5d8ca562e13c84f55ddb5ec7fdab75d
 MD5 ee0270e6094ec9f071f47cba896a119c vsftpd-2.0.4.ebuild 2556
 RMD160 925cdf69d5d8ca562e13c84f55ddb5ec7fdab75d vsftpd-2.0.4.ebuild 2556
 SHA256 9ecd6f6b531377fa55ad7554a79ad6eb5507cfd3864b39598a35abe4a1b07a83 vsftpd-2.0.4.ebuild 2556
-MISC ChangeLog 10369 RMD160 e134189573690082c3c51135ee9fd276505ef43f SHA1 957a8473e5bd5d5ad04653b64ff414fc1daeb6e2 SHA256 62a5c6a1039e337de29cf31c18dcee053de5ffe925cfd5946cc2437554aade46
-MD5 c9c7a7bd47ee66d54fb813363aeb207f ChangeLog 10369
-RMD160 e134189573690082c3c51135ee9fd276505ef43f ChangeLog 10369
-SHA256 62a5c6a1039e337de29cf31c18dcee053de5ffe925cfd5946cc2437554aade46 ChangeLog 10369
+EBUILD vsftpd-2.0.5.ebuild 2875 RMD160 77b5e04a1091e538c15839b4bff6731745c24d78 SHA1 40e3789f42199276d179c8ebecd1555d52384dcb SHA256 5a95002584ddba864e9e518a7097f114e44a0bc779da439d99669407205ba0a5
+MD5 ee58027d634fb5f5f3e8e1ba64ce467b vsftpd-2.0.5.ebuild 2875
+RMD160 77b5e04a1091e538c15839b4bff6731745c24d78 vsftpd-2.0.5.ebuild 2875
+SHA256 5a95002584ddba864e9e518a7097f114e44a0bc779da439d99669407205ba0a5 vsftpd-2.0.5.ebuild 2875
+MISC ChangeLog 10487 RMD160 400b57861c04db0d96b8e2940d6e11216116b2e8 SHA1 7fcf18cc4448b5e36f57bd7a4d0408af199c15e9 SHA256 a42a22b95fe2826891fc54d92b63e3bd4f4925bd561118af1e3771c22641a7b7
+MD5 82846952edd4a8139722c2fb1d8e986d ChangeLog 10487
+RMD160 400b57861c04db0d96b8e2940d6e11216116b2e8 ChangeLog 10487
+SHA256 a42a22b95fe2826891fc54d92b63e3bd4f4925bd561118af1e3771c22641a7b7 ChangeLog 10487
 MISC metadata.xml 344 RMD160 eced9ee76c578ea2a2e96bc811ca610a6f40dbe4 SHA1 0cc8df9a4f8096179966d4c10b45715dcfdc600b SHA256 7737cc6af0c310b6f7aedd541391f1546f3dca50a900f6a49877d04a470ec6f0
 MD5 0451b23327c004752edf415e25931d07 metadata.xml 344
 RMD160 eced9ee76c578ea2a2e96bc811ca610a6f40dbe4 metadata.xml 344
@@ -71,10 +73,6 @@ SHA256 e4fe70eed636813b638d48e7fa1d1974cd00ef6d27c0e149b0e22186c4631109 files/di
 MD5 74f9cfe6a45389167b2aeb6b2496a30d files/digest-vsftpd-2.0.4-r1 238
 RMD160 74295341cd92a8685183f6be3ac904d1e9ed23f6 files/digest-vsftpd-2.0.4-r1 238
 SHA256 e4fe70eed636813b638d48e7fa1d1974cd00ef6d27c0e149b0e22186c4631109 files/digest-vsftpd-2.0.4-r1 238
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEoe/OamhnQswr0vIRApvJAKCXMfS7fW+V/YBm5FTjEt9m0GYiVACgltzJ
-Z6n7/t9TwfbWsPCvo4YvOKQ=
-=abJk
------END PGP SIGNATURE-----
+MD5 55f35e732efcc22c36ba2324a0e937af files/digest-vsftpd-2.0.5 238
+RMD160 a05fc5515e20b1ab526a5d0abc62820533abac03 files/digest-vsftpd-2.0.5 238
+SHA256 82bd5c1de679b40618dbee3ac73090d4790a647860c8ca2aefcfe9665ffe0c30 files/digest-vsftpd-2.0.5 238
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.5 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.5
new file mode 100644
index 000000000000..162037302490
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.5
@@ -0,0 +1,3 @@
+MD5 146062e8b2f93af43ff6c2c770feea94 vsftpd-2.0.5.tar.gz 155985
+RMD160 297c383aae9fd90f75d5d6a62b2ed5e54adf25d4 vsftpd-2.0.5.tar.gz 155985
+SHA256 5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b vsftpd-2.0.5.tar.gz 155985
diff --git a/net-ftp/vsftpd/vsftpd-2.0.5.ebuild b/net-ftp/vsftpd/vsftpd-2.0.5.ebuild
new file mode 100644
index 000000000000..9d65c5105b77
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.0.5.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.5.ebuild,v 1.1 2006/07/14 09:12:19 uberlord Exp $
+
+inherit 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 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="caps logrotate pam tcpd ssl selinux xinetd"
+
+DEPEND="caps? ( sys-libs/libcap )
+	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
+	logrotate? ( app-admin/logrotate )
+	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}/vsftpd-2.0.3-gentoo.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
+		sed -i '/libcap/ d' vsf_findlibs.sh
+	fi
+
+	# Let portage control stripping
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die
+}
+
+src_install() {
+	into /usr
+	doman vsftpd.conf.5 vsftpd.8
+	dosbin vsftpd
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		LICENSE 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
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/vsftpd.logrotate" vsftpd
+	fi
+
+	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 comment out listen=YES
+	# so that our default config works under xinetd - fixes #78347
+	if use xinetd ; then
+		sed -i '/\listen=YES/s/^/#/g' ${IMAGE}/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"
+}