Replace call to docert by install_cert, bug #201675.

Package-Manager: portage-2.1.4_rc11

4 files changed, 82 insertions, 9 deletions

diff --git a/net-ftp/netkit-ftpd/ChangeLog b/net-ftp/netkit-ftpd/ChangeLog
index d7e684b01db0..5133c26f65cb 100644
--- a/net-ftp/netkit-ftpd/ChangeLog
+++ b/net-ftp/netkit-ftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/netkit-ftpd
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/ChangeLog,v 1.7 2007/05/06 10:59:35 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/ChangeLog,v 1.8 2007/12/30 20:38:31 ulm Exp $
+
+*netkit-ftpd-0.17-r6 (30 Dec 2007)
+
+  30 Dec 2007; Ulrich Mueller <ulm@gentoo.org> +netkit-ftpd-0.17-r6.ebuild:
+  Replace call to docert by install_cert, bug #201675.
 
   06 May 2007; Marius Mauch <genone@gentoo.org> netkit-ftpd-0.17-r4.ebuild,
   netkit-ftpd-0.17-r5.ebuild:
diff --git a/net-ftp/netkit-ftpd/Manifest b/net-ftp/netkit-ftpd/Manifest
index 9ee6235b61d8..ef28ca4522ad 100644
--- a/net-ftp/netkit-ftpd/Manifest
+++ b/net-ftp/netkit-ftpd/Manifest
@@ -39,10 +39,14 @@ EBUILD netkit-ftpd-0.17-r5.ebuild 1571 RMD160 ac26540f7510735ed9dc04b3e45147b8a8
 MD5 75a29a8ad0cbb178eb680557bbdc4f39 netkit-ftpd-0.17-r5.ebuild 1571
 RMD160 ac26540f7510735ed9dc04b3e45147b8a80133b0 netkit-ftpd-0.17-r5.ebuild 1571
 SHA256 39d9b1cc5633a9a35117bc567e23380e14070783838ca6fc78961dcd391b22a1 netkit-ftpd-0.17-r5.ebuild 1571
-MISC ChangeLog 5440 RMD160 a4ef6763df7ae47820cd691120c3aea1c395850a SHA1 b9c3711b62d5abfea0452d3e5f18933288504f1a SHA256 db4ee6ca8ae5a3906ddef537fe4b283600af8a92ab286e43b67141dea7cf7482
-MD5 d7e108e3917c626ab76c5319c0a0035d ChangeLog 5440
-RMD160 a4ef6763df7ae47820cd691120c3aea1c395850a ChangeLog 5440
-SHA256 db4ee6ca8ae5a3906ddef537fe4b283600af8a92ab286e43b67141dea7cf7482 ChangeLog 5440
+EBUILD netkit-ftpd-0.17-r6.ebuild 1550 RMD160 7c9572e28712de00a1a96c940c931ab38b9c1a56 SHA1 a4744ba251e74d2b0066db5c9f993452a694fd7e SHA256 0aaac24001710a395e905bd9f4f6959a8c30f9705a7e0426a2f261d3f4d5c1e1
+MD5 388b99a2f8a286f4112ef853d1e3e67c netkit-ftpd-0.17-r6.ebuild 1550
+RMD160 7c9572e28712de00a1a96c940c931ab38b9c1a56 netkit-ftpd-0.17-r6.ebuild 1550
+SHA256 0aaac24001710a395e905bd9f4f6959a8c30f9705a7e0426a2f261d3f4d5c1e1 netkit-ftpd-0.17-r6.ebuild 1550
+MISC ChangeLog 5605 RMD160 f2889d37713af6629b54e43167ca82ef2a2258f5 SHA1 5d01387eab0b9b56d8f1199c10b9d2610e37307a SHA256 687cfe05fb2259c6d2fb72f7e4645085a6a28eaeabd5a0b64f1d6ec14cccc1e8
+MD5 14d179e87b017860a2a82ad2f403294a ChangeLog 5605
+RMD160 f2889d37713af6629b54e43167ca82ef2a2258f5 ChangeLog 5605
+SHA256 687cfe05fb2259c6d2fb72f7e4645085a6a28eaeabd5a0b64f1d6ec14cccc1e8 ChangeLog 5605
 MISC metadata.xml 165 RMD160 1c3eeab5c3fc7c211e19ce70d30db054b3448591 SHA1 e5bc9fac08f72762fdc827e1b520ed403667be37 SHA256 0879c713d0d1ea2f39c1088bf4717b1328b4ab06d6f5dd6968c5559750422ae6
 MD5 2fde084ac8d62be622a13e156d25f684 metadata.xml 165
 RMD160 1c3eeab5c3fc7c211e19ce70d30db054b3448591 metadata.xml 165
