sec update

(Portage version: 2.0.51-r15)

11 files changed, 129 insertions, 27 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 29320d4334ab..b0ddcf6a425a 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/pure-ftpd
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.41 2004/12/29 03:09:43 ciaranm Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.42 2005/02/02 19:01:54 humpback Exp $
+
+*pure-ftpd-1.0.20-r1 (02 Feb 2005)
+
+  02 Feb 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  files/pure-ftpd.conf_d, +pure-ftpd-1.0.20-r1.ebuild:
+  Adding version to solve sec bug #80458 and a warning to the conf file about
+  bug #75861.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 21516ac36726..8f09715f2380 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,20 +1,22 @@
-MD5 5f2eb27cbe3d7ccf25038cac9478899d pure-ftpd-1.0.16b.ebuild 2242
 MD5 9f102667ab0e5676bf89e8ec347eac17 ChangeLog 6145
-MD5 64b35adffe441de849b0997a762a84f7 pure-ftpd-1.0.20.ebuild 2597
+MD5 67d38509ecd6a60f600f15bd875bf8cc metadata.xml 446
+MD5 5f2eb27cbe3d7ccf25038cac9478899d pure-ftpd-1.0.16b.ebuild 2242
+MD5 0e9a7416fd0d7f5c82850c7814a2b36e pure-ftpd-1.0.16c.ebuild 2247
 MD5 f0f63cfcf24a058f13329e08b299bdf7 pure-ftpd-1.0.17a.ebuild 2254
 MD5 eb817063f1ab88f67eacb2eb42366e25 pure-ftpd-1.0.18-r1.ebuild 2347
 MD5 8833765ab4ada569c253196e5dea5c03 pure-ftpd-1.0.18.ebuild 2308
-MD5 67d38509ecd6a60f600f15bd875bf8cc metadata.xml 446
-MD5 0e9a7416fd0d7f5c82850c7814a2b36e pure-ftpd-1.0.16c.ebuild 2247
-MD5 d774a3f199df590cbbaa83ac80dfa93b files/digest-pure-ftpd-1.0.18-r1 69
+MD5 d234aafaf08803f50a8d06899097c992 pure-ftpd-1.0.20-r1.ebuild 2703
+MD5 64b35adffe441de849b0997a762a84f7 pure-ftpd-1.0.20.ebuild 2597
 MD5 0e2de54a63d8f1c4a44d15f95e38b044 files/digest-pure-ftpd-1.0.16b 70
-MD5 d774a3f199df590cbbaa83ac80dfa93b files/digest-pure-ftpd-1.0.18 69
+MD5 f1a1d4817df4539dc199812979aac307 files/digest-pure-ftpd-1.0.16c 70
 MD5 48f295e6b7a19f3b4da8388a21e2e435 files/digest-pure-ftpd-1.0.17a 70
+MD5 d774a3f199df590cbbaa83ac80dfa93b files/digest-pure-ftpd-1.0.18 69
+MD5 d774a3f199df590cbbaa83ac80dfa93b files/digest-pure-ftpd-1.0.18-r1 69
 MD5 0c2b784d8fe62db6dae7e77e6ac5a602 files/digest-pure-ftpd-1.0.20 69
-MD5 6950e43cd48fea12490706463e0a6f9b files/pure-ftpd.conf_d 2287
-MD5 86b7638f0ed01530fff30204ba6b5ce7 files/pure-ftpd.xinetd 238
-MD5 db2ba34b2491a9fb5042f78c029f6386 files/pure-ftpd.rc6-r1 741
-MD5 2d2cca1b2cb50d34fc4db296d0e0c864 files/pure-ftpd.rc6 694
-MD5 f2a93e08e2a874ad4776e24ab3e0d9a7 files/pure-ftpd-1.0.18-fcntl.patch 1220
-MD5 f1a1d4817df4539dc199812979aac307 files/digest-pure-ftpd-1.0.16c 70
+MD5 0c2b784d8fe62db6dae7e77e6ac5a602 files/digest-pure-ftpd-1.0.20-r1 69
 MD5 458b5d7567f55f4257ea1a6bfe3ff150 files/ftpusers 177
+MD5 f2a93e08e2a874ad4776e24ab3e0d9a7 files/pure-ftpd-1.0.18-fcntl.patch 1220
+MD5 303a42dff84f78e2164a41361ea39428 files/pure-ftpd.conf_d 2290
+MD5 2d2cca1b2cb50d34fc4db296d0e0c864 files/pure-ftpd.rc6 694
+MD5 db2ba34b2491a9fb5042f78c029f6386 files/pure-ftpd.rc6-r1 741
+MD5 86b7638f0ed01530fff30204ba6b5ce7 files/pure-ftpd.xinetd 238
diff --git a/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.20-r1 b/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.20-r1
new file mode 100644
index 000000000000..4336bc9e524f
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.20-r1
@@ -0,0 +1 @@
+MD5 e928e9e15adf6b52bfe6183fdad20144 pure-ftpd-1.0.20.tar.bz2 470915
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
index 6f8c7d098df3..6b53427a75da 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
@@ -8,6 +8,10 @@
 ## If you prefer host names over IP addresses, it's your choice :
 ## SERVER="-S ftp.rtchat.com,21"
 ## IPv6 addresses are supported.
+## !!! WARNING !!!
+## Using an invalid IP will result in server not starting and reporting
+## a good start. Work is being done to solve that in:
+## http://bugs.gentoo.org/show_bug.cgi?id=75861
 SERVER="-S 192.168.0.1,21"
 
 ## Number of simultaneous connections in total, and per ip ##
