svn commit: r463182 - in branches/2018Q1/net/ntp: . files

[Xin LI]

Author: delphij
Date: Wed Feb 28 06:55:22 2018
New Revision: 463182
URL: https://svnweb.freebsd.org/changeset/ports/463182

Log:
  MFH: r460670, r463181
  
  Fix RIPENCC TRIMBLE driver compile error.
  
  Security update 4.2.8p10 --> 4.2.8p11.
  
  Approved by:	ports-secteam

Added:
  branches/2018Q1/net/ntp/files/patch-ntpd__refclock__ripencc.c
     - copied unchanged from r460670, head/net/ntp/files/patch-ntpd__refclock__ripencc.c
Modified:
  branches/2018Q1/net/ntp/Makefile
  branches/2018Q1/net/ntp/distinfo
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/net/ntp/Makefile
==============================================================================
--- branches/2018Q1/net/ntp/Makefile	Wed Feb 28 06:51:33 2018	(r463181)
+++ branches/2018Q1/net/ntp/Makefile	Wed Feb 28 06:55:22 2018	(r463182)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.8p10
-PORTREVISION=	2
+PORTVERSION=	4.2.8p11
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/ \

Modified: branches/2018Q1/net/ntp/distinfo
==============================================================================
--- branches/2018Q1/net/ntp/distinfo	Wed Feb 28 06:51:33 2018	(r463181)
+++ branches/2018Q1/net/ntp/distinfo	Wed Feb 28 06:55:22 2018	(r463182)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1490246780
-SHA256 (ntp-4.2.8p10.tar.gz) = ddd2366e64219b9efa0f7438e06800d0db394ac5c88e13c17b70d0dcdf99b99f
-SIZE (ntp-4.2.8p10.tar.gz) = 6998648
+TIMESTAMP = 1519799522
+SHA256 (ntp-4.2.8p11.tar.gz) = f14a39f753688252d683ff907035ffff106ba8d3db21309b742e09b5c3cd278e
+SIZE (ntp-4.2.8p11.tar.gz) = 7076566

Copied: branches/2018Q1/net/ntp/files/patch-ntpd__refclock__ripencc.c (from r460670, head/net/ntp/files/patch-ntpd__refclock__ripencc.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/net/ntp/files/patch-ntpd__refclock__ripencc.c	Wed Feb 28 06:55:22 2018	(r463182, copy of r460670, head/net/ntp/files/patch-ntpd__refclock__ripencc.c)
@@ -0,0 +1,38 @@
+--- ntpd/refclock_ripencc.c.orig	2014-12-18 18:42:01.000000000 -0800
++++ ntpd/refclock_ripencc.c	2017-11-23 19:41:57.473988000 -0800
+@@ -1517,7 +1517,7 @@
+ 
+ 	record_clock_stats(&peer->srcadr, logbuf);
+ 
+-	if (!utcflags & UTCF_UTC_AVAIL)
++	if (!(utcflags & UTCF_UTC_AVAIL))
+ 		return(-1);
+ 
+ 	/* poll for UTC parameters once and then if UTC flag changed */
+@@ -3442,7 +3442,7 @@
+ 	    status1, status2;
+ 	const char
+ 	    *text;
+-	static const char const
++	static const char
+ 	    *sc_text[] = {
+ 		"Doing position fixes",
+ 		"Don't have GPS time yet",
+@@ -4442,8 +4442,6 @@
+ 		known = TRUE;
+ 	}
+ 	if (known == FALSE) pbuf += sprintf(pbuf, "No known");
+-	reserved = reserved;
+-
+ }
+ 
+ /* 0x8F */
+@@ -5059,7 +5057,7 @@
+ 	{
+ 		for (i=0; i<8; i++)
+ 		{
+-			if (Flags&(1<<i)) pbuf += sprintf(pbuf, LeapStatusText[i]);
++			if (Flags&(1<<i)) pbuf += sprintf(pbuf, " %s", LeapStatusText[i]);
+ 		}
+ 	}
+ 	else