Conflicts=systemd-timesyncd.service will be needed for systemd-216 (#521804)

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 126 insertions, 15 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index 5c74d436d27b..f0fba55c45aa 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.121 2014/08/02 18:09:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.122 2014/10/12 09:27:19 pacho Exp $
+
+*openntpd-20080406-r9 (12 Oct 2014)
+
+  12 Oct 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/openntpd.service-20080406-r4, +openntpd-20080406-r9.ebuild:
+  Conflicts=systemd-timesyncd.service will be needed for systemd-216 (#521804)
 
   02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> openntpd-20080406-r8.ebuild:
   Stable for ppc64, wrt bug #507846
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 225d9d6172a9..4f5fa3866025 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -7,26 +7,18 @@ AUX openntpd-20080406-signal.patch 1587 SHA256 06febce7828dcd351c62544685ff08415
 AUX openntpd.conf.d-20080406-r6 255 SHA256 91fb1497b3a6ef0bb3a3d5baefdff801d8ff1cba27aaf742303415550814a09b SHA512 016094e0ac80817c8c1eb8a52a527c8a673b3ee904f2c04bef0304b5dfe1c778a34a2d5321cc5540a1dfe2e14dc878c44a1e54fd0263aca3917600827c6d9059 WHIRLPOOL 9fa127624f50b01ba1b5872262d26b18362d3784a73021e608bd8a6cead2499cabf0fe5eafeaa315548e97285228a6e70689a3cadbdb7031ac00e23bf064e3b9
 AUX openntpd.init.d-20080406-r6 417 SHA256 fca7183a7676f0f471878925c8fbec20b7a0bff01551c0ad2b34d4d8a826c876 SHA512 e5ea7b26871e92a04713c93b0d60d435839f9321aeea7105330b9d9d4259d98581d6da6224274fae89cf7107329a28a9348c8c40a9372c5fc7bc7f5d47801a3b WHIRLPOOL 72626acd887bb997dae48fb717a94f046e2a3f4b01bad72cffc8da03bf388528149f37c6672362ed0661c9582851ebd77124749dcc9238bb013d6f2ccc2bf78f
 AUX openntpd.service-20080406-r3 147 SHA256 7134fb86571582ec1e4b5c05f5b00ff03c37c7c139c27f86482323d423f7eb87 SHA512 fe296581b497d76e7519d734a9209c468ea25705907e4ac9123eaff2dca72a05d5c308ce4973a29abe404aef7074ba30a75c564e46f29902a8f989ec56cde14f WHIRLPOOL 1a4275693a5c2cd0d4d2d25a6d025a9e5c2902758e40c1039ffe2c7f4eb0078c68ced9e676de3db2ec2311fc02bb7c9e2f76c51bee991f234ed36ce7ebc6e0c8
+AUX openntpd.service-20080406-r4 196 SHA256 1171f2aff396842fee94cd3f85a7929601fffb788840aaf9f9abb6f2b0d17016 SHA512 e76196c90696855ea41464df2aab7617d2447d4dbf82cd5d135c52cea2ae1ef131707ae7b4e7800fe91f8d42893a55848b95149d8f27aa03777205fe355e830e WHIRLPOOL 5f33f400d045352f5e7f5fad718920d71c6f70526988ef87e02cf73ee98c4fb70afd928a770657b1f8d41aff46664a43dc21f3fd7bbcc6c6b95f4ad1788a52cf
 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
 EBUILD openntpd-20080406-r8.ebuild 3151 SHA256 12bf4b71557d5f57ff9fa3c6d191fa9c75f109b9028d7708aa29479999d21e05 SHA512 6f1ee5ef99a533fa9e8bc452e4a6d12d494232677af59924009ee982e202cd4af96735e27efd0a19df42e3057225eebbe56528ed0455ed9e0c16ae25912f23ff WHIRLPOOL 4eac570a9ff3a77006189857db89f02accb6b7e5d56c9873b97531950b489b5569df696e972611e79ac4d5209ba66aafc53af12f004f154c5f54c53180c31a3e
-MISC ChangeLog 16856 SHA256 de8b0e7b012cd88d09c8eb4f401d11c35a3055052916fce0739e2169a0ff33a9 SHA512 b8be8f00a18ae10d95862bfd037a76edb6c5f8176b678ef5c94d79e2d72937dc01d08bd2f4e893e68e9998f2413d334c5754b46ebb9235c60843953c107a0e79 WHIRLPOOL d6551d0761f378c7af24d95d5a09dcc0ac2e8fa15a4f680065d39a207277a818caaba6cbd3f0ee3527917b3b79faa4fb3c8bb95e3c91dfdb3fbab6ad4a6c5ebb
+EBUILD openntpd-20080406-r9.ebuild 3161 SHA256 7682147a5fdcfe37f04ae0e0786d5145e1060edc1dbd5fe51fcef75f70a2b67d SHA512 de36ea049c666afdef6c2a9f3abd766ead48c9258f11a455bf84f69528e744ce0fa90de30dabb5fd77f094ef32589066d12cdab4d50d7a03652ccb474155a695 WHIRLPOOL 499638c70bbc392e4bf8030b4bd22c2e97e2fd582ab84b3f4e5b0538626e9482f87a9c28bd96413389b8bf0c69cc43cc4befb08938c8314ae057220dd0769cd0
+MISC ChangeLog 17090 SHA256 72c1693fa4c29c8bc98a97278638070217bb39c8fc96c5abf83c173a8ce1d75d SHA512 2f13cc8227a4ca48b6027199e74039c55631d155c0167d69103f6f1b453681f65756d3a704400850b111d902fdb6618df5ba8bd2ebcf5a0738ceb3e973ec55b2 WHIRLPOOL a62a7ef9d5d79248ce57feb0b9e937d435616e73b60f10712afcd6c309f98c01c51388418690add1d80b3000616b83c6f9324dd7287ee14f150c012dc1ce7c20
 MISC metadata.xml 638 SHA256 74c7acb125483b0fc73da88b4437c5fcf34add2c3f21c488e93cea46991f3dec SHA512 c6469524ff397faa67ff1c3cc60ff2a04e819dae9e40b7389fce2d6b68f87662fe9077ab8d50b287073fc3d31d88c03fa773175763e4e05e490c0b8ff6cb89e7 WHIRLPOOL 0b73a2568412a50ad535c827a54ff8eb524e6e1d6f581585088385214a4149841ff2d9d9382f3ce53fb667fee46478f05cf209cd2fef97ff75648e6206eeedca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJT3SlWAAoJELp701BxlEWfkFIQAJ5szkaPqhERshdkD3oabveH
-JFDoGeKlhsz40zs1Pw+AnFeGTQUTwheturx65XR7NAxogI1jsKpexwlo+yHzh6mb
-KUvQW/iNl4MZHoB/Of/JcbR+9/zHQfCY1FNZcx66jctvtQoy9U/KNDqbuWNdblnB
-rN4MkZhEU+eMDSpA0jUcShgXOclSCkReWRkI3unXeo7qUX9gser6z21xdUMxthru
-LDgh1TxrX0RW8R5u7y8e6D5lJQqsF5ebKdpazijKrYYu8iRMh+jh8aEkCAxLPCFo
-Y+SZkoZBWBTx1tETWSYM3Qnrk8Gepyzbd9uRTNq3pu8mhDvuNySmDevph0+lbEHU
-JaDCHZNFlpxe+5tcetawlkPR7iFmWJtHa5H+NRVm5mVVIEe95xC1JYvz5KrkPOCf
-6jz0alrdFnxnWwTZuMTFRb0X2k7lkdKXVtDxWmBQhGP1BP6JFEP4jv4PVagyh8d/
-jpOFpDVS8YHyqjwOLqQTcEkbDDIDvVwTDwuVqYFsEr7rPIxq0zlkRBhVeHq2bg/Y
-OXBadMOR2mOyuqUQEpbEvCHWwNgVmS3doSsO5v4HdrT660G6CdnwVvfFgM0/5Llq
-ca36VeA95qz/j78vnn8q09yjy2L+FHLoW/v4hDy9honafcQerj10e77vOZw/8a1k
-lZk2PHkdFCNHG/nYpiXM
-=Qidy
+iEYEAREIAAYFAlQ6SXgACgkQCaWpQKGI+9Tw7QCfRx/nrIjgnkjBUZqhjcni5gpA
+4JcAniohCB94z3MK8TUK3PjuAHDUsJZ2
+=Rj1E
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/files/openntpd.service-20080406-r4 b/net-misc/openntpd/files/openntpd.service-20080406-r4
new file mode 100644
index 000000000000..2e1bbff8ff7f
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd.service-20080406-r4
@@ -0,0 +1,11 @@
+[Unit]
+Description=OpenNTP Daemon
+After=network.target
+Conflicts=systemd-timesyncd.service             
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/ntpd -s -d
+
+[Install]
+WantedBy=multi-user.target
diff --git a/net-misc/openntpd/openntpd-20080406-r9.ebuild b/net-misc/openntpd/openntpd-20080406-r9.ebuild
new file mode 100644
index 000000000000..bfef4ac30037
--- /dev/null
+++ b/net-misc/openntpd/openntpd-20080406-r9.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-r9.ebuild,v 1.1 2014/10/12 09:27:19 pacho 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}-r4" 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
+}