Changeset - 05488ac6e003
[Not reviewed]
default
0 2 0
ohnobinki@delllappy.cdm - 16 years ago 2009-01-05 22:56:42
ohnobinki@delllappy.cdm
fixed error in my fix for net-ftp/vsftpd: I forgot to echo echo.
Um, please just see the diff to understand what ``echoing and echo'' means...
2 files changed with 2 insertions and 2 deletions:
0 comments (0 inline, 0 general)
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
 
EBUILD vsftpd-2.0.7-r1.ebuild 3418 RMD160 52dc918a58281704fd282d1f1f27c2f7cdeeecd7 SHA1 19ff3d1e97aa254b4be4195b551a655bf94baefb SHA256 5ccc07e7d19ebff698ce07179d30b9d4a983b33443174a3467f8d3bc5c0a7cbd
 
MISC ChangeLog 15121 RMD160 1e7f7dd6f864e965314b98bb17b57c000ca146d3 SHA1 818a7cf1a62fff9098f91db796657b2055c0d095 SHA256 5053ac19cad67a7b782284cddeb53cd27717b21c0b6512e0acfbec26e117e286
net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild
Show inline comments
 
@@ -2,97 +2,97 @@
 
# 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"
 

	
 
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
 
	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
 
	    echo "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
 
	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
0 comments (0 inline, 0 general)