diff options
author | 2002-12-29 18:39:15 +0000 | |
---|---|---|
committer | 2002-12-29 18:39:15 +0000 | |
commit | 70549453a089be12eb13a65ecb02c67bf05df64e (patch) | |
tree | b1dcd9b517f1dd15e2f79fb490d167196f8c5169 /net-misc | |
parent | remasking at drobbins request (diff) | |
download | gentoo-2-70549453a089be12eb13a65ecb02c67bf05df64e.tar.gz gentoo-2-70549453a089be12eb13a65ecb02c67bf05df64e.tar.bz2 gentoo-2-70549453a089be12eb13a65ecb02c67bf05df64e.zip |
take a step back
Diffstat (limited to 'net-misc')
-rw-r--r-- | net-misc/ntp/ChangeLog | 8 | ||||
-rw-r--r-- | net-misc/ntp/files/digest-ntp-4.1.1b-r2 | 1 | ||||
-rw-r--r-- | net-misc/ntp/files/ntpd.confd | 15 | ||||
-rw-r--r-- | net-misc/ntp/files/ntpd.rc | 26 | ||||
-rw-r--r-- | net-misc/ntp/ntp-4.1.1b-r1.ebuild | 8 | ||||
-rw-r--r-- | net-misc/ntp/ntp-4.1.1b-r2.ebuild | 51 |
6 files changed, 16 insertions, 93 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index b908458901e8..4dcb73e05110 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,12 +1,6 @@ # 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.14 2002/12/27 23:47:44 azarah Exp $ - -*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. +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.15 2002/12/29 18:38:53 vapier Exp $ *ntp-4.1.1b-r1 (16 Dec 2002) diff --git a/net-misc/ntp/files/digest-ntp-4.1.1b-r2 b/net-misc/ntp/files/digest-ntp-4.1.1b-r2 deleted file mode 100644 index dcdc2e9a8f30..000000000000 --- a/net-misc/ntp/files/digest-ntp-4.1.1b-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 27382aa9c483e395662dddb2b11439e2 ntp-4.1.1b.tar.gz 2125307 diff --git a/net-misc/ntp/files/ntpd.confd b/net-misc/ntp/files/ntpd.confd deleted file mode 100644 index 29b916646110..000000000000 --- a/net-misc/ntp/files/ntpd.confd +++ /dev/null @@ -1,15 +0,0 @@ -# /etc/conf.d/ntpd: -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.confd,v 1.6 2002/12/27 23:47:44 azarah Exp $ - -# Config file for /etc/init.d/ntpd - -# The '-q' option mimics the behaviour of the 'ntpdate' program, -# which is to be retired. It causes ntpd to exit just after the -# first time the clock is set. You should add the 'iburst' -# keyword to the server statements in /etc/ntp.conf before using -# this. Also note that 'ntpd -q' will not set the time if its -# off by more than 1000 secs, so adding '-g' may be a needed if -# your time tends to be out with a few seconds. - -#NTPD_OPTS="-q -g" - diff --git a/net-misc/ntp/files/ntpd.rc b/net-misc/ntp/files/ntpd.rc index d2a68dccd33f..7cdba1795d99 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.7 2002/12/27 23:47:44 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.8 2002/12/29 18:38:53 vapier Exp $ depend() { need net @@ -19,25 +19,19 @@ checkconfig() { start() { checkconfig || return $? - NTPDATESERVERS="`egrep '^(server|peer)[[:space:]]+' /etc/ntp.conf`" - if [ -z "${NTPDATESERVERS}" ] ; then + 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" fi - if [ "${NTPD_OPTS/-q}" != "${NTPD_OPTS}" ] ; then - ebegin "Starting ntpd (ntpdate)" - start-stop-daemon --start --quiet --pidfile /var/run/ntpd.pid \ - --startas /usr/bin/ntpd -- -p /var/run/ntpd.pid ${NTPD_OPTS} - eend $? "Failed to start ntpd (ntpdate)" - - # clean stale pidfile - [ -f /var/run/ntpd.pid ] && rm -f /var/run/ntpd.pid - fi - - ebegin "Starting ntpd (daemon)" + ebegin "Starting ntpd" start-stop-daemon --start --quiet --pidfile /var/run/ntpd.pid \ - --startas /usr/bin/ntpd -- -p /var/run/ntpd.pid ${NTPD_OPTS/-q} - eend $? "Failed to start ntpd (daemon)" + --startas /usr/bin/ntpd -- -p /var/run/ntpd.pid + eend $? "Failed to start ntpd" } stop() { diff --git a/net-misc/ntp/ntp-4.1.1b-r1.ebuild b/net-misc/ntp/ntp-4.1.1b-r1.ebuild index 6d9f703bb36e..6ffb6517f06b 100644 --- a/net-misc/ntp/ntp-4.1.1b-r1.ebuild +++ b/net-misc/ntp/ntp-4.1.1b-r1.ebuild @@ -1,6 +1,8 @@ # 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.1 2002/12/16 16:19:06 vapier Exp $ +# $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 $ + +inherit eutils DESCRIPTION="Network Time Protocol suite/programs" SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz" @@ -15,8 +17,8 @@ DEPEND="virtual/glibc >=sys-libs/readline-4.1" src_unpack() { - unpack ${A} && cd ${S} - patch -p1 < ${FILESDIR}/ntp-bk.diff + unpack ${A} + cd ${S}; epatch ${FILESDIR}/ntp-bk.diff aclocal -I . || die automake || die autoconf || die diff --git a/net-misc/ntp/ntp-4.1.1b-r2.ebuild b/net-misc/ntp/ntp-4.1.1b-r2.ebuild deleted file mode 100644 index 3e83a115863b..000000000000 --- a/net-misc/ntp/ntp-4.1.1b-r2.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# 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-r2.ebuild,v 1.1 2002/12/27 23:47:44 azarah Exp $ - -IUSE="" - -inherit eutils - -DESCRIPTION="Network Time Protocol suite/programs" -SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz" -HOMEPAGE="http://www.ntp.org/" - -LICENSE="as-is" -KEYWORDS="x86 ppc sparc alpha" -SLOT="0" - -DEPEND="virtual/glibc - >=sys-libs/ncurses-5.2 - >=sys-libs/readline-4.1" - -src_unpack() { - unpack ${A} - - cd ${S}; epatch ${FILESDIR}/ntp-bk.diff - aclocal -I . || die - automake || die - autoconf || die -} - -src_compile() { - cp configure configure.orig - sed -e "s:-Wpointer-arith::" configure.orig > configure - - econf --build=${CHOST} - emake || die -} - -src_install() { - einstall - - 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/* - - insinto /usr/share/ntp ; doins scripts/* - - exeinto /etc/init.d ; newexe ${FILESDIR}/ntpd.rc ntpd - insinto /etc/conf.d ; newins ${FILESDIR}/ntpd.confd ntpd - insinto /etc ; newins ${FILESDIR}/ntp.conf ntp.conf -} |