summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Shakaryan <omp@gentoo.org>2006-06-11 06:39:16 +0000
committerDavid Shakaryan <omp@gentoo.org>2006-06-11 06:39:16 +0000
commit22b133b6f7b7156a72491de22582602bad531118 (patch)
treeb5852c20ca971642b157fe1c34322233a185154c
parentnet-ftp/ftpd: QA changes (diff)
downloadsunrise-22b133b6f7b7156a72491de22582602bad531118.tar.gz
sunrise-22b133b6f7b7156a72491de22582602bad531118.tar.bz2
sunrise-22b133b6f7b7156a72491de22582602bad531118.zip
net-ftp/ftpd - minor QA improvements
svn path=/; revision=52
-rw-r--r--net-ftp/ftpd/Manifest8
-rw-r--r--net-ftp/ftpd/ftpd-0.17-r4.ebuild21
2 files changed, 12 insertions, 17 deletions
diff --git a/net-ftp/ftpd/Manifest b/net-ftp/ftpd/Manifest
index aa4b7e04d..282aea629 100644
--- a/net-ftp/ftpd/Manifest
+++ b/net-ftp/ftpd/Manifest
@@ -16,10 +16,10 @@ RMD160 64fc0211ae0f7b7760a7460a9d1044736833d7fc files/ftpd-0.17-shadowfix.patch
SHA256 8c8b221554b713c7d842b2b10608010fbf264577cebfaf20c9f34e560e054886 files/ftpd-0.17-shadowfix.patch 895
DIST linux-ftpd-0.17-ssl.patch 36459 RMD160 5a0d7301f69b4c1714f36419f98134f9aa0ce874 SHA1 a684c075dbc7603b40704713350c1bb95d98a4c5 SHA256 0082ee6a71fdd83f61e63166f7bbba97c204cdc67f9e1bf10f2df31590fba780
DIST linux-ftpd-0.17.tar.gz 46763 RMD160 869e410d8f063c764c04f1d3b41b625a9d679d22 SHA1 b348e2c9561d746a42b7a24ba8730a3adc203dfb SHA256 65a0b249e38bf3c3a16dbd4d3edd2657683ca8f47b307e92007f378b21d2fa65
-EBUILD ftpd-0.17-r4.ebuild 1490 RMD160 d06ab20028b9a067aefdc1b765dce5514aa1be33 SHA1 da8dcd35373e1be7d6e1f69304c78dfed839623b SHA256 436d4b69e6810e6aee04eb214c50696f4d72a2a0cdf843a1a58acaa0b8c6f7a3
-MD5 544a55b7342f33a86e6728aa2c7ef23d ftpd-0.17-r4.ebuild 1490
-RMD160 d06ab20028b9a067aefdc1b765dce5514aa1be33 ftpd-0.17-r4.ebuild 1490
-SHA256 436d4b69e6810e6aee04eb214c50696f4d72a2a0cdf843a1a58acaa0b8c6f7a3 ftpd-0.17-r4.ebuild 1490
+EBUILD ftpd-0.17-r4.ebuild 1380 RMD160 6a5ee4ff086160e5a65504db3aaa70ae077ed4c6 SHA1 f75bb977bbbdd101d20c5cc1cef7c1dfd96c585f SHA256 1bcb411fd2e71c5356330187a0dd5e05231832415d16b20d529d255eb22143d2
+MD5 39b658b291ffc5403541193dc02d2f4a ftpd-0.17-r4.ebuild 1380
+RMD160 6a5ee4ff086160e5a65504db3aaa70ae077ed4c6 ftpd-0.17-r4.ebuild 1380
+SHA256 1bcb411fd2e71c5356330187a0dd5e05231832415d16b20d529d255eb22143d2 ftpd-0.17-r4.ebuild 1380
MISC ChangeLog 472 RMD160 858fa05d385aa0315017f0fd5d2415406d000a73 SHA1 a92725b14f558b2a8fd969b06e5d28487e102dfc SHA256 e73bca80c50fb267d16ae5f41ca8d65209f66b96df4c37b8a29093876c60ee3f
MD5 af43162cafd5858e6abcc8b0562e44bb ChangeLog 472
RMD160 858fa05d385aa0315017f0fd5d2415406d000a73 ChangeLog 472
diff --git a/net-ftp/ftpd/ftpd-0.17-r4.ebuild b/net-ftp/ftpd/ftpd-0.17-r4.ebuild
index 6be28eff2..a8d0c0756 100644
--- a/net-ftp/ftpd/ftpd-0.17-r4.ebuild
+++ b/net-ftp/ftpd/ftpd-0.17-r4.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2006 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.5 2005/11/11 15:43:40 blubb Exp $
+# $Header: $
inherit eutils ssl-cert
-
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
@@ -20,18 +19,16 @@ DEPEND="ssl? ( dev-libs/openssl )"
RDEPEND="${DEPEND}
virtual/inetd"
-S="${WORKDIR}"/linux-${P}
+S=${WORKDIR}/linux-${P}
src_unpack() {
unpack ${A}
cd "${S}"
- if use ssl; then
- epatch "${DISTDIR}"/linux-${P}-ssl.patch
- fi
- epatch "${FILESDIR}"/${P}-shadowfix.patch
+ use ssl && epatch "${DISTDIR}/linux-${P}-ssl.patch"
+ epatch "${FILESDIR}/${P}-shadowfix.patch"
# fixes gcc 4.1 compatibility
- epatch "${FILESDIR}"/${P}-gcc41.patch
+ epatch "${FILESDIR}/${P}-gcc41.patch"
}
src_compile() {
@@ -46,17 +43,15 @@ src_install() {
doman ftpd/ftpd.8
dodoc README ChangeLog
insinto /etc/xinetd.d
- newins "${FILESDIR}"/ftp.xinetd ftp
- if use ssl;
- then
+ newins "${FILESDIR}/ftp.xinetd" ftp
+ if use ssl; then
insinto /etc/ssl/certs/
docert ftpd
fi
}
pkg_postinst() {
- if use ssl;
- then
+ 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."