Update the various files to sync with vendor import of 4.2.4p5.

sntp includes a copy of libopts in itself in vendor code, rewrite the
Makefile to compile and use only one copy.  It is an internal library, not
installed.

MFC after:	2 weeks

1 files changed, 277 insertions, 68 deletions

diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h
index ff6cb57..0b4c5d5 100644
--- a/usr.sbin/ntp/config.h
+++ b/usr.sbin/ntp/config.h
@@ -1,5 +1,5 @@
 /* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.in by autoheader.  */
+/* config.h.in.  Generated from configure.ac by autoheader.  */
 /* $FreeBSD$ */
 
 /* Is adjtime() accurate? */
@@ -45,7 +45,7 @@
 /* #undef CLOCK_DCF7000 */
 
 /* Dumb generic hh:mm:ss local clock? */
-#define CLOCK_DUMBCLOCK	1 
+#define CLOCK_DUMBCLOCK 1
 
 /* Forum Graphic GPS datating station driver? */
 /* #undef CLOCK_FG */
@@ -84,10 +84,7 @@
 #define CLOCK_LOCAL 1
 
 /* Meinberg clocks */
-#define CLOCK_MEINBERG 1
-
-/* EES M201 MSF receiver */
-/* #undef CLOCK_MSFEES */
+/* #undef CLOCK_MEINBERG */
 
 /* Magnavox MX4200 GPS receiver */
 /* #undef CLOCK_MX4200 */
@@ -116,9 +113,6 @@
 /* PST/Traconex 1020 WWV/WWVH receiver */
 /* #undef CLOCK_PST */
 
-/* PTB modem service */
-/* #undef CLOCK_PTBACTS */
-
 /* DCF77 raw time code */
 #define CLOCK_RAWDCF 1
 
@@ -140,9 +134,6 @@
 /* KSI/Odetics TPRO/S GPS receiver/IRIG interface */
 /* #undef CLOCK_TPRO */
 
-/* TRAK 8810 GPS receiver */
-/* #undef CLOCK_TRAK */
-
 /* Trimble GPS receiver/TAIP protocol */
 /* #undef CLOCK_TRIMTAIP */
 
@@ -158,9 +149,6 @@
 /* Ultralink M320 WWVB receiver? */
 /* #undef CLOCK_ULINK */
 
-/* USNO modem service */
-/* #undef CLOCK_USNO */
-
 /* VARITEXT protocol */
 /* #undef CLOCK_VARITEXT */
 
@@ -176,6 +164,9 @@
 /* Enable debugging? */
 /* #undef DEBUG */
 
+/* Enable processing time debugging? */
+/* #undef DEBUG_TIMING */
+
 /* Declaration style */
 /* #undef DECL_ADJTIME_0 */
 
@@ -216,9 +207,6 @@
 /* #undef DECL_MKTEMP_0 */
 
 /* Declaration style */
-/* #undef DECL_MRAND48_0 */
-
-/* Declaration style */
 /* #undef DECL_NLIST_0 */
 
 /* Declaration style */
@@ -243,9 +231,6 @@
 /* #undef DECL_SIGVEC_0 */
 
 /* Declaration style */
-/* #undef DECL_SRAND48_0 */
-
-/* Declaration style */
 /* #undef DECL_STDIO_0 */
 
 /* Declaration style */
@@ -287,24 +272,36 @@
 /* The number of minutes in a DST adjustment */
 #define DSTMINUTES 60
 
+/* fopen(3) accepts a 'b' in the mode flag */
+#define FOPEN_BINARY_FLAG "b"
+
+/* fopen(3) accepts a 't' in the mode flag */
+#define FOPEN_TEXT_FLAG "t"
+
 /* force ntpdate to step the clock if !defined(STEP_SLEW) ? */
 /* #undef FORCE_NTPDATE_STEP */
 
+/* What is getsockname()'s socklen type? */
+#define GETSOCKNAME_SOCKLEN_TYPE socklen_t
+
+/* Do we have a routing socket (struct rt_msghdr)? */
+#define HAS_ROUTING_SOCKET 1
+
 /* Define to 1 if you have the <arpa/nameser.h> header file. */
 #define HAVE_ARPA_NAMESER_H 1
 
 /* Do we have audio support? */
