commit: d779726a3e76e282dbcc12886131921817dcbf18 parent: 752d6f6f2519f6905637f9cd47bf258ff8705fc7 Author: Haelwenn (lanodan) Monnier <contact@hacktivis.me> Date: Tue, 26 Jul 2016 20:32:24 +0200 net-misc/openntpd: Fix chownDiffstat:
| A | net-misc/openntpd/Manifest | 5 | +++++ |
| A | net-misc/openntpd/files/openntpd.conf.d-20080406-r6 | 7 | +++++++ |
| A | net-misc/openntpd/files/openntpd.init.d-20080406-r6 | 15 | +++++++++++++++ |
| A | net-misc/openntpd/metadata.xml | 27 | +++++++++++++++++++++++++++ |
| A | net-misc/openntpd/openntpd-6.0_p1.ebuild | 86 | +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |
5 files changed, 140 insertions(+), 0 deletions(-)
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest @@ -0,0 +1,5 @@ +AUX openntpd.conf.d-20080406-r6 255 SHA256 91fb1497b3a6ef0bb3a3d5baefdff801d8ff1cba27aaf742303415550814a09b SHA512 016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059 WHIRLPOOL 9fa127624f50b01ba1b5872262d26b18362d3784a73021e608bd8a6cead2499cabf0fe5eafeaa315548e97285228a6e70689a3cadbdb7031ac00e23bf064e3b9 +AUX openntpd.init.d-20080406-r6 299 SHA256 78bb5035f326d5aab112b9a367b3ebe742786f9a347584154c4debedf0577ce1 SHA512 b806e390a40aa6aea92f16a541ece81627877389466d7d7b18aaeda655abd7f07eeb276567dc748a6f2e0e79f7bf3f84ecb466b75c8b0485c29fef3172c22c7f WHIRLPOOL 6ce7a93314ff524ccb04ed6cbcc2119d1e8608fa69aa9de49364ede473b3c9dff7231c2c288a5fd7d2195a97a4c8d35f61dba7dbe049f1f44eeca1d2d2fc8950 +DIST openntpd-6.0p1.tar.gz 432696 SHA256 b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8 SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d WHIRLPOOL 75b82a07920eb7c3825a37725a81615871b728e9543ec43cb20c9e61a64f523293aa7e1fbbb92ebb8d6417d13f377213ffbcba1c77c7b3c68b64e26e30222a0b +EBUILD openntpd-6.0_p1.ebuild 2880 SHA256 7f73a20ee5883fbf88b8d5946712eee7cff105b7a2612d9d32f45901cf11fcc8 SHA512 27df9ee95d9ca9750514acdaea7d83e42f1368607fe7d2a909c93d9e0aa62b71f52c6fb669462e82b42bb4ff9e55e9c3ead85e6c0c91658156edf9800370b1f0 WHIRLPOOL 84d68549a8fbfb73347a17dc93000994971b2f27e5088bae8c6f71f4ea530a88755607beeba665897b6126a286f2fc2c09e95a5d0a195a72d9e68229e20a0cda +MISC metadata.xml 888 SHA256 b1cda1fe2b8b9f82eaba4c5339b370085d3179e3f80573b5d4525e04c75491e8 SHA512 78f71e8c7d094c9e2d9a6de329af1c949898a56388a55a6e71d722ddd559d460b76fad8d25e670cf4903da0fb2e59e94429f82d5ca682132b09a6a9287356ec4 WHIRLPOOL 725ba6026f005853cd350cc131ec0af51ca6f2fe5fdc8c6da75dd94d624a1881a98b3d8fd11499b9cfd0be391c9e348c2a8ede5acb1b667bea0c19687ea7b10c diff --git a/net-misc/openntpd/files/openntpd.conf.d-20080406-r6 b/net-misc/openntpd/files/openntpd.conf.d-20080406-r6 @@ -0,0 +1,7 @@ +# /etc/conf.d/ntpd: config file for openntpd's ntpd + +# See ntpd(8) man page ... some popular options: +# -s Set the time immediately at startup +# (Note: may cause up to a 15 second startup delay +# if ntp servers not reachable) +NTPD_OPTS="" diff --git a/net-misc/openntpd/files/openntpd.init.d-20080406-r6 b/net-misc/openntpd/files/openntpd.init.d-20080406-r6 @@ -0,0 +1,15 @@ +#!/sbin/openrc-run +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +name="OpenNTPD" +command="/usr/sbin/ntpd" +pidfile="/run/ntpd.pid" +command_args="-p ${pidfile} ${NTPD_OPTS}" + +depend() { + need net + after ntp-client + use dns logger +} diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>henson@acm.org</email> + <name>Paul B. Henson</name> + </maintainer> + <maintainer type="person"> + <email>ottxor@gentoo.org</email> + <name>Christoph Junghans (proxy)</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <longdescription lang="en"> + OpenNTPD is a FREE, easy to use implementation of the Network Time + Protocol. It provides the ability to sync the local clock to remote + NTP servers and can act as NTP server itself, redistributing the + local clock. + </longdescription> + <use> + <flag name="libressl">Enable HTTPS TLS time constraint support using + <pkg>dev-libs/libressl</pkg> + </flag> + </use> +</pkgmetadata> diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild b/net-misc/openntpd/openntpd-6.0_p1.ebuild @@ -0,0 +1,86 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils user + +MY_P="${P/_p/p}" +DESCRIPTION="Lightweight NTP server ported from OpenBSD" +HOMEPAGE="http://www.openntpd.org/" +SRC_URI="mirror://openbsd/OpenNTPD/${MY_P}.tar.gz" + +LICENSE="BSD GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" +IUSE="libressl selinux" + +DEPEND="!<=net-misc/ntp-4.2.0-r2 + !net-misc/ntp[-openntpd] + libressl? ( >=dev-libs/libressl-2.3.2 )" +RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-ntp )" + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + export NTP_HOME="${NTP_HOME:=/var/lib/openntpd/chroot}" + enewgroup ntp + enewuser ntp -1 -1 "${NTP_HOME}" ntp + + # make sure user has correct HOME as flipping between the standard ntp pkg + # and this one was possible in the past + if [[ $(egethome ntp) != ${NTP_HOME} ]]; then + ewarn "From this version on, the homedir of the ntp user cannot be changed" + ewarn "dynamically after the installation. For homedir different from" + ewarn "/var/lib/openntpd/chroot set NTP_HOME in your make.conf and re-emerge." + esethome ntp "${NTP_HOME}" + fi +} + +src_prepare() { + # fix /run path + sed -i 's:/var/run/ntpd:/run/ntpd:g' src/ntpctl.8 src/ntpd.8 || die + sed -i 's:LOCALSTATEDIR "/run/ntpd:"/run/ntpd:' src/ntpd.h || die + # fix ntpd.drift path + sed -i 's:/var/db/ntpd.drift:/var/lib/openntpd/ntpd.drift:g' src/ntpd.8 || die + sed -i 's:"/db/ntpd.drift":"/openntpd/ntpd.drift":' src/ntpd.h || die + # fix default config to use gentoo pool + sed -i 's:servers pool.ntp.org:#servers pool.ntp.org:' ntpd.conf || die + printf "\n# Choose servers announced from Gentoo NTP Pool\nservers 0.gentoo.pool.ntp.org\nservers 1.gentoo.pool.ntp.org\nservers 2.gentoo.pool.ntp.org\nservers 3.gentoo.pool.ntp.org\n" >> ntpd.conf || die +} + +src_configure() { + econf --with-privsep-user=ntp --with-privsep-path=${NTP_HOME} $(use_enable libressl https-constraint) +} + +src_install() { + default + rm -r "${ED}"/var + + newinitd "${FILESDIR}/${PN}.init.d-20080406-r6" ntpd + newconfd "${FILESDIR}/${PN}.conf.d-20080406-r6" ntpd +} + +pkg_postinst() { + # Clean up chroot localtime copy from older versions + if [ -d "${EROOT%/}${NTP_HOME}"/etc ] ; then + if [ -f "${EROOT%/}${NTP_HOME}"/etc/localtime ] ; then + rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime + fi + + rmdir "${EROOT%/}${NTP_HOME}"/etc || + ewarn "Unable to remove legacy ${EROOT%/}${NTP_HOME}/etc directory" + fi + + # Fix permissions on home directory + chown 0:0 "${EROOT%/}${NTP_HOME}" || die + + [[ -f ${EROOT}var/log/ntpd.log ]] && \ + ewarn "Logfile '${EROOT}var/log/ntpd.log' might be orphaned, please remove it if not in use via syslog." + + if [[ -f ${EROOT}var/lib/ntpd.drift ]] ; then + einfo "Moving ntpd.drift file to new location." + mv "${EROOT}var/lib/ntpd.drift" "${EROOT}var/lib/openntpd/ntpd.drift" + fi +}