[gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd: ChangeLog vsftpd-2.3.2-r1.ebuild

[Markos Chandras (hwoarang)]

hwoarang    10/09/27 17:19:35

  Modified:             ChangeLog
  Added:                vsftpd-2.3.2-r1.ebuild
  Log:
  Revbump to fix bug #335977 and bug #335980. Thanks to Joakim Tjernlund <Joakim.Tjernlund@×××××××××.se>
  
  (Portage version: 2.2_rc86/cvs/Linux x86_64)

Revision  Changes    Path
1.130                net-ftp/vsftpd/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.130&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.130&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/ChangeLog?r1=1.129&r2=1.130

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- ChangeLog	20 Aug 2010 19:20:16 -0000	1.129
+++ ChangeLog	27 Sep 2010 17:19:35 -0000	1.130
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.129 2010/08/20 19:20:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.130 2010/09/27 17:19:35 hwoarang Exp $
+
+*vsftpd-2.3.2-r1 (27 Sep 2010)
+
+  27 Sep 2010; Markos Chandras <hwoarang@g.o>
+  +vsftpd-2.3.2-r1.ebuild, +files/vsftpd-2.3.2-as-needed.patch,
+  +files/vsftpd-2.3.2-kerberos.patch:
+  Revbump to fix -as-needed behavior(Bug #335977) and kerberos authentcation
+  (Bug #335980). Thanks to Joakim Tjernlund <Joakim.Tjernlund@×××××××××.se>
 
   20 Aug 2010; Markos Chandras <hwoarang@g.o> metadata.xml:
   Add Dane Smith <smithdanea@×××××.com> as proxy maintainer



1.1                  net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: vsftpd-2.3.2-r1.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild,v 1.1 2010/09/27 17:19:35 hwoarang 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 pam tcpd ssl selinux xinetd"

DEPEND="caps? ( >=sys-libs/libcap-2 )
	pam? ( virtual/pam )
	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
	ssl? ( >=dev-libs/openssl-0.9.7d )"
RDEPEND="${DEPEND}
	net-ftp/ftpbase
	selinux? ( sec-policy/selinux-ftpd )
	xinetd? ( sys-apps/xinetd )"

src_unpack() {
	unpack ${A}
	cd "${S}"

	# as-needed patch. Bug #335977
	epatch "${FILESDIR}/${P}-as-needed.patch"

	# kerberos patch. bug #335980
	epatch "${FILESDIR}/${P}-kerberos.patch"

	# Patch the source, config and the manpage to use /etc/vsftpd/
	epatch "${FILESDIR}/${PN}-2.2.0-gentoo.patch"

	# Fix building without the libcap
	epatch "${FILESDIR}/${PN}-2.1.0-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
		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
	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 || die "doman failed"
	dosbin vsftpd || die "disbin failed"

	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
		README README.security REWARD SIZE \
		SPEED TODO TUNING || die "dodoc failed"
	newdoc vsftpd.conf vsftpd.conf.example || die "newdoc failed"

	docinto security
	dodoc SECURITY/* || die "dodoc failed"

	insinto "/usr/share/doc/${PF}/examples"
	doins -r EXAMPLE/* || die "doins faileD"

	insinto /etc/vsftpd
	newins vsftpd.conf vsftpd.conf.example || die "newins failed"

	insinto /etc/logrotate.d
	newins "${FILESDIR}/vsftpd.logrotate" vsftpd || die "newins failed"

	if use xinetd ; then
		insinto /etc/xinetd.d
		newins "${FILESDIR}/vsftpd.xinetd" vsftpd || die "newins failed"
	fi

	newinitd "${FILESDIR}/vsftpd.init" vsftpd || die "newinitd failed"

	keepdir /usr/share/vsftpd/empty
}

pkg_preinst() {
	# If we use xinetd, then we set listen=NO
	# so that our default config works under xinetd - fixes #78347
	if use xinetd ; then
		sed -i 's/listen=YES/listen=NO/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"
}