Add -g to ntpd's command line options. This came out of a discussion

with robbat2, dwfreed and steev on irc. This allows ntpd to set the
clock when it starts without the use of ntpdate. If you keep this, you
do not need to run the ntp-client service.

Package-Manager: portage-2.2.7/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

5 files changed, 154 insertions, 9 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 55d2ce0124c4..f57649cb66cc 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.199 2013/11/19 20:00:56 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.200 2013/12/09 20:36:19 williamh Exp $
+
+*ntp-4.2.6_p5-r9 (09 Dec 2013)
+
+  09 Dec 2013; William Hubbs <williamh@gentoo.org> +ntp-4.2.6_p5-r9.ebuild,
+  files/ntpd.confd, files/ntpd.service-r1:
+  Add -g to ntpd's command line options. This came out of a discussion with
+  robbat2, dwfreed and steev on irc. This allows ntpd to set the clock when it
+  starts without the use of ntpdate. If you keep this, you do not need to run
+  the ntp-client service.
 
 *ntp-4.2.6_p5-r8 (19 Nov 2013)
 
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 49995550c4ab..b31354899255 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -10,9 +10,9 @@ AUX ntp-4.2.4_p7-nano.patch 393 SHA256 440c13a0eaeab78cb4f8a806b20b128d2d7d845d3
 AUX ntp-client.confd 623 SHA256 e8d5883461f4297c052e3b39814b663965ed3a756c4234675f4a9b62349eca13 SHA512 19b1a9ca78fd2a873f2cc5b026f2ff48b81edf7bbdc95d8269115820e23863b5c922205de17a60f095556e9e27c254093539b6804bbc5d099bb96281abae3b9f WHIRLPOOL b0889194c1284929a2dae045259491b126a30e76825c1c9542bf51f9e9981c2704b3a8cd02dd1d0ed839ed68eb9f9697134e5db08792fbac5adb88d7773a7dca
 AUX ntp-client.rc 834 SHA256 bdd70612cf0654460aa4cfa59bcaaf6d636d240a3fead8b243c86e5cbe640ab9 SHA512 e7c9cccb5529704c5e4673ccd36e544f2ae43ea6b8a0224c0f4cfade566bfa3973c215d8cb40b83d8af68d03ec3d34dc73f2647adb613860fef5015179e54957 WHIRLPOOL e5c1034e2a48493f24e15eb4bc3a4e0771ee6809edd1c88984226dd0b315d18dd40ed5d4ba9d25b64fbd0e675d5ef5db96865dca921939d27a5500740d484bd8
 AUX ntp.conf 1517 SHA256 907ebf0c12e5c75cd32ce7ad45e600d356caacfecbe0858ac24260ff4695d0c9 SHA512 4973c1fce84b9096b421b7314ef1d45f22ee6a0734c122685f9fb3368c4e09336258fa8a1c9aba58593536b099549af607ed10256979c23e8bf25f90526923c5 WHIRLPOOL 13f13fcdb92941488d96f8a273839360bc1cda6713d0e5c7d292a341dd65d9f88088f380504b29bd65cd78501ece94a2ae490b9ab3ed875b4a8db930dabef989
