ftpd-0.17-r3.ebuild added with patch from solar - bug #111573

(Portage version: 2.0.53_rc7)

4 files changed, 72 insertions, 12 deletions

diff --git a/net-ftp/ftpd/ChangeLog b/net-ftp/ftpd/ChangeLog
index 5a0d39953d53..f1451aa02f22 100644
--- a/net-ftp/ftpd/ChangeLog
+++ b/net-ftp/ftpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-ftp/ftpd
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ChangeLog,v 1.18 2005/11/06 12:30:48 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ChangeLog,v 1.19 2005/11/09 21:33:02 dragonheart Exp $
+
+*ftpd-0.17-r3 (09 Nov 2005)
+
+  09 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +ftpd-0.17-r3.ebuild:
+  bumped with a better patch from solar
 
 *ftpd-0.17-r2 (06 Nov 2005)
 
diff --git a/net-ftp/ftpd/Manifest b/net-ftp/ftpd/Manifest
index 71aa881ff2d6..fcd3025ca094 100644
--- a/net-ftp/ftpd/Manifest
+++ b/net-ftp/ftpd/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fa6218792ae76f43f99589d6b4e5efdc ChangeLog 2368
+MD5 d723b2ae775647bd42de3e8f44a0670d ChangeLog 2549
 MD5 1185c6db5ae646d809d0c757f02d8e35 files/digest-ftpd-0.17 66
 MD5 1185c6db5ae646d809d0c757f02d8e35 files/digest-ftpd-0.17-r1 66
 MD5 1185c6db5ae646d809d0c757f02d8e35 files/digest-ftpd-0.17-r2 66
+MD5 d6140676fe7acab811160aa574573e83 files/digest-ftpd-0.17-r3 135
 MD5 c77f5bcf2f56d61c7e8845d94df88164 files/ftp.xinetd 313
 MD5 fb54312525ec906691ee16975f1658be files/ftpd-0.17+ssl-0.3-overflowpatch.diff 532
 MD5 7e1217f2de231dda2c8e842a7d7dfb7b files/ftpd-0.17-shadowfix.patch 895
 MD5 0630d5a4a420220cc8b912bdad705f6c files/ssl.diff.gz 10444
 MD5 753fb4b95ec8ae858ff343a599376b18 ftpd-0.17-r1.ebuild 1461
 MD5 7bfd62aa7556709bd5f5192594ac3230 ftpd-0.17-r2.ebuild 1523
+MD5 d2bcbaad0d92607daef0f589788f044d ftpd-0.17-r3.ebuild 1415
 MD5 a49ca8164b73a5b126e5d4403ec0e6ef ftpd-0.17.ebuild 1410
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFDbfeNmdTrptrqvGERAsMDAJ9UiBnfZW6UyNpWTXo7d9dKJzDqgQCeIlC/
-s9dlc3JqIncVc44eBCa5h9w=
-=BkVz
------END PGP SIGNATURE-----
diff --git a/net-ftp/ftpd/files/digest-ftpd-0.17-r3 b/net-ftp/ftpd/files/digest-ftpd-0.17-r3
new file mode 100644
index 000000000000..79a49aa35fc7
--- /dev/null
+++ b/net-ftp/ftpd/files/digest-ftpd-0.17-r3
@@ -0,0 +1,2 @@
+MD5 0b9185d5144904798b721354ea9ff156 linux-ftpd-0.17-ssl.patch 36459
+MD5 f5f491564812db5d8783daa538c49186 linux-ftpd-0.17.tar.gz 46763
diff --git a/net-ftp/ftpd/ftpd-0.17-r3.ebuild b/net-ftp/ftpd/ftpd-0.17-r3.ebuild
new file mode 100644
index 000000000000..d0296843cc3d
--- /dev/null
+++ b/net-ftp/ftpd/ftpd-0.17-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpd/ftpd-0.17-r3.ebuild,v 1.1 2005/11/09 21:33:02 dragonheart Exp $
+
+inherit eutils ssl-cert
+
+IUSE="ssl"
+
+S=${WORKDIR}/linux-${P}
+DESCRIPTION="The netkit FTP server with optional SSL support"
+HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html"
+SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/linux-${P}.tar.gz
+		mirror://gentoo/linux-${P}-ssl.patch"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+
+RDEPEND="${DEPEND}
+	virtual/inetd"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if use ssl; then
+		epatch ${DISTDIR}/linux-${P}-ssl.patch
+	fi
+	epatch ${FILESDIR}/${P}-shadowfix.patch
+}
+
+src_compile() {
+	./configure --prefix=/usr || die "configure failed"
+	cp MCONFIG MCONFIG.orig
+	sed -e "s:-pipe -O2:${CFLAGS}:" MCONFIG.orig > MCONFIG
+	emake || die "parallel make failed"
+}
+
+src_install() {
+	dobin ftpd/ftpd
+	doman ftpd/ftpd.8
+	dodoc README ChangeLog
+	insinto /etc/xinetd.d
+	newins ${FILESDIR}/ftp.xinetd ftp
+	if use ssl;
+	then
+		insinto /etc/ssl/certs/
+		docert ftpd
+	fi
+}
+
+pkg_postinst() {
+	if use ssl;
+	then
+		einfo "In order to start the server with SSL support"
+		einfo "You need a certificate /etc/ssl/certs/ftpd.pem."
+		einfo "A temporary certificiate has been created."
+	fi
+}