fix config file

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

5 files changed, 15 insertions, 46 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index 73ae3855a8be..f803df9de235 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/oftpd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.28 2010/09/01 10:00:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.29 2010/11/06 01:37:10 xmw Exp $
+
+*oftpd-0.3.7-r6 (06 Nov 2010)
+
+  06 Nov 2010; Michael Weber <xmw@gentoo.org> -oftpd-0.3.7-r4.ebuild,
+  -oftpd-0.3.7-r5.ebuild, +oftpd-0.3.7-r6.ebuild, -files/conf.d.oftpd-r1,
+  +files/conf.d.oftpd-r6:
+  Rev bump to fix default port and description in config file (bug #344169,
+  thanks to Christohper Harrington <ironiridis@gmail.com>).
 
 *oftpd-0.3.7-r5 (01 Sep 2010)
 
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index fa0d35fed7ed..ebf18582e45f 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -1,5 +1,5 @@
 AUX conf.d.oftpd 469 RMD160 2e70e1d86efadaf72d0f6fe56bd8f07167a7badb SHA1 8e0d30aa2ecf77a58a3790ecc1fee32a420d22d9 SHA256 d1bab71ab0942df8dcb2f88bb50a3c318fe97676d278ccf26d540fdc9c4e69ba
-AUX conf.d.oftpd-r1 578 RMD160 84ba38720a6a2ac8f0873ebbc4cab82f0394232c SHA1 821a500ff9a3d8e35f7aaf39c4c3935546399ae1 SHA256 6ba360cac50935ee9c8ed2961b95e57d7c63c5f63dc0ce7befb942756e054f62
+AUX conf.d.oftpd-r6 579 RMD160 8433daa924b3cda57ca579ef451c25749b07b4d2 SHA1 9989021aac01c58e0b5e5703b2263c32184a0c34 SHA256 fabff4fcce71d756ea1fb88951dee6f6146aa3d0dc867ccbca02723369fce800
 AUX init.d.oftpd 676 RMD160 95af3c24dda70f631f487495d0a67f280ec1277a SHA1 e50c5f5b83ec97129aa6510d7ba957f565b36773 SHA256 96d69985013735c39e6e4913797fe753e8971cf836e4bc8e5a8f5ed3d8dc03a2
 AUX init.d.oftpd-r1 722 RMD160 3e24790f4d56d2eff46ce810c8433a10f852c1ad SHA1 49e4d235f382eedd24b25955c1cf2764a94ee08b SHA256 cd3c98cc8bc3255503d9cc9946749d53d90410bf9d4c0a3a9ddb6819c87ab84e
 AUX oftpd-0.3.7-family-1.patch 936 RMD160 0668323bb69fac190d8b1c4bcb0f5ed1c9c2b692 SHA1 945970c75cd4d23b4027f72521f4390a8b8ee4e6 SHA256 fe903d6fbb4a523f7b85dfb4c112f489da07764e8d67e15faa9b8380d400ba2a
@@ -8,7 +8,6 @@ AUX oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch 14107 RMD160 73cd9354fc48d887d6c38
 DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 RMD160 32c080fa2898272b7bde05c806371021bc2d9ea9 SHA1 0502988b5bde25961efdceb36c303dbb351744ea SHA256 b1165052e0169e1495b5009111f07ba56cb81ce34234b9578a9eb2862e76ac3d
 DIST oftpd-0.3.7.tar.gz 97364 RMD160 9430607bf0c51847a4e4cc97c84be0495c931183 SHA1 d6d3ce43c009bb68736d50739e9a2f60bede99c1 SHA256 b135cd2bc6c54e03e5374845964eab73d5e567160c15bb4226c1c922b1e6d64e
 EBUILD oftpd-0.3.7-r3.ebuild 1042 RMD160 469cda3176006ad6434c69eb21f998bd487fe586 SHA1 730851bdfd154d4242c45384dba08698e19c3fac SHA256 33677fd0c45af6bdf47cf873211a260483afa236432efe5c4f7fc717e89e9323
