Attachment #545926 for bug #665232

View | Details | Raw Unified | Return to bug 665232
Collapse All | Expand All





S="${WORKDIR}/${P/_/-}"

PATCHES=(
	"${FILESDIR}"/chronyd-systemd-gentoo.patch
)

src_prepare() {
	default
	sed -i \
		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
		doc/* examples/* || die

	default
}

src_configure() {

	insinto /etc/logrotate.d
	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony

	systemd_dounit examples/chronyd.service
	systemd_enable_ntpunit 50-chrony chronyd.service
}




RESTRICT=test
S="${WORKDIR}/${P/_/-}"

PATCHES=(
	"${FILESDIR}"/chronyd-systemd-gentoo.patch
)

src_prepare() {
	default
	sed -i \
		-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
		-e 's:/var/run:/run:g' \
		conf.c doc/*.adoc examples/* || die

	default
}

src_configure() {

	insinto /etc/logrotate.d
	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony

	systemd_dounit examples/chronyd.service
	systemd_enable_ntpunit 50-chrony chronyd.service
}




From ba3ddefc90f58d30a365104cf6e930333e3a2704 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 4 Sep 2018 13:01:06 -0400
Subject: [PATCH] Tweak chronyd.service for Gentoo

---
 examples/chronyd.service | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/examples/chronyd.service b/examples/chronyd.service
index 1777413..ceed830 100644
--- a/examples/chronyd.service
+++ b/examples/chronyd.service
@@ -7,9 +7,8 @@ ConditionCapability=CAP_SYS_TIME
 
 [Service]
 Type=forking
-PIDFile=/var/run/chrony/chronyd.pid
-EnvironmentFile=-/etc/sysconfig/chronyd
-ExecStart=/usr/sbin/chronyd $OPTIONS
+PIDFile=/run/chrony/chronyd.pid
+ExecStart=/usr/sbin/chronyd
 PrivateTmp=yes
 ProtectHome=yes
 ProtectSystem=full
-- 
2.18.0


Return to bug 665232

Lines 36-47 RESTRICT=test Link Here

(-)a/net-misc/chrony/chrony-3.4_pre1-r1.ebuild (-4 / +6 lines)
36		36
37	S="${WORKDIR}/${P/_/-}"	37	S="${WORKDIR}/${P/_/-}"
38		38
		39	PATCHES=(
		40	"${FILESDIR}"/chronyd-systemd-gentoo.patch
		41	)
		42
39	src_prepare() {	43	src_prepare() {
		44	default
40	sed -i \	45	sed -i \
41	-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \	46	-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
42	doc/* examples/* \|\| die	47	doc/* examples/* \|\| die
43
44	default
45	}	48	}
46		49
47	src_configure() {	50	src_configure() {
Lines 116-121 src_install() { Link Here
116	insinto /etc/logrotate.d	119	insinto /etc/logrotate.d
117	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony	120	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
118		121
119	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service	122	systemd_dounit examples/chronyd.service
120	systemd_enable_ntpunit 50-chrony chronyd.service
121	}	123	}

Lines 33-45 RDEPEND=" Link Here

(-)a/net-misc/chrony/chrony-9999.ebuild (-4 / +6 lines)
33	RESTRICT=test	33	RESTRICT=test
34	S="${WORKDIR}/${P/_/-}"	34	S="${WORKDIR}/${P/_/-}"
35		35
		36	PATCHES=(
		37	"${FILESDIR}"/chronyd-systemd-gentoo.patch
		38	)
		39
36	src_prepare() {	40	src_prepare() {
		41	default
37	sed -i \	42	sed -i \
38	-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \	43	-e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
39	-e 's:/var/run:/run:g' \	44	-e 's:/var/run:/run:g' \
40	conf.c doc/.adoc examples/ \|\| die	45	conf.c doc/.adoc examples/ \|\| die
41
42	default
43	}	46	}
44		47
45	src_configure() {	48	src_configure() {
Lines 111-116 src_install() { Link Here
111	insinto /etc/logrotate.d	114	insinto /etc/logrotate.d
112	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony	115	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
113		116
114	systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service	117	systemd_dounit examples/chronyd.service
115	systemd_enable_ntpunit 50-chrony chronyd.service
116	}	118	}

Line 0 Link Here

(-)a/net-misc/chrony/files/chronyd-systemd-gentoo.patch (-1 / +28 lines)
0	-	1	From ba3ddefc90f58d30a365104cf6e930333e3a2704 Mon Sep 17 00:00:00 2001
		2	From: Mike Gilbert <floppym@gentoo.org>
		3	Date: Tue, 4 Sep 2018 13:01:06 -0400
		4	Subject: [PATCH] Tweak chronyd.service for Gentoo
		5
		6	---
		7	examples/chronyd.service \| 5 ++---
		8	1 file changed, 2 insertions(+), 3 deletions(-)
		9
		10	diff --git a/examples/chronyd.service b/examples/chronyd.service
		11	index 1777413..ceed830 100644
		12	--- a/examples/chronyd.service
		13	+++ b/examples/chronyd.service
		14	@@ -7,9 +7,8 @@ ConditionCapability=CAP_SYS_TIME
		15
		16	[Service]
		17	Type=forking
		18	-PIDFile=/var/run/chrony/chronyd.pid
		19	-EnvironmentFile=-/etc/sysconfig/chronyd
		20	-ExecStart=/usr/sbin/chronyd $OPTIONS
		21	+PIDFile=/run/chrony/chronyd.pid
		22	+ExecStart=/usr/sbin/chronyd
		23	PrivateTmp=yes
		24	ProtectHome=yes
		25	ProtectSystem=full
		26	--
		27	2.18.0
		28