From owner-svn-ports-all@freebsd.org Sun Apr 5 21:20:21 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 28C3526D1D7; Sun, 5 Apr 2020 21:20:21 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48wRQr6d3Mz44Fl; Sun, 5 Apr 2020 21:20:20 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 00AB11C4A6; Sun, 5 Apr 2020 21:20:11 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 035LKBKN056219; Sun, 5 Apr 2020 21:20:11 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 035LKBvZ056217; Sun, 5 Apr 2020 21:20:11 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <202004052120.035LKBvZ056217@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sun, 5 Apr 2020 21:20:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530840 - in head/net/chrony: . files X-SVN-Group: ports-head X-SVN-Commit-Author: mandree X-SVN-Commit-Paths: in head/net/chrony: . files X-SVN-Commit-Revision: 530840 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Apr 2020 21:20:21 -0000 Author: mandree Date: Sun Apr 5 21:20:10 2020 New Revision: 530840 URL: https://svnweb.freebsd.org/changeset/ports/530840 Log: net/chrony: make NETTLE build robust, improve rc script, re-enable NSS Changes by Colin T.: * Always require pkgconfig instead of only requiring it for NSS, because otherwise chrony does not link reliably to nettle. [1] * Add pidfile to rc.d script to stop it from complaining when stopping chronyd. [1] * Document chronyd_* options in rc.d script. [1] Changes by Matthias Andree: * Move USES line up to please portlint. * Add HTMLDOCS option, to build and install HTML docs. IMPLIES DOCS. Needs textproc/asciidoctor (rubygem) as build requisite. * Turn CRYPTLIB into a _RADIO to choose at most one from NSS + NETTLE. * Under WITH_DEBUG, add --enable-debug to CONFIGURE_ARGS. * Remove @ (silent) from Makefile commands. * Remove NSS_BROKEN, chrony 3.5 appears to work with NSS. Updates [3]. PR: 244534 [1] PR: 242510 [2] PR: 223840 [3] Submitted by: Colin T. [1] Reported by: Matt Smith [2] Approved by: maintainer timeout (yonas@fizk.net, 36 days) Modified: head/net/chrony/Makefile head/net/chrony/files/chronyd.in head/net/chrony/pkg-plist Modified: head/net/chrony/Makefile ============================================================================== --- head/net/chrony/Makefile Sun Apr 5 21:20:03 2020 (r530839) +++ head/net/chrony/Makefile Sun Apr 5 21:20:10 2020 (r530840) @@ -3,6 +3,7 @@ PORTNAME= chrony PORTVERSION= 3.5 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://download.tuxfamily.org/chrony/ @@ -12,10 +13,10 @@ COMMENT= System clock synchronization client and serve LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +USES= cpe gmake libedit pkgconfig USERS= chronyd GROUPS= chronyd -USES= cpe gmake libedit CPE_VENDOR= tuxfamily HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} \ @@ -34,22 +35,39 @@ PORTEXAMPLES= chrony.conf.example1 chrony.conf.example # XXX: there are also other potentially useful options worth looking into: # --disable-pps Disable PPS API support -OPTIONS_DEFINE= DOCS EXAMPLES IPV6 NETTLE NSS +OPTIONS_DEFINE= DOCS HTMLDOCS EXAMPLES IPV6 OPTIONS_DEFAULT= NETTLE +OPTIONS_RADIO= CRYPTLIB +OPTIONS_RADIO_CRYPTLIB= NETTLE NSS +HTMLDOCS_IMPLIES= DOCS +OPTIONS_SUB= yes +HTMLDOCS_DESC= Build HTML docs (IMPLIES DOCS, needs ruby, asciidoctor) NETTLE_DESC= Nettle crypto library support -NSS_DESC= Add support for more hashing algorithms +NSS_DESC= NSS-based support for more hashing algorithms IPV6_CONFIGURE_OFF= --disable-ipv6 NETTLE_CONFIGURE_OFF= --without-nettle NETTLE_LIB_DEPENDS= libnettle.so:security/nettle -NSS_BROKEN= Crashes on startup with NSS. See https://bugs.freebsd.org/223840 NSS_CONFIGURE_OFF= --without-nss NSS_LIB_DEPENDS= libfreebl3.so:security/nss -NSS_USES= pkgconfig +HTMLDOCS_BUILD_DEPENDS+=asciidoctor:textproc/rubygem-asciidoctor +HTMLDOCS_ALL_TARGET= docs +HTMLDOCS_INSTALL_TARGET=docs + +.include + +.if defined(WITH_DEBUG) +CONFIGURE_ARGS+= --enable-debug +.endif + +.if ${PORT_OPTIONS:MHTMLDOCS} +PORTDOCS+= doc/*.html +.endif + post-patch: - @cd ${WRKSRC}/examples && \ + cd ${WRKSRC}/examples && \ ${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${PORTEXAMPLES} post-install: @@ -59,12 +77,13 @@ post-install: ${STAGEDIR}${PREFIX}/etc/chrony.conf.sample post-install-DOCS-on: - @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${RM} doc/installation.html cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} post-install-EXAMPLES-on: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} cd ${WRKSRC}/examples && \ ${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR} -.include +.include Modified: head/net/chrony/files/chronyd.in ============================================================================== --- head/net/chrony/files/chronyd.in Sun Apr 5 21:20:03 2020 (r530839) +++ head/net/chrony/files/chronyd.in Sun Apr 5 21:20:10 2020 (r530840) @@ -4,17 +4,32 @@ # # PROVIDE: chronyd # REQUIRE: DAEMON +# KEYWORD: nojail shutdown # +# Add the following lines to /etc/rc.conf.local or /etc/rc.conf +# to enable this service: +# +# chronyd_enable (bool): Set it to "YES" to enable chronyd +# Default is "NO" +# chronyd_config (str): Set full path to configuration file. +# Default is "%%PREFIX%%/etc/chrony.conf" +# chronyd_flags (str): Flags passed to chronyd(8) +# Default is "" +# . /etc/rc.subr name=chronyd rcvar=chronyd_enable -command=%%PREFIX%%/sbin/${name} -rc_flags="${chronyd_flags}" load_rc_config ${name} -: ${chronyd_enable="NO"} +: ${chronyd_enable:="NO"} +: ${chronyd_config:="%%PREFIX%%/etc/chrony.conf"} + +command=%%PREFIX%%/sbin/${name} +command_args="-f ${chronyd_config}" +pidfile=/var/run/chrony/${name}.pid +required_files=${chronyd_config} run_rc_command "$1" Modified: head/net/chrony/pkg-plist ============================================================================== --- head/net/chrony/pkg-plist Sun Apr 5 21:20:03 2020 (r530839) +++ head/net/chrony/pkg-plist Sun Apr 5 21:20:10 2020 (r530840) @@ -5,3 +5,8 @@ man/man5/chrony.conf.5.gz man/man8/chronyd.8.gz sbin/chronyd @dir(chronyd,chronyd) /var/db/chrony +%%HTMLDOCS%%%%DOCSDIR%%/chrony.conf.html +%%HTMLDOCS%%%%DOCSDIR%%/chronyc.html +%%HTMLDOCS%%%%DOCSDIR%%/chronyd.html +%%HTMLDOCS%%%%DOCSDIR%%/faq.html +%%HTMLDOCS%%%%DOCSDIR%%/installation.html