message fix #22436

6 files changed, 17 insertions, 96 deletions

diff --git a/net-misc/chrony/files/chrony-1.18-chrony.conf.example-gentoo.diff b/net-misc/chrony/files/chrony-1.18-chrony.conf.example-gentoo.diff
deleted file mode 100644
index c89299e66cda..000000000000
--- a/net-misc/chrony/files/chrony-1.18-chrony.conf.example-gentoo.diff
+++ /dev/null
@@ -1,57 +0,0 @@
---- chrony.conf.example.orig	Sun May 12 18:16:30 2002
-+++ chrony.conf.example	Sun May 12 18:17:12 2002
-@@ -2,7 +2,7 @@
- # $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chrony-1.18-chrony.conf.example-gentoo.diff,v 1.1 2002/05/12 16:46:21 wmertens Exp $
- #
- # This is an example chrony configuration file.  You should copy it to
--# /etc/chrony.conf after uncommenting and editing the options that you
-+# /etc/chrony/chrony.conf after uncommenting and editing the options that you
- # want to enable.  I have not included the more obscure options.  Refer
- # to the documentation for these.
- #
-@@ -90,7 +90,7 @@
- # immediately so that it doesn't gain or lose any more time.  You
- # generally want this, so it is uncommented.
- 
--driftfile /etc/chrony.drift
-+driftfile /etc/chrony/chrony.drift
- 
- # If you want to use the program called chronyc to configure aspects of
- # chronyd's operation once it is running (e.g. tell it the Internet link
-@@ -99,7 +99,7 @@
- # exchanges between cooperating machines.)  Again, this option is
- # assumed by default.
- 
--keyfile /etc/chrony.keys
-+keyfile /etc/chrony/chrony.keys
- 
- # Tell chronyd which numbered key in the file is used as the password
- # for chronyc. (You can pick any integer up to 2**32-1.  '1' is just a
-@@ -157,8 +157,8 @@
- ! logdir /var/log/chrony
- ! log measurements statistics tracking
- 
--If you have real time clock support enabled (see below), you might want
--this line instead:
-+# If you have real time clock support enabled (see below), you might want
-+# this line instead:
- 
- ! log measurements statistics tracking rtc
- 
-@@ -268,7 +268,7 @@
- # You need to have 'enhanced RTC support' compiled into your Linux
- # kernel.  (Note, these options apply only to Linux.)
- 
--! rtcfile /etc/chrony.rtc
-+! rtcfile /etc/chrony/chrony.rtc
- 
- # Your RTC can be set to keep Universal Coordinated Time (UTC) or local
- # time.  (Local time means UTC +/- the effect of your timezone.)  If you
-@@ -284,6 +284,6 @@
- # /dev/rtc.  If it's accessed somewhere else on your system (e.g. you're
- # using devfs), uncomment and edit the following line.
- 
--! rtcdevice /dev/misc/rtc
-+rtcdevice /dev/misc/rtc
- 
- #######################################################################
diff --git a/net-misc/chrony/files/chrony-1.18-conf.c-gentoo.diff b/net-misc/chrony/files/chrony-1.18-conf.c-gentoo.diff
deleted file mode 100644
index fabc47097ff9..000000000000
--- a/net-misc/chrony/files/chrony-1.18-conf.c-gentoo.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- conf.c.orig	Sun May 12 14:07:31 2002
-+++ conf.c	Sun May 12 14:07:52 2002
-@@ -45,7 +45,7 @@
- 
- /* ================================================== */
- 
--#define DEFAULT_CONF_FILE "/etc/chrony.conf"
-+#define DEFAULT_CONF_FILE "/etc/chrony/chrony.conf"
- 
- /* ================================================== */
- /* Forward prototypes */
diff --git a/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff b/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff
index 2194109efeb9..7f1f2c9cccfc 100644
--- a/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff
+++ b/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff
@@ -1,34 +1,27 @@
---- chrony.conf.example.orig	Sun May 12 18:16:30 2002
-+++ chrony.conf.example	Sun May 12 18:17:12 2002
-@@ -2,7 +2,7 @@
- # $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chrony-1.19-chrony.conf.example-gentoo.diff,v 1.1 2003/03/18 10:27:05 wmertens Exp $
+--- examples/chrony.conf.example.orig	2003-06-16 11:59:01.000000000 -0400
++++ examples/chrony.conf.example	2003-06-16 12:00:13.000000000 -0400
+@@ -3,5 +3,5 @@
  #
  # This is an example chrony configuration file.  You should copy it to
 -# /etc/chrony.conf after uncommenting and editing the options that you
 +# /etc/chrony/chrony.conf after uncommenting and editing the options that you
  # want to enable.  I have not included the more obscure options.  Refer
  # to the documentation for these.
