Version bump, use pid variables in init script by Polynomial-C in bug #296864

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

4 files changed, 139 insertions, 8 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 91f69a6e6b5e..3738447ee704 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.82 2009/11/23 12:59:07 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.83 2009/12/14 17:31:26 voyageur Exp $
+
+*pure-ftpd-1.0.27 (14 Dec 2009)
+
+  14 Dec 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +pure-ftpd-1.0.27.ebuild, files/pure-ftpd.rc7:
+  Version bump, use pid variables in init script by Polynomial-C in bug
+  #296864
 
 *pure-ftpd-1.0.26 (23 Nov 2009)
 
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index e16d9d44d6fd..cda62a0ff6d1 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -3,13 +3,15 @@ AUX pure-ftpd-1.0.22-fix_rest_with_throttling.patch 2142 RMD160 fcfb45d6fbd25636
 AUX pure-ftpd-1.0.22-pam.patch 568 RMD160 510901acb42629a948124bc2e4618b073c6de746 SHA1 fcfc8662096d6bf62626f508117f1d3dc9327353 SHA256 37c4dba7711769da29504840cfdddc5acf8fd970117f8b26bc4caeec4d00e58b
 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 1474 RMD160 864e674dc7c9a19352381a60f28a37aba93ee751 SHA1 dd1294c283bff74f79099647b88366f33d1b55dc SHA256 53d360aec28694de4bc7fdba1dc8cdb3a77a16d511abe21fcf471c3980aebf09
+AUX pure-ftpd.rc7 1514 RMD160 c520c593044158d194e4b1a78bf4162bd442fb95 SHA1 36026f488f5b940c4157a0cf73286c2c67a4d66f SHA256 0de82e1ba490dc874d6cfb52c074f51569fdd7775a2095e2f524aafd0691ef46
 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
 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
-MISC ChangeLog 12384 RMD160 1da7d216c0fe85143e104bdfb82448dc393b4b38 SHA1 7e763389456b64e5b1670321f701b53378ef6b9e SHA256 02cf80b1f9958a40f0886c8ec990f8028a4831bee195a4e5f787a00d15f1678d
+EBUILD pure-ftpd-1.0.27.ebuild 3732 RMD160 ece414320d8e4a03f8e8929f3910c2299e7fbca6 SHA1 b31f3b25a79d8b3f09efa4566f35d6721624007c SHA256 c41b376a0855eccf4441667e8cea7fa298549c3f840258f3dda17049ba761406
+MISC ChangeLog 12604 RMD160 78c565ea6df58bf9bac3933e64663daafdcb86d8 SHA1 b73e164182768682af4f34f76ce53d123e9f6f89 SHA256 facb050d09288f07d623c901de160decf84c768ee5cc1b6ff6d5c78eb675617b
 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 84bcf21e0ebf..34918951f5f1 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc7
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc7
@@ -1,7 +1,10 @@
 #!/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.1 2009/11/23 12:59:07 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc7,v 1.2 2009/12/14 17:31:26 voyageur Exp $
+
+ftpd_pidifle="/var/run/pure-ftpd.pid"
+script_pidfile="/var/run/pure-uploadscript.pid"
 
 depend() {
 	need net
@@ -23,7 +26,7 @@ start() {
 		OKNODO="--oknodo"
 	fi
 	ebegin "Starting Pure-FTPd"
-	start-stop-daemon --start --quiet --pidfile /var/run/pure-ftpd.pid $OKNODO --exec /usr/sbin/pure-ftpd -- --pidfile /var/run/pure-ftpd.pid $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 -- --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"
@@ -31,7 +34,7 @@ start() {
 		eend $result
 		if [ -n "$UPLOADSCRIPT" ] ; then
 			ebegin "Starting Pure-FTPd upload script"
-			start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/pure-uploadscript.pid --exec /usr/sbin/pure-uploadscript -- -B -r $UPLOADSCRIPT
+			start-stop-daemon --start --quiet --make-pidfile --pidfile ${script_pidfile} --exec /usr/sbin/pure-uploadscript -- -B -r $UPLOADSCRIPT
 			eend $?
 		fi
 	fi
@@ -39,11 +42,11 @@ start() {
 
 stop() {
 	ebegin "Stopping Pure-FTPd"
-	start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/pure-ftpd.pid
+	start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
 	eend $?
 	if [ -n "$UPLOADSCRIPT" ] ; then
 		ebegin "Stopping Pure-FTPd upload script"
-		start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/pure-uploadscript.pid
+		start-stop-daemon --stop --retry 20 --quiet --pidfile ${script_pidfile}
 		eend $?
 	fi
 }
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.27.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.27.ebuild
new file mode 100644
index 000000000000..57bab6ec3d6f
--- /dev/null
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.27.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2009 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.27.ebuild,v 1.1 2009/12/14 17:31:26 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.22-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
+}