From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1718E138330 for ; Tue, 23 Aug 2016 15:47:24 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 34ED921C09F; Tue, 23 Aug 2016 15:47:23 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3B5721C09F for ; Tue, 23 Aug 2016 15:47:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A3E153407E6 for ; Tue, 23 Aug 2016 15:47:21 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D48C2452 for ; Tue, 23 Aug 2016 15:47:19 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1471966927.a3ce118ec13660049ca3b69322bd2b22ba0bfc07.blueness@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild X-VCS-Directories: net-ftp/vsftpd/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: a3ce118ec13660049ca3b69322bd2b22ba0bfc07 X-VCS-Branch: master Date: Tue, 23 Aug 2016 15:47:19 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 572c20f2-de68-4f96-95e1-d832aacbea3d X-Archives-Hash: b5eb9f1309bfedeff75400060d473003 commit: a3ce118ec13660049ca3b69322bd2b22ba0bfc07 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Aug 23 15:42:07 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Aug 23 15:42:07 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ce118e net-ftp/vsftpd: bump to EAPI=6 and add libressl support Package-Manager: portage-2.2.28 net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild | 135 ++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild new file mode 100644 index 0000000..2c890e0 --- /dev/null +++ b/net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="6" + +inherit eutils systemd toolchain-funcs + +DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind" +HOMEPAGE="http://vsftpd.beasts.org/" +SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="caps libressl pam tcpd ssl selinux xinetd" + +DEPEND="caps? ( >=sys-libs/libcap-2 ) + pam? ( virtual/pam ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" +RDEPEND="${DEPEND} + net-ftp/ftpbase + selinux? ( sec-policy/selinux-ftp ) + xinetd? ( sys-apps/xinetd )" + +src_prepare() { + # kerberos patch. bug #335980 + epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch" + + # Patch the source, config and the manpage to use /etc/vsftpd/ + epatch "${FILESDIR}/${PN}-2.3.5-gentoo.patch" + + # Fix building without the libcap + epatch "${FILESDIR}/${PN}-2.1.0-caps.patch" + + # Fix building on alpha. Bug #405829 + epatch "${FILESDIR}/${PN}-3.0.2-alpha.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 || die + epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch + fi + + # Let portage control stripping + sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die + + #Bug #335977 + epatch "${FILESDIR}"/${PN}-3.0.0-Makefile.patch + + #Bug #450536 + epatch "${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch + + eapply_user +} + +src_compile() { + # Override LIBS variable. Bug #508192 + LIBS= + use caps && LIBS+=" -lcap" + use pam && LIBS+=" -lpam" + use tcpd && LIBS+=" -lwrap" + use ssl && LIBS+=" -lssl -lcrypto" + + CFLAGS="${CFLAGS}" \ + CC="$(tc-getCC)" \ + emake LIBS="${LIBS}" +} + +src_install() { + into /usr + doman ${PN}.conf.5 ${PN}.8 + dosbin ${PN} || die "disbin failed" + + dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ + README README.security REWARD SIZE \ + SPEED TODO TUNING || die "dodoc failed" + newdoc ${PN}.conf ${PN}.conf.example + + docinto security + dodoc SECURITY/* || die "dodoc failed" + + insinto "/usr/share/doc/${PF}/examples" + doins -r EXAMPLE/* || die "doins faileD" + + insinto /etc/${PN} + newins ${PN}.conf{,.example} + + insinto /etc/logrotate.d + newins "${FILESDIR}/${PN}.logrotate" ${PN} + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/${PN}.xinetd" ${PN} + fi + + newinitd "${FILESDIR}/${PN}.init" ${PN} + + keepdir /usr/share/${PN}/empty + + exeinto /usr/libexec + doexe "${FILESDIR}/vsftpd-checkconfig.sh" + systemd_dounit "${FILESDIR}/${PN}.service" + systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service" + systemd_dounit "${FILESDIR}/${PN}.socket" +} + +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/${PN}/${PN}.conf.example + fi +} + +pkg_postinst() { + einfo "vsftpd openRC 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" +}