Index: head/net/openntpd/Makefile =================================================================== --- head/net/openntpd/Makefile (revision 384832) +++ head/net/openntpd/Makefile (revision 384833) @@ -1,31 +1,44 @@ # $FreeBSD$ PORTNAME= openntpd -PORTVERSION= 5.7p3 +PORTVERSION= 5.7p4 PORTEPOCH= 2 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_OPENBSD} MASTER_SITE_SUBDIR= OpenNTPD MAINTAINER= naddy@FreeBSD.org COMMENT= Network Time Protocol (NTP) daemon LICENSE= ISCL USERS= _ntp 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 .include Index: head/net/openntpd/distinfo =================================================================== --- head/net/openntpd/distinfo (revision 384832) +++ head/net/openntpd/distinfo (revision 384833) @@ -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 Index: head/net/openntpd/files/patch-ntpd.8 =================================================================== --- head/net/openntpd/files/patch-ntpd.8 (revision 384832) +++ head/net/openntpd/files/patch-ntpd.8 (nonexistent) @@ -1,61 +0,0 @@ ---- ntpd.8.orig 2015-01-08 06:57:55 UTC -+++ ntpd.8 -@@ -53,7 +53,7 @@ Use - .Ar file - as the configuration file, - instead of the default --.Pa /etc/ntpd.conf . -+.Pa %%PREFIX%%/etc/ntpd.conf . - .It Fl n - Configtest mode. - Only check the configuration file for validity. -@@ -96,19 +96,19 @@ will be logged. - After the local clock is synchronized, - .Nm - adjusts the clock frequency using the --.Xr adjfreq 2 -+.Xr ntp_adjtime 2 - system call to compensate for systematic drift. - .Pp - .Nm - is usually started at boot time, and can be enabled by - setting --.Va ntpd_flags -+.Va openntpd_flags - in --.Pa /etc/rc.conf.local . -+.Pa /etc/rc.conf . - See - .Xr rc 8 - and --.Xr rc.conf 8 -+.Xr rc.conf 5 - 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 - .Xr syslog 3 . - .Sh FILES --.Bl -tag -width "/var/db/ntpd.driftXXX" -compact --.It Pa /etc/ntpd.conf -+.Bl -tag -width "%%PREFIX%%/etc/ntpd.confXXX" -compact -+.It Pa %%PREFIX%%/etc/ntpd.conf - Default configuration file. - .It Pa /var/db/ntpd.drift - Drift file. -@@ -140,12 +140,12 @@ Socket file for communication with - .El - .Sh SEE ALSO - .Xr date 1 , --.Xr adjfreq 2 , - .Xr adjtime 2 , -+.Xr ntp_adjtime 2 , - .Xr ntpd.conf 5 , -+.Xr rc.conf 5 , - .Xr ntpctl 8 , - .Xr rc 8 , --.Xr rc.conf 8 , - .Xr rdate 8 - .Sh STANDARDS - .Rs Property changes on: head/net/openntpd/files/patch-ntpd.8 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/openntpd/files/patch-ntpd.conf.5 =================================================================== --- head/net/openntpd/files/patch-ntpd.conf.5 (revision 384832) +++ head/net/openntpd/files/patch-ntpd.conf.5 (nonexistent) @@ -1,13 +0,0 @@ ---- ntpd.conf.5.orig 2015-01-08 06:57:55 UTC -+++ ntpd.conf.5 -@@ -182,8 +182,8 @@ servers pool.ntp.org rtable 5 - .Ed - .El - .Sh FILES --.Bl -tag -width "/etc/ntpd.confXXX" -compact --.It Pa /etc/ntpd.conf -+.Bl -tag -width "%%PREFIX%%/etc/ntpd.confXXX" -compact -+.It Pa %%PREFIX%%/etc/ntpd.conf - default - .Xr ntpd 8 - configuration file Property changes on: head/net/openntpd/files/patch-ntpd.conf.5 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -on \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/net/openntpd/files/openntpd.in =================================================================== --- head/net/openntpd/files/openntpd.in (revision 384832) +++ head/net/openntpd/files/openntpd.in (revision 384833) @@ -1,33 +1,33 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: openntpd # REQUIRE: DAEMON ntpdate # BEFORE: LOGIN # KEYWORD: nojail shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf # to enable this service: # # openntpd_enable (bool): Set to NO by default. # Set it to YES to enable openntpd. . /etc/rc.subr check_process() { - /bin/pgrep -f 'ntpd: \[priv\]' + pgrep -f 'ntpd: \[priv\]' } name=openntpd rcvar=openntpd_enable command=%%PREFIX%%/sbin/ntpd required_files=%%PREFIX%%/etc/ntpd.conf load_rc_config $name : ${openntpd_enable="NO"} run_rc_command "$1" Index: head/net/openntpd/files/patch-src_ntpd.8 =================================================================== --- head/net/openntpd/files/patch-src_ntpd.8 (nonexistent) +++ head/net/openntpd/files/patch-src_ntpd.8 (revision 384833) @@ -0,0 +1,61 @@ +--- 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 +-.Pa /etc/ntpd.conf . ++.Pa %%PREFIX%%/etc/ntpd.conf . + .It Fl n + Configtest mode. + Only check the configuration file for validity. +@@ -100,19 +100,19 @@ will be logged. + After the local clock is synchronized, + .Nm + adjusts the clock frequency using the +-.Xr adjfreq 2 ++.Xr ntp_adjtime 2 + system call to compensate for systematic drift. + .Pp + .Nm + is usually started at boot time, and can be enabled by + setting +-.Va ntpd_flags ++.Va openntpd_flags + in +-.Pa /etc/rc.conf.local . ++.Pa /etc/rc.conf . + See + .Xr rc 8 + and +-.Xr rc.conf 8 ++.Xr rc.conf 5 + 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 . + .Sh FILES +-.Bl -tag -width "/var/db/ntpd.driftXXX" -compact +-.It Pa /etc/ntpd.conf ++.Bl -tag -width "%%PREFIX%%/etc/ntpd.confXXX" -compact ++.It Pa %%PREFIX%%/etc/ntpd.conf + Default configuration file. + .It Pa /var/db/ntpd.drift + Drift file. +@@ -148,12 +148,12 @@ Socket file for communication with + .El + .Sh SEE ALSO + .Xr date 1 , +-.Xr adjfreq 2 , + .Xr adjtime 2 , ++.Xr ntp_adjtime 2 , + .Xr ntpd.conf 5 , ++.Xr rc.conf 5 , + .Xr ntpctl 8 , + .Xr rc 8 , +-.Xr rc.conf 8 , + .Xr rdate 8 + .Sh STANDARDS + .Rs Property changes on: head/net/openntpd/files/patch-src_ntpd.8 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net/openntpd/files/patch-src_ntpd.conf.5 =================================================================== --- head/net/openntpd/files/patch-src_ntpd.conf.5 (nonexistent) +++ head/net/openntpd/files/patch-src_ntpd.conf.5 (revision 384833) @@ -0,0 +1,13 @@ +--- 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 +-.Bl -tag -width "/etc/ntpd.confXXX" -compact +-.It Pa /etc/ntpd.conf ++.Bl -tag -width "%%PREFIX%%/etc/ntpd.confXXX" -compact ++.It Pa %%PREFIX%%/etc/ntpd.conf + default + .Xr ntpd 8 + configuration file Property changes on: head/net/openntpd/files/patch-src_ntpd.conf.5 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +on \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property