Version bump.

Package-Manager: portage-2.1.2_rc4-r3

4 files changed, 167 insertions, 8 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 5a8445341197..5675fdaa5d5b 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.89 2006/12/29 22:23:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.90 2006/12/31 14:45:20 vapier Exp $
+
+*ntp-4.2.4 (31 Dec 2006)
+
+  31 Dec 2006; Mike Frysinger <vapier@gentoo.org> +ntp-4.2.4.ebuild:
+  Version bump.
 
   29 Dec 2006; Mike Frysinger <vapier@gentoo.org> -files/ntp.logrotate,
   ntp-4.2.2_p3.ebuild, ntp-4.2.2_p4.ebuild:
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index 444e50c3dc5f..f67de776c57e 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -25,6 +25,8 @@ DIST ntp-4.2.2p3-manpages.tar.bz2 48839 RMD160 ef4a57738db9978ba55d287795d866dad
 DIST ntp-4.2.2p3.tar.gz 2563397 RMD160 fb377b5e7a561bca172e9ba71288a691c5f40f5e SHA1 3cbeea0c65e5346661301832c0484dfbf7395714 SHA256 385a606007eb14f5847f033ac6fa8ea48366597ad1f93aa99864e1f82e23ac88
 DIST ntp-4.2.2p4-manpages.tar.bz2 48792 RMD160 f87e58acdd7c7d3ef2bc3e008f605a4ef4a94317 SHA1 3f451d3dad5b92dea91f8d3c550d6f8d36d840c6 SHA256 d0a127935129d68ca8192ae8c1879fd71b48bef559aa2cf3d795b49e3d08a079
 DIST ntp-4.2.2p4.tar.gz 2499611 RMD160 59e87403c14613c2aa6f619fa0c53aaae42962db SHA1 5239d2fa462555bc7b9031cc2abc3e10dda61f60 SHA256 08544958c6db9a9042a997fdd8245e909d9280a42b6d197edb9062d4cabfd6f4
+DIST ntp-4.2.4-manpages.tar.bz2 49084 RMD160 a0f58094502b309e777b0e227f8e8b0c316f6c26 SHA1 1b9bcc67c7a82d9420f3f84e6cb019a59959dda9 SHA256 47daa90cec64bb1796f2194732972ee94947c64e64e571b27d2b77b3741991d6
+DIST ntp-4.2.4.tar.gz 3417698 RMD160 bd51211582958f7c7d14ecd5ba04f5815bdc7ef8 SHA1 a068541afa9b2fdfae8859d773baf739c1e08b1e SHA256 a8adc8134d692273673559da3a4181e12cfb166f2177c726f916d4a9ff18182f
 EBUILD ntp-4.2.2_p3.ebuild 3872 RMD160 f25d9328d09cf8a50189eab1b02d310532e183ba SHA1 c1abd5c97128f782a74091644d2b5ee26510af3b SHA256 899f4d2f2a56fffccf2dd8bbffa91b85531ab3f60c0fb3d97b2755428b7732b7
 MD5 968721a6ecff48508939766478d89e83 ntp-4.2.2_p3.ebuild 3872
 RMD160 f25d9328d09cf8a50189eab1b02d310532e183ba ntp-4.2.2_p3.ebuild 3872
@@ -33,10 +35,14 @@ EBUILD ntp-4.2.2_p4.ebuild 3884 RMD160 c1b6b791254b4dad2427692687baa8d114b9fc6b
 MD5 e025a83a527b6da5ec3ac5c4173bba92 ntp-4.2.2_p4.ebuild 3884
 RMD160 c1b6b791254b4dad2427692687baa8d114b9fc6b ntp-4.2.2_p4.ebuild 3884
 SHA256 4eb429fb97871a55cc02156011df05b2a7a1df0bda01b876be335ba5e2909cd6 ntp-4.2.2_p4.ebuild 3884
