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

Harlan Stenn stenn at whimsy.udel.edu
Wed Jul 19 19:01:26 UTC 2006


This BitKeeper patch contains the following changesets:
stenn at pogo.udel.edu|ChangeSet|20060719092423|00308
stenn at pogo.udel.edu|ChangeSet|20060626004646|26608
stenn at pogo.udel.edu|ChangeSet|20060719071022|00307
stenn at pogo.udel.edu|ChangeSet|20060704221001|00266
stenn at pogo.udel.edu|ChangeSet|20060624234742|26184
stenn at pogo.udel.edu|ChangeSet|20060719051315|00729
stenn at pogo.udel.edu|ChangeSet|20060619063442|26795
stenn at pogo.udel.edu|ChangeSet|20060619063154|26977

# 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:	whimsy.udel.edu
# Root:	/deacon/backroom/ntp-stable

#
#--- 1.6/bootstrap	2006-07-19 15:01:25 -04:00
#+++ 1.7/bootstrap	2006-07-19 15:01:25 -04:00
#@@ -33,6 +33,8 @@
# 
# scripts/genver
# 
#+cp bincheck.mf sntp/
#+
# #rm -rf sntp/libopts*
# #gunzip -c $(autoopts-config --libsrc) | (
# #  cd sntp
#
#--- 1.388/configure.ac	2006-07-19 15:01:26 -04:00
#+++ 1.390/configure.ac	2006-07-19 15:01:26 -04:00
#@@ -1750,7 +1750,21 @@
#   ], ac_cv_var_mcast=yes) ;;
#   esac])
# case "$ac_cv_var_mcast" in
#- yes) AC_DEFINE(MCAST, 1, [Does the kernel support multicasting IP?]) ;;
#+ yes)
#+    AC_DEFINE(MCAST, 1, [Does the kernel support multicasting IP?])
#+    AC_CACHE_CHECK([[arg type needed for IP*_MULTICAST_LOOP for setsockopt()]],
#+	ac_cv_var_typeof_ip_multicast_loop,
#+	[case "$host" in
#+	 *-*-netbsd*|*-*-linux*|*-*-winnt*)
#+	    ac_cv_var_typeof_ip_multicast_loop=u_int
#+	    ;;
#+	 *) ac_cv_var_typeof_ip_multicast_loop=u_char
#+	    ;;
#+	esac])
#+    AC_DEFINE_UNQUOTED(TYPEOF_IP_MULTICAST_LOOP,
#+		   $ac_cv_var_typeof_ip_multicast_loop,
#+		   [What type to use for setsockopt])
#+    ;;
# esac
# 
# AC_CACHE_CHECK([[availability of ntp_{adj,get}time()]], ac_cv_var_ntp_syscalls,
#
#--- 1.205/ntpd/ntp_io.c	2006-07-19 15:01:26 -04:00
#+++ 1.206/ntpd/ntp_io.c	2006-07-19 15:01:26 -04:00
#@@ -1016,7 +1016,7 @@
# enable_multicast_if(struct interface *iface, struct sockaddr_storage *maddr)
# {
# #ifdef MCAST
#-	u_char off = 0;
#+	/*u_char*/ TYPEOF_IP_MULTICAST_LOOP off = 0;
# 
# 	switch (maddr->ss_family)
# 	{
#

# Diff checksum=3dc7a929


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060617175320|27224
D 1.1542.2.1 06/06/19 02:31:54-04:00 stenn at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Avoid hardcoded path to bash for the bootstrap script
K 26977
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|bootstrap|20060411084755|36539|dc4e8af8b51a337d stenn at pogo.udel.edu|bootstrap|20060619063143|50542

stenn at deacon.udel.edu|ChangeSet|20060619000927|26969
D 1.1551 06/06/19 02:34:42-04:00 stenn at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge whimsy:/backroom/ntp-stable
c into  pogo.udel.edu:/pogo/users/stenn/ntp-stable
i stenn at pogo.udel.edu|ChangeSet|20060619063154|26977
K 26795
M stenn at pogo.udel.edu|ChangeSet|20060619063154|26977
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|bootstrap|20060411084755|36539|dc4e8af8b51a337d stenn at pogo.udel.edu|bootstrap|20060619063439|50542

