Version bump by Polynomial-C, bug #310177

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 132 insertions, 5 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 41bb495fc5aa..4edba360d638 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.85 2010/02/17 12:34:58 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.86 2010/03/19 10:16:32 voyageur Exp $
+
+*pure-ftpd-1.0.29 (19 Mar 2010)
+
+  19 Mar 2010; Bernard Cafarelli <voyageur@gentoo.org>
+  +pure-ftpd-1.0.29.ebuild, files/pure-ftpd.rc7:
+  Version bump by Polynomial-C, bug #310177
 
 *pure-ftpd-1.0.28 (17 Feb 2010)
 
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index 6f000ac44100..a13ddb7c4bb2 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -4,17 +4,19 @@ AUX pure-ftpd-1.0.22-pam.patch 568 RMD160 510901acb42629a948124bc2e4618b073c6de7
 AUX pure-ftpd-1.0.28-pam.patch 564 RMD160 eb510f635babbe34943dee102999a8b835df55e7 SHA1 46fcf04194631cd1b4488a486a48884b80b188ac SHA256 21b340701ba18454cc55b7a719033c71d758960b02cc626ff60183a5dae50fc7
 AUX pure-ftpd.conf_d 3378 RMD160 82d5d319b35e1262e8d72cff46c328429e3e3bce SHA1 93c4f65ce1592ad1ccbe8e04250c4cc1c9cdb5f2 SHA256 4361690c4217fd1cdae0c050015629ce6e74046446def2c7d646020d0682a579
 AUX pure-ftpd.rc6 1455 RMD160 5bb57d4e162e08d113da9c349cf57480244948f7 SHA1 54b0abe7e27f10bdec9a22917e57f5ed625ebca3 SHA256 d554e4bab0c11a23c19e8fac9070c2550ca461dce72047745ca9f3fcf2660770
-AUX pure-ftpd.rc7 1514 RMD160 ecf2faa716c38a7cd1961f63d43cb9ac5d90f9fd SHA1 10657af7ca13f0250999c3481d4a323a30de4747 SHA256 87e81e73d948c4d6cb6c1a6bf2d357ad309bf9ed55e478c43be6b51bc07770fd
+AUX pure-ftpd.rc7 1524 RMD160 c139d58ead26d313cb35e588918bdda24154aaf5 SHA1 725a99b2e4b28c614e7034126f37cb06d22d3a6a SHA256 01d8c4dd8380402c7441f8286d1342a59205f724196140ff19f02a9cf897b684
 AUX pure-ftpd.xinetd 247 RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 SHA1 a698d0145612eb9503612ff2485f7dfcb6487bda SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c
 DIST pure-ftpd-1.0.21.tar.bz2 476117 RMD160 1ad61243c1f8a8d1055ee839eec0d9117681cf20 SHA1 1405ff2b9b9c3616c4e390eb99779884173a3347 SHA256 f2f03e5bb42325b470b88e8ee7e6014226518b620beb5dd8cf1f07bcdb64559c
 DIST pure-ftpd-1.0.22.tar.bz2 497237 RMD160 e7715813f66a561024911b3f8064d1f067969e7f SHA1 38b88f9645cef6c1b6f20a2f7e73ef9289e3314b SHA256 64659df4da59aa2ef5f455674ae1c3b4b56b4649bac1cac582b895942d0059cf
 DIST pure-ftpd-1.0.26.tar.bz2 471836 RMD160 b53b8eaebeed26a199adfb3254f5403c0ce76ab1 SHA1 6b224a5e24f334bbae3c2b8951ab8f677ebe28de SHA256 906e05407718abe3ba124f662ba052c0c2486bd942f97c7f620ec51dbde24cdb
 DIST pure-ftpd-1.0.27.tar.bz2 472818 RMD160 2e6f2501e1d6da6c5caf32b802e7c2d481e2e6ee SHA1 f4c3fcc68bea3b2dad9ff76624e23f072acd9c2e SHA256 d389d10bb3ab62b650dbae9aa4015083ee3975697de1ef6b99092d7d14381118
 DIST pure-ftpd-1.0.28.tar.bz2 465887 RMD160 1a75ea239129de1f2bcd52a34d1b379928e790f6 SHA1 199580574257f144bc958d05c166c23066bfed3c SHA256 1c8e0f4ddac3731ecb2432631d7af342b3800499d7ea7f8442c3e79e3e4c27d8
