version bump. fixes some bugs and addresses a remote exploit among other things. :)

5 files changed, 139 insertions, 3 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 0a1020e8b42d..df299df12fd3 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.40 2003/10/13 16:19:54 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.41 2003/10/16 06:05:13 raker Exp $
+
+*proftpd-1.2.9_rc3 (16 Oct 2003)
+
+  16 Oct 2003; Nick Hadaway <raker@gentoo.org> proftpd-1.2.9_rc3.ebuild:
+  Addresses bug #29639 and #30004.  Also includes a remote exploit fix.
+  Version bump.  1.2.9 release is coming soon. :)
 
 *proftpd-1.2.9_rc2-r1 (13 Oct 2003)
 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 4a8ff49a6801..a37b2eb68ec9 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -4,8 +4,9 @@ MD5 7312398ea208fcb46ef6709cbdc295d8 proftpd-1.2.9_rc2-r1.ebuild 3160
 MD5 6af0a703972bb7f858aabcc18896454b proftpd-1.2.5-r1.ebuild 2487
 MD5 ed644dbda898814d27dbf3b8b8775fef proftpd-1.2.9_rc1.ebuild 2911
 MD5 bef00204f7097fbe4c9cc00c6f638e93 proftpd-1.2.7.ebuild 3670
-MD5 54cb49b79e475a31c66fb313fe2ceacb proftpd-1.2.9_rc3.ebuild 3040
-MD5 c1a9128c8b5cbf88915cfabc1218b6af ChangeLog 6398
+MD5 86ac0c165448c80be902578a1d61e52e proftpd-1.2.9_rc3.ebuild 3037
+MD5 174945d135559213ce18985cbf638492 ChangeLog 6628
+MD5 1eabb88c18a1821e01eab0a586de02d9 metadata.xml 259
 MD5 305b9ec34f3caa3722cf5a7dc1a59880 files/proftpd.rc6 743
 MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
 MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.9_rc3 b/net-ftp/proftpd/files/digest-proftpd-1.2.9_rc3
new file mode 100644
index 000000000000..70b47e065051
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.9_rc3
@@ -0,0 +1 @@
+MD5 5ac74d57bc4349fd71eaf577526e514c proftpd-1.2.9rc3.tar.bz2 820247
diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
new file mode 100644
index 000000000000..b27218d48158
--- /dev/null
+++ b/net-ftp/proftpd/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>raker@gentoo.org</email>
+    <name>Nick Hadaway</name>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild b/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild
new file mode 100644
index 000000000000..7ff03e8fcf59
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.9_rc3.ebuild,v 1.1 2003/10/16 06:05:13 raker Exp $
+
+inherit flag-o-matic
+
+IUSE="ldap pam postgres mysql ssl tcpd ipv6"
+
+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"
+
+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.3 )
+	ssl? ( >=dev-libs/openssl-0.9.6f )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )"
+
+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
+
+	# 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
+	has_version sys-devel/hardened-gcc && echo > lib/libcap/cap_sys.c
+	is-flag -fPIC && echo > lib/libcap/cap_sys.c
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--disable-sendfile \
+		--enable-autoshadow \
+		--with-modules=${modules} \
+		${myconf} $( use_enable ipv6 ) || 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
+	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
+	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
+}