[gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/, net-misc/chrony/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/, net-misc/chrony/files/
Date: Wed, 11 Jun 2025 14:14:36 +0000 (UTC)	[thread overview]
Message-ID: <1749651250.29a5fc395f8beb40621a9c1141d78298a2392b88.sam@gentoo> (raw)

commit:     29a5fc395f8beb40621a9c1141d78298a2392b88
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 11 14:13:58 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 11 14:14:10 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29a5fc39

net-misc/chrony: add 4.7

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/chrony/Manifest                                 |  2 ++
 .../chrony/{chrony-9999.ebuild => chrony-4.7.ebuild}     |  9 ++++-----
 net-misc/chrony/chrony-9999.ebuild                       |  9 ++++-----
 .../chrony/files/chrony-4.7-pool-vendor-gentoo.patch     | 16 ++++++++++++++++
 net-misc/chrony/files/chrony-4.7-systemd-gentoo.patch    | 11 +++++++++++
 5 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 6005353620e3..3bb4527fec44 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,2 +1,4 @@
 DIST chrony-4.6.1.tar.gz 636076 BLAKE2B cc1299ba680eae158da9ebc6d4451ffc8b352b9b0da47056e4ccd21495589d88ee9f8cb9ef8508e7c1a1b0a14b6679453a6d324111308a00888123a265eca788 SHA512 646ae08f2587366236796f2399d8ab3eb570979e0d82f5d13f5cec49939054c876cc93dc20c8d38e105fd3500e1720d05a223a15076783cd882d0de43afd9c7e
 DIST chrony-4.6.1.tar.gz.asc 833 BLAKE2B 19e7359220beb93ede262cad7fec4963b15873510530690eefcdc28c69222ac40e41849487b9514665443dff888fbeeea1a2cbef0517da38a210a6573f4e9c99 SHA512 992b706636bf3a7eb6d502562a4990c9d8e20e5f3011d2cdb2ceb32220e9a1c2bfa6eca767212cee49b811823872602dc33f9e7201a7f9a93cc9c90e81b1db49
+DIST chrony-4.7.tar.gz 644610 BLAKE2B a1a951ea925c183c97d6b934d85d4cb35b15db555d64a4f7abe75a5a5cf69d4747ccbd9d09be403187991745dd38fc4eea994a7c4488cab44c11c6600596ec22 SHA512 419594ab8ff0fd42acaf6e4ca1a011d5cf87c8d90ab040e90bb004b43570888329531593f073fb7c5a1093b5754d61c1ae6034d0b86660e4dc37d42ee0f30623
+DIST chrony-4.7.tar.gz.asc 833 BLAKE2B 67facf41c41b729794f2cb0ce63402b91b5915cec53997f22327687d951be0b677274567bc99c03c6d2702de7c2a69becb0cf88c22147528ce0e86a823ff3af8 SHA512 c2351e6e624f60e82973bddd5cb1d84c90ee5e862d7d24dfc2b7a8f60a6a948f7446c9b7d68c5e72be4afccbd5d8f572141a4e0bde9cfeefc59aebb7e4fc74e1

diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-4.7.ebuild
similarity index 95%
copy from net-misc/chrony/chrony-9999.ebuild
copy to net-misc/chrony/chrony-4.7.ebuild
index 7805861241c0..d11b1f14728a 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-4.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux"
+IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux"
 # nettle > nss > libtomcrypt in configure
 REQUIRED_USE="
 	sechash? ( || ( nettle nss libtomcrypt ) )
@@ -83,8 +83,8 @@ else
 fi
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
+	"${FILESDIR}"/${PN}-4.7-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-4.7-systemd-gentoo.patch
 )
 
 QA_CONFIG_IMPL_DECL_SKIP=(
@@ -137,7 +137,6 @@ src_configure() {
 		$(usev !libtomcrypt '--without-tomcrypt')
 		$(usev !nettle '--without-nettle')
 		$(usev !nss '--without-nss')
-		$(usev !ntp '--disable-ntp')
 		$(usev !nts '--disable-nts')
 		$(usev !nts '--without-gnutls')
 		$(usev !phc '--disable-phc')

diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 7805861241c0..d11b1f14728a 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ S="${WORKDIR}/${P/_/-}"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux"
+IUSE="+caps +cmdmon debug html libtomcrypt +nettle nss +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux"
 # nettle > nss > libtomcrypt in configure
 REQUIRED_USE="
 	sechash? ( || ( nettle nss libtomcrypt ) )
@@ -83,8 +83,8 @@ else
 fi
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
+	"${FILESDIR}"/${PN}-4.7-pool-vendor-gentoo.patch
+	"${FILESDIR}"/${PN}-4.7-systemd-gentoo.patch
 )
 
 QA_CONFIG_IMPL_DECL_SKIP=(
@@ -137,7 +137,6 @@ src_configure() {
 		$(usev !libtomcrypt '--without-tomcrypt')
 		$(usev !nettle '--without-nettle')
 		$(usev !nss '--without-nss')
-		$(usev !ntp '--disable-ntp')
 		$(usev !nts '--disable-nts')
 		$(usev !nts '--without-gnutls')
 		$(usev !phc '--disable-phc')

diff --git a/net-misc/chrony/files/chrony-4.7-pool-vendor-gentoo.patch b/net-misc/chrony/files/chrony-4.7-pool-vendor-gentoo.patch
new file mode 100644
index 000000000000..e7b078872ec5
--- /dev/null
+++ b/net-misc/chrony/files/chrony-4.7-pool-vendor-gentoo.patch
@@ -0,0 +1,16 @@
+- Use the Gentoo pool
+- Use the server directive instead of the pool directive so we get four time
+  sources and not twelve.
+--- a/examples/chrony.conf.example1
++++ b/examples/chrony.conf.example1
+@@ -1,5 +1,8 @@
+-# Use four public NTP servers from the pool.ntp.org project.
+-pool pool.ntp.org iburst
++# Use public NTP servers from the pool.ntp.org project.
++server 0.gentoo.pool.ntp.org iburst
++server 1.gentoo.pool.ntp.org iburst
++server 2.gentoo.pool.ntp.org iburst
++server 3.gentoo.pool.ntp.org iburst
+ 
+ # Record the rate at which the system clock gains/losses time.
+ driftfile /var/lib/chrony/drift

diff --git a/net-misc/chrony/files/chrony-4.7-systemd-gentoo.patch b/net-misc/chrony/files/chrony-4.7-systemd-gentoo.patch
new file mode 100644
index 000000000000..bc9f1f494c7f
--- /dev/null
+++ b/net-misc/chrony/files/chrony-4.7-systemd-gentoo.patch
@@ -0,0 +1,11 @@
+--- a/examples/chronyd.service
++++ b/examples/chronyd.service
+@@ -10,7 +10,7 @@ Type=notify
+ PIDFile=/run/chrony/chronyd.pid
+ Environment="OPTIONS="
+ EnvironmentFile=-/etc/sysconfig/chronyd
+-ExecStart=/usr/sbin/chronyd -n $OPTIONS
++ExecStart=/usr/sbin/chronyd -n $OPTIONS -u ntp -F 2
+ 
+ CapabilityBoundingSet=~CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE
+ CapabilityBoundingSet=~CAP_BLOCK_SUSPEND CAP_KILL CAP_LEASE CAP_LINUX_IMMUTABLE

next             reply	other threads:[~2025-06-11 18:58 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-06-11 14:14 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2022-11-10  7:13 [gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/, net-misc/chrony/files/ Sam James
2021-12-17  2:52 Sam James
2020-09-05  9:29 Jeroen Roovers
2020-03-30 18:36 Thomas Deutschmann
2019-09-26  8:21 Jeroen Roovers
2018-09-05 14:00 Mike Gilbert
2016-05-22 15:38 Tobias Klausmann
2015-12-04  6:04 Jeroen Roovers
2015-10-12 12:30 Jeroen Roovers

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:6005353620e dfblob:3bb4527fec4 dfblob:7805861241c
dfblob:d11b1f14728 dfblob:7805861241c dfblob:d11b1f14728
dfblob:e7b078872ec dfblob:bc9f1f494c7 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: net-misc/chrony/, net-misc/chrony/files/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1749651250.29a5fc395f8beb40621a9c1141d78298a2392b88.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox