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 7F596139360 for ; Sat, 14 Aug 2021 16:51:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E11BE0C09; Sat, 14 Aug 2021 16:51:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4BCD3E0C09 for ; Sat, 14 Aug 2021 16:51:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CF19A342AD6 for ; Sat, 14 Aug 2021 16:51:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 40E647DC for ; Sat, 14 Aug 2021 16:51:51 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1628959881.13c65659bbc9bc59314e972b69578014711663c3.floppym@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.5.ebuild X-VCS-Directories: net-ftp/vsftpd/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 13c65659bbc9bc59314e972b69578014711663c3 X-VCS-Branch: master Date: Sat, 14 Aug 2021 16:51:51 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e6fa4822-278d-4d23-8dd6-628c806cba15 X-Archives-Hash: 879444cfa7c4c554dd815e56434c392e commit: 13c65659bbc9bc59314e972b69578014711663c3 Author: Mike Gilbert gentoo org> AuthorDate: Sat Aug 14 16:51:09 2021 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Aug 14 16:51:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c65659 net-ftp/vsftpd: fix build on musl Closes: https://bugs.gentoo.org/713952 Signed-off-by: Mike Gilbert gentoo.org> net-ftp/vsftpd/vsftpd-3.0.5.ebuild | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild index b452dee49a0..b63d380bf32 100644 --- a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild +++ b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86" -IUSE="pam ssl tcpd" +IUSE="elibc_musl pam ssl tcpd" DEPEND=" >=sys-libs/libcap-2 @@ -36,11 +36,11 @@ src_prepare() { } define() { - sed -i -e "/#undef $1/c#define $1" "${S}"/builddefs.h || die + sed -i -e "/#undef $2/c#define $2${3:+ }$3" "$1" || die } undef() { - sed -i -e "/#define $1/c#undef $1" "${S}"/builddefs.h || die + sed -i -e "/#define $2/c#undef $2" "$1" || die } src_configure() { @@ -49,19 +49,25 @@ src_configure() { if use pam; then libs+=( -lpam ) else - undef VSF_BUILD_PAM + undef builddefs.h VSF_BUILD_PAM libs+=( -lcrypt ) fi if use ssl; then - define VSF_BUILD_SSL + define builddefs.h VSF_BUILD_SSL libs+=( -lcrypto -lssl ) fi if use tcpd; then - define VSF_BUILD_TCPWRAPPERS + define builddefs.h VSF_BUILD_TCPWRAPPERS libs+=( -lwrap ) fi + + if use elibc_musl; then + # musl does not support utmp/wtmp + # https://bugs.gentoo.org/713952 + undef sysdeputil.c VSF_SYSDEP_HAVE_UTMPX + fi } src_compile() {