diff options
author | Roy Marples <uberlord@gentoo.org> | 2007-04-02 11:32:33 +0000 |
---|---|---|
committer | Roy Marples <uberlord@gentoo.org> | 2007-04-02 11:32:33 +0000 |
commit | 35f4af8deb85602c230dc9bce1b5e6fa928a5a38 (patch) | |
tree | 583e1406d036a5524b28691a5f6ec569b265df76 /net-ftp | |
parent | Add ~ia64 keyword wrt bug 170668 (diff) | |
download | gentoo-2-35f4af8deb85602c230dc9bce1b5e6fa928a5a38.tar.gz gentoo-2-35f4af8deb85602c230dc9bce1b5e6fa928a5a38.tar.bz2 gentoo-2-35f4af8deb85602c230dc9bce1b5e6fa928a5a38.zip |
Bump for a non-bash init script.
(Portage version: 2.1.2.3)
Diffstat (limited to 'net-ftp')
-rw-r--r-- | net-ftp/vsftpd/ChangeLog | 8 | ||||
-rw-r--r-- | net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r1 | 3 | ||||
-rw-r--r-- | net-ftp/vsftpd/files/vsftpd.init | 12 | ||||
-rw-r--r-- | net-ftp/vsftpd/vsftpd-2.0.5-r1.ebuild | 107 |
4 files changed, 123 insertions, 7 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index 0d0a5fc3973f..17aaad59c66f 100644 --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-ftp/vsftpd # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.82 2007/03/17 12:43:20 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.83 2007/04/02 11:32:33 uberlord Exp $ + +*vsftpd-2.0.5-r1 (02 Apr 2007) + + 02 Apr 2007; Roy Marples <uberlord@gentoo.org> files/vsftpd.init, + +vsftpd-2.0.5-r1.ebuild: + Bump for a non-bash init script. 17 Mar 2007; Steve Dibb <beandog@gentoo.org> vsftpd-2.0.5.ebuild: amd64 stable, bug 166805 diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r1 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r1 new file mode 100644 index 000000000000..162037302490 --- /dev/null +++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r1 @@ -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/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init index bcb19281acfd..24deb9cd36a8 100644 --- a/net-ftp/vsftpd/files/vsftpd.init +++ b/net-ftp/vsftpd/files/vsftpd.init @@ -1,11 +1,11 @@ #!/sbin/runscript # Copyright 2003-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.3 2006/10/14 20:59:55 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.4 2007/04/02 11:32:33 uberlord Exp $ -VSFTPD_CONF="/etc/vsftpd/vsftpd.conf" -VSFTPD_NAME="${SVCNAME##*.}" -if [[ -n ${VSFTPD_NAME} && ${SVCNAME} != "vsftpd" ]]; then +VSFTPD_CONF=${VSFTPD_CONF:-/etc/vsftpd/vsftpd.conf} +VSFTPD_NAME=${SVCNAME##*.} +if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then VSFTPD_PID="/var/run/vsftpd.${VSFTPD_NAME}.pid" else VSFTPD_PID="/var/run/vsftpd.pid" @@ -17,7 +17,7 @@ depend() { } checkconfig() { - if [[ ! -e ${VSFTPD_CONF} ]] ; then + if [ ! -e ${VSFTPD_CONF} ] ; then eerror "Please setup ${VSFTPD_CONF} before starting vsftpd" eerror "There are sample configurations in /usr/share/doc/vsftpd" return 1 @@ -54,7 +54,7 @@ start() { stop() { ebegin "Stopping vsftpd" - start-stop-daemon --stop --quiet --exec /usr/sbin/vsftpd \ + start-stop-daemon --stop --exec /usr/sbin/vsftpd \ --pidfile "${VSFTPD_PID}" eend $? } diff --git a/net-ftp/vsftpd/vsftpd-2.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.5-r1.ebuild new file mode 100644 index 000000000000..04ab8f51145d --- /dev/null +++ b/net-ftp/vsftpd/vsftpd-2.0.5-r1.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/04/02 11:32:33 uberlord 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" +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}/${PN}-2.0.3-gentoo.patch" + + # Fix building without the libcap + epatch "${FILESDIR}/${P}-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 + 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() { + # 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" +} |