Changeset - 58fc38ad771d
[Not reviewed]
default
0 3 2
Nathan Brink (binki) - 16 years ago 2009-05-06 16:57:48
ohnobinki@ohnopublishing.net
net-ftp/vsftpd: bumped to 2.0.7-r2 parallel to gentoo's 2.0.7-r1, removed KEYWORDS - stabilized x86 for 2.0.7-r1, added metadata.xml describing logrotate useflag
5 files changed with 43 insertions and 25 deletions:
0 comments (0 inline, 0 general)
net-ftp/vsftpd/ChangeLog
Show inline comments
 
# ChangeLog for net-ftp/vsftpd
 
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
 
# 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 $
 

	
 
  06 May 2009; Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
 
  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
 
  corresponding to Gentoo's 2.0.7-r1, described logrotate useflag in
 
  metadata.xml, whitespace changes
 

	
 
  05 Jan 2009; Nathan Brink <ohnobinki@ohnopublishing.net>
 
Initial import from Gentoo's Portage. Fixed issue with linking when {/usr/lib and /usr/lib64} and {/lib64 and lib} are not symlinked.
 
	
 
  02 Jan 2009; Dawid Węgliński <cla@gentoo.org> vsftpd-2.0.7-r1.ebuild:
 
  Stable on amd64 (bug #248458)
 

	
 
  31 Dec 2008; Friedrich Oslage <bluebird@gentoo.org>
 
  vsftpd-2.0.7-r1.ebuild:
 
  Stable on sparc, bug #248458
 

	
 
  28 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
 
  vsftpd-2.0.7-r1.ebuild:
 
  ppc stable, bug #248458
 

	
 
  27 Dec 2008; Brent Baude <ranger@gentoo.org> vsftpd-2.0.7-r1.ebuild:
 
  stable ppc64, bug 248458
 

	
 
  26 Dec 2008; Raúl Porcel <armin76@gentoo.org>
 
  -files/vsftpd-2.0.5-anon-upload-umask.patch,
 
  +files/vsftpd-2.0.7-uclibc.patch, vsftpd-2.0.7-r1.ebuild:
 
  Also add a patch from Debian to fix uclibc build, bug #241720
 

	
 
*vsftpd-2.0.7-r1 (26 Dec 2008)
 

	
 
  26 Dec 2008; Raúl Porcel <armin76@gentoo.org> files/vsftpd.init,
 
  -vsftpd-2.0.5-r3.ebuild, -vsftpd-2.0.7.ebuild, +vsftpd-2.0.7-r1.ebuild:
 
  Fix init script, bug 234278
 

	
 
  21 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
 
  add GLEP 56 USE flag desc from use.local.desc
 

	
 
*vsftpd-2.0.7 (31 Jul 2008)
 

	
 
  31 Jul 2008; Raúl Porcel <armin76@gentoo.org> +vsftpd-2.0.7.ebuild:
 
  Version bump
 

	
 
  02 Jun 2008; Jeremy Olexa <darkside@gentoo.org> files/vsftpd.init:
 
  Modified init script to allow vsftpd to stop correctly. Thanks to Vaclav
 
  Adamik for the suggestion, bug #223225
 

	
 
  14 May 2008; Diego Pettenò <flameeyes@gentoo.org> vsftpd-2.0.5-r3.ebuild,
 
  vsftpd-2.0.6.ebuild:
 
  Make the pam USE flag only depend on virtual/pam.
 

	
 
  04 Apr 2008; Kenneth Prugh <ken69267@gentoo.org> vsftpd-2.0.6.ebuild:
 
  amd64 stable, bug #214959
 

	
 
  29 Mar 2008; Dawid Węgliński <cla@gentoo.org> vsftpd-2.0.6.ebuild:
net-ftp/vsftpd/Manifest
Show inline comments
 
AUX vsftpd-2.0.3-gentoo.patch 7128 RMD160 99ef0aee94847405e6185cc95acbc72cba0df0e0 SHA1 4608e2656d83cc17fcef229a8f4b66c803b899d8 SHA256 8f3215d43948364d431312dd4109af09e9a83ebbafb7a1c388f2aefea4df9154
 
AUX vsftpd-2.0.6-caps.patch 649 RMD160 161b4610fdedcc3b1173055e534682fc5450b1d7 SHA1 cf63310bcee83e68079377c1da55e2b0d0111ebf SHA256 1435d0bc4e0d0e5f4a86ba2c42e77663be10d494cc9bc3af782c104a062e2778
 
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.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
 
EBUILD vsftpd-2.0.7-r1.ebuild 3413 RMD160 4e6968e972b3aee4a2854c3cb66c3237635ce075 SHA1 819bfaa04ac4abdd49a8947e6565a56a44ca1476 SHA256 80dd33fcfc8218a5c95c3ea6fe460725e70afc0e00ccb25de4b61a227859cf11
 
MISC ChangeLog 15121 RMD160 1e7f7dd6f864e965314b98bb17b57c000ca146d3 SHA1 818a7cf1a62fff9098f91db796657b2055c0d095 SHA256 5053ac19cad67a7b782284cddeb53cd27717b21c0b6512e0acfbec26e117e286
 
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
 
MISC metadata.xml 354 RMD160 2a8c6399d267518a342f258ac3edb1d568164a54 SHA1 45b5cdb37090f2c07d40190866bd3b755cd6c1fe SHA256 5b6855c6e26ae707dffa0d8e7bbb92b498904a36460e6e20aeb055489caaa765
net-ftp/vsftpd/metadata.xml
Show inline comments
 
new file 100644
 
<?xml version="1.0" encoding="UTF-8"?>
 
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 
<pkgmetadata>
 
  <herd>no-herd</herd>
 
  <maintainer>
 
    <email>ohnobinki@ohnopublishing.net</email>
 
  </maintainer>
 
  <use>
 
    <flag name="logrotate">
 
      Install logrotate script and depend on logrotate.
 
    </flag>
 
  </use>
 
</pkgmetadata>
net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
Show inline comments
 
# 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="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
 
KEYWORDS="amd64 x86"
 
IUSE="caps logrotate 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
 
	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}/${PN}-2.0.3-gentoo.patch"
 
	# uclibc fix, from Debian
 
	epatch "${FILESDIR}"/${PN}-2.0.7-uclibc.patch
 

	
 
	# Fix building without the libcap
 
	epatch "${FILESDIR}/${PN}-2.0.6-caps.patch"
 
	has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
 

	
 
	# Configure vsftpd build defaults
 
	echo "#!/bin/sh" > vsf_findlibs.sh
 
	if use tcpd; then
 
	    echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
 
	    echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh
 
		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
 
		echo "#define VSF_BUILD_SSL" >> builddefs.h
 
		echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh
 
	fi
 
	if use pam; then
 
	    echo "\"-lpam\"" >> vsf_findlibs.sh
 
		echo "\"-lpam\"" >> vsf_findlibs.sh
 
	else
 
	    echo "#undef VSF_BUILD_PAM" >> builddefs.h
 
		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
 
		echo "echo \"-lcap\"" >> vsf_findlibs.sh
 
	else
 
		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}" 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
 

	
 
	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() {
net-ftp/vsftpd/vsftpd-2.0.7-r2.ebuild
Show inline comments
 
file copied from net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild to net-ftp/vsftpd/vsftpd-2.0.7-r2.ebuild
 
# 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="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
 
IUSE="caps logrotate pam tcpd ssl selinux xinetd"
 
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
 
	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}/${PN}-2.0.3-gentoo.patch"
 
	# uclibc fix, from Debian
 
	epatch "${FILESDIR}"/${PN}-2.0.7-uclibc.patch
 

	
 
	# Fix building without the libcap
 
	epatch "${FILESDIR}/${PN}-2.0.6-caps.patch"
 
	has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
 

	
 
	# Configure vsftpd build defaults
 
	echo "#!/bin/sh" > vsf_findlibs.sh
 
	if use tcpd; then
 
	    echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
 
	    echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh
 
		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
 
		echo "#define VSF_BUILD_SSL" >> builddefs.h
 
		echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh
 
	fi
 
	if use pam; then
 
	    echo "\"-lpam\"" >> vsf_findlibs.sh
 
		echo "\"-lpam\"" >> vsf_findlibs.sh
 
	else
 
	    echo "#undef VSF_BUILD_PAM" >> builddefs.h
 
		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
 
		echo "echo \"-lcap\"" >> vsf_findlibs.sh
 
	else
 
		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}" 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
 

	
 
	if use logrotate ; then
 
		insinto /etc/logrotate.d
 
		newins "${FILESDIR}/vsftpd.logrotate" vsftpd
 
	fi
 
	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"
 
}
0 comments (0 inline, 0 general)