From 9d069cc7ca6122c42ba58afc49d69bc5caa21faa Mon Sep 17 00:00:00 2001 From: Raúl Porcel Date: Thu, 21 Feb 2008 17:28:50 +0000 Subject: Fix caps failure wrt #210478 Package-Manager: portage-2.1.4.4 --- net-ftp/vsftpd/ChangeLog | 6 +++++- net-ftp/vsftpd/Manifest | 6 +++--- net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild | 6 +++--- net-ftp/vsftpd/vsftpd-2.0.6.ebuild | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) (limited to 'net-ftp') 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 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/Manifest b/net-ftp/vsftpd/Manifest index 87ede112301f..863086447fd3 100644 --- a/net-ftp/vsftpd/Manifest +++ b/net-ftp/vsftpd/Manifest @@ -7,7 +7,7 @@ AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf1 AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f DIST vsftpd-2.0.5.tar.gz 155985 RMD160 297c383aae9fd90f75d5d6a62b2ed5e54adf25d4 SHA1 9b6a079699aaeb01219665acf203c093f94faef0 SHA256 5462ebf0df2792dde8ea3cf5d87c715200aac388554b3f0a9ace6265edecfa5b DIST vsftpd-2.0.6.tar.gz 158516 RMD160 33e9782e2c99986c2c8b60fc29880cedad7ba1fa SHA1 23fcc21996cd1404f6957d83bfb2e8004401a858 SHA256 8e35c3962477c5c539d9be489d0d3794840f5eda15690e492a6f1f256398ce30 -EBUILD vsftpd-2.0.5-r3.ebuild 3065 RMD160 592ed2a8f7baaa029982887bdca7a42c60b5917e SHA1 2f80ba29732187ae5535b7fe6ad5a99ac27dc2d8 SHA256 b836bf76d927f193234e02da6aa598d87df61a0298a8c50c2090c6955b4e30c4 -EBUILD vsftpd-2.0.6.ebuild 2990 RMD160 fb07b7c73e1891301678150476f61207f83f5752 SHA1 173f63a9fdc584be97030815cde1c848a38029ef SHA256 2468cd700123aa9853f6f26b52e6f2eeab853e08b3e1c74eea8cf7382163ab0a -MISC ChangeLog 12641 RMD160 186c44a2dc57f3de40c7413fce77b42e14b5e4e5 SHA1 a75482035728c1c7bb02d03afdf543dab6b71c0a SHA256 f58d8bd2381d9b30b42f2ae0a86357768e4ecc560d3568b892b3db7ee4af4870 +EBUILD vsftpd-2.0.5-r3.ebuild 3078 RMD160 93e1d5c532798d0181d2f95344b9de1cac1ec0c6 SHA1 d3fc431a484ad5bf5ca33e46cbfc9574de2b2eda SHA256 e8763354d240fc4d058b741a5174c29c7cdcfd7f1e5b8e68c0373f1568b81a6f +EBUILD vsftpd-2.0.6.ebuild 3004 RMD160 f9be9c003857930b3e7d47378a37c760bbafe69c SHA1 6a273fee16c444efc6ca823c500ef6f04c6111f8 SHA256 a118940d76304ecc94d273aab82b7a39514cb1225cb7ae7fcb34b02c4879446b +MISC ChangeLog 12769 RMD160 4cc3de1dd1c099b0f5ecfe0d021bc28989aab9fa SHA1 4be8caff899712e57261eb80e0150b15b2f9d641 SHA256 ab904f432f786c717b10b716ee6cfa74907f1ae9abaace7a91ae7ccaa52153cb MISC metadata.xml 358 RMD160 f8ffc0942c689c54a62b078a9a5bcd44702a5e68 SHA1 a252bf60d812dad06cbe00c324671cfba7b4e991 SHA256 cdc354a30f912a068432b3de197b3886ac05661869e7a0f67ac29f1da04b3b0d 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 -- cgit v1.2.3-65-gdbad