@@ -53,10 +57,13 @@ SHA256 193c18b7c4e2467ed5453bee8fc5e2b66ab314c429cc4a2daf79fbe652de26ba files/di
 MD5 a5158bf958d1411f9daefa3a43b7f12e files/digest-netkit-ftpd-0.17-r5 497
 RMD160 db856b5782788330427703698f410c205225d8e2 files/digest-netkit-ftpd-0.17-r5 497
 SHA256 193c18b7c4e2467ed5453bee8fc5e2b66ab314c429cc4a2daf79fbe652de26ba files/digest-netkit-ftpd-0.17-r5 497
+MD5 a5158bf958d1411f9daefa3a43b7f12e files/digest-netkit-ftpd-0.17-r6 497
+RMD160 db856b5782788330427703698f410c205225d8e2 files/digest-netkit-ftpd-0.17-r6 497
+SHA256 193c18b7c4e2467ed5453bee8fc5e2b66ab314c429cc4a2daf79fbe652de26ba files/digest-netkit-ftpd-0.17-r6 497
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v1.4.8 (GNU/Linux)
 
-iD8DBQFGPbRf6J2i8a8J4okRArKGAKDafpYJQ1sdTkImdv244wW0m/lsfACfUGQW
-sGtuUAXuIz3SwcFbX8yvrQc=
-=Uatg
+iEYEARECAAYFAkd4Ad4ACgkQOeoy/oIi7uyqUwCfY0+jy9edcHUfODqIvGBwnLId
+Jl8AoOsNLrYW6XmgkVh9D0bnoekgvRow
+=OfQY
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/netkit-ftpd/files/digest-netkit-ftpd-0.17-r6 b/net-ftp/netkit-ftpd/files/digest-netkit-ftpd-0.17-r6
new file mode 100644
index 000000000000..9c0de1ba222e
--- /dev/null
+++ b/net-ftp/netkit-ftpd/files/digest-netkit-ftpd-0.17-r6
@@ -0,0 +1,6 @@
+MD5 0b9185d5144904798b721354ea9ff156 linux-ftpd-0.17-ssl.patch 36459
+RMD160 5a0d7301f69b4c1714f36419f98134f9aa0ce874 linux-ftpd-0.17-ssl.patch 36459
+SHA256 0082ee6a71fdd83f61e63166f7bbba97c204cdc67f9e1bf10f2df31590fba780 linux-ftpd-0.17-ssl.patch 36459
+MD5 f5f491564812db5d8783daa538c49186 linux-ftpd-0.17.tar.gz 46763
+RMD160 869e410d8f063c764c04f1d3b41b625a9d679d22 linux-ftpd-0.17.tar.gz 46763
+SHA256 65a0b249e38bf3c3a16dbd4d3edd2657683ca8f47b307e92007f378b21d2fa65 linux-ftpd-0.17.tar.gz 46763
diff --git a/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r6.ebuild b/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r6.ebuild
new file mode 100644
index 000000000000..068bc031ddba
--- /dev/null
+++ b/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r6.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/netkit-ftpd/netkit-ftpd-0.17-r6.ebuild,v 1.1 2007/12/30 20:38:31 ulm Exp $
+
+inherit eutils ssl-cert
+
+MY_P="linux-ftpd-${PV}"
+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/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-ssl.patch"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~s390 ~sh ~sparc ~x86"
+IUSE="ssl"
+
+DEPEND="ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}
+	virtual/inetd"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${MY_P}.tar.gz
+	cd "${S}"
+	use ssl && epatch "${DISTDIR}"/${MY_P}-ssl.patch "${FILESDIR}"/${P}-cleanup-ssl.patch
+	epatch "${FILESDIR}"/${P}-cleanup.patch
+	epatch "${FILESDIR}"/${P}-build.patch
+	epatch "${FILESDIR}"/${P}-shadowfix.patch
+	epatch "${FILESDIR}"/${P}-gcc41.patch
+	epatch "${FILESDIR}"/${P}-setguid.patch
+}
+
+src_compile() {
+	./configure --prefix=/usr || die "configure failed"
+	emake || die "parallel make failed"
+}
+
+src_install() {
+	dobin ftpd/ftpd || die
+	doman ftpd/ftpd.8
+	dodoc README ChangeLog
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/ftp.xinetd ftp
+}
+
+pkg_postinst() {
+	if use ssl ; then
+		install_cert /etc/ssl/certs/ftpd
+		elog "In order to start the server with SSL support"
+		elog "You need a certificate /etc/ssl/certs/ftpd.pem."
+		elog "A temporary certificiate has been created."
+	fi
+}