Support CONFIG_HZ=200, see bug #21058

6 files changed, 98 insertions, 8 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index a8792d434872..a09479258d69 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/chrony
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.17 2004/07/01 20:52:51 squinky86 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.18 2004/10/23 12:01:42 wmertens Exp $
+
+  23 Oct 2004; Wout Mertens <wmertens@gentoo.org> chrony-1.20-r1.ebuild:
+  Include Alexander Papaspyrou's patch for CONFIG_HZ=200 support. (#21058)
 
   01 Jul 2004; Jon Hood <squinky86@gentoo.org> chrony-1.19.ebuild,
   chrony-1.20.ebuild:
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index a3a6e08cb1ea..9a9799879ffa 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,11 +1,15 @@
-MD5 ca770009e09effb0905509861bb8cc94 chrony-1.20.ebuild 1196
-MD5 e9435e114a616f39b4cc5c805e31bae4 ChangeLog 2113
+MD5 f9c1ceab87b5a6bd979f48686199d208 ChangeLog 2262
 MD5 da92a35b9c34b8be089136c81c770d16 chrony-1.19.ebuild 1186
+MD5 ca770009e09effb0905509861bb8cc94 chrony-1.20.ebuild 1196
+MD5 ca0bf2a02b7d249dfe7269af1338ac5f metadata.xml 225
+MD5 d48a90f502b3a5a1ddec6ca729359cfa chrony-1.20-r1.ebuild 1303
+MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.19-chrony.conf.example-gentoo.diff 1592
+MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.19-conf.c-gentoo.diff 342
 MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.20-chrony.conf.example-gentoo.diff 1592
+MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.20-conf.c-gentoo.diff 342
+MD5 d364a3eb5fa42974f0676a61433cca10 files/chronyd.conf 786
+MD5 b201e9150a928119ab1598ac0d3dfee6 files/chronyd.rc 1609
 MD5 c0e426c615798b7c75afc3b1aadcd727 files/digest-chrony-1.19 63
 MD5 530b19caa6b14e1501530401f8cdc986 files/digest-chrony-1.20 63
-MD5 b201e9150a928119ab1598ac0d3dfee6 files/chronyd.rc 1609
-MD5 d364a3eb5fa42974f0676a61433cca10 files/chronyd.conf 786
-MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.19-conf.c-gentoo.diff 342
-MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.19-chrony.conf.example-gentoo.diff 1592
-MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.20-conf.c-gentoo.diff 342
+MD5 19fc6632603680a145092ca56fe9aaa1 files/chrony-1.20-sys_linux.c-gentoo.diff 797
+MD5 530b19caa6b14e1501530401f8cdc986 files/digest-chrony-1.20-r1 63
diff --git a/net-misc/chrony/chrony-1.20-r1.ebuild b/net-misc/chrony/chrony-1.20-r1.ebuild
new file mode 100644
index 000000000000..580d5ade1352
--- /dev/null
+++ b/net-misc/chrony/chrony-1.20-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.20-r1.ebuild,v 1.1 2004/10/23 12:01:42 wmertens Exp $
+
+inherit eutils
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.sunsite.dk/"
+SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~mips sparc ~ppc"
+IUSE="readline"
+
+DEPEND="virtual/libc
+	readline? ( >=sys-libs/readline-4.1-r4 )"
+
+src_unpack() {
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-conf.c-gentoo.diff
+	epatch ${FILESDIR}/${P}-chrony.conf.example-gentoo.diff
+	# Allow Hz=200 detection (#21058, Alexander Papaspyrou)
+	epatch ${FILESDIR}/${P}-sys_linux.c-gentoo.diff
+}
+
+src_compile() {
+	econf `use_enable readline` || die
+	emake all docs || die
+}
+
+src_install() {
+	# the chrony install is brain-dead so we'll just do it ourselves
+	dobin chronyc
+	dosbin chronyd
+
+	dodoc chrony.txt README examples/chrony.{conf,keys}.example
+	dohtml chrony.html
+	doman *.{1,5,8}
+	doinfo chrony.info*
+
+	dodir /etc/chrony
+	exeinto /etc/init.d ; newexe ${FILESDIR}/chronyd.rc chronyd
+	insinto /etc/conf.d ; newins ${FILESDIR}/chronyd.conf chronyd
+	dosed "s:the documentation directory:/usr/share/doc/${PF}/:" /etc/init.d/chronyd
+}
diff --git a/net-misc/chrony/files/chrony-1.20-sys_linux.c-gentoo.diff b/net-misc/chrony/files/chrony-1.20-sys_linux.c-gentoo.diff
new file mode 100644
index 000000000000..063be7aba9a6
--- /dev/null
+++ b/net-misc/chrony/files/chrony-1.20-sys_linux.c-gentoo.diff
@@ -0,0 +1,27 @@
+--- sys_linux.c.orig	2003-10-04 15:56:40.000000000 -0400
++++ sys_linux.c	2003-10-09 21:06:06.000000000 -0400
+@@ -448,6 +448,7 @@
+ 
+   if (TMX_SetFrequency(scaled_freq, required_tick) < 0) {
+     char buffer[1024];
++      perror("failed");
+     sprintf(buffer, "adjtimex failed for set_frequency, freq_ppm=%10.4e scaled_freq=%10.4e required_tick=%ld",
+             freq_ppm, scaled_freq, required_tick);
+     CROAK(buffer);
+@@ -600,6 +601,16 @@
+     *shift_hz = 7;
+     return;
+   }
++  /* GENTOO: Gentoo Linux has hz=200
++   * tick_nominal: 5000
++   * tick_lo: 3333
++   * tick_hi: 6667 */
++  if (tick >= 3333 && tick <= 6667) {
++    *hz = 200;
++    *shift_hz = 8;
++    return;
++  }
++  /* END GENTOO */
+ 
+   for (i=4; i<16; i++) { /* surely 16 .. 32768 is a wide enough range? */
+     ihz = 1 << i;
diff --git a/net-misc/chrony/files/digest-chrony-1.20-r1 b/net-misc/chrony/files/digest-chrony-1.20-r1
new file mode 100644
index 000000000000..52c899e5af73
--- /dev/null
+++ b/net-misc/chrony/files/digest-chrony-1.20-r1
@@ -0,0 +1 @@
+MD5 d0f89e9e13fa47d04fd9f99e56c615c2 chrony-1.20.tar.gz 308253
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
new file mode 100644
index 000000000000..036f9cf848a0
--- /dev/null
+++ b/net-misc/chrony/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>net-misc</herd>
+<maintainer>
+  <email>wmertens@gentoo.org</email>
+</maintainer>
+</pkgmetadata>