[ntp:bk-ntp-dev-send] BitKeeper patch
Harlan Stenn
stenn at whimsy.udel.edu
Thu Jul 20 21:15:10 UTC 2006
This BitKeeper patch contains the following changesets:
stenn at whimsy.udel.edu|ChangeSet|20060720112034|00127
stenn at whimsy.udel.edu|ChangeSet|20060720203546|64530
stenn at whimsy.udel.edu|ChangeSet|20060720195044|00365
# 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-dev
#
#--- 1.359.5.2/configure.ac 2006-07-20 17:15:08 -04:00
#+++ 1.390/configure.ac 2006-07-20 17:15:08 -04:00
#@@ -31,10 +31,19 @@
# AC_PROG_CC_STDC
# AC_PROG_CPP
#
#+# HMS: These need to be moved to AM_CPPFLAGS and/or AM_CFLAGS
# case "$host" in
# *-*-amigaos)
# CFLAGS="$CFLAGS -Dfork=vfork -DSYS_AMIGA"
# ;;
#+ *-*-hpux10.*) # at least for hppa2.0-hp-hpux10.20
#+ case "$GCC" in
#+ yes)
#+ ;;
#+ *) CFLAGS="$CFLAGS -Wp,-H18816"
#+ ;;
#+ esac
#+ ;;
# *-pc-cygwin*)
# CFLAGS="$CFLAGS -DSYS_CYGWIN32"
# ;;
#@@ -54,6 +63,8 @@
#
# AMU_OS_CFLAGS
#
#+LIBOPTS_CHECK(libopts)
#+
# AC_MSG_CHECKING(for bin subdirectory)
# AC_ARG_WITH(binsubdir,
# AC_HELP_STRING([--with-binsubdir], [bin ={bin,sbin}]),
#@@ -72,12 +83,14 @@
# BINSUBDIR=$use_binsubdir
# AC_SUBST(BINSUBDIR)
#
#-if test -d $srcdir/arlib
#-then
#- AC_ARG_WITH(arlib,
#+AC_MSG_CHECKING(if we want to use arlib)
#+AC_ARG_WITH(arlib,
# AC_HELP_STRING([--with-arlib], [- Compile the async resolver library?]),
#- [ans=$withval], [ans=no])
#+ [ans=$withval], [ans=no])
#+AC_MSG_RESULT($ans)
#
#+if test -d $srcdir/arlib
#+then
# case "$ans" in
# yes)
# ARLIB_DIR=arlib
#@@ -249,11 +262,18 @@
# AC_SUBST(CFLAGS)dnl
# AC_SUBST(LDFLAGS)dnl
#
#+# HMS: From bunnylou/cowbird
#+case "$host" in
#+ alpha-dec-osf4.0)
#+ AC_DISABLE_SHARED
#+ ;;
#+esac
#+
#+AC_PROG_LIBTOOL
# AC_PROG_LN_S
# AC_PROG_GCC_TRADITIONAL
# AC_C_VOLATILE
# AC_ISC_POSIX
#-AC_PROG_RANLIB
# AC_PATH_PROG(PATH_SH, sh)
# AC_PATH_PROG(PATH_PERL, perl)
#
#@@ -554,6 +574,15 @@
# AC_TYPE_SIZE_T
# AC_CHECK_TYPE(time_t, long)
# AC_CHECK_SIZEOF(time_t)
#+AC_CHECK_TYPES(uintptr_t)
#+
#+AH_VERBATIM([TYPEDEF_UINTPTR_T],
#+[/* Provide a typedef for uintptr_t? */
#+#ifndef HAVE_UINTPTR_T
#+typedef unsigned int uintptr_t;
#+#define HAVE_UINTPTR_T 1
#+#endif])
#+
# AC_STRUCT_TM
#
# AC_CACHE_CHECK([for u_int8_t], ac_cv_type_u_int8_t,
#@@ -651,9 +680,8 @@
# #include <sys/types.h>
# #include <sys/socket.h>
# #include <net/if.h>
#-#include <net/route.h>],[
#-extern struct rt_msghdr *p;
#-return p;],
#+#include <net/route.h>],
#+[struct rt_msghdr p;],
# ac_cv_struct_rt_msghdr=yes,
# ac_cv_struct_rt_msghdr=no)
# ])
#@@ -1715,6 +1743,15 @@
# fi
# AC_MSG_RESULT($ntp_ok)
#
#+AC_MSG_CHECKING(if we including processing time debugging code)
#+AC_ARG_ENABLE(debug-timing,
#+ AC_HELP_STRING([--enable-debug-timing], [- include processing time debugging code (costs performance)]),
#+ [ntp_ok=$enableval], [ntp_ok=no])
#+if test "$ntp_ok" = "yes"; then
#+ AC_DEFINE(DEBUG_TIMING, 1, [Enable processing time debugging?])
#+fi
#+AC_MSG_RESULT($ntp_ok)
#+
# AC_MSG_CHECKING(for a the number of minutes in a DST adjustment)
# AC_ARG_ENABLE(dst_minutes,
# AC_HELP_STRING([--enable-dst-minutes=60], [+ minutes per DST adjustment]),
#@@ -1755,9 +1792,12 @@
# 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*)
#+ *-*-netbsd*|*-*-linux*)
# ac_cv_var_typeof_ip_multicast_loop=u_int
# ;;
#+ *-*-winnt*)
#+ ac_cv_var_typeof_ip_multicast_loop=BOOL
#+ ;;
# *) ac_cv_var_typeof_ip_multicast_loop=u_char
# ;;
# esac])
#@@ -2941,20 +2981,6 @@
# esac
# AC_MSG_RESULT($ans)
#
#-AC_MSG_CHECKING(if we want to try SNTP)
#-AC_ARG_WITH(sntp,
#- AC_HELP_STRING([--with-sntp], [+ Build SNTP?]),
#- [ans=$withval], [ans=yes])
#-case "$ans" in
#- no) ;;
#- *)
#- MAKE_SNTP="sntp"
#- AC_SUBST(MAKE_SNTP)
#- ans=yes
#- ;;
#-esac
#-AC_MSG_RESULT($ans)
#-
# AC_SUBST(MAKE_CHECK_LAYOUT)
# AC_MSG_CHECKING(if we want to run check-layout)
# case "$cross_compiling$PATH_PERL" in
#@@ -4016,11 +4042,6 @@
# AC_CONFIG_FILES(scripts/summary, [chmod +x scripts/summary])
# AC_CONFIG_FILES(util/Makefile)
#
#-case "$MAKE_SNTP" in
#- '') ;;
#- *)
#- AC_CONFIG_SUBDIRS(sntp)
#- ;;
#-esac
#+AC_CONFIG_SUBDIRS(sntp)
#
# AC_OUTPUT
#
#--- 1.27.9.1/packageinfo.sh 2006-07-20 17:15:08 -04:00
#+++ 1.57/BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03 2006-07-20 17:15:08 -04:00
#@@ -23,4 +23,4 @@
# # - Numeric values increment
# # - empty 'increments' to 1
# # - NEW 'increments' to empty
#-rcpoint=
#+rcpoint=0
#
# Diff checksum=ca8cb3b5
# Patch vers: 1.3
# Patch type: REGULAR
== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at deacon.udel.edu|ChangeSet|20060720022249|00117
D 1.1251.92.30 06/07/20 07:20:34-04:00 stenn at whimsy.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c NTP_4_2_2P3_RC0
K 127
P ChangeSet
S NTP_4_2_2P3_RC0
s g
s stenn at whimsy.udel.edu|ChangeSet|20060710110226|00962
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|packageinfo.sh|20060411084712|47225|7f44215e99c0cd03 stenn at whimsy.udel.edu|packageinfo.sh|20060720112029|51884
stenn at whimsy.udel.edu|ChangeSet|20060720112034|00127
D 1.1251.92.31 06/07/20 15:50:44-04:00 stenn at whimsy.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 671] Windows wants TYPEOF_IP_MULTICAST_SPOOL=BOOL
K 365
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663 stenn at whimsy.udel.edu|configure.ac|20060720194510|48808
stenn at whimsy.udel.edu|ChangeSet|20060720174944|64430
D 1.1426 06/07/20 16:35:46-04:00 stenn at whimsy.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge whimsy.udel.edu:/deacon/backroom/ntp-stable
c into whimsy.udel.edu:/deacon/backroom/ntp-dev
i stenn at whimsy.udel.edu|ChangeSet|20060720112034|00127
i stenn at whimsy.udel.edu|ChangeSet|20060720195044|00365
K 64530
M stenn at whimsy.udel.edu|ChangeSet|20060720195044|00365
P ChangeSet
------------------------------------------------
0a0
> stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663 stenn at whimsy.udel.edu|configure.ac|20060720203310|33850
> stenn at whimsy.udel.edu|packageinfo.sh|20060411084712|47225|7f44215e99c0cd03 stenn at whimsy.udel.edu|BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03|20060720203335|51884
== configure.ac ==
stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663
stenn at pogo.udel.edu|configure.ac|20060719092414|44451
D 1.359.5.3 06/07/20 15:45:10-04:00 stenn at whimsy.udel.edu +4 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c [Bug 671] Windows wants TYPEOF_IP_MULTICAST_SPOOL=BOOL
K 48808
O -rw-rw-r--
P configure.ac
------------------------------------------------
D1758 1
I1758 1
*-*-netbsd*|*-*-linux*)
I1759 3
;;
*-*-winnt*)
ac_cv_var_typeof_ip_multicast_loop=BOOL
stenn at deacon.udel.edu|configure.ac|20060720000339|29493
D 1.390 06/07/20 16:33:10-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i stenn at whimsy.udel.edu|configure.ac|20060720194510|48808
K 33850
M stenn at whimsy.udel.edu|configure.ac|20060720194510|48808
O -rw-rw-r--
P configure.ac
------------------------------------------------
== BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03 ==
stenn at whimsy.udel.edu|packageinfo.sh|20060411084712|47225|7f44215e99c0cd03
stenn at whimsy.udel.edu|packageinfo.sh|20060710110223|51836
D 1.27.10.1 06/07/20 07:20:29-04:00 stenn at whimsy.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c NTP_4_2_2P3_RC0
K 51884
O -rw-rw-r--
P packageinfo.sh
------------------------------------------------
D26 1
I26 1
rcpoint=0
stenn at whimsy.udel.edu|packageinfo.sh|20060720112029|51884
D 1.27.10.2 06/07/20 16:32:36-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
c Merge rename: packageinfo.sh -> BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03
K 30968
O -rw-rw-r--
P BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03
------------------------------------------------
stenn at deacon.udel.edu|BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03|20060720000339|51836
D 1.57 06/07/20 16:33:35-04:00 stenn at whimsy.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Auto merged
i stenn at whimsy.udel.edu|packageinfo.sh|20060720112029|51884
i stenn at whimsy.udel.edu|BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03|20060720203236|30968
K 51884
M stenn at whimsy.udel.edu|BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03|20060720203236|30968
O -rw-rw-r--
P BitKeeper/deleted/.del-packageinfo.sh~7f44215e99c0cd03
------------------------------------------------
# Patch checksum=c736f9ce
More information about the bk-ntp-dev-send
mailing list