Fincer
/
openntpd-portable
mirror of https://github.com/Fincer/openntpd-portable
1
0
Fork 0
Code Issues 0 Projects 0 Releases 10 Wiki Activity
Browse Source

rebase patches

OPENBSD_5_8
Brent Cook 9 years ago
parent
70b6d21af6
commit
f3bb8bae60
13 changed files with 72 additions and 75 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -15
      .gitignore
  2. +3
    -3
      patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch
  3. +3
    -3
      patches/0002-EAI_NODATA-does-not-exist-everywhere.patch
  4. +3
    -3
      patches/0003-Use-LOG_NTP-syslog-facility-if-it-is-available.patch
  5. +3
    -3
      patches/0004-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch
  6. +32
    -22
      patches/0005-check-if-rdomain-support-is-available.patch
  7. +4
    -4
      patches/0006-update-ntpd.conf-to-indicate-OS-dependent-options.patch
  8. +4
    -4
      patches/0007-allow-overriding-default-user-and-file-locations.patch
  9. +4
    -4
      patches/0008-add-p-option-to-create-a-pid-file.patch
  10. +3
    -3
      patches/0009-initialize-setproctitle-where-needed.patch
  11. +3
    -3
      patches/0010-document-SIGUSR1-fallback-if-SIGINFO-is-not-implemen.patch
  12. +6
    -6
      patches/0011-Notify-the-user-when-constraint-support-is-disabled.patch
  13. +2
    -2
      patches/0012-add-a-method-for-updating-the-realtime-clock-on-sync.patch

+ 2
- 15
.gitignore View File

@ -34,23 +34,10 @@ Makefile.in
openntpd*.tar.gz
compat/arc4random.c
compat/arc4random_freebsd.h
compat/arc4random_hpux.h
compat/arc4random_linux.h
compat/arc4random_netbsd.h
compat/arc4random_osx.h
compat/arc4random_solaris.h
compat/arc4random_uniform.c
compat/arc4random_win.h
compat/arc4random_*
compat/chacha_private.h
compat/explicit_bzero.c
compat/getentropy_freebsd.c
compat/getentropy_hpux.c
compat/getentropy_linux.c
compat/getentropy_netbsd.c
compat/getentropy_osx.c
compat/getentropy_solaris.c
compat/getentropy_win.c
compat/getentropy_*
compat/imsg-buffer.c
compat/imsg.c
compat/md5.c


+ 3
- 3
patches/0001-Handle-IPv6-DNS-records-on-IPv4-networks-more-libera.patch View File

@ -1,7 +1,7 @@
From 12b5412a7b2004ade1ece0872151c8fe3bb40e04 Mon Sep 17 00:00:00 2001
From 943b27f54be7bc2bfd890b7062b44202a6147ee8 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:10:22 -0600
Subject: [PATCH 01/11] Handle IPv6 DNS records on IPv4 networks more liberally
Subject: [PATCH 01/12] Handle IPv6 DNS records on IPv4 networks more liberally
Rather than fail on IPv4 only networks when seeing an IPv6 DNS record,
just give a warning.
@ -37,5 +37,5 @@ index 1d982d6..e717d69 100644
if (p->rtable != -1 &&
setsockopt(p->query->fd, SOL_SOCKET, SO_RTABLE,
--
1.9.1
2.4.3.573.g4eafbef

+ 3
- 3
patches/0002-EAI_NODATA-does-not-exist-everywhere.patch View File

@ -1,7 +1,7 @@
From 1e47d56c25f283ed9fe71594bed96eaf15babc5e Mon Sep 17 00:00:00 2001
From 8eaf10387df7014a20285e329455eda86e0c4dc9 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:04:08 -0600
Subject: [PATCH 02/11] EAI_NODATA does not exist everywhere
Subject: [PATCH 02/12] EAI_NODATA does not exist everywhere
FreeBSD says it is deprecated #ifdef's it out.
@ -36,5 +36,5 @@ index 3945405..8c1baa2 100644
log_warnx("could not parse \"%s\": %s", s,
gai_strerror(error));
--
1.9.1
2.4.3.573.g4eafbef

+ 3
- 3
patches/0003-Use-LOG_NTP-syslog-facility-if-it-is-available.patch View File

@ -1,7 +1,7 @@
From 1428f299aa499b50fcd18e63b1493bae8d2714ab Mon Sep 17 00:00:00 2001
From aa3a56f2688a9dc12a97eaed4fe45acbafe780d8 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Mon, 12 Jan 2015 21:16:54 -0600
Subject: [PATCH 03/11] Use LOG_NTP syslog facility if it is available
Subject: [PATCH 03/12] Use LOG_NTP syslog facility if it is available
FreeBSD PR: 114191
Submitted by: Robert Archer <freebsd@deathbeforedecaf.net>
@ -51,5 +51,5 @@ index 1d8304b..5d34709 100644
tzset();
}
--
1.9.1
2.4.3.573.g4eafbef

+ 3
- 3
patches/0004-conditionally-fill-in-sin_len-sin6_len-if-they-exist.patch View File

@ -1,7 +1,7 @@
From b5bb8f5408cd54fff33d64c8f28d3847648334ab Mon Sep 17 00:00:00 2001
From c42162dc31ccb9703fdf668052057bf53797583b Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:02:50 -0600
Subject: [PATCH 04/11] conditionally fill in sin_len/sin6_len if they exist
Subject: [PATCH 04/12] conditionally fill in sin_len/sin6_len if they exist
---
src/usr.sbin/ntpd/config.c | 8 ++++++++
@ -49,5 +49,5 @@ index 8c1baa2..2e39604 100644
res->ai_addr)->sin6_addr, sizeof(struct in6_addr));
}
--
1.9.1
2.4.3.573.g4eafbef

