new revision that uses ftpbase

(Portage version: 2.0.51.22-r1)

4 files changed, 180 insertions, 11 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 807493692eb5..365a37e01275 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.94 2005/07/07 23:58:53 humpback Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.95 2005/07/08 16:02:20 humpback Exp $
+
+*proftpd-1.2.10-r6 (08 Jul 2005)
+
+  08 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
+  +proftpd-1.2.10-r6.ebuild:
+  New revision that uses the new net-ftp/ftpbase. Nice work there UberLord.
 
   07 Jul 2005; Gustavo Felisberto <humpback@gentoo.org>;
   proftpd-1.2.9-r2.ebuild, proftpd-1.2.10.ebuild, proftpd-1.2.10-r1.ebuild,
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index e37501c47fcf..95ce53b8a4e3 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 8ef1eed018ef00af61e92c26937f0d11 proftpd-1.2.10-r6.ebuild 4331
 MD5 47c7909cf9d623eaa77933d997bdb7c1 proftpd-1.2.10-r1.ebuild 4422
 MD5 ccd3b0639bb673d4f542f42b1a9824b2 proftpd-1.2.10-r3.ebuild 4356
 MD5 9cd5b3f274033c4ed06ac8c36b143353 proftpd-1.2.10-r5.ebuild 4393
@@ -21,13 +19,7 @@ MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r1 213
 MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r2 213
 MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r3 142
 MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r5 142
+MD5 81e05e840c023b1f6bfb46dc24cb165f files/digest-proftpd-1.2.10-r6 142
 MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66
 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
 MD5 cfe47c0d5f8fece1d36ca8d56d0f2b99 files/ftp.pamd 701
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzcHS8zY1VwezZiERAjLbAKCTaM2NPVWAkzRkwOEEW5rxpb3onACePGgz
-6XNG6CqcHsRQQRpZDgwuq1k=
-=eeqD
------END PGP SIGNATURE-----
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r6 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r6
new file mode 100644
index 000000000000..211d52a3fca3
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r6
@@ -0,0 +1,2 @@
+MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
+MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild
new file mode 100644
index 000000000000..070617ebfd17
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.10-r6.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2005 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-r6.ebuild,v 1.1 2005/07/08 16:02:20 humpback Exp $
+
+inherit flag-o-matic eutils
+
+IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd
+	selinux sendfile noauthunix authfile ncurses xinetd"
+
+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.5.tar.gz )"
+HOMEPAGE="http://www.proftpd.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64 ~ppc64"
+
+DEPEND="pam? ( || ( virtual/pam sys-libs/pam) )
+	mysql? ( >=dev-db/mysql-3.23.26 )
+	ldap? ( >=net-nds/openldap-1.2.11 )
+	postgres? ( >=dev-db/postgresql-7.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6f )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
+	ncurses? ( sys-libs/ncurses )
+	xinetd? ( sys-apps/xinetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		selinux? ( sec-policy/selinux-ftpd )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd ${S}
+	if use shaper; then
+		unpack ${PN}-mod-shaper-0.5.5.tar.gz
+		mv mod_shaper/mod_shaper.c contrib/
+	fi
+}
+
+src_compile() {
+	addpredict /etc/krb5.conf
+	local modules myconf
+
+	modules="mod_ratio:mod_readme"
+	use pam && modules="${modules}:mod_auth_pam"
+	use tcpd && modules="${modules}:mod_wrap"
+	use shaper && modules="${modules}:mod_shaper"
+
+	if use ldap; then
+		einfo ldap
+		modules="${modules}:mod_ldap"
+		append-ldflags "-lresolv"
+	fi
+
+	if use ssl; then
+		einfo ssl
+		# enable mod_tls
+		modules="${modules}:mod_tls"
+	fi
+
+	if use mysql && use postgres
+	then
+		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
+		ewarn "Presently this ebuild defaults to mysql. If you would like to"
+		ewarn "change the default behaviour, merge ProFTPD with;"
+		ewarn "USE=\"-mysql postgres\" emerge proftpd"
+		epause 5
+	fi
+
+	if use mysql; then
+		modules="${modules}:mod_sql:mod_sql_mysql"
+		myconf="${myconf} --with-includes=/usr/include/mysql"
+	elif use postgres; then
+		modules="${modules}:mod_sql:mod_sql_postgres"
+		myconf="${myconf} --with-includes=/usr/include/postgresql"
+	fi
+
+	if use softquota; then
+		modules="${modules}:mod_quotatab"
+		if use mysql || use postgres; then
+			modules="${modules}:mod_quotatab_sql"
+		fi
+		if use ldap; then
+			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
+		else
+			modules="${modules}:mod_quotatab_file"
+		fi
+	fi
+
+	# New modules for 1.2.9
+	# Not sure how these should be enabled yet as no use variables
+	# apply currently.  Uncomment if you want to use them though.
+	# -raker 06/16/2003
+	#
+	# modules="${modules}:mod_ifsession"
+	# modules="${modules}:mod_radius"
+	# modules="${modules}:mod_rewrite"
+
+	# bug #30359
+	use hardened && echo > lib/libcap/cap_sys.c
+	has_pic && echo > lib/libcap/cap_sys.c
+
+	if use noauthunix ; then
+		myconf="${myconf} --disable-auth-unix"
+	else
+		myconf="${myconf} --enable-auth-unix"
+	fi
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--enable-autoshadow \
+		--enable-ctrls \
+		--with-modules=${modules} \
+		$(use_enable authfile auth-file) \
+		$(use_enable ncurses) \
+		$(use_enable ipv6) \
+		$(use_with sendfile) \
+		${myconf} || die "bad ./configure"
+
+	emake || die "compile problem"
+}
+
+src_install() {
+	# Note rundir needs to be specified to avoid sandbox violation
+	# on initial install. See Make.rules
+	make DESTDIR=${D} install || die
+
+	keepdir /home/ftp
+	keepdir /var/run/proftpd
+
+	dodoc contrib/UPGRADE.mod_sql ${FILESDIR}/proftpd.conf \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/{license.txt,GetConf}
+	dohtml doc/*.html
+
+	use shaper && dohtml mod_shaper/mod_shaper.html
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
+
+	insinto /etc/proftpd
+	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
+
+
+	if use xinetd; then
+		insinto /etc/xinetd.d
+		newins ${FILESDIR}/proftpd.xinetd proftpd
+	fi
+
+	newinitd ${FILESDIR}/proftpd.rc6 proftpd
+}
+
+pkg_postinst() {
+	einfo
+	einfo 'You can find the config files in /etc/proftpd'
+	einfo
+	einfo 'mod_delay has been causing more bad than good and has been removed'
+	einfo 'see Changelog for more info'
+	ewarn 'With introduction of net-ftp/ftpbase the ftp user is now ftp.'
+	ewarn 'Remember to change that in the configuration file.'
+}