[ntp:bk-ntp-dev-send] BitKeeper patch

[Harlan Stenn]

This BitKeeper patch contains the following changesets:
stenn at deacon.udel.edu|ChangeSet|20060703041359|55736

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	deacon.udel.edu
# Root:	/deacon/backroom/ntp-dev

#
#--- 1.13/bootstrap	2006-06-30 01:03:43 -04:00
#+++ 1.14/bootstrap	2006-07-03 00:13:47 -04:00
#@@ -1,4 +1,4 @@
#-#! /usr/bin/env bash
#+#! /bin/sh
# 
# #  This "bootstrap" script performs various pre-autoreconf actions
# #  that are required after pulling fresh sources from the repository.
#@@ -13,24 +13,22 @@
# #
# #  1.  Autoconf and Automake.
# #
#-#  2.  AutoGen.  The repository does *not* contain the files generated from
#+#  2.  lynx.  This is used to extract the COPYRIGHT file extracted from
#+#      the html documentation.
#+#
#+#  *** The following are no longer needed for simple builds from the repo
#+#  3.  AutoGen.  The repository does *not* contain the files generated from
# #      the option definition files and it does not contain the libopts
# #      tear-off/redistributable library.
# #
#-#  3.  gunzip.  The tear-off library is a gzipped tarball.
#-#
#-#  4.  lynx.  This is used to extract the COPYRIGHT file extracted from
#-#      the html documentation.
#-#
#-#  5.  bash, ksh, zsh or any POSIX compliant shell to run this script.
#+#      Note: AutoGen needs GNU Guile.
# #
#+#  4.  gunzip.  The tear-off library is a gzipped tarball.
# 
# set -e
# 
# AUTORECONF=${AUTORECONF:-autoreconf}
# 
#-#. ./packageinfo.sh
#-
# scripts/genver
# 
# # 20060629: HMS: Let's try checking in libopts and the autogen-generated files
#@@ -47,11 +45,12 @@
# #  tar -xvf -
# #  mv libopts-*.*.* libopts )
# 
#-prog_opt_files=$(
#-    egrep -l '^prog.name' $(
#-        find * -type f -name *.def|fgrep -v /SCCS/))
#+def_files=`find [B-Za-z]* -type f -name '*.def' -print | fgrep -v /SCCS/`
#+prog_opt_files=`grep -l '^prog.name' $def_files`
# 
#-incdir=${PWD}/include
#+## AutoGen stuff
#+
#+#incdir=${PWD}/include
# 
# #for f in ${prog_opt_files}
# #do
#@@ -60,6 +59,31 @@
# #    autogen -L${incdir} $(basename ${f})
# #  ) || exit 1
# #done
#+
#+## Non-AutoGen stuff
#+
#+# touch the stuff generated by the opt files
#+
#+for f in ${prog_opt_files}
#+do
#+    f=`echo $f | sed -e 's/-opts.def//'`
#+    l=
#+    for i in `ls -1 $f*`
#+    do
#+	case "$i" in
#+	 *.c|*.h|*.1|*.texi|*.menu)
#+	    l="$l $i"
#+	    ;;
#+	esac
#+    done
#+    case"$l" in
#+     '') ;;
#+     *) touch $l
#+	;;
#+    esac
#+done
#+
#+## EOAutoGen stuff
# 
# cp bincheck.mf sntp/
# 
#
#--- 1.244/ntpd/ntp_proto.c	2006-03-14 03:46:44 -05:00
#+++ 1.245/ntpd/ntp_proto.c	2006-07-03 00:13:02 -04:00
#@@ -3071,8 +3071,8 @@
# 	 * the orphan parent.
# 	 */
# 	if (peer->stratum > 1 && peer->refid != htonl(LOOPBACKADR) &&
#-	    ((!peer->dstadr || peer->refid == peer->dstadr->addr_refid) || peer->refid ==
#-	    sys_refid))
#+	    ((!peer->dstadr || peer->refid == peer->dstadr->addr_refid) ||
#+	    peer->refid == sys_refid))
# 		rval |= TEST12;		/* synch loop */
# 
# 	/*
#

# Diff checksum=23b02498


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at deacon.udel.edu|ChangeSet|20060630050352|55633
D 1.1399 06/07/03 00:13:59-04:00 stenn at deacon.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c touch the files generated by autogen to keep them from needing to be rebuilt.
K 55736
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|bootstrap|20060411084755|36539|dc4e8af8b51a337d stenn at deacon.udel.edu|bootstrap|20060703041347|57386
> stenn at whimsy.udel.edu|ntpd/ntp_proto.c|19990526004817|01635|3aed0663 stenn at deacon.udel.edu|ntpd/ntp_proto.c|20060703041302|20871

== bootstrap ==
stenn at whimsy.udel.edu|bootstrap|20060411084755|36539|dc4e8af8b51a337d
stenn at deacon.udel.edu|bootstrap|20060630050343|28184
D 1.14 06/07/03 00:13:47-04:00 stenn at deacon.udel.edu +38 -14
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c touch the files generated by autogen to keep them from needing to be rebuilt.
K 57386
O -rwxrwxr-x
P bootstrap
------------------------------------------------

D1 1
I1 1
#! /bin/sh
D16 1
I16 5
#  2.  lynx.  This is used to extract the COPYRIGHT file extracted from
#      the html documentation.
#
#  *** The following are no longer needed for simple builds from the repo
#  3.  AutoGen.  The repository does *not* contain the files generated from
D20 6
I25 1
#      Note: AutoGen needs GNU Guile.
I26 1
#  4.  gunzip.  The tear-off library is a gzipped tarball.
D32 2
D50 3
I52 2
def_files=`find [B-Za-z]* -type f -name '*.def' -print | fgrep -v /SCCS/`
prog_opt_files=`grep -l '^prog.name' $def_files`
D54 1
I54 3
## AutoGen stuff
\
#incdir=${PWD}/include
I62 25
\
## Non-AutoGen stuff
\
# touch the stuff generated by the opt files
\
for f in ${prog_opt_files}
do
    f=`echo $f | sed -e 's/-opts.def//'`
    l=
    for i in `ls -1 $f*`
    do
	case "$i" in
	 *.c|*.h|*.1|*.texi|*.menu)
	    l="$l $i"
	    ;;
	esac
    done
    case"$l" in
     '') ;;
     *) touch $l
	;;
    esac
done
\
## EOAutoGen stuff

== ntpd/ntp_proto.c ==
stenn at whimsy.udel.edu|ntpd/ntp_proto.c|19990526004817|01635|3aed0663
kardel at pogo.udel.edu|ntpd/ntp_proto.c|20060314084644|20871
D 1.245 06/07/03 00:13:02-04:00 stenn at deacon.udel.edu +2 -2
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Dave reformatted a line
K 20871
O -rw-rw-r--
P ntpd/ntp_proto.c
------------------------------------------------

D3074 2
I3075 2
	    ((!peer->dstadr || peer->refid == peer->dstadr->addr_refid) ||
	    peer->refid == sys_refid))

# Patch checksum=821e0d87