updated 2.0.1 ebuild to build without pam support, bug 65981

Package-Manager: portage-2.0.51-r13

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 7ef536ed48433a2f65ea3ea269d5c46745dcbeb4..5774fafd954992dcc26e5d143350131b349a3902 100644 (file)
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-ftp/vsftpd
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.46 2004/12/29 03:10:56 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.47 2005/01/17 16:03:03 jforman Exp $
+
+  17 Jan 2005; Jeffrey Forman <jforman@gentoo.org> vsftpd-2.0.1.ebuild:
+  Add support to build vsftpd without pam, bug 65981, thanks Rob!
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance

diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 4037b29dd945db233db661dc949773c6582b83d5..cf0cf440482c49f1ce4ef41bc81dfbf2d24489d7 100644 (file)
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,24 +1,24 @@
-MD5 f430c6545b2b64ec413757a5fee27cbe ChangeLog 5365
-MD5 bce1cd62cbe79fc1bcb85e693131f252 vsftpd-2.0.1.ebuild 2341
-MD5 213703fc92069b2036caf192afb39068 vsftpd-1.2.0-r1.ebuild 2218
-MD5 103349a94ae86d21467853e2cff4d0a1 vsftpd-1.2.2.ebuild 2294
+MD5 2937f93ecf1f738a6e684716e07b296c ChangeLog 5504
 MD5 d161cb0e313c1619fc61077d5b0c8821 metadata.xml 251
-MD5 d1a2ec32b0639d78243cc5aee840eb9f vsftpd-1.0.1-r1.ebuild 1325
-MD5 284ab51c778b56a5f4155fbb7eb7492e vsftpd-1.2.1.ebuild 2237
-MD5 12157a137e6633887fad5c7a8e1e1ae3 files/vsftpd-1.2.0-gentoo.diff.bz2 2078
+MD5 95428c20e767e1f9daef82970a5e4d49 vsftpd-1.0.1-r1.ebuild 1324
+MD5 85c91beaad705e75c0a45baa3b445b86 vsftpd-1.2.0-r1.ebuild 2217
+MD5 425ecc7dab6af4626596d302f0f8e00b vsftpd-1.2.1.ebuild 2236
+MD5 f28a7ea529005d4356928cd167120156 vsftpd-1.2.2.ebuild 2297
+MD5 3e07fdcb271a0cce6efee956c166f187 vsftpd-2.0.1.ebuild 2280
+MD5 3734a4e9aaa1cc7775943c0c97bedd4b files/digest-vsftpd-1.0.1-r1 63
+MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0-r1 64
 MD5 fd342c037bab05b6fcdd20c0d8fd6720 files/digest-vsftpd-1.2.1 64
-MD5 aaa55785aee7dd51daf75a72232693f9 files/vsftpd.pam 481
 MD5 a44f959b4b7b9b7fa839bf999f04c9e1 files/digest-vsftpd-1.2.2 64
-MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0-r1 64
-MD5 d2bbf1b4e07a4f1f51f313274eb2e320 files/vsftpd.init.d 974
-MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
-MD5 a61f83e896d2058a22f9fb3d2b2b1b25 files/vsftpd.conf.d 294
-MD5 eb057c63bffcf702e1b8d0f9e406b6e5 files/vsftpd.conf 3770
-MD5 3734a4e9aaa1cc7775943c0c97bedd4b files/digest-vsftpd-1.0.1-r1 63
 MD5 2b36bc74604934d6ce3ef5c6b2d77485 files/digest-vsftpd-2.0.1 64
+MD5 5a140ccd0017f39fe3c63e6a29e1abcd files/ftpusers 365
+MD5 b602cee3b9a0967cfa02e3e398c0d641 files/vsftpd-1.0.1-gentoo.diff 5204
+MD5 12157a137e6633887fad5c7a8e1e1ae3 files/vsftpd-1.2.0-gentoo.diff.bz2 2078
+MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080
 MD5 e0e25ba72aea7fb37f3f66f4ca359a82 files/vsftpd-1.2.2-ppc64.diff 479
-MD5 32951e2e5a1c743fa96533989167c54a files/vsftpd.xinetd.ipv6 488
 MD5 e0a15cbbb9ee8ae2099c0b267431f2da files/vsftpd-2.0.1-gentoo.diff 6762
