commit: 3c17bfa27ffd29237d81154a3d181f631ac0f0f4 Author: Dominik Kriegner <dominik.kriegner <AT> gmail <DOT> com> AuthorDate: Tue Jan 26 12:12:26 2016 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Nov 20 05:30:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c17bfa2
net-misc/tlsdate: systemd support, bug 533380 Package-Manager: portage-2.3.2 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> .../files/tlsdate-0.0.13-tlsdated-service.patch | 22 ++++++++++++++++++++++ net-misc/tlsdate/files/tlsdated.default | 4 ++++ net-misc/tlsdate/files/tlsdated.tmpfiles.conf | 1 + net-misc/tlsdate/tlsdate-0.0.13.ebuild | 10 ++++++++-- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch b/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch new file mode 100644 index 00000000..df03833 --- /dev/null +++ b/net-misc/tlsdate/files/tlsdate-0.0.13-tlsdated-service.patch @@ -0,0 +1,22 @@ +From: Dominik Kriegner <[email protected]> +Date: Tue, 26 Jan 2016 12:12:26 +0000 +Subject: [PATCH] Fix systemd unit file + +Project-Bug-URL: https://github.com/ioerror/tlsdate/pull/162 +Gentoo-Bug-URL: https://bugs.gentoo.org/533380 + +--- a/systemd/tlsdated.service ++++ b/systemd/tlsdated.service +@@ -5,6 +5,9 @@ After=network.target + [Service] + Type=simple + EnvironmentFile=/etc/default/tlsdated +-ExecStart=/usr/sbin/tlsdated ${DAEMON_OPTS} +-ExecReload=/bin/kill -HUP ${MAINPID} +-ExecStop=/bin/kill -INT ${MAINPID} ++ExecStart=/usr/sbin/tlsdated $DAEMON_OPTS ++ExecReload=/bin/kill -HUP $MAINPID ++ExecStop=/bin/kill -INT $MAINPID ++ ++[Install] ++WantedBy=multi-user.target diff --git a/net-misc/tlsdate/files/tlsdated.default b/net-misc/tlsdate/files/tlsdated.default new file mode 100644 index 00000000..08186f7 --- /dev/null +++ b/net-misc/tlsdate/files/tlsdated.default @@ -0,0 +1,4 @@ +# defaults file for /etc/default/tlsdated + +# Additional options; see `man tlsdated` for reference. +DEAMON_OPTS="" diff --git a/net-misc/tlsdate/files/tlsdated.tmpfiles.conf b/net-misc/tlsdate/files/tlsdated.tmpfiles.conf new file mode 100644 index 00000000..07a7966 --- /dev/null +++ b/net-misc/tlsdate/files/tlsdated.tmpfiles.conf @@ -0,0 +1 @@ +d /var/cache/tlsdated 0700 tlsdate tlsdate - diff --git a/net-misc/tlsdate/tlsdate-0.0.13.ebuild b/net-misc/tlsdate/tlsdate-0.0.13.ebuild index 1fb4cc8..5b1f523 100644 --- a/net-misc/tlsdate/tlsdate-0.0.13.ebuild +++ b/net-misc/tlsdate/tlsdate-0.0.13.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="4" -inherit autotools vcs-snapshot user +inherit autotools eutils systemd vcs-snapshot user DESCRIPTION="Update local time over HTTPS" HOMEPAGE="https://github.com/ioerror/tlsdate"; @@ -26,6 +26,7 @@ src_prepare() { sed -i \ -e 's:/tlsdate/ca-roots/tlsdate-ca-roots.conf:/ssl/certs/ca-certificates.crt:' \ Makefile.am || die + epatch "${FILESDIR}"/${P}-tlsdated-service.patch eautoreconf } @@ -53,6 +54,11 @@ src_install() { newinitd "${FILESDIR}"/tlsdate.rc tlsdate newconfd "${FILESDIR}"/tlsdate.confd tlsdate + systemd_newunit "${S}"/systemd/tlsdated.service tlsdated.service + systemd_newtmpfilesd "${FILESDIR}"/tlsdated.tmpfiles.conf tlsdated.conf + insinto /etc/default + newins "${FILESDIR}"/tlsdated.default tlsdated + insinto /etc/dbus-1/system.d/ doins dbus/org.torproject.tlsdate.conf
