summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2008-05-14 22:12:57 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2008-05-14 22:12:57 +0000
commit8dcd1cb6c7b6f061df58b7bc0abaddfd50d9ce0b (patch)
tree8d6f3d5ef7a3f7d31094a8970677bb12ceaf751d
parentadd a new version that drops support for pam_stack configuration files and ju... (diff)
downloadhistorical-8dcd1cb6c7b6f061df58b7bc0abaddfd50d9ce0b.tar.gz
historical-8dcd1cb6c7b6f061df58b7bc0abaddfd50d9ce0b.tar.bz2
historical-8dcd1cb6c7b6f061df58b7bc0abaddfd50d9ce0b.zip
Make the pam USE flag only depend on virtual/pam.
Package-Manager: portage-2.1.5_rc10
-rw-r--r--net-ftp/vsftpd/ChangeLog6
-rw-r--r--net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild4
-rw-r--r--net-ftp/vsftpd/vsftpd-2.0.6.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 1db78d527b44..5599491b98c8 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.97 2008/04/04 22:51:57 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.98 2008/05/14 22:12:57 flameeyes Exp $
+
+ 14 May 2008; Diego Pettenò <flameeyes@gentoo.org> vsftpd-2.0.5-r3.ebuild,
+ vsftpd-2.0.6.ebuild:
+ Make the pam USE flag only depend on virtual/pam.
04 Apr 2008; Kenneth Prugh <ken69267@gentoo.org> vsftpd-2.0.6.ebuild:
amd64 stable, bug #214959
diff --git a/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild b/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild
index 87c22c0c0591..0181c9a34d4d 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-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.4 2008/02/26 17:39:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.5-r3.ebuild,v 1.5 2008/05/14 22:12:57 flameeyes Exp $
inherit eutils toolchain-funcs
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="caps logrotate pam tcpd ssl selinux xinetd"
DEPEND="caps? ( sys-libs/libcap )
- pam? ( || ( virtual/pam sys-libs/pam ) )
+ pam? ( virtual/pam )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
ssl? ( >=dev-libs/openssl-0.9.7d )"
RDEPEND="${DEPEND}
diff --git a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild b/net-ftp/vsftpd/vsftpd-2.0.6.ebuild
index d2848e07a96e..fea307f85d71 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.8 2008/04/04 22:51:57 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.6.ebuild,v 1.9 2008/05/14 22:12:57 flameeyes Exp $
inherit eutils toolchain-funcs
@@ -14,7 +14,7 @@ KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
IUSE="caps logrotate pam tcpd ssl selinux xinetd"
DEPEND="caps? ( sys-libs/libcap )
- pam? ( || ( virtual/pam sys-libs/pam ) )
+ pam? ( virtual/pam )
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
ssl? ( >=dev-libs/openssl-0.9.7d )"
RDEPEND="${DEPEND}