dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ypbind
-# $Id: Makefile,v 1.1 2004/09/09 15:12:10 cvsdist Exp $
-NAME := ypbind
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

ypbind.init

@@ -81,19 +81,25 @@ start() {
 	# 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.
-	timeout=$NISTIMEOUT
-	while [ $timeout -gt 0 ]; do
-	    /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind && \
+	timeout=10
+	firsttime=1
+        SECONDS=0
+	while [ $SECONDS -lt $timeout ]; do
+		if /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind
+		then
+			if [ $firsttime -eq 1 ]; then
+				# reset timeout
+				timeout=$NISTIMEOUT
+				firsttime=0
+			fi
 			/usr/bin/ypwhich > /dev/null 2>&1
-	    RETVAL=$?
-	    if [ $RETVAL -eq 0 ]; then
-		break;
-	    fi
-	    echo -n "..."
-	    # ypwhich has a hardcode 15sec timeout
-	    # so subtract that from NISTIMEOUT to
-	    # to see of we should continue to wait
-	    timeout=`expr $timeout - 15` 
+		    	RETVAL=$?
+	    		if [ $RETVAL -eq 0 ]; then
+				break;
+	    		fi
+		fi
+		sleep 2
+		echo -n "..."
 	done
 	if [ $RETVAL -eq 0 ]; then
 	    logger -t ypbind \

ypbind.spec

@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain.
 Name: ypbind
 Version: 1.20.4
-Release: 2%{?dist}
+Release: 4%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.bz2
@@ -91,6 +91,14 @@ exit 0
 %doc README NEWS
 
 %changelog
+* Fri May 23 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 3:1.20.4-4
+- Fix init script timing again
+  Resolves: #446356
+
+* Mon Feb  4 2008 Vitezslav Crhonek <vcrhonek@redhat.com> - 3:1.20.4-3
+- Fix ypbind startup fails because of timeout error in init script
+  Resolves: #430409
+
 * Mon Sep 17 2007 Steve Dickson <steved@redhat.com> - 3:1.20.4-2
 - Fixed a couple of typos in initscript (bz 281951)