Let portage control stripping and configure libcap dependancy via the cap USE

flag, #120891.
Package-Manager: portage-2.1_pre4-r1

4 files changed, 158 insertions, 5 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index b60906d30183..e104191b2efd 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,12 @@
 # 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.65 2006/01/10 07:17:30 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.66 2006/01/31 11:39:30 uberlord Exp $
+
+*vsftpd-2.0.4-r1 (31 Jan 2006)
+
+  31 Jan 2006; Roy Marples <uberlord@gentoo.org> +vsftpd-2.0.4-r1.ebuild:
+  Let portage control stripping and configure libcap dependancy via the cap USE
+  flag, #120891.
 
 *vsftpd-2.0.4 (10 Jan 2006)
 
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index c39bbcc883da..27e24572a94f 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,26 +1,64 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 47c90c2831d0aea91fc6e21d7d5a5d9d ChangeLog 9396
+MD5 ef0af98f79b2c2b910c9213c5794654f ChangeLog 9600
+RMD160 5c72e0aca1605d671e30725f4cd5993e77866ca4 ChangeLog 9600
+SHA256 796c8bebe85007e0da88a4d03b55e3f57f261d683bf21e5b1eeccac151f52211 ChangeLog 9600
 MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3-r1 64
+RMD160 a0800f4e877cb898356b9ab496753ad9fb89b538 files/digest-vsftpd-2.0.3-r1 64
+SHA256 00a8893ff427b890086c6a93d5267aef2766ca3feee62ada94598477790c6843 files/digest-vsftpd-2.0.3-r1 64
 MD5 c3af0a9f9ed1ea8eb162da439b88bf78 files/digest-vsftpd-2.0.3-r2 64
+RMD160 a0800f4e877cb898356b9ab496753ad9fb89b538 files/digest-vsftpd-2.0.3-r2 64
+SHA256 00a8893ff427b890086c6a93d5267aef2766ca3feee62ada94598477790c6843 files/digest-vsftpd-2.0.3-r2 64
 MD5 c8e8bfd0ee59267bac7f7f981159ce96 files/digest-vsftpd-2.0.4 64
+RMD160 b2df651d99b5421e2fcd35d1beb050dc14adc20b files/digest-vsftpd-2.0.4 64
+SHA256 1e3d920291aa12de7050411dde205c820655cf0d1aefc40e4ad151312df5ec00 files/digest-vsftpd-2.0.4 64
+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
 MD5 10727329a1de642694a73e3655774015 files/vsftpd-2.0.3-gentoo.diff 5598
+RMD160 be988bf91b6cbd888b6babe469ca1e58aaa738f7 files/vsftpd-2.0.3-gentoo.diff 5598
+SHA256 84d59b6332243808876609e0dbaef8b5e07ef2d74716c5a50849a978586da3ac files/vsftpd-2.0.3-gentoo.diff 5598
 MD5 2008f701278d9e59c755433c8e987606 files/vsftpd-2.0.3-gentoo.patch 7128
+RMD160 99ef0aee94847405e6185cc95acbc72cba0df0e0 files/vsftpd-2.0.3-gentoo.patch 7128
+SHA256 8f3215d43948364d431312dd4109af09e9a83ebbafb7a1c388f2aefea4df9154 files/vsftpd-2.0.3-gentoo.patch 7128
 MD5 d0f6c4bc146ade78fdcc3ecc94ffece2 files/vsftpd.conf 3842
+RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 files/vsftpd.conf 3842
+SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0 files/vsftpd.conf 3842
 MD5 b9603a9d37ef056865406509e3b4ad38 files/vsftpd.conf.d 94
+RMD160 6882e38862b4bff82b020e3b9d2a50806cb98760 files/vsftpd.conf.d 94
+SHA256 42cba53a77d07f6643088c60a1ad6b8acc03e8892f8b3b8e8a40fad34097864b files/vsftpd.conf.d 94
 MD5 8df8f4a0d1fac0ddf21aab9f9c11fa1c files/vsftpd.init 1628
+RMD160 5bcb4d37fccbed0f36ac099abe4f2c50dabb85a8 files/vsftpd.init 1628
+SHA256 8db12e352f594bd6643c3fc5d3fe86f771d7b140261e207f9aae7d9668ecdc2e files/vsftpd.init 1628
 MD5 b0551ddc57103f1dcca71524691540a0 files/vsftpd.init.d 1038
