diff options
| -rw-r--r-- | net-misc/ntp/ChangeLog | 15 | ||||
| -rw-r--r-- | net-misc/ntp/files/digest-ntp-4.1.1b-r3 (renamed from net-misc/ntp/files/digest-ntp-4.1.1b-r1) | 0 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntpd.confd | 23 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntpd.rc | 17 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.1.1b-r3.ebuild (renamed from net-misc/ntp/ntp-4.1.1b-r1.ebuild) | 15 |
5 files changed, 52 insertions, 18 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index 4dcb73e05110..677c549b008d 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for net-misc/ntp # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.15 2002/12/29 18:38:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.16 2003/01/01 01:27:45 vapier Exp $ + +*ntp-4.1.1b-r3 (31 Dec 2002) + + 31 Dec 2002; Mike Frysinger <vapier@gentoo.org> : + Hopefully this will keep everyone happy + Added ntpd.confd back in but with the ability for the end + user to use ntpdate or ntpd or whatever to set the clock ... or nothing + +*ntp-4.1.1b-r2 (27 Dec 2002) + + 27 Dec 2002; Martin Schlemmer <azarah@gentoo.org> : + Update /etc/init.d/ntpd to retire ntpdate. Also added improvements + suggested by Donny Davies <woodchip@gentoo.org>. This closes bug #897. *ntp-4.1.1b-r1 (16 Dec 2002) diff --git a/net-misc/ntp/files/digest-ntp-4.1.1b-r1 b/net-misc/ntp/files/digest-ntp-4.1.1b-r3 index dcdc2e9a8f30..dcdc2e9a8f30 100644 --- a/net-misc/ntp/files/digest-ntp-4.1.1b-r1 +++ b/net-misc/ntp/files/digest-ntp-4.1.1b-r3 diff --git a/net-misc/ntp/files/ntpd.confd b/net-misc/ntp/files/ntpd.confd new file mode 100644 index 000000000000..908abcca724b --- /dev/null +++ b/net-misc/ntp/files/ntpd.confd @@ -0,0 +1,23 @@ +# Copyright 1999-2002 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.confd,v 1.8 2003/01/01 01:27:45 vapier Exp $ + +# Comment this out if you dont want the init script to warn +# about not having ntpdate setup +NTPDATE_WARN="y" + +# Command to run to set the clock initially +# if you want to use ntpd to set the clock, change this to 'ntpd' +#NTPDATE_CMD="ntpdate" + +# Options to pass to the above command +# you might want to change 'someserver' to a valid +# hostname which you can aquire below +#NTPDATE_OPTS="-b someserver" + +## +# A list of available servers is available here: +# * http://www.eecis.udel.edu/~mills/ntp/clock1.html +# and +# * http://www.eecis.udel.edu/~mills/ntp/clock2.html +## diff --git a/net-misc/ntp/files/ntpd.rc b/net-misc/ntp/files/ntpd.rc index 7cdba1795d99..564b1e8ede55 100644 --- a/net-misc/ntp/files/ntpd.rc +++ b/net-misc/ntp/files/ntpd.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.8 2002/12/29 18:38:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.9 2003/01/01 01:27:45 vapier Exp $ depend() { need net @@ -10,22 +10,21 @@ depend() { checkconfig() { if [ ! -f /etc/ntp.conf ] ; then eerror "Please create /etc/ntp.conf" + eerror "Sample conf: /usr/share/ntp/ntp.conf" return 1 fi - return 0 } start() { checkconfig || return $? - NTPDATESERVERS=`egrep '^(server|peer)[[:space:]]+' /etc/ntp.conf | awk '{print $2}'` - if [ -n "${NTPDATESERVERS}" ] ; then - ebegin "Running ntpdate" - ntpdate -b ${NTPDATESERVERS} > /dev/null - eend $? "Failed to run ntpdate" - else - ewarn "Please set a valid server line in /etc/ntp.conf" + if [ -n "${NTPDATE_CMD}" ] ; then + ebegin "Initializing clock via ${NTPDATE_CMD}" + ${NTPDATE_CMD} ${NTPDATE_OPTS} > /dev/null + eend $? "Failed to run ${NTPDATE_CMD}" + elif [ "${NTPDATE_WARN}" == "y" ] ; then + ewarn "Please setup ntpd via /etc/conf.d/ntpd" fi ebegin "Starting ntpd" diff --git a/net-misc/ntp/ntp-4.1.1b-r1.ebuild b/net-misc/ntp/ntp-4.1.1b-r3.ebuild index 6ffb6517f06b..aacac151df26 100644 --- a/net-misc/ntp/ntp-4.1.1b-r1.ebuild +++ b/net-misc/ntp/ntp-4.1.1b-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.1.1b-r1.ebuild,v 1.2 2002/12/29 18:38:53 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.1.1b-r3.ebuild,v 1.1 2003/01/01 01:27:45 vapier Exp $ inherit eutils @@ -28,20 +28,19 @@ src_compile() { cp configure configure.orig sed -e "s:-Wpointer-arith::" configure.orig > configure - econf --build=${CHOST} + econf --build=${CHOST} || die emake || die } src_install() { - einstall + einstall || die dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START - insinto /usr/share/doc/${PF}/html ; doins html/*.htm - insinto /usr/share/doc/${PF}/html/hints ; doins html/hints/* - insinto /usr/share/doc/${PF}/html/pic ; doins html/pic/* + dohtml -r html/* - insinto /usr/share/ntp ; doins scripts/* + insinto /usr/share/ntp + doins scripts/* ${FILESDIR}/ntp.conf exeinto /etc/init.d ; newexe ${FILESDIR}/ntpd.rc ntpd - insinto /etc ; newins ${FILESDIR}/ntp.conf ntp.conf + insinto /etc/conf.d ; newins ${FILESDIR}/ntpd.confd ntpd } |