diff options
| author |   Sam James <sam@gentoo.org> | 2021-06-08 09:42:37 +0000 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2021-06-08 09:42:37 +0000 |
| commit | b1c84c1e2372d5f92e3794de46af966942a53620 (patch) | |
| tree | a6a2341dfba66224aa682390d6d8a85a81d7f3de /net-ftp | |
| parent | dev-perl/Graph: Keyword 0.972.100 sparc, #794571 (diff) | |
| download | gentoo-b1c84c1e2372d5f92e3794de46af966942a53620.tar.gz gentoo-b1c84c1e2372d5f92e3794de46af966942a53620.tar.bz2 gentoo-b1c84c1e2372d5f92e3794de46af966942a53620.zip | |
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>
Diffstat (limited to 'net-ftp')
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch | 17 | ||||
| -rw-r--r-- | net-ftp/vsftpd/vsftpd-3.0.4.ebuild | 2 |
2 files changed, 18 insertions, 1 deletions
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 000000000000..75e0e3e7cfd3 --- /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 5803985cfa00..e7be11994783 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 |