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

Harlan Stenn stenn at whimsy.udel.edu
Sat Jan 10 18:11:20 PST 2004


This BitKeeper patch contains the following changesets:
stenn at whimsy.udel.edu|ChangeSet|20040111021011|25241

# 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:	/backroom/ntp-dev

#
#--- 1.11/include/ntp_rfc2553.h	Sat Nov  8 20:30:05 2003
#+++ 1.12/include/ntp_rfc2553.h	Sat Jan 10 21:10:00 2004
#@@ -178,6 +178,7 @@
# 				_SS_PAD1SIZE - _SS_ALIGNSIZE)
# #endif /* HAVE_SA_LEN_IN_STRUCT_SOCKADDR */
# 
#+#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
# struct sockaddr_storage {
# #ifdef HAVE_SA_LEN_IN_STRUCT_SOCKADDR
# 	u_int8_t	ss_len;		/* address length */
#@@ -189,6 +190,7 @@
# 	u_int64_t	__ss_align;	/* force desired structure storage alignment */
# 	char		__ss_pad2[_SS_PAD2SIZE];
# };
#+#endif /* not HAVE_STRUCT_SOCKADDR_STORAGE */
# 
# struct addrinfo {
# 	int	ai_flags;	/* AI_PASSIVE, AI_CANONNAME, AI_NUMERICHOST */
#
#--- 1.338/configure.in	Wed Dec 24 00:44:08 2003
#+++ 1.339/configure.in	Sat Jan 10 21:09:59 2004
#@@ -550,6 +550,21 @@
#     AC_DEFINE(HAVE_SA_LEN_IN_STRUCT_SOCKADDR, 1, [Should be obvious...])
# fi
# 
#+AC_CACHE_CHECK(for struct sockaddr_storage, ac_cv_struct_sockaddr_storage,
#+[AC_TRY_COMPILE([
#+#include <sys/types.h>
#+#include <sys/socket.h>
#+#include <netinet/in.h>
#+],[
#+extern struct sockaddr_storage *ss;
#+return 0;],
#+	ac_cv_struct_sockaddr_storage=yes,
#+	ac_cv_struct_sockaddr_storage=no)
#+])
#+if test $ac_cv_struct_sockaddr_storage = yes; then
#+    AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [Does a system header define struct sockaddr_storage?])
#+fi
#+
# AC_CACHE_CHECK([for ss_family field in struct sockaddr_storage],
# 		ac_cv_have_ss_family_in_struct_ss, [
# 	AC_TRY_COMPILE(
#@@ -3579,6 +3594,16 @@
#     AC_DEFINE(ISC_PLATFORM_HAVESALEN, ,[ISC: struct sockaddr as sa_len?])
# fi
# 
#+AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--enable-ipv6], [use IPv6?]))
#+
#+case "$enable_ipv6" in
#+	yes|''|autodetect)
#+		AC_DEFINE(WANT_IPV6, ,[ISC: Want IPv6?])
#+		;;
#+	no)
#+		;;
#+esac
#+
# AC_MSG_CHECKING(for IPv6 structures)
# AC_TRY_COMPILE([
# #include <sys/types.h>
#@@ -3590,6 +3615,66 @@
# 	[AC_MSG_RESULT(no)
# 	 found_ipv6=no])
# 
#+#
#+# See whether IPv6 support is provided via a Kame add-on.
#+# This is done before other IPv6 linking tests so LIBS is properly set.
#+#
#+AC_MSG_CHECKING(for Kame IPv6 support)
#+AC_ARG_WITH(kame,
#+	[  --with-kame[=PATH]	use Kame IPv6 [default path /usr/local/v6]],
#+	use_kame="$withval", use_kame="no")
#+
#+case "$use_kame" in
#+	no)
#+		;;
#+	yes)
#+		kame_path=/usr/local/v6
#+		;;
#+	*)
#+		kame_path="$use_kame"
#+		;;
#+esac
#+
#+case "$use_kame" in
#+	no)
#+		AC_MSG_RESULT(no)
#+		;;
#+	*)
#+		if test -f $kame_path/lib/libinet6.a; then
#+			AC_MSG_RESULT($kame_path/lib/libinet6.a)
#+			LIBS="-L$kame_path/lib -linet6 $LIBS"
#+		else
#+			AC_MSG_ERROR([$kame_path/lib/libinet6.a not found.
#+
#+Please choose the proper path with the following command:
#+
#+    configure --with-kame=PATH
#+])
#+		fi
#+		;;
#+esac
#+
#+#
#+# Whether netinet6/in6.h is needed has to be defined in isc/platform.h.
#+# Including it on Kame-using platforms is very bad, though, because
#+# Kame uses #error against direct inclusion.   So include it on only
#+# the platform that is otherwise broken without it -- BSD/OS 4.0 through 4.1.
#+# This is done before the in6_pktinfo check because that's what
#+# netinet6/in6.h is needed for.
#+#
#+case "$host" in
#+*-bsdi4.[[01]]*)
#+	ISC_PLATFORM_NEEDNETINET6IN6H="#define ISC_PLATFORM_NEEDNETINET6IN6H 1"
#+	LWRES_PLATFORM_NEEDNETINET6IN6H="#define LWRES_PLATFORM_NEEDNETINET6IN6H 1"
#+	isc_netinet6in6_hack="#include <netinet6/in6.h>"
#+	;;
#+*)
#+	ISC_PLATFORM_NEEDNETINET6IN6H="#undef ISC_PLATFORM_NEEDNETINET6IN6H"
#+	LWRES_PLATFORM_NEEDNETINET6IN6H="#undef LWRES_PLATFORM_NEEDNETINET6IN6H"
#+	isc_netinet6in6_hack=""
#+	;;
#+esac
#+
# AC_MSG_CHECKING([for struct if_laddrconf])
# AC_TRY_LINK([
# #include <sys/types.h>
#@@ -3613,7 +3698,6 @@
# case "$found_ipv6" in
#  yes)
#     AC_DEFINE(ISC_PLATFORM_HAVEIPV6, ,[ISC: Have IPv6?])
#-    AC_DEFINE(WANT_IPV6, ,[ISC: Want IPv6?])
# 
#     AC_MSG_CHECKING(for in6_pktinfo)
#     AC_TRY_COMPILE([
#@@ -3662,6 +3746,8 @@
#         [AC_MSG_RESULT(yes)
#          AC_DEFINE(HAVE_IFLIST_SYSCTL,1,[ISC: Use iflist_sysctl?])],
#         [AC_MSG_RESULT(no)])
#+
#+###
# 
# case "$build" in
#  $host)
#

