Bump for a non-bash init script.

Package-Manager: portage-2.1.2.3

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 0d0a5fc3973f87fc7c2f60164b51bac4ac64d827..17aaad59c66fe856b16ac163e067e9ca9cc4f3cf 100644 (file)
--- 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/Manifest b/net-ftp/vsftpd/Manifest
index 64cfb1d8f51223253ada54193ea195b0ffc51d67..802df1d749fd52770d2bf358dcf26276d60d7ab3 100644 (file)
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -10,10 +10,10 @@ AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd584
 MD5 d0f6c4bc146ade78fdcc3ecc94ffece2 files/vsftpd.conf 3842
 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 files/vsftpd.conf 3842
 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0 files/vsftpd.conf 3842
-AUX vsftpd.init 1616 RMD160 e87cc0c5fde4c4ead1048ba1fd31bd11695aa6b0 SHA1 f290f21f230a924363036ef796c7f127543dc5a8 SHA256 03afafab90673060ec13d6b2d5de1d88b5e15ab3ecb6ca005cfe573df53e714a
-MD5 44192c76ed3186baaeb31beb9e8ef290 files/vsftpd.init 1616
-RMD160 e87cc0c5fde4c4ead1048ba1fd31bd11695aa6b0 files/vsftpd.init 1616
-SHA256 03afafab90673060ec13d6b2d5de1d88b5e15ab3ecb6ca005cfe573df53e714a files/vsftpd.init 1616
+AUX vsftpd.init 1620 RMD160 55d2aa50e6a7919edc4465950e3e4f1d80c0c2d7 SHA1 fabc0c69bc116873940b5d66801ed5eec15fb21d SHA256 bf810956f462e3c2983acd7e5c97cee8766d1a93ce4172c8cb6b7d764bdad7ca
+MD5 e654e1ddc6f3c8ec65467399c22241bc files/vsftpd.init 1620
+RMD160 55d2aa50e6a7919edc4465950e3e4f1d80c0c2d7 files/vsftpd.init 1620
+SHA256 bf810956f462e3c2983acd7e5c97cee8766d1a93ce4172c8cb6b7d764bdad7ca files/vsftpd.init 1620
 AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3
 MD5 4b9dad8564a6cf38452350a1e5ba5664 files/vsftpd.logrotate 53
 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 files/vsftpd.logrotate 53
@@ -28,14 +28,18 @@ EBUILD vsftpd-2.0.4-r1.ebuild 2865 RMD160 a3f1e62e0aa19f90c37104f55351f2eeaefc24
 MD5 374e1585a146e6f155ae27a746cbbdd2 vsftpd-2.0.4-r1.ebuild 2865
 RMD160 a3f1e62e0aa19f90c37104f55351f2eeaefc2450 vsftpd-2.0.4-r1.ebuild 2865
 SHA256 a39e817fb16893140d5ca072f63d548cdf5a323bc1443890db34906fb663ed61 vsftpd-2.0.4-r1.ebuild 2865
+EBUILD vsftpd-2.0.5-r1.ebuild 2968 RMD160 c9b2a5c31fcd58d6d03847bf902685839ed2c45b SHA1 a793c30b34f7bd9124c7e7ce82f5a7aaf5734348 SHA256 4dcce1b6e02767d4e80298ab20303ff4bbfb32fff8790fc87b9d2d8477792fef
+MD5 e96c2ed787c164bda3b2f7763581d692 vsftpd-2.0.5-r1.ebuild 2968
+RMD160 c9b2a5c31fcd58d6d03847bf902685839ed2c45b vsftpd-2.0.5-r1.ebuild 2968
+SHA256 4dcce1b6e02767d4e80298ab20303ff4bbfb32fff8790fc87b9d2d8477792fef vsftpd-2.0.5-r1.ebuild 2968
 EBUILD vsftpd-2.0.5.ebuild 2965 RMD160 d24909a8ad5962ed7b9001974169b99f191fddd8 SHA1 6cb1b19cb7489643cdab2e502eeeb0fef485d39e SHA256 a144637b26ba7fca4b740a5ca728944d5b3c73940201a13c428b86b1294181ce
 MD5 a7396d6621fe6f9d47281f43ce463b8b vsftpd-2.0.5.ebuild 2965
 RMD160 d24909a8ad5962ed7b9001974169b99f191fddd8 vsftpd-2.0.5.ebuild 2965
 SHA256 a144637b26ba7fca4b740a5ca728944d5b3c73940201a13c428b86b1294181ce vsftpd-2.0.5.ebuild 2965
-MISC ChangeLog 11489 RMD160 c79e541bb2d75a16196350c3cf2f26384b86cae6 SHA1 9eb6b3b6cbb58cee937816d7b409e3ca1bd0f268 SHA256 494157f356f54594b442b7ee5aa6a5e57342107989bb8989fed1084cb0a23229
-MD5 e788efb413e653f2c86e710964c7ccef ChangeLog 11489
-RMD160 c79e541bb2d75a16196350c3cf2f26384b86cae6 ChangeLog 11489
-SHA256 494157f356f54594b442b7ee5aa6a5e57342107989bb8989fed1084cb0a23229 ChangeLog 11489
+MISC ChangeLog 11653 RMD160 cd7ce0bfe698a23216aca1129d1a77c765dd8d80 SHA1 d781da606a173034905bc30a6d615ead30a65a9b SHA256 87c4556d66fbbaf2bbe730ed0b3bbf706edd69495ecfa6ccffda0d26d491d660
+MD5 a1f4b6ee9664da17efd357da570d78d3 ChangeLog 11653
+RMD160 cd7ce0bfe698a23216aca1129d1a77c765dd8d80 ChangeLog 11653
+SHA256 87c4556d66fbbaf2bbe730ed0b3bbf706edd69495ecfa6ccffda0d26d491d660 ChangeLog 11653
 MISC metadata.xml 344 RMD160 eced9ee76c578ea2a2e96bc811ca610a6f40dbe4 SHA1 0cc8df9a4f8096179966d4c10b45715dcfdc600b SHA256 7737cc6af0c310b6f7aedd541391f1546f3dca50a900f6a49877d04a470ec6f0
 MD5 0451b23327c004752edf415e25931d07 metadata.xml 344
 RMD160 eced9ee76c578ea2a2e96bc811ca610a6f40dbe4 metadata.xml 344
@@ -46,3 +50,6 @@ SHA256 e4fe70eed636813b638d48e7fa1d1974cd00ef6d27c0e149b0e22186c4631109 files/di
 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
+MD5 55f35e732efcc22c36ba2324a0e937af files/digest-vsftpd-2.0.5-r1 238
+RMD160 a05fc5515e20b1ab526a5d0abc62820533abac03 files/digest-vsftpd-2.0.5-r1 238
+SHA256 82bd5c1de679b40618dbee3ac73090d4790a647860c8ca2aefcfe9665ffe0c30 files/digest-vsftpd-2.0.5-r1 238

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 (file)
index 0000000..1620373
--- /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 bcb19281acfd7546944c1a6ae11120c1b6699cb4..24deb9cd36a80d38bf51c60824b71e3e86081703 100644 (file)
--- 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 (file)
index 0000000..04ab8f5
--- /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"
+}