Anchor the config options check in the init script (#310773)

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 83 insertions, 11 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 5aaae59d79d5..8122422f8895 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/chrony
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.49 2010/03/15 18:42:49 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.50 2010/03/23 09:09:48 tove Exp $
+
+*chrony-1.24-r1 (23 Mar 2010)
+
+  23 Mar 2010; Torsten Veller <tove@gentoo.org> +chrony-1.24-r1.ebuild,
+  files/chronyd.rc:
+  Anchor the config options check in the init script (#310773)
 
   15 Mar 2010; Christian Faulhammer <fauli@gentoo.org> chrony-1.24.ebuild:
   stable x86, security bug 307757
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index e1fa8f7cfc8c..e156ddd46431 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -7,17 +7,18 @@ AUX chrony-1.21-hppa.patch 572 RMD160 527c9dff58563168e34efbcc3da15b329cc6009f S
 AUX chrony-1.21-makefile.diff 627 RMD160 4a661285ceebdf8609baa084454fdfdff3e47443 SHA1 7162220786f568f8170cf36fa9d6da8c2a0af6c5 SHA256 e90b6ac857b854aaa2f67124da3ec18933f3897eec075d5438ae3bdf751481ac
 AUX chrony-1.23-sources.diff 1719 RMD160 56c443d44647603407e05ea7b0c0ac6e8e4fa96c SHA1 2aaff60839745d43f28c6df7931bb7b932c09250 SHA256 f0ad08f480879fffd565a60a1d69a5f0283194b414e952d9ca587c947ecc92a3
 AUX chronyd.conf 378 RMD160 929862983d9ac346506d074fd4d8d14452ce451a SHA1 4efc8a4259e54df7df3be8a1c848891c7bfd11bf SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99
-AUX chronyd.rc 1702 RMD160 b3ba4c5869ad2710e5d212ca7786bbed2d27dcdc SHA1 66f9506fcfda318757fabbf3a99e6fff960d41e5 SHA256 5cabd9ff35006233f43ef33a8b1a03e96ee78b269eba5e0efedf4327fa64662d
+AUX chronyd.rc 1744 RMD160 67f19b65a72619bf224fab034ff56438be9e3340 SHA1 9903364e1c3c5b30e14373b3b0387b925a5a7580 SHA256 3c15c635e656c1f83846270813754863033e996bed144f82bdbf65a2e5dd3aa5
 DIST chrony-1.23.tar.gz 321015 RMD160 6f92aeac15d252821ff72a02f340fc0e562eddc1 SHA1 f0c6b32099329f358dbdb4f62753d2c7cbc13c79 SHA256 889f292458ccb3f20ae4f5872110d776a639f1cda2d1df694eb88a14726832c5
 DIST chrony-1.24.tar.gz 364311 RMD160 a393c3f51d99a24a1aefd1653575de5a6c642191 SHA1 6e17d7b8cdd3508751713bd2279202b75643e268 SHA256 dd0e6c98a7e094d760d83a1681f85d84f3a5103400c49b4a9e062bbe02ceb215
 EBUILD chrony-1.23.ebuild 1856 RMD160 9d0b47e1d365290eadc462fec6dc609b4c585223 SHA1 ce67919c45e510eaca10cf5ad7a01b8631ac585a SHA256 f65036a24acf5862f97fdd25ef09445e4f09fe6126bcf6ea0b66262c85c74d1c
+EBUILD chrony-1.24-r1.ebuild 1722 RMD160 89aea4a226c7d4d0e9eabfc4255cc4cbb5beccc6 SHA1 51ec863eaf78d6b676630b02a8c4f8c06d9603db SHA256 9e8536ee2c4f401798ac0ed3cecf98bf17174d98f88be846c9b44b1ba7d943c3
 EBUILD chrony-1.24.ebuild 1719 RMD160 91d2295351be8b546858ea319cda1dc05f5620a7 SHA1 3c6ee0b2905e47addfec2ce472902064f9290b35 SHA256 bd39df29fc1df531c19f905ea0cf3e7b782bdf18ac36023059fb8fc60ce9202f
-MISC ChangeLog 6219 RMD160 66f4fe7f62f4dce2e21f7b8dfcff3152103bb753 SHA1 b2007b04e7ba80eafb4e65fc9b9b4ce663238066 SHA256 e28b1d0b8999038e98c3600f24cece2f6c7b41f0b9362299a47092039f681984
+MISC ChangeLog 6405 RMD160 9956619b68c1bb390c6e7a1d38e0e0e1c4e305d3 SHA1 6131729249c75fb54cee20473a451c60dd9b7941 SHA256 7f46c9e9b0c9a2184e0d2d6d6541fce3eecce49496e1cbf211aada933c59f368
 MISC metadata.xml 1028 RMD160 0b2a82de3f3f7f586ffba067114005b5398e78fc SHA1 68914908720affa4f5a0aa7bfc3f2e0d1474c9dd SHA256 abc23a3b826bff26c757496fbe12dc5a40bc50dffb634629c94c9dd6136ab81e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuef7gACgkQNQqtfCuFneMw6wCgjMcYjcH+I5BB2Pc/J6H7iAQD
-59QAoIXrhYJAF23t+ZZafDcniwt9v3a1
-=hdUz
+iEYEARECAAYFAkuohWIACgkQV3J2n04EauxDSgCfZtt87dflv3njl1j3t5La6MJX
+DDAAnRCsHPfZOM0LffXbmjzQYpkt1RUY
+=E/bt
 -----END PGP SIGNATURE-----
diff --git a/net-misc/chrony/chrony-1.24-r1.ebuild b/net-misc/chrony/chrony-1.24-r1.ebuild
new file mode 100644
index 000000000000..51999f25cdff
--- /dev/null
+++ b/net-misc/chrony/chrony-1.24-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.24-r1.ebuild,v 1.1 2010/03/23 09:09:48 tove Exp $
+
+EAPI=2
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="NTP client and server programs"
+HOMEPAGE="http://chrony.tuxfamily.org/"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="caps readline"
+
+RDEPEND="readline? ( >=sys-libs/readline-4.1-r4 )
+	caps? ( sys-libs/libcap )"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.21-hppa.patch
+	sed -i "s:/etc/chrony\.:/etc/chrony/chrony.:g" \
+		examples/* chrony*.{1,5,8} faq.txt chrony.texi || die "sed failed"
+}
+
+src_configure() {
+	tc-export CC
+	local myconf
+	use readline || myconf+=" --disable-readline"
+	#use ipv6     || myconf+=" --disable-ipv6"
+	use caps     || myconf+=" --disable-linuxcaps"
+	# selfwritten configure
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc/chrony \
+		--infodir=/usr/share/info \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/${PF} \
+		${myconf} ${EXTRA_ECONF} || die "configure failed"
+}
+
+src_compile() {
+	emake all || die "make failed"
+	emake docs || die "make docs failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	rm "${D}"/usr/share/doc/${PF}/COPYING || die
+	dodoc examples/chrony.{conf,keys}.example || die
+	doinfo chrony.info* || die
+
+	newinitd "${FILESDIR}"/chronyd.rc chronyd || die
+	dosed "s:the documentation directory:/usr/share/doc/${PF}/:" \
+		/etc/init.d/chronyd || die "doc sed failed"
+	newconfd "${FILESDIR}"/chronyd.conf chronyd || die
+
+	keepdir /var/{lib,log}/chrony /etc/chrony
+}
diff --git a/net-misc/chrony/files/chronyd.rc b/net-misc/chrony/files/chronyd.rc
index c6b28a488d6b..32dfd424e081 100644
--- a/net-misc/chrony/files/chronyd.rc
+++ b/net-misc/chrony/files/chronyd.rc
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.9 2009/11/16 14:28:14 cla Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/files/chronyd.rc,v 1.10 2010/03/23 09:09:50 tove Exp $
 
 depend() {
 	need net
@@ -30,16 +30,20 @@ checkconfig() {
 		# know if it might be handy
 		PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
 	fi
+	return 0
+}
 
+setxtrarg() {
 	if [ -c /dev/rtc ]; then
-		grep -q 'rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+		grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
 	fi
-	grep -q 'dumponexit' "${CFGFILE}" && ARGS="${ARGS} -r"
+	grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
 	return 0
 }
 
 start() {
 	checkconfig || return $?
+	setxtrarg
 
 	[ -n "${PIDFILE}" ] || PIDFILE=/var/run/chronyd.pid