From: Roy Marples Date: Tue, 10 Apr 2007 13:00:55 +0000 (+0000) Subject: Fix the init script to muliplex better, #173923 thanks to Grégoire Baron X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=29dd75ab2749827397ef805fa9e75a0dae6f4720;p=gentoo.git Fix the init script to muliplex better, #173923 thanks to Grégoire Baron Package-Manager: portage-2.1.2.3 --- diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index 17aaad59c66f..6be21c85a646 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.83 2007/04/02 11:32:33 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.84 2007/04/10 13:00:55 uberlord Exp $ + +*vsftpd-2.0.5-r2 (10 Apr 2007) + + 10 Apr 2007; Roy Marples files/vsftpd.init, + +vsftpd-2.0.5-r2.ebuild: + Fix the init script to muliplex better, #173923 thanks to Grégoire Baron *vsftpd-2.0.5-r1 (02 Apr 2007) diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest index 802df1d749fd..4c9641b1814c 100644 --- 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 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.init 1735 RMD160 1c1487ac281d341420ad741ee35e23807766a2fe SHA1 d5fe1307ed792e7580de9709e6c6ca6680fad430 SHA256 1651712a71c8f06cc5c12c903b5181ba60d01b1ee44833bb0c219ada770b034f +MD5 d103d643de8044034cc92df532faf810 files/vsftpd.init 1735 +RMD160 1c1487ac281d341420ad741ee35e23807766a2fe files/vsftpd.init 1735 +SHA256 1651712a71c8f06cc5c12c903b5181ba60d01b1ee44833bb0c219ada770b034f files/vsftpd.init 1735 AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3 MD5 4b9dad8564a6cf38452350a1e5ba5664 files/vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 files/vsftpd.logrotate 53 @@ -32,14 +32,18 @@ EBUILD vsftpd-2.0.5-r1.ebuild 2968 RMD160 c9b2a5c31fcd58d6d03847bf902685839ed2c4 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-r2.ebuild 2968 RMD160 bac0eaa3587c7d0f49035f0c16e42e49ae7ea978 SHA1 d6457c608bd7d8a1de866c2c42689a9394fc7b24 SHA256 5c5421a1e8f9e3c44ab543171254758921be0b38d540bd9175d15b8b13e7e846 +MD5 40c6421c4f30cab4c14dd3d9fddd67a9 vsftpd-2.0.5-r2.ebuild 2968 +RMD160 bac0eaa3587c7d0f49035f0c16e42e49ae7ea978 vsftpd-2.0.5-r2.ebuild 2968 +SHA256 5c5421a1e8f9e3c44ab543171254758921be0b38d540bd9175d15b8b13e7e846 vsftpd-2.0.5-r2.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 11653 RMD160 cd7ce0bfe698a23216aca1129d1a77c765dd8d80 SHA1 d781da606a173034905bc30a6d615ead30a65a9b SHA256 87c4556d66fbbaf2bbe730ed0b3bbf706edd69495ecfa6ccffda0d26d491d660 -MD5 a1f4b6ee9664da17efd357da570d78d3 ChangeLog 11653 -RMD160 cd7ce0bfe698a23216aca1129d1a77c765dd8d80 ChangeLog 11653 -SHA256 87c4556d66fbbaf2bbe730ed0b3bbf706edd69495ecfa6ccffda0d26d491d660 ChangeLog 11653 +MISC ChangeLog 11857 RMD160 d3b96a2586ca5f61e4bebc7d2896af618706fc3b SHA1 928bb5afcf50bc766bda1bed11c0688079e09432 SHA256 3322ffa4c6bbcad9c4b2567ed9689cfe2d05c10c6b04b22e3469c7fb7e681dff +MD5 5ff8c490bd7db53ed81830afcb1c153d ChangeLog 11857 +RMD160 d3b96a2586ca5f61e4bebc7d2896af618706fc3b ChangeLog 11857 +SHA256 3322ffa4c6bbcad9c4b2567ed9689cfe2d05c10c6b04b22e3469c7fb7e681dff ChangeLog 11857 MISC metadata.xml 344 RMD160 eced9ee76c578ea2a2e96bc811ca610a6f40dbe4 SHA1 0cc8df9a4f8096179966d4c10b45715dcfdc600b SHA256 7737cc6af0c310b6f7aedd541391f1546f3dca50a900f6a49877d04a470ec6f0 MD5 0451b23327c004752edf415e25931d07 metadata.xml 344 RMD160 eced9ee76c578ea2a2e96bc811ca610a6f40dbe4 metadata.xml 344 @@ -53,3 +57,6 @@ SHA256 82bd5c1de679b40618dbee3ac73090d4790a647860c8ca2aefcfe9665ffe0c30 files/di 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 +MD5 55f35e732efcc22c36ba2324a0e937af files/digest-vsftpd-2.0.5-r2 238 +RMD160 a05fc5515e20b1ab526a5d0abc62820533abac03 files/digest-vsftpd-2.0.5-r2 238 +SHA256 82bd5c1de679b40618dbee3ac73090d4790a647860c8ca2aefcfe9665ffe0c30 files/digest-vsftpd-2.0.5-r2 238 diff --git a/net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r2 b/net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r2 new file mode 100644 index 000000000000..162037302490 --- /dev/null +++ b/net-ftp/vsftpd/files/digest-vsftpd-2.0.5-r2 @@ -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 24deb9cd36a8..591679fd038e 100644 --- a/net-ftp/vsftpd/files/vsftpd.init +++ b/net-ftp/vsftpd/files/vsftpd.init @@ -1,15 +1,17 @@ #!/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.4 2007/04/02 11:32:33 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.5 2007/04/10 13:00:55 uberlord Exp $ -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" + VSFTPD_CONF_DEFAULT="/etc/vsftpd/${VSFTPD_NAME}.conf" else VSFTPD_PID="/var/run/vsftpd.pid" + VSFTPD_CONF_DEFAULT="/etc/vsftpd/vsftpd.conf" fi +VSFTPD_CONF=${VSFTPD_CONF:-${VSFTPD_CONF_DEFAULT}} depend() { need net @@ -45,7 +47,7 @@ checkconfig() { start() { checkconfig || return 1 - ebegin "Starting vsftpd" + ebegin "Starting ${SVCNAME}" start-stop-daemon --start --exec /usr/sbin/vsftpd \ --background --make-pidfile --pidfile "${VSFTPD_PID}" \ -- "${VSFTPD_CONF}" @@ -53,7 +55,7 @@ start() { } stop() { - ebegin "Stopping vsftpd" + ebegin "Stopping ${SVCNAME}" start-stop-daemon --stop --exec /usr/sbin/vsftpd \ --pidfile "${VSFTPD_PID}" eend $? diff --git a/net-ftp/vsftpd/vsftpd-2.0.5-r2.ebuild b/net-ftp/vsftpd/vsftpd-2.0.5-r2.ebuild new file mode 100644 index 000000000000..7fb100e57024 --- /dev/null +++ b/net-ftp/vsftpd/vsftpd-2.0.5-r2.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-r2.ebuild,v 1.1 2007/04/10 13:00:55 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" +}