Date: Mon, 05 Jan 2015 22:59:37 -0800 From: Cy Schubert <Cy.Schubert@komquats.com> To: Cy Schubert <cy@FreeBSD.org> Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org Subject: Re: svn commit: r376385 - in head/net/ntp-devel: . files Message-ID: <201501060659.t066xbLX087257@slippy.cwsent.com> In-Reply-To: Message from Cy Schubert <cy@FreeBSD.org> of "Tue, 06 Jan 2015 06:33:53 %2B0000." <201501060633.t066XrDB012253@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <201501060633.t066XrDB012253@svn.freebsd.org>, Cy Schubert writes: > 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 (r37638 > 4) > +++ head/net/ntp-devel/Makefile Tue Jan 6 06:33:52 2015 (r37638 > 5) > @@ -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@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 (r37638 > 4) > +++ head/net/ntp-devel/Makefile.inc Tue Jan 6 06:33:52 2015 (r37638 > 5) > @@ -1,4 +1,4 @@ > -# $FreeBSD: /tmp/pcvs/ports/net/ntp-devel/Makefile.inc,v 1.1 2011-11-27 23:0 > 2: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 (r37638 > 4) > +++ head/net/ntp-devel/distinfo Tue Jan 6 06:33:52 2015 (r37638 > 5) > @@ -1,2 +1,2 @@ > -SHA256 (ntp-dev-4.2.7p486-RC.tar.gz) = 16efe6adcf401fb8c29dc90f518e0a07f0ae8 > f0ed7f16a3cc6408d43159310de > -SIZE (ntp-dev-4.2.7p486-RC.tar.gz) = 6551782 > +SHA256 (ntp-4.2.8p1-beta4.tar.gz) = 18a1b009635e4d193006fb84d230b2f35997141a > bd3cb0079a34a40a0dd9d598 > +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:3 > 3: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) > If people have issues with ntp, they use ntp-devel instead. I'm using ntp-devel to track 4.2.8p1 betas for now. Our ntp.org upline is actively resolving issues in ntp 4.2.8 so we will likely see a lot of activity with ntp over the next while. Using the base port to track 4.2.8p1 betas will require epoch adjustments to make sure version numbers always increase -- because decreasing version numbers cause pkg and friends a bit of gas. -- Cheers, Cy Schubert <Cy.Schubert@komquats.com> or <Cy.Schubert@cschubert.com> FreeBSD UNIX: <cy@FreeBSD.org> Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501060659.t066xbLX087257>