-#define HAVE_AUDIO	1 
+#define HAVE_AUDIO	1
 
 /* Define to 1 if you have the <bstring.h> header file. */
 /* #undef HAVE_BSTRING_H */
 
+/* Define to 1 if you have the `canonicalize_file_name' function. */
+/* #undef HAVE_CANONICALIZE_FILE_NAME */
+
 /* Do we have the CIOGETEV ioctl (SunOS, Linux)? */
 /* #undef HAVE_CIOGETEV */
 
-/* [Use], [/dev/clockctl?] */
-/* #undef HAVE_CLOCKCTL */
-
 /* Define to 1 if you have the `clock_gettime' function. */
 #define HAVE_CLOCK_GETTIME 1
 
@@ -314,6 +311,25 @@
 /* Define to 1 if you have the `daemon' function. */
 #define HAVE_DAEMON 1
 
+/* Define this if /dev/zero is readable device */
+#define HAVE_DEV_ZERO 1
+
+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
+   */
+#define HAVE_DIRENT_H 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Use Rendezvous/DNS-SD registration */
+/* #undef HAVE_DNSREGISTRATION */
+
+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
+/* #undef HAVE_DOPRNT */
+
+/* Can we drop root privileges? */
+/* #undef HAVE_DROPROOT */
+
 /* Define to 1 if you have the <errno.h> header file. */
 #define HAVE_ERRNO_H 1
 
@@ -338,6 +354,9 @@
 /* Define to 1 if you have the `getdtablesize' function. */
 #define HAVE_GETDTABLESIZE 1
 
+/* Define to 1 if you have the `getifaddrs' function. */
+#define HAVE_GETIFADDRS 1
+
 /* Define to 1 if you have the `getrusage' function. */
 #define HAVE_GETRUSAGE 1
 
@@ -356,6 +375,18 @@
 /* ISC: Use iflist_sysctl? */
 #define HAVE_IFLIST_SYSCTL 1
 
+/* Define to 1 if the system has the type `int16_t'. */
+#define HAVE_INT16_T 1
+
+/* Define to 1 if the system has the type `int32_t'. */
+#define HAVE_INT32_T 1
+
+/* Define to 1 if the system has the type `int8_t'. */
+#define HAVE_INT8_T 1
+
+/* Define to 1 if the system has the type `intptr_t'. */
+#define HAVE_INTPTR_T 1
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #define HAVE_INTTYPES_H 1
 
@@ -378,11 +409,14 @@
 /* #undef HAVE_LIBEDIT */
 
 /* Define to 1 if you have the `elf' library (-lelf). */
-/* #undef HAVE_LIBELF */
+#define HAVE_LIBELF 1
 
 /* Define to 1 if you have the `gen' library (-lgen). */
 /* #undef HAVE_LIBGEN */
 
+/* Define to 1 if you have the <libgen.h> header file. */
+#define HAVE_LIBGEN_H 1
+
 /* Define to 1 if you have the `kvm' library (-lkvm). */
 #define HAVE_LIBKVM 1
 
@@ -405,10 +439,10 @@
 /* #undef HAVE_LIBPOSIX4 */
 
 /* Define to 1 if you have the `readline' library (-lreadline). */
-/* #undef HAVE_LIBREADLINE */
+#define HAVE_LIBREADLINE 1
 
 /* Define to 1 if you have the `rt' library (-lrt). */
-/* #undef HAVE_LIBRT */
+#define HAVE_LIBRT 1
 
 /* Define to 1 if you have the `socket' library (-lsocket). */
 /* #undef HAVE_LIBSOCKET */
@@ -416,6 +450,15 @@
 /* Define to 1 if you have the `syslog' library (-lsyslog). */
 /* #undef HAVE_LIBSYSLOG */
 
+/* Define to 1 if you have the `xnet' library (-lxnet). */
+/* #undef HAVE_LIBXNET */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* Do we have Linux capabilities? */
+/* #undef HAVE_LINUX_CAPABILITIES */
+
 /* Define to 1 if you have the <machine/inline.h> header file. */
 /* #undef HAVE_MACHINE_INLINE_H */
 
