Add conf.d options to set command line options (bug #38219). init script depends on domainname rather than having it set in two places. Marking latest ebuild stable on amd64 and x86. Removing old ebuilds.

15 files changed, 51 insertions, 134 deletions

diff --git a/net-nds/ypserv/ChangeLog b/net-nds/ypserv/ChangeLog
index 438e0e574c38..441bb5f570c5 100644
--- a/net-nds/ypserv/ChangeLog
+++ b/net-nds/ypserv/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/ypserv
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.18 2004/06/25 00:24:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.19 2004/07/24 06:26:27 eradicator Exp $
+
+  23 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  files/rpc.yppasswdd-r1, files/rpc.ypxfrd, +files/rpc.ypxfrd.confd,
+  +files/ypserv, files/ypserv.confd, -files/ypserv.rc, -ypserv-2.5.ebuild:
+  Add conf.d options to set command line options (bug #38219). init script
+  depends on domainname rather than having it set in two places. Marking latest
+  ebuild stable on amd64 and x86. Removing old ebuilds.
 
   11 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
   files/rpc.yppasswdd-r1, ypserv-2.13-r1.ebuild:
diff --git a/net-nds/ypserv/files/digest-ypserv-2.5 b/net-nds/ypserv/files/digest-ypserv-2.5
deleted file mode 100644
index c4fe9efbd871..000000000000
--- a/net-nds/ypserv/files/digest-ypserv-2.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 40832a68d66b154f25b774b59b715eba ypserv-2.5.tar.gz 209416
diff --git a/net-nds/ypserv/files/digest-ypserv-2.5-r1 b/net-nds/ypserv/files/digest-ypserv-2.5-r1
deleted file mode 100644
index c4fe9efbd871..000000000000
--- a/net-nds/ypserv/files/digest-ypserv-2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 40832a68d66b154f25b774b59b715eba ypserv-2.5.tar.gz 209416
diff --git a/net-nds/ypserv/files/rpc.yppasswdd-r1 b/net-nds/ypserv/files/rpc.yppasswdd-r1
index badd48292444..a14762516518 100644
--- a/net-nds/ypserv/files/rpc.yppasswdd-r1
+++ b/net-nds/ypserv/files/rpc.yppasswdd-r1
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/rpc.yppasswdd-r1,v 1.3 2004/07/15 00:19:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/rpc.yppasswdd-r1,v 1.4 2004/07/24 06:26:28 eradicator Exp $
 
 depend() {
 	need net portmap ypserv
@@ -10,7 +10,7 @@ depend() {
 start() {
 	ebegin "Starting rpc.yppasswdd"
 	YOPTS=""
-	if [ -n "${YPPASSWDD_OPTS}" ]; then YOPTS="-- $YPPASSWDD_OPTS"; fi
+	if [ -n "${YPPASSWDD_OPTS}" ]; then YOPTS="-- ${YPPASSWDD_OPTS}"; fi
 	start-stop-daemon --start --quiet --exec /usr/sbin/rpc.yppasswdd ${YOPTS}
 	eend $?
 }
diff --git a/net-nds/ypserv/files/rpc.ypxfrd b/net-nds/ypserv/files/rpc.ypxfrd
index cadf1fbfa8b5..359a3aa44b75 100644
--- a/net-nds/ypserv/files/rpc.ypxfrd
+++ b/net-nds/ypserv/files/rpc.ypxfrd
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/rpc.ypxfrd,v 1.3 2004/07/15 00:19:17 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/rpc.ypxfrd,v 1.4 2004/07/24 06:26:28 eradicator Exp $
 
 depend() {
 	need net portmap ypserv
@@ -9,7 +9,9 @@ depend() {
 
 start() {
 	ebegin "Starting rpc.ypxfrd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/rpc.ypxfrd
+	YOPTS=""
+	if [ -n "${YPXFRD_OPTS}" ]; then YOPTS="-- ${YPXFRD_OPTS}"; fi
+ 	start-stop-daemon --start --quiet --exec /usr/sbin/rpc.ypxfrd ${YOPTS}
 	eend $?
 }
 
diff --git a/net-nds/ypserv/files/rpc.ypxfrd.confd b/net-nds/ypserv/files/rpc.ypxfrd.confd
new file mode 100644
index 000000000000..73cfc47e7154
--- /dev/null
+++ b/net-nds/ypserv/files/rpc.ypxfrd.confd
@@ -0,0 +1,3 @@
+# Command line options to pass to rpc.ypxfrd
+# eg: you can pass --port <number> to use a non-standard port
+YPXFRD_OPTS=""
diff --git a/net-nds/ypserv/files/ypserv b/net-nds/ypserv/files/ypserv
new file mode 100755
index 000000000000..9f616059f1f4
--- /dev/null
+++ b/net-nds/ypserv/files/ypserv
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/ypserv,v 1.3 2004/07/24 06:26:28 eradicator Exp $
+
+depend() {
+	need net portmap domainname
+}
+
+start() {
+	ebegin "Starting NIS Server"
+	YOPTS=""
+	if [ -n "${YPSERV_OPTS}" ]; then YOPTS="-- ${YPSERV_OPTS}"; fi
+	start-stop-daemon --start --quiet --exec /usr/sbin/ypserv ${YOPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping NIS Server"
+	start-stop-daemon --stop --quiet --exec /usr/sbin/ypserv
+	eend $?
+}
diff --git a/net-nds/ypserv/files/ypserv.confd b/net-nds/ypserv/files/ypserv.confd
index 7f2e74440a24..0ae9756dc81b 100644
--- a/net-nds/ypserv/files/ypserv.confd
+++ b/net-nds/ypserv/files/ypserv.confd
@@ -1,4 +1,4 @@
 # Config file for /etc/init.d/ypserv
 
-# NIS domain (not necessarily the same as DNS domain)
-#YP_DOMAIN=my.nis.domain
+# Command line options to pass to ypserv:
+YPSERV_OPTS=""
diff --git a/net-nds/ypserv/files/ypserv.rc b/net-nds/ypserv/files/ypserv.rc
deleted file mode 100644
index a838d7adc149..000000000000
--- a/net-nds/ypserv/files/ypserv.rc
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/ypserv.rc,v 1.3 2004/07/15 00:19:17 agriffis Exp $
-
-depend() {
-	need net portmap
-}
-
-checkconfig() {
-    [ -n "$YP_DOMAIN" ] && return 0
-    eerror "You need to setup YP_DOMAIN in /etc/conf.d/ypserv"
-    return 1
-}
-
-start() {
-    checkconfig || return 1
-	ebegin "Starting NIS Server"
-    ypdomainname "$YP_DOMAIN"
-	start-stop-daemon --start --quiet --exec /usr/sbin/ypserv
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping NIS Server"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/ypserv
-	eend $?
-}
diff --git a/net-nds/ypserv/ypserv-1.3.12.ebuild b/net-nds/ypserv/ypserv-1.3.12.ebuild
index 01d508174d91..3554f67f1897 100644
--- a/net-nds/ypserv/ypserv-1.3.12.ebuild
+++ b/net-nds/ypserv/ypserv-1.3.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-1.3.12.ebuild,v 1.18 2004/06/25 00:24:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-1.3.12.ebuild,v 1.19 2004/07/24 06:26:27 eradicator Exp $
 
 IUSE="tcpd"
 
@@ -71,5 +71,5 @@ src_install() {
 	insinto /etc ; doins etc/ypserv.conf
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/ypserv-initd ypserv
+	newexe ${FILESDIR}/ypserv ypserv
 }
diff --git a/net-nds/ypserv/ypserv-2.13-r1.ebuild b/net-nds/ypserv/ypserv-2.13-r1.ebuild
index c1926d2a3ad6..e867688241e7 100644
--- a/net-nds/ypserv/ypserv-2.13-r1.ebuild
+++ b/net-nds/ypserv/ypserv-2.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.13-r1.ebuild,v 1.3 2004/06/25 00:24:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.13-r1.ebuild,v 1.4 2004/07/24 06:26:28 eradicator Exp $
 
 DESCRIPTION="Network Information Service server"
 HOMEPAGE="http://www.linux-nis.org/nis/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://kernel/linux/utils/net/NIS/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~ppc64 ~amd64"
+KEYWORDS="x86 ~ppc ~sparc ~ppc64 amd64"
 IUSE=""
 
 DEPEND=">=sys-libs/gdbm-1.8.0"
@@ -26,9 +26,10 @@ src_install() {
 	insinto /etc/conf.d
 	newins ${FILESDIR}/ypserv.confd ypserv
 	newins ${FILESDIR}/rpc.yppasswdd.confd rpc.yppasswdd
+	newins ${FILESDIR}/rpc.ypxfrd.confd rpc.ypxfrd
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/ypserv.rc ypserv
+	newexe ${FILESDIR}/ypserv ypserv
 	newexe ${FILESDIR}/rpc.yppasswdd-r1 rpc.yppasswdd
 	newexe ${FILESDIR}/rpc.ypxfrd rpc.ypxfrd
 
diff --git a/net-nds/ypserv/ypserv-2.13.ebuild b/net-nds/ypserv/ypserv-2.13.ebuild
index 852fecbb0b63..d55839ff037a 100644
--- a/net-nds/ypserv/ypserv-2.13.ebuild
+++ b/net-nds/ypserv/ypserv-2.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.13.ebuild,v 1.3 2004/06/25 00:24:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.13.ebuild,v 1.4 2004/07/24 06:26:28 eradicator Exp $
 
 DESCRIPTION="Network Information Service server"
 HOMEPAGE="http://www.linux-nis.org/nis/"
@@ -27,7 +27,7 @@ src_install() {
 	newins ${FILESDIR}/ypserv.confd ypserv
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/ypserv.rc ypserv
+	newexe ${FILESDIR}/ypserv ypserv
 	newexe ${FILESDIR}/rpc.yppasswdd rpc.yppasswdd
 	newexe ${FILESDIR}/rpc.ypxfrd rpc.ypxfrd
 
diff --git a/net-nds/ypserv/ypserv-2.5-r1.ebuild b/net-nds/ypserv/ypserv-2.5-r1.ebuild
deleted file mode 100644
index e89ec11abc70..000000000000
--- a/net-nds/ypserv/ypserv-2.5-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.5-r1.ebuild,v 1.10 2004/06/25 00:24:03 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="NIS SERVER"
-SRC_URI="mirror://kernel/linux/utils/net/NIS/${P}.tar.gz"
-HOMEPAGE="http://www.linux-nis.org/nis/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-
-DEPEND=">=sys-libs/gdbm-1.8.0"
-
-src_compile() {
-	econf --enable-yppasswd || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
-
-	insinto /etc ; doins etc/ypserv.conf etc/locale etc/netgroup etc/netmasks etc/timezone
-
-	insinto /var/yp ; doins etc/securenets
-
-	exeinto /etc/init.d ; newexe ${FILESDIR}/ypserv-initd ypserv
-	insinto /etc/conf.d ; newins ${FILESDIR}/ypserv-confd ypserv
-
-	### This will -NOT- work when installing a binary .tbz2
-	### and should be fixed properly.
-	# Save the old config into the new package as CONFIG_PROTECT
-	# doesn't work for this package.
-	if [ -f ${ROOT}/var/yp/Makefile ]; then
-		mv ${D}/var/yp/Makefile ${D}/var/yp/Makefile.dist
-		cp ${ROOT}/var/yp/Makefile ${D}/var/yp/Makefile
-		einfo "As you have a previous /var/yp/Makefile, I have added"
-		einfo "this file into the new package and installed the new"
-		einfo "file as /var/yp/Makefile.dist"
-	fi
-}
-
-pkg_postinst() {
-	einfo "ypserv does not longer have support for tcp_wrappers. You need to"
-	einfo "use /var/yp/securenets to allow/deny queries from other hosts."
-}
diff --git a/net-nds/ypserv/ypserv-2.5.ebuild b/net-nds/ypserv/ypserv-2.5.ebuild
deleted file mode 100644
index 3a9cd5fb376c..000000000000
--- a/net-nds/ypserv/ypserv-2.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.5.ebuild,v 1.9 2004/06/25 00:24:03 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="NIS SERVER"
-SRC_URI="mirror://kernel/linux/utils/net/NIS/${P}.tar.gz"
-HOMEPAGE="http://www.linux-nis.org/nis/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-
-DEPEND=">=sys-libs/gdbm-1.8.0"
-
-src_compile() {
-	econf --enable-yppasswd || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install
-
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO
-
-	insinto /etc ; doins etc/ypserv.conf etc/locale etc/netgroup etc/netmasks etc/timezone
-
-	insinto /var/yp ; doins etc/securenets
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/ypserv-initd ypserv
-}
-
-pkg_postinst() {
-	einfo "ypserv does not longer have support for tcp_wrappers. You need to"
-	einfo "use /var/yp/securenets to allow/deny queries from other hosts."
-}
diff --git a/net-nds/ypserv/ypserv-2.8.ebuild b/net-nds/ypserv/ypserv-2.8.ebuild
index e4749a9b22a2..7d3745bf09d4 100644
--- a/net-nds/ypserv/ypserv-2.8.ebuild
+++ b/net-nds/ypserv/ypserv-2.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.8.ebuild,v 1.12 2004/06/25 00:24:03 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.8.ebuild,v 1.13 2004/07/24 06:26:28 eradicator Exp $
 
 DESCRIPTION="Network Information Service server"
 SRC_URI="mirror://kernel/linux/utils/net/NIS/${P}.tar.gz"
@@ -31,7 +31,7 @@ src_install() {
 	newins ${FILESDIR}/ypserv.confd ypserv
 
 	exeinto /etc/init.d
-	newexe ${FILESDIR}/ypserv.rc ypserv
+	newexe ${FILESDIR}/ypserv ypserv
 	newexe ${FILESDIR}/rpc.yppasswdd rpc.yppasswdd
 	newexe ${FILESDIR}/rpc.ypxfrd rpc.ypxfrd