copy 20080406-r9 version to 4.0_pre20080406 to prepare version bump to 5.7_p1 (bug #536032)

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

3 files changed, 124 insertions, 17 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index 1a3cb743c12e..d064de5a827d 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.126 2014/11/02 09:10:58 swift Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.127 2015/01/12 16:27:39 ottxor Exp $
+
+*openntpd-4.0_pre20080406 (12 Jan 2015)
+
+  12 Jan 2015; Christoph Junghans <ottxor@gentoo.org>
+  +openntpd-4.0_pre20080406.ebuild:
+  copy 20080406-r9 version to 4.0_pre20080406 to prepare version bump to 5.7_p1
+  (bug #536032)
 
   02 Nov 2014; Sven Vermeulen <swift@gentoo.org> openntpd-20080406-r9.ebuild:
   Remove sec-policy/selinux-* dependency from DEPEND but keep in RDEPEND (bug
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 3fac0a9d4213..a1581ec5bef6 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -10,22 +10,17 @@ AUX openntpd.service-20080406-r4 196 SHA256 1171f2aff396842fee94cd3f85a7929601ff
 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-r9.ebuild 3174 SHA256 7570e990dafeec956b6c47862d318faadfc1755a9e87cbce8b17a036a009d110 SHA512 2055312a73e1eed42285f54d6457052c8509047e40f41d1ba06f580b4908861e68790d50635acab6480cd72a6503243caf1d2094abcc3e232bfe2d2a0f86726e WHIRLPOOL bd9eb18efa4356c98486c2d03ddbf502d56b69265ada6031a4903a60aca711bc4e2f8f178e9275f30be3a365ec217d6ade56c761fffc420b1083eeee623ce417
-MISC ChangeLog 17650 SHA256 ab64b4a7370495c0b74098e8d21f593dfd38973c5620315ab57bd55c2b031dc1 SHA512 5b0577e9c0243310131a5cdca7ef502ba75efd09ec6b04b05a3d12e619ca24dd673cb9f246b4ec5e6fc404ede91b185753fd2fc00541da713af69625fb1415e3 WHIRLPOOL 313009ba0b15df936b31d0bb9f127d54eb86428444dff4e5e34ce722da94854664b51796fd69bb6a7187d9d5c2b6cf26f57e72f3f1db332e39d858526f27c57b
+EBUILD openntpd-4.0_pre20080406.ebuild 3251 SHA256 6db12344d992b47694186da4dcc7d17e644088449723ca38d9ddb7850741c1ce SHA512 a5c7c51ab7534fafdef16d9fcccb7aa8691a798a5726c2de707a5736f6ac70763b4ef26e14bbb3fba0886f6ce66c0f5c99852f24fcc144c04047365925811a3c WHIRLPOOL 606330a126ca4cda2e3c6069097f8dba216ae34af858277b80a6168bbb200c18ccb632ddec1bd9f483b824ef3b9d0c75d7aeeb93c3545fd7022f85c86b3675d9
+MISC ChangeLog 17879 SHA256 b69f8de81e112836ba13d9eefdcbc5a292b3f886f852326886c145ba0530cb30 SHA512 c4662ab44b5c1cd5403622554c91ebad1b9b136e6c4a5663ccad7face856cc29dd9d4461ef87ced3d24ac6f3cd29096e855aac1bc9751ceb3aecc9e825c9a22b WHIRLPOOL 1d7deaf678a403bcf9f0d6799086b793279902028776a4d9a38b84dea67ee8d0d2fef73930e745a76ebbb3fd8f4bd0164c48f589c8ff8945bae98ff4b1e6741e
 MISC metadata.xml 638 SHA256 74c7acb125483b0fc73da88b4437c5fcf34add2c3f21c488e93cea46991f3dec SHA512 c6469524ff397faa67ff1c3cc60ff2a04e819dae9e40b7389fce2d6b68f87662fe9077ab8d50b287073fc3d31d88c03fa773175763e4e05e490c0b8ff6cb89e7 WHIRLPOOL 0b73a2568412a50ad535c827a54ff8eb524e6e1d6f581585088385214a4149841ff2d9d9382f3ce53fb667fee46478f05cf209cd2fef97ff75648e6206eeedca
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUVfUjAAoJEC7dUkA7aK9HpYEQAJUlIoPv81+7R4TzYfsHGbpl
-QioRm/GckEW9HPXZXxFw8uwvvj4aRON5BpCOpHKQvlq4uwt6NqZsOzRqNtMK6MJr
-JhyhpYG0fhUEcAEgdYwWT8MNHb6iO2L8HqalqEM5A3g7h2SCPbrpa+WfPLsl8AfE
-aUDBkeP+EAL0gfglUdx8oN+LSbMadw5mkWTFcSnoah5JMzZcMIljBtWiD98koQF7
-9mYpbA8x8NddNJNjppLkdWiV4zQSicqE+qrP9RLaYMolY4HUs5qnO694epjgzhLt
-ndXNF4kX1LOqCXAErbVBU/goc3TvCmArYltGrqN0zFOwIe5lhVBmqA73JntusBMK
-b70IukkDwRIT7UgY6LtvRmFmAsmeEMkUJlscTiQBpqsa2taHR3Kuh1f5lEI7aQ+K
-0bcn4LxregYbx3v6RQrYcJJkcvyQgdlLfJv7wpcbUpblo//bNBnz93vRbkkaHvJm
-uShil3rtFaxwtU/b5r5EbMYIoVPmkToT2Zd6+TERwqMqWtAtqoKw8pV126GbC8HB
-+2iXKayZ3kh/NahsNBIFkBVJWFbjpfLZhG+K7VliExhICV3S9cqJsRP4PmAjkz9i
-bzxPy9WRs++CpFNwHGPIut0NNdBr1gkTvzl5vPcjLBbwmeAeAaobEd9pXdHx6ThH
-ZnMo2LljyIgAj0/srlhb
-=azef
+iQEcBAEBCAAGBQJUs/YAAAoJEOeBhlrCAAWG+LkH/jdX1jorxBa8scrfPHnqW+ES
+G7wQ0ihPaGd4YcieiQCDwSg9lFBVJL1+8liQLixdf84F30cznGBBu6K2S7r86O/C
+Vgy6CEn+12ETcHiD3fqY8VEFQjAg6ILjCDsIA7elUmzZqwPCGtOiGNaf78IzApIt
+qz3MQDPNFYMEmXAHw/fP4pIobFBBlUAea/xgTNmIN7GI6QLt8AHcJNgGRYDSsRfn
+8wxCT4KbwD+PxbDjKEqhawAkId6PwLz/woCXVTlVREG2Ll5wnWfVbvdLs35+VXjO
+UjH8BZNc5RAWMQIPTVZhyWgDP23NZb0j+7GLccMIAjYFXzq8rTLPfLrXDxCgY6c=
+=hM/1
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild b/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild
new file mode 100644
index 000000000000..400237534662
--- /dev/null
+++ b/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-4.0_pre20080406.ebuild,v 1.1 2015/01/12 16:27:39 ottxor Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs systemd user
+
+MY_PV=${PV##*pre}
+MY_P="${PN}_${MY_PV}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"
+
+CDEPEND="ssl? ( dev-libs/openssl )
+	!<=net-misc/ntp-4.2.0-r2
+	!net-misc/ntp[-openntpd]"
+DEPEND="${CDEPEND}
+	virtual/yacc"
+RDEPEND="${CDEPEND}
+	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 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}/${PN}-${MY_PV}-pidfile.patch"
+	epatch "${FILESDIR}/${PN}-${MY_PV}-signal.patch"
+	epatch "${FILESDIR}/${PN}-${MY_PV}-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-${MY_PV}-r6" ntpd
+	newconfd "${FILESDIR}/${PN}.conf.d-${MY_PV}-r6" ntpd
+
+	systemd_newunit "${FILESDIR}/${PN}.service-${MY_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
+}