-AUX ntpd.confd 189 SHA256 a3bc17ee0f7d41102d6c33e4281e22d312a42cc2ffd8848b08e9cd78d63f2d05 SHA512 9e41fdac3fa299b62b3b13c2f52264781d1b9849a0e5664296dbb5d3ed3b69161371a276c295c2cb8e61c6c18bee357c92eebbb343b756129d50cfc7ce97d9ef WHIRLPOOL a62245f70e440201c0ac0980f6c95d15ee3afc8e9ecb2ca8e21ead9eda8cb20b117786ecf91865e0842fcab8aaf09d692e17ce7aa2675198af581fe25a389f4e
+AUX ntpd.confd 192 SHA256 40803821f498267f6567436eedc18201b5ae4b5390d6872fb15a94200c2ac06f SHA512 a9e96a214d3c21a3f4863709c48a11f9dedc73e2d83a9b20761021df44a9acb56757e77f113aa0314f5f3923e9cb26bc6e0147658d20e8a74d078d415a171d91 WHIRLPOOL 75ba0559326dac961a6b228d6ee58ea8b4442ace200c36ef07101bc00b8fc12dfca78bc6474870f29928c1b9cb1397a4bfc8706befdf33178abad1a5f558b372
 AUX ntpd.rc 819 SHA256 f7c58e8f8e91ee0c1b947e9684b0a9e9e27220e0c97a8b06ee4e3bc5578a88b2 SHA512 b32a4f5ed6b12a6a0254951e530ffcd006ec8719847c6b146bced7d29e482d2312448802ef2c22f85d6a3fd8d6ee7f6913485fad71dd57759da112e8248fc62e WHIRLPOOL 87cb1e26d78a026a507f0e38ad611970e158d1f633aad8681843cef44aaaa999e73fbd46e5a884116fabab2af3f96db1115c8e1e161f5da67820423e422d96fb
-AUX ntpd.service-r1 168 SHA256 82742cda6c4b570f684bac21f12f8c7a7795ec130ba84e22c387c3ecba5d8e96 SHA512 ed13de4f5ec0ca82d6b998c5c089c02df26691376395b266b6d30576bc896729e84b57613d79ab1bd81b2475b8f60985aafdbdd9c5be470eb58ee0ceabc7aedd WHIRLPOOL 32775b0da8b86ce900508c147b76db1ef133efea65f21164d7a90e12ebee4c9071c8d0b2f0efd3c4be30e80b83d40f724bb7ca163aecff955dcfd133d6c59016
+AUX ntpd.service-r1 171 SHA256 302ce93a9fe6e56063aece43d2109b98602333a7155641f3a6a41a4cf687a011 SHA512 15e0b038c756f9c5195cb69ff25dcad5a86bc80bc697875d351592c18d65db6e9b74482de4997015c63bc09ad6e9fdc282b27954bf859d944032ae3594be6548 WHIRLPOOL 17a2e93d9fe266d1e39900102fd05eac62b208a8a393fcaa27bff46b29f9ae89bd05330d95027eac57c2db3e1ab15b8133855237a7b0e158ab708850ede38572
 AUX ntpdate.service 260 SHA256 2602a76654d46f642f35ac6381fadf64f04e3a8f7e4efa83ef95d3dddd81db99 SHA512 c46c9fc2958a15d055a18769fe3e39c37dfff2fcff62c385fb01d56b3aadeae59e58aa6e79d034f8ffa26ba44bccd0436cb833ef18b8699fbf4c175526f712ea WHIRLPOOL e8efc18127a570e1a955c9c1dfe4f1122f13b35d9f7031e8aaf366fa171055d5eba299fcc1e0883bbc1e5d91298d94f86e0907bec932c373153ed79cdaa1e048
 AUX ntpdate.service.conf 119 SHA256 a7f886d6f5e671005da8ef9b53567884a8467239528bf860db61230b73097eb3 SHA512 7c5c397bb51f0192e927079044c7ffb91ae158c55f725be50d09bd618e6a4d37dd93c0f8e4bad726d1d9ada276bf73ad9567e00e0c30f4bf47344e4214f4b4b8 WHIRLPOOL 6d99157e99026fdd4734674647bbb9a721f8766d5708f6c6f725fa88687bbb2995233fd02ccb34ebed7b80570e1a309a857ddb58fc08e0255268880eb8d18d9e
 AUX sntp.confd 149 SHA256 97282007801cb9c0e3b431e2930dec3bb8ce8869f63f7e02d903846e96734684 SHA512 28c8f1fd3a69bbdfacc2379a3ce01f254ae21fd8b91d893600086d27e5fb9cccf05d1bf62022ab26fcb53fa2080d4178961619811fd7a56f4e7502893f8ea13b WHIRLPOOL 65af6af349f56b2379afdb6c53042571de19e799a079b0997dcb9f6185849a04292000a584e22e7e03af5bc9c10e0627037a72b748b8f083ee4a51a1e608e94a
