fix slow boot sequence (bug #464174)

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

4 files changed, 119 insertions, 17 deletions

diff --git a/net-misc/openntpd/ChangeLog b/net-misc/openntpd/ChangeLog
index e048279198b6..c1214a0f9a94 100644
--- a/net-misc/openntpd/ChangeLog
+++ b/net-misc/openntpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/openntpd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.77 2013/03/11 07:39:14 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/ChangeLog,v 1.78 2013/06/22 14:46:38 ottxor Exp $
+
+*openntpd-20080406-r1 (22 Jun 2013)
+
+  22 Jun 2013; Christoph Junghans <ottxor@gentoo.org>
+  +files/openntpd.init.d-20080406-r1, +openntpd-20080406-r1.ebuild:
+  fix slow boot sequence (bug #464174)
 
   11 Mar 2013; Agostino Sarubbo <ago@gentoo.org> openntpd-20080406.ebuild:
   Stable for sh, wrt bug #457454
diff --git a/net-misc/openntpd/Manifest b/net-misc/openntpd/Manifest
index aa12a17fcf20..a9621528b306 100644
--- a/net-misc/openntpd/Manifest
+++ b/net-misc/openntpd/Manifest
@@ -1,34 +1,30 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX openntpd.conf.d-3.9_p1-r2 195 SHA256 1980b5dadcd9478e653ef05c099ef45caacfdf12a73a3745b39322f75773a738 SHA512 bd4579b005507f8ff22e901a678b1ba2f82a8064dd19118fae99e31f2e08fa21523ed5e9dce1fbbad9bbb0ee6dfe92f0b254827034333f813e6018bceb9d490f WHIRLPOOL 7af98dab593e701d20f1e3d23f976323d6b083b6c80e73e1c548de5c07ee4c635db3ecf63c3f07a95b18cb1d98bd3878c36b66146caba4bfb09f0637fe5e6094
 AUX openntpd.conf.d-3.9_p1-r4 195 SHA256 1980b5dadcd9478e653ef05c099ef45caacfdf12a73a3745b39322f75773a738 SHA512 bd4579b005507f8ff22e901a678b1ba2f82a8064dd19118fae99e31f2e08fa21523ed5e9dce1fbbad9bbb0ee6dfe92f0b254827034333f813e6018bceb9d490f WHIRLPOOL 7af98dab593e701d20f1e3d23f976323d6b083b6c80e73e1c548de5c07ee4c635db3ecf63c3f07a95b18cb1d98bd3878c36b66146caba4bfb09f0637fe5e6094
+AUX openntpd.init.d-20080406-r1 990 SHA256 5f33429879d0e5fe0d105c1012a801d822bfdb0b3a0eaa0f21d89c9f80cf030b SHA512 77c8eb497be7cadce3d9e725f7a6f7a36cb1931b536a40282ddd25e0ec935a5ede5b8471a3ad6b1a3b2b3db926f3aea82eff6f634605d88e42019823991464fe WHIRLPOOL c1aaf7cbc2bf895807db32dafec3b90c7afc815b817d5174d8191d81aa95e6bf152c487efc5ec3e4dc67b7bb541970b3b0d0a4deb3ebe5ee80e11dcf3f7fad1d
 AUX openntpd.init.d-3.9_p1-r4 861 SHA256 9ac5287d9c9397e69d62eac8ffc3fb1945ba09f03dce247cd1a2dbca495bf2c8 SHA512 deb4cc60aceda644848696333a776ecc814528ced150da1a062cced615f93cd89888dd825e293b38ea9586bc082782ca236e6e8762b446c317a16a224564fe8c WHIRLPOOL 9842439b95ed36ab61730239811b139654bae01d2e186f93a5029c023a0f1931873658d9331bce7620c572f6f64d64b81cbb5d4a28effa4a15d8ae28d2cfa0aa
 AUX openntpd.rc-3.9_p1-r2 1113 SHA256 7260bb5d1aa25beaf8e871e6a6fb8f02a3e297ab855ccdd3c4afad6ceaf9b08f SHA512 a0db9c625ae30da1c5cda2a1f2ce73dd3982206fa7ae6b1c3ce69924293ee8e0b0741c1919f34a9bbf101f85e4961b22a1fc54fac5b2b28e6a079e51960139e6 WHIRLPOOL 2858407f2c5c1e33bcce5eb7a8af65c6a73bacd6e2cd694fe35b7aa61b22a40c6c308b335a75db58fa7cf59d53838571ec87bdc525f62b77ad4a5f95a06f61e5
 DIST openntpd-3.9p1.tar.gz 152700 SHA256 83dd7c1e8ec8b4567afe49af539271b5a73562fb7a3ca51df73eccba89ec8c49 SHA512 e19e7242b67c8d12fbf0a78cd29dae4248afff5b5308069b190b663a9f9426666aad20f8c9ec70fabf8d2e5c2a2e61052191fe4ccc132c62a7decd8c498c2a13 WHIRLPOOL ba5793b8a5548d2b923d8cf2c7a6eba72689a6ea7e7f90b6c014e8244f8cb53f35f22945616782754e5bf0d1d24bd40132f90debbbc030aaf6576a2a0e27b0c2
 DIST openntpd_20080406p-4.debian.tar.gz 11480 SHA256 cec5f49a253288384499017bbd5894ec08480de2e4b3b9ce7cad21c056ad2c07 SHA512 bb09991e64d25e098f3d5efc97d422f767c6b4d11e647a00acc2464ad1251613b2da446d5cc0496719bbd5bd2440476326360ffa7dbafdf9e11acfca5165730b WHIRLPOOL bbd6b880197f7a61c423ac996aefdb64ae78a1ed56c10c2065df7c2b3a1a6befe86f986487408802679d6636c847c39d93c418a162510f59725b463d14f34972
 DIST openntpd_20080406p.orig.tar.gz 175923 SHA256 52f473dd8ea8864023ebcdce16a9a50571803af7ffc32a00212242c6a866c3b2 SHA512 9561788002b232786d1589f74bbe2f07a029e3407da4471d2ac9d5e20d8839dbb6e6e53493c78829058611ca23bf00560bbe7bcfe76204d206747752fd47f696 WHIRLPOOL 545125d0ee5ced7827df3d804ac63938d2614e9fb4a2bf3c6bbc17f6040175aa03c057d7a4d3da71ae944f4a556e2b66266d1c6d0463c1cad5d86de3ae896712
 DIST openntpd_3.9p1+debian-8.debian.tar.gz 15052 SHA256 e3bc604d81d4e1e8008560cabc22942c76130854ec67eb5968ce638d598780ad SHA512 dd2249e16761ec0fc64ee47e343459d24603094cc59da516639b741951c891e7f3905fd6c34edba6766b1e15261b7286279128631248c69e894f8b645588468a WHIRLPOOL ba3426b0cf2efd600775eb748da777c78ebf82c7d1d821d39c389b393b1e538517fc5feb46230fa89765c3d5d76e29a820a62c5be64ca96e157441028a27541c
+EBUILD openntpd-20080406-r1.ebuild 1578 SHA256 bf557504aac816be0ad266817477541a9aec38626058950051c238c1d1c4bbd0 SHA512 aa64d9bf189b6f8684db2c7470599fc7c14be53e76a68ac1642f875e99b5d33465fa8f53d5d0f13504a07cfc4ee67e20557d40f38c975d2753d75081917cd98b WHIRLPOOL c9e330ded5fd1d02169b68f2960d5f3626c8c635126a032b2aaa0262a9c5b757e3e774038ccf68d5405c593349de9413b15ed2a7363d7788ebf0a471ea8dfc81
 EBUILD openntpd-20080406.ebuild 1562 SHA256 0047f728e0b414d79e87481707f9fb012138958e53955b52a3e1e1555dfa6451 SHA512 9eabcea6ccbdc71661c07f82b84aaf68f2b7f3aa905aa7bb9dd05ecf013522fc075da4be61b145e4f785511b5fa323b0a1f385d87369adf5dafb85805028e1e1 WHIRLPOOL 2ddc499df7428defc136eb04f7fe67e49cd3b3b120b1a4a32a6a83a8054e085958167e14e28b4de1d29a7f007eb5e2539de2a5a799c6e01bf8d8a3ff42bb4f9a
 EBUILD openntpd-3.9_p1-r3.ebuild 1552 SHA256 998da01cff7765e9a174aab7dc45cda34db0755b979a6393b32debd70aed4d18 SHA512 c9b4a6cd7dfc551e37511852b0fdc4495dfc32d2cf5b59e3f8f3d1ccec4f61bec752e5e8292009eced2f39b1684dfce8c7b7c5b183ca377964ace75de5034146 WHIRLPOOL 30a204c4fe437250a91dda15d981efffe9c482083e09e76ed0f90a3d2b32a80ba4d86d691eabc9c012184fcf50dd3c190664a23a843df482f5bda50f5223554f
 EBUILD openntpd-3.9_p1-r4.ebuild 1566 SHA256 83acfd63aee711992a73dfbcce8dfd2a1fc180ce405ea3b01857e1c1f2e4dde3 SHA512 ca0ab8e9d59bfdaafde48b4c32d2f4a2060bc52701774fd9ae579836ee7ba6cdaa5057daaa1d9929d98d1284867e8c98cfe807f79edd38710e35fbc958c18f52 WHIRLPOOL f6fd0f2af08b9715a80444db618944d3fd422eb48827afdfd84cd5c43703a67e3da9758af0cac3b6b4fbc0cca2e6242ecd0bb7d34f1598ad1f46dec077be2297
 EBUILD openntpd-3.9_p1-r5.ebuild 1560 SHA256 d9f0352e4e22a276ecbc8fd7e3cfa9d5123eed3cd7d654ddba20b7dd7b4c6db8 SHA512 7947163f9c3d61a57550f760f8ac47b87f3e278e8c9530e7e84756047c5ddf2ec8c7f90b5817dcca4096539c5750f4b1d159567c9799dca07f11969026abae2d WHIRLPOOL 7217ad894a0805ddf1077292e0b9d5e80ee9b00bca1aacb1688cb627c5111a72eb033457a5ebfe4d2564da460162cb46695d254a7160a54821d891b181ecd38a
-MISC ChangeLog 10426 SHA256 623778f165f3a98922660ff2749b6df09b750e9bb3cac5f0864d26f79c5b8fb6 SHA512 447f6b4a37091e7bf506a4643f7dd1aec5ea7b891e5545bd736159dcd8662f4312f20e6be3e0360c7cbe1960aac543df9c1b167f21955d71ad306111ec58d85c WHIRLPOOL 87799b24bdb96a532550d063957203ea572e81b8a5433f598d2b68e6af204f509ce05b58d9ebca412eeb376b1fdcdb8f6d0fa20d88b0b3b1e470059d8472cbb1
+MISC ChangeLog 10628 SHA256 c1fb650b9cb0d1c6a39bc287d51450e9d66fe7415f6052953858ea7f549e37cf SHA512 a63d84492d7b7a83e6d8a0adf9f0f725ff068476d62cd4afe9b98a0a43a2239540f3bd71e01f6b86a9943af921584d73fd371c19709d804c494695096eddc196 WHIRLPOOL 11004b5d3687d7b93b778d01c8a87073480c850502e3f9a519ad979dfe374c128463f90763735a97b2d109d9f59637153e8fd841f8b6b3aca06fef42f8f61a83
 MISC metadata.xml 507 SHA256 0b48739b9e971d26b7ddd260a7419009be85f1774855660f40e07e4b6c88a1a6 SHA512 b570088b143a26e7ecf28d6cb6a9cc0963899b9462d94bb5c63cd306fe4956f1c69841f12ba6afa67c520968c8a4bdf1d231356502e25564f84f3b5260d109ad WHIRLPOOL 3fa46846b3f005bac272608ce5e32678f8c6129ef968f9f248917558bcc0bf489c83f42850f06d8e7f3e8cf42b470659932867e0f36ca38741728bd1f3bbf773
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRPYmVAAoJELp701BxlEWfNQcP/i72VQnjpUq+ncKWSM+7dS5B
-Ot6kSUbmQ2rka0mZWocvobqQRYkK/0XUmE3jb5VUA3P1l17UUDsXcpFXo0kUuI7m
-BtkZH4LY8Bl8ln55JMlu65CQLtKIGmIgHsUpyNi18UforC1C+mgaDjdUJVgcVOyV
-R0t1rBkwSmqr6K3nf7nXYnYN7dC2mS1eXu4wYNwD5Kxp3k+EPfYDjCUUuO9X4FRF
-1bEDl3rgamDX4S9NAGt5RP2j/EFNKVJvN2Y+RL4GurdoZb6iri40X8EF1tTZW8dF
-Ej9nJomU55g5YBLkOSLaqUpoUR2XsGZE4aKp8uzR10p+ahCzykWnU8NmArJqzO6j
-8RLOZwqcu7l7BQPzpeZf1i4tD3/eel7+z0mRURxGA3PrFeQlqwzOsjErt/5JJUqO
-vcr3LlqVMoS1ZFLHHAssMj5VteQeQLwYuYF2TM+cq54Fl17aCFhjJmz7cM0rKaaB
-lDKIcQmDr8Stx1F1uDvxMYpbvpF/1kOjSfGQgVzsOLjXT2Bms0YxX7xCbJiau/h+
-CSQAqzcFczJk9ua+SsX6Df8+m0avjTpHg65vyLF5mnlMJord0u2/KTHn7OxyRqfi
-A8IjYQ8WttJ3uP5cFO/lzT3d/tC/G4X9JtQbeeE7bAwK5WJyZJ5MM4j6nXC83DWE
-lEUY357lDE/Flz3JooPT
-=GOmE
+iQEcBAEBCAAGBQJRxbjdAAoJEOeBhlrCAAWGSsUH/jROkEawlUl5E/X3ZuTYEuM0
+UdT92gA0j3UZqJo0uxcyNTdkowwzZztU/+GjEPrpcqoXm7mTYpWY9vjM5SlpSaXP
+O1XqwAAkGKMSNF3k37b4KpKglmdyXHHR4kUgKY5Yzywh8+nvSTsGyXdHlV0KdaOl
+hjWBj5kcLd8apUow6xXkG7Dk6fbUhTBvO9HqBk31KWWLHlgjo0ueyGsl8NFZR/0Z
+FZH5AAZqdbIDA6m7Hs1HX4j4+wkdgYu9QB930pc1iFT8RtqvzER5Fi/Hcx7n+q6a
+y4xpQeKPtasPunZV0Nzuc8txDCsmiH7p/7u1T0hAJq9quxvox947QSJF4ed0/x8=
+=Kv/Y
 -----END PGP SIGNATURE-----
diff --git a/net-misc/openntpd/files/openntpd.init.d-20080406-r1 b/net-misc/openntpd/files/openntpd.init.d-20080406-r1
new file mode 100644
index 000000000000..5a6230d9c61e
--- /dev/null
+++ b/net-misc/openntpd/files/openntpd.init.d-20080406-r1
@@ -0,0 +1,41 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/files/openntpd.init.d-20080406-r1,v 1.1 2013/06/22 14:46:38 ottxor Exp $
+
+name="OpenNTPD"
+command="/usr/sbin/ntpd"
+command_args="${NTPD_OPTS} -d"
+command_background="yes"
+pidfile="/var/run/ntpd.pid"
+logfile="/var/run/ntpd.log"
+start_stop_daemon_args="--stderr ${logfile}"
+
+depend() {
+	need net
+	after ntp-client
+	use dns logger
+}
+
+start_pre() {
+	if [ ! -f /etc/ntpd.conf ] ; then
+		eerror "Could not find /etc/ntpd.conf!"
+		return 1
+	fi
+
+	if [ -x /usr/bin/getent ] ; then
+		if [ "`getent passwd ntp | cut -d: -f 6`" != "${NTPD_HOME}" ] ; then
+			eerror "Home directory of ntp needs to be ${NTPD_HOME}"
+			eerror "Please run 'usermod -d ${NTPD_HOME} ntp'"
+			return 1
+		fi
+	fi
+
+	checkpath -d -o 0:0 "${NTPD_HOME}"
+
+	# prepare chroot
+	mkdir -p "${NTPD_HOME}/etc"
+	cp /etc/localtime "${NTPD_HOME}/etc"
+
+	return 0
+}
diff --git a/net-misc/openntpd/openntpd-20080406-r1.ebuild b/net-misc/openntpd/openntpd-20080406-r1.ebuild
new file mode 100644
index 000000000000..6400a17c8aa9
--- /dev/null
+++ b/net-misc/openntpd/openntpd-20080406-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openntpd/openntpd-20080406-r1.ebuild,v 1.1 2013/06/22 14:46:38 ottxor Exp $
+
+EAPI=5
+
+inherit autotools eutils toolchain-funcs user
+
+MY_P="${P/-/_}p"
+DEB_VER="4"
+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 ~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() {
+	enewgroup ntp
+	enewuser ntp -1 -1 /var/lib/openntpd/chroot ntp
+
+	# make sure user has correct HOME when flipping between
+	# the standard ntp pkg and this one
+	usermod -d /var/lib/openntpd/chroot ntp || die
+}
+
+src_prepare() {
+	sed -i '/NTPD_USER/s:_ntp:ntp:' ntpd.h || die
+
+	epatch "${WORKDIR}"/debian/patches/*.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
+
+	newinitd "${FILESDIR}/openntpd.init.d-20080406-r1" ntpd
+	newconfd "${FILESDIR}/openntpd.conf.d-3.9_p1-r4" ntpd
+}