From nobody Sun Dec 8 15:20:06 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y5pZt2GyQz5gnVy; Sun, 08 Dec 2024 15:20:06 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y5pZt1f5gz517k; Sun, 8 Dec 2024 15:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733671206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pmzoUdt5RGST1so6nYK4+rKu6IEl3OYR/RigfykClZo=; b=TGSQqJpBdJIXBSHoa1az8PJXuDX8dHQrajLiBSQxqtwEPYrGKPjsBAcxvfj2zAlq4IbllT 2JV3LxePwS6R+x8dyjUNxxEsH1NMApFJdnJ4bpe5FBR++fEYDH3N7O+HxXiC+6PPy0L4BB 5KZ09usOpQqyCxh71rJ+OleQA8apz6NfozGyZFs3YadbLIuhDZvhM6IgjQz5EntjhBNwjx NDZ4cHRKxLEP6k+syqqgjAV/0s01Nc2Tv2v3xJh33VgWVcbh/NjXs8O5qu+IBth+0jmdWS aGIEWYsM1RlvWaCmvcpqC14k3MXxjdu8Hdjp1O0623Z74orZUI4+cJ58jCkNew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733671206; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pmzoUdt5RGST1so6nYK4+rKu6IEl3OYR/RigfykClZo=; b=JOO4PKR/ztf2kF7YozgZLTH7lv+4wX5AIory+F8ow5RRHmKT1VuVpnkwNcWtD7boMEOSZY XzZmpOMRg0rvWe4hDUvy/34k14YMGl19uFDoVmvyyrj5HtuLYazQfA/VxJzk5lBJnH+b+d rokkFoROKxRSk3JpA4U7D/QrimhN4pKjBB1Hi3YozBsgQK10tjlCRRvJDXCLP0RC1DZauV euu9Fa8t3yWsDqIRb+1pQ9M+tj6e7uRitNoyIW+Lwpq7oxlOgzWAH2H7M9jCst9qyVXT+E ZQI83fd7tqknJiLxpkPcwOtGW+HeBpoj22lThKoSUGs61eJRBjBm+0Z67K15ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733671206; a=rsa-sha256; cv=none; b=OXAHzDV2pD2NRcbQpk2zlrh7SGYv5HtRWA3uSHIMBEVaGly7/8cQpUcqE7CcCzGZHgIppT 6pC7eOBNMqtv+PA+5XR2AGlGlG2WOy2/bDFVmv5WmGMV08ceGX4cqs8OgyxmAdwyRYdRyJ gex0HL8dUojoMizhlMrvvFkzgybavtkRbHQYz8P2NiaqFX7JeeeY007XPrSNq5/1L/H7Vw 3oqiTvhxAZ0/6wZb7YeFsdKEXJ8unv/BI3bvmMItT0s2T5UX9JZxg8h5DPoH5/5eXtrqVi Z/Rv4w5AVWRZAR8wUEbdBI44mW/W+OpY/OG00aNQvas4Rm4I87XTp3yMz99DBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y5pZt17jKzx0k; Sun, 8 Dec 2024 15:20:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B8FK6RR029680; Sun, 8 Dec 2024 15:20:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B8FK6Zc029675; Sun, 8 Dec 2024 15:20:06 GMT (envelope-from git) Date: Sun, 8 Dec 2024 15:20:06 GMT Message-Id: <202412081520.4B8FK6Zc029675@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: f7c8a6233b51 - main - net/chrony: dns/dnsmasq: change rcfile ordering List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f7c8a6233b5131c572e42a5f4c5bfe8d823e5e01 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=f7c8a6233b5131c572e42a5f4c5bfe8d823e5e01 commit f7c8a6233b5131c572e42a5f4c5bfe8d823e5e01 Author: Matthias Andree AuthorDate: 2024-12-08 15:15:46 +0000 Commit: Matthias Andree CommitDate: 2024-12-08 15:19:40 +0000 net/chrony: dns/dnsmasq: change rcfile ordering Make sure that these services start in proper order, and sooner such that chrony can synchronize time before other services need it. Note that there is a circular dependency or bootstrapping problem here in that the system time needs to be halfway correct if you require your time servers to be looked up through DNS with DNSSEC enabled because crypto usually needs correct clocks for expiration checks on signatures to work so the name service needs a correct time, and looking up the time server needs a working name service. So be sure you can bootstrap with a skewed time. Reported by: Lexi Winter PR: 282566 I am not MFHing this, it's too intrusive. --- dns/dnsmasq/Makefile | 2 +- dns/dnsmasq/files/dnsmasq.in | 4 ++-- net/chrony/Makefile | 1 + net/chrony/files/chronyd.in | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dns/dnsmasq/Makefile b/dns/dnsmasq/Makefile index e3726648b0ef..82c465cf42c6 100644 --- a/dns/dnsmasq/Makefile +++ b/dns/dnsmasq/Makefile @@ -1,7 +1,7 @@ PORTNAME= dnsmasq DISTVERSION= 2.90 # Leave the PORTREVISION in even if 0 to avoid accidental PORTEPOCH bumps: -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= dns MASTER_SITES= https://www.thekelleys.org.uk/dnsmasq/ \ diff --git a/dns/dnsmasq/files/dnsmasq.in b/dns/dnsmasq/files/dnsmasq.in index 1311df694b69..f2178bc8db1a 100644 --- a/dns/dnsmasq/files/dnsmasq.in +++ b/dns/dnsmasq/files/dnsmasq.in @@ -1,8 +1,8 @@ #!/bin/sh # PROVIDE: dnsmasq -# REQUIRE: SERVERS ldconfig -# BEFORE: DAEMON named +# REQUIRE: NETWORKING ldconfig ntpdate +# BEFORE: DAEMON chrony named # KEYWORD: shutdown # # Start before named so as not to break named_wait if named is diff --git a/net/chrony/Makefile b/net/chrony/Makefile index 0fc94be6e698..5cf16e4d51ff 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,5 +1,6 @@ PORTNAME= chrony DISTVERSION= 4.6.1 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= https://chrony-project.org/releases/ \ LOCAL/mandree diff --git a/net/chrony/files/chronyd.in b/net/chrony/files/chronyd.in index 79e370d3c4c1..1eb20c2b03ca 100644 --- a/net/chrony/files/chronyd.in +++ b/net/chrony/files/chronyd.in @@ -1,7 +1,7 @@ #!/bin/sh # PROVIDE: chronyd -# REQUIRE: DAEMON +# REQUIRE: SERVERS # KEYWORD: nojail shutdown # # Add the following lines to /etc/rc.conf.local or /etc/rc.conf