# HG changeset patch # User Binki # Date 2009-05-06 17:25:41 # Node ID 236d69211665ada7c4c22374e650ba35c23fe056 # Parent 1e6a6b6124d4bda632779e43e8d33d528e26efc6 net-ftp/vsftpd: bumped to 2.1.0 parallel to Gentoo diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.107 2009/01/02 16:33:32 cla Exp $ +*vsftpd-2.1.0 (06 Mar 2009) + + 06 May 2009; Nathan Phillip Brink + +vsftpd-2.1.0.ebuild: + Bumped to vsftpd-2.1.0 parallel to Gentoo Portage. + 06 May 2009; Nathan Phillip Brink vsftpd-2.0.7-r1.ebuild, +vsftpd-2.0.7-r2.ebuild, +metadata.xml: Removed many KEYWORDS, stabilized x86 for 2.0.7-r1, added 2.0.7-r2 diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest --- a/net-ftp/vsftpd/Manifest +++ b/net-ftp/vsftpd/Manifest @@ -3,13 +3,16 @@ AUX vsftpd-2.0.6-caps.patch 649 RMD160 1 AUX vsftpd-2.0.6-libcap1.patch 582 RMD160 239fa2c23770e81a0b45f8df154a52b42af1f542 SHA1 d3fb0ae32f445092e9ab5af2209ac16af2ac0a5d SHA256 8c72a4f34ca8f4f3fb2da49d4cfde288c346d29bac3036f25b64c51f1543a51c AUX vsftpd-2.0.7-uclibc.patch 582 RMD160 7e1a930162d0936076a6e4601585d73b649073d8 SHA1 d47b6b0ac66c7ebfc08b472c04c4fc8b076be4ef SHA256 adef1463cb329454706cf094b453f41d70dee8a46b72ef144f94b938de319002 AUX vsftpd-2.1.0-caps.patch 575 RMD160 a7b27df472ccbb5068d5f9961fe6bb010063e98c SHA1 f98d3cfbc1eb68f6e852cf9cbf5ad80407be5557 SHA256 4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370 +AUX vsftpd-2.1.0-dont-link-caps.patch 682 RMD160 fff89775de0d95562603b890e181703acb5dd6ce SHA1 c18bc7639643fe2b1ea91717d97eae191e73660c SHA256 6662a7961043e2888ff377a7689b31934f75d0ebf4bfad916a5432ff05cfcb52 AUX vsftpd-2.1.0-gentoo.patch 7575 RMD160 0695c1e679a8b0a7f1a4d599ee01571c7db0049b SHA1 69cd031c3f958f94ff64b573d4af235e79d84051 SHA256 3bacbc4828edf8d24f08600090ca60c9af8c1603032fc6cf3748960ac971f2bd AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd5847bb328d8df188d85ffc5ccd7fcd5983525 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0 AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f4925e941e21075be678387076e57246b3d SHA256 78941ea7744d65d4674b4df8ecee6df91e6ed601c47d64ce1f489af56ea250e2 AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3 AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f DIST vsftpd-2.0.7.tar.gz 162801 RMD160 8947c7ae00214fb30c9d7d2cfba5116643e1d8c7 SHA1 760afe849d1ebe10592ef29032b6e00e7f1bbf79 SHA256 5d86a6d627f2d8e35dbdefdbd445f6016d349955107b247076bbcc36cde1046b +DIST vsftpd-2.1.0.tar.gz 178636 RMD160 0066ac526bb184e3ada9d4e53e520d82dfc71633 SHA1 3edd0868e03164eac11ab1fa9eac3ca4a30cd33a SHA256 82fdb75d44f1bbf1ee7930265a772dd13ebd314d389692c6788e9e2b4b116c87 EBUILD vsftpd-2.0.7-r1.ebuild 3337 RMD160 be09a76c1e6a7a2f4be42aadc71d75f264c13ff0 SHA1 0a63faef9a61a1aef328e436c7f51ba9d1affa67 SHA256 d743109c5528232878d268318885b65219250314ca96e4fd89bb5d304f347469 EBUILD vsftpd-2.0.7-r2.ebuild 3261 RMD160 c0a0962af2e9a9d49b496fc8532bf18716fc7b1f SHA1 b651456f491b4c97dc9b3f7ea4b9c067f84fa072 SHA256 8d4688ffbe4846ba00828f79619f609cd9aee283e5cbc8520dc547774b26911a -MISC ChangeLog 15428 RMD160 8a034324a367d9af80c82e2b15b5286a4b4200dd SHA1 05a25a6f26897b590fd06649388a75b53af84895 SHA256 fe122a3e042d619250513ff2750a8469214a2f6c089f4bcc93fde0aa7ab3c74e +EBUILD vsftpd-2.1.0.ebuild 3222 RMD160 fff130314ec83f78f11dbd514cb9eedfa9a0cfe4 SHA1 3c2f3dfa6de99d45c6bde6544a9bfda2d8137d97 SHA256 fca2f8d5727bd05679cc9dbba6b1bf63f3dd6968f199dc4d387b1bd3eadfd2f1 +MISC ChangeLog 15602 RMD160 f59766c1c12a0888bfa44e1b194d181ae698d139 SHA1 632c7db5f9918b72d3e3ccba0c4bf19ad9419b4e SHA256 69158e583e8092887faa0be3987a72326e9611bcd290c05f907b04133329fcbd MISC metadata.xml 354 RMD160 2a8c6399d267518a342f258ac3edb1d568164a54 SHA1 45b5cdb37090f2c07d40190866bd3b755cd6c1fe SHA256 5b6855c6e26ae707dffa0d8e7bbb92b498904a36460e6e20aeb055489caaa765 diff --git a/net-ftp/vsftpd/vsftpd-2.1.0.ebuild b/net-ftp/vsftpd/vsftpd-2.1.0.ebuild new file mode 100644 --- /dev/null +++ b/net-ftp/vsftpd/vsftpd-2.1.0.ebuild @@ -0,0 +1,119 @@ +# 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.0.7-r1.ebuild,v 1.6 2009/01/02 16:33:32 cla 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="amd64 ~x86" +IUSE="caps pam tcpd ssl selinux xinetd" + +DEPEND="caps? ( sys-libs/libcap ) + 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}/${P}-gentoo.patch" + + # Fix building without the libcap + epatch "${FILESDIR}/${P}-caps.patch" + has_version " vsf_findlibs.sh + if use tcpd; then + echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h + echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh + fi + if use ssl; then + echo "#define VSF_BUILD_SSL" >> builddefs.h + echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh + fi + if use pam; then + echo "\"-lpam\"" >> vsf_findlibs.sh + else + echo "#undef VSF_BUILD_PAM" >> builddefs.h + fi + + # Ensure that we don't link against libcap unless asked + if use caps ; then + echo "echo \"-lcap\"" >> vsf_findlibs.sh + else + sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c + sed -i '/libcap/ d' vsf_findlibs.sh + epatch "${FILESDIR}"/${P}-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 comment out listen=YES + # so that our default config works under xinetd - fixes #78347 + if use xinetd ; then + sed -i '/\listen=YES/s/^/#/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" +}