diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2009-05-30 11:28:41 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2009-05-30 11:28:41 +0000 |
| commit | 677277c442e4e383bdbb18527affaf75153336da (patch) | |
| tree | 2058759c0325e04912b5f9fc749fa03b22988140 /net-ftp/vsftpd/files | |
| parent | alpha/arm/ia64/s390/sh stable wrt #271444 (diff) | |
| download | gentoo-2-677277c442e4e383bdbb18527affaf75153336da.tar.gz gentoo-2-677277c442e4e383bdbb18527affaf75153336da.tar.bz2 gentoo-2-677277c442e4e383bdbb18527affaf75153336da.zip | |
Version bump, fix xinetd example, bug #266881, force libcap-2, bug #266806, bug #268353
(Portage version: 2.1.6.11/cvs/Linux i686, RepoMan options: --force)
Diffstat (limited to 'net-ftp/vsftpd/files')
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch | 11 | ||||
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch | 20 |
2 files changed, 20 insertions, 11 deletions
diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch index f428fb41beca..b3589920721d 100644 --- a/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch +++ b/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch @@ -75,17 +75,6 @@ diff -ur vsftpd-2.1.0.orig/vsftpd.conf vsftpd-2.1.0/vsftpd.conf # # The default compiled in settings are fairly paranoid. This sample file # loosens things up a bit, to make the ftp daemon more usable. -@@ -8,6 +8,10 @@ - # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's - # capabilities. - # -+# Listen on IPv4. xinet users must set NO or comment out -+# otherwise it must be set YES -+listen=YES -+# - # Allow anonymous FTP? (Beware - allowed by default if you comment this out). - anonymous_enable=YES - # @@ -87,14 +91,14 @@ # useful for combatting certain DoS attacks. #deny_email_enable=YES diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch new file mode 100644 index 000000000000..d36fa37ffe40 --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch @@ -0,0 +1,20 @@ +diff -ur vsftpd-2.1.2.orig/vsf_findlibs.sh vsftpd-2.1.2/vsf_findlibs.sh +--- vsftpd-2.1.2.orig/vsf_findlibs.sh 2009-05-30 12:43:33.000000000 +0200 ++++ vsftpd-2.1.2/vsf_findlibs.sh 2009-05-30 12:44:41.000000000 +0200 +@@ -42,16 +42,6 @@ + # For older HP-UX... + locate_library /usr/lib/libsec.sl && echo "-lsec"; + +-# Look for libcap (capabilities) +-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"; +-fi +- + # Solaris needs this for nanosleep().. + locate_library /lib/libposix4.so && echo "-lposix4"; + locate_library /usr/lib/libposix4.so && echo "-lposix4"; |