Version bump.

(Portage version: 2.1.1_pre2-r8)

4 files changed, 169 insertions, 1 deletions

diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index d4a6f5c0b80f..b9600e031119 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.74 2006/06/17 07:42:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.75 2006/07/16 07:03:01 vapier Exp $
+
+*ntp-4.2.2_p2 (16 Jul 2006)
+
+  16 Jul 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/ntp-4.2.2_p2-sntp-header.patch, +ntp-4.2.2_p2.ebuild:
+  Version bump.
 
 *ntp-4.2.2 (17 Jun 2006)
 
diff --git a/net-misc/ntp/files/digest-ntp-4.2.2_p2 b/net-misc/ntp/files/digest-ntp-4.2.2_p2
new file mode 100644
index 000000000000..9bf17bbed341
--- /dev/null
+++ b/net-misc/ntp/files/digest-ntp-4.2.2_p2
@@ -0,0 +1,6 @@
+MD5 d42b28df83b9c08850f5b92d4f17a8a3 ntp-4.2.2p2-manpages.tar.bz2 48744
+RMD160 e684f7e0fc285b0cd469346859e9daf8ead413fc ntp-4.2.2p2-manpages.tar.bz2 48744
+SHA256 1ca88851575e7cb2fc9c48409e26da89048ac78e4098f5a4f6d504846de28690 ntp-4.2.2p2-manpages.tar.bz2 48744
+MD5 5c6ca6fab651c9cb21754a6478b8650e ntp-4.2.2p2.tar.gz 2563137
+RMD160 3c4c01c902be0afe92dd15d52c746549bd26d27f ntp-4.2.2p2.tar.gz 2563137
+SHA256 38105050bd0c6852e5ce03ee541ac726e75a838fe4925df1a8d63c016e26c923 ntp-4.2.2p2.tar.gz 2563137
diff --git a/net-misc/ntp/files/ntp-4.2.2_p2-sntp-header.patch b/net-misc/ntp/files/ntp-4.2.2_p2-sntp-header.patch
new file mode 100644
index 000000000000..039a5663dd2d
--- /dev/null
+++ b/net-misc/ntp/files/ntp-4.2.2_p2-sntp-header.patch
@@ -0,0 +1,11 @@
+--- ntp-4.2.2p2/sntp/socket.c	2006-07-09 07:01:46.000000000 -0400
++++ ntp-4.2.2/sntp/socket.c	2006-06-06 16:17:16.000000000 -0400
+@@ -8,8 +8,6 @@
+ 
+ 
+ 
+-#include "config.h"
+-
+ #include "header.h"
+ #include "internet.h"
+ #include <fcntl.h>
diff --git a/net-misc/ntp/ntp-4.2.2_p2.ebuild b/net-misc/ntp/ntp-4.2.2_p2.ebuild
new file mode 100644
index 000000000000..393090ae5688
--- /dev/null
+++ b/net-misc/ntp/ntp-4.2.2_p2.ebuild
@@ -0,0 +1,145 @@
+# 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.2_p2.ebuild,v 1.1 2006/07/16 07:03:01 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 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="logrotate parse-clocks caps selinux ssl ipv6 openntpd debug"
+
+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
+
+	epatch "${FILESDIR}"/${P}-sntp-header.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
+	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/*.[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 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
+}