Version bump #254098.

Package-Manager: portage-2.2_rc20/cvs/Linux 2.6.28 x86_64

3 files changed, 152 insertions, 5 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index c6b8a7caa3c4..98cdaf38c79e 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,6 +1,11 @@
 # 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.132 2009/01/10 13:03:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.133 2009/01/10 13:12:11 vapier Exp $
+
+*ntp-4.2.4_p6 (10 Jan 2009)
+
+  10 Jan 2009; Mike Frysinger <vapier@gentoo.org> +ntp-4.2.4_p6.ebuild:
+  Version bump #254098.
 
   10 Jan 2009; Mike Frysinger <vapier@gentoo.org>
   +files/ntp-4.2.4_p5-adjtimex.patch, ntp-4.2.4_p5.ebuild:
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index a4abd3a9c7a1..bee027ebf90d 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -12,13 +12,16 @@ AUX ntpd.confd 189 RMD160 f66902d8abf5180ac8cc24646d665597cec8ba43 SHA1 f5fc6088
 AUX ntpd.rc 827 RMD160 b7155fb342453a108b7f6f3a89f0d01eda27fe57 SHA1 f2acf5591a991d5c448a2e714c90cd64ced9381c SHA256 3f1e27310bf09df5931cb4b3bac48b6b68b1a8b5a5db27db0953701fe97c66a5
 DIST ntp-4.2.4p5-manpages.tar.bz2 49663 RMD160 3923ef610c42040431d71e4386cdcc7ecc54ccd5 SHA1 212397a52db1370e25fab79623baf5ef3ebb6273 SHA256 ff112ec645ccd5c1f074029407529e995a13f9cbb211adac23ec75e646caebe1
 DIST ntp-4.2.4p5.tar.gz 3461636 RMD160 e6de8e264b1adc5b509c6685848321e45625909d SHA1 3c5fc87d337a082ff705805e1a2ee41634533cb5 SHA256 74cbea60cc5586c6a73d812088f15a0e77e191c18d476610f3f1b352ea43dd18
+DIST ntp-4.2.4p6-manpages.tar.bz2 49716 RMD160 5caa9341e0cbf66fef371d3b1832f81d42c5c139 SHA1 993b849a2e5fa719f53f85c4e83ee52eecbea56d SHA256 960447080376ecb429e83eea11f1cc64ec69c8abcb0534293a1da43c78eb515d
+DIST ntp-4.2.4p6.tar.gz 3443787 RMD160 d3853bdd593b49c435ec19b95066097ef5e71acc SHA1 ad4b068cc03ce346a6276ed6b31c026b6ffc3d92 SHA256 647640067c7c6a4c568af54c139ce07bbf9f69b54bf9be2704b4c99c56651067
 EBUILD ntp-4.2.4_p5.ebuild 4225 RMD160 113e004ee7b2a7476d9da474f6681bcf3f79c1f3 SHA1 9f4eef801f91a422aa6c7103f1c3914f4bf1aaeb SHA256 e6058ae2e0777adad086dafbf1d50b67d3b6ed3fe19da7aaa3a07a94cb37959d
-MISC ChangeLog 17949 RMD160 a721b4e4ff19e55162d7f56522a3d466551d9441 SHA1 4b34a139dc82bd1cd3e17a2d7643f4a9f2d52e8d SHA256 02bae8b943f5b9861a7cc533c8e5395cd616fbfdb8eb3197bf2f2611280c5c47
+EBUILD ntp-4.2.4_p6.ebuild 4236 RMD160 4deb66c6c8dbca37e2621b8b5d56acd786750247 SHA1 01dc7fd63298ccf1daff9a821f61b80c15d9d19a SHA256 3c9f1dd108e68d6065dbc78fdec1ced8b5f14d6fc4a0446eb81693e918d78ab0
+MISC ChangeLog 18075 RMD160 9e7cd10def597ab78782d00d119a3762c272ecfc SHA1 38d9b7bae4101d7d6cbafaa5948f9f247964be81 SHA256 119e85ae865b2f6b24ec6f56a08ca69934d7b4b3303b51065e92d05ce2b548f7
 MISC metadata.xml 715 RMD160 399981058fa1aae89de79c26de94873c2426ce22 SHA1 ebbfab9333a505a464b4fbcdd61345fb2358e74d SHA256 3f67258fd96d7520138375575b1763e018f22ef8fb87b71acd1f65fffe307de0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklonLUACgkQn/5bYzqsSmHhFgCfRKsYghLDW8m0KONrtHwmM7MF
-ip8AoIFQYO6n+OTd5iz/G+oczMW/wp87
-=naBv
+iEYEARECAAYFAklonrAACgkQn/5bYzqsSmH1AgCZAWy34B6NnEnabXFYTgZJn1a3
+QXYAoKIj0ZOzx5Dg3SqF7WCGV/Hbaw84
+=qYFu
 -----END PGP SIGNATURE-----
diff --git a/net-misc/ntp/ntp-4.2.4_p6.ebuild b/net-misc/ntp/ntp-4.2.4_p6.ebuild
new file mode 100644
index 000000000000..bbe2e021e75f
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.4_p6.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2009 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_p6.ebuild,v 1.1 2009/01/10 13:12:11 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="caps debug ipv6 openntpd parse-clocks selinux ssl zeroconf"
+
+DEPEND=">=sys-libs/ncurses-5.2
+	>=sys-libs/readline-4.1
+	kernel_linux? ( caps? ( sys-libs/libcap ) )
+	zeroconf? ( || ( net-dns/avahi net-misc/mDNSResponder ) )
+	!openntpd? ( !net-misc/openntpd )
+	ssl? ( dev-libs/openssl )
+	selinux? ( sec-policy/selinux-ntp )"
+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 -p "${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
+
+	if use zeroconf && has_version net-dns/avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then
+		eerror "You need to recompile net-dns/avahi with mdnsresponder-compat USE flag"
+		die "net-dns/avahi is missing required mdnsresponder-compat support"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Needs to be ported ...
+	#epatch "${FILESDIR}"/4.2.0.20040617-hostname.patch
+	epatch "${FILESDIR}"/${PN}-4.2.4_p5-adjtimex.patch #254030
+
+	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
+	# 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 \
+		$(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/ || 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
+}