Fixed up init/conf scripts. bumping security fix to stable x86.

7 files changed, 46 insertions, 12 deletions

diff --git a/net-ftp/oftpd/ChangeLog b/net-ftp/oftpd/ChangeLog
index 6dac1aa7d56f..e198145dd561 100644
--- a/net-ftp/oftpd/ChangeLog
+++ b/net-ftp/oftpd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/oftpd
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.6 2004/03/26 00:43:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/ChangeLog,v 1.7 2004/03/26 03:02:50 eradicator Exp $
+
+  25 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  oftpd-0.3.6-r7.ebuild, oftpd-0.3.7.ebuild, files/conf.d.oftpd,
+  files/init.d.oftpd, files/oftpd.rc6:
+  Fixed up init/conf scripts.  bumping security fix to stable x86.
 
 *oftpd-0.3.7 (25 Mar 2004)
 
diff --git a/net-ftp/oftpd/Manifest b/net-ftp/oftpd/Manifest
index 2719f2dc09f2..e6e4138c45c1 100644
--- a/net-ftp/oftpd/Manifest
+++ b/net-ftp/oftpd/Manifest
@@ -1,6 +1,8 @@
-MD5 b9d5cdb6db7eb365ccd97c67caaeea56 ChangeLog 1018
-MD5 a5342dd37b984ea023c6aaf317603910 oftpd-0.3.7.ebuild 924
-MD5 42342dabdc03adefecd556c8f435ce47 oftpd-0.3.6-r7.ebuild 924
+MD5 5a81a86a0f78385ffefa7aede4d36c2b oftpd-0.3.7.ebuild 991
+MD5 ee8481debb3c655eda4991227dc21dc7 ChangeLog 1266
+MD5 0f7a846dd3f2197538502db078109b71 metadata.xml 351
+MD5 94c08e096ce06b086c4176e68d4983e8 oftpd-0.3.6-r7.ebuild 993
+MD5 a8787fb0c452c7d62131d869a7117a73 files/init.d.oftpd 685
+MD5 b0ba4d96ae0eb98abce711409607eda4 files/conf.d.oftpd 469
 MD5 56b946d01010a7a4f6eab6dfb5f1313a files/digest-oftpd-0.3.6-r7 62
-MD5 8cd4eb1845d221bd2181adc8466596ab files/oftpd.rc6 673
 MD5 14eb385d2dee30be94c941c01703ab40 files/digest-oftpd-0.3.7 62
diff --git a/net-ftp/oftpd/files/conf.d.oftpd b/net-ftp/oftpd/files/conf.d.oftpd
new file mode 100644
index 000000000000..ac54aeaa4c79
--- /dev/null
+++ b/net-ftp/oftpd/files/conf.d.oftpd
@@ -0,0 +1,13 @@
+# 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
diff --git a/net-ftp/oftpd/files/oftpd.rc6 b/net-ftp/oftpd/files/init.d.oftpd
index a3d65ffd799d..37190cec40b7 100644
--- a/net-ftp/oftpd/files/oftpd.rc6
+++ b/net-ftp/oftpd/files/init.d.oftpd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/oftpd.rc6,v 1.5 2004/03/04 19:29:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/files/init.d.oftpd,v 1.1 2004/03/26 03:02:51 eradicator Exp $
 
 depend() {
 	need net
@@ -9,7 +9,7 @@ depend() {
 
 checkconfig() {
 	if [ -z "$FTPUSER" ] || [ -z "$FTPROOT" ] ; then
-		eerror "You need to setup FTPUSER and FTPROOT in /etc/rc.conf"
+		eerror "You need to setup FTPUSER and FTPROOT in /etc/conf.d/oftpd"
 		return 1
 	fi
 }
diff --git a/net-ftp/oftpd/metadata.xml b/net-ftp/oftpd/metadata.xml
new file mode 100644
index 000000000000..77a3d8c7f9ac
--- /dev/null
+++ b/net-ftp/oftpd/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>eradicator@gentoo.org</email>
+    <name>Jeremy Huddleston</name>
+    <description>Temporary maintainership.  Feel free to take over.</description>
+  </maintainer>
+</pkgmetadata>
diff --git a/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild b/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild
index 767923d6ed14..3a187880994f 100644
--- a/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild,v 1.9 2004/03/26 00:43:59 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.6-r7.ebuild,v 1.10 2004/03/26 03:02:50 eradicator Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Secure, small, anonymous only ftpd"
@@ -30,5 +30,7 @@ src_install() {
 	dodoc AUTHORS BUGS COPYING INSTALL FAQ NEWS README TODO
 	dodir /home/ftp
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/oftpd.rc6 oftpd
+	newexe ${FILESDIR}/init.d.oftpd oftpd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/conf.d.oftpd oftpd
 }
diff --git a/net-ftp/oftpd/oftpd-0.3.7.ebuild b/net-ftp/oftpd/oftpd-0.3.7.ebuild
index 06d7d5e61279..f65195f96a67 100644
--- a/net-ftp/oftpd/oftpd-0.3.7.ebuild
+++ b/net-ftp/oftpd/oftpd-0.3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7.ebuild,v 1.2 2004/03/26 00:49:21 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/oftpd/oftpd-0.3.7.ebuild,v 1.3 2004/03/26 03:02:50 eradicator Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Secure, small, anonymous only ftpd"
@@ -11,7 +11,7 @@ DEPEND="virtual/glibc"
 
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~x86 ~sparc ~ppc ~ppc64"
+KEYWORDS="x86 ~sparc ~ppc ~ppc64"
 
 src_compile() {
 	# local myconf
@@ -30,5 +30,7 @@ src_install() {
 	dodoc AUTHORS BUGS COPYING INSTALL FAQ NEWS README TODO
 	dodir /home/ftp
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/oftpd.rc6 oftpd
+	newexe ${FILESDIR}/init.d.oftpd oftpd
+	insinto /etc/conf.d
+	newins ${FILESDIR}/conf.d.oftpd oftpd
 }