# Diff checksum=2613accc


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20040110073206|25451
D 1.1210 04/01/10 21:10:11-05:00 stenn at whimsy.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c initial attempt at more rfc2553 cleanup
K 25241
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663 stenn at whimsy.udel.edu|configure.in|20040111020959|44661
> jhay at angel.cids.org.za|include/ntp_rfc2553.h|20011004194249|08764|d8c85aa6dfbf483 stenn at whimsy.udel.edu|include/ntp_rfc2553.h|20040111021000|50192

== include/ntp_rfc2553.h ==
jhay at angel.cids.org.za|include/ntp_rfc2553.h|20011004194249|08764|d8c85aa6dfbf483
mayer at tecotoo.myibg.com|include/ntp_rfc2553.h|20031109013005|43925
D 1.12 04/01/10 21:10:00-05:00 stenn at whimsy.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c initial attempt at more rfc2553 cleanup
K 50192
O -rw-rw-r--
P include/ntp_rfc2553.h
------------------------------------------------

I180 1
#ifndef HAVE_STRUCT_SOCKADDR_STORAGE
I191 1
#endif /* not HAVE_STRUCT_SOCKADDR_STORAGE */

== configure.in ==
stenn at whimsy.udel.edu|configure.in|19990526004811|01635|3aed0663
stenn at whimsy.udel.edu|configure.in|20031224054408|01647
D 1.339 04/01/10 21:09:59-05:00 stenn at whimsy.udel.edu +87 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c initial attempt at more rfc2553 cleanup
K 44661
O -rw-rw-r--
P configure.in
------------------------------------------------

I552 15
AC_CACHE_CHECK(for struct sockaddr_storage, ac_cv_struct_sockaddr_storage,
[AC_TRY_COMPILE([
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
],[
extern struct sockaddr_storage *ss;
return 0;],
	ac_cv_struct_sockaddr_storage=yes,
	ac_cv_struct_sockaddr_storage=no)
])
if test $ac_cv_struct_sockaddr_storage = yes; then
    AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [Does a system header define struct sockaddr_storage?])
fi
\
I3581 10
AC_ARG_ENABLE(ipv6, AC_HELP_STRING([--enable-ipv6], [use IPv6?]))
\
case "$enable_ipv6" in
	yes|''|autodetect)
		AC_DEFINE(WANT_IPV6, ,[ISC: Want IPv6?])
		;;
	no)
		;;
esac
\
I3592 60
#
# See whether IPv6 support is provided via a Kame add-on.
# This is done before other IPv6 linking tests so LIBS is properly set.
#
AC_MSG_CHECKING(for Kame IPv6 support)
AC_ARG_WITH(kame,
	[  --with-kame[=PATH]	use Kame IPv6 [default path /usr/local/v6]],
	use_kame="$withval", use_kame="no")
\
case "$use_kame" in
	no)
		;;
	yes)
		kame_path=/usr/local/v6
		;;
	*)
		kame_path="$use_kame"
		;;
esac
\
case "$use_kame" in
	no)
		AC_MSG_RESULT(no)
		;;
	*)
		if test -f $kame_path/lib/libinet6.a; then
			AC_MSG_RESULT($kame_path/lib/libinet6.a)
			LIBS="-L$kame_path/lib -linet6 $LIBS"
		else
			AC_MSG_ERROR([$kame_path/lib/libinet6.a not found.
\
Please choose the proper path with the following command:
\
    configure --with-kame=PATH
])
		fi
		;;
esac
\
#
# Whether netinet6/in6.h is needed has to be defined in isc/platform.h.
# Including it on Kame-using platforms is very bad, though, because
# Kame uses #error against direct inclusion.   So include it on only
# the platform that is otherwise broken without it -- BSD/OS 4.0 through 4.1.
# This is done before the in6_pktinfo check because that's what
# netinet6/in6.h is needed for.
#
case "$host" in
*-bsdi4.[[01]]*)
	ISC_PLATFORM_NEEDNETINET6IN6H="#define ISC_PLATFORM_NEEDNETINET6IN6H 1"
	LWRES_PLATFORM_NEEDNETINET6IN6H="#define LWRES_PLATFORM_NEEDNETINET6IN6H 1"
	isc_netinet6in6_hack="#include <netinet6/in6.h>"
	;;
*)
	ISC_PLATFORM_NEEDNETINET6IN6H="#undef ISC_PLATFORM_NEEDNETINET6IN6H"
	LWRES_PLATFORM_NEEDNETINET6IN6H="#undef LWRES_PLATFORM_NEEDNETINET6IN6H"
	isc_netinet6in6_hack=""
	;;
esac
\
D3616 1
I3664 2
\
###

# Patch checksum=d69ca237



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