From 3b3cb584e265efd23d1a59c6ef85c3a3eb5407f4 Mon Sep 17 00:00:00 2001 From: "Paul B. Henson" Date: Mon, 30 May 2016 20:31:35 -0700 Subject: net-misc/openntpd: Bump to 6.0_p1, fix bug #584508 --- net-misc/openntpd/Manifest | 2 +- net-misc/openntpd/openntpd-5.9_p1-r1.ebuild | 88 ----------------------------- net-misc/openntpd/openntpd-6.0_p1.ebuild | 88 +++++++++++++++++++++++++++++ 3 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 net-misc/openntpd/openntpd-5.9_p1-r1.ebuild create mode 100644 net-misc/openntpd/openntpd-6.0_p1.ebuild diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest index 0df196ae46f5..978070087327 100644 --- a/net-misc/openntpd/Manifest +++ b/net-misc/openntpd/Manifest @@ -1,2 +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 +DIST openntpd-6.0p1.tar.gz 432696 SHA256 b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8 SHA512 a71c516dbe7596cbcb3a385112a59a82185b7e3d93a52eda695cea5a0a599ba7fbf58daa81da55d608255cb6950398123fa7d71663604a4c3bcbee949711296d WHIRLPOOL 75b82a07920eb7c3825a37725a81615871b728e9543ec43cb20c9e61a64f523293aa7e1fbbb92ebb8d6417d13f377213ffbcba1c77c7b3c68b64e26e30222a0b diff --git a/net-misc/openntpd/openntpd-5.9_p1-r1.ebuild b/net-misc/openntpd/openntpd-5.9_p1-r1.ebuild deleted file mode 100644 index 1c782618831a..000000000000 --- a/net-misc/openntpd/openntpd-5.9_p1-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# 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-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 - - 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 -} diff --git a/net-misc/openntpd/openntpd-6.0_p1.ebuild b/net-misc/openntpd/openntpd-6.0_p1.ebuild new file mode 100644 index 000000000000..1c782618831a --- /dev/null +++ b/net-misc/openntpd/openntpd-6.0_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-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 + + 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 +} -- cgit v1.2.3-65-gdbad