From b190c4505a7d1ed51761e487803ccee95260386b Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@fedoraproject.org>
Date: Feb 04 2010 14:44:43 +0000
Subject: - update to 1.24 (#555367, CVE-2010-0292 CVE-2010-0293 CVE-2010-0294)

- modify default config
- step clock on start if it is off by more than 100 seconds
- disable client log
- build with -fPIE on sparc

---

diff --git a/.cvsignore b/.cvsignore
index aedad52..baaaffb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-chrony-1.24-pre1.tar.gz
+chrony-1.24.tar.gz
diff --git a/chrony.conf b/chrony.conf
index 4f49740..8b52382 100644
--- a/chrony.conf
+++ b/chrony.conf
@@ -3,7 +3,8 @@
 server 0.fedora.pool.ntp.org
 server 1.fedora.pool.ntp.org
 server 2.fedora.pool.ntp.org
- 
+initstepslew 100 0.fedora.pool.ntp.org 1.fedora.pool.ntp.org 2.fedora.pool.ntp.org
+
 driftfile /var/lib/chrony/drift
 
 # Allow client access from local network.
@@ -17,6 +18,9 @@ keyfile /etc/chrony.keys
 # Specify the key used as password for chronyc.
 commandkey 1
 
+# Disable logging of client accesses.
+noclientlog
+
 # Send a message to syslog when chronyd has to correct
 # an error larger than 0.5 seconds.
 logchange 0.5
diff --git a/chrony.spec b/chrony.spec
index 8559b33..f79d63a 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -1,7 +1,6 @@
-%define prerelease -pre1
 Name:           chrony
 Version:        1.24
-Release:        0.1.pre1%{?dist}
+Release:        1%{?dist}
 Summary:        An NTP client/server
 
 Group:          System Environment/Daemons
@@ -32,7 +31,14 @@ in permanently connected environments.
 %setup -q -n %{name}-%{version}%{?prerelease}
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -pie -fpie"
+CFLAGS="$RPM_OPT_FLAGS"
+%ifarch %{sparc}
+CFLAGS="$CFLAGS -pie -fPIE"
+%else
+CFLAGS="$CFLAGS -pie -fpie"
+%endif
+export CFLAGS
+
 %configure --docdir=%{_docdir}
 make %{?_smp_mflags} getdate all docs
 
@@ -100,6 +106,13 @@ fi
 %dir %attr(-,chrony,chrony) %{_localstatedir}/log/chrony
 
 %changelog
+* Thu Feb 04 2010 Miroslav Lichvar <mlichvar@redhat.com> 1.24-1
+- update to 1.24 (#555367, CVE-2010-0292 CVE-2010-0293 CVE-2010-0294)
+- modify default config
+  - step clock on start if it is off by more than 100 seconds
+  - disable client log
+- build with -fPIE on sparc
+
 * Tue Dec 15 2009 Miroslav Lichvar <mlichvar@redhat.com> 1.24-0.1.pre1
 - update to 1.24-pre1
 
diff --git a/sources b/sources
index f4d2dcf..6a94fd3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e1f0d15bc0830f5f6bf80da2d72eb16a  chrony-1.24-pre1.tar.gz
+8849e95428f43c5ab2692a2812653e65  chrony-1.24.tar.gz