General ebuild cleanup. Fix bugs.

Package-Manager: portage-2.1.2_pre1

4 files changed, 88 insertions, 26 deletions

diff --git a/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.21-r1 b/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.21-r1
new file mode 100644
index 000000000000..400607e696eb
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/digest-pure-ftpd-1.0.21-r1
@@ -0,0 +1,3 @@
+MD5 ca8a8dbec0cd9c8ea92fc4c37ea9c410 pure-ftpd-1.0.21.tar.bz2 476117
+RMD160 1ad61243c1f8a8d1055ee839eec0d9117681cf20 pure-ftpd-1.0.21.tar.bz2 476117
+SHA256 f2f03e5bb42325b470b88e8ee7e6014226518b620beb5dd8cf1f07bcdb64559c pure-ftpd-1.0.21.tar.bz2 476117
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
index 7b4b76161f65..af445062df61 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d
@@ -5,17 +5,17 @@
 #IS_CONFIGURED="yes"
 
 ## FTP Server,Port (separated by comma) ##
-## If you prefer host names over IP addresses, it's your choice :
+## 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"
+## Using an invalid IP will result in the server not starting,
+## but reporting a correct start!
+## SERVER="-S 192.168.0.1,21"
+## By default binds to all available IPs.
 SERVER="-S 21"
 
-## Number of simultaneous connections in total, and per ip ##
+## Number of simultaneous connections in total, and per IP ##
 MAX_CONN="-c 30"
 MAX_CONN_IP="-C 10"
 
@@ -28,23 +28,35 @@ DISK_FULL="-k 90%"
 ## If your FTP server is behind a NAT box, uncomment this ##
 #USE_NAT="-N"
 
-## Authentication (others are 'pam', ...)##
-## Further infos in the README file.
+## Authentication mechanisms (others are 'pam', ...) ##
+## Further infos can be found in the README file.
 AUTH="-l unix"
 
-## Change the maximum idle time. (in minutes. default 15)
+## Change the maximum idle time (in minutes) ##
+## If this variable is not defined, it will default to 15 minutes.
 #TIMEOUT="-I <timeout>'"
 
-## Use that facility for syslog logging. It defaults to 'ftp'
-## Logging can be disabled with '-f none' .
-#LOG="-f facility"
+## Facility used for syslog logging ##
+## If this variable is not defined, it will default to the 'ftp' facility.
+## Logging can be disabled with '-f none'.
+#LOG="-f <facility>"
+
+## Charset conversion support *experimental* ##
+## Only works if USE "charconv" is enabled (only Pure-FTPd >=1.0.21).
+## Set the charset of the filesystem.
+# CHARCONV="--fscharset <charset>"
 
 ## Misc. Others ##
-MISC_OTHER="-A -x -j -R -B"
+MISC_OTHER="-A -x -j -R -B -Z"
+
+## If you want to process each file uploaded through Pure-FTPd, enter the name
+## of the script that should process the files below.
+## man pure-uploadscript to learn more about how to write this script.
+# UPLOADSCRIPT="/path/to/uploadscript"
 
 #
 # Use these inside $MISC_OTHER
-# More can be found on "http://pureftpd.sourceforge.net/README"
+# More can be found on "http://download.pureftpd.org/pub/pure-ftpd/doc/README"
 #
 # -A [ chroot() everyone, but root ]
 # -e [ Only allow anonymous users ]
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc6 b/net-ftp/pure-ftpd/files/pure-ftpd.rc6
new file mode 100644
index 000000000000..86bcae35b2ff
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc6
@@ -0,0 +1,47 @@
+#!/sbin/runscript
+# Copyright 1999-2004 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.rc6,v 1.10 2006/09/23 23:12:14 chtekk Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [ -z "$IS_CONFIGURED" ] ; then
+		eerror "You need to setup /etc/conf.d/pure-ftpd first!"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+	UPSCRIPT=""
+	if [ -n "$UPLOADSCRIPT" ] ; then
+		UPSCRIPT="--uploadscript"
+	fi
+	ebegin "Starting Pure-FTPd"
+	start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/pure-ftpd.pid --exec /usr/sbin/pure-ftpd -- $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"
+	else
+		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
+			eend $?
+		fi
+	fi
+}
+
+stop() {
+	ebegin "Stopping Pure-FTPd"
+	start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/pure-ftpd.pid
+	eend $?
+	if [ -n "$UPLOADSCRIPT" ] ; then
+		ebegin "Stopping Pure-FTPd upload script"
+		start-stop-daemon --stop --retry 20 --quiet --pidfile /var/run/pure-uploadscript.pid
+		eend $?
+	fi
+}
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.xinetd b/net-ftp/pure-ftpd/files/pure-ftpd.xinetd
index 389150f19f2e..11022e6fde8d 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.xinetd
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.xinetd
@@ -1,13 +1,13 @@
-# default: off
-# description: Pure-FTPd service example config.
-
-service ftp 
-{ 
-    socket_type = stream 
-    server = /usr/sbin/pure-ftpd
-    server_args = -s -a 42
-    protocol = tcp 
-    user = root 
-    wait = no
-    disable = yes
+#
+# Pure-FTPd FTP daemon - http://www.pureftpd.org
+#
+service ftp
+{
+       socket_type	= stream
+       wait		= no
+       user		= root
+       server		= /usr/sbin/pure-ftpd
+       server_args	= -s -a 42
+       protocol		= tcp
+       disable		= yes
 }