summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2008-02-21 17:28:50 +0000
committerRaúl Porcel <armin76@gentoo.org>2008-02-21 17:28:50 +0000
commit5a80536ec97b043d664d275b7b7cedb6ff793328 (patch)
treea865a84e3f3af76b75cc7e430ad1b1644c705cc6 /net-ftp/vsftpd
parentMake repoman happy (diff)
downloadgentoo-2-5a80536ec97b043d664d275b7b7cedb6ff793328.tar.gz
gentoo-2-5a80536ec97b043d664d275b7b7cedb6ff793328.tar.bz2
gentoo-2-5a80536ec97b043d664d275b7b7cedb6ff793328.zip
Fix caps failure wrt #210478
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-ftp/vsftpd')
-rw-r--r--net-ftp/vsftpd/ChangeLog6
-rw-r--r--net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild6
-rw-r--r--net-ftp/vsftpd/vsftpd-2.0.6.ebuild4
3 files changed, 10 insertions, 6 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index be8c1dd0259f..48c2c03998a3 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/vsftpd
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.90 2008/02/14 16:34:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.91 2008/02/21 17:28:50 armin76 Exp $
+
+ 21 Feb 2008; Raúl Porcel <armin76@gentoo.org> vsftpd-2.0.5-r3.ebuild,
+ vsftpd-2.0.6.ebuild:
+ Fix caps failure wrt #210478
*vsftpd-2.0.6 (14 Feb 2008)
diff --git a/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild b/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
index 05aa475d6291..53e23d1f6e4e 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild,v 1.2 2007/07/09 12:40:35 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild,v 1.3 2008/02/21 17:28:50 armin76 Exp $
inherit eutils toolchain-funcs
@@ -31,7 +31,7 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
# Fix building without the libcap
- epatch "${FILESDIR}/${P}-caps.patch"
+ ! use caps && epatch "${FILESDIR}/${P}-caps.patch"
# Fix anon umask uploads, #183213.
epatch "${FILESDIR}/${P}-anon-upload-umask.patch"
diff --git a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild b/net-ftp/vsftpd/vsftpd-2.0.6.ebuild
index a13a7fe9fcfe..198bf1ae0d21 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.6.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.6.ebuild,v 1.1 2008/02/14 16:34:11 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.6.ebuild,v 1.2 2008/02/21 17:28:50 armin76 Exp $
inherit eutils toolchain-funcs
@@ -31,7 +31,7 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch"
# Fix building without the libcap
- epatch "${FILESDIR}/${PN}-2.0.5-caps.patch"
+ ! use caps && epatch "${FILESDIR}/${PN}-2.0.5-caps.patch"
# Configure vsftpd build defaults
use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h