@@ -39,13 +39,14 @@ EBUILD ntp-4.2.6_p5-r1.ebuild 3784 SHA256 b5f103c04700e8266e2720ccfc1fd0b7135a3f
 EBUILD ntp-4.2.6_p5-r2.ebuild 3869 SHA256 4c5a7f80315243b8fa9c7acf57fd9e0c84831fa1a42c2cc6c1144a8fb2a64c11 SHA512 e52b92bb66ced7e1f2771544727e5eb9cd1999cd7ab9766f1a7d30b158971c91d3882b281cac8cf27fbdbb45ca14d49ca2c3e54256f85fed62e8cb21341a7d0b WHIRLPOOL 2342083adc37e255ec8f2fe29126a6280c3a265b0fb09a8b6ff021edf3cacb1b879dc435eb0c54102f82be1315c1c53a8d4cd211ca4c8ef8832305ae1989ed26
 EBUILD ntp-4.2.6_p5-r7.ebuild 4224 SHA256 5faff2fc977acd0654a2fdb9126e54be865dd214a7031b8854a34c05ca50ce9f SHA512 b2ddc542324f77f1af5e299b81b6b01ae3530070951383b180e6952991d15ef3e2ac126f6f896ae472401133115f191de9742da6ebf664590c40d646abb5be01 WHIRLPOOL 94a5777d4cda6a58d20ddba81aca393e9cd9979dbb4077bb85ddec8cfc42d901a416acb2f9be3dbb484c28d6e8cc4edee8b01cf1e9553f2b52bfaeec8fc5bb0e
 EBUILD ntp-4.2.6_p5-r8.ebuild 4275 SHA256 cf99bf16360fef7a956e82d5098b9e037aa764b5f54f7b751cec353aa316518b SHA512 1394a61eb664737317e39b16e46d805c0b9a3032c111a38398819c72d670bdfb6fa3823104e26d71ecd33bdef36c365be60118caa3a809de79b64d2ac0556915 WHIRLPOOL ffca3d78ecf236e358a5ef7858d333dfee2a57d395c589c7c1a58572f012ea271dbfb67bfeddcf62175d47ed0dbdf6f5d16f2592949790bfc501e4def88fcf86
+EBUILD ntp-4.2.6_p5-r9.ebuild 4278 SHA256 60402cf5dfc048e91acb65f591a78c3de3a0241f4fa0eb1a79e1f55592d2bae8 SHA512 d069d4b63d2a9c0fe4f0f47c04ab6941301bc2c1aa966af9ebd69dbd5ec07f18645abce3ecf1b9519a14b8b5e81af21a342a477e889a9aaaac126e5951153a5e WHIRLPOOL 775a1045c08068e66f9dd79450fba2421b498df9c4edc41b5f2a8fe9c4c25f436d9c2e9ecd5c5770d8b0d953dbface8362dba7732583563610bd188891628a98
 EBUILD ntp-4.2.6_p5.ebuild 3809 SHA256 d9c4e1d7c7dbcb5b2d831e39d32b23d2ac58f09f130b8c1d67a26af0fc2a5dce SHA512 cf8b7cc652f92432fcf0b14ad37c172794ce06c81a4a560eadc3fe532aae66485fad6663cfe9bc33161412a3fa68a3c113f36d0eb8fd8f4c57ea0509dc91e763 WHIRLPOOL 459711eb1457dc77c1b2c8b2a010a4a0a11b5b2f6b03414183d7692c13b85c7a79d46f30376f90ea19726ab8f61426b0f6ddfaf38507596db9e1bf95fd5d71ed
