diff options
| author |   Stephanie J. Lockwood-Childs <wormo@gentoo.org> | 2009-08-24 05:37:00 +0000 |
|---|---|---|
| committer | Stephanie J. Lockwood-Childs <wormo@gentoo.org> | 2009-08-24 05:37:00 +0000 |
| commit | bef9905533d632361583ab5046b71c49260f3748 (patch) | |
| tree | 6c5c829e02776fd9311d62c8628a66eb781a5f1f /net-ftp/vsftpd | |
| parent | Moving squeak-3.10-glibc210.patch to mirrors, bug #282507 (diff) | |
| download | gentoo-2-bef9905533d632361583ab5046b71c49260f3748.tar.gz gentoo-2-bef9905533d632361583ab5046b71c49260f3748.tar.bz2 gentoo-2-bef9905533d632361583ab5046b71c49260f3748.zip | |
Need new version of caps-disabling patch to apply cleanly to 2.2.0
(bug #282494, reported by Sergey Plyukhin)
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp/vsftpd')
| -rw-r--r-- | net-ftp/vsftpd/ChangeLog | 7 | ||||
| -rw-r--r-- | net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch | 21 | ||||
| -rw-r--r-- | net-ftp/vsftpd/vsftpd-2.2.0.ebuild | 4 |
3 files changed, 29 insertions, 3 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index 08cbbe6b5f11..51cf4e6d953b 100644 --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-ftp/vsftpd # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.117 2009/08/23 16:11:13 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.118 2009/08/24 05:37:00 wormo Exp $ + + 24 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org> + +files/vsftpd-2.2.0-dont-link-caps.patch: + Need new version of caps-disabling patch to apply cleanly to 2.2.0 + (bug #282494, reported by Sergey Plyukhin) *vsftpd-2.2.0 (23 Aug 2009) diff --git a/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch new file mode 100644 index 000000000000..debcf06279e3 --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch @@ -0,0 +1,21 @@ +diff -ur vsftpd-2.2.0.orig/vsf_findlibs.sh vsftpd-2.2.0/vsf_findlibs.sh +--- vsftpd-2.2.0.orig/vsf_findlibs.sh 2009-08-23 22:15:39.000000000 -0700 ++++ vsftpd-2.2.0/vsf_findlibs.sh 2009-08-23 22:16:31.000000000 -0700 +@@ -44,17 +44,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"; +- locate_library /lib64/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 --git a/net-ftp/vsftpd/vsftpd-2.2.0.ebuild b/net-ftp/vsftpd/vsftpd-2.2.0.ebuild index bdd57d0a30ce..12ab4b9b98e9 100644 --- a/net-ftp/vsftpd/vsftpd-2.2.0.ebuild +++ b/net-ftp/vsftpd/vsftpd-2.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.2.0.ebuild,v 1.1 2009/08/23 16:11:13 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.2.0.ebuild,v 1.2 2009/08/24 05:37:00 wormo Exp $ inherit eutils toolchain-funcs @@ -40,7 +40,7 @@ src_unpack() { # Ensure that we don't link against libcap unless asked if ! use caps ; then sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c - epatch "${FILESDIR}"/${PN}-2.1.2-dont-link-caps.patch + epatch "${FILESDIR}"/${P}-dont-link-caps.patch fi # Let portage control stripping |