Version bump #315651 by Lars Wendler.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 165 insertions, 6 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 5aeca42576b3..3eb3460ba7aa 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ntp
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.157 2009/12/15 12:52:32 flameeyes Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.158 2010/04/16 22:42:22 vapier Exp $
+
+*ntp-4.2.6_p1 (16 Apr 2010)
+
+  16 Apr 2010; Mike Frysinger <vapier@gentoo.org> +ntp-4.2.6_p1.ebuild,
+  +files/ntp-4.2.6_p1-linking.patch:
+  Version bump #315651 by Lars Wendler.
 
   15 Dec 2009; Diego E. Pettenò <flameeyes@gentoo.org>
   files/ntp-4.2.6-linking.patch:
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index f3167357e3ba..788a5d57a1b0 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -8,6 +8,7 @@ AUX ntp-4.2.4_p5-adjtimex.patch 670 RMD160 54cb1f9e8bf872044cc6e9f2a8a469f03d29a
 AUX ntp-4.2.4_p7-CVE-2009-3563.patch 1752 RMD160 d259ed78523701ce22dd7aaadc945277b0586dd3 SHA1 3696ce854ea1bca9e2a514cdf883772ee38436e4 SHA256 4a6eb328ccfe3be771dc0932d6f6ee8210868f8c3d5ba09dbe6e9707edd4ce60
 AUX ntp-4.2.4_p7-nano.patch 393 RMD160 59096f773b7206f6c9a8a94aa4ca6ac9c6b7a2a4 SHA1 4de6cd3fad1946146107f86d1f161eb835fbb2d3 SHA256 440c13a0eaeab78cb4f8a806b20b128d2d7d845d3842f2e8acc88dc5f2deb1b4
 AUX ntp-4.2.6-linking.patch 1673 RMD160 b23c96e4864b3eb038daf65dd9a2ef4c12282b73 SHA1 c771d4c9f01decdd86193d04376a67c82d67cd82 SHA256 06a95e96bca8715aea1191abc250df42e6312f52fa8a4d4fd406a5315d0df7db
+AUX ntp-4.2.6_p1-linking.patch 895 RMD160 d7459e97f2e920b3348e24493b1dbfcf208c330c SHA1 298130af9f570266781710b770e6a24e16bd678a SHA256 88829d9b42df399d220dc7f10b27c8ee91bb58fe201d7c51d5805d75782b6f37
 AUX ntp-client.confd 623 RMD160 e577043438d3e1fffb0bb6a00468d1d5d0bfe3c8 SHA1 a5d618de62c4861e541b066562d2ecac7e7d971a SHA256 e8d5883461f4297c052e3b39814b663965ed3a756c4234675f4a9b62349eca13
 AUX ntp-client.rc 833 RMD160 bc24de842f93866a9d7663df81323b8c4ef75afa SHA1 4a794373a29e95889ae5448192affebabdbc322a SHA256 19f6a7fc0cc589e12cf1eaf7681d654d5c4613e8b3ae08dcc1b7dec12da2590c
 AUX ntp.conf 1517 RMD160 749056c054071b300de2b0a04a4b2a9a7a135da7 SHA1 4d2924d2ea6269b53f12e7f2fa45c3a2be2f2c4b SHA256 907ebf0c12e5c75cd32ce7ad45e600d356caacfecbe0858ac24260ff4695d0c9
