diff --git a/.gitignore b/.gitignore index 6e7ff0d..54f433e 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ Makefile Makefile.in openntpd*.tar.gz +ntpd.conf compat/arc4random.c compat/arc4random_* compat/chacha_private.h diff --git a/ntpd.conf b/ntpd.conf deleted file mode 100644 index f362e52..0000000 --- a/ntpd.conf +++ /dev/null @@ -1,21 +0,0 @@ -# $OpenBSD: ntpd.conf,v 1.3 2015/05/18 11:10:03 dtucker Exp $ -# sample ntpd configuration file, see ntpd.conf(5) - -# Addresses to listen on (ntpd does not listen by default) -#listen on * - -# sync to a single server -#server ntp.example.org - -# use a random selection of NTP Pool Time Servers -# see http://support.ntp.org/bin/view/Servers/NTPPoolServers -servers pool.ntp.org - -# use a specific local timedelta sensor (radio clock, etc) -#sensor nmea0 - -# use all detected timedelta sensors -#sensor * - -# get the time constraint from a well-known HTTPS site -#constraints from "https://www.google.com/" diff --git a/patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch b/patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch index 41213d6..56ff9c7 100644 --- a/patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch +++ b/patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch @@ -1,4 +1,4 @@ -From 7a3b9e1c6e340a8cfcb29cbac1ad4739a43e4929 Mon Sep 17 00:00:00 2001 +From 3932b6e3f8a6053d9ce2054c1d4f056d557fc0ef Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:10:22 -0600 Subject: [PATCH 01/13] Handle IPv6 DNS records on IPv4 networks more liberally diff --git a/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch b/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch index 7a6f1a2..5450383 100644 --- a/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch +++ b/patches/0002-EAI_NODATA-does-not-exist-everywhere.patch @@ -1,4 +1,4 @@ -From e6b57234f53bfe3de18082dc2d374e14c189d37a Mon Sep 17 00:00:00 2001 +From 25747c0ef42f61f122d73c9c8f7b1d6facd5c437 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:04:08 -0600 Subject: [PATCH 02/13] EAI_NODATA does not exist everywhere diff --git a/patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch b/patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch index 1c2a073..e95969f 100644 --- a/patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch +++ b/patches/0003-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch @@ -1,4 +1,4 @@ -From 66c1f59300b4841caebd5e8cebd38dfe73dc197e Mon Sep 17 00:00:00 2001 +From 36eb7d2a2843515b465e36a79b869dc2dd43439f Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:02:50 -0600 Subject: [PATCH 03/13] conditionally fill in sin_len/sin6_len if they exist diff --git a/patches/0004-check-if-rdomain-support-is-available.patch b/patches/0004-check-if-rdomain-support-is-available.patch index 725144d..795b1ea 100644 --- a/patches/0004-check-if-rdomain-support-is-available.patch +++ b/patches/0004-check-if-rdomain-support-is-available.patch @@ -1,4 +1,4 @@ -From db8b0669905e63b8708181b400b887f8d19a6ce1 Mon Sep 17 00:00:00 2001 +From ee9042fcbe380097c551c5edbcf4d683704c2ab9 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:05:46 -0600 Subject: [PATCH 04/13] check if rdomain support is available. diff --git a/patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch b/patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch index c32f051..853643a 100644 --- a/patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch +++ b/patches/0005-update-ntpd.conf-to-indicate-OS-dependent-options.patch @@ -1,4 +1,4 @@ -From 999b87a59812e6c485618d2806bc2a05af1787cc Mon Sep 17 00:00:00 2001 +From 56a53ff670459660f858723115fff391203cc2e2 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Tue, 30 Dec 2014 09:20:03 -0600 Subject: [PATCH 05/13] update ntpd.conf to indicate OS-dependent options diff --git a/patches/0006-allow-overriding-default-user-and-file-locations.patch b/patches/0006-allow-overriding-default-user-and-file-locations.patch index 40dc024..2f87762 100644 --- a/patches/0006-allow-overriding-default-user-and-file-locations.patch +++ b/patches/0006-allow-overriding-default-user-and-file-locations.patch @@ -1,4 +1,4 @@ -From 3d967b9daff41f325171bef987218f6bd39a2703 Mon Sep 17 00:00:00 2001 +From 1ba669c02b5e81551dfa3f1ce07fdfb7a00fd3c1 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Thu, 1 Jan 2015 07:18:11 -0600 Subject: [PATCH 06/13] allow overriding default user and file locations diff --git a/patches/0007-add-p-option-to-create-a-pid-file.patch b/patches/0007-add-p-option-to-create-a-pid-file.patch index 08dd83e..ea948a4 100644 --- a/patches/0007-add-p-option-to-create-a-pid-file.patch +++ b/patches/0007-add-p-option-to-create-a-pid-file.patch @@ -1,4 +1,4 @@ -From 6e0861d02aadcdeb00995e307e805189e4eefbc8 Mon Sep 17 00:00:00 2001 +From 933fd946afb55fdeaae822b84b0674ee114ad497 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Wed, 31 Dec 2014 08:26:41 -0600 Subject: [PATCH 07/13] add -p option to create a pid file diff --git a/patches/0008-initialize-setproctitle-where-needed.patch b/patches/0008-initialize-setproctitle-where-needed.patch index 854e569..07f89b8 100644 --- a/patches/0008-initialize-setproctitle-where-needed.patch +++ b/patches/0008-initialize-setproctitle-where-needed.patch @@ -1,4 +1,4 @@ -From e5fe65b2c3ddccaf70b1cad493ff7efeda5ede6f Mon Sep 17 00:00:00 2001 +From 4738a7078815a5c98e4ea227e3d9aa58bd076a4f Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 12 Jan 2015 06:18:31 -0600 Subject: [PATCH 08/13] initialize setproctitle where needed diff --git a/patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch b/patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch index 0663750..f83ed06 100644 --- a/patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch +++ b/patches/0009-Notify-the-user-when-constraint-support-is-disabled.patch @@ -1,4 +1,4 @@ -From 662cb42337bf04bb3d784a4f9571dc376228f401 Mon Sep 17 00:00:00 2001 +From efb678b08cbff1e994513621b113e864dec9e0c6 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Fri, 27 Mar 2015 23:14:15 -0500 Subject: [PATCH 09/13] Notify the user when constraint support is disabled. diff --git a/patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch b/patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch index 290785e..a47a639 100644 --- a/patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch +++ b/patches/0010-add-a-method-for-updating-the-realtime-clock-on-sync.patch @@ -1,4 +1,4 @@ -From 6c6ea48c43c8438d0fadff1d994977f270f6236a Mon Sep 17 00:00:00 2001 +From daec8e4e9571441a76485ae566b1e974d96752a9 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 4 May 2015 04:27:29 -0500 Subject: [PATCH 10/13] add a method for updating the realtime clock on sync diff --git a/patches/0011-Deal-with-missing-SO_TIMESTAMP.patch b/patches/0011-Deal-with-missing-SO_TIMESTAMP.patch index ca3ada3..fa7f58c 100644 --- a/patches/0011-Deal-with-missing-SO_TIMESTAMP.patch +++ b/patches/0011-Deal-with-missing-SO_TIMESTAMP.patch @@ -1,4 +1,4 @@ -From 881d29d2e864c858458e87706751c35fe231519e Mon Sep 17 00:00:00 2001 +From 551dfcb76bfcd11299729e69d4df5c61bcc6a994 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 6 Dec 2015 22:35:38 -0600 Subject: [PATCH 11/13] Deal with missing SO_TIMESTAMP diff --git a/patches/0012-check-result-of-ftello-ftruncate.patch b/patches/0012-check-result-of-ftello-ftruncate.patch index bf6425d..4a6731d 100644 --- a/patches/0012-check-result-of-ftello-ftruncate.patch +++ b/patches/0012-check-result-of-ftello-ftruncate.patch @@ -1,4 +1,4 @@ -From ada94a3f01ba9dbcee3b74116b76d7da6ade2d6d Mon Sep 17 00:00:00 2001 +From 974f13df1d84aa9199288cf4689db4f19f28af16 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Mon, 21 Dec 2015 05:53:20 -0600 Subject: [PATCH 12/13] check result of ftello/ftruncate diff --git a/patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch b/patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch index fa90f82..77032e9 100644 --- a/patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch +++ b/patches/0013-set-IPV6_V6ONLY-if-we-are-binding-to-an-IPv6-address.patch @@ -1,4 +1,4 @@ -From 9398c9c6c64add64c176519794bf57f142efeaa5 Mon Sep 17 00:00:00 2001 +From 1e633c87b63e0933c854f82b965a3bd686eb0c1c Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sat, 13 Aug 2016 14:22:02 -0500 Subject: [PATCH 13/13] set IPV6_V6ONLY if we are binding to an IPv6 address diff --git a/update.sh b/update.sh index c498fd7..bbbbec1 100755 --- a/update.sh +++ b/update.sh @@ -21,6 +21,7 @@ fi # setup source paths dir=`pwd` patches=$dir/patches +etc_src=$dir/openbsd/src/etc libc_inc=$dir/openbsd/src/include libc_src=$dir/openbsd/src/lib/libc arc4random_src=$dir/openbsd/src/lib/libcrypto/arc4random @@ -34,11 +35,12 @@ CP_LIBC='do_cp_libc' CP='cp -p' PATCH='patch -p0 -s' +$CP $etc_src/ntpd.conf ./ sed '/DECLS/d' $libc_inc/md5.h > include/md5.h sed '/DECLS/d' $libc_inc/sha2.h > include/sha2_openbsd.h -cp $libutil_src/imsg.h include/ -cp $libutil_src/imsg.c compat/ -cp $libutil_src/imsg-buffer.c compat/ +$CP $libutil_src/imsg.h include/ +$CP $libutil_src/imsg.c compat/ +$CP $libutil_src/imsg-buffer.c compat/ (cd compat; $PATCH < $patches/patch-imsg.c) for i in explicit_bzero.c strlcpy.c strlcat.c; do