Gentoo Archives: gentoo-commits

From: "Stephanie J. Lockwood-Childs (wormo)" <wormo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd/files: vsftpd-2.2.0-dont-link-caps.patch
Date: Mon, 24 Aug 2009 05:37:03
Message-Id: E1MfSEn-0003Bg-3X@stork.gentoo.org
1 wormo 09/08/24 05:37:01
2
3 Added: vsftpd-2.2.0-dont-link-caps.patch
4 Log:
5 Need new version of caps-disabling patch to apply cleanly to 2.2.0
6 (bug #282494, reported by Sergey Plyukhin)
7 (Portage version: 2.1.6.13/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch?rev=1.1&content-type=text/plain
14
15 Index: vsftpd-2.2.0-dont-link-caps.patch
16 ===================================================================
17 diff -ur vsftpd-2.2.0.orig/vsf_findlibs.sh vsftpd-2.2.0/vsf_findlibs.sh
18 --- vsftpd-2.2.0.orig/vsf_findlibs.sh 2009-08-23 22:15:39.000000000 -0700
19 +++ vsftpd-2.2.0/vsf_findlibs.sh 2009-08-23 22:16:31.000000000 -0700
20 @@ -44,17 +44,6 @@
21 # For older HP-UX...
22 locate_library /usr/lib/libsec.sl && echo "-lsec";
23
24 -# Look for libcap (capabilities)
25 -if locate_library /lib/libcap.so.1; then
26 - echo "/lib/libcap.so.1";
27 -elif locate_library /lib/libcap.so.2; then
28 - echo "/lib/libcap.so.2";
29 -else
30 - locate_library /usr/lib/libcap.so && echo "-lcap";
31 - locate_library /lib/libcap.so && echo "-lcap";
32 - locate_library /lib64/libcap.so && echo "-lcap";
33 -fi
34 -
35 # Solaris needs this for nanosleep()..
36 locate_library /lib/libposix4.so && echo "-lposix4";
37 locate_library /usr/lib/libposix4.so && echo "-lposix4";