-MISC ChangeLog 27744 SHA256 e5a1b46bc7694b6eeffc19cb03442dc4dabded81c941f121393b0206cb262a55 SHA512 049fe7dfb76e2fc8f0a1aa7d3e8a42c06436a5c72db49fadc659797d5dea6379ebcdd639944f40c07a9019ea2f54ca4c43b6bb8f289e18da853a859c7beceaa1 WHIRLPOOL db84f6e5d58cdfdaed57a096128d790bac99af4fb7cb76caa8bd6070623855983094079998308bd0f8c222aa9b45e896669ed1224c57c9b34c3937b73a766caa
+MISC ChangeLog 28158 SHA256 3d2cdbe51ee38e7cf9a3ba974d0e9234e665fd559d3d8cacde1b15a0b297bc02 SHA512 dcdf94a5ee0ec0c5e314364e1de7eaa1230ff7ae9a6be8fe653fff520508f1fe78ca0c4de1e6253963ce4594544d3ccbe464877c6e65a2a876e2fe9c8cc0eee5 WHIRLPOOL ca403a260765d201a8a512a9bcbadc3079e87462d780ae89e570bc6044503de211d26b0c2d0558140d9d357621cbaa4a59e9f15b7b666c9eae1765fb2861641d
 MISC metadata.xml 837 SHA256 57b162a2c709963d5760fdb3abe7d2a12e6e55a6abe816b16db30e9e2ae10a4e SHA512 d1403413373a0785712c40fd1a96c4649ef368b30efc5735667626ad760bb2336ba28fd335c75fc781ad6222e7dd9f53ad5dd2f558b3cbbf719104684fa0d9ed WHIRLPOOL 1513304c252dfb8f9a06a7cce1e13ab41ac80e0f0db7e231891430168df6e71a81e88984d47a694d6a5d0fd5a9c04dd1318c504baf21c7be6bd0d99b307db867
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEUEAREIAAYFAlKLw3kACgkQCaWpQKGI+9S28wCVEOOaIHRaHdx/daxBb7MRshkJ
-8gCfS/kY9pyd9wAvtuUTwTGfLT60q6g=
-=O7TC
+iEYEAREIAAYFAlKmKdUACgkQblQW9DDEZTg8eACeMD4f9J8/GhaUxSZksh4gD0UT
+wfkAnA+sZf2uukgtAD4UDtX/yUB4aZRO
+=krfT
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/ntpd.confd b/net-misc/ntp/files/ntpd.confd
index c651e80dcc67..2b74282c5775 100644
--- a/net-misc/ntp/files/ntpd.confd
+++ b/net-misc/ntp/files/ntpd.confd
@@ -3,4 +3,4 @@
 # Options to pass to the ntpd process
 # Most people should leave this line alone ...
 # however, if you know what you're doing, feel free to tweak
-NTPD_OPTS="-u ntp:ntp"
+NTPD_OPTS="-g -u ntp:ntp"
diff --git a/net-misc/ntp/files/ntpd.service-r1 b/net-misc/ntp/files/ntpd.service-r1
index 7d18d89ea548..0b6109037c42 100644
--- a/net-misc/ntp/files/ntpd.service-r1
+++ b/net-misc/ntp/files/ntpd.service-r1
@@ -3,7 +3,7 @@ Description=Network Time Service
 After=ntpdate.service sntp.service
 
 [Service]
-ExecStart=/usr/sbin/ntpd -n
+ExecStart=/usr/sbin/ntpd -g -n
 PrivateTmp=true
 
 [Install]
