Index: head/net/openntpd/Makefile =================================================================== --- head/net/openntpd/Makefile (revision 449429) +++ head/net/openntpd/Makefile (revision 449430) @@ -1,56 +1,55 @@ # $FreeBSD$ PORTNAME= openntpd -PORTVERSION= 6.2p1 -PORTREVISION= 1 +PORTVERSION= 6.2p2 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD MAINTAINER= naddy@FreeBSD.org COMMENT= Network Time Protocol (NTP) daemon LICENSE= ISCL RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss USE_RC_SUBR= openntpd USERS= _ntp GROUPS= _ntp USES= ssl GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-cacert=${LOCALBASE}/etc/ssl/cert.pem SUB_FILES= 480.status-openntpd pre-build: ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8 post-install: cd ${STAGEDIR}${PREFIX}/etc && ${MV} ntpd.conf ntpd.conf.sample ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily ${INSTALL_SCRIPT} ${WRKDIR}/480.status-openntpd \ ${STAGEDIR}${PREFIX}/etc/periodic/daily .include # Requires libtls from LibreSSL .if ${SSL_DEFAULT:Mlibressl*} CPPFLAGS+= -I${OPENSSLINC} LDFLAGS+= -L${OPENSSLLIB} .else # SSL_DEFAULT BUILD_DEPENDS+= ${NONEXISTENT}:security/libressl:stage CPPFLAGS+= -I${WRKDIR}/libressl/include LDFLAGS+= -L${WRKDIR}/libressl/lib # Don't use COPYTREE_SHARE here as it hard links files, and the original files # are owned by root, which creates problems of its own. pre-configure: @cd `${MAKE} -V STAGEDIR -C ${PORTSDIR}/security/libressl`${PREFIX} \ && ${FIND} -E . ! -name *.so\* | ${CPIO} -dump ${WRKDIR}/libressl >/dev/null 2>&1 .endif # SSL_DEFAULT .include Index: head/net/openntpd/distinfo =================================================================== --- head/net/openntpd/distinfo (revision 449429) +++ head/net/openntpd/distinfo (revision 449430) @@ -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 Index: head/net/openntpd/files/patch-src_parse.y =================================================================== --- head/net/openntpd/files/patch-src_parse.y (revision 449429) +++ head/net/openntpd/files/patch-src_parse.y (nonexistent) @@ -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); Property changes on: head/net/openntpd/files/patch-src_parse.y ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/openntpd/files/patch-src_ntpd.8 =================================================================== --- head/net/openntpd/files/patch-src_ntpd.8 (revision 449429) +++ head/net/openntpd/files/patch-src_ntpd.8 (revision 449430) @@ -1,61 +1,60 @@ ---- 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 as the configuration file, instead of the default -.Pa /etc/ntpd.conf . +.Pa %%PREFIX%%/etc/ntpd.conf . .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 -.Xr adjfreq 2 +.Xr ntp_adjtime 2 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 -.Xr rc.conf 8 +.Xr rc.conf 5 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 -.Bl -tag -width "/var/db/ntpd.driftXXX" -compact -.It Pa /etc/ntpd.conf +.Bl -tag -width "%%PREFIX%%/etc/ntpd.confXXX" -compact +.It Pa %%PREFIX%%/etc/ntpd.conf 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 , -.Xr adjfreq 2 , .Xr adjtime 2 , +.Xr ntp_adjtime 2 , .Xr ntpd.conf 5 , +.Xr rc.conf 5 , .Xr ntpctl 8 , .Xr rc 8 , -.Xr rc.conf 8 , .Xr rdate 8 .Sh STANDARDS .Rs