Date: Mon, 27 Apr 2015 13:58:14 +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: r384833 - in head/net/openntpd: . files Message-ID: <201504271358.t3RDwE3M073728@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: naddy Date: Mon Apr 27 13:58:14 2015 New Revision: 384833 URL: https://svnweb.freebsd.org/changeset/ports/384833 Log: Use plain "pgrep" in rc script to accommodate different path in DragonFly. Reported by: Juan Francisco Cantero Hurtado <iam@juanfra.info> Update to 5.7p4. No user-visible changes. In particular, the new HTTPS contraint feature is *not* enabled, because * LibreSSL fails with the certificiate bundle from ca_root_nss * USE_OPENSSL does not handle LibreSSL yet Added: head/net/openntpd/files/patch-src_ntpd.8 - copied, changed from r384831, head/net/openntpd/files/patch-ntpd.8 head/net/openntpd/files/patch-src_ntpd.conf.5 - copied, changed from r381607, head/net/openntpd/files/patch-ntpd.conf.5 Deleted: head/net/openntpd/files/patch-ntpd.8 head/net/openntpd/files/patch-ntpd.conf.5 Modified: head/net/openntpd/Makefile head/net/openntpd/distinfo head/net/openntpd/files/openntpd.in Modified: head/net/openntpd/Makefile ============================================================================== --- head/net/openntpd/Makefile Mon Apr 27 13:44:06 2015 (r384832) +++ head/net/openntpd/Makefile Mon Apr 27 13:58:14 2015 (r384833) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= openntpd -PORTVERSION= 5.7p3 +PORTVERSION= 5.7p4 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_OPENBSD} @@ -18,12 +18,25 @@ GROUPS= _ntp USE_RC_SUBR= openntpd GNU_CONFIGURE= yes -CONFIGURE_ARGS= --localstatedir=/var \ - --disable-silent-rules +CONFIGURE_ARGS= --disable-silent-rules + +# XXX: +# * LibreSSL fails with the certificiate bundle from ca_root_nss. +# * 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:${PORTSDIR}/security/libressl +#RESSL_CONFIGURE_WITH= cacert=${LOCALBASE}/etc/ssl/cert.pem +#RESSL_CPPFLAGS= -I${LOCALBASE}/include +#RESSL_LDFLAGS= -L${LOCALBASE}/lib pre-build: ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ - ${WRKSRC}/ntpd.conf.5 ${WRKSRC}/ntpd.8 + ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8 post-install: cd ${STAGEDIR}${PREFIX}/etc; ${MV} ntpd.conf ntpd.conf.sample Modified: head/net/openntpd/distinfo ============================================================================== --- head/net/openntpd/distinfo Mon Apr 27 13:44:06 2015 (r384832) +++ head/net/openntpd/distinfo Mon Apr 27 13:58:14 2015 (r384833) @@ -1,2 +1,2 @@ -SHA256 (openntpd-5.7p3.tar.gz) = 4f417c8a4c21ed7ec3811107829f931404f9bf121855b8571a2ca3355695343a -SIZE (openntpd-5.7p3.tar.gz) = 409734 +SHA256 (openntpd-5.7p4.tar.gz) = a993d95976e375acc0ab1a677fd268f55024477835633c8ae404895046bccb23 +SIZE (openntpd-5.7p4.tar.gz) = 427900 Modified: head/net/openntpd/files/openntpd.in ============================================================================== --- head/net/openntpd/files/openntpd.in Mon Apr 27 13:44:06 2015 (r384832) +++ head/net/openntpd/files/openntpd.in Mon Apr 27 13:58:14 2015 (r384833) @@ -17,7 +17,7 @@ check_process() { - /bin/pgrep -f 'ntpd: \[priv\]' + pgrep -f 'ntpd: \[priv\]' } name=openntpd Copied and modified: head/net/openntpd/files/patch-src_ntpd.8 (from r384831, head/net/openntpd/files/patch-ntpd.8) ============================================================================== --- head/net/openntpd/files/patch-ntpd.8 Mon Apr 27 12:52:47 2015 (r384831, copy source) +++ head/net/openntpd/files/patch-src_ntpd.8 Mon Apr 27 13:58:14 2015 (r384833) @@ -1,6 +1,6 @@ ---- ntpd.8.orig 2015-01-08 06:57:55 UTC -+++ ntpd.8 -@@ -53,7 +53,7 @@ Use +--- src/ntpd.8.orig 2015-03-18 16:25:53 UTC ++++ src/ntpd.8 +@@ -57,7 +57,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. -@@ -96,19 +96,19 @@ will be logged. +@@ -100,19 +100,19 @@ will be logged. After the local clock is synchronized, .Nm adjusts the clock frequency using the @@ -33,8 +33,8 @@ for more information on the boot process and enabling daemons. .Pp -@@ -129,8 +129,8 @@ receives a - signal, it writes its peer and sensor status to +@@ -137,8 +137,8 @@ signal on systems without + it writes its peer and sensor status to .Xr syslog 3 . .Sh FILES -.Bl -tag -width "/var/db/ntpd.driftXXX" -compact @@ -44,7 +44,7 @@ Default configuration file. .It Pa /var/db/ntpd.drift Drift file. -@@ -140,12 +140,12 @@ Socket file for communication with +@@ -148,12 +148,12 @@ Socket file for communication with .El .Sh SEE ALSO .Xr date 1 , Copied and modified: head/net/openntpd/files/patch-src_ntpd.conf.5 (from r381607, head/net/openntpd/files/patch-ntpd.conf.5) ============================================================================== --- head/net/openntpd/files/patch-ntpd.conf.5 Thu Mar 19 15:55:15 2015 (r381607, copy source) +++ head/net/openntpd/files/patch-src_ntpd.conf.5 Mon Apr 27 13:58:14 2015 (r384833) @@ -1,6 +1,6 @@ ---- ntpd.conf.5.orig 2015-01-08 06:57:55 UTC -+++ ntpd.conf.5 -@@ -182,8 +182,8 @@ servers pool.ntp.org rtable 5 +--- src/ntpd.conf.5.orig 2015-03-18 16:25:53 UTC ++++ src/ntpd.conf.5 +@@ -222,8 +222,8 @@ constraints from "https://www.google.com .Ed .El .Sh FILES
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504271358.t3RDwE3M073728>