+RMD160 0d084e2cfbe72238d7ce265f7c4e46b59183aa32 files/vsftpd.init.d 1038
+SHA256 e2b1713e6279053582d5372a7b2b27db7be7ced944ee61f8c2c3be853d6de207 files/vsftpd.init.d 1038
 MD5 4b9dad8564a6cf38452350a1e5ba5664 files/vsftpd.logrotate 53
+RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 files/vsftpd.logrotate 53
+SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3 files/vsftpd.logrotate 53
 MD5 8578d5c3f50e7b090ba023dfa626ec89 files/vsftpd.xinetd 432
+RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 files/vsftpd.xinetd 432
+SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f files/vsftpd.xinetd 432
 MD5 0451b23327c004752edf415e25931d07 metadata.xml 344
+RMD160 eced9ee76c578ea2a2e96bc811ca610a6f40dbe4 metadata.xml 344
+SHA256 7737cc6af0c310b6f7aedd541391f1546f3dca50a900f6a49877d04a470ec6f0 metadata.xml 344
 MD5 dc7c446f859492b83b73eb59ee07e560 vsftpd-2.0.3-r1.ebuild 2032
+RMD160 0aafff8a44214c623b5c11395d95f98ee7c12f93 vsftpd-2.0.3-r1.ebuild 2032
+SHA256 0bedc5a1d833f0991360c20e50c1c9016a478ccdaa7b5515ccffd62219fd90b7 vsftpd-2.0.3-r1.ebuild 2032
 MD5 5a4c26e8f75ee0f92d48815bb9fb14e4 vsftpd-2.0.3-r2.ebuild 2409
+RMD160 f4604b7db41e15cc366015d7935a5c7d5c0dce8a vsftpd-2.0.3-r2.ebuild 2409
+SHA256 ac3e7beb3693909234d92bc632fc29eee2435bd3356ef7a6fcbe4da321b38eab vsftpd-2.0.3-r2.ebuild 2409
+MD5 499d80482dbe4a86d8fa98fc2d740fb3 vsftpd-2.0.4-r1.ebuild 2881
+RMD160 2db2dd5f736d12ec6a9f1f15307a7d3aa05dec19 vsftpd-2.0.4-r1.ebuild 2881
+SHA256 fe6ba55d490be96896a4f5eea9229d79008e2780a7e066621450092cc60f92fb vsftpd-2.0.4-r1.ebuild 2881
 MD5 ee0270e6094ec9f071f47cba896a119c vsftpd-2.0.4.ebuild 2556
+RMD160 925cdf69d5d8ca562e13c84f55ddb5ec7fdab75d vsftpd-2.0.4.ebuild 2556
+SHA256 9ecd6f6b531377fa55ad7554a79ad6eb5507cfd3864b39598a35abe4a1b07a83 vsftpd-2.0.4.ebuild 2556
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDzGVs2+ySkm8kpY0RAgDDAJ4iUlaU9fYCrketNlpE+zzYG3uWlgCeI3j7
-TxSFb459jTu0M8FvsebzIUQ=
-=P7FK
+iD8DBQFD30yBEbVyYKaZ/NERAvxbAJ9H7n74bLyFxBR626du5gD74IdePgCfe6xt
+Y9W9tAkgdt1ouul8wLGEagc=
+=s6j1
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.4-r1 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.4-r1
new file mode 100644
index 000000000000..2884bd494c7c
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.4-r1
@@ -0,0 +1,3 @@
+MD5 c0bf8c7b8e15ab15827172786fc56115 vsftpd-2.0.4.tar.gz 154857
+RMD160 e8f07c125c0c3a8f0d457b47fd0062d6431c480b vsftpd-2.0.4.tar.gz 154857
+SHA256 3bd3d8750460cf724b4589589eb37ab0d398f0c4d3d7492468c66d3617052af6 vsftpd-2.0.4.tar.gz 154857
diff --git a/net-ftp/vsftpd/vsftpd-2.0.4-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.4-r1.ebuild
new file mode 100644
index 000000000000..573dbde749d0
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.0.4-r1.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.4-r1.ebuild,v 1.1 2006/01/31 11:39:30 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 ~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 INSTALL \
+		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"
+}