From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A8D7659CB2 for ; Sat, 16 Apr 2016 16:49:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5565C21C093; Sat, 16 Apr 2016 16:49:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D5BB421C093 for ; Sat, 16 Apr 2016 16:49:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5E2C5340C30 for ; Sat, 16 Apr 2016 16:49:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B3D4C7 for ; Sat, 16 Apr 2016 16:49:45 +0000 (UTC) From: "Christoph Junghans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Christoph Junghans" Message-ID: <1460825166.ef0cce7b812a05f37064956934addd94b19e1e81.ottxor@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openntpd/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/openntpd/Manifest net-misc/openntpd/metadata.xml net-misc/openntpd/openntpd-5.9_p1.ebuild X-VCS-Directories: net-misc/openntpd/ X-VCS-Committer: ottxor X-VCS-Committer-Name: Christoph Junghans X-VCS-Revision: ef0cce7b812a05f37064956934addd94b19e1e81 X-VCS-Branch: master Date: Sat, 16 Apr 2016 16:49:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4af806ea-c675-4825-a0f1-8cbec213cfb3 X-Archives-Hash: f02ffa11982d4ec48403ff57f3d0c583 commit: ef0cce7b812a05f37064956934addd94b19e1e81 Author: Paul B. Henson acm org> AuthorDate: Sat Apr 16 04:00:39 2016 +0000 Commit: Christoph Junghans gentoo org> CommitDate: Sat Apr 16 16:46:06 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef0cce7b net-misc/openntpd: Bump to 5.9_p1 net-misc/openntpd/Manifest | 1 + net-misc/openntpd/metadata.xml | 5 ++ net-misc/openntpd/openntpd-5.9_p1.ebuild | 88 ++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+) diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest index bea2d47..0df196a 100644 --- a/net-misc/openntpd/Manifest +++ b/net-misc/openntpd/Manifest @@ -1 +1,2 @@ DIST openntpd-5.7p4.tar.gz 427900 SHA256 a993d95976e375acc0ab1a677fd268f55024477835633c8ae404895046bccb23 SHA512 2a185139c915482086069fa19dd3070884a415137d1688059559d2da892928afbbe2fa0a8ade70d474809710265dcc05906abaf261892d7894e70272e2e516ef WHIRLPOOL 9464941e0f055ecd1db19a03bb5264a1dce02c6c7c2be078d1e3a19b5bd0a3c4e19ee6768617c90ebed01dea32f3a63751f9ef0436f56e22b7e6bd673a065546 +DIST openntpd-5.9p1.tar.gz 432844 SHA256 200c04056d4d6441653cac71d515611f3903aa7b15b8f5661a40dab3fb3697b3 SHA512 227a4d42f43f4abfaa97fb85cf121d3b9a6646259faeda785dbeb3e4a27285a7f95daf96e72135871a31f772895f3b66c10bd628c87e453507ce69102f5e1213 WHIRLPOOL af0d4085f9dc7449a3ab8dd61ced9dbac285d83c9716b8761f35e1e920519a910d34d277cd28ec3138a556f5eb1df88399f9e47524438f539cf41ef1739ddcc4 diff --git a/net-misc/openntpd/metadata.xml b/net-misc/openntpd/metadata.xml index 72d4033..ba5173c 100644 --- a/net-misc/openntpd/metadata.xml +++ b/net-misc/openntpd/metadata.xml @@ -19,4 +19,9 @@ NTP servers and can act as NTP server itself, redistributing the local clock. + + Enable HTTPS TLS time constraint support using + dev-libs/libressl + + diff --git a/net-misc/openntpd/openntpd-5.9_p1.ebuild b/net-misc/openntpd/openntpd-5.9_p1.ebuild new file mode 100644 index 0000000..80015bb --- /dev/null +++ b/net-misc/openntpd/openntpd-5.9_p1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils systemd 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 )" +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 + + systemd_newunit "${FILESDIR}/${PN}.service-20080406-r4" ntpd.service +} + +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 root:root "${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 +}