mirror of
https://git.freebsd.org/ports.git
synced 2025-06-22 05:00:30 -04:00
Update to 6.2p2: upstream has incorporated the fixes for the "query from"
feature.
This commit is contained in:
parent
8bb9689668
commit
6568d3ec19
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=449430
4 changed files with 11 additions and 36 deletions
|
@ -1,8 +1,7 @@
|
|||
# $FreeBSD$
|
||||
|
||||
PORTNAME= openntpd
|
||||
PORTVERSION= 6.2p1
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 6.2p2
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= OPENBSD/OpenNTPD
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1500146749
|
||||
SHA256 (openntpd-6.2p1.tar.gz) = 05e1668f89969a6ae064f411cb1d864ca3acb27ebd8fac963e6443ea0788d0bc
|
||||
SIZE (openntpd-6.2p1.tar.gz) = 437376
|
||||
TIMESTAMP = 1504817543
|
||||
SHA256 (openntpd-6.2p2.tar.gz) = 5808a4137b008a4db20907e1a482f474734b120f254e3c5feb90db15e0820fb2
|
||||
SIZE (openntpd-6.2p2.tar.gz) = 437527
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
--- src/ntpd.8.orig 2016-05-30 22:50:02 UTC
|
||||
--- src/ntpd.8.orig 2017-09-07 19:12:02 UTC
|
||||
+++ src/ntpd.8
|
||||
@@ -56,7 +56,7 @@ Use
|
||||
.Ar file
|
||||
|
@ -9,7 +9,7 @@
|
|||
.It Fl n
|
||||
Configtest mode.
|
||||
Only check the configuration file for validity.
|
||||
@@ -99,19 +99,19 @@ will be logged.
|
||||
@@ -99,18 +99,18 @@ will be logged.
|
||||
After the local clock is synchronized,
|
||||
.Nm
|
||||
adjusts the clock frequency using the
|
||||
|
@ -18,13 +18,12 @@
|
|||
system call to compensate for systematic drift.
|
||||
.Pp
|
||||
.Nm
|
||||
is usually started at boot time, and can be enabled by
|
||||
setting
|
||||
-is started at boot time by default via
|
||||
-.Va ntpd_flags
|
||||
+is usually started at boot time, and can be enabled by setting
|
||||
+.Va openntpd_flags
|
||||
in
|
||||
-.Pa /etc/rc.conf.local .
|
||||
+.Pa /etc/rc.conf .
|
||||
.Pa /etc/rc.conf .
|
||||
See
|
||||
.Xr rc 8
|
||||
and
|
||||
|
@ -33,7 +32,7 @@
|
|||
for more information on the boot process
|
||||
and enabling daemons.
|
||||
.Pp
|
||||
@@ -124,8 +124,8 @@ and its initial clock drift from
|
||||
@@ -123,8 +123,8 @@ and its initial clock drift from
|
||||
.Pa /var/db/ntpd.drift .
|
||||
Clock drift is periodically written to the drift file thereafter.
|
||||
.Sh FILES
|
||||
|
@ -44,7 +43,7 @@
|
|||
Default configuration file.
|
||||
.It Pa /var/db/ntpd.drift
|
||||
Drift file.
|
||||
@@ -135,12 +135,12 @@ Socket file for communication with
|
||||
@@ -134,12 +134,12 @@ Socket file for communication with
|
||||
.El
|
||||
.Sh SEE ALSO
|
||||
.Xr date 1 ,
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
--- src/parse.y.orig 2017-08-11 19:19:57 UTC
|
||||
+++ src/parse.y
|
||||
@@ -136,6 +136,8 @@ main : LISTEN ON address listen_opts {
|
||||
struct sockaddr_in sin4;
|
||||
struct sockaddr_in6 sin6;
|
||||
|
||||
+ memset(&sin4, 0, sizeof(sin4));
|
||||
+ memset(&sin6, 0, sizeof(sin6));
|
||||
sin4.sin_family = AF_INET;
|
||||
sin6.sin6_family = AF_INET6;
|
||||
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
|
||||
@@ -144,9 +146,9 @@ main : LISTEN ON address listen_opts {
|
||||
#endif
|
||||
|
||||
if (inet_pton(AF_INET, $3, &sin4.sin_addr) == 1)
|
||||
- memcpy(&query_addr4, &sin4, sizeof(struct in_addr));
|
||||
+ memcpy(&query_addr4, &sin4, sizeof(struct sockaddr_in));
|
||||
else if (inet_pton(AF_INET6, $3, &sin6.sin6_addr) == 1)
|
||||
- memcpy(&query_addr6, &sin6, sizeof(struct in6_addr));
|
||||
+ memcpy(&query_addr6, &sin6, sizeof(struct sockaddr_in6));
|
||||
else {
|
||||
yyerror("invalid IPv4 or IPv6 address: %s\n",
|
||||
$3);
|
Loading…
Add table
Reference in a new issue