fixed setup of localtime in chroot (bug #506970)

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2000586

3 files changed, 118 insertions, 15 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index 4fd11e42ce2c..2e95d83972bf 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -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 <ottxor@gentoo.org>
+  +openntpd-20080406-r8.ebuild:
+  fixed setup of localtime in chroot (bug #506970)
 
   06 Apr 2014; Mike Frysinger <vapier@gentoo.org> openntpd-20080406-r7.ebuild:
   Mark arm64/s390/sh stable.
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index fcba60842dc9..5e56cf79146e 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -10,22 +10,17 @@ AUX openntpd.service-20080406-r3 147 SHA256 7134fb86571582ec1e4b5c05f5b00ff03c37
 DIST openntpd_20080406p-6.debian.tar.gz 11849 SHA256 6718ffb52b7f34c7c3e9532d245f31ee5c749bac2cc2c2d4594d8161925a3122 SHA512 f857fbc85e29035470af0855c8fc416c188f55586ba2e1d719159ecfa4a0274ba4dd526409dfd915056a1c15f5e44cb8c40196a7e03c3026c5d73851ebb5abc8 WHIRLPOOL 35bc0ab16d161c7878d438641eede8425238fbce4d32f6b56e347252e6ad561dc1a5795e3bc3cf133fa09dccb69520cb9837c7134bc0fe6cec9ea14be314ee51
 DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a50571803af7ffc32a00212242c6a866c3b2 SHA512 9561788002b232786d1589f74bbe2f07a029e3407da4471d2ac9d5e20d8839dbb6e6e53493c78829058611ca23bf00560bbe7bcfe76204d206747752fd47f696 WHIRLPOOL 545125d0ee5ced7827df3d804ac63938d2614e9fb4a2bf3c6bbc17f6040175aa03c057d7a4d3da71ae944f4a556e2b66266d1c6d0463c1cad5d86de3ae896712
 EBUILD openntpd-20080406-r7.ebuild 2965 SHA256 239436d4d3f9b22bb612dc576b01de7b2c0d1afb0df06da654a54b29c55edb30 SHA512 ae6b0207737a752ec6401cb9c0109af57723b6022ad4b67cf63a87c48dbf97b3a7979ecdf9a09522e5aaf3cc23c9c6889f9c9031bc810b58019368f0fe7494cd WHIRLPOOL fd54914946d8959f8b0cdecd2e1041230ecc2c27506177e456955adc10f4e23918eb147531db6d035207d60fdc69ffb9ccd0523d88b53c1e1bf2115e18aa4fe0
-MISC ChangeLog 15682 SHA256 34f6c0d71c2896102ba9d2c2166c4fd30ebf201aee2be886553a65d863025c01 SHA512 280da737c74fce491f4d023f2b06be68480423f470a101049b717f09d044571d92dd55a2c5658781e7d08806c2bdfd5f00ecad2c1c7728a48ab353fb2973c440 WHIRLPOOL 7f0af033570503c314151618e3e6b16c7c84734d54eecdfe3d877b5695d2a4033653c997e9a8673353fb9459e409d9b00bacf45a431f5b371e27b5593ccdea23
+EBUILD openntpd-20080406-r8.ebuild 3162 SHA256 358b173e68dc7e6ab27d7a4d6fcb29fca882c7043b285a1be5c70854644460fe SHA512 b51160487213c4766533855d6d44f811fdb7e33d0f6247545dca3aa684703b1bb60243e267f3fd4cf0aa4f83a253ac05e20d4d31a137eecec0e411da435fdd97 WHIRLPOOL b9816a31ffd5e74a7d62dd33a4ab073f795f7a6561f226015ce4eb44fbffecae77fb779496a4f5919eb3da028ee38a81dca4e9f00c0ec4b45354d91bea1a9267
+MISC ChangeLog 15857 SHA256 8da8ba6a500868a39b36dd1397c8c485afbb6a2ff10fe6631f30191635bfbce6 SHA512 c10204f15812dc3eeb36a6fef0dfe837dab615f0289b3177002e8da35412da8866bdb5055bfabf13ff079ccd6558b3133eaaa298a2ba95e5f4c4bf6b5833f5ea WHIRLPOOL 5206c618416d3d0322cb46d68ce7f4d65bc41331923e56d950899f07e1ed076b8274f946af5732e4bd722295dfff90757a51fbfd264d24dba299340e24da8240
 MISC metadata.xml 638 SHA256 74c7acb125483b0fc73da88b4437c5fcf34add2c3f21c488e93cea46991f3dec SHA512 c6469524ff397faa67ff1c3cc60ff2a04e819dae9e40b7389fce2d6b68f87662fe9077ab8d50b287073fc3d31d88c03fa773175763e4e05e490c0b8ff6cb89e7 WHIRLPOOL 0b73a2568412a50ad535c827a54ff8eb524e6e1d6f581585088385214a4149841ff2d9d9382f3ce53fb667fee46478f05cf209cd2fef97ff75648e6206eeedca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTQWmyAAoJEPGu1DbS6WIAryAP/A8VGIb6XTbAcRdmBHwcftFV
-3Sep/elxX+Jer8VVdgE3GQJZLRYOb7tS2wstw5cqCmw+NSQBuE7YBVs/coqy6FQ3
-oGoPoXUfPR+0PA6SvTtEP6zuLYTETEWd/hXFn01YS08prK9R53IIBVhEH42LbN7a
-mbr+9Afi24apkHK6WCkcj1qJ0Rto4jrjxsMwzVuZCnGcdCw3rQc5gR6gziSfOJp3
-EYR/xWRr1cWmqPhMxNVy6RWPfXuFWUTT1yJw0q0oNEXSIn0ZXI6erYaWHEG3+eaM
-Dgm9vnnQXZHFyefAdbB+7dJoSyXT1zEp9eLfvm/tSBSvKLv5ek0JdvTjdf8+8IKZ
-VvrKr6aO0iD1dF39JHYjTHBtRLHTxXOh0GKkEfadIScZJXejQUJPKAb2nbpEAEhz
-e/tNJznkRjrFUETzUtwquFR+1nV2khclV6/SJ+aRJPipbx/pAKQ9Lydgq/OZxKz9
-P5sPdgDsrKJGIqJC13HDyaN0EhCQZPfdecH9/EXP2SwGhSCZaDmwRLUFkdZ7QsSo
-3YPsiZ43NFUFb4JgaA0SmKb3bJIegLzRrdC48BWJu9/4o9mCh0M8Upz2aJVVB4kZ
-byPtS6c7zocJxiJNsi3fPSZTBrxHEwdgm01KFOPu/0RXwCXY+F6tRhK6cilfrdjO
-VHRwZzMy8P9xjEMBCTLr
-=SgIu
+iQEcBAEBCAAGBQJTTt61AAoJEOeBhlrCAAWG3tEH/3GsooBHH+P0BIgqPeErQ/5O
+yTbcu0meGvLM2qbK5K0o9tMTLqYF+YrPdCud7ErWyzFS/hADWntqI7Uv5iEiXa4R
+1DURKbBeF4W2BIDyY7YrtEd4seZDH9rFSX4SKE1zJllu+g3DKkyuE3fWBbDv+6ol
+9w1/PvHB1CyCFtnAqShAH8j2Z+K0VMj66VrY4PrUCF2/rviNTrDQst5hCreaOcX2
+U3igeRkBhKWYihYc5DF8//d2qzKaM5K3I1OLEaTS7e3AFxM6/8P4jcVQLCQfhgYh
+VEyJ5oKdfkpjJ9BNVsR6WeCoyhknzVTlC5CskVW9unkW81/EAJHTIF+g3LQqkN4=
+=X+A4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/openntpd-20080406-r8.ebuild b/net-misc/openntpd/openntpd-20080406-r8.ebuild
new file mode 100644
index 000000000000..2c970f60566a
--- /dev/null
+++ b/net-misc/openntpd/openntpd-20080406-r8.ebuild
@@ -0,0 +1,102 @@
+# 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
+}