message fix #22436

10 files changed, 46 insertions, 216 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 14adcb1cb44a..ea0894dcb842 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,9 +1,12 @@
 # ChangeLog for net-misc/chrony
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.7 2003/03/18 10:27:05 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.8 2003/06/16 16:08:22 vapier Exp $
 
 *chrony-1.19 (18 Mar 2003)
 
+  16 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
+  init.d/conf.d fixes #22436.
+
   18 Mar 2003; Wout Mertens <wmertens@gentoo.org> :
   Version bump, no changes to the ebuild needed.
   Still wondering whether the drift and rtc files shouldn't go in
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 41cb5bbe8428..87696955d2d5 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,10 +1,7 @@
-MD5 1abe9fad21e003a748d92be8637be0df ChangeLog 947
-MD5 4b54244462d3185d690137f46dbf4939 chrony-1.18.ebuild 1528
-MD5 a88d4a8a077aaec2a1af226a4a7d1b03 chrony-1.19.ebuild 1530
-MD5 3705081bbd31e521565b0c2bbb9a4634 files/chrony-1.18-chrony.conf.example-gentoo.diff 2221
-MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.18-conf.c-gentoo.diff 342
-MD5 60d5acfaaaed0558b9d532211eb98f17 files/chrony-1.19-chrony.conf.example-gentoo.diff 2221
-MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.19-conf.c-gentoo.diff 342
-MD5 f828e7006adebc22bfced72b8feab9b5 files/chronyd.rc 1645
-MD5 acc6d226e52e32977403ec94944acf96 files/digest-chrony-1.18 63
+MD5 0c4550669734b111629eb49eb08b7536 ChangeLog 1030
+MD5 efdb39c2102a159308272ae8241fefb2 chrony-1.19.ebuild 1186
 MD5 c0e426c615798b7c75afc3b1aadcd727 files/digest-chrony-1.19 63
+MD5 63f4f8f700117b18e444ad59888f0cf3 files/chronyd.rc 1515
+MD5 e25a6c1d369336a4e0a592df4ab24e7a files/chronyd.conf 161
+MD5 b778857b5d802a10ec3e9ffd6ba9d226 files/chrony-1.19-conf.c-gentoo.diff 342
+MD5 fa94342edcd12320e3fc947c7921c771 files/chrony-1.19-chrony.conf.example-gentoo.diff 1592
diff --git a/net-misc/chrony/chrony-1.18.ebuild b/net-misc/chrony/chrony-1.18.ebuild
deleted file mode 100644
index 62602b100de5..000000000000
--- a/net-misc/chrony/chrony-1.18.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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/chrony-1.18.ebuild,v 1.9 2003/02/13 14:46:51 vapier Exp $
-
-IUSE="readline"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="NTP client and server programs"
-SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
-HOMEPAGE="http://chrony.sunsite.dk"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc "
-
-DEPEND="virtual/glibc
-		readline? ( >=readline-4.1-r4 )"
-RDEPEND=$DEPEND
-
-# Patch the distribution so that it puts stuff in /etc/chrony/ by default
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp conf.c conf.c.orig
-	patch -p0 < ${FILESDIR}/${P}-conf.c-gentoo.diff
-	cd examples
-	cp chrony.conf.example chrony.conf.example.orig
-	patch -p0 < ${FILESDIR}/${P}-chrony.conf.example-gentoo.diff
-}
-
-src_compile() {
-
-	local myconf
-
-	use readline || myconf="--disable-readline"
-
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$myconf || die "./configure failed"
-		
-	emake all docs || die
-}
-
-src_install () {
-	# the chrony install is brain-dead so we'll
-	# just do it ourselves.
-
-	dobin chronyc
-	dosbin chronyd
-	
-	# documentation
-	dodoc chrony.txt chrony.html COPYING README
-
-	# man pages
-	doman *.{1,5,8}	
-
-	# info files
-	doinfo chrony.info*
-
-	# example configuration files
-	dodoc examples/chrony.conf.example
-	dodoc examples/chrony.keys.example
-
-	# system configuration
-	exeinto /etc/init.d ; newexe ${FILESDIR}/chronyd.rc chronyd
-	dodir /etc/chrony
-}
diff --git a/net-misc/chrony/chrony-1.19.ebuild b/net-misc/chrony/chrony-1.19.ebuild
index 4b5d3e9f3fa5..44f9ab0cd384 100644
--- a/net-misc/chrony/chrony-1.19.ebuild
+++ b/net-misc/chrony/chrony-1.19.ebuild
@@ -1,68 +1,45 @@
 # 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/chrony-1.19.ebuild,v 1.1 2003/03/18 10:27:05 wmertens Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.19.ebuild,v 1.2 2003/06/16 16:08:22 vapier Exp $
 
-IUSE="readline"
+inherit eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="NTP client and server programs"
 SRC_URI="http://chrony.sunsite.dk/download/${P}.tar.gz"
-HOMEPAGE="http://chrony.sunsite.dk"
+HOMEPAGE="http://chrony.sunsite.dk/"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc "
+KEYWORDS="x86 sparc"
+IUSE="readline"
 
 DEPEND="virtual/glibc
-		readline? ( >=readline-4.1-r4 )"
-RDEPEND=$DEPEND
+	readline? ( >=readline-4.1-r4 )"
 
-# Patch the distribution so that it puts stuff in /etc/chrony/ by default
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	cp conf.c conf.c.orig
-	patch -p0 < ${FILESDIR}/${P}-conf.c-gentoo.diff
-	cd examples
-	cp chrony.conf.example chrony.conf.example.orig
-	patch -p0 < ${FILESDIR}/${P}-chrony.conf.example-gentoo.diff
+	unpack ${A} ; cd ${S}
+
+	epatch ${FILESDIR}/${P}-conf.c-gentoo.diff
+	epatch ${FILESDIR}/${P}-chrony.conf.example-gentoo.diff
 }
 
 src_compile() {
-
-	local myconf
-
-	use readline || myconf="--disable-readline"
-
-	./configure \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		$myconf || die "./configure failed"
-		
+	econf `use_enable readline` || die
 	emake all docs || die
 }
 
-src_install () {
-	# the chrony install is brain-dead so we'll
-	# just do it ourselves.
-
+src_install() {
+	# the chrony install is brain-dead so we'll just do it ourselves
 	dobin chronyc
 	dosbin chronyd
-	
-	# documentation
-	dodoc chrony.txt chrony.html COPYING README
 
-	# man pages
+	dodoc chrony.txt README examples/chrony.{conf,keys}.example
+	dohtml chrony.html
 	doman *.{1,5,8}	
-
-	# info files
 	doinfo chrony.info*
 
-	# example configuration files
-	dodoc examples/chrony.conf.example
-	dodoc examples/chrony.keys.example
-
-	# system configuration
-	exeinto /etc/init.d ; newexe ${FILESDIR}/chronyd.rc chronyd
 	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.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