@@ -457,8 +500,11 @@
 #define HAVE_MLOCKALL 1
 #endif
 
-/* Define to 1 if you have the `mrand48' function. */
-#define HAVE_MRAND48 1
+/* Define to 1 if you have the `mmap' function. */
+#define HAVE_MMAP 1
+
+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+/* #undef HAVE_NDIR_H */
 
 /* Define to 1 if you have the <netdb.h> header file. */
 #define HAVE_NETDB_H 1
@@ -485,7 +531,10 @@
 /* #undef HAVE_NET_IF6_H */
 
 /* Define to 1 if you have the <net/if.h> header file. */
-/* #undef HAVE_NET_IF_H */
+#define HAVE_NET_IF_H 1
+
+/* Define to 1 if you have the <net/route.h> header file. */
+#define HAVE_NET_ROUTE_H 1
 
 /* Define to 1 if you have the `nice' function. */
 #define HAVE_NICE 1
@@ -499,6 +548,9 @@
 /* Define to 1 if you have the `ntp_gettime' function. */
 #define HAVE_NTP_GETTIME 1
 
+/* Define this if pathfind(3) works */
+/* #undef HAVE_PATHFIND */
+
 /* Define to 1 if you have the `plock' function. */
 /* #undef HAVE_PLOCK */
 
@@ -517,18 +569,21 @@
 /* Define to 1 if you have the `pututxline' function. */
 /* #undef HAVE_PUTUTXLINE */
 
-/* Define to 1 if you have the `random' function. */
-/* #undef HAVE_RANDOM */
-
 /* Define to 1 if you have the <readline/history.h> header file. */
-/* #undef HAVE_READLINE_HISTORY_H */
+#define HAVE_READLINE_HISTORY_H 1
 
 /* Define to 1 if you have the <readline/readline.h> header file. */
-/* #undef HAVE_READLINE_READLINE_H */
+#define HAVE_READLINE_READLINE_H 1
 
 /* Define to 1 if you have the `readlink' function. */
 #define HAVE_READLINK 1
 
+/* Define this if we have a functional realpath(3C) */
+#define HAVE_REALPATH 1
+
+/* Define to 1 if you have the `recvmsg' function. */
+#define HAVE_RECVMSG 1
+
 /* Define to 1 if you have the <resolv.h> header file. */
 #define HAVE_RESOLV_H 1
 
@@ -547,6 +602,9 @@
 /* Define to 1 if you have the `sched_setscheduler' function. */
 /* #undef HAVE_SCHED_SETSCHEDULER */
 
+/* Define to 1 if you have the <setjmp.h> header file. */
+#define HAVE_SETJMP_H 1
+
 /* Define to 1 if you have the `setlinebuf' function. */
 #define HAVE_SETLINEBUF 1
 
@@ -572,7 +630,7 @@
 #define HAVE_SETVBUF 1
 
 /* Define to 1 if you have the <sgtty.h> header file. */
-#define HAVE_SGTTY_H 1
+/* #undef HAVE_SGTTY_H */
 
 /* Define to 1 if you have the `sigaction' function. */
 #define HAVE_SIGACTION 1
@@ -592,12 +650,15 @@
 /* Define to 1 if you have the `snprintf' function. */
 #define HAVE_SNPRINTF 1
 
-/* Define to 1 if you have the `srand48' function. */
-#define HAVE_SRAND48 1
-
 /* Does struct sockaddr_storage have ss_family? */
 #define HAVE_SS_FAMILY_IN_SS 1
 
+/* Does struct sockaddr_storage have ss_len? */
+#define HAVE_SS_LEN_IN_SS 1
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#define HAVE_STDARG_H 1
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #define HAVE_STDINT_H 1
 
@@ -616,12 +677,18 @@
 /* Define to 1 if you have the `strerror' function. */
 #define HAVE_STRERROR 1
 
