ottxor 14/04/16 19:49:02 Modified: ChangeLog Added: openntpd-20080406-r8.ebuild Log: fixed setup of localtime in chroot (bug #506970) (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key C2000586)
Revision Changes Path 1.112 net-misc/openntpd/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/ChangeLog?rev=1.112&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/ChangeLog?rev=1.112&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/ChangeLog?r1=1.111&r2=1.112 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- ChangeLog 6 Apr 2014 14:50:23 -0000 1.111 +++ ChangeLog 16 Apr 2014 19:49:02 -0000 1.112 @@ -1,6 +1,12 @@ # ChangeLog for net-misc/openntpd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.111 2014/04/06 14:50:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.112 2014/04/16 19:49:02 ottxor Exp $ + +*openntpd-20080406-r8 (16 Apr 2014) + + 16 Apr 2014; Christoph Junghans <ott...@gentoo.org> + +openntpd-20080406-r8.ebuild: + fixed setup of localtime in chroot (bug #506970) 06 Apr 2014; Mike Frysinger <vap...@gentoo.org> openntpd-20080406-r7.ebuild: Mark arm64/s390/sh stable. 1.1 net-misc/openntpd/openntpd-20080406-r8.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/openntpd-20080406-r8.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/openntpd/openntpd-20080406-r8.ebuild?rev=1.1&content-type=text/plain Index: openntpd-20080406-r8.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r8.ebuild,v 1.1 2014/04/16 19:49:02 ottxor Exp $ EAPI=5 inherit autotools eutils toolchain-funcs systemd user MY_P="${P/-/_}p" DEB_VER="6" DESCRIPTION="Lightweight NTP server ported from OpenBSD" HOMEPAGE="http://www.openntpd.org/"; SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.orig.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}-${DEB_VER}.debian.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="ssl selinux" RDEPEND="ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]" DEPEND="${RDEPEND} virtual/yacc" 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 flipng 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() { sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h || die epatch "${WORKDIR}"/debian/patches/*.patch epatch "${FILESDIR}/${P}-pidfile.patch" epatch "${FILESDIR}/${P}-signal.patch" epatch "${FILESDIR}/${P}-dns-timeout.patch" sed -i 's:debian:gentoo:g' ntpd.conf || die eautoreconf # deb patchset touches .ac files and such } src_configure() { econf \ --disable-strip \ $(use_with !ssl builtin-arc4random) \ AR="$(type -p $(tc-getAR))" } src_install() { default rmdir "${ED}"/{var/empty,var} newinitd "${FILESDIR}/${PN}.init.d-${PV}-r6" ntpd newconfd "${FILESDIR}/${PN}.conf.d-${PV}-r6" ntpd systemd_newunit "${FILESDIR}/${PN}.service-${PV}-r3" ntpd.service } pkg_config() { einfo "Setting up chroot for ntp in ${NTP_HOME}" # remove localtime file from previous installations rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime mkdir -p "${EROOT%/}${NTP_HOME}"/etc if ! ln "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime ; then cp "${EROOT%/}"/etc/localtime "${EROOT%/}${NTP_HOME}"/etc/localtime || die einfo "We could not create a hardlink from /etc/localtime to ${NTP_HOME}/etc/localtime," einfo "so please run 'emerge --config =${CATEGORY}/${PF}' whenever you changed" einfo "your timezone." fi chown -R root:root "${EROOT%/}${NTP_HOME}" || die } pkg_postinst() { pkg_config [[ -f ${EROOT}var/log/ntpd.log ]] && \ ewarn "There is an orphaned logfile '${EROOT}var/log/ntpd.log', please remove it!" # bug #226491, remove <=openntpd-20080406-r7 trash rm -f "${EROOT%/}${NTP_HOME}"etc/localtime rmdir "${EROOT%/}${NTP_HOME}"etc } pkg_postrm() { # remove localtime file from previous installations rm -f "${EROOT%/}${NTP_HOME}"/etc/localtime }