@@ -19,16 +20,19 @@ DIST ntp-4.2.4p7-manpages.tar.bz2 49719 RMD160 deebf4f80e4c3684c48f743a03e048103
 DIST ntp-4.2.4p7.tar.gz 3382146 RMD160 11d69176c8cb4b95f7e9f468c37ab8fc53a28876 SHA1 8476f75daffe9851cc6f33d170902bce77637499 SHA256 5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3
 DIST ntp-4.2.6-manpages.tar.bz2 47646 RMD160 8a62a4e8b31d72ab37a4568cf7f8b176d9710eb6 SHA1 89fb6a63d3d1c0d22fe150c8ed1f87c5128dbac9 SHA256 22c04530386ee47d5b0ec8e1eaefb0bb46c84389e0c0906f699c37f2446c42ac
 DIST ntp-4.2.6.tar.gz 4322055 RMD160 2258b2c624559aa5f8ae0ead164059064d341332 SHA1 a1f21b23c8c80f35801d59e30ba30779f2025a72 SHA256 0b0d4c62ae0138e7fa0e318dc5cb5577a7618de895c20834339a138068a98a11
+DIST ntp-4.2.6p1-manpages.tar.bz2 47677 RMD160 3778d6b26a3365676bbe5d762b71c9486d454662 SHA1 68889d4abcc9d7d0154efcc4012ecc50fddf69ba SHA256 045e4ef3f5e5cdf5805ac3787b392658f0e3c22e412edccbe40b4b4718c1f694
+DIST ntp-4.2.6p1.tar.gz 4327920 RMD160 95527acd587a42f726fa2dcd0450abf91167d3e6 SHA1 c4fa55afb8f2104146d25b75a09437ebffb4d657 SHA256 ec40f3525e6d66371093705688130c8c8a3d6ab2c90ac6e3dbc1ab455fbc7c5d
 EBUILD ntp-4.2.4_p6.ebuild 4135 RMD160 15cec7d894f3a013d330c81ec72e7d920311f9c4 SHA1 453dff9e9ef1bd4d3e58ba9d98caa243b02ff1bd SHA256 460e8ca13c724f4d105209d2fe7f9a84e825c08ce36b031c81de2360e6ff4265
 EBUILD ntp-4.2.4_p7-r1.ebuild 3782 RMD160 b07238f8198685f90e02bfbd84354fc2e0365dc6 SHA1 ca339df3e41933668b16e8a1f84e91c333395619 SHA256 53c26e8d0f2e1b8a8af8181931145cb124c5fff85962c7d116cd37f0edcbb3fe
 EBUILD ntp-4.2.4_p7.ebuild 3718 RMD160 1ef66c290349bea5dd58b95812a07e83ca0e67d4 SHA1 17689b7577b8ea10a2da04c643c2e4e81866723f SHA256 8bbcb2ac27d54f79b439656e13af20a5ad7a8f3c49257f64ab43cc0563470e12
 EBUILD ntp-4.2.6.ebuild 3691 RMD160 3e4532af1a09696a321d61a06ab86380a785a407 SHA1 d2c83c9e006f708f703263e2eee87bfab8dcc834 SHA256 7c2efd92d93036ae9e957259ba5aaae46916a09202d9105bee1c12835b10ac9e
-MISC ChangeLog 21164 RMD160 b58417f0f768cda73ce26cd46770ffdc7fec1027 SHA1 2d7b3ea5fb2c219cd83e024dae855704ba947b32 SHA256 5682ab7ab0d216ba0ea0447d34074c3ca0787568fd0b0a431506eaf4ff9bde06
+EBUILD ntp-4.2.6_p1.ebuild 3722 RMD160 bc4fe9511e91cb06f6617ad7ffe8b316d4283245 SHA1 5ab30f8ad638028d1e699d5ed7f4edeaab2e7bc6 SHA256 e4e47549dc196f74ebb5e232c2a1deb13f712ead1c3a557a19c30b51b0110120
+MISC ChangeLog 21340 RMD160 884060276ea5c7054e5406383884d1fd1f66a704 SHA1 130073bac1a53e84b551691106d44ff8d30b0f89 SHA256 a23a0c106288ebb1e1b646e35fae997b3b7f67bc05046f56af4cbcc2ea14377a
 MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iF4EAREIAAYFAks5sMgACgkQTwhj9JtAlp5wqAEAo67OuEan+mYsqtaMVVZp9jD/