+/* Define this if strftime() works */
+#define HAVE_STRFTIME 1
+
 /* Define to 1 if you have the <strings.h> header file. */
 #define HAVE_STRINGS_H 1
 
 /* Define to 1 if you have the <string.h> header file. */
 #define HAVE_STRING_H 1
 
+/* Define to 1 if you have the `strrchr' function. */
+#define HAVE_STRRCHR 1
+
 /* Define to 1 if you have the `strstr' function. */
 #define HAVE_STRSTR 1
 
@@ -637,6 +704,12 @@
 /* Do we have struct snd_size? */
 #define HAVE_STRUCT_SND_SIZE 1
 
+/* Define to 1 if `sin6_scope_id' is member of `struct sockaddr_in6'. */
+#define HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID 1
+
+/* Does a system header define struct sockaddr_storage? */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
 /* Do we have struct timespec? */
 #define HAVE_STRUCT_TIMESPEC 1
 
@@ -649,15 +722,25 @@
 /* Define to 1 if you have the `sysctl' function. */
 #define HAVE_SYSCTL 1
 
+/* Define to 1 if you have the <sysexits.h> header file. */
+#define HAVE_SYSEXITS_H 1
+
 /* Define to 1 if you have the <sys/audioio.h> header file. */
 /* #undef HAVE_SYS_AUDIOIO_H */
 
+/* Define to 1 if you have the <sys/capability.h> header file. */
+/* #undef HAVE_SYS_CAPABILITY_H */
+
 /* Define to 1 if you have the <sys/clkdefs.h> header file. */
 /* #undef HAVE_SYS_CLKDEFS_H */
 
 /* Define to 1 if you have the <sys/clockctl.h> header file. */
 /* #undef HAVE_SYS_CLOCKCTL_H */
 
+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_DIR_H */
+
 /* Define to 1 if you have the <sys/file.h> header file. */
 #define HAVE_SYS_FILE_H 1
 
@@ -670,6 +753,9 @@
 /* Define to 1 if you have the <sys/ipc.h> header file. */
 #define HAVE_SYS_IPC_H 1
 
+/* Define to 1 if you have the <sys/limits.h> header file. */
+/* #undef HAVE_SYS_LIMITS_H */
+
 /* Define to 1 if you have the <sys/lock.h> header file. */
 /* #undef HAVE_SYS_LOCK_H */
 
@@ -679,18 +765,31 @@
 /* Define to 1 if you have the <sys/modem.h> header file. */
 /* #undef HAVE_SYS_MODEM_H */
 
+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
+   */
+/* #undef HAVE_SYS_NDIR_H */
+
 /* Define to 1 if you have the <sys/param.h> header file. */
 #define HAVE_SYS_PARAM_H 1
 
 /* Define to 1 if you have the <sys/pcl720.h> header file. */
 /* #undef HAVE_SYS_PCL720_H */
 
+/* Define to 1 if you have the <sys/poll.h> header file. */
+#define HAVE_SYS_POLL_H 1
+
 /* Define to 1 if you have the <sys/ppsclock.h> header file. */
 /* #undef HAVE_SYS_PPSCLOCK_H */
 
 /* Define to 1 if you have the <sys/ppstime.h> header file. */
 /* #undef HAVE_SYS_PPSTIME_H */
 
+/* Define to 1 if you have the <sys/prctl.h> header file. */
+/* #undef HAVE_SYS_PRCTL_H */
+
+/* Define to 1 if you have the <sys/procset.h> header file. */
+/* #undef HAVE_SYS_PROCSET_H */
+
 /* Define to 1 if you have the <sys/proc.h> header file. */
 #define HAVE_SYS_PROC_H 1
 
@@ -698,7 +797,7 @@
 #define HAVE_SYS_RESOURCE_H 1
 
 /* Define to 1 if you have the <sys/sched.h> header file. */
-#define HAVE_SYS_SCHED_H 1
+/* #undef HAVE_SYS_SCHED_H */
 
 /* Define to 1 if you have the <sys/select.h> header file. */
 #define HAVE_SYS_SELECT_H 1
@@ -712,6 +811,9 @@
 /* Define to 1 if you have the <sys/sio.h> header file. */
 /* #undef HAVE_SYS_SIO_H */
 
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
 /* Define to 1 if you have the <sys/sockio.h> header file. */
 #define HAVE_SYS_SOCKIO_H 1
 
