commit: b1c84c1e2372d5f92e3794de46af966942a53620 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Jun 8 09:42:37 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Jun 8 09:42:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c84c1e
net-ftp/vsftpd: refresh USE=-caps patch Closes: https://bugs.gentoo.org/562426 Thanks-to: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com> Signed-off-by: Sam James <sam <AT> gentoo.org> net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch | 17 +++++++++++++++++ net-ftp/vsftpd/vsftpd-3.0.4.ebuild | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch new file mode 100644 index 00000000000..75e0e3e7cfd --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch @@ -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"; diff --git a/net-ftp/vsftpd/vsftpd-3.0.4.ebuild b/net-ftp/vsftpd/vsftpd-3.0.4.ebuild index 5803985cfa0..e7be1199478 100644 --- a/net-ftp/vsftpd/vsftpd-3.0.4.ebuild +++ b/net-ftp/vsftpd/vsftpd-3.0.4.ebuild @@ -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
