summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ftp/vsftpd/HISTORY3
-rwxr-xr-xftp/vsftpd/PRE_BUILD6
2 files changed, 6 insertions, 3 deletions
diff --git a/ftp/vsftpd/HISTORY b/ftp/vsftpd/HISTORY
index 1d575cd0fb..4bb01a754f 100644
--- a/ftp/vsftpd/HISTORY
+++ b/ftp/vsftpd/HISTORY
@@ -1,3 +1,6 @@
+2021-02-06 Vlad Glagolev <stealth@sourcemage.org>
+ * PRE_BUILD: corrected dependency handling
+
2017-06-08 Vlad Glagolev <stealth@sourcemage.org>
* DEPENDS: made libcap optional dependency
diff --git a/ftp/vsftpd/PRE_BUILD b/ftp/vsftpd/PRE_BUILD
index 8dbe1a04ae..8cd9204cd0 100755
--- a/ftp/vsftpd/PRE_BUILD
+++ b/ftp/vsftpd/PRE_BUILD
@@ -22,17 +22,17 @@ sedit '
# the package is installed, but this is the easy way
# I'm doing it for now. :)
#
-if spell_ok tcp_wrappers; then
+if is_depends_enabled ${SPELL} tcp_wrappers; then
sedit "/^#undef VSF_BUILD_TCPWRAPPERS/{s/undef/define/}" builddefs.h
fi &&
-if spell_ok openssl; then
+if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} SSL); then
sedit "/^#undef VSF_BUILD_SSL/{s/undef/define/}" builddefs.h
fi &&
#
# builddefs.h defaults to using Linux-PAM
#
-if ! spell_ok linux-pam; then
+if ! is_depends_enabled ${SPELL} linux-pam; then
sedit "/^#define VSF_BUILD_PAM/{s/define/undef/}" builddefs.h
fi