From owner-p4-projects Tue Nov 5 9:58:29 2002 Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 10AD537B404; Tue, 5 Nov 2002 09:58:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 98B6F37B401 for ; Tue, 5 Nov 2002 09:58:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6A05543E3B for ; Tue, 5 Nov 2002 09:58:03 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gA5HuHmV042929 for ; Tue, 5 Nov 2002 09:56:17 -0800 (PST) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gA5HuAf9042923 for perforce@freebsd.org; Tue, 5 Nov 2002 09:56:10 -0800 (PST) Date: Tue, 5 Nov 2002 09:56:10 -0800 (PST) Message-Id: <200211051756.gA5HuAf9042923@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson Subject: PERFORCE change 20702 for review To: Perforce Change Reviews Sender: owner-p4-projects@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG http://perforce.freebsd.org/chv.cgi?CH=20702 Change 20702 by rwatson@rwatson_tislabs on 2002/11/05 09:56:03 Integ the TrustedBSD base tree for recent main tree changes, including loopback of MAC execve changes. Affected files ... .. //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/freebsd.h#4 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/NEWS#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/README.bk#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/README.refclocks#1 branch .. //depot/projects/trustedbsd/base/contrib/ntp/acconfig.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/aclocal.m4#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/config.guess#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/config.h.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/config.sub#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/configure#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/configure.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/depcomp#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/flock-build#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/html/driver42.htm#1 branch .. //depot/projects/trustedbsd/base/contrib/ntp/html/driver42.html#2 delete .. //depot/projects/trustedbsd/base/contrib/ntp/html/driver43.htm#1 branch .. //depot/projects/trustedbsd/base/contrib/ntp/html/driver44.htm#1 branch .. //depot/projects/trustedbsd/base/contrib/ntp/html/refclock.htm#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/include/ntp.h#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/include/ntp_syscall.h#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/install-sh#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/libntp/clocktypes.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/missing#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/mkinstalldirs#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/Makefile.am#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/Makefile.in#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/ntp_control.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/ntp_loopfilter.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/refclock_conf.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/refclock_local.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/refclock_neoclock4x.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/refclock_ripencc.c#1 branch .. //depot/projects/trustedbsd/base/contrib/ntp/ntpd/refclock_zyfer.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/ntpdate/ntpdate.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/util/ansi2knr.c#3 integrate .. //depot/projects/trustedbsd/base/contrib/ntp/version#2 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config#8 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/ssh_config.5#4 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config#9 integrate .. //depot/projects/trustedbsd/base/crypto/openssh/sshd_config.5#4 integrate .. //depot/projects/trustedbsd/base/etc/rc.d/ypbind#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac.3#3 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/mac.c#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/posix1e/posix1e.3#5 integrate .. //depot/projects/trustedbsd/base/lib/libc/sys/gettimeofday.2#4 integrate .. //depot/projects/trustedbsd/base/lib/libc/uuid/uuid.h#2 integrate .. //depot/projects/trustedbsd/base/lib/libc_r/uthread/uthread_write.c#3 integrate .. //depot/projects/trustedbsd/base/release/Makefile#29 integrate .. //depot/projects/trustedbsd/base/release/alpha/dokern.sh#5 integrate .. //depot/projects/trustedbsd/base/release/alpha/drivers.conf#7 integrate .. //depot/projects/trustedbsd/base/release/ia64/doFS.sh#1 branch .. //depot/projects/trustedbsd/base/release/pc98/fixit-small_crunch.conf#1 branch .. //depot/projects/trustedbsd/base/sbin/dumpfs/dumpfs.c#8 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sbin/reboot/nextboot.8#1 branch .. //depot/projects/trustedbsd/base/share/man/man4/wi.4#6 integrate .. //depot/projects/trustedbsd/base/share/man/man9/mac.9#2 integrate .. //depot/projects/trustedbsd/base/sys/compat/pecoff/imgact_pecoff.c#12 integrate .. //depot/projects/trustedbsd/base/sys/conf/NOTES#23 integrate .. //depot/projects/trustedbsd/base/sys/conf/files#46 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.i386#22 integrate .. //depot/projects/trustedbsd/base/sys/conf/files.pc98#20 integrate .. //depot/projects/trustedbsd/base/sys/conf/majors#15 integrate .. //depot/projects/trustedbsd/base/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/scd/scd.c#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/scd/scd_isa.c#1 branch .. //depot/projects/trustedbsd/base/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/trustedbsd/base/sys/dev/scd/scdvar.h#1 branch .. //depot/projects/trustedbsd/base/sys/dev/sound/pcm/sound.c#8 integrate .. //depot/projects/trustedbsd/base/sys/i386/conf/NOTES#29 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/npx.c#14 integrate .. //depot/projects/trustedbsd/base/sys/i386/isa/scd.c#8 delete .. //depot/projects/trustedbsd/base/sys/i386/isa/scdreg.h#2 delete .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC#18 integrate .. //depot/projects/trustedbsd/base/sys/ia64/conf/GENERIC.hints#2 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_elf.c#14 integrate .. //depot/projects/trustedbsd/base/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/trustedbsd/base/sys/kern/init_sysent.c#24 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_acct.c#11 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_exec.c#22 integrate .. //depot/projects/trustedbsd/base/sys/kern/kern_mac.c#28 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.c#25 integrate .. //depot/projects/trustedbsd/base/sys/kern/syscalls.master#24 integrate .. //depot/projects/trustedbsd/base/sys/modules/nfsserver/Makefile#4 integrate .. //depot/projects/trustedbsd/base/sys/modules/scd/Makefile#1 branch .. //depot/projects/trustedbsd/base/sys/netgraph/ng_source.c#2 integrate .. //depot/projects/trustedbsd/base/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_biba/mac_biba.c#19 integrate .. //depot/projects/trustedbsd/base/sys/security/mac_mls/mac_mls.c#17 integrate .. //depot/projects/trustedbsd/base/sys/sys/imgact.h#7 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac.h#19 integrate .. //depot/projects/trustedbsd/base/sys/sys/mac_policy.h#18 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.h#25 integrate .. //depot/projects/trustedbsd/base/sys/sys/syscall.mk#25 integrate .. //depot/projects/trustedbsd/base/sys/sys/sysproto.h#26 integrate .. //depot/projects/trustedbsd/base/sys/sys/uuid.h#2 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.c#23 integrate .. //depot/projects/trustedbsd/base/sys/vm/vm_page.h#16 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ancontrol/ancontrol.8#7 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/config.h#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/ntpd/Makefile#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/ntp/scripts/mkver#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/pppd/sys-bsd.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sicontrol/sicontrol.8#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/menus.c#16 integrate .. //depot/projects/trustedbsd/base/usr.sbin/sysinstall/modules.c#3 integrate .. //depot/projects/trustedbsd/base/usr.sbin/wicontrol/wicontrol.8#7 integrate Differences ... ==== //depot/projects/trustedbsd/base/contrib/gcc/config/sparc/freebsd.h#4 (text+ko) ==== @@ -18,7 +18,7 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.2 2002/09/12 17:19:09 obrien Exp $ */ +/* $FreeBSD: src/contrib/gcc/config/sparc/freebsd.h,v 1.3 2002/11/05 03:35:56 obrien Exp $ */ /* FreeBSD needs's the platform name (sparc64) defined. Emacs needs to know if the arch is 64 or 32-bits. */ @@ -26,6 +26,7 @@ #undef CPP_CPU64_DEFAULT_SPEC #define CPP_CPU64_DEFAULT_SPEC "-D__sparc64__ -D__sparc_v9__ -D__arch64__" +/* Because we include sparc/sysv4.h. */ #undef CPP_PREDEFINES #define CPP_PREDEFINES FBSD_CPP_PREDEFINES @@ -102,6 +103,31 @@ #undef SPARC_DEFAULT_CMODEL #define SPARC_DEFAULT_CMODEL CM_MEDLOW +#define TRANSFER_FROM_TRAMPOLINE \ + static int need_enable_exec_stack; \ + static void check_enabling(void) __attribute__ ((constructor)); \ + static void check_enabling(void) \ + { \ + extern int sysctlbyname(const char *, void *, size_t *, void *, size_t);\ + int prot = 0; \ + size_t len = sizeof(prot); \ + \ + sysctlbyname ("kern.stackprot", &prot, &len, NULL, 0); \ + if (prot != 7) \ + need_enable_exec_stack = 1; \ + } \ + extern void __enable_execute_stack (void *); \ + void __enable_execute_stack (void *addr) \ + { \ + if (!need_enable_exec_stack) \ + return; \ + else { \ + /* 7 is PROT_READ | PROT_WRITE | PROT_EXEC */ \ + if (mprotect (addr, TRAMPOLINE_SIZE, 7) < 0) \ + perror ("mprotect of trampoline code"); \ + } \ + } + /************************[ Assembler stuff ]********************************/ ==== //depot/projects/trustedbsd/base/contrib/ntp/Makefile.am#3 (text+ko) ==== @@ -29,6 +29,7 @@ README.cvs \ README.des \ README.hackers \ + README.refclocks \ README.rsa \ README.versions \ TODO \ @@ -78,6 +79,8 @@ dist-hook: @find $(distdir) -type d -name CVS -print | xargs rm -rf @find $(distdir) -type d -name SCCS -print | xargs rm -rf + @for i in `find $(distdir)/ports/winnt -type f -name '*.ds*' -print`; \ + do chmod u+w $$i ; unix2dos $$i $$i; done .warning: @echo "Compiling with GCC now generates lots of new warnings." ==== //depot/projects/trustedbsd/base/contrib/ntp/Makefile.in#3 (text+ko) ==== @@ -142,6 +142,7 @@ README.cvs \ README.des \ README.hackers \ + README.refclocks \ README.rsa \ README.versions \ TODO \ @@ -522,6 +523,8 @@ dist-hook: @find $(distdir) -type d -name CVS -print | xargs rm -rf @find $(distdir) -type d -name SCCS -print | xargs rm -rf + @for i in `find $(distdir)/ports/winnt -type f -name '*.ds*' -print`; \ + do chmod u+w $$i ; unix2dos $$i $$i; done .warning: @echo "Compiling with GCC now generates lots of new warnings." ==== //depot/projects/trustedbsd/base/contrib/ntp/NEWS#3 (text+ko) ==== @@ -1,4 +1,5 @@ -- +* clock state machine bugfix * Lose the source port check on incoming packets * (x)ntpdc compatibility patch * Virtual IP improvements ==== //depot/projects/trustedbsd/base/contrib/ntp/README.bk#2 (text+ko) ==== @@ -1,8 +1,8 @@ In order to use the BitKeeper repository version of NTP you will have to have the following tools installed: - autoconf 2.50 or later (we use 2.52) - automake (we use 1.5) + autoconf 2.52 or later + automake 1.5 or later lynx Lynx is used to generate the COPYRIGHT file. Don't ask. @@ -17,24 +17,34 @@ Once you have installed bitkeeper, you can clone any NTP repository. + Note: as of 2002-05, ntp.bkserver.net and ntp.bkbits.net are + being upgraded. Depending on the "phase" of the upgrade, one + of the two machines may not answer. + You can get the ntp-stable repository by either of the following commands: bk clone bk://www.ntp.org/home/bk/ntp-stable ntp-stable bk clone bk://ntp.bkserver.net/ntp-stable ntp-stable + bk clone bk://ntp.bkbits.net/ntp-stable ntp-stable + You can get the ntp-dev repository by either of the following commands: bk clone bk://www.ntp.org/home/bk/ntp-dev ntp-dev bk clone bk://ntp.bkserver.net/ntp-dev ntp-dev + bk clone bk://ntp.bkbits.net/ntp-dev ntp-dev + The IPV6 patch has been applied: bk clone bk://www.ntp.org/home/bk/ntp-dev-ipv6 ntp-dev-ipv6 bk clone bk://ntp.bkserver.net/ntp-dev-ipv6 ntp-dev-ipv6 + bk clone bk://ntp.bkbits.net/ntp-dev-ipv6 ntp-dev-ipv6 + The ntp-dev-ipv6 repository will be merged back in to the ntp-dev repo as soon as the code is stable. ==== //depot/projects/trustedbsd/base/contrib/ntp/acconfig.h#3 (text+ko) ==== @@ -1,485 +1,1 @@ -/* debugging code */ -#undef DEBUG - -/* Minutes per DST adjustment */ -#undef DSTMINUTES - -/* MD5 authentication */ -#undef MD5 - -/* DES authentication (COCOM only) */ -#undef DES - -/* time_t */ -#undef time_t - -/* reference clock interface */ -#undef REFCLOCK - -/* Audio CHU? */ -#undef AUDIO_CHU - -/* PARSE kernel PLL PPS support */ -#undef PPS_SYNC - -/* ACTS modem service */ -#undef CLOCK_ACTS - -/* Arbiter 1088A/B GPS receiver */ -#undef CLOCK_ARBITER - -/* DHD19970505: ARCRON support. */ -#undef CLOCK_ARCRON_MSF - -/* Austron 2200A/2201A GPS receiver */ -#undef CLOCK_AS2201 - -/* PPS interface */ -#undef CLOCK_ATOM - -/* PPS auxiliary interface for ATOM */ -#undef PPS_SAMPLE - -/* Datum/Bancomm bc635/VME interface */ -#undef CLOCK_BANC - -/* Diems Computime Radio Clock */ -#undef CLOCK_COMPUTIME - -/* Chronolog K-series WWVB receiver */ -#undef CLOCK_CHRONOLOG - -/* Datum Programmable Time System */ -#undef CLOCK_DATUM - -/* ELV/DCF7000 clock */ -#undef CLOCK_DCF7000 - -/* Dumb generic hh:mm:ss local clock */ -#undef CLOCK_DUMBCLOCK - -/* Forum Graphic GPS datating station driver */ -#undef CLOCK_FG - -/* TrueTime GPS receiver/VME interface */ -#undef CLOCK_GPSVME - -/* Heath GC-1000 WWV/WWVH receiver */ -#undef CLOCK_HEATH - -/* HOPF 6021 clock */ -#undef CLOCK_HOPF6021 - -/* HOPF PCI clock device */ -#undef CLOCK_HOPF_PCI - -/* HOPF serial clock device*/ -#undef CLOCK_HOPF_SERIAL - -/* HP 58503A GPS receiver */ -#undef CLOCK_HPGPS - -/* Sun IRIG audio decoder */ -#undef CLOCK_IRIG - -/* JJY receiver */ -#undef CLOCK_JJY - -/* Rockwell Jupiter GPS clock */ -#undef CLOCK_JUPITER - -/* Leitch CSD 5300 Master Clock System Driver */ -#undef CLOCK_LEITCH - -/* local clock reference */ -#undef CLOCK_LOCAL - -/* Meinberg clocks */ -#undef CLOCK_MEINBERG - -/* EES M201 MSF receiver */ -#undef CLOCK_MSFEES - -/* Magnavox MX4200 GPS receiver */ -#undef CLOCK_MX4200 - -/* NMEA GPS receiver */ -#undef CLOCK_NMEA - -/* Motorola UT Oncore GPS */ -#undef CLOCK_ONCORE - -/* Palisade clock */ -#undef CLOCK_PALISADE - -/* PARSE driver interface */ -#undef CLOCK_PARSE - -/* Conrad parallel port radio clock */ -#undef CLOCK_PCF - -/* PCL 720 clock support */ -#undef CLOCK_PPS720 - -/* PST/Traconex 1020 WWV/WWVH receiver */ -#undef CLOCK_PST - -/* PTB modem service */ -#undef CLOCK_PTBACTS - -/* DCF77 raw time code */ -#undef CLOCK_RAWDCF - -/* RCC 8000 clock */ -#undef CLOCK_RCC8000 - -/* Schmid DCF77 clock */ -#undef CLOCK_SCHMID - -/* clock thru shared memory */ -#undef CLOCK_SHM - -/* Spectracom 8170/Netclock/2 WWVB receiver */ -#undef CLOCK_SPECTRACOM - -/* 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 - -/* Trimble GPS receiver/TSIP protocol */ -#undef CLOCK_TRIMTSIP - -/* Kinemetrics/TrueTime receivers */ -#undef CLOCK_TRUETIME - -/* Ultralink M320 WWVB receiver */ -#undef CLOCK_ULINK - -/* USNO modem service */ -#undef CLOCK_USNO - -/* WHARTON 400A Series protocol */ -#undef CLOCK_WHARTON_400A - -/* WWV audio driver */ -#undef CLOCK_WWV - -/* VARITEXT protocol */ -#undef CLOCK_VARITEXT - -/* define if we need to declare int errno; */ -#undef DECL_ERRNO - -/* define if we may declare int h_errno; */ -#undef DECL_H_ERRNO - -/* define if it's OK to declare char *sys_errlist[]; */ -#undef CHAR_SYS_ERRLIST - -/* define if it's OK to declare int syscall P((int, struct timeval *, struct timeval *)); */ -#undef DECL_SYSCALL - -/* define if we have syscall is buggy (Solaris 2.4) */ -#undef SYSCALL_BUG - -/* Do we need extra room for SO_RCVBUF? (HPUX <8) */ -#undef NEED_RCVBUF_SLOP - -/* Should we open the broadcast socket? */ -#undef OPEN_BCAST_SOCKET - -/* Do we want the HPUX FindConfig()? */ -#undef NEED_HPUX_FINDCONFIG - -/* canonical system (cpu-vendor-os) string */ -#undef STR_SYSTEM - -/* define if NetInfo support is available */ -#undef HAVE_NETINFO - -/* define if [gs]ettimeofday() only takes 1 argument */ -#undef SYSV_TIMEOFDAY - -/* define if struct sockaddr has sa_len */ -#undef HAVE_SA_LEN_IN_STRUCT_SOCKADDR - -/* define if struct clockinfo has hz */ -#undef HAVE_HZ_IN_STRUCT_CLOCKINFO - -/* define if struct sigaction has sa_sigaction */ -#undef HAVE_SA_SIGACTION_IN_STRUCT_SIGACTION - -/* define if struct clockinfo has tickadj */ -#undef HAVE_TICKADJ_IN_STRUCT_CLOCKINFO - -/* define if struct ntptimeval uses time.tv_nsec instead of time.tv_usec */ -#undef HAVE_TV_NSEC_IN_NTPTIMEVAL - -/* Does a system header defind struct ppsclockev? */ -#undef HAVE_STRUCT_PPSCLOCKEV - -/* define if function prototypes are OK */ -#undef HAVE_PROTOTYPES - -/* define if setpgrp takes 0 arguments */ -#undef HAVE_SETPGRP_0 - -/* hardwire a value for tick? */ -#undef PRESET_TICK - -/* hardwire a value for tickadj? */ -#undef PRESET_TICKADJ - -/* is adjtime() accurate? */ -#undef ADJTIME_IS_ACCURATE - -/* should we NOT read /dev/kmem? */ -#undef NOKMEM - -/* use UDP Wildcard Delivery? */ -#undef UDP_WILDCARD_DELIVERY - -/* always slew the clock? */ -#undef SLEWALWAYS - -/* step, then slew the clock? */ -#undef STEP_SLEW - -/* force ntpdate to step the clock if !defined(STEP_SLEW) ? */ -#undef FORCE_NTPDATE_STEP - -/* synch TODR hourly? */ -#undef DOSYNCTODR - -/* do we set process groups with -pid? */ -#undef UDP_BACKWARDS_SETOWN - -/* must we have a CTTY for fsetown? */ -#undef USE_FSETOWNCTTY - -/* can we use SIGIO for tcp and udp IO? */ -#undef HAVE_SIGNALED_IO - -/* can we use SIGPOLL for UDP? */ -#undef USE_UDP_SIGPOLL - -/* can we use SIGPOLL for tty IO? */ -#undef USE_TTY_SIGPOLL - -/* should we use clock_settime()? */ -#undef USE_CLOCK_SETTIME - -/* do we want the CHU driver? */ -#undef CLOCK_CHU - -/* do we have the ppsclock streams module? */ -#undef PPS - -/* do we have the tty_clk line discipline/streams module? */ -#undef TTYCLK - -/* does the kernel support precision time discipline? */ -#undef KERNEL_PLL - -/* does the kernel support multicasting IP? */ -#undef MCAST - -/* do we have ntp_{adj,get}time in libc? */ -#undef NTP_SYSCALLS_LIBC - -/* do we have ntp_{adj,get}time in the kernel? */ -#undef NTP_SYSCALLS_STD - -/* do we have STREAMS/TLI? (Can we replace this with HAVE_SYS_STROPTS_H? */ -#undef STREAMS_TLI - -/* do we need an s_char typedef? */ -#undef NEED_S_CHAR_TYPEDEF - -/* include the GDT Surveying code? */ -#undef GDT_SURVEYING - -/* does SIOCGIFCONF return size in the buffer? */ -#undef SIZE_RETURNED_IN_BUFFER - -/* what is the name of TICK in the kernel? */ -#undef K_TICK_NAME - -/* Is K_TICK_NAME (nsec_per_tick, for example) in nanoseconds? */ -#undef TICK_NANO - -/* what is the name of TICKADJ in the kernel? */ -#undef K_TICKADJ_NAME - -/* Is K_TICKADJ_NAME (hrestime_adj, for example) in nanoseconds? */ -#undef TICKADJ_NANO - -/* what is (probably) the name of DOSYNCTODR in the kernel? */ -#undef K_DOSYNCTODR_NAME - -/* what is (probably) the name of NOPRINTF in the kernel? */ -#undef K_NOPRINTF_NAME - -/* do we need HPUX adjtime() library support? */ -#undef NEED_HPUX_ADJTIME - -/* Might nlist() values require an extra level of indirection (AIX)? */ -#undef NLIST_EXTRA_INDIRECTION - -/* Other needed NLIST stuff */ -#undef NLIST_STRUCT -#undef NLIST_NAME_UNION - -/* Should we recommend a minimum value for tickadj? */ -#undef MIN_REC_TICKADJ - -/* Is there a problem using PARENB and IGNPAR (IRIX)? */ -#undef NO_PARENB_IGNPAR - -/* Should we not IGNPAR (Linux)? */ -#undef RAWDCF_NO_IGNPAR - -/* Does the compiler like "volatile"? */ -#undef volatile - -/* Does qsort expect to work on "void *" stuff? */ -#undef QSORT_USES_VOID_P - -/* What is the fallback value for HZ? */ -#undef DEFAULT_HZ - -/* Do we need to override the system's idea of HZ? */ -#undef OVERRIDE_HZ - -/* Do we want the SCO clock hacks? */ -#undef SCO5_CLOCK - -/* Do we want the ReliantUNIX clock hacks? */ -#undef RELIANTUNIX_CLOCK - -/* Does the kernel have an FLL bug? */ -#undef KERNEL_FLL_BUG - -/* Define if you have the TIOCGPPSEV ioctl (Solaris) */ -#undef HAVE_TIOCGPPSEV - -/* Define if you have the TIOCSPPS ioctl (Solaris) */ -#undef HAVE_TIOCSPPS - -/* Define if you have the CIOGETEV ioctl (SunOS, Linux) */ -#undef HAVE_CIOGETEV - -/* Define if you have the TIOCGSERIAL, TIOCSSERIAL, ASYNC_PPS_CD_POS, and ASYNC_PPS_CD_NEG ioctls (linux) */ -#undef HAVE_TIO_SERIAL_STUFF - -/* Define if you have the interface in the Draft RFC */ -#undef HAVE_PPSAPI - -/* Do we need to #define _SVID3 when we #include ? */ -#undef TERMIOS_NEEDS__SVID3 - -/* Do we have support for SHMEM_STATUS? */ -#undef ONCORE_SHMEM_STATUS - -/***/ - -/* Which way should we declare... */ - -/* adjtime()? */ -#undef DECL_ADJTIME_0 - -/* bcopy()? */ -#undef DECL_BCOPY_0 - -/* bzero()? */ -#undef DECL_BZERO_0 - -/* cfset[io]speed()? */ -#undef DECL_CFSETISPEED_0 - -/* hstrerror()? */ -#undef DECL_HSTRERROR_0 - -/* inet_ntoa()? */ -#undef DECL_INET_NTOA_0 - -/* ioctl()? */ -#undef DECL_IOCTL_0 - -/* IPC? (bind, connect, recvfrom, sendto, setsockopt, socket) */ -#undef DECL_IPC_0 - -/* memmove()? */ -#undef DECL_MEMMOVE_0 - -/* memset()? */ -#undef DECL_MEMSET_0 - -/* mkstemp()? */ -#undef DECL_MKSTEMP_0 - -/* mktemp()? */ -#undef DECL_MKTEMP_0 - -/* mrand48()? */ -#undef DECL_MRAND48_0 - -/* nlist()? */ -#undef DECL_NLIST_0 - -/* plock()? */ -#undef DECL_PLOCK_0 - -/* rename()? */ -#undef DECL_RENAME_0 - -/* select()? */ -#undef DECL_SELECT_0 - -/* setitimer()? */ -#undef DECL_SETITIMER_0 - -/* setpriority()? */ -#undef DECL_SETPRIORITY_0 -#undef DECL_SETPRIORITY_1 - -/* sigvec()? */ -#undef DECL_SIGVEC_0 - -/* srand48()? */ -#undef DECL_SRAND48_0 - -/* stdio stuff? */ -#undef DECL_STDIO_0 - -/* stime()? */ -#undef DECL_STIME_0 -#undef DECL_STIME_1 - -/* strtol()? */ -#undef DECL_STRTOL_0 - -/* syslog() stuff? */ -#undef DECL_SYSLOG_0 - -/* time()? */ -#undef DECL_TIME_0 - -/* [gs]ettimeofday()? */ -#undef DECL_TIMEOFDAY_0 - -/* tolower()? */ -#undef DECL_TOLOWER_0 - -/* toupper()? */ -#undef DECL_TOUPPER_0 - -/* strerror()? */ -#undef DECL_STRERROR_0 - #undef ULONG_CONST ==== //depot/projects/trustedbsd/base/contrib/ntp/aclocal.m4#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# ./aclocal.m4 generated automatically by aclocal 1.5 +# aclocal.m4 generated automatically by aclocal 1.5 # Copyright 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. ==== //depot/projects/trustedbsd/base/contrib/ntp/config.guess#2 (text+ko) ==== @@ -3,7 +3,7 @@ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. -timestamp='2001-06-29' +timestamp='2001-08-21' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -227,6 +227,9 @@ 2-307) UNAME_MACHINE="alphaev67" ;; + 2-1307) + UNAME_MACHINE="alphaev68" + ;; esac fi rm -f $dummy.s $dummy @@ -330,6 +333,9 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; atari*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -639,7 +645,7 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; - *9??*:MPE/iX:*:*) + *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) @@ -683,12 +689,13 @@ echo xmp-cray-unicos exit 0 ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} + echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ + -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ + -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' @@ -777,6 +784,9 @@ ppc:Linux:*:*) echo powerpc-unknown-linux-gnu exit 0 ;; + ppc64:Linux:*:*) + echo powerpc64-unknown-linux-gnu + exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -785,7 +795,7 @@ PCA57) UNAME_MACHINE=alphapca56 ;; EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev67 ;; + EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi @@ -992,8 +1002,8 @@ echo ns32k-sni-sysv fi exit 0 ;; - PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says + PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort + # says echo i586-unisys-sysv4 exit 0 ;; *:UNIX_System_V:4*:FTX*) @@ -1005,6 +1015,10 @@ # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit 0 ;; + *:VOS:*:*) + # From Paul.Green@stratus.com. + echo hppa1.1-stratus-vos + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; @@ -1097,6 +1111,9 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 ==== //depot/projects/trustedbsd/base/contrib/ntp/config.h.in#3 (text+ko) ==== @@ -1,27 +1,17 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ -/* debugging code */ -#undef DEBUG +/* config.h.in. Generated from configure.in by autoheader. */ +#undef ULONG_CONST -/* Minutes per DST adjustment */ -#undef DSTMINUTES +/* Is adjtime() accurate? */ +#undef ADJTIME_IS_ACCURATE -/* MD5 authentication */ -#undef MD5 +/* CHU audio/decoder? */ +#undef AUDIO_CHU -/* DES authentication (COCOM only) */ -#undef DES +/* Autokey? */ +#undef AUTOKEY -/* time_t */ -#undef time_t - -/* reference clock interface */ -#undef REFCLOCK - -/* Audio CHU? */ -#undef AUDIO_CHU - -/* PARSE kernel PLL PPS support */ -#undef PPS_SYNC +/* Declare char *sys_errlist array */ +#undef CHAR_SYS_ERRLIST /* ACTS modem service */ #undef CLOCK_ACTS @@ -29,70 +19,70 @@ /* Arbiter 1088A/B GPS receiver */ #undef CLOCK_ARBITER -/* DHD19970505: ARCRON support. */ +/* ARCRON support? */ #undef CLOCK_ARCRON_MSF -/* Austron 2200A/2201A GPS receiver */ +/* Austron 2200A/2201A GPS receiver? */ #undef CLOCK_AS2201 -/* PPS interface */ +/* PPS interface? */ #undef CLOCK_ATOM -/* PPS auxiliary interface for ATOM */ -#undef PPS_SAMPLE +/* Datum/Bancomm bc635/VME interface? */ +#undef CLOCK_BANC + +/* Chronolog K-series WWVB receiver? */ +#undef CLOCK_CHRONOLOG -/* Datum/Bancomm bc635/VME interface */ -#undef CLOCK_BANC +/* CHU modem/decoder */ +#undef CLOCK_CHU -/* Diems Computime Radio Clock */ +/* Diems Computime Radio Clock? */ #undef CLOCK_COMPUTIME -/* Chronolog K-series WWVB receiver */ -#undef CLOCK_CHRONOLOG - -/* Datum Programmable Time System */ +/* Datum Programmable Time System? */ #undef CLOCK_DATUM -/* ELV/DCF7000 clock */ +/* ELV/DCF7000 clock? */ #undef CLOCK_DCF7000 -/* Dumb generic hh:mm:ss local clock */ +/* Dumb generic hh:mm:ss local clock? */ #undef CLOCK_DUMBCLOCK -/* Forum Graphic GPS datating station driver */ +/* Forum Graphic GPS datating station driver? */ #undef CLOCK_FG -/* TrueTime GPS receiver/VME interface */ +/* TrueTime GPS receiver/VME interface? */ #undef CLOCK_GPSVME -/* Heath GC-1000 WWV/WWVH receiver */ +/* Heath GC-1000 WWV/WWVH receiver? */ #undef CLOCK_HEATH -/* HOPF 6021 clock */ +/* HOPF 6021 clock? */ #undef CLOCK_HOPF6021 -/* HOPF PCI clock device */ +/* HOPF PCI clock device? */ #undef CLOCK_HOPF_PCI -/* HOPF serial clock device*/ +/* HOPF serial clock device? */ #undef CLOCK_HOPF_SERIAL -/* HP 58503A GPS receiver */ +/* HP 58503A GPS receiver? */ #undef CLOCK_HPGPS -/* Sun IRIG audio decoder */ +/* IRIG audio decoder? */ #undef CLOCK_IRIG -/* JJY receiver */ >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message