From a2190fbbc2bf84954479f1bf03aead2f294225bc Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 15:15:48 +0000 Subject: [PATCH] auto-import changelog data from ypbind-1.10-6.src.rpm Mon Mar 25 2002 Alex Larsson 1.10-6 - Fix bugs in initscript. Should fix #37463 and #61857 Mon Mar 25 2002 Alex Larsson 1.10-5 - New config patch that handles failing gethostbynames even better Thu Mar 21 2002 Alex Larsson 1.10-4 - Added patch to avoid hanging if gethostbyname fails. (#56322) Sun Mar 10 2002 Florian La Roche - fixed #57393 Wed Jan 09 2002 Tim Powers - automated rebuild Sat Nov 17 2001 Florian La Roche - update to version 1.10 --- .cvsignore | 2 +- sources | 2 +- ypbind.init | 23 ++++++++++++++--------- ypbind.spec | 34 +++++++++++++++++++++++++++------- 4 files changed, 43 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 303d328..451346a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ypbind-mt-1.8.tar.gz +ypbind-mt-1.10.tar.bz2 diff --git a/sources b/sources index 97fae25..018d617 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c4a813fced112c5584bd5ea0e585911 ypbind-mt-1.8.tar.gz +48acfe5dcbd39bbc802cffcfe55b9e71 ypbind-mt-1.10.tar.bz2 diff --git a/ypbind.init b/ypbind.init index 519309c..f7225d5 100755 --- a/ypbind.init +++ b/ypbind.init @@ -33,29 +33,34 @@ start() { fi echo -n $"Binding to the NIS domain: " daemon ypbind $OTHER_YPBIND_OPTS + RETVAL=$? echo - # the following fixes problems with the init scripts continuing + if [ $RETVAL -ne 0 ]; then + return $RETVAL + fi + # the following fixes problems with the init scripts continuing # even when we are really not bound yet to a server, and then things # that need NIS fail. - pid=`pidofproc ypbind` - if [ -n "$pid" ]; then - echo -n $"Listening for an NIS domain server." - for (( times = 1; times < 5; times++ )); do - ypwhich > /dev/null 2>&1 + echo -n $"Listening for an NIS domain server." + for (( times = 1; times < 20; times++ )); do + /usr/sbin/rpcinfo -p | grep ypbind > /dev/null 2>&1 && ypwhich > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ]; then break; fi sleep 1 echo -n "." - done - fi + done if [ $RETVAL -eq 0 ]; then initlog -n ypbind -s "bound to NIS server `ypwhich 2> /dev/null`" touch /var/lock/subsys/ypbind else failure "attempting to contact yp server" - kill $pid + killproc ypbind + # if we used brute force (like kill -9) we don't want those around + if [ x$(domainname) != x ] ; then + rm -f /var/yp/binding/$(domainname)* + fi fi echo return $RETVAL diff --git a/ypbind.spec b/ypbind.spec index 54d511f..abd229c 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -1,14 +1,15 @@ Summary: The NIS daemon which binds NIS clients to an NIS domain. Name: ypbind -Version: 1.8 -Release: 1 +Version: 1.10 +Release: 6 Copyright: GPL Group: System Environment/Daemons -Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.gz +Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2 Source1: ypbind.init Patch1: ypbind-mt-1.6-broadcast.patch Patch2: ypbind-1.8-dos.patch -Patch3: ypbind-1.8-no_mt.patch +Patch3: ypbind-1.10-no_mt.patch +Patch4: ypbind-1.10-config.patch Prereq: /sbin/chkconfig Requires: portmap, yp-tools, bash >= 2.0 Epoch: 3 @@ -33,9 +34,10 @@ also need to install the ypserv package to a machine on your network. %prep %setup -q -n ypbind-mt-%{version} -%patch1 -p0 -b .broadcast -%patch2 -p1 -b .dos -%patch3 -p1 -b .no_mt +%patch1 -p0 +#%patch2 -p1 +%patch3 -p1 -b .fixit +%patch4 -p1 -b .config %build %configure --sbindir=/sbin @@ -81,6 +83,24 @@ exit 0 %doc README NEWS %changelog +* Mon Mar 25 2002 Alex Larsson 1.10-6 +- Fix bugs in initscript. Should fix #37463 and #61857 + +* Mon Mar 25 2002 Alex Larsson 1.10-5 +- New config patch that handles failing gethostbynames even better + +* Thu Mar 21 2002 Alex Larsson 1.10-4 +- Added patch to avoid hanging if gethostbyname fails. (#56322) + +* Sun Mar 10 2002 Florian La Roche +- fixed #57393 + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + +* Sat Nov 17 2001 Florian La Roche +- update to version 1.10 + * Mon Aug 13 2001 Preston Brown - eliminate potential DOS attack via ypwhich (#38637) - install PO files