fixed uclibc compatibility (bug #554434)

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

3 files changed, 102 insertions, 9 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index 13193a77ac50..966774978165 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openntpd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.134 2015/05/26 14:38:12 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.135 2015/07/12 18:20:25 ottxor Exp $
+
+*openntpd-5.7_p4-r1 (12 Jul 2015)
+
+  12 Jul 2015; Christoph Junghans <ottxor@gentoo.org>
+  +openntpd-5.7_p4-r1.ebuild:
+  fixed uclibc compatibility (bug #554434)
 
 *openntpd-5.7_p4 (26 May 2015)
 
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index 6002e8819914..45f059057184 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -21,17 +21,18 @@ DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a5
 EBUILD openntpd-4.0_pre20080406.ebuild 3275 SHA256 37dc9977612c5e8b074ddea26c72e5dbe213cafd3aa594b00793640f78460559 SHA512 974370502106f7fc38d2939cd9d3e9d747493d3af854c452de1051f685e804afe89d5c797b06ab1328407ab585ceb9c66847665eca7a163c984c70a6976f0cdd WHIRLPOOL 6217c75861887d8063c135435d11fa198fe4a76215be14b2fba62b7454c044cab70bd73b714c9524676a7e2cd979f92fdbc5c4e27ccc3fffd7e9b48bda1457c5
 EBUILD openntpd-5.7_p2.ebuild 2987 SHA256 57a10dde48b7f2992fca5690ba39fe0b518353924a877e73f3d4f133caf37071 SHA512 9139976066d70e2a66a8bf26d07a516fcc16263f741eec27ee7fe390c2f2980153962875b529b85be873dfbb2fe6b81f2909be5d77496de00041f57aff137e42 WHIRLPOOL 435ff52ae51df95850f69f90af8c10af6e3244fecf9645e12c13de226d7eade04c7aafb4f021749e6ad7cd8e4651b7eeba2d85224920071005008acd5c1326d2
 EBUILD openntpd-5.7_p3.ebuild 3316 SHA256 22483dde636ba18c8449587aeab9330b1f622d0b6d0323b4a556a2da455ac18a SHA512 d6656fbd6813c76b23288d755287175c694704b46f6dd96c0bc039eda2f46b607478b8f7eb4f7fc044744a58f60f42b7e82af470fd8272f644c21bc5d16a8111 WHIRLPOOL c7a621e3a7976e063080d98a3ff90c0441011e00f519a869fd0b5fc1a2cf003bfab9600a0307f45ce5ec90ab8ffea671add47774857d845b76ef88ac317e62fe
+EBUILD openntpd-5.7_p4-r1.ebuild 2984 SHA256 1bf219a88cffc855802161b427996b28a7b26c26e429ef0af85b6421ff9e4972 SHA512 4e3876444b16090b45ac09dbc1028791969e1046ef1c3d1297d1094070916fc513ef4adfaa20c26b89bcd55f3377786e173a750c4faaa2c3679c95e7b4a03cd9 WHIRLPOOL 142343c830aa38a38dea4ede4e85bfe7c6c25ed07edf8c94602a933bfe98969a8496faa8c6259850ced9a3c4f85b00373947fce37f8d761e04dd382848b60191
 EBUILD openntpd-5.7_p4.ebuild 3399 SHA256 f6159902604b99d4bdfa75f98e9f4c0798cfa3e90ee6e426774ec4077f47bed0 SHA512 2ce37d04567d037ddda444623ede5d9adacb6cc6a7d1a3d41b70a9eca23d5c5f916dd75cdbc0c03780fc28ae359a31012fbd422f1d1e1104f80c7123909d1509 WHIRLPOOL 9f2db371b5245823ab7bdb1c642b9740485d6749c1eb5ad0f7cd9d11ce40868b5d7a2952b0162a1a590108922bd1079b8e16c64f1d96a03e7c880371eaa8aef6
-MISC ChangeLog 19363 SHA256 b462fe5c14a11b0fa6ea9d1946ff33e1558748ca144b99fff3c88fb1f2f0b1a7 SHA512 f648b29c1794659b01fdbce4d612a78f042fe7ad924df7674161f172164064945c3ac418e0ec2eff2b11d3512365cf8c6cf0d5ef8cefeb542bf38a01c0b308f5 WHIRLPOOL b4a0bd7e4c33813ed3e18d71fe484f737083dd079eba458a59684eb361a318a13985776d8f3f55f30fc3cb8c702617e44b5747689e288d4accbc5600601c764e
+MISC ChangeLog 19526 SHA256 c72f4edc330fc418304db4736206a3e3af3e0335259f33b81e338312ed4276f9 SHA512 19c7fc77ca15ef06ba1830fcc0af0d68cb26153a6b8d70763f5d8b6c04e6da249f2d5f9173562366d0b65389cff2fdb3b339e07d5cc9f28052c635c6ec7a4c3c WHIRLPOOL acdcc7fdd2d9c5d3067669ae18731eaccc28a12feac30fd1dd09c1bfd62165c961f3c47b3106e1fe18824e091e1579508fae466515273bab3b4ae945aa81708f
 MISC metadata.xml 638 SHA256 74c7acb125483b0fc73da88b4437c5fcf34add2c3f21c488e93cea46991f3dec SHA512 c6469524ff397faa67ff1c3cc60ff2a04e819dae9e40b7389fce2d6b68f87662fe9077ab8d50b287073fc3d31d88c03fa773175763e4e05e490c0b8ff6cb89e7 WHIRLPOOL 0b73a2568412a50ad535c827a54ff8eb524e6e1d6f581585088385214a4149841ff2d9d9382f3ce53fb667fee46478f05cf209cd2fef97ff75648e6206eeedca
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVZIVeAAoJEOeBhlrCAAWGaKAH/jmMqPqVwFmSAOPJX5Hx9TVN
-f3GOvNtXiYO5YaibkpncAwZx8p9g9Nv8U6LFcwyVRlFyguvOMLaZT5t3fPuFSrZ4
-XmbtItCPm/06WCzjfaUiTEh1e9XXrQvyofzNbLLMY7kDdwL4oImeqLNS7uo/oDtS
-BrRGxPaTiXNhaXGf0qGiN4MALeWFeI+PiIh/Vy329zatJ3uB53YDXgpTd1Akt1BJ
-JK4sJDiowWfpb1H6/Q0ggt8LvPSfFQWMAVZFfC7+sQGakeEk0fLIV8kRh3NPxLl2
-tUvXDYaaR9tk0SDPMqfIj7JhmnqKmm3GE9PQN0FoNiRF6KmUSAbjY3J0xoX16m8=
-=LWvJ
+iQEcBAEBCAAGBQJVoq/qAAoJEOeBhlrCAAWGDZgH/jUDtq16yIITmUH+mszCc2wN
+ZDQgIsq99bG2Q/J9ouVFEqB4tEoQlSmyHiusB37j9yndVwJGhdHtCQnYKhUBVNso
+hCnqOM54GyAmxUfU8nbYZE36KFydJRxySvf18qV4MfZJ3ek6H3OPTH+P2TNED9cJ
+myj73Twp7eWMCxd6300sAFWucwUtXalZQgLEvbXN0mebQEUu2C/Yf+gNAOMdGlJx
+cpW+SMnaNhmUYIgElQerGE8OKOAHTbshm854/8OxylCefx0rZ9oNHKTFznv/EQr4
+fmYszTc65b/PxWZgxT7G994z6xhL7WTsXU4N7Hg5gvTZotm2Nn3h0Bp9h73MH1U=
+=0Gj+
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/openntpd-5.7_p4-r1.ebuild b/net-misc/openntpd/openntpd-5.7_p4-r1.ebuild
new file mode 100644
index 000000000000..2b567e6d31d1
--- /dev/null
+++ b/net-misc/openntpd/openntpd-5.7_p4-r1.ebuild
@@ -0,0 +1,86 @@
+# 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-5.7_p4-r1.ebuild,v 1.1 2015/07/12 18:20:25 ottxor Exp $
+
+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="selinux"
+
+DEPEND="!<=net-misc/ntp-4.2.0-r2
+	!net-misc/ntp[-openntpd]"
+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() {
+	# add fail constraints when no libtls patch (accepted upstream)
+	epatch "${FILESDIR}/${P}-nolibtls.patch"
+	# 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
+}
+
+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
+
+	[[ -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
+}