Version bump.

4 files changed, 147 insertions, 14 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index e3651835416f..67b75e940859 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,11 @@
 # 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.42 2003/10/21 09:57:42 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.43 2003/11/05 05:35:29 blkdeath Exp $
+
+*proftpd-1.2.9 (05 Nov 2003)
+
+  05 Nov 2003; Stewart Honsberger <blkdeath@gentoo.org> proftpd-1.2.9.ebuild:
+  Version bump. Security fixes, some memory leaks, IPv4 / IPv6 fixes.
 
   20 Oct 2003; Nick Hadaway <raker@gentoo.org> proftpd-1.2.9_rc3.ebuild:
   Added files/1.2.9_rc3-reversedns.diff which was taken from the 
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index d57fe496e214..bc5d28fdbf24 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,22 +1,24 @@
-MD5 52a4951fa28542163e71336339fdbe57 proftpd-1.2.9_rc2.ebuild 3036
-MD5 3ae04eafb730c36ccc8984f86799af79 proftpd-1.2.8.ebuild 2739
-MD5 7312398ea208fcb46ef6709cbdc295d8 proftpd-1.2.9_rc2-r1.ebuild 3160
+MD5 00deed835fe6f48f83ef24502e5d8cda ChangeLog 7019
 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 46dda3e01d28cea22470232c9559b961 proftpd-1.2.9_rc3.ebuild 3123
-MD5 abfc45449d61cea70890f1337a9e1b6b ChangeLog 6837
+MD5 3ae04eafb730c36ccc8984f86799af79 proftpd-1.2.8.ebuild 2739
+MD5 ed644dbda898814d27dbf3b8b8775fef proftpd-1.2.9_rc1.ebuild 2911
+MD5 52a4951fa28542163e71336339fdbe57 proftpd-1.2.9_rc2.ebuild 3036
 MD5 1eabb88c18a1821e01eab0a586de02d9 metadata.xml 259
-MD5 305b9ec34f3caa3722cf5a7dc1a59880 files/proftpd.rc6 743
-MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
+MD5 7312398ea208fcb46ef6709cbdc295d8 proftpd-1.2.9_rc2-r1.ebuild 3160
+MD5 46dda3e01d28cea22470232c9559b961 proftpd-1.2.9_rc3.ebuild 3123
+MD5 aa786a94066ba1b5fa47ed7fd76e0fbd proftpd-1.2.9.ebuild 3124
+MD5 6236a589ef01778d118911281b20be51 files/digest-proftpd-1.2.5-r1 66
 MD5 c1dc1d9278d5b77f53ea44ee848dafc6 files/digest-proftpd-1.2.7 211
 MD5 cb6cd6133728449d0da092b1d6147b9d files/digest-proftpd-1.2.8 66
+MD5 2cb8d1fb115bf19c162c4b6510f98bca files/digest-proftpd-1.2.9_rc1 69
 MD5 0cf02f8c82f22e714b8299e7b7907d8f files/mod_sql_postgres.c.patch 275
+MD5 b338504ed873219e368abab7df6c276d files/proftpd.conf 1704
+MD5 305b9ec34f3caa3722cf5a7dc1a59880 files/proftpd.rc6 743
 MD5 313cde04e0ea4cd747e6b905e6c982b4 files/proftpd.xinetd 302
-MD5 2cb235867cee126fe540c911c3b5ad5b files/proftpd-1.2.9_rc2-dirtree-r118.patch 474
-MD5 836a8039f80567f9bb82951c450fb51e files/digest-proftpd-1.2.9_rc2-r1 70
-MD5 2cb8d1fb115bf19c162c4b6510f98bca files/digest-proftpd-1.2.9_rc1 69
 MD5 836a8039f80567f9bb82951c450fb51e files/digest-proftpd-1.2.9_rc2 70
-MD5 3db5027a53a7d9d889c5a75df90d77b0 files/digest-proftpd-1.2.9_rc3 69
-MD5 6236a589ef01778d118911281b20be51 files/digest-proftpd-1.2.5-r1 66
 MD5 e558f099037d359da5f855285542246e files/1.2.9_rc3-reversedns.diff 1974
+MD5 836a8039f80567f9bb82951c450fb51e files/digest-proftpd-1.2.9_rc2-r1 70
+MD5 3db5027a53a7d9d889c5a75df90d77b0 files/digest-proftpd-1.2.9_rc3 69
+MD5 2cb235867cee126fe540c911c3b5ad5b files/proftpd-1.2.9_rc2-dirtree-r118.patch 474
+MD5 6c1a92fc601780a49fdfc01aaf483b69 files/digest-proftpd-1.2.9 66
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.9 b/net-ftp/proftpd/files/digest-proftpd-1.2.9
new file mode 100644
index 000000000000..dc35e2c279e0
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.9
@@ -0,0 +1 @@
+MD5 7c85503b160a36a96594ef75f3180a07 proftpd-1.2.9.tar.bz2 778953
diff --git a/net-ftp/proftpd/proftpd-1.2.9.ebuild b/net-ftp/proftpd/proftpd-1.2.9.ebuild
new file mode 100644
index 000000000000..132df7a5728d
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.9.ebuild
@@ -0,0 +1,125 @@
+# 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.ebuild,v 1.1 2003/11/05 05:35:30 blkdeath 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_unpack() {
+	unpack ${A}
+	cd ${S}
+#	epatch ${FILESDIR}/1.2.9_rc3-reversedns.diff
+}
+
+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"
+
+	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
+	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
+}