From c9655aadfa14f56b841a0fba2b5c939b6f4e0a59 Mon Sep 17 00:00:00 2001 From: Donny Davies Date: Wed, 18 Jun 2003 02:19:53 +0000 Subject: Close #20767. --- net-nds/ypserv/ChangeLog | 8 ++++++- net-nds/ypserv/Manifest | 12 +++++----- net-nds/ypserv/files/ypserv-confd | 8 +++++++ net-nds/ypserv/files/ypserv-initd | 44 +++++++++++++++++++++++++++++++++++++ net-nds/ypserv/files/ypserv.rc5 | 30 ------------------------- net-nds/ypserv/files/ypserv.rc6 | 20 ----------------- net-nds/ypserv/ypserv-1.3.12.ebuild | 8 ++----- net-nds/ypserv/ypserv-2.5-r1.ebuild | 13 ++++++----- net-nds/ypserv/ypserv-2.5.ebuild | 6 ++--- 9 files changed, 78 insertions(+), 71 deletions(-) create mode 100644 net-nds/ypserv/files/ypserv-confd create mode 100644 net-nds/ypserv/files/ypserv-initd delete mode 100644 net-nds/ypserv/files/ypserv.rc5 delete mode 100644 net-nds/ypserv/files/ypserv.rc6 (limited to 'net-nds/ypserv') diff --git a/net-nds/ypserv/ChangeLog b/net-nds/ypserv/ChangeLog index 6470cf2da133..97da49c6d2d6 100644 --- a/net-nds/ypserv/ChangeLog +++ b/net-nds/ypserv/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-nds/ypserv # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.9 2003/05/25 15:08:28 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ChangeLog,v 1.10 2003/06/18 02:19:45 woodchip Exp $ + + 17 Jun 2003; Donny Davies ypserv-1.3.12.ebuild, + ypserv-2.5-r1.ebuild, ypserv-2.5.ebuild, files/ypserv-confd, + files/ypserv-initd, files/ypserv.rc5, files/ypserv.rc6: + Close #20767; added new rc-scripts. Thanks to + Jeremy Huddleston . 25 May 2003; Martin Holzer ypserv-1.3.12.ebuild, ypserv-2.5-r1.ebuild, ypserv-2.5.ebuild: diff --git a/net-nds/ypserv/Manifest b/net-nds/ypserv/Manifest index 7d1ba676e9fa..f5b97970d2ef 100644 --- a/net-nds/ypserv/Manifest +++ b/net-nds/ypserv/Manifest @@ -1,11 +1,11 @@ -MD5 ef99688ec4b27f75b60f76fc8a1f8785 ChangeLog 1587 -MD5 1ad0e85bf1eed2d85563b20e62ebb9a1 ypserv-1.3.12.ebuild 1610 -MD5 669cb71e4edd1c72a26062b68ff732a2 ypserv-2.5-r1.ebuild 1456 -MD5 4a69830199775fe26b38b4c4ce6b9dcd ypserv-2.5.ebuild 990 +MD5 a78d6b77784555fefbf705079a9dedf3 ChangeLog 1887 +MD5 35a8cb8c9e2b7e839d90b1a456973a14 ypserv-1.3.12.ebuild 1609 +MD5 67da13c9aa07c76c0fe63b40f1ddd3ba ypserv-2.5-r1.ebuild 1613 +MD5 03c1ab38d5c952e9ed92393984576235 ypserv-2.5.ebuild 992 MD5 d65fdf73994b1d6d96d9820cbcae02ef files/defs.sed 856 MD5 d8a2530491cec60a01a03e74b63b37c7 files/digest-ypserv-1.3.12 65 MD5 9c20be3742d94aee43877c12df611b05 files/digest-ypserv-2.5 62 MD5 9c20be3742d94aee43877c12df611b05 files/digest-ypserv-2.5-r1 62 -MD5 17ac388deb54a1630badcf5754897318 files/ypserv.rc5 525 -MD5 95e1d4cd2f9fc1968bf1fb08117290f1 files/ypserv.rc6 494 +MD5 723eea6eeee5a020cd9ff8cc3959fb6a files/ypserv-confd 216 +MD5 bc2e829e5cfce15dae06614f152d8e19 files/ypserv-initd 1089 MD5 5950ee3a17fa970f3c76bc615b024b6c files/1.3.12/volatile-fix-gcc-3.2.diff 385 diff --git a/net-nds/ypserv/files/ypserv-confd b/net-nds/ypserv/files/ypserv-confd new file mode 100644 index 000000000000..f632ec62e40d --- /dev/null +++ b/net-nds/ypserv/files/ypserv-confd @@ -0,0 +1,8 @@ +# Config file for /etc/init.d/ypserv + +# Start Master Password Server? /usr/sbin/rpc.yppasswdd +PW_SERVER="yes" +#PW_SERVER_OPTIONS="-e chsh -e chfn" + +# Start NIS transfer server? /usr/sbin/rpc.ypxfrd" +XFR_SERVER="yes" diff --git a/net-nds/ypserv/files/ypserv-initd b/net-nds/ypserv/files/ypserv-initd new file mode 100644 index 000000000000..e05d95abc9ba --- /dev/null +++ b/net-nds/ypserv/files/ypserv-initd @@ -0,0 +1,44 @@ +#!/sbin/runscript +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/ypserv-initd,v 1.1 2003/06/18 02:19:45 woodchip Exp $ + +depend() { + need net +} + +start() { + ebegin "Starting NIS Server" + start-stop-daemon --start --quiet --exec /usr/sbin/ypserv + result=${?} + + if [ ${PW_SERVER} = "yes" ]; then + start-stop-daemon --start --quiet --exec /usr/sbin/rpc.yppasswdd ${PW_SERVER_OPTIONS} + result=$(( $result + $? )) + fi + + if [ ${XFR_SERVER} = "yes" ]; then + start-stop-daemon --start --quiet --exec /usr/sbin/rpc.ypxfrd + result=$(( $result + $? )) + fi + + eend ${result} +} + +stop() { + ebegin "Stopping NIS Server" + start-stop-daemon --stop --quiet --exec /usr/sbin/ypserv + result=${?} + + if [ ${PW_SERVER} = "yes" ]; then + start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.yppasswdd + result=$(( $result + $? )) + fi + + if [ ${XFR_SERVER} = "yes" ]; then + start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.ypxfrd + result=$(( $result + $? )) + fi + + eend ${result} +} diff --git a/net-nds/ypserv/files/ypserv.rc5 b/net-nds/ypserv/files/ypserv.rc5 deleted file mode 100644 index d7c54817245a..000000000000 --- a/net-nds/ypserv/files/ypserv.rc5 +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -#RCUPDATE:2 3 4:75:This line is required for script management - -. /etc/rc.d/config/functions - -SERVICE="NIS Server" -opts="start stop restart" - -EXE=/usr/sbin/ypserv - -start() { - ebegin "Starting $SERVICE..." - start-stop-daemon --start --quiet --exec $EXE - eend $? "Started $SERVICE." "Error Starting $SERVICE." -} - -stop() { - ebegin "Stopping $SERVICE..." - start-stop-daemon --stop --quiet --exec $EXE - eend $? "Stopped $SERVICE." "Error Stopping $SERVICE." -} - -restart() { - stop - start -} - -doservice ${@} - - diff --git a/net-nds/ypserv/files/ypserv.rc6 b/net-nds/ypserv/files/ypserv.rc6 deleted file mode 100644 index 6ee4f0b6b92d..000000000000 --- a/net-nds/ypserv/files/ypserv.rc6 +++ /dev/null @@ -1,20 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/files/ypserv.rc6,v 1.3 2003/02/14 23:09:08 vapier Exp $ - -depend() { - need net -} - -start() { - ebegin "Starting NIS Server" - 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 58f7b5c3ed2f..71c2b64ecad5 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-2003 Gentoo Technologies, Inc. # 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.13 2003/05/25 15:08:28 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-1.3.12.ebuild,v 1.14 2003/06/18 02:19:45 woodchip Exp $ IUSE="tcpd" @@ -17,16 +17,13 @@ DEPEND=">=sys-libs/gdbm-1.8.0 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )" src_unpack() { - unpack ${A} cd ${S} cp ${FILESDIR}/defs.sed ypmake patch < ${FILESDIR}/${PV}/volatile-fix-gcc-3.2.diff || die - } src_compile() { - local myconf use tcpd && myconf="${myconf} --enable-tcp-wrapper" @@ -47,7 +44,6 @@ src_compile() { } src_install() { - make \ ROOT=${D} \ installdirs install_progs || die @@ -76,5 +72,5 @@ src_install() { insinto /etc ; doins etc/ypserv.conf exeinto /etc/init.d - newexe ${FILESDIR}/ypserv.rc6 ypserv + newexe ${FILESDIR}/ypserv-initd ypserv } diff --git a/net-nds/ypserv/ypserv-2.5-r1.ebuild b/net-nds/ypserv/ypserv-2.5-r1.ebuild index ea382743f25f..6fb8e991c365 100644 --- a/net-nds/ypserv/ypserv-2.5-r1.ebuild +++ b/net-nds/ypserv/ypserv-2.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # 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.3 2003/05/25 15:08:28 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.5-r1.ebuild,v 1.4 2003/06/18 02:19:45 woodchip Exp $ IUSE="" @@ -11,7 +11,7 @@ HOMEPAGE="http://www.linux-nis.org/nis/" SLOT="1" LICENSE="GPL-2" -KEYWORDS="x86 sparc " +KEYWORDS="x86 sparc" DEPEND=">=sys-libs/gdbm-1.8.0" @@ -29,9 +29,12 @@ src_install() { insinto /var/yp ; doins etc/securenets - exeinto /etc/init.d - newexe ${FILESDIR}/ypserv.rc6 ypserv - # Save the old config into the new package as CONFIG_PROTECT + 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 diff --git a/net-nds/ypserv/ypserv-2.5.ebuild b/net-nds/ypserv/ypserv-2.5.ebuild index 971e9b6142af..8a493be37afd 100644 --- a/net-nds/ypserv/ypserv-2.5.ebuild +++ b/net-nds/ypserv/ypserv-2.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # 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.4 2003/05/25 15:08:28 mholzer Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/ypserv/ypserv-2.5.ebuild,v 1.5 2003/06/18 02:19:45 woodchip Exp $ IUSE="" @@ -11,7 +11,7 @@ HOMEPAGE="http://www.linux-nis.org/nis/" SLOT="1" LICENSE="GPL-2" -KEYWORDS="x86 sparc " +KEYWORDS="x86 sparc" DEPEND=">=sys-libs/gdbm-1.8.0" @@ -30,7 +30,7 @@ src_install() { insinto /var/yp ; doins etc/securenets exeinto /etc/init.d - newexe ${FILESDIR}/ypserv.rc6 ypserv + newexe ${FILESDIR}/ypserv-initd ypserv } pkg_postinst() { -- cgit v1.2.3-65-gdbad