net-ftp/vsftpd: refresh USE=-caps patch

Closes: https://bugs.gentoo.org/562426
Thanks-to: Joakim Tjernlund <joakim.tjernlund@infinera.com>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2021-06-08 09:42:37 +00:00
parent 0dda61a878
commit b1c84c1e23
2 changed files with 18 additions and 1 deletions

View File

@@ -0,0 +1,17 @@
--- a/vsf_findlibs.sh
+++ b/vsf_findlibs.sh
@@ -47,14 +47,6 @@
# For older HP-UX...
locate_library /usr/lib/libsec.sl && echo "-lsec";
-# Look for libcap (capabilities)
-# Note that link may fail with:
-# /usr/bin/ld: cannot find -lcap
-# If the libcap-devel package isn't installed.
-locate_library /usr/lib/libcap.so && echo "-lcap";
-locate_library /lib/libcap.so && echo "-lcap";
-locate_library /lib64/libcap.so && echo "-lcap";
-
# Solaris needs this for nanosleep()..
locate_library /lib/libposix4.so && echo "-lposix4";
locate_library /usr/lib/libposix4.so && echo "-lposix4";

View File

@@ -66,7 +66,7 @@ src_prepare() {
# Ensure that we don't link against libcap unless asked
if ! use caps ; then
sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
eapply "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
eapply "${FILESDIR}"/${PN}-3.0.4-dont-link-caps.patch
fi
# Let portage control stripping