summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/pure-ftpd/ChangeLog8
-rw-r--r--net-ftp/pure-ftpd/files/pure-ftpd.rc118
-rw-r--r--net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild10
3 files changed, 15 insertions, 11 deletions
diff --git a/net-ftp/pure-ftpd/ChangeLog b/net-ftp/pure-ftpd/ChangeLog
index 1c3c98fbb35d..f7f43f431dea 100644
--- a/net-ftp/pure-ftpd/ChangeLog
+++ b/net-ftp/pure-ftpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/pure-ftpd
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.148 2012/07/30 07:38:03 polynomial-c Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/ChangeLog,v 1.149 2014/02/04 09:43:42 polynomial-c Exp $
+
+ 04 Feb 2014; Lars Wendler <polynomial-c@gentoo.org> pure-ftpd-1.0.36.ebuild,
+ files/pure-ftpd.rc11:
+ Fixed pidfile location. Converted latest ebuild to EAPI-5.
30 Jul 2012; Lars Wendler <polynomial-c@gentoo.org>
-pure-ftpd-1.0.32-r2.ebuild, -pure-ftpd-1.0.35.ebuild:
diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
index 0c4737e80cd0..5e81fefca9db 100644
--- a/net-ftp/pure-ftpd/files/pure-ftpd.rc11
+++ b/net-ftp/pure-ftpd/files/pure-ftpd.rc11
@@ -1,10 +1,10 @@
#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.4 2012/03/29 11:33:22 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/files/pure-ftpd.rc11,v 1.5 2014/02/04 09:43:41 polynomial-c Exp $
-ftpd_pidfile="/var/run/pure-ftpd.pid"
-script_pidfile="/var/run/pure-uploadscript.pid"
+ftpd_pidfile="/run/pure-ftpd.pid"
+script_pidfile="/run/pure-uploadscript.pid"
ftpd_rundir="/var/lib/run/pure-ftpd"
daemon="/usr/sbin/pure-ftpd"
script_daemon="/usr/sbin/pure-uploadscript"
diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
index 31909589d9b9..46da1e11561e 100644
--- a/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
+++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 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.36.ebuild,v 1.11 2012/07/29 18:46:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pure-ftpd/pure-ftpd-1.0.36.ebuild,v 1.12 2014/02/04 09:43:42 polynomial-c Exp $
-EAPI=2
+EAPI=5
inherit eutils confutils flag-o-matic
KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
@@ -85,11 +85,11 @@ src_configure() {
--with-uploadscript \
--with-virtualhosts \
--enable-largefile \
- ${my_conf} || die "econf failed"
+ ${my_conf}
}
src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
+ emake DESTDIR="${D}" install
dodoc AUTHORS CONTACT ChangeLog FAQ HISTORY INSTALL README* NEWS