Version bump.

(Portage version: 2.1_pre10-r2)

7 files changed, 180 insertions, 5 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 1b9b0a13e3cd..93fd22054c4b 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/ntp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.71 2006/03/31 00:37:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.72 2006/05/04 01:10:07 vapier Exp $
+
+*ntp-4.2.0.20060224 (04 May 2006)
+
+  04 May 2006; Mike Frysinger <vapier@gentoo.org>
+  +ntp-4.2.0.20060224.ebuild:
+  Version bump.
 
   31 Mar 2006; Diego Pettenò <flameeyes@gentoo.org>
   ntp-4.2.0.20050303-r1.ebuild:
diff --git a/net-misc/ntp/files/digest-ntp-4.1.2 b/net-misc/ntp/files/digest-ntp-4.1.2
index 3991a65ff918..28b433f059b6 100644
--- a/net-misc/ntp/files/digest-ntp-4.1.2
+++ b/net-misc/ntp/files/digest-ntp-4.1.2
@@ -1,2 +1,6 @@
-MD5 98e16c7aa4ecd4c004b51bff18962e95 ntp-4.1.2.tar.gz 2168384
 MD5 66f59d0eef99784e14b78157c87b97fa ntp-4.1.2-manpages.tbz2 19961
+RMD160 8e71c8bfce4a8d432520f8ca102acf6395e5bd5c ntp-4.1.2-manpages.tbz2 19961
+SHA256 2b1174f9158c1af00bfbda451719321cea2f8b98d68d0b54e2f087d347195835 ntp-4.1.2-manpages.tbz2 19961
+MD5 98e16c7aa4ecd4c004b51bff18962e95 ntp-4.1.2.tar.gz 2168384
+RMD160 053bc86725a923784da6af37f6a844f6a9819d03 ntp-4.1.2.tar.gz 2168384
+SHA256 9f4a5271a285d390c9225e3ea28f70049ea377d30fc6de4659007cfff278671a ntp-4.1.2.tar.gz 2168384
diff --git a/net-misc/ntp/files/digest-ntp-4.2.0-r2 b/net-misc/ntp/files/digest-ntp-4.2.0-r2
index eff87f02a9d5..5b725f4e9dfd 100644
--- a/net-misc/ntp/files/digest-ntp-4.2.0-r2
+++ b/net-misc/ntp/files/digest-ntp-4.2.0-r2
@@ -1,2 +1,6 @@
-MD5 0f8fabe87cf54f409b57c6283f0c0c3d ntp-4.2.0.tar.gz 2514502
 MD5 0333bcec9a94b17621c785ccae674285 ntp-4.2.0-r2-manpages.tar.bz2 25355
+RMD160 f8aacb8153e55ee5ad99e9e6893fe0e24145fe02 ntp-4.2.0-r2-manpages.tar.bz2 25355
+SHA256 c75dde3246c4bf251640d4b503114d2c30cd86b3d1ea6f2791fbc2b372a4efd3 ntp-4.2.0-r2-manpages.tar.bz2 25355
+MD5 0f8fabe87cf54f409b57c6283f0c0c3d ntp-4.2.0.tar.gz 2514502
+RMD160 73de5671ea583f6699c8052ea9f8270a8455c295 ntp-4.2.0.tar.gz 2514502
+SHA256 da784d5c0363d4f708a25f3aad23ba9a3486aafd464444d2aa6a9f8d29213f25 ntp-4.2.0.tar.gz 2514502
diff --git a/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r3 b/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r3
index 1fec3109247e..9044df5fe442 100644
--- a/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r3
+++ b/net-misc/ntp/files/digest-ntp-4.2.0.20040617-r3
@@ -1,2 +1,6 @@
-MD5 d0554ae42164bcda990e6318648a7c58 ntp-stable-4.2.0a-20040617.tar.gz 2435648
 MD5 0f2d809eb4a360dd4479b00cfd95bc4e ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346
+RMD160 2afd3dfc760b995e85cf9676f5b0b262523fd4b6 ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346
+SHA256 d88055fc4216ee5f34e4cd6a6fc47961904dbc559c0d78c3d814ee64223274bf ntp-stable-4.2.0a-20040617-manpages.tar.bz2 25346
+MD5 d0554ae42164bcda990e6318648a7c58 ntp-stable-4.2.0a-20040617.tar.gz 2435648
+RMD160 0de9b928c70e22e0a61cab16c749ac73083edd53 ntp-stable-4.2.0a-20040617.tar.gz 2435648
+SHA256 cb1561b13c95d6598c286bd0f80562e147c30e85104c3aec2a7be6eb5bc34cc3 ntp-stable-4.2.0a-20040617.tar.gz 2435648
diff --git a/net-misc/ntp/files/digest-ntp-4.2.0.20050303-r1 b/net-misc/ntp/files/digest-ntp-4.2.0.20050303-r1
index 60bb48950e2c..78587defbab1 100644
--- a/net-misc/ntp/files/digest-ntp-4.2.0.20050303-r1
+++ b/net-misc/ntp/files/digest-ntp-4.2.0.20050303-r1
@@ -1,2 +1,6 @@
-MD5 20b8d0616b637b8584147db39a754326 ntp-stable-4.2.0a-20050303.tar.gz 2446073
 MD5 d3a5a6185ef5ed71d2fa8e06598fc28f ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360
