Merge ntpd & friends 4.2.4p5 from vendor/ntp/dist into head. Next commit

will update usr.sbin/ntp to match this.

MFC after:	2 weeks

1 files changed, 25 insertions, 26 deletions

diff --git a/contrib/ntp/flock-build b/contrib/ntp/flock-build
index 80dadc3..557809d 100755
--- a/contrib/ntp/flock-build
+++ b/contrib/ntp/flock-build
@@ -3,38 +3,33 @@
 BUILD_ARGS="$@"
 PARSE="--enable-parse-clocks"
 #PARSE=
-SNTP="--with-sntp"
+STD="--enable-simulator"
 
 # Backroom:
-#   beauregard	   freebsd-4
-#   deacon	   sparc-sun-solaris2.7
-#   grundoon	   sparc-sun-sunos4.1.3
-#   howland	   freebsd-4
-#   mort	   sparc-sun-solaris2.8
-#   whimsy	   sparc-sun-solaris2.8
+#   beauregard	   freebsd-6
+# o churchy	   alpha-dec-osf5.1
+#   deacon	   sparc-sun-solaris2.10
+#   grundoon	   freebsd-6.1
+#   howland	   freebsd-6.1
+# o macabre	   sparc-sun-solaris2.8
+# o mort	   sparc-sun-solaris2.8
+#   whimsy	   sparc-sun-solaris2.10
 
 # Campus:
-# * albert	   redhat-8
-#   baldwin	   sparc-sun-solaris2.8
-#   bridgeport	   sparc-sun-solaris2.8
-# * bunnylou	   alpha-dec-osf4.0
-# * churchy	   alpha-dec-osf5.1
-#   cowbird	   alpha-dec-osf4.0
-# * hepzibah	   freebsd-4
-#   malarky	   sparc-sun-solaris2.8
-# * pogo	   sparc-sun-solaris2.8
-# * porkypine	   mips-dec-ultrix4.4
-# * rackety	   sparc-sun-sunos4.1.3/cc
-# ? roogey	   debian
-# * snavely	   hppa1.1-hp-hpux10.20
+# * baldwin	   sparc-sun-solaris2.10
+# * bridgeport	   sparc-sun-solaris2.10
+# * cowbird	   freebsd-6.1
+# * malarky	   sparc-sun-solaris2.10
+# * pogo	   sparc-sun-solaris2.10
+# * rackety	   freebsd-6.1
 
-c_d=`pwd`
+c_d=${PWD:-`pwd`}
 
 SIG=`perl -e 'print rand'`
 echo $SIG > .buildkey
 
 case "$LIST" in
- '') LIST="albert bunnylou churchy hepzibah pogo porkypine rackety snavely" ;;
+ '') LIST="baldwin bridgeport cowbird malarky pogo rackety" ;;
 esac
 
 for i in $LIST
@@ -42,12 +37,16 @@ do
     echo $i
     case "1" in
      0)
-    ssh $i "cd $c_d ; ./build $SIG $PARSE $SNTP $BUILD_ARGS" &
-    ssh $i "cd $c_d ; ./build $SIG $PARSE $SNTP --without-crypto $BUILD_ARGS" &
+    ssh $i "cd $c_d ; ./build $SIG $PARSE $STD $BUILD_ARGS" &
+    ssh $i "cd $c_d ; ./build $SIG $PARSE $STD --without-crypto $BUILD_ARGS" &
+    ssh $i "cd $c_d ; ./build $SIG        $STD --disable-all-clocks $BUILD_ARGS" &
 	;;
      1) ssh $i "cd $c_d ; \
-./build $SIG $PARSE $SNTP $BUILD_ARGS ; \
-./build $SIG $PARSE $SNTP --without-crypto $BUILD_ARGS" &
+./build $SIG $PARSE $STD $BUILD_ARGS ; \
+./build $SIG $PARSE $STD --disable-debugging $BUILD_ARGS ; \
+./build $SIG $PARSE $STD --without-crypto $BUILD_ARGS ; \
+./build $SIG        $STD --disable-all-clocks $BUILD_ARGS" \
+&
 	;;
     esac
 done