-MISC ChangeLog 13177 RMD160 6e8d5f923faf31d07b3eee3dba7042bf28d4ba50 SHA1 5cba55fdc5c65cf9d1ad9d49264c70714c1e22b3 SHA256 399105bed8816692d16212f2a7a891f74d865eba1dba8718bc8d54165573a0e0
-MD5 b03753e2433c2337eea7f4e23543122f ChangeLog 13177
-RMD160 6e8d5f923faf31d07b3eee3dba7042bf28d4ba50 ChangeLog 13177
-SHA256 399105bed8816692d16212f2a7a891f74d865eba1dba8718bc8d54165573a0e0 ChangeLog 13177
+EBUILD ntp-4.2.4.ebuild 3886 RMD160 0d4828425c5f7c1609dffa2bfe7237dd9a8f3634 SHA1 72bfb94b12f03e061a20382f25335ebf73cb75b7 SHA256 008e2162f08014f567d0e307f9bbefae8704d9e6000242a5642db9addd69552e
+MD5 91d4406d36476214de58ad7d3a4cfce5 ntp-4.2.4.ebuild 3886
+RMD160 0d4828425c5f7c1609dffa2bfe7237dd9a8f3634 ntp-4.2.4.ebuild 3886
+SHA256 008e2162f08014f567d0e307f9bbefae8704d9e6000242a5642db9addd69552e ntp-4.2.4.ebuild 3886
+MISC ChangeLog 13289 RMD160 7ad336a555e1e09f05f0d9bc0e404364030bb67b SHA1 d064284cff59340b16991b5a5c2d165dff23ebd1 SHA256 8c3c9c4de07acf2c276ed2961da6e1bc1404eb4971605a75f98f1e4b0f8354d9
+MD5 c54734f025aaa7693be8d17a664e9b94 ChangeLog 13289
+RMD160 7ad336a555e1e09f05f0d9bc0e404364030bb67b ChangeLog 13289
+SHA256 8c3c9c4de07acf2c276ed2961da6e1bc1404eb4971605a75f98f1e4b0f8354d9 ChangeLog 13289
 MISC metadata.xml 607 RMD160 f005595b482e97659d0dc42cf0af1c56d88ec3a7 SHA1 67aab04a0a7021caf7a78d9094315f3595f47409 SHA256 14dc7da8f6d0ccaafa8408e289acd1a23f7adff23ef45c2fdd0d8b89d97d0222
 MD5 8d52071ded7c5d37f4823ac9a4fffb8e metadata.xml 607
 RMD160 f005595b482e97659d0dc42cf0af1c56d88ec3a7 metadata.xml 607
@@ -47,10 +53,13 @@ SHA256 560137fe3eb14759fad10b8b4c6af6e785a4de18be8103add02244e587d41f55 files/di
 MD5 b074bf5f796ed02c56aa4da099376456 files/digest-ntp-4.2.2_p4 500
 RMD160 7ad5e24ee1ca85f52a3ce913c3042df7859329e5 files/digest-ntp-4.2.2_p4 500
 SHA256 d05fcf4e69cacf4334cb17bec3601e2ebb65529709f1a6f95c61cfbc8067a29b files/digest-ntp-4.2.2_p4 500
+MD5 e39395059089848ec999738d8e9a6bca files/digest-ntp-4.2.4 488
+RMD160 47cc46be562bc1226f5aa5b5c0c75473c2cb2d5b files/digest-ntp-4.2.4 488
+SHA256 0712d606ca90d45e71dd9b4cf2a675cbf6939f08d965c5fdd0e0cb7799098d0e files/digest-ntp-4.2.4 488
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFl8su8bi6rjpTunYRArjpAJ9VEkGFWgpS1hpL4z+zwdjrl+hFGwCgtZkc
-ZQckYUHLM2cPCvbl6Uq2/UY=
-=pEFk
+iD8DBQFFl81G8bi6rjpTunYRAg01AJ9VsAbqIymbzcXTjzprZxrQgTHxigCfZ72W
+IaZN7fCD/O8Yub/B7OewBvY=
+=R3P/
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/digest-ntp-4.2.4 b/net-misc/ntp/files/digest-ntp-4.2.4
new file mode 100644
index 000000000000..35b5c07d3563
--- /dev/null
+++ b/net-misc/ntp/files/digest-ntp-4.2.4
@@ -0,0 +1,6 @@
+MD5 7634518362dff8528c6527646885d96e ntp-4.2.4-manpages.tar.bz2 49084
+RMD160 a0f58094502b309e777b0e227f8e8b0c316f6c26 ntp-4.2.4-manpages.tar.bz2 49084
+SHA256 47daa90cec64bb1796f2194732972ee94947c64e64e571b27d2b77b3741991d6 ntp-4.2.4-manpages.tar.bz2 49084
+MD5 eb9147d26cbe18bd8fbec07f1df55aef ntp-4.2.4.tar.gz 3417698
+RMD160 bd51211582958f7c7d14ecd5ba04f5815bdc7ef8 ntp-4.2.4.tar.gz 3417698
+SHA256 a8adc8134d692273673559da3a4181e12cfb166f2177c726f916d4a9ff18182f ntp-4.2.4.tar.gz 3417698
diff --git a/net-misc/ntp/ntp-4.2.4.ebuild b/net-misc/ntp/ntp-4.2.4.ebuild
new file mode 100644
index 000000000000..e80972793820
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.4.ebuild
@@ -0,0 +1,139 @@
+# 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.4.ebuild,v 1.1 2006/12/31 14:45:20 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+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 ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="parse-clocks caps selinux ssl ipv6 debug openntpd"
+
+RDEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.1
+	kernel_linux? ( caps? ( 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}"
+
+	# Needs to be ported ...
+	#epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch
+
+	sed -i \
+		-e 's:md5\.h:touch_not_my_md5:g' \
+		-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"
+}
+
+src_compile() {
+	hax_bitkeeper
+	econf \
+		$(use_enable caps linuxcaps) \
+		$(use_enable parse-clocks) \
+		$(use_enable ipv6) \
+		$(use_enable debug debugging) \
+		$(use_with ssl crypto) \
+		|| die
+	emake || die
+}
+
+src_install() {
+	hax_bitkeeper
+	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/
+	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 caps || 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 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_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
+}