removed cmdftp from sunrise and added to portage tree

svn path=/sunrise/; revision=4451

9 files changed, 262 insertions, 51 deletions

diff --git a/net-ftp/cmdftp/ChangeLog b/net-ftp/cmdftp/ChangeLog
deleted file mode 100644
index 43f01e1ad..000000000
--- a/net-ftp/cmdftp/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-# ChangeLog for net-ftp/cmdftp
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  25 Jul 2007; Jason Smathers (jsin) <jason.smathers@gmail.com>
-
-  cmdftp-0.9.6.ebuild:
-  using IUSE onlysmall instead of +largefile
-
-  24 Jul 2007; Jason Smathers (jsin) <jason.smathers@gmail.com>
-  +metadata.xml, +cmdftp-0.9.6.ebuild:
-  New Ebuild for bug 104018
-
diff --git a/net-ftp/cmdftp/Manifest b/net-ftp/cmdftp/Manifest
deleted file mode 100644
index 606184665..000000000
--- a/net-ftp/cmdftp/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST cmdftp-0.9.6.tar.bz2 114046 RMD160 535d44a32b9e5ff6df4d8a617534555a6e6601ce SHA1 25a5966f17076367db2079ddd5856e52e23ba26a SHA256 45ab930e0990707795a697aa47949f21ffdd5df876f8067a99b8cc0bed3191bb
-EBUILD cmdftp-0.9.6.ebuild 646 RMD160 47948b7eb43075b2c62ec544aef6639cb55f99ae SHA1 f35805599df5d91194cb12695cdec82b387323aa SHA256 9927cb9f532cf0713d595bead4dfa0d0fed3bea16c4f45869539c8006869dccd
-MISC ChangeLog 381 RMD160 5188b8d5185d14ec5625ab38db6c9b84d5061b4e SHA1 50ed9bd63fd9af0cb4f4141933984383aae1ede9 SHA256 2e44a61dfb6ea9e73fe5d66ce0b6c915994ebd99661ca3d2f5fc8003a09548a1
-MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
diff --git a/net-ftp/cmdftp/cmdftp-0.9.6.ebuild b/net-ftp/cmdftp/cmdftp-0.9.6.ebuild
deleted file mode 100644
index fba52b22e..000000000
--- a/net-ftp/cmdftp/cmdftp-0.9.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-DESCRIPTION="Light weight, yet robust command line FTP client with shell-like
-functions."
-HOMEPAGE="http://savannah.nongnu.org/projects/cmdftp/"
-SRC_URI="http://download.savannah.nongnu.org/releases/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="onlysmall"
-
-DEPEND=""
-RDEPEND=""
-
-src_compile() {
-	econf $(use_enable !onlysmall largefile) || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc NEWS README AUTHORS
-}
diff --git a/net-ftp/cmdftp/files/digest-cmdftp-0.9.6 b/net-ftp/cmdftp/files/digest-cmdftp-0.9.6
deleted file mode 100644
index f23964db6..000000000
--- a/net-ftp/cmdftp/files/digest-cmdftp-0.9.6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 73ea1e20d62e9d97754c7e2f73943399 cmdftp-0.9.6.tar.bz2 114046
-RMD160 535d44a32b9e5ff6df4d8a617534555a6e6601ce cmdftp-0.9.6.tar.bz2 114046
-SHA256 45ab930e0990707795a697aa47949f21ffdd5df876f8067a99b8cc0bed3191bb cmdftp-0.9.6.tar.bz2 114046
diff --git a/net-ftp/cmdftp/metadata.xml b/net-ftp/cmdftp/metadata.xml
deleted file mode 100644
index 7e3286984..000000000
--- a/net-ftp/cmdftp/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>maintainer-wanted</herd>
-</pkgmetadata>
diff --git a/net-ftp/drftpd/Manifest b/net-ftp/drftpd/Manifest
new file mode 100644
index 000000000..dd273efd6
--- /dev/null
+++ b/net-ftp/drftpd/Manifest
@@ -0,0 +1,3 @@
+DIST drftpd-2.0.5.tar.gz 358218 RMD160 34e60967734d858d138ce01b56c6e7c959f8683f SHA1 96c80c3783144c4bc96d2de56bb016f8f3cc79a8 SHA256 94f6bd856ac36dad339a3d85c49082933b7927ea5766b8af67a82c0a0719f26e
+EBUILD drftpd-2.0.5.ebuild 738 RMD160 0151509a76c2c7f9b97e604ab3c0c9a6cd5cbc30 SHA1 1610a08dc0cff97b5fcbf1c8ce71a9f397f2a3fb SHA256 381625fea7a9ffab888f148c211cb6b9362951266586fb338a5178144761a655
+MISC .drftpd-2.0.5.ebuild.swp 12288 RMD160 08fe4e3fb6e31e2797ec9a95b735ba95f649c2ea SHA1 90a0e8e303a4b418b363f1a03c8810103c4cdc99 SHA256 70237ee32adc3776e10f22a3182ebe2a21d1fcd2bb07781ccbbc21bb9167d8e2
diff --git a/net-ftp/drftpd/drftpd-2.0.5.ebuild b/net-ftp/drftpd/drftpd-2.0.5.ebuild
new file mode 100644
index 000000000..75e5c2157
--- /dev/null
+++ b/net-ftp/drftpd/drftpd-2.0.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+JAVA_PKG_IUSE="source"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A Distributed FTP server written in java."
+HOMEPAGE="http://www.drftpd.org"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="slave"
+
+COMMON_DEP=">=dev-java/log4j-1.2.8
+	>=dev-java/jdom-1.0
+	>=dev-java/xstream-1.2
+	>=dev-java/jakarta-oro-2.0.8
+	>=dev-java/jsx-1.0.7.5
+	>=dev-java/martyr-0.3.9
+	>=dev-java/wrapper-3.1.2
+	slave? ( >=virtual/jdk-1.4 )
+	!slave? ( >=virtual/jdk-1.5 )"
+
+DEPEND=${COMMON_DEP}
+RDEPEND=${COMMON_DEP}
+
+src_unpack() {
+	unpack ${A}
+}
+
+EANT_DOC_TARGET=""
+
+src_install() {
+	eant
+}
+
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
new file mode 100644
index 000000000..9d8818245
--- /dev/null
+++ b/net-ftp/proftpd/Manifest
@@ -0,0 +1,6 @@
+DIST mod_clamav_new.c 7399 RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb SHA1 f037c573b6c0052f8ed5ee427504a8cd8834f15c SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1
+DIST mod_clamav_new.html 4645 RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 SHA1 58479f3aae082effad3636026a27c09ddb232905 SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e
+DIST proftpd-1.3.1rc3.tar.bz2 1538700 RMD160 68cbdd137caa0f7a46be18eb682d5c3c516ca167 SHA1 a752ccc2ea4d7ae6f55ac5486d1ede01f734280c SHA256 9bad65ea4ddca40547ca6bb1aa337c7d4ae54752bb9f5fc76124a8c4535daefd
+DIST proftpd-mod-shaper-0.6.3.tar.gz 19040 RMD160 9978fda37d0099c48d755e53132482506c948c05 SHA1 a5c9a1889c441b9290f2c571ad7fc06bebaf9326 SHA256 a6947836461872adca53dab2708b1e140fa6ce7a8b93ccbe2dafbc3ca63fde67
+DIST proftpd-mod-vroot-0.7.2.tar.gz 6071 RMD160 b152162b3714910d5b9378611313041c3e7e17d4 SHA1 3fc4c5874deba4bbe989b0bd54a7478a47f3d876 SHA256 cab5a42390eac4e0b8bdcbe1e6d15804c8029d51da9ad3bd428b46a80cd69d5a
+EBUILD proftpd-1.3.1_rc3.ebuild 5991 RMD160 1d5b2985d8fd0fad862233699c3a82e0b352d04c SHA1 584ab6d5a3a810c71b647cf4053711cfc3591d7a SHA256 87eb53002f6c35b34c725969eea83a02965a9c9a38baeb3f79acbd4b524bd319
diff --git a/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild
new file mode 100644
index 000000000..2a92677f6
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.1_rc3.ebuild
@@ -0,0 +1,213 @@
+# Copyright 1999-2007 Gentoo Foundation
+# # Distributed under the terms of the GNU General Public License v2
+# # $Header: $
+#
+inherit eutils flag-o-matic toolchain-funcs
+
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="acl authfile clamav hardened ifsession ipv6 ldap mysql ncurses nls noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
+
+SHAPER_VER="0.6.3"
+VROOT_VER="0.7.2"
+
+DESCRIPTION="An advanced and very configurable FTP server."
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2
+		clamav? ( http://www.uglyboxindustries.com/mod_clamav_new.c http://www.uglyboxindustries.com/mod_clamav_new.html )
+		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
+		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
+HOMEPAGE="http://www.proftpd.org/
+		http://www.castaglia.org/proftpd/
+		http://www.uglyboxindustries.com/open-source.php"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="acl? ( sys-apps/acl sys-apps/attr )
+		clamav? ( app-antivirus/clamav )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( virtual/mysql )
+		ncurses? ( sys-libs/ncurses )
+		opensslcrypt? ( >=dev-libs/openssl-0.9.6f )
+		pam? ( virtual/pam )
+		postgres? ( >=dev-db/postgresql-7.3 )
+		ssl? ( >=dev-libs/openssl-0.9.6f )
+		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
+		xinetd? ( sys-apps/xinetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		selinux? ( sec-policy/selinux-ftpd )"
+
+S="${WORKDIR}/${P/_/}"
+
+pkg_setup() {
+	# Add the proftpd user to make the default config
+	# work out-of-the-box
+	enewgroup proftpd
+	enewuser proftpd -1 -1 -1 proftpd
+}
+
+src_unpack() {
+	unpack ${P/_/}.tar.bz2
+
+	cd "${S}"
+
+	# Fix stripping of files
+	sed -e "s| @INSTALL_STRIP@||g" -i Make*
+
+	if use shaper ; then
+		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
+		cp -f mod_shaper/mod_shaper.c contrib/
+	fi
+
+	if use clamav ; then
+		cp -f "${DISTDIR}/mod_clamav_new.c" contrib/mod_clamav.c
+		cp -f "${DISTDIR}/mod_clamav_new.html" doc/mod_clamav.html
+	fi
+
+	if use vroot ; then
+		unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
+		cp -f mod_vroot/mod_vroot.c contrib/
+		cp -f mod_vroot/mod_vroot.html doc/
+	fi
+}
+
+src_compile() {
+	addpredict /etc/krb5.conf
+	local modules myconf
+
+	modules="mod_ratio:mod_readme"
+	use acl && modules="${modules}:mod_facl"
+	use clamav && modules="${modules}:mod_clamav"
+	use pam && modules="${modules}:mod_auth_pam"
+	use radius && modules="${modules}:mod_radius"
+	use rewrite && modules="${modules}:mod_rewrite"
+	use shaper && modules="${modules}:mod_shaper"
+	use sitemisc && modules="${modules}:mod_site_misc"
+	use ssl && modules="${modules}:mod_tls"
+	use tcpd && modules="${modules}:mod_wrap"
+	use vroot && modules="${modules}:mod_vroot"
+
+	# pam needs to be explicitely disabled
+	use pam || myconf="${myconf} --enable-auth-pam=no"
+
+	if use ldap ; then
+		modules="${modules}:mod_ldap"
+		append-ldflags "-lresolv"
+	fi
+
+	if use opensslcrypt ; then
+		append-ldflags "-lcrypto"
+		myconf="${myconf} --enable-openssl --with-includes=/usr/include/openssl"
+		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
+	fi
+
+	if use nls ; then
+		myconf="${myconf} --enable-nls"
+	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
+
+	# mod_ifsession should be the last module in the --with-modules list
+	# see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation
+	use ifsession && modules="${modules}:mod_ifsession"
+
+	# bug #30359
+	use hardened && echo > lib/libcap/cap_sys.c
+	gcc-specs-pie && 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 acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable ipv6) \
+		$(use_enable ncurses) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	# Note rundir needs to be specified to avoid sandbox violation
+	# on initial install. See Make.rules
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir /var/run/proftpd
+
+	dodoc "${FILESDIR}/proftpd.conf" \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/license.txt
+	dohtml doc/*.html
+	dohtml doc/howto/*.html
+
+	use shaper && dohtml mod_shaper/mod_shaper.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	mv -f "${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() {
+	elog
+	elog "You can find the config files in /etc/proftpd"
+	elog
+	ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
+	ewarn "Remember to change that in the configuration file."
+	ewarn
+	if use clamav ; then
+		ewarn "mod_clamav was updated to a new version, which uses Clamd"
+		ewarn "only for virus scanning, so you'll have to set Clamd up"
+		ewarn "and start it, also re-check the mod_clamav docs."
+		ewarn
+	fi
+}