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 79C731382C5 for ; Sun, 24 Jan 2021 10:33:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C3DD1E0997; Sun, 24 Jan 2021 10:33:27 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 ADD71E0997 for ; Sun, 24 Jan 2021 10:33:27 +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 C5EDC335D8B for ; Sun, 24 Jan 2021 10:33:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFB91328 for ; Sun, 24 Jan 2021 10:33:24 +0000 (UTC) From: "Mikle Kolyada" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mikle Kolyada" Message-ID: <1611484402.d06386545e7df671604303f2fe4912128d86a2d0.zlogene@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/ftpbase/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-ftp/ftpbase/ftpbase-0.01-r3.ebuild net-ftp/ftpbase/ftpbase-0.01-r4.ebuild X-VCS-Directories: net-ftp/ftpbase/ X-VCS-Committer: zlogene X-VCS-Committer-Name: Mikle Kolyada X-VCS-Revision: d06386545e7df671604303f2fe4912128d86a2d0 X-VCS-Branch: master Date: Sun, 24 Jan 2021 10:33:24 +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: c8fbee38-09f6-446b-a1ad-28d03db1ddd5 X-Archives-Hash: bc4c5d6b3619531174dbbad1e2efec8f commit: d06386545e7df671604303f2fe4912128d86a2d0 Author: Mikle Kolyada gentoo org> AuthorDate: Sun Jan 24 10:32:50 2021 +0000 Commit: Mikle Kolyada gentoo org> CommitDate: Sun Jan 24 10:33:22 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0638654 net-ftp/ftpbase: install pam files conditionally Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Mikle Kolyada gentoo.org> .../{ftpbase-0.01-r3.ebuild => ftpbase-0.01-r4.ebuild} | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild similarity index 67% rename from net-ftp/ftpbase/ftpbase-0.01-r3.ebuild rename to net-ftp/ftpbase/ftpbase-0.01-r4.ebuild index f278d506cef..19eee733db9 100644 --- a/net-ftp/ftpbase/ftpbase-0.01-r3.ebuild +++ b/net-ftp/ftpbase/ftpbase-0.01-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit eutils pam user +inherit pam DESCRIPTION="FTP layout package" HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage" @@ -30,10 +30,7 @@ src_install() { insinto /etc doins "${FILESDIR}/ftpusers" - cp "${FILESDIR}/ftp-pamd-include" "${T}" || die - if use elibc_FreeBSD; then - sed -i -e "/pam_listfile.so/s/^.*$/account required pam_ftpusers.so no_warn disallow/" \ - "${T}"/ftp-pamd-include || die + if use pam; then + newpamd "${FILESDIR}"/ftp-pamd-include ftp fi - newpamd "${T}"/ftp-pamd-include ftp }