+DIST pure-ftpd-1.0.29.tar.bz2 466867 RMD160 bcbff660f5ec34d39830a3ffd0594edae5745e79 SHA1 9bba0d6122066098273fde6db03b54825911c012 SHA256 b9217802d2674c0471fc43004565d4630e0938ca8530c3a1b73361d405259f5f
 EBUILD pure-ftpd-1.0.21-r1.ebuild 3761 RMD160 78c15227586a89745901fd77bbb147c4f5716fba SHA1 034df50ad5f5eeaa729b78c6c45efdeeeab1ab55 SHA256 44b581e4633283fd356a58050ecf464bcbf34c9e9875cc670f4cb7afc3478b54
 EBUILD pure-ftpd-1.0.22-r1.ebuild 3785 RMD160 c274c99c5e297e62b61b88b7ddc1e15eafdb7f88 SHA1 55db604898f6cf75a15d4c5c1afde595475a6aef SHA256 2de0386861314051e6843be9918170d96b57e8f4b0b2f00504d764e1e5a4af0a
 EBUILD pure-ftpd-1.0.26.ebuild 3732 RMD160 5f7ef7bd208bcd9972ee0b1d7850350da09ef37c SHA1 4ad2381df161fa784827511feb24d1e9581ed973 SHA256 3d66261f2124dfb03151101a5b17aa5346d3ab1eaca31fd1f9daf8c9bb53893a
 EBUILD pure-ftpd-1.0.27-r1.ebuild 3735 RMD160 c5a373298f2db6c2def76f296b6873f5de5be53e SHA1 06362b7de6d0ee13cded041f7ede48905c133c63 SHA256 de9fbd982f62aca7457a8a82144cf63dbdc740658554fb44d812c38dd2be8eec
 EBUILD pure-ftpd-1.0.28.ebuild 3732 RMD160 1f96fb4b976261b9a5a49168b2597247b5a18c12 SHA1 c8630b24e77427cd08f555bb9844cf80dc0fcc53 SHA256 1377a7e14fc1aca22b86ff06258e6b6b6a20e3476c9db7812882077db5a1dbde
-MISC ChangeLog 13053 RMD160 331656cd56e9bf42caf54a675ebf082f21fac24b SHA1 80cb4a2bc66d042ad860e95412bae4e13fc873bc SHA256 73704e92261f34d94455eaf7cef9464b015e5761ef15ce3163e201b81d717863
+EBUILD pure-ftpd-1.0.29.ebuild 3732 RMD160 0e487451c3c05e9d8e911fa302e0c0437db84e55 SHA1 2c208527674c6a89257bc5835f0d133c81983948 SHA256 e35c40b7276d8f62a833d616ab0f9239988154c5b0ef6f4894477670a6826d35
+MISC ChangeLog 13235 RMD160 90486531ba1c69fff1dfb15ba686c8199dea94d1 SHA1 321e6258f99ee2df517a9d508f60a42fc3765a9a SHA256 21edd8eef843180759409dc71a31aa117e7fd161dae38079aef81802d15c316d
 MISC metadata.xml 1048 RMD160 20c962a5b9b6a0fe6e75346847cc67a079e66870 SHA1 6423ca1d2067eeb0f009b7d8b0a7a35c94ff14b7 SHA256 1d0113e0866ac5d9c4df3a690d141881ad75baf0ad394959025c798bf3af4be0
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc7 b/net-ftp/pure-ftpd/files/pure-ftpd.rc7
index 7df446db85ef..d672e52305ae 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc7
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc7
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.3 2009/12/14 22:10:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.4 2010/03/19 10:16:34 voyageur Exp $
 
 ftpd_pidfile="/var/run/pure-ftpd.pid"
 script_pidfile="/var/run/pure-uploadscript.pid"