-MZQHSi+hPzY9QGIlqGsA/iUH+uvAOInRTEpHv4ieYby6wR1fudb1krJaa1txh5d/
-=0Pxr
+iF4EAREIAAYFAkvI54kACgkQTwhj9JtAlp6rbgEAoydKmmbcvg6RH7UnCUV2jsLC
+QDqHL9sXaxzUjxweBl4BAJbsAceWE4XBIBySKRau+EyjQdOZZkX3otdcAjU1Msbi
+=YPpk
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/ntp-4.2.6_p1-linking.patch b/net-misc/ntp/files/ntp-4.2.6_p1-linking.patch
new file mode 100644
index 000000000000..20f87f8edc33
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.6_p1-linking.patch
@@ -0,0 +1,29 @@
+fix readline linking order
+https://bugs.ntp.org/show_bug.cgi?id=1528
+
+--- ntp-4.2.6_p1/ntpdc/Makefile.in
++++ ntp-4.2.6_p1/ntpdc/Makefile.in
+@@ -267,8 +267,8 @@
+ 	-I$(top_srcdir)/lib/isc/unix/include $(LIBOPTS_CFLAGS)
+ 
+ # LDADD might need RESLIB and ADJLIB
+-ntpdc_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+-		../libntp/libntp.a @LCRYPTO@
++ntpdc_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a \
++		@EDITLINE_LIBS@ @LCRYPTO@
+ 
+ # ntpdc-layout doesn't need any additional libraries at all
+ ntpdc_layout_LDADD = 
+--- ntp-4.2.6_p1/ntpqMakefile.in
++++ ntp-4.2.6_p1/ntpq/Makefile.in
+@@ -268,8 +268,8 @@
+ 
+ 
+ # LDADD might need RESLIB and ADJLIB
+-ntpq_LDADD = version.o @EDITLINE_LIBS@ $(LIBOPTS_LDADD) \
+-		../libntp/libntp.a @LCRYPTO@
++ntpq_LDADD = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a \
++		@EDITLINE_LIBS@ @LCRYPTO@
+ 
+ noinst_HEADERS = ntpq.h
+ noinst_LIBRARIES = libntpq.a
diff --git a/net-misc/ntp/ntp-4.2.6_p1.ebuild b/net-misc/ntp/ntp-4.2.6_p1.ebuild
new file mode 100644
index 000000000000..817ed7429f18
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.6_p1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2010 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_p1.ebuild,v 1.1 2010/04/16 22:42:22 vapier Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+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="as-is"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="caps debug ipv6 openntpd parse-clocks selinux 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] net-misc/mDNSResponder ) )
+	!openntpd? ( !net-misc/openntpd )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )"
+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
+	epatch "${FILESDIR}"/${P}-linking.patch
+	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=$(use zeroconf && echo yes || echo no)
+	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_with ssl crypto)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "install failed"
+	# move ntpd/ntpdate to sbin #66671
+	dodir /usr/sbin
+	mv "${D}"/usr/bin/{ntpd,ntpdate} "${D}"/usr/sbin/ || die "move to sbin"
+
+	dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START
+	doman "${WORKDIR}"/man/*.[58]
+	dohtml -r html/*
+
+	insinto /usr/share/ntp
+	doins "${FILESDIR}"/ntp.conf
+	cp -r scripts/* "${D}"/usr/share/ntp/ || die
+	fperms -R go-w /usr/share/ntp
+	find "${D}"/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
+	use caps || dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd
+	dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
+
+	keepdir /var/lib/ntp
+	fowners ntp:ntp /var/lib/ntp
+
+	if use openntpd ; then
+		cd "${D}"
+		rm usr/sbin/ntpd || die
+		rm -r var/lib
+		rm etc/{conf,init}.d/ntpd
+		rm usr/share/man/*/ntpd.8 || die
+	fi
+}
+
+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' "${ROOT}"/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
+}