summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Felisberto <humpback@gentoo.org>2004-09-16 18:16:04 +0000
committerGustavo Felisberto <humpback@gentoo.org>2004-09-16 18:16:04 +0000
commite7b9f660e28805a16ba43b5de624111b9cdad286 (patch)
tree79fe0e450187854e1492008e4ac943fe0677a155 /net-ftp
parentversion bump (Manifest recommit) (diff)
downloadgentoo-2-e7b9f660e28805a16ba43b5de624111b9cdad286.tar.gz
gentoo-2-e7b9f660e28805a16ba43b5de624111b9cdad286.tar.bz2
gentoo-2-e7b9f660e28805a16ba43b5de624111b9cdad286.zip
stable on x86
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/proftpd/ChangeLog6
-rw-r--r--net-ftp/proftpd/proftpd-1.2.10.ebuild24
2 files changed, 18 insertions, 12 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 8e4484f70abd..48fb637bd57a 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-ftp/proftpd
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.69 2004/09/07 18:09:56 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.70 2004/09/16 18:16:04 humpback Exp $
+
+ 16 Sep 2004; Gustavo Felisberto <humpback@gentoo.org>;
+ proftpd-1.2.10.ebuild:
+ Mod shaper causes problems again :( . Marking stable as the rest is rock solid.
*proftpd-1.2.10 (07 Sep 2004)
diff --git a/net-ftp/proftpd/proftpd-1.2.10.ebuild b/net-ftp/proftpd/proftpd-1.2.10.ebuild
index a400c9d3f096..c835fd855a03 100644
--- a/net-ftp/proftpd/proftpd-1.2.10.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10.ebuild
@@ -1,22 +1,24 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10.ebuild,v 1.1 2004/09/07 18:09:56 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10.ebuild,v 1.2 2004/09/16 18:16:04 humpback Exp $
inherit flag-o-matic eutils
-IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux"
+#Mod shaper is giving problems on some machines
+#IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux"
+IUSE="hardened ipv6 ldap mysql pam postgres softquota ssl tcpd selinux"
MY_P=${P/_/}
S=${WORKDIR}/${MY_P}
DESCRIPTION="An advanced and very configurable FTP server"
-SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2
- shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.3.tar.gz"
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${MY_P}.tar.bz2"
+# shaper? http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-0.5.3.tar.gz"
HOMEPAGE="http://www.proftpd.org/"
SLOT="0"
LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64"
+KEYWORDS="x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64"
DEPEND="pam? ( >=sys-libs/pam-0.75 )
mysql? ( >=dev-db/mysql-3.23.26 )
@@ -30,10 +32,10 @@ RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
src_unpack() {
unpack ${MY_P}.tar.bz2
cd ${S}
- if use shaper; then
- unpack ${PN}-mod-shaper-0.5.3.tar.gz
- mv mod_shaper/mod_shaper.c contrib/
- fi
+# if use shaper; then
+# unpack ${PN}-mod-shaper-0.5.3.tar.gz
+# mv mod_shaper/mod_shaper.c contrib/
+# fi
}
src_compile() {
@@ -42,7 +44,7 @@ src_compile() {
modules="mod_ratio:mod_readme"
use pam && modules="${modules}:mod_auth_pam"
use tcpd && modules="${modules}:mod_wrap"
- use shaper && modules="${modules}:mod_shaper"
+# use shaper && modules="${modules}:mod_shaper"
if use ldap; then
einfo ldap
@@ -123,7 +125,7 @@ src_install() {
COPYING CREDITS ChangeLog NEWS README* \
doc/{license.txt,GetConf}
dohtml doc/*.html
- use shaper && dohtml mod_shaper/mod_shaper.html
+ #use shaper && dohtml mod_shaper/mod_shaper.html
docinto rfc
dodoc doc/rfc/*.txt