commit: 99b67bf04c64f5f09b9b6a32b61de2323249041f Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Jul 27 18:09:14 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Jul 27 18:09:14 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b67bf0
net-ftp/vsftpd: depend on virtual/libcrypt when pam is disabled Closes: https://bugs.gentoo.org/794952 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-ftp/vsftpd/{vsftpd-3.0.3-r3.ebuild => vsftpd-3.0.3-r4.ebuild} | 7 ++++++- net-ftp/vsftpd/{vsftpd-3.0.4.ebuild => vsftpd-3.0.4-r1.ebuild} | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild similarity index 97% rename from net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild rename to net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild index bba34a41dd4..e3ad887f7e1 100644 --- a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild +++ b/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild @@ -16,6 +16,7 @@ IUSE="caps pam tcpd ssl selinux xinetd" DEPEND="caps? ( >=sys-libs/libcap-2 ) pam? ( sys-libs/pam ) + !pam? ( virtual/libcrypt:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ssl? ( dev-libs/openssl:0= @@ -73,7 +74,11 @@ src_compile() { # Override LIBS variable. Bug #508192 LIBS= use caps && LIBS+=" -lcap" - use pam && LIBS+=" -lpam" + if use pam; then + LIBS+=" -lpam" + else + LIBS+=" -lcrypt" + fi use tcpd && LIBS+=" -lwrap" use ssl && LIBS+=" -lssl -lcrypto" diff --git a/net-ftp/vsftpd/vsftpd-3.0.4.ebuild b/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild similarity index 97% rename from net-ftp/vsftpd/vsftpd-3.0.4.ebuild rename to net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild index e7be1199478..d68b2892522 100644 --- a/net-ftp/vsftpd/vsftpd-3.0.4.ebuild +++ b/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild @@ -16,6 +16,7 @@ IUSE="caps pam tcpd ssl selinux xinetd" DEPEND="caps? ( >=sys-libs/libcap-2 ) pam? ( sys-libs/pam ) + !pam? ( virtual/libcrypt:= ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) ssl? ( dev-libs/openssl:0= )" RDEPEND="${DEPEND} @@ -79,7 +80,11 @@ src_compile() { # Override LIBS variable. Bug #508192 LIBS= use caps && LIBS+=" -lcap" - use pam && LIBS+=" -lpam" + if use pam; then + LIBS+=" -lpam" + else + LIBS+=" -lcrypt" + fi use tcpd && LIBS+=" -lwrap" use ssl && LIBS+=" -lssl -lcrypto"
