svn commit: r376385 - in head/net/ntp-devel: . files

[Cy Schubert]

Author: cy
Date: Tue Jan  6 06:33:52 2015
New Revision: 376385
URL: https://svnweb.freebsd.org/changeset/ports/376385
QAT: https://qat.redports.org/buildarchive/r376385/

Log:
  Ntp devel port now tracks ntp-4.2.8p1 betas as our upline works to
  iron out bugs. We start with beta4.

Added:
  head/net/ntp-devel/files/
  head/net/ntp-devel/files/patch-ntpd__refclock__mx4200.c   (contents, props changed)
Modified:
  head/net/ntp-devel/Makefile
  head/net/ntp-devel/Makefile.inc
  head/net/ntp-devel/distinfo

Modified: head/net/ntp-devel/Makefile
==============================================================================
--- head/net/ntp-devel/Makefile	Tue Jan  6 06:23:40 2015	(r376384)
+++ head/net/ntp-devel/Makefile	Tue Jan  6 06:33:52 2015	(r376385)
@@ -2,18 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.7p486
+PORTVERSION=	4.2.8p1b4
 CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
-		http://archive.ntp.org/ntp4/ntp-dev/
+MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
+		http://archive.ntp.org/ntp4/ntp-4.2/ \
+ 		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/
 PKGNAMESUFFIX=	-devel
-DISTNAME=	${PORTNAME}-dev-${PORTVERSION}-RC
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/:S/b/-beta/}
 
 MAINTAINER=	cy at FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 
-FORBIDDEN=	http://www.kb.cert.org/vuls/id/852879
-
 GNU_CONFIGURE=	yes
 OPTIONS_SUB=	yes
 USES=		pathfix shebangfix libtool
@@ -48,10 +47,6 @@ CONFIGURE_ARGS+=	--enable-${D}
 .endif
 .endfor
 
-.if ${PORT_OPTIONS:MMX4200}
-BROKEN=		Fails to compile when MX4200 is enabled.
-.endif
- 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}4
 
 # XXX Temporary hack. Remember to remove this next commit.

Modified: head/net/ntp-devel/Makefile.inc
==============================================================================
--- head/net/ntp-devel/Makefile.inc	Tue Jan  6 06:23:40 2015	(r376384)
+++ head/net/ntp-devel/Makefile.inc	Tue Jan  6 06:33:52 2015	(r376385)
@@ -1,4 +1,4 @@
-# $FreeBSD: /tmp/pcvs/ports/net/ntp-devel/Makefile.inc,v 1.1 2011-11-27 23:02:28 cy Exp $
+# $FreeBSD: head/net/ntp/Makefile.inc 374987 2014-12-20 00:41:16Z cy $
 
 OPTIONS_DEFINE=	NTPSNMPD \
 		SSL \

Modified: head/net/ntp-devel/distinfo
==============================================================================
--- head/net/ntp-devel/distinfo	Tue Jan  6 06:23:40 2015	(r376384)
+++ head/net/ntp-devel/distinfo	Tue Jan  6 06:33:52 2015	(r376385)
@@ -1,2 +1,2 @@
-SHA256 (ntp-dev-4.2.7p486-RC.tar.gz) = 16efe6adcf401fb8c29dc90f518e0a07f0ae8f0ed7f16a3cc6408d43159310de
-SIZE (ntp-dev-4.2.7p486-RC.tar.gz) = 6551782
+SHA256 (ntp-4.2.8p1-beta4.tar.gz) = 18a1b009635e4d193006fb84d230b2f35997141abd3cb0079a34a40a0dd9d598
+SIZE (ntp-4.2.8p1-beta4.tar.gz) = 6758029

Added: head/net/ntp-devel/files/patch-ntpd__refclock__mx4200.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ntp-devel/files/patch-ntpd__refclock__mx4200.c	Tue Jan  6 06:33:52 2015	(r376385)
@@ -0,0 +1,25 @@
+--- ntpd/refclock_mx4200.c.orig	2014-12-19 11:56:52 UTC
++++ ntpd/refclock_mx4200.c
+@@ -1572,7 +1572,7 @@ mx4200_debug(struct peer *peer, char *fm
+ 		 * Print debug message to stdout
+ 		 * In the future, we may want to get get more creative...
+ 		 */
+-		mvprintf(fmt, ap);
++		vprintf(fmt, ap);
+ 
+ 		va_end(ap);
+ 	}
+@@ -1613,11 +1613,11 @@ mx4200_send(peer, fmt, va_alist)
+ 
+ 	cp = buf;
+ 	*cp++ = '$';
+-	n = VSNPRINTF((cp, sizeof(buf) - 1, fmt, ap));
++	n = vsnprintf(cp, sizeof(buf) - 1, fmt, ap);
+ 	ck = mx4200_cksum(cp, n);
+ 	cp += n;
+ 	++n;
+-	n += SNPRINTF((cp, sizeof(buf) - n - 5, "*%02X\r\n", ck));
++	n += snprintf(cp, sizeof(buf) - n - 5, "*%02X\r\n", ck);
+ 
+ 	m = write(pp->io.fd, buf, (unsigned)n);
+ 	if (m < 0)