From 65c75db293b8cc5f37d7d40ff5a79283861441c5 Mon Sep 17 00:00:00 2001 From: Cy Schubert Date: Thu, 6 Jun 2019 03:04:57 +0000 Subject: Resurrect net/ntp-devel, which is in development once again. Update 4.3.93 --> 4.3.95. --- MOVED | 1 - net/Makefile | 1 + net/ntp-devel/Makefile | 83 ++++ net/ntp-devel/Makefile.inc | 168 +++++++ net/ntp-devel/distinfo | 3 + net/ntp-devel/files/patch-ntpd__ntp.conf.5man | 24 + net/ntp-devel/files/patch-ntpd__ntp.conf.html | 11 + net/ntp-devel/files/patch-ntpd__refclock__mx4200.c | 25 + .../files/patch-ntpd__refclock__ripencc.c | 38 ++ net/ntp-devel/files/patch-sntp_sntp.mdoc.in | 11 + net/ntp-devel/files/pkg-message.in | 7 + net/ntp-devel/pkg-descr | 18 + net/ntp-devel/pkg-plist | 501 +++++++++++++++++++++ 13 files changed, 890 insertions(+), 1 deletion(-) create mode 100644 net/ntp-devel/Makefile create mode 100644 net/ntp-devel/Makefile.inc create mode 100644 net/ntp-devel/distinfo create mode 100644 net/ntp-devel/files/patch-ntpd__ntp.conf.5man create mode 100644 net/ntp-devel/files/patch-ntpd__ntp.conf.html create mode 100644 net/ntp-devel/files/patch-ntpd__refclock__mx4200.c create mode 100644 net/ntp-devel/files/patch-ntpd__refclock__ripencc.c create mode 100644 net/ntp-devel/files/patch-sntp_sntp.mdoc.in create mode 100644 net/ntp-devel/files/pkg-message.in create mode 100644 net/ntp-devel/pkg-descr create mode 100644 net/ntp-devel/pkg-plist diff --git a/MOVED b/MOVED index 10c0ecb89e90..1ceaa35d88a9 100644 --- a/MOVED +++ b/MOVED @@ -10463,7 +10463,6 @@ graphics/OpenEXR|graphics/openexr|2018-09-22|Renamed to match upstream distribut math/mtl||2018-09-27|Has expired: fails to fetch: mastersite times out dns/dnscrypt-proxy|dns/dnscrypt-proxy2|2018-09-27|Has expired: Deprecated by upstream, use dns/dnscrypt-proxy2 instead www/waterfox||2018-09-29|Has expired: experiment ended: unsustainable -net/ntp-devel|net/ntp|2018-09-30|Has expired: Use net/ntp instead net/xrdp-devel|net/xrdp|2018-09-30|Has expired: Use net/xrdp instead net/tigervnc-devel|net/tigervnc|2018-09-30|Has expired: Use net/tigervnc instead net/unison-devel|net/unison|2018-09-30|Has expired: Use net/unison instead diff --git a/net/Makefile b/net/Makefile index 851bc6c0cd9a..63ad19650af7 100644 --- a/net/Makefile +++ b/net/Makefile @@ -510,6 +510,7 @@ SUBDIR += ntlmaps SUBDIR += ntopng SUBDIR += ntp + SUBDIR += ntp-devel SUBDIR += ntpa SUBDIR += ntraceroute SUBDIR += nusoap diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile new file mode 100644 index 000000000000..7795292bc6a0 --- /dev/null +++ b/net/ntp-devel/Makefile @@ -0,0 +1,83 @@ +# Created by: andreas +# $FreeBSD$ + +PORTNAME= ntp +PORTVERSION= 4.3.95 +CATEGORIES= net ipv6 +MASTER_SITES= http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \ + http://archive.ntp.org/ntp4/ntp-dev/ +PKGNAMESUFFIX= -devel +DISTNAME= ${PORTNAME}-dev-${PORTVERSION:S/P/p/:S/r/-RC/:S/b/-beta/} + +MAINTAINER= cy@FreeBSD.org +COMMENT= The Network Time Protocol Distribution + +LIB_DEPENDS= libevent.so:devel/libevent + +CONFLICTS= ntp-[0-9].* openntpd-* + +USES= cpe pathfix shebangfix libedit libtool localbase:ldflags \ + pkgconfig gettext-runtime + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --enable-leap-smear + +TEST_TARGET= check + +SHEBANG_FILES= scripts/ntptrace/ntptrace.in \ + scripts/ntp-wait/ntp-wait.in \ + scripts/update-leap/update-leap.in +perl_OLD_CMD= @PATH_PERL@ + +SUB_FILES= pkg-message + +.include "Makefile.inc" + +OPTIONS_DEFINE+= DEBUG NLS THREADS +OPTIONS_DEFAULT+= THREADS +OPTIONS_SUB= yes + +IPV6_CONFIGURE_ENABLE= ipv6 + +NLS_CONFIGURE_ENABLE= nls +NLS_CONFIGURE_OFF= ac_cv_lib_intl_gettext=no +NLS_USES= gettext-runtime + +NTP_SIGND_CONFIGURE_ENABLE= ntp-signd + +NTPSNMPD_LIB_DEPENDS= libnetsnmp.so:net-mgmt/net-snmp +NTPSNMPD_CONFIGURE_OFF= --without-ntpsnmpd + +PERL_UTILS_USES= perl5 + +SSL_CONFIGURE_ON= --with-openssl-incdir=${OPENSSLINC} \ + --with-openssl-libdir=${OPENSSLLIB} +SSL_CONFIGURE_OFF= --without-crypto +SSL_USES= ssl +SSL_BROKEN_OFF= Includes OpenSSL when deselected + +DEBUG_CONFIGURE_ON= --enable-debug + +THREADS_CONFIGURE_ENABLE= thread-support +THREADS_CONFIGURE_WITH= threads + +.for D in ${NTP_DRIVERS} +${D}_CONFIGURE_ENABLE= ${D} +.endfor + +.include + +# XXX Temporary hack. Remember to remove this next commit. +post-extract: + @${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates + @${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates + +post-install: + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE} + @cd ${WRKSRC}/html && ${FIND} . -print | \ + ${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR} + +.include diff --git a/net/ntp-devel/Makefile.inc b/net/ntp-devel/Makefile.inc new file mode 100644 index 000000000000..fbc059a2a399 --- /dev/null +++ b/net/ntp-devel/Makefile.inc @@ -0,0 +1,168 @@ +# $FreeBSD$ + +OPTIONS_DEFINE= NTPSNMPD \ + SSL \ + IPV6 \ + DEBUG \ + NTP_SIGND \ + BANCOMM \ + GPSVME \ + ACTS \ + ARBITER \ + ARCRON_MSF \ + AS2201 \ + ATOM \ + CHRONOLOG \ + CHU \ + AUDIO_CHU \ + DATUM \ + DUMBCLOCK \ + FG \ + HEATH \ + HOPFSERIAL \ + HOPFPCI \ + HPGPS \ + IRIG \ + JJY \ + JUPITER \ + LEITCH \ + LOCAL_CLOCK \ + MX4200 \ + NEOCLOCK4X \ + NMEA \ + ONCORE \ + PALISADE \ + PCF \ + PERL_UTILS \ + PST \ + RIPENCC \ + SHM \ + SPECTRACOM \ + TRUETIME \ + ULINK \ + WWV \ + ZYFER \ + COMPUTIME \ + DCF7000 \ + HOPF6021 \ + MEINBERG \ + RAWDCF \ + RCC8000 \ + SCHMID \ + SEL240X \ + TRIMTAIP \ + TRIMTSIP \ + WHARTON \ + VARITEXT \ + DOCS \ + EXAMPLES + +OPTIONS_DEFAULT= SSL \ + ATOM \ + PERL_UTILS \ + NMEA + +NTPSNMPD_DESC= Build and install ntpsnmpd +NTP_SIGND_DESC= Enable signed NTP +BANCOMM_DESC= Enable Datum/Bancomm bc635/VME interface +GPSVME_DESC= Enable TrueTime GPS receiver/VME interface +ACTS_DESC= Enable ACTS modem service +ARBITER_DESC= Enable Arbiter 1088A/B GPS receiver +ARCRON_MSF_DESC= Enable Arcron MSF receiver +AS2201_DESC= Enable Austron 2200A/2201A GPS receiver +ATOM_DESC= Enable ATOM PPS interface +CHRONOLOG_DESC= Enable Chrono-log K-series WWVB receiver +CHU_DESC= Enable CHU modem/decoder +AUDIO_CHU_DESC= Enable CHU audio/decoder +DATUM_DESC= Enable Datum Programmable Time System +DUMBCLOCK_DESC= Enable Dumb generic hh:mm:ss local clock +FG_DESC= Enable Forum Graphic GPS +HEATH_DESC= Enable Heath GC-1000 WWV/WWVH receiver +HOPFSERIAL_DESC= Enable hopf serial clock device +HOPFPCI_DESC= Enable hopf 6039 PCI board +HPGPS_DESC= Enable HP 58503A GPS receiver +IRIG_DESC= Enable IRIG audio decoder +JJY_DESC= Enable JJY receiver +JUPITER_DESC= Enable Rockwell Jupiter GPS receiver +LEITCH_DESC= Enable Leitch CSD 5300 Master Clock +LOCAL_CLOCK_DESC= Enable local clock reference +MX4200_DESC= Enable Magnavox MX4200 GPS receiver +NEOCLOCK4X_DESC= Enable NeoClock4X DCF77 / TDF receiver +NMEA_DESC= Enable NMEA GPS receiver +ONCORE_DESC= Enable Motorola VP/UT Oncore GPS receiver +PALISADE_DESC= Enable Palisade clock +PCF_DESC= Enable Conrad parallel port radio clock +PERL_UTILS_DESC= Install ntp-wait and ntptrace utilities +PST_DESC= Enable PST/Traconex 1020 WWV/WWVH receiver +RIPENCC_DESC= Enable RIPENCC specific Trimble driver +SHM_DESC= Enable SHM clock attached thru shared memory +SPECTRACOM_DESC= Enable Spectracom 8170/Netclock/2 WWVB +TRUETIME_DESC= Enable Kinemetrics/TrueTime receivers +ULINK_DESC= Enable Ultralink WWVB receiver +WWV_DESC= Enable WWV Audio receiver +ZYFER_DESC= Enable Zyfer GPStarplus receiver +COMPUTIME_DESC= Enable Diem Computime Radio Clock +DCF7000_DESC= Enable ELV/DCF7000 clock +HOPF6021_DESC= Enable HOPF 6021 clock +MEINBERG_DESC= Enable Meinberg clocks +RAWDCF_DESC= Enable DCF77 raw time code +RCC8000_DESC= Enable RCC 8000 clock +SCHMID_DESC= Enable Schmid DCF77 clock +SEL240X_DESC= Enable SEL 240X clocks +TRIMTAIP_DESC= Enable Trimble GPS receiver/TAIP protocol +TRIMTSIP_DESC= Enable Trimble GPS receiver/TSIP protocol +WHARTON_DESC= Enable WHARTON 400A Series clock +VARITEXT_DESC= Enable VARITEXT clock + +# Not supported by FreeBSD: TPRO Enable KSI/Odetics TPRO/S GPS receiver/IRIG +# XXX Broken under FreeBSD: TT560 Enable TrueTime 560 IRIG-B decoder + +NTP_DRIVERS= \ + BANCOMM \ + GPSVME \ + ACTS \ + ARBITER \ + ARCRON_MSF \ + AS2201 \ + ATOM \ + CHRONOLOG \ + CHU \ + AUDIO_CHU \ + DATUM \ + DUMBCLOCK \ + FG \ + HEATH \ + HOPFSERIAL \ + HOPFPCI \ + HPGPS \ + IRIG \ + JJY \ + JUPITER \ + LEITCH \ + LOCAL_CLOCK \ + MX4200 \ + NEOCLOCK4X \ + NMEA \ + ONCORE \ + PALISADE \ + PCF \ + PST \ + RIPENCC \ + SHM \ + SPECTRACOM \ + TRUETIME \ + ULINK \ + WWV \ + ZYFER \ + COMPUTIME \ + DCF7000 \ + HOPF6021 \ + MEINBERG \ + RAWDCF \ + RCC8000 \ + SCHMID \ + SEL240X \ + TRIMTAIP \ + TRIMTSIP \ + WHARTON \ + VARITEXT diff --git a/net/ntp-devel/distinfo b/net/ntp-devel/distinfo new file mode 100644 index 000000000000..2d9a9bf38c11 --- /dev/null +++ b/net/ntp-devel/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1559789621 +SHA256 (ntp-dev-4.3.95.tar.gz) = d603a46c84ec4994c415a6127356c21e4f2f2c385304c3be94ef6889f6d846e3 +SIZE (ntp-dev-4.3.95.tar.gz) = 6962732 diff --git a/net/ntp-devel/files/patch-ntpd__ntp.conf.5man b/net/ntp-devel/files/patch-ntpd__ntp.conf.5man new file mode 100644 index 000000000000..c91b31bbbeef --- /dev/null +++ b/net/ntp-devel/files/patch-ntpd__ntp.conf.5man @@ -0,0 +1,24 @@ +--- ntpd/ntp.conf.5man.orig 2016-06-02 06:41:03.000000000 -0700 ++++ ntpd/ntp.conf.5man 2017-03-07 22:54:39.255862000 -0800 +@@ -22,12 +22,6 @@ + \- Network Time Protocol (NTP) daemon configuration file format + .SH SYNOPSIS + \f\*[B-Font]ntp.conf\fP +-[\f\*[B-Font]\-\-option-name\f[]] +-[\f\*[B-Font]\-\-option-name\f[] \f\*[I-Font]value\f[]] +-.sp \n(Ppu +-.ne 2 +- +-All arguments must be options. + .sp \n(Ppu + .ne 2 + +@@ -190,7 +184,7 @@ + .NOP \f\*[B-Font]pool\f[] + For type s addresses, this command mobilizes a persistent + client mode association with a number of remote servers. +-In this mode the local clock can synchronized to the ++In this mode the local clock can be synchronized to the + remote server, but the remote server can never be synchronized to + the local clock. + .TP 7 diff --git a/net/ntp-devel/files/patch-ntpd__ntp.conf.html b/net/ntp-devel/files/patch-ntpd__ntp.conf.html new file mode 100644 index 000000000000..0a7829761f88 --- /dev/null +++ b/net/ntp-devel/files/patch-ntpd__ntp.conf.html @@ -0,0 +1,11 @@ +--- ntpd/ntp.conf.html.orig 2019-02-20 09:56:39.000000000 -0800 ++++ ntpd/ntp.conf.html 2019-02-21 19:04:30.444506000 -0800 +@@ -280,7 +280,7 @@ +
pool
+

For type s addresses, this command mobilizes a persistent + client mode association with a number of remote servers. +-In this mode the local clock can synchronized to the ++In this mode the local clock can be synchronized to the + remote server, but the remote server can never be synchronized to + the local clock. +

diff --git a/net/ntp-devel/files/patch-ntpd__refclock__mx4200.c b/net/ntp-devel/files/patch-ntpd__refclock__mx4200.c new file mode 100644 index 000000000000..f0181520b7c3 --- /dev/null +++ b/net/ntp-devel/files/patch-ntpd__refclock__mx4200.c @@ -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) diff --git a/net/ntp-devel/files/patch-ntpd__refclock__ripencc.c b/net/ntp-devel/files/patch-ntpd__refclock__ripencc.c new file mode 100644 index 000000000000..d6f134dfd89f --- /dev/null +++ b/net/ntp-devel/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<