vsftpd: link with wrap when tcp-wrappers configured

PATCH New Athanasios Oikonomou 1 participant 1 message Sep 6, 2017

Share & tools

Athanasios Oikonomou

author

2017-09-06 21:11 UTC #0 lore raw

PATCH 1/1 vsftpd: link with wrap when tcp-wrappers configured

By default we do not build vsftpd with tcp-wrappers, so we should not include lib wrap. Make lib wrap optional depending on tcp-wrappers PACKAGECONFIG.

Signed-off-by Athanasios Oikonomou <[email protected]>

---
 meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

meta-networking/recipes-daemons/vsftpd/vsftpd_3.0.3.bb +2 -1

index e524614..7a20356 100644
@@ -37,6 +37,7 @@ PACKAGECONFIG[tcp-wrappers] = ",,tcp-wrappers"
 DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-listfile', '', d)}"
 PAMLIB = "${@bb.utils.contains('DISTRO_FEATURES', 'pam', '-L${STAGING_BASELIBDIR} -lpam', '', d)}"
+WRAPLIB = "${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', '-lwrap', '', d)}"
 NOPAM_SRC ="${@bb.utils.contains('PACKAGECONFIG', 'tcp-wrappers', 'file://nopam-with-tcp_wrappers.patch', 'file://nopam.patch', d)}"
 
 inherit update-rc.d useradd systemd

@@ -54,7 +55,7 @@ do_configure() {
 }
 
 do_compile() {
-   oe_runmake "LIBS=-L${STAGING_LIBDIR} -lcrypt -lcap ${PAMLIB} -lwrap"
+   oe_runmake "LIBS=-L${STAGING_LIBDIR} -lcrypt -lcap ${PAMLIB} ${WRAPLIB}"
 }
 
 do_install() {

Signature · 1 line

2.1.4