stenn at pogo.udel.edu|ChangeSet|20060619063442|26795
D 1.1552 06/06/24 19:47:42-04:00 stenn at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge whimsy:/backroom/ntp-stable
c into  pogo.udel.edu:/pogo/users/stenn/ntp-stable
i stenn at whimsy.udel.edu|ChangeSet|20060619110256|26974
i kardel at pogo.udel.edu|ChangeSet|20060622192828|26976
i stenn at whimsy.udel.edu|ChangeSet|20060622210733|26986
i stenn at whimsy.udel.edu|ChangeSet|20060623110247|26983
i kardel at pogo.udel.edu|ChangeSet|20060624164625|26984
i stenn at whimsy.udel.edu|ChangeSet|20060624205417|26358
K 26184
M stenn at whimsy.udel.edu|ChangeSet|20060624205417|26358
P ChangeSet
------------------------------------------------


stenn at pogo.udel.edu|ChangeSet|20060624234742|26184
D 1.1553 06/06/25 20:46:46-04:00 stenn at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge whimsy:/backroom/ntp-stable
c into  pogo.udel.edu:/pogo/users/stenn/ntp-stable
i stenn at whimsy.udel.edu|ChangeSet|20060625110322|26354
i stenn at whimsy.udel.edu|ChangeSet|20060625210047|26688
i stenn at whimsy.udel.edu|ChangeSet|20060625231006|26841
K 26608
M stenn at whimsy.udel.edu|ChangeSet|20060625231006|26841
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|bootstrap|20060411084755|36539|dc4e8af8b51a337d stenn at pogo.udel.edu|bootstrap|20060626004636|52417

stenn at pogo.udel.edu|ChangeSet|20060626004646|26608
D 1.1554 06/07/04 18:10:01-04:00 stenn at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge whimsy:/backroom/ntp-stable
c into  pogo.udel.edu:/pogo/users/stenn/ntp-stable
i stenn at whimsy.udel.edu|ChangeSet|20060626065254|26890
i stenn at whimsy.udel.edu|ChangeSet|20060626070650|62659
i stenn at whimsy.udel.edu|ChangeSet|20060626072359|62684
i stenn at whimsy.udel.edu|ChangeSet|20060626110311|62686
i stenn at whimsy.udel.edu|ChangeSet|20060627081941|62791
i stenn at whimsy.udel.edu|ChangeSet|20060627110241|62796
i burnicki at pogo.udel.edu|ChangeSet|20060627212021|00489
i stenn at whimsy.udel.edu|ChangeSet|20060628110307|00499
K 266
M stenn at whimsy.udel.edu|ChangeSet|20060628110307|00499
P ChangeSet
------------------------------------------------


stenn at pogo.udel.edu|ChangeSet|20060704221001|00266
D 1.1555 06/07/19 01:13:15-04:00 stenn at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge bk://maccarony/ntp-stable
c into  pogo.udel.edu:/pogo/users/stenn/ntp-stable
i stenn at whimsy.udel.edu|ChangeSet|20060708101607|00502
i stenn at whimsy.udel.edu|ChangeSet|20060708101953|00492
i stenn at whimsy.udel.edu|ChangeSet|20060708110236|00483
i stenn at whimsy.udel.edu|ChangeSet|20060709043926|00720
i stenn at whimsy.udel.edu|ChangeSet|20060709110221|00725
i stenn at whimsy.udel.edu|ChangeSet|20060710042134|00962
i stenn at whimsy.udel.edu|ChangeSet|20060710052012|00954
i stenn at whimsy.udel.edu|ChangeSet|20060710053225|00935
i stenn at whimsy.udel.edu|ChangeSet|20060710054048|00921
i stenn at whimsy.udel.edu|ChangeSet|20060710055426|00977
i stenn at whimsy.udel.edu|ChangeSet|20060710070733|00980
i stenn at whimsy.udel.edu|ChangeSet|20060710071423|00975
i stenn at whimsy.udel.edu|ChangeSet|20060710072715|00968
i stenn at whimsy.udel.edu|ChangeSet|20060710110226|00962
K 729
M stenn at whimsy.udel.edu|ChangeSet|20060710110226|00962
P ChangeSet
------------------------------------------------