@@ -757,6 +859,12 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
 
+/* Use sys/uio.h for struct iovec help */
+/* #undef HAVE_SYS_UIO_H */
+
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
 /* Define to 1 if you have the <sys/wait.h> header file. */
 #define HAVE_SYS_WAIT_H 1
 
@@ -779,10 +887,10 @@
 /* #undef HAVE_TIMEPPS_H */
 
 /* Define to 1 if you have the `timer_create' function. */
-/* #undef HAVE_TIMER_CREATE */
+#define HAVE_TIMER_CREATE 1
 
 /* Define to 1 if you have the `timer_settime' function. */
-/* #undef HAVE_TIMER_SETTIME */
+#define HAVE_TIMER_SETTIME 1
 
 /* Define to 1 if you have the <timex.h> header file. */
 /* #undef HAVE_TIMEX_H */
@@ -796,12 +904,27 @@
 /* Do we have the TIO serial stuff? */
 /* #undef HAVE_TIO_SERIAL_STUFF */
 
-/* Does u_int64_t exist */
+/* Does u_int64_t exist? */
 #define HAVE_TYPE_U_INT64_T 1
 
-/* Does u_int8_t exist */
+/* Does u_int8_t exist? */
 #define HAVE_TYPE_U_INT8_T 1
 
+/* Define to 1 if the system has the type `uint16_t'. */
+#define HAVE_UINT16_T 1
+
+/* Define to 1 if the system has the type `uint32_t'. */
+#define HAVE_UINT32_T 1
+
+/* Define to 1 if the system has the type `uint8_t'. */
+#define HAVE_UINT8_T 1
+
+/* Define to 1 if the system has the type `uintptr_t'. */
+#define HAVE_UINTPTR_T 1
+
+/* Define to 1 if the system has the type `uint_t'. */
+/* #undef HAVE_UINT_T */
+
 /* Define to 1 if you have the `umask' function. */
 #define HAVE_UMASK 1
 
@@ -817,12 +940,27 @@
 /* Define to 1 if you have the `updwtmpx' function. */
 /* #undef HAVE_UPDWTMPX */
 
+/* Define to 1 if you have the <utime.h> header file. */
+#define HAVE_UTIME_H 1
+
 /* Define to 1 if you have the <utmpx.h> header file. */
 /* #undef HAVE_UTMPX_H */
 
 /* Define to 1 if you have the <utmp.h> header file. */
 #define HAVE_UTMP_H 1
 
+/* Define to 1 if you have the <values.h> header file. */
+/* #undef HAVE_VALUES_H */
+
+/* Define to 1 if you have the <varargs.h> header file. */
+/* #undef HAVE_VARARGS_H */
+
+/* Define to 1 if you have the `vprintf' function. */
+#define HAVE_VPRINTF 1
+
+/* Define to 1 if you have the `vsnprintf' function. */
+#define HAVE_VSNPRINTF 1
+
 /* Define to 1 if you have the `vsprintf' function. */
 #define HAVE_VSPRINTF 1
 
@@ -841,9 +979,18 @@
 /* Does struct sockaddr_storage have __ss_family? */
 /* #undef HAVE___SS_FAMILY_IN_SS */
 
+/* Does struct sockaddr_storage have __ss_len? */
+/* #undef HAVE___SS_LEN_IN_SS */
+
 /* Should we use the IRIG sawtooth filter? */
 /* #undef IRIG_SUCKS */
 
+/* Do we need to fix in6isaddr? */
+/* #undef ISC_PLATFORM_FIXIN6ISADDR */
+
+/* ISC: do we have if_nametoindex()? */
+#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1
+
 /* ISC: have struct if_laddrconf? */
 /* #undef ISC_PLATFORM_HAVEIF_LADDRCONF */
 
@@ -859,12 +1006,24 @@
 /* ISC: struct sockaddr as sa_len? */
 #define ISC_PLATFORM_HAVESALEN 
 
