net-misc/chrony: Use Gentoo vendor pool

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Fixes: https://bugs.gentoo.org/621702
Signed-off-by: Jeroen Roovers <jer@gentoo.org>

diff --git a/net-misc/chrony/chrony-3.5.ebuild b/net-misc/chrony/chrony-3.5-r1.ebuild
similarity index 98%
rename from net-misc/chrony/chrony-3.5.ebuild
rename to net-misc/chrony/chrony-3.5-r1.ebuild
index c74eea646f90505450c85e512f8078f4e1f5cdea..e280760fd28c70e037356bad90adfa8256b9be28 100644 (file)
--- a/net-misc/chrony/chrony-3.5.ebuild
+++ b/net-misc/chrony/chrony-3.5-r1.ebuild
@@ -40,6 +40,7 @@ RESTRICT=test
 S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
+       "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
        "${FILESDIR}"/${PN}-3.5-systemd-gentoo.patch
 )
 

diff --git a/net-misc/chrony/chrony-9999.ebuild b/net-misc/chrony/chrony-9999.ebuild
index 53dd5de5b8a05fd355191626ccb329025f92cf6b..5cac01a6dee7e4a4efd6c516856c172cd31aee1f 100644 (file)
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -38,6 +38,7 @@ RESTRICT=test
 S="${WORKDIR}/${P/_/-}"
 
 PATCHES=(
+       "${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
        "${FILESDIR}"/${PN}-3.5-systemd-gentoo.patch
 )
 

diff --git a/net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch b/net-misc/chrony/files/chrony-3.5-pool-vendor-gentoo.patch
new file mode 100644 (file)
index 0000000..817a410
--- /dev/null
+++ b/net-misc/chrony/files/chrony-3.5-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 public NTP servers from the pool.ntp.org project.
+-pool pool.ntp.org iburst
++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