Add USE=logrotate with a logrotate script contributed by Georg Sauthoff (bug #106391).

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

5 files changed, 97 insertions, 3 deletions

diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index b669028fb79c..cd1a255789be 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,13 @@
 # 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.56 2010/06/09 22:09:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.57 2010/06/10 02:24:55 jer Exp $
+
+*chrony-1.24-r2 (10 Jun 2010)
+
+  10 Jun 2010; Jeroen Roovers <jer@gentoo.org> +chrony-1.24-r2.ebuild,
+  +files/chrony.logrotate, metadata.xml:
+  Add USE=logrotate with a logrotate script contributed by Georg Sauthoff
+  (bug #106391).
 
   09 Jun 2010; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Maintain.
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index fd756d67cae6..123cc518088e 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -1,7 +1,9 @@
 AUX chrony-1.21-hppa.patch 572 RMD160 527c9dff58563168e34efbcc3da15b329cc6009f SHA1 159abdea72e63268ae87655859908404d4d179ed SHA256 b755684e28aea7da4276c540a51eb33016f3dbf8b5cd2e3228f2a2915dbc5c1c
+AUX chrony.logrotate 301 RMD160 88030a539ed48925e012e0293eeb38b93d8f8d41 SHA1 85b75b4a4a1cbc57f4b5254ed06b85438030574f SHA256 5cb338e41defa0e2f6257b5a2f6ba539cf097ad80c8de894e9858ab0c382293c
 AUX chronyd.conf 378 RMD160 929862983d9ac346506d074fd4d8d14452ce451a SHA1 4efc8a4259e54df7df3be8a1c848891c7bfd11bf SHA256 29040502f86c419dbfbc7e2627cc658a8df82b37da21b3d1fce2eed9136d8f99
 AUX chronyd.rc 1744 RMD160 67f19b65a72619bf224fab034ff56438be9e3340 SHA1 9903364e1c3c5b30e14373b3b0387b925a5a7580 SHA256 3c15c635e656c1f83846270813754863033e996bed144f82bdbf65a2e5dd3aa5
 DIST chrony-1.24.tar.gz 364311 RMD160 a393c3f51d99a24a1aefd1653575de5a6c642191 SHA1 6e17d7b8cdd3508751713bd2279202b75643e268 SHA256 dd0e6c98a7e094d760d83a1681f85d84f3a5103400c49b4a9e062bbe02ceb215
 EBUILD chrony-1.24-r1.ebuild 1720 RMD160 31c49b32eb8421c022cfd6669adad2f67c6bc043 SHA1 5c949b93d0788bbbf87db8dc37f047a7cad70554 SHA256 ea2b878c52b9f0829a810fe6ba94bfa7a6bba0ade4c589a61bf2a142f0058d0b
-MISC ChangeLog 7035 RMD160 ad01412bc67b705a881662a5007e92b0fb46c1d2 SHA1 14674fda5fa3b93ee2f2c8c79cab9e77a5126da9 SHA256 03391bd66147df81ef6361066bc3a3a1609fd3d7d8bb3e0a6a51b1beda960b18
-MISC metadata.xml 1014 RMD160 f46472683e7ec16a3bf736e0baeb7948f489cbed SHA1 fe8a55544286c7788ab58e8caa55b7f8b8cbd451 SHA256 10f827a848beb64f26a7fd9660a3692572dcfb20862dcae3fa44f47ed806bcff
+EBUILD chrony-1.24-r2.ebuild 1990 RMD160 877eadd8b39b79e578cfa151242ae35dc5eab1b7 SHA1 2af48624a14355500471c73c067239ecfa0f97f5 SHA256 ebd380e3917ab1d6ce775b95bac68e313cb1e0737cc35a6db4b5a1e177e75abf
+MISC ChangeLog 7270 RMD160 d409ee4050ad5ee073420989811c2b3cb620bc42 SHA1 ba1cc88e070ec920bd7d5aec46253a9148dd8748 SHA256 fd5fba6a7dcd9ba757e1f5417a48e31c629ee888eee98f85d0c9b82dde4be3fe
+MISC metadata.xml 1110 RMD160 d11b712226429f196be53fa176862975f96c9a1f SHA1 c9a7f1e082201a348c51cdc397304d21de24f39e SHA256 792d464a7b1c75b2df71a8d4e2e8eb98265978857ad162c035f1655f940758eb
diff --git a/net-misc/chrony/chrony-1.24-r2.ebuild b/net-misc/chrony/chrony-1.24-r2.ebuild
new file mode 100644
index 000000000000..dd343e56dbf1
--- /dev/null
+++ b/net-misc/chrony/chrony-1.24-r2.ebuild
@@ -0,0 +1,72 @@
+# 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-r2.ebuild,v 1.1 2010/06/10 02:24:55 jer 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 logrotate readline"
+
+RDEPEND="
+	readline? ( >=sys-libs/readline-4.1-r4 )
+	caps? ( sys-libs/libcap )
+	logrotate? ( app-admin/logrotate )
+"
+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
+
+	if use logrotate; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/chrony.logrotate chrony
+
+		elog "Rotating logs works through chronyc and requires"
+		elog "a password to be set in /etc/chrony/chrony.keys."
+	fi
+}
diff --git a/net-misc/chrony/files/chrony.logrotate b/net-misc/chrony/files/chrony.logrotate
new file mode 100644
index 000000000000..a88537d74b61
--- /dev/null
+++ b/net-misc/chrony/files/chrony.logrotate
@@ -0,0 +1,10 @@
+/var/log/chrony/*.log
+	sharedscripts
+	postrotate
+                PASSWORD=`awk '$1 ~ /^1$/ {print $2; exit}' /etc/chrony/chrony.keys`
+                cat << EOF | /usr/bin/chronyc | sed '/^200 OK$/d'
+                password $PASSWORD
+                cyclelogs
+                EOF
+        endscript
+}
diff --git a/net-misc/chrony/metadata.xml b/net-misc/chrony/metadata.xml
index 4a9e80e69b4a..3365838251ce 100644
--- a/net-misc/chrony/metadata.xml
+++ b/net-misc/chrony/metadata.xml
@@ -5,6 +5,9 @@
 <maintainer>
 	<email>jer@gentoo.org</email>
 </maintainer>
+<use>
+	<flag name="logrotate">Use <pkg>app-admin/logrotate</pkg> for log rotation</flag>
+</use>
 <longdescription>
 Chrony is a pair of programs (chronyd and chronyc) which are used to maintain
 the accuracy of the system clock on a computer. chronyd has been specifically