+/* ISC: Have sin6_scope_id? */
+#define ISC_PLATFORM_HAVESCOPEID 
+
+/* ISC: provide inet_aton() */
+/* #undef ISC_PLATFORM_NEEDATON */
+
 /* ISC: Need in6addr_any? */
 /* #undef ISC_PLATFORM_NEEDIN6ADDRANY */
 
 /* ISC: provide inet_ntop() */
 /* #undef ISC_PLATFORM_NEEDNTOP */
 
+/* Do we need our own in_port_t? */
+/* #undef ISC_PLATFORM_NEEDPORTT */
+
+/* ISC: provide inet_pton() */
+/* #undef ISC_PLATFORM_NEEDPTON */
+
 /* Does the kernel have an FLL bug? */
 /* #undef KERNEL_FLL_BUG */
 
@@ -919,6 +1078,15 @@
 /* Should we NOT read /dev/kmem? */
 /* #undef NOKMEM */
 
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+/* #undef NO_MINUS_C_MINUS_O */
+
+/* Define this if optional arguments are disallowed */
+/* #undef NO_OPTIONAL_OPT_ARGS */
+
+/* Should we avoid #warning on option name collisions? */
+/* #undef NO_OPTION_NAME_WARNINGS */
+
 /* Is there a problem using PARENB and IGNPAR (IRIX)? */
 #define NO_PARENB_IGNPAR 1
 
@@ -935,11 +1103,18 @@
 #define ONCORE_SHMEM_STATUS 1
 
 /* Use OpenSSL? */
-/* #undef OPENSSL */
+#define OPENSSL		1
 
 /* Should we open the broadcast socket? */
 #define OPEN_BCAST_SOCKET 1
 
+/* need to recreate sockets on changed routing? */
+/* #undef OS_MISSES_SPECIFIC_ROUTE_UPDATES */
+
+/* wildcard socket needs to set REUSEADDR when binding to interface addresses
+   */
+/* #undef OS_NEEDS_REUSEADDR_FOR_IFADDRBIND */
+
 /* Do we need to override the system's idea of HZ? */
 #define OVERRIDE_HZ 1
 
@@ -950,16 +1125,16 @@
 #define PACKAGE_BUGREPORT "roberto@FreeBSD.org"
 
 /* Define to the full name of this package. */
-#define PACKAGE_NAME ""
+#define PACKAGE_NAME "ntp"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
+#define PACKAGE_STRING "ntp 4.2.4p5"
 
 /* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
+#define PACKAGE_TARNAME "ntp"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION ""
+#define PACKAGE_VERSION "4.2.4p5"
 
 /* Do we have the ppsclock streams module? */
 /* #undef PPS */
@@ -976,7 +1151,7 @@
 /* Preset a value for 'tickadj'? */
 #define PRESET_TICKADJ 500/hz
 
-/* Define if compiler has function prototypes */
+/* Define to 1 if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
 
 /* Does qsort expect to work on "void *" stuff? */
@@ -988,6 +1163,9 @@
 /* Basic refclock support? */
 #define REFCLOCK 1
 
+/* name of regex header file */
+#define REGEX_HEADER <regex.h>
+
 /* Do we want the ReliantUNIX clock hacks? */
 /* #undef RELIANTUNIX_CLOCK */
 
@@ -997,6 +1175,13 @@
 /* Do we want the SCO clock hacks? */
 /* #undef SCO5_CLOCK */
 
+/* The size of a `char*', as computed by sizeof. */
+#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__)
+#define SIZEOF_CHARP 8
+#else
+#define SIZEOF_CHARP 4
+#endif
+
 /* The size of a `int', as computed by sizeof. */
 #define SIZEOF_INT 4
 
@@ -1007,9 +1192,19 @@
 #define SIZEOF_LONG 4
 #endif
 
+/* The size of a `short', as computed by sizeof. */
+#define SIZEOF_SHORT 2
+
 /* The size of a `signed char', as computed by sizeof. */
 #define SIZEOF_SIGNED_CHAR 1
 
