merge conflicts

external/bsd/ntp/dist/configure.ac

@@ -3014,6 +3014,17 @@ AC_MSG_RESULT([$ans])
 
 NTP_OPENSSL
 
+AC_MSG_CHECKING([if we want to enable CMAC support])
+case "$ac_cv_header_openssl_cmac_h" in
+ yes)
+    AC_DEFINE([ENABLE_CMAC], [1], [Enable CMAC support?])
+    ans="yes"
+    ;;
+ *) ans="no"
+    ;;
+esac
+AC_MSG_RESULT([$ans])
+
 NTP_CRYPTO_RAND
 
 # if we are using OpenSSL (--with-crypto), by default Autokey is enabled
@@ -4380,6 +4391,10 @@ NTP_PROBLEM_TESTS
 
 ###
 
+AC_CHECK_DECLS([sigsetjmp,siglongjmp], [], [], [[#include <setjmp.h>]])
+
+###
+
 AC_DEFINE_DIR([NTP_KEYSDIR], [sysconfdir],
     [Default location of crypto key info])
 

external/bsd/ntp/dist/include/isc/mem.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: mem.h,v 1.4 2016/01/08 21:35:35 christos Exp $	*/
+/*	$NetBSD: mem.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * libntp local override of isc/mem.h to stub it out.
@@ -28,7 +28,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: mem.h,v 1.78.120.3 2009/02/11 03:07:01 jinmei Exp  */
+/* Id */
 
 #ifndef ISC_MEM_H
 #define ISC_MEM_H 1

external/bsd/ntp/dist/include/ntp.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ntp.h,v 1.9 2018/04/07 00:19:52 christos Exp $	*/
+/*	$NetBSD: ntp.h,v 1.10 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * ntp.h - NTP definitions for the masses
@@ -612,6 +612,18 @@ struct pkt {
 #define	STRATUM_TO_PKT(s)	((u_char)(((s) == (STRATUM_UNSPEC)) ?\
 				(STRATUM_PKT_UNSPEC) : (s)))
 
+
+/*
+ * A test to determine if the refid should be interpreted as text string.
+ * This is usually the case for a refclock, which has stratum 0 internally,
+ * which results in sys_stratum 1 if the refclock becomes system peer, or
+ * in case of a kiss-of-death (KoD) packet that has STRATUM_PKT_UNSPEC (==0)
+ * in the packet which is converted to STRATUM_UNSPEC when the packet
+ * is evaluated.
+ */
+#define REFID_ISTEXT(s) (((s) <= 1) || ((s) >= STRATUM_UNSPEC))
+
+
 /*
  * Event codes. Used for reporting errors/events to the control module
  */

external/bsd/ntp/dist/include/ntp_debug.h

@@ -1,9 +1,9 @@
-/*	$NetBSD: ntp_debug.h,v 1.4 2016/01/08 21:35:35 christos Exp $	*/
+/*	$NetBSD: ntp_debug.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Header
  *
- * $Created: Sat Aug 20 14:23:01 2005 $
+ * Created
  *
  * Copyright (C) 2005 by Frank Kardel
  */

external/bsd/ntp/dist/include/ntp_md5.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ntp_md5.h,v 1.7 2017/04/13 20:17:41 christos Exp $	*/
+/*	$NetBSD: ntp_md5.h,v 1.8 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * ntp_md5.h: deal with md5.h headers
@@ -9,8 +9,13 @@
 #define NTP_MD5_H
 
 #ifdef OPENSSL
-# include "openssl/evp.h"
+# include <openssl/evp.h>
 # include "libssl_compat.h"
+# ifdef HAVE_OPENSSL_CMAC_H
+#  include <openssl/cmac.h>
+#  define CMAC                  "AES128CMAC"
+#  define AES_128_KEY_SIZE      16
+# endif /*HAVE_OPENSSL_CMAC_H*/
 #else	/* !OPENSSL follows */
 /*
  * Provide OpenSSL-alike MD5 API if we're not using OpenSSL

external/bsd/ntp/dist/kernel/sys/bsd_audioirig.h

@@ -1,7 +1,7 @@
-/*	$NetBSD: bsd_audioirig.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: bsd_audioirig.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
- *	$Header: bsd_audioirig.h,v 1.0 93/08/02 12:42:00
+ *	Header
  */
 
 #ifndef _BSD_AUDIOIRIG_H_

external/bsd/ntp/dist/lib/isc/alpha/include/isc/atomic.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: atomic.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: atomic.h,v 1.7 2009/04/08 06:48:23 tbox Exp  */
+/* Id */
 
 /*
  * This code was written based on FreeBSD's kernel source whose copyright

external/bsd/ntp/dist/lib/isc/app_api.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: app_api.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: app_api.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: app_api.c,v 1.5 2009/09/02 23:48:02 tbox Exp  */
+/* Id */
 
 #include <config.h>
 

external/bsd/ntp/dist/lib/isc/assertions.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: assertions.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: assertions.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007-2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: assertions.c,v 1.26 2009/09/29 15:06:07 fdupont Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/backtrace-emptytbl.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: backtrace-emptytbl.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: backtrace-emptytbl.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: backtrace-emptytbl.c,v 1.3 2009/09/01 20:13:44 each Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/backtrace.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: backtrace.c,v 1.6 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: backtrace.c,v 1.7 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: backtrace.c,v 1.3 2009/09/02 23:48:02 tbox Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/base32.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: base32.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: base32.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: base32.c,v 1.6 2009/10/21 01:22:29 each Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/base64.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: base64.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: base64.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: base64.c,v 1.34 2009/10/21 23:48:05 tbox Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/bitstring.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bitstring.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: bitstring.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: bitstring.c,v 1.17 2007/06/19 23:47:17 tbox Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/buffer.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: buffer.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: buffer.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: buffer.c,v 1.49 2008/09/25 04:02:39 tbox Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/bufferlist.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: bufferlist.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: bufferlist.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: bufferlist.c,v 1.17 2007/06/19 23:47:17 tbox Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/commandline.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: commandline.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: commandline.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Portions Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -50,7 +50,7 @@
  * SUCH DAMAGE.
  */
 
-/* Id: commandline.c,v 1.22 2008/09/25 04:02:39 tbox Exp  */
+/* Id */
 
 /*! \file
  * This file was adapted from the NetBSD project's source tree, RCS ID:

external/bsd/ntp/dist/lib/isc/entropy.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: entropy.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: entropy.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: entropy.c,v 1.22 2010/08/10 23:48:19 tbox Exp  */
+/* Id */
 
 /*! \file
  * \brief

external/bsd/ntp/dist/lib/isc/error.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: error.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: error.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: error.c,v 1.21 2007/06/19 23:47:17 tbox Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/event.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: event.c,v 1.7 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: event.c,v 1.8 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: event.c,v 1.21 2007/06/19 23:47:17 tbox Exp  */
+/* Id */
 
 /*!
  * \file

external/bsd/ntp/dist/lib/isc/fsaccess.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: fsaccess.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: fsaccess.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: fsaccess.c,v 1.10 2007/06/19 23:47:17 tbox Exp  */
+/* Id */
 
 /*! \file
  * \brief

external/bsd/ntp/dist/lib/isc/hash.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: hash.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: hash.c,v 1.16 2009/09/01 00:22:28 jinmei Exp  */
+/* Id */
 
 /*! \file
  * Some portion of this code was derived from universal hash function

external/bsd/ntp/dist/lib/isc/hex.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: hex.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: hex.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: hex.c,v 1.20 2008/09/25 04:02:39 tbox Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/hmacmd5.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: hmacmd5.c,v 1.5 2016/05/01 23:32:00 christos Exp $	*/
+/*	$NetBSD: hmacmd5.c,v 1.6 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: hmacmd5.c,v 1.16 2009/02/06 23:47:42 tbox Exp  */
+/* Id */
 
 /*! \file
  * This code implements the HMAC-MD5 keyed hash algorithm

external/bsd/ntp/dist/lib/isc/ia64/include/isc/atomic.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: atomic.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2006, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: atomic.h,v 1.7 2009/06/24 02:22:50 marka Exp  */
+/* Id */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1

external/bsd/ntp/dist/lib/isc/include/isc/app.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: app.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: app.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: app.h,v 1.11 2009/09/02 23:48:03 tbox Exp  */
+/* Id */
 
 #ifndef ISC_APP_H
 #define ISC_APP_H 1

external/bsd/ntp/dist/lib/isc/include/isc/assertions.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: assertions.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: assertions.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,9 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/*
+/* Id */
- * Id: assertions.h,v 1.28 2009/09/29 23:48:04 tbox Exp 
- */
 /*! \file isc/assertions.h
  */
 

external/bsd/ntp/dist/lib/isc/include/isc/backtrace.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: backtrace.h,v 1.5 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: backtrace.h,v 1.6 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: backtrace.h,v 1.2 2009/09/01 18:40:25 jinmei Exp  */
+/* Id */
 
 /*! \file isc/backtrace.h
  * \brief provide a back trace of the running process to help debug problems.

external/bsd/ntp/dist/lib/isc/include/isc/base32.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: base32.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: base32.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: base32.h,v 1.3 2008/09/25 04:02:39 tbox Exp  */
+/* Id */
 
 #ifndef ISC_BASE32_H
 #define ISC_BASE32_H 1

external/bsd/ntp/dist/lib/isc/include/isc/base64.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: base64.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: base64.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: base64.h,v 1.22 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_BASE64_H
 #define ISC_BASE64_H 1

external/bsd/ntp/dist/lib/isc/include/isc/bind9.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: bind9.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: bind9.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: bind9.h,v 1.2 2009/12/05 23:31:41 each Exp  */
+/* Id */
 
 #ifndef ISC_BIND9_H
 #define ISC_BIND9_H 1

external/bsd/ntp/dist/lib/isc/include/isc/bitstring.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: bitstring.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: bitstring.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: bitstring.h,v 1.14 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_BITSTRING_H
 #define ISC_BITSTRING_H 1

external/bsd/ntp/dist/lib/isc/include/isc/boolean.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: boolean.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: boolean.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: boolean.h,v 1.19 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_BOOLEAN_H
 #define ISC_BOOLEAN_H 1

external/bsd/ntp/dist/lib/isc/include/isc/buffer.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: buffer.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: buffer.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2008, 2010  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: buffer.h,v 1.55 2010/12/20 23:47:21 tbox Exp  */
+/* Id */
 
 #ifndef ISC_BUFFER_H
 #define ISC_BUFFER_H 1

external/bsd/ntp/dist/lib/isc/include/isc/bufferlist.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: bufferlist.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: bufferlist.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: bufferlist.h,v 1.17 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_BUFFERLIST_H
 #define ISC_BUFFERLIST_H 1

external/bsd/ntp/dist/lib/isc/include/isc/commandline.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: commandline.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: commandline.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: commandline.h,v 1.16 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_COMMANDLINE_H
 #define ISC_COMMANDLINE_H 1

external/bsd/ntp/dist/lib/isc/include/isc/entropy.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: entropy.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: entropy.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: entropy.h,v 1.35 2009/10/19 02:37:08 marka Exp  */
+/* Id */
 
 #ifndef ISC_ENTROPY_H
 #define ISC_ENTROPY_H 1

external/bsd/ntp/dist/lib/isc/include/isc/error.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: error.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: error.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: error.h,v 1.22 2009/09/29 23:48:04 tbox Exp  */
+/* Id */
 
 #ifndef ISC_ERROR_H
 #define ISC_ERROR_H 1

external/bsd/ntp/dist/lib/isc/include/isc/event.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: event.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: event.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: event.h,v 1.34 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_EVENT_H
 #define ISC_EVENT_H 1

external/bsd/ntp/dist/lib/isc/include/isc/eventclass.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: eventclass.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: eventclass.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: eventclass.h,v 1.18 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_EVENTCLASS_H
 #define ISC_EVENTCLASS_H 1

external/bsd/ntp/dist/lib/isc/include/isc/formatcheck.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: formatcheck.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: formatcheck.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: formatcheck.h,v 1.13 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_FORMATCHECK_H
 #define ISC_FORMATCHECK_H 1

external/bsd/ntp/dist/lib/isc/include/isc/fsaccess.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: fsaccess.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: fsaccess.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: fsaccess.h,v 1.16 2009/01/17 23:47:43 tbox Exp  */
+/* Id */
 
 #ifndef ISC_FSACCESS_H
 #define ISC_FSACCESS_H 1

external/bsd/ntp/dist/lib/isc/include/isc/hash.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: hash.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: hash.h,v 1.12 2009/01/17 23:47:43 tbox Exp  */
+/* Id */
 
 #ifndef ISC_HASH_H
 #define ISC_HASH_H 1

external/bsd/ntp/dist/lib/isc/include/isc/heap.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: heap.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: heap.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: heap.h,v 1.26 2009/01/17 23:47:43 tbox Exp  */
+/* Id */
 
 #ifndef ISC_HEAP_H
 #define ISC_HEAP_H 1

external/bsd/ntp/dist/lib/isc/include/isc/hex.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: hex.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: hex.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: hex.h,v 1.13 2008/09/25 04:02:39 tbox Exp  */
+/* Id */
 
 #ifndef ISC_HEX_H
 #define ISC_HEX_H 1

external/bsd/ntp/dist/lib/isc/include/isc/hmacmd5.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: hmacmd5.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: hmacmd5.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: hmacmd5.h,v 1.14 2009/02/06 23:47:42 tbox Exp  */
+/* Id */
 
 /*! \file isc/hmacmd5.h
  * \brief This is the header file for the HMAC-MD5 keyed hash algorithm

external/bsd/ntp/dist/lib/isc/include/isc/hmacsha.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: hmacsha.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: hmacsha.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2005-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: hmacsha.h,v 1.9 2009/02/06 23:47:42 tbox Exp  */
+/* Id */
 
 /*! \file isc/hmacsha.h
  * This is the header file for the HMAC-SHA1, HMAC-SHA224, HMAC-SHA256,

external/bsd/ntp/dist/lib/isc/include/isc/httpd.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: httpd.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: httpd.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2006-2008  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: httpd.h,v 1.9 2008/08/08 05:06:49 marka Exp  */
+/* Id */
 
 #ifndef ISC_HTTPD_H
 #define ISC_HTTPD_H 1

external/bsd/ntp/dist/lib/isc/include/isc/interfaceiter.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: interfaceiter.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: interfaceiter.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: interfaceiter.h,v 1.17 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_INTERFACEITER_H
 #define ISC_INTERFACEITER_H 1

external/bsd/ntp/dist/lib/isc/include/isc/ipv6.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ipv6.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: ipv6.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: ipv6.h,v 1.24 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_IPV6_H
 #define ISC_IPV6_H 1

external/bsd/ntp/dist/lib/isc/include/isc/iterated_hash.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: iterated_hash.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: iterated_hash.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: iterated_hash.h,v 1.3 2008/09/25 04:02:39 tbox Exp  */
+/* Id */
 
 #ifndef ISC_ITERATED_HASH_H
 #define ISC_ITERATED_HASH_H 1

external/bsd/ntp/dist/lib/isc/include/isc/lang.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: lang.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: lang.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: lang.h,v 1.13 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_LANG_H
 #define ISC_LANG_H 1

external/bsd/ntp/dist/lib/isc/include/isc/lex.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: lex.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: lex.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: lex.h,v 1.37 2008/05/30 23:47:01 tbox Exp  */
+/* Id */
 
 #ifndef ISC_LEX_H
 #define ISC_LEX_H 1

external/bsd/ntp/dist/lib/isc/include/isc/lfsr.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: lfsr.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: lfsr.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: lfsr.h,v 1.17 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_LFSR_H
 #define ISC_LFSR_H 1

external/bsd/ntp/dist/lib/isc/include/isc/lib.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: lib.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: lib.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: lib.h,v 1.16 2009/09/02 23:48:03 tbox Exp  */
+/* Id */
 
 #ifndef ISC_LIB_H
 #define ISC_LIB_H 1

external/bsd/ntp/dist/lib/isc/include/isc/log.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: log.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: log.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: log.h,v 1.59 2009/02/16 02:01:16 marka Exp  */
+/* Id */
 
 #ifndef ISC_LOG_H
 #define ISC_LOG_H 1

external/bsd/ntp/dist/lib/isc/include/isc/magic.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: magic.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: magic.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: magic.h,v 1.18 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_MAGIC_H
 #define ISC_MAGIC_H 1

external/bsd/ntp/dist/lib/isc/include/isc/md5.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: md5.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: md5.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: md5.h,v 1.20 2010/01/07 23:48:54 tbox Exp  */
+/* Id */
 
 /*! \file isc/md5.h
  * \brief This is the header file for the MD5 message-digest algorithm.

external/bsd/ntp/dist/lib/isc/include/isc/msgcat.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: msgcat.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: msgcat.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: msgcat.h,v 1.13 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_MSGCAT_H
 #define ISC_MSGCAT_H 1

external/bsd/ntp/dist/lib/isc/include/isc/msgs.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: msgs.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: msgs.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: msgs.h,v 1.19 2009/10/01 23:48:08 tbox Exp  */
+/* Id */
 
 #ifndef ISC_MSGS_H
 #define ISC_MSGS_H 1

external/bsd/ntp/dist/lib/isc/include/isc/mutexblock.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: mutexblock.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: mutexblock.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: mutexblock.h,v 1.17 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_MUTEXBLOCK_H
 #define ISC_MUTEXBLOCK_H 1

external/bsd/ntp/dist/lib/isc/include/isc/netaddr.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: netaddr.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: netaddr.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: netaddr.h,v 1.37 2009/01/17 23:47:43 tbox Exp  */
+/* Id */
 
 #ifndef ISC_NETADDR_H
 #define ISC_NETADDR_H 1

external/bsd/ntp/dist/lib/isc/include/isc/netscope.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: netscope.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: netscope.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: netscope.h,v 1.13 2009/06/25 23:48:02 tbox Exp  */
+/* Id */
 
 #ifndef ISC_NETSCOPE_H
 #define ISC_NETSCOPE_H 1

external/bsd/ntp/dist/lib/isc/include/isc/ondestroy.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ondestroy.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: ondestroy.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: ondestroy.h,v 1.14 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_ONDESTROY_H
 #define ISC_ONDESTROY_H 1

external/bsd/ntp/dist/lib/isc/include/isc/os.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: os.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: os.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: os.h,v 1.12 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_OS_H
 #define ISC_OS_H 1

external/bsd/ntp/dist/lib/isc/include/isc/parseint.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: parseint.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: parseint.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: parseint.h,v 1.9 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_PARSEINT_H
 #define ISC_PARSEINT_H 1

external/bsd/ntp/dist/lib/isc/include/isc/platform.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: platform.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: platform.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 1999-2001  Internet Software Consortium.
@@ -17,7 +17,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: platform.h.in,v 1.28 2001/11/19 03:08:26 mayer Exp  */
+/* Id */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1

external/bsd/ntp/dist/lib/isc/include/isc/platform.h.in

@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: platform.h.in,v 1.1.1.7 2018/09/29 17:28:41 christos Exp $ */
+/* Id */
 
 #ifndef ISC_PLATFORM_H
 #define ISC_PLATFORM_H 1

external/bsd/ntp/dist/lib/isc/include/isc/portset.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: portset.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: portset.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: portset.h,v 1.6 2009/06/25 05:28:34 marka Exp  */
+/* Id */
 
 /*! \file isc/portset.h
  * \brief Transport Protocol Port Manipulation Module

external/bsd/ntp/dist/lib/isc/include/isc/print.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: print.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: print.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: print.h,v 1.26 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_PRINT_H
 #define ISC_PRINT_H 1

external/bsd/ntp/dist/lib/isc/include/isc/quota.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: quota.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: quota.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: quota.h,v 1.16 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_QUOTA_H
 #define ISC_QUOTA_H 1

external/bsd/ntp/dist/lib/isc/include/isc/radix.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: radix.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: radix.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: radix.h,v 1.13 2008/12/01 23:47:45 tbox Exp  */
+/* Id */
 
 /*
  * This source was adapted from MRT's RCS Ids:

external/bsd/ntp/dist/lib/isc/include/isc/random.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: random.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: random.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: random.h,v 1.20 2009/01/17 23:47:43 tbox Exp  */
+/* Id */
 
 #ifndef ISC_RANDOM_H
 #define ISC_RANDOM_H 1

external/bsd/ntp/dist/lib/isc/include/isc/ratelimiter.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: ratelimiter.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: ratelimiter.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: ratelimiter.h,v 1.23 2009/01/18 23:48:14 tbox Exp  */
+/* Id */
 
 #ifndef ISC_RATELIMITER_H
 #define ISC_RATELIMITER_H 1

external/bsd/ntp/dist/lib/isc/include/isc/refcount.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: refcount.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: refcount.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: refcount.h,v 1.17 2009/09/29 23:48:04 tbox Exp  */
+/* Id */
 
 #ifndef ISC_REFCOUNT_H
 #define ISC_REFCOUNT_H 1

external/bsd/ntp/dist/lib/isc/include/isc/region.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: region.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: region.h,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: region.h,v 1.25 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_REGION_H
 #define ISC_REGION_H 1

external/bsd/ntp/dist/lib/isc/include/isc/resource.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: resource.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: resource.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2008  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: resource.h,v 1.13 2008/07/11 23:47:09 tbox Exp  */
+/* Id */
 
 #ifndef ISC_RESOURCE_H
 #define ISC_RESOURCE_H 1

external/bsd/ntp/dist/lib/isc/include/isc/resultclass.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: resultclass.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: resultclass.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: resultclass.h,v 1.20 2009/09/02 23:48:03 tbox Exp  */
+/* Id */
 
 #ifndef ISC_RESULTCLASS_H
 #define ISC_RESULTCLASS_H 1

external/bsd/ntp/dist/lib/isc/include/isc/rwlock.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: rwlock.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: rwlock.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: rwlock.h,v 1.28 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_RWLOCK_H
 #define ISC_RWLOCK_H 1

external/bsd/ntp/dist/lib/isc/include/isc/serial.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: serial.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: serial.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: serial.h,v 1.18 2009/01/18 23:48:14 tbox Exp  */
+/* Id */
 
 #ifndef ISC_SERIAL_H
 #define ISC_SERIAL_H 1

external/bsd/ntp/dist/lib/isc/include/isc/sha1.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sha1.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: sha1.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -20,9 +20,9 @@
 #ifndef ISC_SHA1_H
 #define ISC_SHA1_H 1
 
-/* Id: sha1.h,v 1.19 2009/02/06 23:47:42 tbox Exp  */
+/* Id */
 
-/*	NetBSD: sha1.h,v 1.2 1998/05/29 22:55:44 thorpej Exp 	*/
+/*	$NetBSD: sha1.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*! \file isc/sha1.h
  * \brief SHA-1 in C

external/bsd/ntp/dist/lib/isc/include/isc/sha2.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sha2.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: sha2.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2005-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: sha2.h,v 1.12 2009/10/22 02:21:31 each Exp  */
+/* Id */
 
 /*	$FreeBSD: src/sys/crypto/sha2/sha2.h,v 1.1.2.1 2001/07/03 11:01:36 ume Exp $	*/
 /*	$KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $	*/

external/bsd/ntp/dist/lib/isc/include/isc/sockaddr.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: sockaddr.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: sockaddr.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: sockaddr.h,v 1.57 2009/01/18 23:48:14 tbox Exp  */
+/* Id */
 
 #ifndef ISC_SOCKADDR_H
 #define ISC_SOCKADDR_H 1

external/bsd/ntp/dist/lib/isc/include/isc/stdio.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: stdio.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: stdio.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: stdio.h,v 1.13 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_STDIO_H
 #define ISC_STDIO_H 1

external/bsd/ntp/dist/lib/isc/include/isc/stdlib.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: stdlib.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: stdlib.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: stdlib.h,v 1.8 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_STDLIB_H
 #define ISC_STDLIB_H 1

external/bsd/ntp/dist/lib/isc/include/isc/string.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: string.h,v 1.5 2016/05/01 23:32:00 christos Exp $	*/
+/*	$NetBSD: string.h,v 1.6 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: string.h,v 1.23 2007/09/13 04:48:16 each Exp  */
+/* Id */
 
 #ifndef ISC_STRING_H
 #define ISC_STRING_H 1

external/bsd/ntp/dist/lib/isc/include/isc/timer.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: timer.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: timer.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: timer.h,v 1.43 2009/09/02 23:48:03 tbox Exp  */
+/* Id */
 
 #ifndef ISC_TIMER_H
 #define ISC_TIMER_H 1

external/bsd/ntp/dist/lib/isc/include/isc/version.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: version.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: version.h,v 1.9 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 /*! \file isc/version.h */
 

external/bsd/ntp/dist/lib/isc/include/isc/xml.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: xml.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: xml.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2006, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: xml.h,v 1.4 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_XML_H
 #define ISC_XML_H 1

external/bsd/ntp/dist/lib/isc/inet_aton.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: inet_aton.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: inet_aton.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Portions Copyright (C) 2004, 2005, 2007, 2008  Internet Systems Consortium, Inc. ("ISC")
@@ -73,7 +73,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)inet_addr.c	8.1 (Berkeley) 6/17/93";
-static char rcsid[] = "Id: inet_aton.c,v 1.23 2008/12/01 23:47:45 tbox Exp ";
+/* Id */
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

external/bsd/ntp/dist/lib/isc/inet_ntop.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: inet_ntop.c,v 1.7 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: inet_ntop.c,v 1.8 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -21,7 +21,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-	"Id: inet_ntop.c,v 1.21 2009/07/17 23:47:41 tbox Exp ";
+/* Id */
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

external/bsd/ntp/dist/lib/isc/inet_pton.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: inet_pton.c,v 1.8 2017/04/13 20:17:41 christos Exp $	*/
+/*	$NetBSD: inet_pton.c,v 1.9 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -21,7 +21,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-	"Id: inet_pton.c,v 1.19 2007/06/19 23:47:17 tbox Exp ";
+/* Id */
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>

external/bsd/ntp/dist/lib/isc/iterated_hash.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: iterated_hash.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: iterated_hash.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2006, 2008, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: iterated_hash.c,v 1.6 2009/02/18 23:47:48 tbox Exp  */
+/* Id */
 
 #include "config.h"
 

external/bsd/ntp/dist/lib/isc/lex.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: lex.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: lex.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: lex.c,v 1.86 2007/09/17 09:56:29 shane Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/lfsr.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: lfsr.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: lfsr.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: lfsr.c,v 1.20 2007/06/19 23:47:17 tbox Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/lib.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: lib.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: lib.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: lib.c,v 1.16 2009/09/02 23:48:02 tbox Exp  */
+/* Id */
 
 /*! \file */
 

external/bsd/ntp/dist/lib/isc/md5.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: md5.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: md5.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004, 2005, 2007, 2009  Internet Systems Consortium, Inc. ("ISC")
@@ -17,7 +17,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: md5.c,v 1.16 2009/02/06 23:47:42 tbox Exp  */
+/* Id */
 
 /*! \file
  * This code implements the MD5 message-digest algorithm.

external/bsd/ntp/dist/lib/isc/mem_api.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: mem_api.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: mem_api.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2009, 2010  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: mem_api.c,v 1.8 2010/08/12 21:30:26 jinmei Exp  */
+/* Id */
 
 #include <config.h>
 

external/bsd/ntp/dist/lib/isc/mips/include/isc/atomic.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: atomic.h,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: atomic.h,v 1.5 2018/09/29 21:52:32 christos Exp $	*/
 
 /*
  * Copyright (C) 2005, 2007  Internet Systems Consortium, Inc. ("ISC")
@@ -16,7 +16,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* Id: atomic.h,v 1.3 2007/06/19 23:47:18 tbox Exp  */
+/* Id */
 
 #ifndef ISC_ATOMIC_H
 #define ISC_ATOMIC_H 1

external/bsd/ntp/dist/lib/isc/netscope.c

@@ -1,4 +1,4 @@
-/*	$NetBSD: netscope.c,v 1.4 2016/01/08 21:35:36 christos Exp $	*/
+/*	$NetBSD: netscope.c,v 1.5 2018/09/29 21:52:31 christos Exp $	*/
 
 /*
  * Copyright (C) 2004-2007  Internet Systems Consortium, Inc. ("ISC")
@@ -21,7 +21,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static char rcsid[] =
-	"Id: netscope.c,v 1.13 2007/06/19 23:47:17 tbox Exp ";
+/* Id */
 #endif /* LIBC_SCCS and not lint */
 
 #include <config.h>