+RMD160 7c8b27357b76c8ab75b9f2f148abf214426288c2 ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360
+SHA256 5702731a6081abbb849ca52f13fa5b5a3570e75c9e96832b3a81d53e70fc214d ntp-stable-4.2.0a-20050303-manpages.tar.bz2 25360
+MD5 20b8d0616b637b8584147db39a754326 ntp-stable-4.2.0a-20050303.tar.gz 2446073
+RMD160 d8c5340c50a6a9c82a82577d4c2804d03f7fe83d ntp-stable-4.2.0a-20050303.tar.gz 2446073
+SHA256 55001c85e9607ab186ebb297a08369e7567150d5985583255fe560117d14639c ntp-stable-4.2.0a-20050303.tar.gz 2446073
diff --git a/net-misc/ntp/files/digest-ntp-4.2.0.20060224 b/net-misc/ntp/files/digest-ntp-4.2.0.20060224
new file mode 100644
index 000000000000..87177ae99e14
--- /dev/null
+++ b/net-misc/ntp/files/digest-ntp-4.2.0.20060224
@@ -0,0 +1,6 @@
+MD5 a3e5d74ece8eb066d93592a645b054b1 ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060
+RMD160 7fc34945a895175e4eb0d84e054bc701c62095ab ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060
+SHA256 d222f3c8dd98e1c35b8dd994727c7befbb1d03cba9dc1fceaa4c19c36b67bb5b ntp-stable-4.2.0a-20060224-manpages.tar.bz2 25060
+MD5 49d4a704b49dc1ef2a7ec0b7938c3ae1 ntp-stable-4.2.0a-20060224.tar.gz 2447194
+RMD160 36bcce870220fb670d63c4b05a968075f990ca9c ntp-stable-4.2.0a-20060224.tar.gz 2447194
+SHA256 5232890e8ac01f0549082d3f3f1dda60ed47b43f4fe22a562b9cf754a900f0d1 ntp-stable-4.2.0a-20060224.tar.gz 2447194
diff --git a/net-misc/ntp/ntp-4.2.0.20060224.ebuild b/net-misc/ntp/ntp-4.2.0.20060224.ebuild
new file mode 100644
index 000000000000..043f64007db5
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.0.20060224.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0.20060224.ebuild,v 1.1 2006/05/04 01:10:07 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+MY_P=${PN}-stable-${PV:0:5}a-${PV:6}
+DESCRIPTION="Network Time Protocol suite/programs"
+HOMEPAGE="http://www.ntp.org/"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/snapshots/ntp-stable/${PV:6:4}/${PV:10:2}/${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 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="logrotate parse-clocks nodroproot selinux ssl ipv6 openntpd debug"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.1
+	kernel_linux? ( !nodroproot? ( sys-libs/libcap ) )
+	!openntpd? ( !net-misc/openntpd )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )"
+DEPEND="${RDEPEND}
+	>=sys-apps/portage-2.0.51"
+PDEPEND="openntpd? ( net-misc/openntpd )"
+
+S=${WORKDIR}/${MY_P}
+
+hax_bitkeeper() {
+	# the makefiles have support for bk ...
+	# basically we have to do this or bk will try to write
+	# to files in /opt/bitkeeper causing sandbox violations ;(
+	mkdir "${T}"/fakebin
+	echo "#!/bin/sh"$'\n'"exit 1" > "${T}"/fakebin/bk
+	chmod a+x "${T}"/fakebin/bk
+	export PATH="${T}/fakebin:${PATH}"
+}
+
+pkg_setup() {
+	enewgroup ntp 123
+	enewuser ntp 123 -1 /dev/null ntp
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/4.2.0-linux-config-phone.patch #13001
+	epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch
+	epatch "${FILESDIR}"/4.2.0.20040617-errno-fix.patch
+	epatch "${FILESDIR}"/ntp-4.2.0-ntpd-using-wrong-group.patch #103719
+
+	sed -i \
+		-e 's:md5\.h:touch_not_my_md5:g' \
+		-e 's:-Wpointer-arith::' \
+		-e 's:-lelf:-la_doe_a_deer_a_female_deer:g' \
+		-e 's:-lmd5:-li_dont_want_no_stinkin_md5:g' \
+		configure || die "sed failed"
+	tc-is-cross-compiler || sed -i '/^BUILT_SOURCES/s:=.*:=:' ntpdc/Makefile.in
+}
+
+src_compile() {
+	hax_bitkeeper
+	econf \
+		$(use_enable !nodroproot linuxcaps) \
+		$(use_enable parse-clocks) \
+		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
+		$(use_with ssl crypto) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	hax_bitkeeper
+	make 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/*.1
+	dohtml -r html/*
+
+	insinto /usr/share/ntp
+	doins "${FILESDIR}"/ntp.conf
+	cp -r scripts/* "${D}"/usr/share/ntp/
+	chmod -R go-w "${D}"/usr/share/ntp
+	find "${D}"/usr/share/ntp \
+		'(' \
+		-name '*.in' -o \
+		-name 'Makefile*' -o \
+		-name 'rc[12]' -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 nodroproot && dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd
+	dosed "s:-Q::" /etc/conf.d/ntp-client # no longer needed
+	dosed "s:/usr/bin:/usr/sbin:" /etc/init.d/ntpd
+
+	keepdir /var/lib/ntp
+	fowners ntp:ntp /var/lib/ntp
+
+	if use logrotate ; then
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/ntp.logrotate ntp
+	fi
+
+	if use openntpd ; then
+		cd "${D}"
+		rm usr/sbin/ntpd
+		rm -r var/lib
+		rm etc/{conf,init}.d/ntpd
+	fi
+}
+
+pkg_preinst() {
+	if [[ -e ${ROOT}/etc/ntp.conf ]] ; then
+		rm -f "${D}"/etc/ntp.conf
+	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
+	einfo "The way ntp sets and maintains your system time has changed."
+	einfo "Now you can use /etc/init.d/ntp-client to set your time at"
+	einfo "boot while you can use /etc/init.d/ntpd to maintain your time"
+	einfo "while your machine runs"
+	if [[ -n $(egrep '^[^#].*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
+}