+/* The size of a `time_t', as computed by sizeof. */
+#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__)
+#define SIZEOF_TIME_T 8
+#else
+#define SIZEOF_TIME_T 4
+#endif
+
 /* Does SIOCGIFCONF return size in the buffer? */
 /* #undef SIZE_RETURNED_IN_BUFFER */
 
@@ -1025,10 +1220,7 @@
 /* Step, then slew the clock? */
 /* #undef STEP_SLEW */
 
-/* Do we have STREAMS/TLI? (Can we replace this with HAVE_SYS_STROPTS_H?) */
-/* #undef STREAMS_TLI */
-
-/* canonical system (cpu-vendor-os) string */
+/* canonical system (cpu-vendor-os) of where we should run */
 #if defined(__alpha__)
 #define STR_SYSTEM "alpha-undermydesk-freebsd"
 #elif defined(__sparc64__)
@@ -1041,7 +1233,6 @@
 #define STR_SYSTEM "i386-undermydesk-freebsd"
 #endif
 
-
 /* Buggy syscall() (Solaris2.4)? */
 /* #undef SYSCALL_BUG */
 
@@ -1066,12 +1257,18 @@
 /* Do we have the tty_clk line discipline/streams module? */
 /* #undef TTYCLK */
 
+/* Provide a typedef for uintptr_t? */
+#ifndef HAVE_UINTPTR_T
+typedef unsigned int	uintptr_t;
+#define HAVE_UINTPTR_T 1
+#endif
+
+/* What type to use for setsockopt */
+#define TYPEOF_IP_MULTICAST_LOOP u_char
+
 /* Do we set process groups with -pid? */
 /* #undef UDP_BACKWARDS_SETOWN */
 
-/* use UDP Wildcard Delivery? */
-#define UDP_WILDCARD_DELIVERY 1
-
 /* How do we create unsigned long constants? */
 #define ULONG_CONST(a) a ## UL
 
@@ -1085,23 +1282,30 @@
 /* #undef USE_UDP_SIGPOLL */
 
 /* Version number of package */
-#define VERSION "4.2.0"
+#define VERSION "4.2.4p5"
 
 /* ISC: Want IPv6? */
-#define WANT_IPV6 
+#define WANT_IPV6 1
+
+/* Define this if a working libregex can be found */
+#define WITH_LIBREGEX 1
 
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #if defined(__sparc64__)
 #define WORDS_BIGENDIAN	1
-#endif 
+#endif
 
 /* Handle ss_family */
 #if !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE___SS_FAMILY_IN_SS)
 # define ss_family __ss_family
-# define ss_len __ss_len
 #endif /* !defined(HAVE_SS_FAMILY_IN_SS) && defined(HAVE_SA_FAMILY_IN_SS) */
 
+/* Handle ss_len */
+#if !defined(HAVE_SS_LEN_IN_SS) && defined(HAVE___SS_LEN_IN_SS)
+# define ss_len __ss_len
+#endif /* !defined(HAVE_SS_LEN_IN_SS) && defined(HAVE_SA_LEN_IN_SS) */
+
 /* Define to 1 if on AIX 3.
    System headers sometimes define this.
    We just want to avoid a redefinition error message.  */
@@ -1124,15 +1328,20 @@
 /* # undef __CHAR_UNSIGNED__ */
 #endif
 
+/* Define like PROTOTYPES; this can be used by system headers. */
+#define __PROTOTYPES 1
+
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
 
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef gid_t */
 
-/* Define as `__inline' if that's what the C compiler calls it, or to nothing
-   if it is not supported. */
+/* Define to `__inline__' or `__inline' if that's what the C compiler
+   calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef __cplusplus
 /* #undef inline */
+#endif
 
 /* Define to `long' if <sys/types.h> does not define. */
 /* #undef off_t */
@@ -1146,8 +1355,8 @@
 /* Define to `int' if <sys/types.h> doesn't define. */
 /* #undef uid_t */
 
+/* Alternate uintptr_t for systems without it. */
+/* #undef uintptr_t */
+
 /* Does the compiler like "volatile"? */
 /* #undef volatile */
-
-/* XXX EAI_NODATA is deprecated but still used in 4.2.0, work around that */
-#define EAI_NODATA EAI_NONAME