stenn at pogo.udel.edu|ChangeSet|20060719051315|00729
D 1.1556 06/07/19 03:10:22-04:00 stenn at pogo.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 657] Different OSes need different sized args for IP_MULTICAST_LOOP
K 307
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663 stenn at pogo.udel.edu|configure.ac|20060719071008|44409
> stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663 stenn at pogo.udel.edu|ntpd/ntp_io.c|20060719071009|45310

stenn at pogo.udel.edu|ChangeSet|20060719071022|00307
D 1.1557 06/07/19 05:24:23-04:00 stenn at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 657] netbsd fix for IP_MULTICAST_LOOP test
K 308
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663 stenn at pogo.udel.edu|configure.ac|20060719092414|44451

== bootstrap ==
stenn at whimsy.udel.edu|bootstrap|20060411084755|36539|dc4e8af8b51a337d
stenn at whimsy.udel.edu|bootstrap|20060510190431|49788
D 1.4.1.1 06/06/19 02:31:43-04:00 stenn at pogo.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Avoid hardcoded path to bash for the bootstrap script
K 50542
O -rwxrwxr-x
P bootstrap
------------------------------------------------

D1 1
I1 1
#! /usr/bin/env bash

stenn at deacon.udel.edu|bootstrap|20060619000918|50542
D 1.6 06/06/19 02:34:39-04:00 stenn at pogo.udel.edu +0 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i stenn at pogo.udel.edu|bootstrap|20060619063143|50542
K 50542
M stenn at pogo.udel.edu|bootstrap|20060619063143|50542
O -rwxrwxr-x
P bootstrap
------------------------------------------------

D2 1

stenn at pogo.udel.edu|bootstrap|20060619063439|50542
D 1.7 06/06/25 20:46:36-04:00 stenn at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i stenn at whimsy.udel.edu|bootstrap|20060625205901|52417
K 52417
M stenn at whimsy.udel.edu|bootstrap|20060625205901|52417
O -rwxrwxr-x
P bootstrap
------------------------------------------------


== configure.ac ==
stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663
stenn at deacon.udel.edu|configure.ac|20060504095410|09438
D 1.389 06/07/19 03:10:08-04:00 stenn at pogo.udel.edu +15 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 657] Different OSes need different sized args for IP_MULTICAST_LOOP
K 44409
O -rw-rw-r--
P configure.ac
------------------------------------------------

D1753 1
I1753 15
 yes)
    AC_DEFINE(MCAST, 1, [Does the kernel support multicasting IP?])
    AC_CACHE_CHECK([[arg type needed for IP*_MULTICAST_LOOP for setsockopt()]],
	ac_cv_var_typeof_ip_multicast_loop,
	[case "$host" in
	 *-*-netbsd|*-*-linux*|*-*-winnt*)
	    ac_cv_var_typeof_ip_multicast_loop=u_int
	    ;;
	 *) ac_cv_var_typeof_ip_multicast_loop=u_char
	    ;;
	esac])
    AC_DEFINE_UNQUOTED(TYPEOF_IP_MULTICAST_LOOP,
		   $ac_cv_var_typeof_ip_multicast_loop,
		   [What type to use for setsockopt])
    ;;

stenn at pogo.udel.edu|configure.ac|20060719071008|44409
D 1.390 06/07/19 05:24:14-04:00 stenn at pogo.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 657] netbsd fix for IP_MULTICAST_LOOP test
K 44451
O -rw-rw-r--
P configure.ac
------------------------------------------------

D1758 1
I1758 1
	 *-*-netbsd*|*-*-linux*|*-*-winnt*)

== ntpd/ntp_io.c ==
stenn at whimsy.udel.edu|ntpd/ntp_io.c|19990526004817|01635|3aed0663
stenn at whimsy.udel.edu|ntpd/ntp_io.c|20060625230944|43183
D 1.206 06/07/19 03:10:09-04:00 stenn at pogo.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 657] Different OSes need different sized args for IP_MULTICAST_LOOP
K 45310
O -rw-rw-r--
P ntpd/ntp_io.c
------------------------------------------------

D1019 1
I1019 1
	/*u_char*/ TYPEOF_IP_MULTICAST_LOOP off = 0;

# Patch checksum=094409da


More information about the bk-ntp-stable-send mailing list