Date: Sat, 2 Apr 2016 16:04:34 +0000 (UTC) From: Christian Weisgerber <naddy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r412413 - in head/net/openntpd: . files Message-ID: <201604021604.u32G4YWg045306@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: naddy Date: Sat Apr 2 16:04:34 2016 New Revision: 412413 URL: https://svnweb.freebsd.org/changeset/ports/412413 Log: Update to 5.9p1. Notable changes: * The rtable option was removed from server and servers. Users of "server * rtable X" will need to switch to launching ntpd with # setfib -F X /usr/sbin/ntpd * Various improvements to the HTTPS constraint feature (requires LibreSSL). This port reenables rtable support in the listen option on FreeBSD. Relnotes: http://www.openntpd.org/txt/release-5.9p1.txt Added: head/net/openntpd/files/patch-include_signal.h (contents, props changed) head/net/openntpd/files/patch-src_server.c (contents, props changed) Deleted: head/net/openntpd/files/patch-compat_adjfreq__freebsd.c head/net/openntpd/files/patch-src_ntpd.c Modified: head/net/openntpd/Makefile head/net/openntpd/distinfo head/net/openntpd/files/openntpd.in head/net/openntpd/files/patch-src_constraint.c head/net/openntpd/files/patch-src_ntpd.8 head/net/openntpd/files/patch-src_ntpd.conf.5 Modified: head/net/openntpd/Makefile ============================================================================== --- head/net/openntpd/Makefile Sat Apr 2 15:51:18 2016 (r412412) +++ head/net/openntpd/Makefile Sat Apr 2 16:04:34 2016 (r412413) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= openntpd -PORTVERSION= 5.7p4 -PORTREVISION= 2 +PORTVERSION= 5.9p1 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= OPENBSD/OpenNTPD @@ -20,20 +19,19 @@ USE_RC_SUBR= openntpd GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-silent-rules -# * LibreSSL fails with the certificiate bundle from ca_root_nss; -# 3.22.2 appears to work just fine (unlike 3.22). -# * USE_OPENSSL does not handle LibreSSL yet. - OPTIONS_DEFINE= RESSL RESSL_DESC= SSL/TLS support via LibreSSL OPTIONS_DEFAULT= RESSL -RESSL_LIB_DEPENDS= libtls.so:security/libressl +# Requires libtls from LibreSSL >= 2.3.2 +RESSL_USE= openssl=yes +RESSL_VARS= with_openssl_port=yes \ + openssl_port=security/libressl-devel RESSL_CONFIGURE_WITH= cacert=${LOCALBASE}/etc/ssl/cert.pem RESSL_CPPFLAGS= -I${LOCALBASE}/include RESSL_LDFLAGS= -L${LOCALBASE}/lib -RESSL_RUN_DEPENDS= ca_root_nss>=3.22.2:security/ca_root_nss +RESSL_RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss pre-build: ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ Modified: head/net/openntpd/distinfo ============================================================================== --- head/net/openntpd/distinfo Sat Apr 2 15:51:18 2016 (r412412) +++ head/net/openntpd/distinfo Sat Apr 2 16:04:34 2016 (r412413) @@ -1,2 +1,2 @@ -SHA256 (openntpd-5.7p4.tar.gz) = a993d95976e375acc0ab1a677fd268f55024477835633c8ae404895046bccb23 -SIZE (openntpd-5.7p4.tar.gz) = 427900 +SHA256 (openntpd-5.9p1.tar.gz) = 200c04056d4d6441653cac71d515611f3903aa7b15b8f5661a40dab3fb3697b3 +SIZE (openntpd-5.9p1.tar.gz) = 432844 Modified: head/net/openntpd/files/openntpd.in ============================================================================== --- head/net/openntpd/files/openntpd.in Sat Apr 2 15:51:18 2016 (r412412) +++ head/net/openntpd/files/openntpd.in Sat Apr 2 16:04:34 2016 (r412413) @@ -17,7 +17,7 @@ check_process() { - pgrep -f 'ntpd: \[priv\]' + pgrep -f $command } name=openntpd Added: head/net/openntpd/files/patch-include_signal.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openntpd/files/patch-include_signal.h Sat Apr 2 16:04:34 2016 (r412413) @@ -0,0 +1,10 @@ +--- include/signal.h.orig 2015-05-04 09:54:32 UTC ++++ include/signal.h +@@ -8,3 +8,7 @@ + #ifndef SIGINFO + #define SIGINFO SIGUSR1 + #endif ++ ++#ifndef _NSIG ++#define _NSIG NSIG ++#endif Modified: head/net/openntpd/files/patch-src_constraint.c ============================================================================== --- head/net/openntpd/files/patch-src_constraint.c Sat Apr 2 15:51:18 2016 (r412412) +++ head/net/openntpd/files/patch-src_constraint.c Sat Apr 2 16:04:34 2016 (r412413) @@ -1,6 +1,6 @@ ---- src/constraint.c.orig 2015-03-14 21:24:11 UTC +--- src/constraint.c.orig 2016-03-28 13:51:51 UTC +++ src/constraint.c -@@ -665,7 +665,7 @@ httpsdate_request(struct httpsdate *http +@@ -905,7 +905,7 @@ httpsdate_request(struct httpsdate *http * or ANSI C's asctime() - the latter doesn't include * the timezone which is required here. */ Modified: head/net/openntpd/files/patch-src_ntpd.8 ============================================================================== --- head/net/openntpd/files/patch-src_ntpd.8 Sat Apr 2 15:51:18 2016 (r412412) +++ head/net/openntpd/files/patch-src_ntpd.8 Sat Apr 2 16:04:34 2016 (r412413) @@ -1,6 +1,6 @@ ---- src/ntpd.8.orig 2015-03-18 16:25:53 UTC +--- src/ntpd.8.orig 2016-03-28 13:51:51 UTC +++ src/ntpd.8 -@@ -57,7 +57,7 @@ Use +@@ -56,7 +56,7 @@ Use .Ar file as the configuration file, instead of the default @@ -9,7 +9,7 @@ .It Fl n Configtest mode. Only check the configuration file for validity. -@@ -100,19 +100,19 @@ will be logged. +@@ -99,19 +99,19 @@ will be logged. After the local clock is synchronized, .Nm adjusts the clock frequency using the @@ -33,9 +33,9 @@ for more information on the boot process and enabling daemons. .Pp -@@ -137,8 +137,8 @@ signal on systems without - it writes its peer and sensor status to - .Xr syslog 3 . +@@ -124,8 +124,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 @@ -44,7 +44,7 @@ Default configuration file. .It Pa /var/db/ntpd.drift Drift file. -@@ -148,12 +148,12 @@ Socket file for communication with +@@ -135,12 +135,12 @@ Socket file for communication with .El .Sh SEE ALSO .Xr date 1 , Modified: head/net/openntpd/files/patch-src_ntpd.conf.5 ============================================================================== --- head/net/openntpd/files/patch-src_ntpd.conf.5 Sat Apr 2 15:51:18 2016 (r412412) +++ head/net/openntpd/files/patch-src_ntpd.conf.5 Sat Apr 2 16:04:34 2016 (r412413) @@ -1,6 +1,6 @@ ---- src/ntpd.conf.5.orig 2015-03-18 16:25:53 UTC +--- src/ntpd.conf.5.orig 2016-03-28 13:51:51 UTC +++ src/ntpd.conf.5 -@@ -222,8 +222,8 @@ constraints from "https://www.google.com +@@ -218,8 +218,8 @@ constraints from "https://www.google.com .Ed .El .Sh FILES Added: head/net/openntpd/files/patch-src_server.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/openntpd/files/patch-src_server.c Sat Apr 2 16:04:34 2016 (r412413) @@ -0,0 +1,47 @@ +--- src/server.c.orig 2016-03-28 13:51:51 UTC ++++ src/server.c +@@ -36,14 +36,14 @@ setup_listeners(struct servent *se, stru + struct ifaddrs *ifa, *ifap; + struct sockaddr *sa; + #ifdef SO_RTABLE +- struct if_data *ifd; ++ struct ifreq ifr; + #endif + u_int8_t *a6; + size_t sa6len = sizeof(struct in6_addr); + u_int new_cnt = 0; + int tos = IPTOS_LOWDELAY; + #ifdef SO_RTABLE +- int rdomain = 0; ++ int rdomain, fd; + #endif + + TAILQ_FOREACH(lap, &lconf->listen_addrs, entry) { +@@ -56,16 +56,21 @@ setup_listeners(struct servent *se, stru + sa = ifap->ifa_addr; + if (sa == NULL || SA_LEN(sa) == 0) + continue; +-#ifdef SO_RTABLE +- if (sa->sa_family == AF_LINK) { +- ifd = ifap->ifa_data; +- rdomain = ifd->ifi_rdomain; +- } +-#endif + if (sa->sa_family != AF_INET && + sa->sa_family != AF_INET6) + continue; + #ifdef SO_RTABLE ++ strlcpy(ifr.ifr_name, ifap->ifa_name, ++ sizeof(ifr.ifr_name)); ++ ++ fd = socket(AF_INET, SOCK_DGRAM, 0); ++ if (ioctl(fd, SIOCGIFRDOMAIN, ++ (caddr_t)&ifr) == -1) ++ rdomain = 0; ++ else ++ rdomain = ifr.ifr_rdomainid; ++ close(fd); ++ + if (lap->rtable != -1 && rdomain != lap->rtable) + continue; + #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604021604.u32G4YWg045306>