summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-07-27 14:09:14 -0400
committerMike Gilbert <floppym@gentoo.org>2021-07-27 14:09:14 -0400
commit99b67bf04c64f5f09b9b6a32b61de2323249041f (patch)
tree8f3e79af4344d41884b0b6c6ddb146db4d10fac8
parentdev-libs/libffi-compat: add libffi.so.7 compat slot (diff)
downloadgentoo-99b67bf04c64f5f09b9b6a32b61de2323249041f.tar.gz
gentoo-99b67bf04c64f5f09b9b6a32b61de2323249041f.tar.bz2
gentoo-99b67bf04c64f5f09b9b6a32b61de2323249041f.zip
net-ftp/vsftpd: depend on virtual/libcrypt when pam is disabled
Closes: https://bugs.gentoo.org/794952 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
-rw-r--r--net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild (renamed from net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild)7
-rw-r--r--net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild (renamed from net-ftp/vsftpd/vsftpd-3.0.4.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
index bba34a41dd44..e3ad887f7e16 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
index e7be11994783..d68b28925225 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"