@@ -26,7 +26,7 @@ start() {
 		OKNODO="--oknodo"
 	fi
 	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
+	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} $OKNODO --exec /usr/sbin/pure-ftpd --wait 50 -- --pidfile ${ftpd_pidfile} $SERVER $MAX_CONN $MAX_CONN_IP $DAEMON $DISK_FULL $USE_NAT $AUTH $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT
 	result=$?
 	if [ $result -ne 0 ] ; then
 		eend 1 "Could not launch Pure-FTPd"
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild
new file mode 100644
index 000000000000..b02988ae13e6
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.29.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2010 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.29.ebuild,v 1.1 2010/03/19 10:16:32 voyageur Exp $
+
+EAPI=2
+inherit eutils confutils flag-o-matic
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+DESCRIPTION="Fast, production-quality, standard-conformant FTP server."
+HOMEPAGE="http://www.pureftpd.org/"
+SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+
+IUSE="anondel anonperm anonren anonres caps charconv ldap mysql noiplog pam paranoidmsg postgres selinux ssl vchroot xinetd"
+
+DEPEND="caps? ( sys-libs/libcap )
+		charconv? ( virtual/libiconv )
+		ldap? ( >=net-nds/openldap-2.0.25 )
+		mysql? ( virtual/mysql )
+		pam? ( virtual/pam )
+		postgres? ( virtual/postgresql-base )
+		ssl? ( >=dev-libs/openssl-0.9.6g )
+		xinetd? ( virtual/inetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		selinux? ( sec-policy/selinux-ftpd )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.0.28-pam.patch
+}
+
+src_configure() {
+	# 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" || die "sed failed"
+
+	local my_conf=""
+
+	# Let's configure the USE-enabled stuff
+	enable_extension_without	"capabilities"	"caps"
+	enable_extension_with		"rfc2640"		"charconv"		0
+	enable_extension_with		"ldap"			"ldap"			0
+	enable_extension_with		"mysql"			"mysql"			0
+	enable_extension_with		"pam"			"pam"			0
+	enable_extension_with		"paranoidmsg"	"paranoidmsg"	0
+	enable_extension_with		"pgsql"			"postgres"		0
+	enable_extension_with		"tls"			"ssl"			0
+	enable_extension_with		"virtualchroot"	"vchroot"		0
+	enable_extension_without	"inetd"			"xinetd"
+
+	# noiplog is a negative flag, we don't want that enabled by default,
+	# so we handle it manually, as confutils can't do that
+	use noiplog && my_conf="${my_conf} --without-iplogging"
+
+	# Those features are only configurable like this, see bug #179375.
+	use anondel && append-cppflags -DANON_CAN_DELETE
+	use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS
+	use anonren && append-cppflags -DANON_CAN_RENAME
+	use anonres && append-cppflags -DANON_CAN_RESUME
+
+	econf \
+		--with-altlog \
+		--with-cookie \
+		--with-diraliases \
+		--with-extauth \
+		--with-ftpwho \
+		--with-language=${PUREFTPD_LANG:=english} \
+		--with-peruserlimits \
+		--with-privsep \
+		--with-puredb \
+		--with-quotas \
+		--with-ratios \
+		--with-throttling \
+		--with-uploadscript \
+		--with-virtualhosts \
+		--enable-largefile \
+		${my_conf} || die "econf failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
+
+	newconfd "${FILESDIR}/pure-ftpd.conf_d" pure-ftpd
+
+	newinitd "${FILESDIR}/pure-ftpd.rc7" pure-ftpd
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		doins pureftpd.schema
+		insinto /etc/openldap
+		insopts -m 0600
+		doins pureftpd-ldap.conf
+	fi
+}
+
+pkg_postinst() {
+	elog
+	elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!"
+	elog
+	ewarn "It's *really* important to read the README provided with Pure-FTPd!"
+	ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info"
+	ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info."
+	ewarn
+	if use charconv ; then
+		ewarn "Charset conversion is an *experimental* feature!"
+		ewarn "Remember to set a valid charset for your filesystem in the configuration!"
+	fi
+}