Fixed startup of pure-ftpd with openrc when pure-uploadscript should be

+  started as well (bug #366761)

Package-Manager: portage-2.2.0_alpha33/cvs/Linux x86_64

6 files changed, 199 insertions, 139 deletions

diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index f06526ea533f..a8bdba1efbb4 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-ftp/pure-ftpd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.117 2011/05/14 08:26:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.118 2011/05/16 14:54:53 polynomial-c Exp $
+
+*pure-ftpd-1.0.32-r1 (16 May 2011)
+
+  16 May 2011; Lars Wendler <polynomial-c@gentoo.org>
+  -pure-ftpd-1.0.30-r1.ebuild, -pure-ftpd-1.0.31.ebuild,
+  +pure-ftpd-1.0.32-r1.ebuild, +files/pure-ftpd.conf_d-3,
+  +files/pure-ftpd.rc11:
+  Fixed startup of pure-ftpd with openrc when pure-uploadscript should be
+  started as well. Thanks to Kilburn Abrahams for reporting this in bug
+  #366761. Improved readability of the init script a bit (requested by jer).
+  Removed old (vulnerable) versions.
 
   14 May 2011; Kacper Kowalik <xarthisius@gentoo.org> pure-ftpd-1.0.32.ebuild:
   ppc/ppc64 stable wrt #365751
diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest
index e57ea81edba3..aa792b597108 100644
--- a/net-ftp/pure-ftpd/Manifest
+++ b/net-ftp/pure-ftpd/Manifest
@@ -1,26 +1,33 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX pure-ftpd-1.0.28-pam.patch 564 RMD160 eb510f635babbe34943dee102999a8b835df55e7 SHA1 46fcf04194631cd1b4488a486a48884b80b188ac SHA256 21b340701ba18454cc55b7a719033c71d758960b02cc626ff60183a5dae50fc7
 AUX pure-ftpd.conf_d-2 3778 RMD160 4e7d6c5fffd56ee3b0dffc6e5873f3d854b9bfaa SHA1 631030ed9249101594c1cb08e549bf34c99c5105 SHA256 8e48df3365bd74a1d8fa7c394e035c69bf7953a70ccc417377c9c881097bddca
+AUX pure-ftpd.conf_d-3 3728 RMD160 b5ebccffeb17232819bf794348549d0400e930ae SHA1 5ae244dacc725d617444dd1712a22399f1f02cb7 SHA256 6b67379efa91a6168bd4cebee56ba09dfa77830a4843b25edb7a85f1bb88e5fa
 AUX pure-ftpd.rc10 2055 RMD160 125a410ddc5d63067b7f8c91f1babc7a349da1a3 SHA1 0f7d077b2531e8e9857d3baeeba8b67cc624e99c SHA256 72e8df706f2c856229617daae24dd98e522f11f3420eb515f4627244b63bde7f
+AUX pure-ftpd.rc11 2072 RMD160 dcdc4ce4e3820b0c5f7e86e14a1f2922ad72cd70 SHA1 c43860e7863ac9bc114e693ef4ad16afc10338b2 SHA256 87d3d74f67c3e76af00cb081b20f67fa996a280147ea3fe34140ffab2c801049
 AUX pure-ftpd.xinetd 247 RMD160 5789f98ffc48dcd5f67ad4777cbc70e158e89de6 SHA1 a698d0145612eb9503612ff2485f7dfcb6487bda SHA256 30e166051c7331c48ab1d948d6deecaa71130aaf3cfdc3ffb99124971b64f80c
 DIST pure-ftpd-1.0.29.tar.bz2 466867 RMD160 bcbff660f5ec34d39830a3ffd0594edae5745e79 SHA1 9bba0d6122066098273fde6db03b54825911c012 SHA256 b9217802d2674c0471fc43004565d4630e0938ca8530c3a1b73361d405259f5f
-DIST pure-ftpd-1.0.30.tar.bz2 475402 RMD160 137c38d491b311e826076a85589e0ce4f1b46826 SHA1 0b73b80f102f2b62f97e6c7de55fa3e1eba1feaa SHA256 9b85cf5f6290f6cbed18ede22862922a8701c691abee78b15e9aa40da63de0fe
-DIST pure-ftpd-1.0.31.tar.bz2 466831 RMD160 f9f26e2694a5f15bb90fe421b392b068710fe61d SHA1 a91bd38a868a3e7665821a051924589540a4d7fb SHA256 1d901a7dd3962ece9c68ced756c09cb17d17458adbfcdb89f65917df32d68932
 DIST pure-ftpd-1.0.32.tar.bz2 465149 RMD160 5aa43cfa2a944282667052981ebe2d4d36e4b8ef SHA1 589f5e35771f6b481d3b56b466282bd1f50da7c9 SHA256 f1b99a9b238c330a3efea03af2f15d56b2447e6028e3b68ce9a2d261c0d520a4
 EBUILD pure-ftpd-1.0.29-r1.ebuild 3713 RMD160 54cc89fff265c7e1a19f02e5843a01f19ff6bf8f SHA1 a1711891e305a6b9fdf2b755851915b6f4f2b175 SHA256 422ec6c7d817238ed65f5d02b3fff7d28469524c5e14e0aa1c1414936c89fc91
-EBUILD pure-ftpd-1.0.30-r1.ebuild 3915 RMD160 12c646b8ca2391715a51cb2ea2590b73a8f33da4 SHA1 633a92e2a68d95781a30615d57757581fee775a9 SHA256 2ade0a33d4544bdea49d90472e9dbfc4687838297598572cacc598bd6e331a08
-EBUILD pure-ftpd-1.0.31.ebuild 3983 RMD160 d7a688c355fa3267ca82b89cc539893ee4c58d74 SHA1 1f5e96e63666831b21af804768de3a6909738350 SHA256 5197a98f8671ebab38837465fd3b07c4a0e008ffb69858e4f88fde39ad5b9cf2
+EBUILD pure-ftpd-1.0.32-r1.ebuild 3986 RMD160 5b3549b8a7fada72e23a33bfebd9e21d278fb660 SHA1 7fe6567ed4e65306b3cc20dc137033b9f46793ec SHA256 b5701826fbb1a95d3052f3e3d9dd2d5465632c3c053d869df094d2634a721905
 EBUILD pure-ftpd-1.0.32.ebuild 3972 RMD160 e12ad29fd40a1a1064587c965316ffa46038ca20 SHA1 82c2741a239ccd099ff0b601089d486676aab228 SHA256 bd5b8b63340a0038d067f9a01e37ddd8a5dc4fbe0f593f19f5e4552404940ece
-MISC ChangeLog 18593 RMD160 56f575950b36a0465d1d074b0ec8a5f6ac917cba SHA1 1441dff24cc5d7ead5e936c16c56919817e399d3 SHA256 0d8e95c79717087ed30b1eac9b108b7f7a465ef9c1400f7de88b5ee242fcb89f
+MISC ChangeLog 19086 RMD160 f56d94f1197403c20bc42ad6686ec971a4a1db5d SHA1 3924a0e1663b14597567104963ccd2f859c6562f SHA256 836bd70c260e215a36f17549917562ad33f2183ee489e86c99c224daf2f1e893
 MISC metadata.xml 1184 RMD160 1e755f909e9b9e8cdc3e247fb64485f03cdc4167 SHA1 5a50f33ea3ca553f1f290a4ed6a731adcbb7770c SHA256 7fc78f63752fb89e449e2d922d7d29909006ca0eadf3e8ebe751a5527b28d99b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk3OPNYACgkQIiMqcbOVdxQVRAP/eWZJCb6pA5t/xyEhAModsT3E
-H8rEqOSYrPrifORk2KSInMvmcBCM7rvhpIWSJnHaA+r4Qq+ml+PMLFqENR9H5VTK
-5jNJdPfWuO6gylFMEs3EStbtZNz1MLyCjLrLmtJSbdDKDECM0WpbjOepWLxuaKCu
-GL3WLMBla4H2Uf/lv7w=
-=+Ma9
+iQIcBAEBCgAGBQJN0TrCAAoJEPiazRVxLXTFlvoQAKz9tfthpevKJEYy25EXVsCE
+voBxSI9aYri0G/LWhhqfpwHQb2K12bUueNVa6XSWsA/KYrYjt4Ra+WLltJdxy3BC
+fAtNQfjp2z839585IHYVvI9kDtqcXwpXfpVjgSR9pFKbFYw36r0PsVTYBpOuoJbJ
+LHbZpQaLFL+VsHCfXVUSyOoUr/pETcrxMR8cMtsZaQoc+n13Sdym+uAWpmemwVK3
+CHEia5n54ZkFoFP6qSmHrwOYWv7K9En9C1UyPsX5LQ51bf18J9VzGM3AkBUGvB4p
+Yg5fUEtCebRbQ/irCwfPdCv2LP3r6Xeu0Dtf8b/rneM1pCyw2B9q9xpnGBrh6cmh
+k0cX3RHqUz3GDa0TzSW1d5N0KEGkuWOuyqOFNU3mpV+XDFSbxkeC6PmohGXNk5AS
+Wd59JdIhAR3MQ87AGTJd9bUAu5/1vS4G8DwBAegWTp5pKgRbRFtOz25G0GpUbJmB
+ZfdiJBJABtE3YYjThI2pM3Tf1/ATbiuoMzPMq4R2NtAz8NJWhK8XcIeLlcgdX8n0
+6b5cPxPV4zg4YBSY30FkZIjWLDpEkcN7oRNYBl8WW8mTG8x/UrGAUD/v+BBISNNa
+BRFd3sQM4QKNCaA/UiQ1dokGIQgP5sDQclyhWj+K1RAzttpHilHpjFOWiPfWAS6p
+gJlJdjI8gXUYUpibZ7Kt
+=6qeZ
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3 b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3
new file mode 100644
index 000000000000..29b15a5a8928
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3
@@ -0,0 +1,90 @@
+# Config file for /etc/init.d/pure-ftpd
+##Comment variables out to disable its features, or change the values in it... ##
+
+## This variable must be uncommented in order for the server to start ##
+#IS_CONFIGURED="yes"
+
+## FTP Server,Port (separated by comma) ##
+## 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 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 ##
+MAX_CONN="-c 30"
+MAX_CONN_IP="-C 10"
+
+## Don't allow uploads if the partition is more full then this var ##
+DISK_FULL="-k 90%"
+
+## If your FTP server is behind a NAT box, uncomment this ##
+#USE_NAT="-N"
+
+## Authentication mechanisms (others are 'pam', ...) ##
+## Further infos can be found in the README file.
+AUTH="-l unix"
+
+## Change the maximum idle time (in minutes) ##
+## If this variable is not defined, it will default to 15 minutes.
+#TIMEOUT="-I <timeout>'"
+
+## 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>"
+
+## 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"
+
+## Misc. Others ##
+MISC_OTHER="-A -x -j -R -Z"
+
+#
+# Use these inside $MISC_OTHER
+# More can be found on "http://download.pureftpd.org/pub/pure-ftpd/doc/README"
+#
+# -A [ chroot() everyone, but root ]
+# -e [ Only allow anonymous users ]
+# -E [ Only allow authenticated users. Anonymous logins are prohibited. ]
+# -i [ Disallow upload for anonymous users, whatever directory perms are ]
+# -j [ If the home directory of a user doesn't exist, auto-create it ]
+# -M [ Allow anonymous users to create directories. ]
+# -R [ Disallow users (even non-anonymous ones) usage of the CHMOD command ]
+# -x [ In  normal  operation mode, authenticated users can read/write
+#	files beginning with a dot ('.'). Anonymous users can't, for security reasons
+#	(like changing banners or a forgotten .rhosts). When '-x' is used, authenticated
+#	users can download dot-files, but not overwrite/create  them,  even  if they own
+#	them. ]
+# -X [ This  flag  is  identical  to  the  previous one (writing
+#       dot-files is prohibited), but in addition, users can't even *read* files and
+#       directories beginning with a dot (like "cd .ssh"). ]
+# -D [ List files beginning with a dot ('.') even when the client doesn't
+#      append the '-a' option to the list command. A workaround for badly
+#      configured FTP clients. ]
+# -G [ Disallow renaming. ]
+# -d [ Send various debugging messages to the syslog. ONLY for DEBUG ]
+# -F <fortune file> [ Display a fortune cookie on login. Check the README file ]
+# -H [ By default, fully-qualified host names are logged. The '-H' flag avoids host names resolution. ]
+
+
+# Some filesystems don't like accesses being memory mapped. This happens for
+# example with ftpwho on JFFS2 filesystems (bug #330563). If you happen to 
+# have such a filesystem on /var set TMPFS_MOUNT to "true".
+TMPFS_MOUNT="false"
+
+# Special mount options (like nosuid or nodev) for the tmpfs mount can be added 
+# here. Several options must be separated by comma: "nodev,nosuid"
+#TMPFS_OPTS=""
+
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
new file mode 100644
index 000000000000..49ebf84fb961
--- /dev/null
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
@@ -0,0 +1,76 @@
+#!/sbin/runscript
+# Copyright 1999-2011 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.rc11,v 1.1 2011/05/16 14:54:53 polynomial-c Exp $
+
+ftpd_pidfile="/var/run/pure-ftpd.pid"
+script_pidfile="/var/run/pure-uploadscript.pid"
+ftpd_rundir="/var/lib/run/pure-ftpd"
+daemon="/usr/sbin/pure-ftpd"
+script_daemon="/usr/sbin/pure-uploadscript"
+
+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
+
+	FTPD_CONFIG="$SERVER $MAX_CONN $MAX_CONN_IP $DISK_FULL $USE_NAT $AUTH
+		     $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT"
+
+	if ${TMPFS_MOUNT:-false} && grep -q tmpfs /proc/filesystems ; then
+		[ -n "${TMPFS_OPTS}" ] && MOUNT_OPTS="-o ${TMPFS_OPTS}"
+		einfo "Mounting tmpfs on ${ftpd_rundir}"
+		mount ${MOUNT_OPTS} -t tmpfs tmpfs ${ftpd_rundir} \
+			|| eerror "Unable to mount tmpfs"
+	fi
+
+	WAIT="--wait 100"
+
+	UPSCRIPT=""
+	if [ -n "$UPLOADSCRIPT" ] ; then
+		UPSCRIPT="--uploadscript"
+	fi
+	ebegin "Starting Pure-FTPd"
+	start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} \
+		--make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \
+		-- ${FTPD_CONFIG//-B}
+	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 ${script_pidfile} \
+				 --exec ${script_daemon} --background ${WAIT} \
+				 -- -r $UPLOADSCRIPT
+			eend $?
+		fi
+	fi
+}
+
+stop() {
+	if [ -n "$UPLOADSCRIPT" ] ; then
+		ebegin "Stopping Pure-FTPd upload script"
+		start-stop-daemon --stop --retry 20 --quiet \
+			--pidfile ${script_pidfile}
+		eend $?
+	fi
+	ebegin "Stopping Pure-FTPd"
+	start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile}
+	eend $?
+
+	if ${TMPFS_MOUNT:-false} && mount | grep -q ${ftpd_rundir} ; then
+		umount ${ftpd_rundir} >/dev/null 2>&1
+	fi
+}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.30-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.30-r1.ebuild
deleted file mode 100644
index dd707792a502..000000000000
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.30-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2011 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.30-r1.ebuild,v 1.1 2011/04/22 12:04:38 polynomial-c Exp $
-
-EAPI=2
-inherit eutils confutils flag-o-matic
-
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
-
-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 resolveids selinux ssl sysquota vchroot xinetd"
-
-DEPEND="caps? ( sys-libs/libcap )
-		charconv? ( virtual/libiconv )
-		ldap? ( >=net-nds/openldap-2.0.25 )
-		mysql? ( virtual/mysql )
-		pam? ( virtual/pam )
-		postgres? ( dev-db/postgresql-base )
-		ssl? ( >=dev-libs/openssl-0.9.6g )
-		sysquota? ( sys-fs/quota[-rpc] )
-		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_with		"sysquotas"		"sysquota"		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
-	use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS
-
-	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-2" pure-ftpd
-
-	newinitd "${FILESDIR}/pure-ftpd.rc10" pure-ftpd
-
-	dodir /var/lib/run/${PN}
-
-	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
-}
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.31.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r1.ebuild
index 66df7310d9ff..6ab4b14c047b 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.31.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.31.ebuild,v 1.1 2011/04/27 11:54:42 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.32-r1.ebuild,v 1.1 2011/05/16 14:54:53 polynomial-c Exp $
 
 EAPI=2
 inherit eutils confutils flag-o-matic
@@ -90,9 +90,9 @@ src_install() {
 
 	dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS
 
-	newconfd "${FILESDIR}/pure-ftpd.conf_d-2" pure-ftpd
+	newconfd "${FILESDIR}/pure-ftpd.conf_d-3" pure-ftpd
 
-	newinitd "${FILESDIR}/pure-ftpd.rc10" pure-ftpd
+	newinitd "${FILESDIR}/pure-ftpd.rc11" pure-ftpd
 
 	dodir /var/lib/run/${PN}