version bump, tls support, tcpwrappers support, cleanups

6 files changed, 161 insertions, 110 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index c266f95e1e25..c7333739571b 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.12 2002/11/10 05:31:23 rphillips Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.13 2002/11/18 05:20:30 blocke Exp $
+
+*proftpd-1.2.7_rc3 (17 Nov 2002)
+
+  17 Nov 2002; Bruce A. Locke <blocke@shivan.org> proftpd-1.2.7_rc3.ebuild:
+  Version bump, ebuild cleanups, and:
+
+  - mod_ldap TLS enable suggested by psi-jack@myrealbox.com (Eric Renfro)
+  - mod_tls added (suggestion from stian@barmen.nu (Stian B. Barmen))
+  - mod_wrap for TCP wrappers support
+  - sample config file location in rc6 message changed
 
 *proftpd-1.2.7_rc2 (02 Nov 2002)
 
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.6_rc1-r1 b/net-ftp/proftpd/files/digest-proftpd-1.2.6_rc1-r1
deleted file mode 100644
index 07de557fe643..000000000000
--- a/net-ftp/proftpd/files/digest-proftpd-1.2.6_rc1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8bbe9e82cbcde203edfbf6dfc0562b71 proftpd-1.2.6rc1.tar.bz2 565290
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.2.7_rc3 b/net-ftp/proftpd/files/digest-proftpd-1.2.7_rc3
new file mode 100644
index 000000000000..8a35d507a4d4
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.2.7_rc3
@@ -0,0 +1,3 @@
+MD5 96fa154311b790121e3bf29c0a1698ec proftpd-1.2.7rc3.tar.bz2 641437
+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/proftpd.rc6 b/net-ftp/proftpd/files/proftpd.rc6
index 9e6e698545c3..a8c28fac364d 100644
--- a/net-ftp/proftpd/files/proftpd.rc6
+++ b/net-ftp/proftpd/files/proftpd.rc6
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.3 2001/12/06 20:17:02 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.4 2002/11/18 05:20:31 blocke Exp $
 
 depend() {
 	need net
@@ -10,7 +10,7 @@ depend() {
 checkconfig() {
 	if [ ! -e /etc/proftpd/proftpd.conf ] ; then
 		eerror "You need an /etc/proftpd/proftpd.conf file first"
-		eerror "There is a sample file in /usr/share/doc/proftpd"
+		eerror "There is a sample file in /etc/proftpd"
 		return 1
 	fi
 }
diff --git a/net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild b/net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild
deleted file mode 100644
index 90b7660e5560..000000000000
--- a/net-ftp/proftpd/proftpd-1.2.6_rc1-r1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2002 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.6_rc1-r1.ebuild,v 1.7 2002/11/02 17:09:07 blizzy Exp $
-
-IUSE="ldap pam postgres mysql"
-
-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.net/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~sparc64"
-
-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 )"
-
-src_unpack() {
-
-#Fix bug #3791
-	
-	unpack ${P}.tar.bz2
-    cd ${WORKDIR}/${P}
-    patch contrib/mod_sql_postgres.c < ${FILESDIR}/mod_sql_postgres.c.patch || die "config patch failed"
-}
-
-src_compile() {
-	local modules myconf
-
-	modules="mod_ratio:mod_readme:mod_linuxprivs"
-	use pam && modules="${modules}:mod_pam"
-	use ldap && modules="${modules}:mod_ldap"
-
-	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
-
-	use ldap && export LDFLAGS="-lresolv"
-
-	econf \
-		--sbindir=/usr/sbin \
-		--localstatedir=/var/run \
-		--sysconfdir=/etc/proftpd \
-		--enable-shadow \
-		--disable-sendfile \
-		--enable-autoshadow \
-		--with-modules=${modules} \
-		${myconf} || die "bad ./configure"
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	
-	#Note rundir needs to be specified to avoid sanbox 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
-
-	#dobin contrib/genuser.pl
-	dodir /home/ftp
-	touch ${D}/home/ftp/.keep
-
-	touch ${D}/var/run/proftpd/.keep
-
-	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
-
-	cd ${D}/etc/proftpd
-	mv proftpd.conf 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
-}
diff --git a/net-ftp/proftpd/proftpd-1.2.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.2.7_rc3.ebuild
new file mode 100644
index 000000000000..a533f17aa7b2
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.2.7_rc3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2002 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.7_rc3.ebuild,v 1.1 2002/11/18 05:20:31 blocke 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"
+
+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-r4 )"
+
+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: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
+}