@@ -35,7 +39,7 @@ AUTH="-l unix"
 #LOG="-f facility"
 
 ## Misc. Others ##
-MISC_OTHER="-A -x -j -R"
+MISC_OTHER="-A -x -j -R -B"
 
 #
 # Use these inside $MISC_OTHER
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.16b.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.16b.ebuild
index 68f12e8a7c5b..0cd4ff062825 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.16b.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.16b.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/pure-ftpd/pure-ftpd-1.0.16b.ebuild,v 1.7 2004/07/01 22:16:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.16b.ebuild,v 1.8 2005/02/02 19:01:54 humpback Exp $
 
 IUSE="pam mysql postgres ldap ssl"
 
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.16c.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.16c.ebuild
index aa72f41dcc33..8f2d03e79089 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.16c.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.16c.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/pure-ftpd/pure-ftpd-1.0.16c.ebuild,v 1.6 2004/07/01 22:16:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.16c.ebuild,v 1.7 2005/02/02 19:01:54 humpback Exp $
 
 IUSE="pam mysql postgres ldap ssl"
 
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.17a.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.17a.ebuild
index bf4863475987..057634c2e2f1 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.17a.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.17a.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/pure-ftpd/pure-ftpd-1.0.17a.ebuild,v 1.6 2004/07/01 22:16:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.17a.ebuild,v 1.7 2005/02/02 19:01:54 humpback Exp $
 
 IUSE="pam mysql postgres ldap ssl"
 
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.18-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.18-r1.ebuild
index df9f89634e35..d21b7d34cca2 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.18-r1.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.18-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/pure-ftpd/pure-ftpd-1.0.18-r1.ebuild,v 1.10 2004/07/15 18:15:21 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.18-r1.ebuild,v 1.11 2005/02/02 19:01:54 humpback Exp $
 
 inherit eutils
 
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.18.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.18.ebuild
index 1d116bbf7679..ccaca2de97c8 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.18.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.18.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/pure-ftpd/pure-ftpd-1.0.18.ebuild,v 1.7 2004/07/01 22:16:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.18.ebuild,v 1.8 2005/02/02 19:01:54 humpback Exp $
 
 IUSE="pam mysql postgres ldap ssl"
 
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild
new file mode 100644
index 000000000000..73b3cdcb8e33
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.20-r1.ebuild,v 1.1 2005/02/02 19:01:54 humpback Exp $
+
+inherit eutils
+
+DESCRIPTION="fast, production-quality, standard-conformant FTP server"
+HOMEPAGE="http://www.pureftpd.org/"
+SRC_URI="ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+IUSE="pam mysql postgres ldap ssl caps vchroot"
+
+DEPEND="virtual/libc
+	pam? ( >=sys-libs/pam-0.75 )
+	mysql? ( >=dev-db/mysql-3* )
+	postgres? ( >=dev-db/postgresql-7.2.2 )
+	ldap? ( >=net-nds/openldap-2.0.25 )
+	ssl? ( >=dev-libs/openssl-0.9.6g )"
+
+src_compile() {
+	local myconf="--with-privsep"
+
+	use pam && myconf="${myconf} --with-pam"
+	use ldap && myconf="${myconf} --with-ldap"
+	use mysql && myconf="${myconf} --with-mysql"
+	use postgres && myconf="${myconf} --with-pgsql"
+	use ssl && myconf="${myconf} --with-tls"
+	use caps && myconf="${myconf} --with-capabilities"
+	!(use caps) && myconf="${myconf} --without-capabilities"
+	use vchroot && myconf="${myconf} --with-virtualchroot"
+	#!(use vchroot) && myconf="${myconf} --without-virtualchroot"
+
+	# adjust max user length to something more appropriate
+	# for virtual hosts.  See bug #62472 for details.
+	sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" -i ${S}/src/ftpd.h
+
+	econf \
+		--with-altlog --with-extauth \
+		--with-puredb --with-cookie \
+		--with-throttling --with-ratios \
+		--with-quotas --with-ftpwho \
+		--with-uploadscript --with-virtualhosts \
+		--with-diraliases --with-peruserlimits \
+		--with-largefile \
+		${myconf} || die "econf failed"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	einstall || die
+
+	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
+
+	use pam && cp ${FILESDIR}/ftpusers ${D}/etc/ftpusers
+	use pam && insinto /etc/pam.d && doins pam/pure-ftpd
+
+	dodir /etc/{conf.d,init.d}
+
+	cp ${FILESDIR}/pure-ftpd.conf_d ${D}/etc/conf.d/pure-ftpd
+
+	exeopts -m 0744
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/pure-ftpd.rc6-r1 pure-ftpd
+
+	insopts -m 0644
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/pure-ftpd.xinetd pure-ftpd
+
+	if use ldap ; then
+		dodir /etc/openldap/schema
+		insinto /etc/openldap/schema
+		doins pureftpd.schema
+		insinto /etc/openldap
+		doins pureftpd-ldap.conf
+	fi
+}
+
+pkg_postinst() {
+	einfo "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file."
+	echo
+	ewarn "It's *really* important to read the README provided with Pure-FTPd."
+	ewarn "Check out - http://www.pureftpd.org/README"
+	ewarn "And for SSL/TLS help - http://www.pureftpd.org/README.TLS"
+}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.20.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.20.ebuild
index f1354a936f95..e4b20d0aeadf 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.20.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.20.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/pure-ftpd/pure-ftpd-1.0.20.ebuild,v 1.4 2004/09/17 23:45:42 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.20.ebuild,v 1.5 2005/02/02 19:01:54 humpback Exp $
 
 inherit eutils