diff options
| author |   Peter Volkov <pva@gentoo.org> | 2009-09-04 15:03:10 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2009-09-04 15:03:10 +0000 |
| commit | c1e10cf4249ea3ee36d4f7132ec631f21541f686 (patch) | |
| tree | 2ab4a9f8d24fddb2a01257276ad55ac9bd099d8d /net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch | |
| parent | net-misc/moblock: Fixes and Enhancements (diff) | |
| download | sunrise-c1e10cf4249ea3ee36d4f7132ec631f21541f686.tar.gz sunrise-c1e10cf4249ea3ee36d4f7132ec631f21541f686.tar.bz2 sunrise-c1e10cf4249ea3ee36d4f7132ec631f21541f686.zip | |
net-ftp/vsftpd-devnet: Updated patch to make it appliable, bug #283110 reported by skobkin.
svn path=/sunrise/; revision=9163
Diffstat (limited to 'net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch')
| -rw-r--r-- | net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch b/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch index 2d046dbf3..4d907db6e 100644 --- a/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch +++ b/net-ftp/vsftpd-devnet/files/vsftpd-devnet-2.1.0-dont-link-caps.patch @@ -1,31 +1,20 @@ -diff -ur vsf_findlibs.sh.orig vsf_findlibs.sh ---- vsf_findlibs.sh.orig 2009-03-02 23:29:22.417771616 +0200 -+++ vsf_findlibs.sh 2009-03-02 23:29:36.893762969 +0200 -@@ -48,14 +48,6 @@ +--- vsf_findlibs.sh 2009-09-04 14:50:18 +0000 ++++ vsf_findlibs.sh 2009-09-04 14:57:26 +0000 +@@ -48,16 +48,6 @@ # For older HP-UX... - locate_library "/usr/$lib/libsec.sl" && echo "-lsec"; + locate_library /usr/$lib/libsec.sl && echo "-lsec"; -# Look for libcap (capabilities) --if locate_library "/$lib/libcap.so.1"; then +-if locate_library /$lib/libcap.so.1; then - echo "/$lib/libcap.so.1"; +-elif locate_library /$lib/libcap.so.2; then +- echo "/$lib/libcap.so.2"; -else -- locate_library "/usr/$lib/libcap.so" && echo "-lcap"; -- locate_library "/$lib/libcap.so" && echo "-lcap"; +- locate_library /usr/$lib/libcap.so && echo "-lcap"; +- locate_library /$lib/libcap.so && echo "-lcap"; -fi - # Solaris needs this for nanosleep().. - locate_library "/$lib/libposix4.so" && echo "-lposix4"; - locate_library "/usr/$lib/libposix4.so" && echo "-lposix4"; -diff -ur sysdeputil.c.orig sysdeputil.c ---- sysdeputil.c.orig 2009-03-03 01:59:22.726752967 +0200 -+++ sysdeputil.c 2009-03-03 01:59:34.383753897 +0200 -@@ -160,9 +160,6 @@ - #include <crypt.h> - #endif - --/* Prefer libcap based capabilities over raw syscall capabilities */ --#include <sys/capability.h> -- - #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP) - #include <linux/capability.h> - #include <sys/syscall.h> + locate_library /$lib/libposix4.so && echo "-lposix4"; + locate_library /usr/$lib/libposix4.so && echo "-lposix4"; + |