Gentoo Archives: gentoo-commits

From: "Raul Porcel (armin76)" <armin76@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd/files: vsftpd-2.1.2-dont-link-caps.patch vsftpd-2.1.0-gentoo.patch
Date: Sat, 30 May 2009 11:28:43
Message-Id: E1MAMjx-0001Ai-NA@stork.gentoo.org
1 armin76 09/05/30 11:28:41
2
3 Modified: vsftpd-2.1.0-gentoo.patch
4 Added: vsftpd-2.1.2-dont-link-caps.patch
5 Log:
6 Version bump, fix xinetd example, bug #266881, force libcap-2, bug #266806, bug #268353
7 (Portage version: 2.1.6.11/cvs/Linux i686, RepoMan options: --force)
8
9 Revision Changes Path
10 1.2 net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch?r1=1.1&r2=1.2
15
16 Index: vsftpd-2.1.0-gentoo.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- vsftpd-2.1.0-gentoo.patch 23 Feb 2009 17:41:05 -0000 1.1
23 +++ vsftpd-2.1.0-gentoo.patch 30 May 2009 11:28:41 -0000 1.2
24 @@ -75,17 +75,6 @@
25 #
26 # The default compiled in settings are fairly paranoid. This sample file
27 # loosens things up a bit, to make the ftp daemon more usable.
28 -@@ -8,6 +8,10 @@
29 - # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
30 - # capabilities.
31 - #
32 -+# Listen on IPv4. xinet users must set NO or comment out
33 -+# otherwise it must be set YES
34 -+listen=YES
35 -+#
36 - # Allow anonymous FTP? (Beware - allowed by default if you comment this out).
37 - anonymous_enable=YES
38 - #
39 @@ -87,14 +91,14 @@
40 # useful for combatting certain DoS attacks.
41 #deny_email_enable=YES
42
43
44
45 1.1 net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch?rev=1.1&content-type=text/plain
49
50 Index: vsftpd-2.1.2-dont-link-caps.patch
51 ===================================================================
52 diff -ur vsftpd-2.1.2.orig/vsf_findlibs.sh vsftpd-2.1.2/vsf_findlibs.sh
53 --- vsftpd-2.1.2.orig/vsf_findlibs.sh 2009-05-30 12:43:33.000000000 +0200
54 +++ vsftpd-2.1.2/vsf_findlibs.sh 2009-05-30 12:44:41.000000000 +0200
55 @@ -42,16 +42,6 @@
56 # For older HP-UX...
57 locate_library /usr/lib/libsec.sl && echo "-lsec";
58
59 -# Look for libcap (capabilities)
60 -if locate_library /lib/libcap.so.1; then
61 - echo "/lib/libcap.so.1";
62 -elif locate_library /lib/libcap.so.2; then
63 - echo "/lib/libcap.so.2";
64 -else
65 - locate_library /usr/lib/libcap.so && echo "-lcap";
66 - locate_library /lib/libcap.so && echo "-lcap";
67 -fi
68 -
69 # Solaris needs this for nanosleep()..
70 locate_library /lib/libposix4.so && echo "-lposix4";
71 locate_library /usr/lib/libposix4.so && echo "-lposix4";