removing older versions and adding -r2 release that can use sendfile()

8 files changed, 179 insertions, 276 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 66c84d368468..42256b95f3ed 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.82 2004/11/30 12:16:11 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.83 2004/12/06 19:29:06 humpback Exp $
+
+*proftpd-1.2.10-r2 (06 Dec 2004)
+
+  06 Dec 2004; Gustavo Felisberto <humpback@gentoo.org>;
+  +proftpd-1.2.10-r2.ebuild, -proftpd-1.2.7.ebuild, -proftpd-1.2.8.ebuild:
+  Removed older versions and added a new release that uses the sendfile()
+  function. Use with care.
 
   30 Nov 2004; Guy Martin <gmsoft@gentoo.org> proftpd-1.2.10-r1.ebuild:
   Stable on hppa.
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 0a6556c06268..e352ea6d97c1 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,14 +1,13 @@
-MD5 bc389a600ac701b3b91d950eba9dac64 ChangeLog 13014
+MD5 bc5e979d324ec76dce4b03ecb827f36c ChangeLog 13284
 MD5 b47207aedd0149443faa2152950714ed metadata.xml 401
+MD5 73dd6a4c82748349629f6e20dbc777e8 proftpd-1.2.10-r1.ebuild 4389
+MD5 c65870b431c4f2a3f253be6a57e62fc4 proftpd-1.2.10-r2.ebuild 4468
 MD5 50ccc531b10541be2ca6732b0889a732 proftpd-1.2.10.ebuild 4137
-MD5 4cc98eb1b4b8be1479ba8965bb49bc70 proftpd-1.2.7.ebuild 3662
-MD5 3a0fc9def548faa16ed6e52a3e698ab1 proftpd-1.2.8.ebuild 2729
 MD5 a28b579450718c5bc4b60c168e015459 proftpd-1.2.9-r2.ebuild 3438
-MD5 73dd6a4c82748349629f6e20dbc777e8 proftpd-1.2.10-r1.ebuild 4389
 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
 MD5 fa041c7b343099eef454338152a04ea7 files/digest-proftpd-1.2.10 67
-MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211
-MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66
+MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r1 213
+MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r2 213
 MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9-r2 66
 MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
 MD5 b00999f820f1e46a501ce4fcaeb5fe23 files/proftpd-1.2.9-makefile.patch 434
@@ -16,4 +15,3 @@ MD5 50955f0d375360841d50a82b9589e435 files/proftpd-1.2.9-privescal-fix.patch 588
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
 MD5 55ca24c9ee61b9ed94968c664baaeace files/proftpd.rc6 731
 MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
