Added support to change tcp port to the init script. Closes bug #97183.

Package-Manager: portage-2.0.51.22-r1

7 files changed, 105 insertions, 7 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index 469f88b34048..ceccd813a5ed 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/oftpd
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.14 2005/05/15 16:10:09 voxus Exp $
+# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.15 2005/07/02 23:15:07 eradicator Exp $
+
+*oftpd-0.3.7-r2 (02 Jul 2005)
+
+  02 Jul 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/conf.d.oftpd-r1, files/init.d.oftpd, +files/init.d.oftpd-r1,
+  +oftpd-0.3.7-r2.ebuild:
+  Added support to change tcp port to the init script.  Closes bug #97183.
 
   15 May 2005; Konstantin Arkhipov <voxus@gentoo.org> oftpd-0.3.7-r1.ebuild:
   Added ~amd64 keyword wrt bug #92567. Header fixed.
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index 76c4b4637e6d..9dd7eb3fb5ba 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -1,6 +1,20 @@
-MD5 aa7ae4176d791906c638a4b01cc6c649 ChangeLog 2113
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 9b3d5cec9ba56085c010b1c149b00b0c ChangeLog 2378
 MD5 0f7a846dd3f2197538502db078109b71 metadata.xml 351
 MD5 741cbc4b00b06c6579b17b8acffca400 oftpd-0.3.7-r1.ebuild 832
-MD5 14eb385d2dee30be94c941c01703ab40 files/digest-oftpd-0.3.7-r1 62
+MD5 dd52078d730ad43aef6777c07969fc57 oftpd-0.3.7-r2.ebuild 839
 MD5 b0ba4d96ae0eb98abce711409607eda4 files/conf.d.oftpd 469
-MD5 e172cb3380495952dbccdc43d5168a16 files/init.d.oftpd 671
+MD5 14eb385d2dee30be94c941c01703ab40 files/digest-oftpd-0.3.7-r1 62
+MD5 42f3108677c4a53b623f3646d6db5fe2 files/init.d.oftpd 676
+MD5 dd7b994af55686281ddf1f73b8cba663 files/conf.d.oftpd-r1 578
+MD5 72d1cf62ed5467e49076dcdb4e932d9d files/init.d.oftpd-r1 703
+MD5 14eb385d2dee30be94c941c01703ab40 files/digest-oftpd-0.3.7-r2 62
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCxyAHArHZZzCEUG0RAtFKAJ0YrnkvrBeV2MF6zlbbHNXlDlHgIwCfbaIh
+LeGhOEdI0OCj2rMy2Ic433A=
+=BUGq
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/oftpd/files/conf.d.oftpd-r1 b/net-ftp/oftpd/files/conf.d.oftpd-r1
new file mode 100644
index 000000000000..67c40c897b6f
--- /dev/null
+++ b/net-ftp/oftpd/files/conf.d.oftpd-r1
@@ -0,0 +1,17 @@
+# Please read the oftd(8) man page for a more detailed explaination of these
+# variables.
+#
+# FTPUSER (user-name in the man page):
+# Set this variable to the user to run the ftp daemon as
+FTPUSER=ftp
+
+# FTPROOT (root-directory in the man page):
+# The server uses chroot(2) to change the root directory of the server to this
+# directory. When a user connects, this is the directory that they  will start
+# in, and is the top of their directory tree.
+#
+FTPROOT=/home/ftp
+
+# FTPPORT (TCP port)
+# 22 is the standard ftp port, but you can change it here to something else
+FTPPORT=22
diff --git a/net-ftp/oftpd/files/digest-oftpd-0.3.7-r2 b/net-ftp/oftpd/files/digest-oftpd-0.3.7-r2
new file mode 100644
index 000000000000..b99ac815fee3
--- /dev/null
+++ b/net-ftp/oftpd/files/digest-oftpd-0.3.7-r2
@@ -0,0 +1 @@
+MD5 1a396ad12584c7efe3a0e712dadf28be oftpd-0.3.7.tar.gz 97364
diff --git a/net-ftp/oftpd/files/init.d.oftpd b/net-ftp/oftpd/files/init.d.oftpd
index e655478b1bdf..c398abfa9b71 100644
--- a/net-ftp/oftpd/files/init.d.oftpd
+++ b/net-ftp/oftpd/files/init.d.oftpd
@@ -1,10 +1,10 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd,v 1.3 2004/10/05 22:24:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd,v 1.4 2005/07/02 23:15:07 eradicator Exp $
 
 depend() {
-	use net
+	need net
 }
 
 checkconfig() {
diff --git a/net-ftp/oftpd/files/init.d.oftpd-r1 b/net-ftp/oftpd/files/init.d.oftpd-r1
new file mode 100644
index 000000000000..057b1146cadf
--- /dev/null
+++ b/net-ftp/oftpd/files/init.d.oftpd-r1
@@ -0,0 +1,29 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd-r1,v 1.1 2005/07/02 23:15:07 eradicator Exp $
+
+depend() {
+	need net
+}
+
+checkconfig() {
+	if [[ -z ${FTPUSER} || -z ${FTPROOT} || -z ${FTPPORT} ] ; then
+		eerror "You need to setup FTPUSER and FTPROOT in /etc/conf.d/oftpd"
+		return 1
+	fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting oftpd"
+       	start-stop-daemon --start --exec /usr/sbin/oftpd -- -p ${FTPPORT} ${FTPUSER} ${FTPROOT}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping oftpd"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/oftpd
+	eend $?
+}
diff --git a/net-ftp/oftpd/oftpd-0.3.7-r2.ebuild b/net-ftp/oftpd/oftpd-0.3.7-r2.ebuild
new file mode 100644
index 000000000000..17c8834cf83b
--- /dev/null
+++ b/net-ftp/oftpd/oftpd-0.3.7-r2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2005 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-r2.ebuild,v 1.1 2005/07/02 23:15:07 eradicator Exp $
+
+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 ~sparc ~x86"
+IUSE=""
+
+DEPEND=""
+
+src_compile() {
+	# local myconf
+	# ipv6 support busted according to lamer
+	# use ipv6 && myconf="${myconf} --enable-ipv6"
+	econf --bindir=/usr/sbin || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die
+	dodoc AUTHORS BUGS FAQ NEWS README TODO
+	keepdir /home/ftp
+	newinitd ${FILESDIR}/init.d.oftpd oftpd
+	newconfd ${FILESDIR}/conf.d.oftpd oftpd
+}