+ 32
- 22
patches/0005-check-if-rdomain-support-is-available.patch View File

@ -1,7 +1,7 @@
From 63674f2828a535709805738711503c08efb0e7d4 Mon Sep 17 00:00:00 2001
From e476ea0fbf67062c3c63ea5393fb58e9c2f6a097 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:05:46 -0600
Subject: [PATCH 05/11] check if rdomain support is available.
Subject: [PATCH 05/12] check if rdomain support is available.
Handle FreeBSD's calling rdomain 'FIB'.
- from naddy@openbsd.org
@ -9,8 +9,8 @@ Handle FreeBSD's calling rdomain 'FIB'.
src/usr.sbin/ntpd/client.c | 4 ++++
src/usr.sbin/ntpd/ntpd.h | 6 ++++++
src/usr.sbin/ntpd/parse.y | 2 ++
src/usr.sbin/ntpd/server.c | 11 ++++++++++-
4 files changed, 22 insertions(+), 1 deletion(-)
src/usr.sbin/ntpd/server.c | 15 ++++++++++++++-
4 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/usr.sbin/ntpd/client.c b/src/usr.sbin/ntpd/client.c
index e717d69..2be1f93 100644
@ -43,7 +43,7 @@ index e717d69..2be1f93 100644
for (cmsg = CMSG_FIRSTHDR(&somsg); cmsg != NULL;
cmsg = CMSG_NXTHDR(&somsg, cmsg)) {
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index f6e3acf..28ab1ba 100644
index de4cd84..1402d74 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -41,6 +41,12 @@
@ -60,7 +60,7 @@ index f6e3acf..28ab1ba 100644
#define INTERVAL_QUERY_PATHETIC 60
#define INTERVAL_QUERY_AGGRESSIVE 5
diff --git a/src/usr.sbin/ntpd/parse.y b/src/usr.sbin/ntpd/parse.y
index 8faff66..ebf85ca 100644
index 4b9ef49..375f609 100644
--- a/src/usr.sbin/ntpd/parse.y
+++ b/src/usr.sbin/ntpd/parse.y
@@ -412,11 +412,13 @@ weight : WEIGHT NUMBER {
@ -78,38 +78,48 @@ index 8faff66..ebf85ca 100644
}
;
diff --git a/src/usr.sbin/ntpd/server.c b/src/usr.sbin/ntpd/server.c
index dc58b32..0c0d3dc 100644
index ef448d3..618cd8f 100644
--- a/src/usr.sbin/ntpd/server.c
+++ b/src/usr.sbin/ntpd/server.c
@@ -39,7 +39,10 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
@@ -35,11 +35,16 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
struct listen_addr *la, *nla, *lap;
struct ifaddrs *ifa, *ifap;
struct sockaddr *sa;
+#ifdef SO_RTABLE
struct if_data *ifd;
+#endif
u_int8_t *a6;
size_t sa6len = sizeof(struct in6_addr);
u_int new_cnt = 0;
- int tos = IPTOS_LOWDELAY, rdomain, fd;
- int tos = IPTOS_LOWDELAY, rdomain = 0;
+ int tos = IPTOS_LOWDELAY;
+#ifdef SO_RTABLE
+ int rdomain, fd;
+ int rdomain = 0;
+#endif
TAILQ_FOREACH(lap, &lconf->listen_addrs, entry) {
switch (lap->sa.ss_family) {
@@ -59,6 +62,7 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
strlcpy(ifr.ifr_name, ifap->ifa_name,
sizeof(ifr.ifr_name));
@@ -51,15 +56,19 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
sa = ifap->ifa_addr;
if (sa == NULL || SA_LEN(sa) == 0)
continue;
+#ifdef SO_RTABLE
if (sa->sa_family == AF_LINK) {
ifd = ifap->ifa_data;
rdomain = ifd->ifi_rdomain;
}
+#endif
if (sa->sa_family != AF_INET &&
sa->sa_family != AF_INET6)
continue;
+#ifdef SO_RTABLE
fd = socket(AF_INET, SOCK_DGRAM, 0);
if (ioctl(fd, SIOCGIFRDOMAIN,
(caddr_t)&ifr) == -1)
@@ -69,6 +73,7 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
if (lap->rtable != -1 && rdomain != lap->rtable)
continue;
+#endif
if (sa->sa_family == AF_INET &&
((struct sockaddr_in *)sa)->sin_addr.s_addr ==
@@ -87,7 +92,9 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
@@ -78,7 +87,9 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
fatal("setup_listeners calloc");
memcpy(&la->sa, sa, SA_LEN(sa));
@ -119,7 +129,7 @@ index dc58b32..0c0d3dc 100644
TAILQ_INSERT_TAIL(&lconf->listen_addrs, la, entry);
}
@@ -132,10 +139,12 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
@@ -123,10 +134,12 @@ setup_listeners(struct servent *se, struct ntpd_conf *lconf, u_int *cnt)
IPPROTO_IP, IP_TOS, &tos, sizeof(tos)) == -1)
log_warn("setsockopt IPTOS_LOWDELAY");
@ -133,5 +143,5 @@ index dc58b32..0c0d3dc 100644
if (bind(la->fd, (struct sockaddr *)&la->sa,
SA_LEN((struct sockaddr *)&la->sa)) == -1) {
--
1.9.1
2.4.3.573.g4eafbef

+ 4
- 4
patches/0006-update-ntpd.conf-to-indicate-OS-dependent-options.patch View File

@ -1,7 +1,7 @@
From a65fc1f204c49a92d3b15866c7468576f0088929 Mon Sep 17 00:00:00 2001
From 23f0bcc51a983e3f4f64e8eba69aab02b700a846 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Tue, 30 Dec 2014 09:20:03 -0600
Subject: [PATCH 06/11] update ntpd.conf to indicate OS-dependent options
Subject: [PATCH 06/12] update ntpd.conf to indicate OS-dependent options
Also, clarify listening behavior based on a patch from
Dererk <dererk@debian.org>
@ -11,7 +11,7 @@ Debian bug ID: 575705
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/usr.sbin/ntpd/ntpd.conf.5 b/src/usr.sbin/ntpd/ntpd.conf.5
index 0254fa7..25efcae 100644
index 65b51b0..5dd584d 100644
--- a/src/usr.sbin/ntpd/ntpd.conf.5
+++ b/src/usr.sbin/ntpd/ntpd.conf.5
@@ -38,9 +38,14 @@ The basic configuration options are as follows:
@ -49,5 +49,5 @@ index 0254fa7..25efcae 100644
.Xr ntpd 8
will use each given sensor that actually exists.
--
1.9.1
2.4.3.573.g4eafbef

+ 4
- 4
patches/0007-allow-overriding-default-user-and-file-locations.patch View File

@ -1,7 +1,7 @@
From ee0a5875edc403406175dc8b21c4d20448f9f6de Mon Sep 17 00:00:00 2001
From f01d4ae55c737bdda0c4ae1c9c3749781fa7f421 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Thu, 1 Jan 2015 07:18:11 -0600
Subject: [PATCH 07/11] allow overriding default user and file locations
Subject: [PATCH 07/12] allow overriding default user and file locations
Allow the build process to override the default ntpd file paths and
default user.
@ -10,7 +10,7 @@ default user.
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index 28ab1ba..4d5b3ad 100644
index 1402d74..295d2b4 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -36,10 +36,20 @@
@ -48,5 +48,5 @@ index 28ab1ba..4d5b3ad 100644
enum client_state {
STATE_NONE,
--
1.9.1
2.4.3.573.g4eafbef

+ 4
- 4
patches/0008-add-p-option-to-create-a-pid-file.patch View File

@ -1,7 +1,7 @@
From c699cfbb1e9fb4acc10f12642ce497e38c013391 Mon Sep 17 00:00:00 2001
From 7576c1d2fdd7203e92635724d2a10d451737dff9 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Wed, 31 Dec 2014 08:26:41 -0600
Subject: [PATCH 08/11] add -p option to create a pid file
Subject: [PATCH 08/12] add -p option to create a pid file
This is used in both the Gentoo and Debian ports.
@ -134,7 +134,7 @@ index 045bdd4..c7935bf 100644
timeout = INFTIM;
break;
diff --git a/src/usr.sbin/ntpd/ntpd.h b/src/usr.sbin/ntpd/ntpd.h
index 4d5b3ad..6403391 100644
index 295d2b4..2b7b672 100644
--- a/src/usr.sbin/ntpd/ntpd.h
+++ b/src/usr.sbin/ntpd/ntpd.h
@@ -239,6 +239,7 @@ struct ntpd_conf {
@ -146,5 +146,5 @@ index 4d5b3ad..6403391 100644
struct ctl_show_status {
--
1.9.1
2.4.3.573.g4eafbef

+ 3
- 3
patches/0009-initialize-setproctitle-where-needed.patch View File

@ -1,7 +1,7 @@
From caac2ba644741d6e09e80671612ae34f5f7dbf24 Mon Sep 17 00:00:00 2001
From 95ef91133c920f51d96a3878096cccc9f604671e Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Mon, 12 Jan 2015 06:18:31 -0600
Subject: [PATCH 09/11] initialize setproctitle where needed
Subject: [PATCH 09/12] initialize setproctitle where needed
We need to save a copy of argv and __progname to avoid setproctitle
clobbering them.
@ -48,5 +48,5 @@ index c7935bf..44caa80 100644
switch (ch) {
case 'd':
--
1.9.1
2.4.3.573.g4eafbef

+ 3
- 3
patches/0010-document-SIGUSR1-fallback-if-SIGINFO-is-not-implemen.patch View File

@ -1,7 +1,7 @@
From e659eb618e6f0563c7db796a0ba71569a1c4da27 Mon Sep 17 00:00:00 2001
From 72e069c446e2924fbcdaa3ef60655e84fceaaf10 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Mon, 12 Jan 2015 21:17:35 -0600
Subject: [PATCH 10/11] document SIGUSR1 fallback if SIGINFO is not
Subject: [PATCH 10/12] document SIGUSR1 fallback if SIGINFO is not
implemented.
---
@ -26,5 +26,5 @@ index b11b5ca..24f08e0 100644
.Sh FILES
.Bl -tag -width "/var/db/ntpd.driftXXX" -compact
--
1.9.1
2.4.3.573.g4eafbef

+ 6
- 6
patches/0011-Notify-the-user-when-constraint-support-is-disabled.patch View File

@ -1,7 +1,7 @@
From 0532e94c831af38d015d3bcd56740403cb391e26 Mon Sep 17 00:00:00 2001
From 3ee0940c80c203f7a3af452dca243d365b128e84 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Fri, 27 Mar 2015 23:14:15 -0500
Subject: [PATCH 11/11] Notify the user when constraint support is disabled.
Subject: [PATCH 11/12] Notify the user when constraint support is disabled.
Update the manpage and make a constraint line a fatal error if it is
configured but ntpd is built without libtls present.
@ -27,10 +27,10 @@ index 2e39604..779aed6 100644
}
diff --git a/src/usr.sbin/ntpd/ntp.c b/src/usr.sbin/ntpd/ntp.c
index 0a9b4be..285e30d 100644
index 50fc468..566fd74 100644
--- a/src/usr.sbin/ntpd/ntp.c
+++ b/src/usr.sbin/ntpd/ntp.c
@@ -110,12 +110,14 @@ ntp_main(int pipe_prnt[2], int fd_ctl, struct ntpd_conf *nconf,
@@ -109,12 +109,14 @@ ntp_main(int pipe_prnt[2], int fd_ctl, struct ntpd_conf *nconf,
return (pid);
}
@ -46,7 +46,7 @@ index 0a9b4be..285e30d 100644
/* in this case the parent didn't init logging and didn't daemonize */
if (nconf->settime && !nconf->debug) {
diff --git a/src/usr.sbin/ntpd/ntpd.conf.5 b/src/usr.sbin/ntpd/ntpd.conf.5
index 25efcae..2dee297 100644
index 5dd584d..7b09932 100644
--- a/src/usr.sbin/ntpd/ntpd.conf.5
+++ b/src/usr.sbin/ntpd/ntpd.conf.5
@@ -191,8 +191,11 @@ authenticated constraint,
@ -64,5 +64,5 @@ index 25efcae..2dee297 100644
.It Ic constraint from Ar url
Specify the URL, IP address or the hostname of an HTTPS server to
--
1.9.1
2.4.3.573.g4eafbef

+ 2
- 2
patches/0012-add-a-method-for-updating-the-realtime-clock-on-sync.patch View File

@ -1,4 +1,4 @@
From 6d482d31602ce3fc0b17f155d2306a27bad09bec Mon Sep 17 00:00:00 2001
From bbd4389dbe2934d8c36d22a70d3b473c33e9bbf6 Mon Sep 17 00:00:00 2001
From: Brent Cook <busterb@gmail.com>
Date: Mon, 4 May 2015 04:27:29 -0500
Subject: [PATCH 12/12] add a method for updating the realtime clock on sync
@ -29,5 +29,5 @@ index 44caa80..fb9a8df 100644
}
--
2.2.1.209.g41e5f3a
2.4.3.573.g4eafbef

Write Preview
Loading…
Cancel
Save