-EBUILD oftpd-0.3.7-r4.ebuild 1025 RMD160 11068cffccf61dab85f30e1f059ac24caad37f3a SHA1 9f5cd1db083b7955a05f9afa9c4d3ef2ea8d7e54 SHA256 956f0c9fbe359fcf1622776021b4a6ecc70a0b4b8edc1f0a68441b56bf12190f
-EBUILD oftpd-0.3.7-r5.ebuild 1236 RMD160 136ae9fb1f98ba2ce9726d9ed8496b534414e38f SHA1 ccb6403c019b7f4f0037089950eb2e469ef9b034 SHA256 2a19c893c2179b10f4241e139238e1c09805b7a8f6900a7f0c568d9629a585f0
-MISC ChangeLog 4475 RMD160 4d49b2ac305ab46ebb9d8857da7f554c2e8a83d6 SHA1 c3724e784463ac095d6197c6d1c9f6430eba72d7 SHA256 4a22b13cae9f6355f783f946b8263f927e8e7ebd7d03a5e964eb020a86351a15
+EBUILD oftpd-0.3.7-r6.ebuild 1236 RMD160 d8b8c48bf4ee07264ba27a84a7de73e9945ce1ea SHA1 1e69eb43ec30574fb25e1f28def6d3074a19a840 SHA256 f95879522632d316e6f331b3b10126e9ee4fe96ae165068d193f778f422db462
+MISC ChangeLog 4813 RMD160 f5e4d67edb571cde4ad383119434f3ee6d4c3272 SHA1 7603d9c0305edbbb2233aa87f64e02b3807dba41 SHA256 b1dd627542947bcced29de7825e57674b70b03836f599e66b0a8e46ca1772648
 MISC metadata.xml 255 RMD160 074d0756614e5268d188aa562b5774eedda511d0 SHA1 ee37445e389c446bbdc21503ba2b6c9dd6746eb1 SHA256 d540a4739cb022c072918b4b0b648e9121a7dcb956ddee9505fa6b9f9fc813e7
diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r1 b/net-ftp/oftpd/files/conf.d.oftpd-r6
index 67c40c897b6f..dee1cba00863 100644
--- a/net-ftp/oftpd/files/conf.d.oftpd-r1
+++ b/net-ftp/oftpd/files/conf.d.oftpd-r6
@@ -1,4 +1,4 @@
-# Please read the oftd(8) man page for a more detailed explaination of these
+# Please read the oftpd(8) man page for a more detailed explaination of these
 # variables.
 #
 # FTPUSER (user-name in the man page):
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild
deleted file mode 100644
index 0e90fea40bd1..000000000000
--- a/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r4.ebuild,v 1.1 2009/05/29 14:00:05 rbu Exp $
-
-EAPI=2
-inherit eutils
-
-DESCRIPTION="Secure, small, anonymous only ftpd"
-HOMEPAGE="http://www.time-travellers.org/oftpd"
-SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="net-ftp/ftpbase"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Don't crash when using an unsupported address family, #159178.
-	epatch "${FILESDIR}"/oftpd-0.3.7-family.patch
-}
-
-src_configure() {
-	# local myconf
-	# ipv6 support busted according to lamer
-	# use ipv6 && myconf="${myconf} --enable-ipv6"
-	econf --bindir=/usr/sbin || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS FAQ NEWS README TODO
-	keepdir /home/ftp
-	newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd
-	newconfd "${FILESDIR}"/conf.d.oftpd-r1 oftpd
-}
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild
index e3be0fe5f834..e9dd22d4c758 100644
--- a/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r5.ebuild,v 1.1 2010/09/01 10:00:39 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7-r6.ebuild,v 1.1 2010/11/06 01:37:10 xmw Exp $
 
 EAPI=2
 
@@ -42,5 +42,5 @@ src_install() {
 	dodoc AUTHORS BUGS FAQ NEWS README TODO || die
 	keepdir /home/ftp
 	newinitd "${FILESDIR}"/init.d.oftpd-r1 oftpd || die
-	newconfd "${FILESDIR}"/conf.d.oftpd-r1 oftpd || die
+	newconfd "${FILESDIR}"/conf.d.oftpd-r6 oftpd || die
 }