diff --git a/net-misc/ntp/ntp-4.2.6_p5-r9.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r9.ebuild
new file mode 100644
index 000000000000..ee80cc3fd6e6
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.6_p5-r9.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r9.ebuild,v 1.1 2013/12/09 20:36:19 williamh Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs flag-o-matic user systemd
+
+MY_P=${P/_p/p}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${PV:0:3}/${MY_P}.tar.gz
+	mirror://gentoo/${MY_P}-manpages.tar.bz2"
+
+LICENSE="HPND BSD ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~m68k-mint"
+IUSE="caps debug ipv6 openntpd parse-clocks samba selinux snmp ssl vim-syntax zeroconf"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.1
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+	!openntpd? ( !net-misc/openntpd )
+	snmp? ( net-analyzer/net-snmp )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )
+	parse-clocks? ( net-misc/pps-tools )"
+RDEPEND="${DEPEND}
+	vim-syntax? ( app-vim/ntp-syntax )"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
+	epatch "${FILESDIR}"/${PN}-4.2.4_p7-nano.patch #270483
+	append-cppflags -D_GNU_SOURCE #264109
+}
+
+src_configure() {
+	# avoid libmd5/libelf
+	export ac_cv_search_MD5Init=no ac_cv_header_md5_h=no
+	export ac_cv_lib_elf_nlist=no
+	# blah, no real configure options #176333
+	export ac_cv_header_dns_sd_h=$(usex zeroconf)
+	export ac_cv_lib_dns_sd_DNSServiceRegister=${ac_cv_header_dns_sd_h}
+	econf \
+		--with-lineeditlibs=readline,edit,editline \
+		$(use_enable caps linuxcaps) \
+		$(use_enable parse-clocks) \
+		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
+		$(use_enable samba ntp-signd) \
+		$(use_with snmp ntpsnmpd) \
+		$(use_with ssl crypto)
+}
+
+src_install() {
+	default
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${ED}"/usr/bin/{ntpd,ntpdate} "${ED}"/usr/sbin/ || die "move to sbin"
+
+	dodoc INSTALL WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+	dohtml -r html/*
+
+	insinto /usr/share/ntp
+	doins "${FILESDIR}"/ntp.conf
+	cp -r scripts/* "${ED}"/usr/share/ntp/ || die
+	use prefix || fperms -R go-w /usr/share/ntp
+	find "${ED}"/usr/share/ntp \
+		'(' \
+		-name '*.in' -o \
+		-name 'Makefile*' -o \
+		-name support \
+		')' \
+		-exec rm -r {} \;
+
+	insinto /etc
+	doins "${FILESDIR}"/ntp.conf
+	newinitd "${FILESDIR}"/ntpd.rc ntpd
+	newconfd "${FILESDIR}"/ntpd.confd ntpd
+	newinitd "${FILESDIR}"/ntp-client.rc ntp-client
+	newconfd "${FILESDIR}"/ntp-client.confd ntp-client
+	newinitd "${FILESDIR}"/sntp.rc sntp
+	newconfd "${FILESDIR}"/sntp.confd sntp
+	if ! use caps ; then
+		sed -i "s|-u ntp:ntp||" "${ED}"/etc/conf.d/ntpd || die
+	fi
+	sed -i "s:/usr/bin:/usr/sbin:" "${ED}"/etc/init.d/ntpd || die
+
+	keepdir /var/lib/ntp
+	use prefix || fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${ED}"
+		rm usr/sbin/ntpd || die
+		rm -r var/lib
+		rm etc/{conf,init}.d/ntpd
+		rm usr/share/man/*/ntpd.8 || die
+	else
+		systemd_newunit "${FILESDIR}"/ntpd.service-r1 ntpd.service
+		systemd_enable_ntpunit 60-ntpd ntpd.service
+	fi
+
+	systemd_dounit "${FILESDIR}"/ntpdate.service
+	systemd_install_serviced "${FILESDIR}"/ntpdate.service.conf
+	systemd_dounit "${FILESDIR}"/sntp.service
+	systemd_install_serviced "${FILESDIR}"/sntp.service.conf
+}
+
+pkg_postinst() {
+	ewarn "You can find an example /etc/ntp.conf in /usr/share/ntp/"
+	ewarn "Review /etc/ntp.conf to setup server info."
+	ewarn "Review /etc/conf.d/ntpd to setup init.d info."
+	echo
+	elog "The way ntp sets and maintains your system time has changed."
+	elog "Now you can use /etc/init.d/ntp-client to set your time at"
+	elog "boot while you can use /etc/init.d/ntpd to maintain your time"
+	elog "while your machine runs"
+	if grep -qs '^[^#].*notrust' "${EROOT}"/etc/ntp.conf ; then
+		echo
+		eerror "The notrust option was found in your /etc/ntp.conf!"
+		ewarn "If your ntpd starts sending out weird responses,"
+		ewarn "then make sure you have keys properly setup and see"
+		ewarn "http://bugs.gentoo.org/41827"
+	fi
+}