- #
-@@ -90,7 +90,7 @@
- # immediately so that it doesn't gain or lose any more time.  You
+@@ -91,5 +91,5 @@
  # generally want this, so it is uncommented.
  
 -driftfile /etc/chrony.drift
 +driftfile /etc/chrony/chrony.drift
  
  # If you want to use the program called chronyc to configure aspects of
- # chronyd's operation once it is running (e.g. tell it the Internet link
-@@ -99,7 +99,7 @@
- # exchanges between cooperating machines.)  Again, this option is
+@@ -100,5 +100,5 @@
  # assumed by default.
  
 -keyfile /etc/chrony.keys
 +keyfile /etc/chrony/chrony.keys
  
  # Tell chronyd which numbered key in the file is used as the password
- # for chronyc. (You can pick any integer up to 2**32-1.  '1' is just a
-@@ -157,8 +157,8 @@
- ! logdir /var/log/chrony
+@@ -158,6 +158,6 @@
  ! log measurements statistics tracking
  
 -If you have real time clock support enabled (see below), you might want
@@ -37,18 +30,14 @@
 +# this line instead:
  
  ! log measurements statistics tracking rtc
- 
-@@ -268,7 +268,7 @@
- # You need to have 'enhanced RTC support' compiled into your Linux
+@@ -269,5 +269,5 @@
  # kernel.  (Note, these options apply only to Linux.)
  
 -! rtcfile /etc/chrony.rtc
 +! rtcfile /etc/chrony/chrony.rtc
  
  # Your RTC can be set to keep Universal Coordinated Time (UTC) or local
- # time.  (Local time means UTC +/- the effect of your timezone.)  If you
-@@ -284,6 +284,6 @@
- # /dev/rtc.  If it's accessed somewhere else on your system (e.g. you're
+@@ -285,5 +285,5 @@
  # using devfs), uncomment and edit the following line.
  
 -! rtcdevice /dev/misc/rtc
diff --git a/net-misc/chrony/files/chronyd.conf b/net-misc/chrony/files/chronyd.conf
new file mode 100644
index 000000000000..8a33f59366f2
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.conf
@@ -0,0 +1,5 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.conf,v 1.1 2003/06/16 16:08:22 vapier Exp $
+
+CFGFILE=/etc/chrony/chrony.conf
diff --git a/net-misc/chrony/files/chronyd.rc b/net-misc/chrony/files/chronyd.rc
index d481f06b6cbf..07ec4c10c159 100644
--- a/net-misc/chrony/files/chronyd.rc
+++ b/net-misc/chrony/files/chronyd.rc
@@ -1,23 +1,19 @@
 #!/sbin/runscript
 # Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# /space/gentoo/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc6,v 1.3 2002/03/24 14:25:31 azarah Exp
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.3 2003/06/16 16:08:22 vapier Exp $
 
 depend() {
 	need net
 }
 
-CFGFILE=/etc/chrony/chrony.conf
-
 checkconfig() {
-
 	# Note that /etc/chrony.keys is *NOT* checked. This
 	# is because the user may have specified another key
 	# file, and we don't want to force the user to use that
 	# exact name for the key file.
-	if [ ! -f $CFGFILE ]
-	then
-		eerror "Please create $cfgfile and the"
+	if [ ! -f $CFGFILE ] ; then
+		eerror "Please create $CFGFILE and the"
 		eerror "chrony key file (usually /etc/chrony/chrony.keys)"
 		eerror "by using the"
 		eerror ""
diff --git a/net-misc/chrony/files/digest-chrony-1.18 b/net-misc/chrony/files/digest-chrony-1.18
deleted file mode 100644
index cdc53127b2d2..000000000000
--- a/net-misc/chrony/files/digest-chrony-1.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d76f2191226e6cd631302d7e9b5c5839 chrony-1.18.tar.gz 302364