-MD5 52697b758d9c85e63c881592c5a8bb02 files/digest-proftpd-1.2.10-r1 213
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.10-r2 b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r2
new file mode 100644
index 000000000000..6e5808e84c43
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.10-r2
@@ -0,0 +1,3 @@
+MD5 5feb4a7348e12faefc25e34fd92efdd6 proftpd-1.2.10.tar.bz2 920337
+MD5 ca3d63ffbc6ad5b6a9063f79b36d1b55 proftpd-mod-shaper-0.5.5.tar.gz 18090
+MD5 f1dba4f32dcabef8651bb3cd7cebb756 proftpd-mod-delay-0.4.tar.gz 7412
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.7 b/net-ftp/proftpd/files/digest-proftpd-1.2.7
deleted file mode 100644
index 6ce489566016..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 7f2f7890742255e703437046149a1c31 proftpd-1.2.7.tar.bz2 646680
-MD5 eabad809f05fe633b3ae421170ce7453 proftpd-mod-tls-2.0.4.tar.gz 47978
-MD5 4976b4762675380e173527dea9dc7539 proftpd-mod-wrap-1.2.3.tar.gz 12652
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.8 b/net-ftp/proftpd/files/digest-proftpd-1.2.8
deleted file mode 100644
index df77a27525df..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 35e669cb085879eea21c6db9e7af2040 proftpd-1.2.8.tar.bz2 746193
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild
new file mode 100644
index 000000000000..efe2e9202260
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.10-r2.ebuild
@@ -0,0 +1,163 @@
+# 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-r2.ebuild,v 1.1 2004/12/06 19:29:06 humpback Exp $
+
+inherit flag-o-matic eutils
+
+#Mod shaper is giving problems on some machines
+IUSE="hardened ipv6 ldap mysql pam postgres shaper softquota ssl tcpd selinux sendfile"
+#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.5.tar.gz
+		http://www.castaglia.org/${PN}/modules/${PN}-mod-delay-0.4.tar.gz"
+HOMEPAGE="http://www.proftpd.org/"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~hppa ~alpha ~ppc ~mips ~amd64"
+
+DEPEND="pam? ( >=sys-libs/pam-0.75 )
+	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 )"
+
+RDEPEND="selinux? ( sec-policy/selinux-ftpd )"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	cd ${S}
+	unpack ${PN}-mod-delay-0.4.tar.gz
+	mv mod_delay/mod_delay.c contrib
+	if use shaper; then
+		unpack ${PN}-mod-shaper-0.5.5.tar.gz
+		mv mod_shaper/mod_shaper.c contrib/
+	fi
+}
+
+src_compile() {
+	local modules myconf
+
+	modules="mod_ratio:mod_readme:mod_delay"
+	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 sendfile; then
+		myconf="${myconf} --with-sendfile"
+	fi
+
+	if use softquota; then
+		modules="${modules}:mod_quotatab"
+		if use mysql || use postgres; then
+			modules="${modules}:mod_quotatab_sql"
+		elif 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
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--enable-autoshadow \
+		--enable-ctrls \
+		--with-modules=${modules} \
+		${myconf} $( use_enable ipv6 ) || 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/README.mod_sql ${FILESDIR}/proftpd.conf \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/{license.txt,GetConf}
+	dohtml doc/*.html
+	dohtml mod_delay/mod_delay.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 pam; then
+		insinto /etc/pam.d
+		newins ${S}/contrib/dist/rpm/ftp.pamd ftp
+	fi
+
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/proftpd.xinetd proftpd
+
+	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
+}
+
+pkg_postinst() {
+	groupadd proftpd &>/dev/null
+	id proftpd &>/dev/null || \
+		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
+	einfo
+	einfo 'You can find the config files in /etc/proftpd'
+	einfo
+	einfo 'For info on the mod_delay please read mod_delay.html in the doc dir'
+}
diff --git a/net-ftp/proftpd/proftpd-1.2.7.ebuild b/net-ftp/proftpd/proftpd-1.2.7.ebuild
deleted file mode 100644
index 00ca9ac23280..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.7.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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.7.ebuild,v 1.11 2004/06/24 22:47:23 agriffis Exp $
-
-IUSE="ldap pam postgres mysql ssl tcpd"
-
-TLS_VER="2.0.4"
-WRAP_VER="1.2.3"
-
-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
-		 ssl? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-tls-${TLS_VER}.tar.gz )
-		 tcpd? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-wrap-${WRAP_VER}.tar.gz )"
-HOMEPAGE="http://www.proftpd.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc hppa alpha ppc"
-
-DEPEND="net-libs/libpcap
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
-
-src_unpack() {
-
-	unpack ${MY_P}.tar.bz2
-
-	cd ${S}
-
-	if use ssl; then
-		unpack proftpd-mod-tls-${TLS_VER}.tar.gz
-		cp mod_tls/mod_tls.c modules
-	fi
-
-	if use tcpd; then
-		unpack proftpd-mod-wrap-${WRAP_VER}.tar.gz
-		cp mod_wrap/mod_wrap.c modules
-	fi
-}
-
-
-src_compile() {
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use x86 && modules="${modules}:mod_linuxprivs"
-	use pam && modules="${modules}:mod_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-
-	if use ldap; then
-		einfo ldap
-		modules="${modules}:mod_ldap"
-		export LDFLAGS="-lresolv"
-	fi
-
-	if use ssl; then
-		einfo ssl
-		# enable TLS for mod_ldap
-		cp contrib/mod_ldap.c contrib/mod_ldap.c.orig
-		sed -e "s:\/\* #define USE_LDAPV3_TLS \*\/:#define USE_LDAPV3_TLS:" \
-			-e "s:\/\* #define HAVE_OPENSSL \*\/:#define HAVE_OPENSSL:" \
-			contrib/mod_ldap.c.orig > contrib/mod_ldap.c || die "sed failed"
-
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	fi
-
-	if use mysql; then
-		modules="${modules}:mod_sql:mod_sql_mysql"
-	elif use postgres; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		myconf="--with-includes=/usr/include/postgresql"
-	fi
-
-	econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--disable-sendfile \
-		--enable-autoshadow \
-		--with-modules=${modules} \
-		${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	einstall \
-		sbindir=${D}/usr/sbin \
-		localstatedir=${D}/var/run \
-		rundir=${D}/var/run/proftpd \
-		sysconfdir=${D}/etc/proftpd \
-		|| die
-
-	keepdir /home/ftp
-	keepdir /var/run/proftpd
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{license.txt,GetConf}
-	dohtml doc/*.html
-	docinto rfc
-	dodoc doc/rfc/*.txt
-
-	if use ssl; then
-		docinto mod_tls-${TLS_VER}
-		dodoc mod_tls/{README,draft-murray-auth-ftp-ssl-09.txt}
-		dohtml mod_tls/mod_tls.html
-	fi
-
-	if use tcpd; then
-		docinto mod_wrap-${WRAP_VER}
-		dodoc mod_wrap/README
-		dohtml mod_wrap/mod_wrap.html
-	fi
-
-	mv ${D}/etc/proftpd/proftpd.conf ${D}/etc/proftpd/proftpd.conf.distrib
-
-	insinto /etc/proftpd
-	newins ${FILESDIR}/proftpd.conf proftpd.conf.sample
-
-	if use pam; then
-		insinto /etc/pam.d
-		newins ${S}/contrib/dist/rpm/ftp.pamd ftp
-	fi
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/proftpd.xinetd proftpd
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
-
-pkg_postinst() {
-	groupadd proftpd &>/dev/null
-	id proftpd &>/dev/null || \
-		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
-	einfo
-	einfo 'You can find the config files in /etc/proftpd'
-	einfo
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.8.ebuild b/net-ftp/proftpd/proftpd-1.2.8.ebuild
deleted file mode 100644
index 5821ff41410a..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.8.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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.8.ebuild,v 1.11 2004/10/19 10:47:48 absinthe Exp $
-
-IUSE="ldap pam postgres mysql ssl tcpd"
-
-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"
-HOMEPAGE="http://www.proftpd.org/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc ~hppa ~alpha ppc amd64"
-
-DEPEND="net-libs/libpcap
-	pam? ( >=sys-libs/pam-0.75 )
-	mysql? ( >=dev-db/mysql-3.23.26 )
-	ldap? ( >=net-nds/openldap-1.2.11 )
-	postgres? ( >=dev-db/postgresql-7.1 )
-	ssl? ( >=dev-libs/openssl-0.9.6f )
-	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
-
-src_unpack() {
-	unpack ${MY_P}.tar.bz2
-	cd ${S}
-}
-
-
-src_compile() {
-	local modules myconf
-
-	modules="mod_ratio:mod_readme"
-	use pam && modules="${modules}:mod_auth_pam"
-	use tcpd && modules="${modules}:mod_wrap"
-
-	if use ldap; then
-		einfo ldap
-		modules="${modules}:mod_ldap"
-		export LDFLAGS="-lresolv"
-	fi
-
-	if use ssl; then
-		einfo ssl
-
-		# enable mod_tls
-		modules="${modules}:mod_tls"
-	fi
-
-	if use mysql; then
-		modules="${modules}:mod_sql:mod_sql_mysql"
-		myconf="--with-includes=/usr/include/mysql"
-	elif use postgres; then
-		modules="${modules}:mod_sql:mod_sql_postgres"
-		myconf="--with-includes=/usr/include/postgresql"
-	fi
-
-	econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--disable-sendfile \
-		--enable-autoshadow \
-		--with-modules=${modules} \
-		${myconf} || die "bad ./configure"
-
-	make || die "compile problem"
-}
-
-src_install() {
-	# Note rundir needs to be specified to avoid sandbox violation
-	# on initial install. See Make.rules
-	einstall \
-		sbindir=${D}/usr/sbin \
-		localstatedir=${D}/var/run \
-		rundir=${D}/var/run/proftpd \
-		sysconfdir=${D}/etc/proftpd \
-		|| die
-
-	keepdir /home/ftp
-	keepdir /var/run/proftpd
-
-	dodoc contrib/README.mod_sql ${FILESDIR}/proftpd.conf \
-		COPYING CREDITS ChangeLog NEWS README* \
-		doc/{license.txt,GetConf}
-	dohtml doc/*.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 pam; then
-		insinto /etc/pam.d
-		newins ${S}/contrib/dist/rpm/ftp.pamd ftp
-	fi
-
-	insinto /etc/xinetd.d
-	newins ${FILESDIR}/proftpd.xinetd proftpd
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/proftpd.rc6 proftpd
-}
-
-pkg_postinst() {
-	groupadd proftpd &>/dev/null
-	id proftpd &>/dev/null || \
-		useradd -g proftpd -d /home/ftp -s /bin/false proftpd
-	einfo
-	einfo 'You can find the config files in /etc/proftpd'
-	einfo
-}