+MD5 eb057c63bffcf702e1b8d0f9e406b6e5 files/vsftpd.conf 3770
+MD5 a61f83e896d2058a22f9fb3d2b2b1b25 files/vsftpd.conf.d 294
+MD5 d2bbf1b4e07a4f1f51f313274eb2e320 files/vsftpd.init.d 974
+MD5 aaa55785aee7dd51daf75a72232693f9 files/vsftpd.pam 481
 MD5 e50b10a57c22f7b27de250b8b65038a0 files/vsftpd.xinetd 468
-MD5 3b7d7a76cbc4e8ca1754e7ffef193d09 files/vsftpd-1.2.1-gentoo.diff.bz2 2080
-MD5 5a140ccd0017f39fe3c63e6a29e1abcd files/ftpusers 365
+MD5 32951e2e5a1c743fa96533989167c54a files/vsftpd.xinetd.ipv6 488

diff --git a/net-ftp/vsftpd/vsftpd-1.0.1-r1.ebuild b/net-ftp/vsftpd/vsftpd-1.0.1-r1.ebuild
index f53dd8ea3cb6aca45afaba9290e4e03a3a8410e5..7eba122373630ccf5792ea3d0ecfbb10acaa9439 100644 (file)
--- a/net-ftp/vsftpd/vsftpd-1.0.1-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-1.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.0.1-r1.ebuild,v 1.10 2004/07/15 00:05:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.0.1-r1.ebuild,v 1.11 2005/01/17 16:03:04 jforman Exp $
 
 DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
 SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"

diff --git a/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild b/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild
index 2f018c2e4e7235551a5f3096a9303430c3c85ea8..3d0c2ce39b44d1ceae9825dec50de8260da489f4 100644 (file)
--- a/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild,v 1.8 2004/06/24 22:48:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.2.0-r1.ebuild,v 1.9 2005/01/17 16:03:04 jforman Exp $
 
 inherit flag-o-matic eutils
 

diff --git a/net-ftp/vsftpd/vsftpd-1.2.1.ebuild b/net-ftp/vsftpd/vsftpd-1.2.1.ebuild
index c1a8f7debec1d1cf39cea721e5c1921aee302de6..7eac6075e4dc0d8ceacc2ad7701a48e5c02de60c 100644 (file)
--- a/net-ftp/vsftpd/vsftpd-1.2.1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.2.1.ebuild,v 1.12 2004/06/24 22:48:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.2.1.ebuild,v 1.13 2005/01/17 16:03:04 jforman Exp $
 
 inherit flag-o-matic eutils
 

diff --git a/net-ftp/vsftpd/vsftpd-1.2.2.ebuild b/net-ftp/vsftpd/vsftpd-1.2.2.ebuild
index d8ced9dfc6cc5301b8df3341b18bbb5ce6a4d825..b61eb279ed3471f2c8753d8cec9bd44c634c127c 100644 (file)
--- a/net-ftp/vsftpd/vsftpd-1.2.2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-1.2.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.2.2.ebuild,v 1.9 2004/09/29 03:11:23 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.2.2.ebuild,v 1.10 2005/01/17 16:03:04 jforman Exp $
 
 inherit flag-o-matic eutils
 

diff --git a/net-ftp/vsftpd/vsftpd-2.0.1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.1.ebuild
index d7c26868ccc4974fa2e495d777273373545710d4..acc00c85a646baefdaa23ea7e96bfa58c0464555 100644 (file)
--- a/net-ftp/vsftpd/vsftpd-2.0.1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.1.ebuild,v 1.4 2004/09/24 23:32:59 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.1.ebuild,v 1.5 2005/01/17 16:03:04 jforman Exp $
 
 inherit flag-o-matic eutils
 
@@ -25,15 +25,14 @@ src_unpack() {
        epatch ${FILESDIR}/${PN}-2.0.1-gentoo.diff || die
        use tcpd && echo '#define VSF_BUILD_TCPWRAPPERS' >> builddefs.h
        use ssl && echo '#define VSF_BUILD_SSL' >> builddefs.h
+       if ! use pam; then
+               echo '#undef VSF_BUILD_PAM' >> builddefs.h
+       fi
+
 }
 
 src_compile() {
-       if use pam; then
-               emake CFLAGS="${CFLAGS} -DUSE_PAM" || die
-       else
-               emake CFLAGS="${CFLAGS}" \
-               LIBS='`./vsf_findlibs.sh | sed "/[/-]\<.*pam.*\>/d"`' || die
-       fi
+       echo "PAM support is DISABLED"
 }
 
 src_install() {