diff options
author | Mike Frysinger <vapier@gentoo.org> | 2003-12-12 00:07:46 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2003-12-12 00:07:46 +0000 |
commit | 50064f837b4e52c4f37d981ba4b778b0de20f524 (patch) | |
tree | da4c22e720aec4b325d3c1a6951d237f327fc398 /net-misc/clockspeed | |
parent | arts/la fix #34804 (diff) | |
download | gentoo-2-50064f837b4e52c4f37d981ba4b778b0de20f524.tar.gz gentoo-2-50064f837b4e52c4f37d981ba4b778b0de20f524.tar.bz2 gentoo-2-50064f837b4e52c4f37d981ba4b778b0de20f524.zip |
fix temp file locations #34708
Diffstat (limited to 'net-misc/clockspeed')
-rw-r--r-- | net-misc/clockspeed/ChangeLog | 7 | ||||
-rw-r--r-- | net-misc/clockspeed/clockspeed-0.62-r1.ebuild | 48 | ||||
-rw-r--r-- | net-misc/clockspeed/clockspeed-0.62-r3.ebuild (renamed from net-misc/clockspeed/clockspeed-0.62-r2.ebuild) | 38 | ||||
-rw-r--r-- | net-misc/clockspeed/files/0.62-gentoo.patch | 251 | ||||
-rw-r--r-- | net-misc/clockspeed/files/clockspeed-0.62-r1-gentoo.diff | 34 | ||||
-rw-r--r-- | net-misc/clockspeed/files/clockspeed-0.62-r2-gentoo.diff | 57 | ||||
-rw-r--r-- | net-misc/clockspeed/files/digest-clockspeed-0.62-r2 | 1 | ||||
-rw-r--r-- | net-misc/clockspeed/files/digest-clockspeed-0.62-r3 (renamed from net-misc/clockspeed/files/digest-clockspeed-0.62-r1) | 0 | ||||
-rw-r--r-- | net-misc/clockspeed/files/ntpclockset | 8 |
9 files changed, 277 insertions, 167 deletions
diff --git a/net-misc/clockspeed/ChangeLog b/net-misc/clockspeed/ChangeLog index 09441ff613f6..ec421642f9a7 100644 --- a/net-misc/clockspeed/ChangeLog +++ b/net-misc/clockspeed/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/clockspeed # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/ChangeLog,v 1.10 2003/02/12 08:20:34 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/ChangeLog,v 1.11 2003/12/12 00:07:46 vapier Exp $ + +*clockspeed-0.62-r3 (11 Dec 2003) + + 11 Dec 2003; Mike Frysinger <vapier@gentoo.org> : + Version bump to fix state file install locations #34708. *clockspeed-0.62-r2 (09 Jan 2003) diff --git a/net-misc/clockspeed/clockspeed-0.62-r1.ebuild b/net-misc/clockspeed/clockspeed-0.62-r1.ebuild deleted file mode 100644 index 8595e9a1e64f..000000000000 --- a/net-misc/clockspeed/clockspeed-0.62-r1.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r1.ebuild,v 1.14 2003/02/28 16:55:00 liquidx Exp $ - -inherit eutils - -IUSE="" - -S=${WORKDIR}/${P} -DESCRIPTION="A simple Network Time Protocol (NTP) client" -SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz" -HOMEPAGE="http://cr.yp.to/" - -SLOT="0" -LICENSE="as-is" -KEYWORDS="x86 sparc ppc" - -DEPEND="sys-apps/groff" - -src_compile() { - epatch ${FILESDIR}/${PF}-gentoo.diff - - cp -a conf-cc conf-cc.orig - sed "s:@CFLAGS@:${CFLAGS}:" < conf-cc.orig > conf-cc - - emake || die -} - -src_install () { - dodir /etc /usr/bin /usr/sbin /usr/share/man/man1 - insinto /etc - doins leapsecs.dat - - into /usr - dobin clockspeed clockadd clockview sntpclock taiclock taiclockd - doman clockspeed.1 clockadd.1 clockview.1 sntpclock.1 taiclock.1 taiclockd.1 - - exeinto /usr/sbin - doexe ${FILESDIR}/ntpclockset - - dodoc BLURB CHANGES README THANKS TODO INSTALL -} - -pkg_postinst() { - echo - einfo "Use ntpclockset to set your clock!" - echo -} diff --git a/net-misc/clockspeed/clockspeed-0.62-r2.ebuild b/net-misc/clockspeed/clockspeed-0.62-r3.ebuild index 83152d720232..47e4f94c529a 100644 --- a/net-misc/clockspeed/clockspeed-0.62-r2.ebuild +++ b/net-misc/clockspeed/clockspeed-0.62-r3.ebuild @@ -1,32 +1,30 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r2.ebuild,v 1.4 2003/04/01 21:46:56 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/clockspeed/clockspeed-0.62-r3.ebuild,v 1.1 2003/12/12 00:07:46 vapier Exp $ inherit eutils -IUSE="static" - DESCRIPTION="A simple Network Time Protocol (NTP) client" +HOMEPAGE="http://cr.yp.to/clockspeed.html" SRC_URI="http://cr.yp.to/clockspeed/${P}.tar.gz" -HOMEPAGE="http://cr.yp.to/" -SLOT="0" LICENSE="as-is" -KEYWORDS="x86 ~ppc ~sparc" +SLOT="0" +KEYWORDS="x86 ppc sparc" +IUSE="static" DEPEND="sys-apps/groff" -src_compile() { - epatch ${FILESDIR}/${PF}-gentoo.diff - - cp conf-cc{,.old} - sed -e "s/@CFLAGS@/${CFLAGS}/" conf-cc.old > conf-cc - +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PV}-gentoo.patch + sed -i "s:@CFLAGS@:${CFLAGS}:" conf-cc use static && LDFLAGS="${LDFLAGS} -static" + sed -i "s:@LDFLAGS@:${LDFLAGS}:" conf-ld +} - cp conf-ld{,.old} - sed -e "s:@LDFLAGS@:${LDFLAGS}:" conf-ld.old > conf-ld - +src_compile() { emake || die } @@ -35,14 +33,8 @@ src_install() { dosbin ${FILESDIR}/ntpclockset doman clockspeed.1 clockadd.1 clockview.1 sntpclock.1 taiclock.1 taiclockd.1 - dodoc BLURB CHANGES README THANKS TODO INSTALL + dodoc BLURB CHANGES README THANKS TODO - insinto /etc + insinto /var/lib/clockspeed doins leapsecs.dat } - -pkg_postinst() { - echo - einfo "Use ntpclockset to set your clock!" - echo -} diff --git a/net-misc/clockspeed/files/0.62-gentoo.patch b/net-misc/clockspeed/files/0.62-gentoo.patch new file mode 100644 index 000000000000..7055ef102eef --- /dev/null +++ b/net-misc/clockspeed/files/0.62-gentoo.patch @@ -0,0 +1,251 @@ +diff -ur clockspeed-0.62.orig/INSTALL clockspeed-0.62/INSTALL +--- clockspeed-0.62.orig/INSTALL 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/INSTALL 2003-12-02 09:14:41.000000000 +0200 +@@ -4,8 +4,8 @@ + + Things you have to decide before starting: + +-* Where the clockspeed package will be installed, normally +-/usr/local/clockspeed. To change this directory, edit conf-home now. ++* Where the clockspeed package will be installed, normally /usr. ++To change this directory, edit conf-home now. + + + How to install: +@@ -16,9 +16,9 @@ + or with gethrtime(). The compiler must support a 64-bit type, either + long or long long. + +- 2. Install the programs, the man pages, and /etc/leapsecs.dat: ++ 2. Install the programs, the man pages, and /var/lib/clockspeed/leapsecs.dat: + # make setup check +- Put /usr/local/clockspeed/bin into $PATH. ++ Put /usr/bin into $PATH. + + + How to test: +@@ -39,20 +39,20 @@ + 5. Start clockspeed: + # clockspeed & + Give clockspeed a time measurement: +- # sntpclock 1.2.3.4 > /usr/local/clockspeed/adjust & ++ # sntpclock 1.2.3.4 > /var/lib/clockspeed/adjust & + + 6. After a few hours, give clockspeed a second time measurement: +- # sntpclock 1.2.3.4 > /usr/local/clockspeed/adjust & ++ # sntpclock 1.2.3.4 > /var/lib/clockspeed/adjust & + You can run sntpclock as a non-root user, if you change +- /usr/local/clockspeed/adjust to be owned by that user. I recommend ++ /var/lib/clockspeed/adjust to be owned by that user. I recommend + this for security. + + 7. After a few days, check how well clockspeed has adjusted your clock: + % sntpclock 1.2.3.4 | clockview + Check how many attoseconds clockspeed thinks are in one tick: +- % clockview < /usr/local/clockspeed/etc/atto ++ % clockview < /var/lib/clockspeed/atto + Give it another time measurement: +- # sntpclock 1.2.3.4 > /usr/local/clockspeed/adjust & ++ # sntpclock 1.2.3.4 > /var/lib/clockspeed/adjust & + + 8. Repeat step 7 after a few weeks, then after a few months. Your clock + should now be synchronized to the remote clock to within a few +@@ -70,7 +70,7 @@ + Here 5.6.7.8 is the master's IP address. Set the client's clock: + # clockadd < adjustment + Finally, run clockspeed as in step 5, and do +- % taiclock 5.6.7.8 > /usr/local/clockspeed/adjust & ++ % taiclock 5.6.7.8 > /var/lib/clockspeed/adjust & + after a few days. + + +diff -ur clockspeed-0.62.orig/Makefile clockspeed-0.62/Makefile +--- clockspeed-0.62.orig/Makefile 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/Makefile 2003-12-02 09:22:21.000000000 +0200 +@@ -7,8 +7,8 @@ + auto-ccld.sh: \ + conf-cc conf-ld warn-auto.sh + ( cat warn-auto.sh; \ +- echo CC=\'`head -1 conf-cc`\'; \ +- echo LD=\'`head -1 conf-ld`\' \ ++ echo CC=\'`head -n 1 conf-cc`\'; \ ++ echo LD=\'`head -n 1 conf-ld`\' \ + ) > auto-ccld.sh + + auto-str: \ +@@ -21,7 +21,7 @@ + + auto_home.c: \ + auto-str conf-home +- ./auto-str auto_home `head -1 conf-home` > auto_home.c ++ ./auto-str auto_home `head -n 1 conf-home` > auto_home.c + + auto_home.o: \ + compile auto_home.c +diff -ur clockspeed-0.62.orig/clockspeed.1 clockspeed-0.62/clockspeed.1 +--- clockspeed-0.62.orig/clockspeed.1 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/clockspeed.1 2003-12-02 09:14:41.000000000 +0200 +@@ -12,7 +12,7 @@ + + .B clockspeed + reads the real-time measurements from +-.BR /usr/local/clockspeed/adjust . ++.BR /var/lib/clockspeed/adjust . + Each real-time measurement must be a single 16-byte packet, + expressed as a TAI64NA time adjustment to the local UNIX clock. + +@@ -24,12 +24,12 @@ + .B clockspeed + can figure out the number of real attoseconds per tick. + It saves this number in TAI64NA format in +-.BR /usr/local/clockspeed/etc/atto , ++.BR /var/lib/clockspeed/atto , + overwriting +-.B /usr/local/clockspeed/etc/atto.tmp ++.B /var/lib/clockspeed/atto.tmp + for reliability. + It reads +-.B /usr/local/clockspeed/etc/atto ++.B /var/lib/clockspeed/atto + when it starts up again. + + .B clockspeed +diff -ur clockspeed-0.62.orig/clockspeed.c clockspeed-0.62/clockspeed.c +--- clockspeed-0.62.orig/clockspeed.c 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/clockspeed.c 2003-12-02 09:14:41.000000000 +0200 +@@ -83,7 +83,7 @@ + if (deriv <= 0) return; + if (deriv > 200000000) return; /* 5Hz ticks? be serious */ + +- fd = open_trunc("etc/atto.tmp"); ++ fd = open_trunc("/var/lib/clockspeed/atto.tmp"); + if (fd == -1) return; + + buf[0] = 0; +@@ -119,7 +119,7 @@ + if (fsync(fd) == -1) { close(fd); return; } + if (close(fd) == -1) return; /* NFS stupidity */ + +- rename("etc/atto.tmp","etc/atto"); /* if it fails, bummer */ ++ rename("/var/lib/clockspeed/atto.tmp","/var/lib/clockspeed/atto"); /* if it fails, bummer */ + } + + void main() +@@ -136,16 +136,16 @@ + if (chdir(auto_home) == -1) _exit(1); + umask(033); + +- if (open_read("etc/atto") == 0) { ++ if (open_read("/var/lib/clockspeed/atto") == 0) { + r = read(0,buf,sizeof buf); + if (r == sizeof buf) + deriv = nano(buf); + close(0); + } + +- if (fifo_make("adjust",0600) == -1) if (errno != error_exist) _exit(1); +- if (open_read("adjust") != 0) _exit(1); +- if (open_write("adjust") == -1) _exit(1); ++ if (fifo_make("/var/lib/clockspeed/adjust",0600) == -1) if (errno != error_exist) _exit(1); ++ if (open_read("/var/lib/clockspeed/adjust") != 0) _exit(1); ++ if (open_write("/var/lib/clockspeed/adjust") == -1) _exit(1); + + now(&first); + +diff -ur clockspeed-0.62.orig/clockview.c clockspeed-0.62/clockview.c +--- clockspeed-0.62.orig/clockview.c 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/clockview.c 2003-12-02 09:14:41.000000000 +0200 +@@ -1,5 +1,5 @@ + #include <sys/types.h> +-#include <sys/time.h> ++#include <time.h> + #include "substdio.h" + #include "readwrite.h" + #include "strerr.h" +diff -ur clockspeed-0.62.orig/conf-cc clockspeed-0.62/conf-cc +--- clockspeed-0.62.orig/conf-cc 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/conf-cc 2003-12-02 09:14:41.000000000 +0200 +@@ -1,3 +1,3 @@ +-gcc -O2 ++gcc @CFLAGS@ + + This will be used to compile .c files. +diff -ur clockspeed-0.62.orig/conf-home clockspeed-0.62/conf-home +--- clockspeed-0.62.orig/conf-home 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/conf-home 2003-12-02 09:14:41.000000000 +0200 +@@ -1,4 +1,4 @@ +-/usr/local/clockspeed ++/usr + + This is the clockspeed home directory. Programs will be installed in + .../bin. +diff -ur clockspeed-0.62.orig/conf-ld clockspeed-0.62/conf-ld +--- clockspeed-0.62.orig/conf-ld 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/conf-ld 2003-12-02 09:14:41.000000000 +0200 +@@ -1,3 +1,3 @@ +-gcc -s ++gcc @LDFLAGS@ + + This will be used to link .o files into an executable. +diff -ur clockspeed-0.62.orig/error.h clockspeed-0.62/error.h +--- clockspeed-0.62.orig/error.h 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/error.h 2003-12-02 09:14:41.000000000 +0200 +@@ -1,7 +1,7 @@ + #ifndef ERROR_H + #define ERROR_H + +-extern int errno; ++#include <errno.h> + + extern int error_intr; + extern int error_nomem; +diff -ur clockspeed-0.62.orig/hier.c clockspeed-0.62/hier.c +--- clockspeed-0.62.orig/hier.c 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/hier.c 2003-12-02 09:14:41.000000000 +0200 +@@ -2,7 +2,9 @@ + + void hier() + { +- c("/","etc","leapsecs.dat",-1,-1,0644); ++ d("/var/lib","clockspeed",-1,-1,0755); ++ ++ c("/","var/lib/clockspeed","leapsecs.dat",-1,-1,0644); + + h(auto_home,-1,-1,0755); + +diff -ur clockspeed-0.62.orig/leapsecs.3 clockspeed-0.62/leapsecs.3 +--- clockspeed-0.62.orig/leapsecs.3 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/leapsecs.3 2003-12-02 09:14:41.000000000 +0200 +@@ -52,10 +52,10 @@ + + .B leapsecs_read + reads the leap-second table from +-.BR /etc/leapsecs.dat . ++.BR /var/lib/clockspeed/leapsecs.dat . + It returns 0 on success, -1 on error. + If +-.B /etc/leapsecs.dat ++.B /var/lib/clockspeed/leapsecs.dat + does not exist, + .B leapsecs_read + treats it as an empty file. +diff -ur clockspeed-0.62.orig/leapsecs_read.c clockspeed-0.62/leapsecs_read.c +--- clockspeed-0.62.orig/leapsecs_read.c 1998-10-13 20:37:49.000000000 +0300 ++++ clockspeed-0.62/leapsecs_read.c 2003-12-02 09:14:41.000000000 +0200 +@@ -2,7 +2,6 @@ + #include <sys/stat.h> + #include <fcntl.h> + #include <errno.h> +-extern int errno; + #include "tai.h" + #include "leapsecs.h" + +@@ -18,7 +17,7 @@ + int i; + struct tai u; + +- fd = open("/etc/leapsecs.dat",O_RDONLY | O_NDELAY); ++ fd = open("/var/lib/clockspeed/leapsecs.dat",O_RDONLY | O_NDELAY); + if (fd == -1) { + if (errno != ENOENT) return -1; + if (leapsecs) free(leapsecs); diff --git a/net-misc/clockspeed/files/clockspeed-0.62-r1-gentoo.diff b/net-misc/clockspeed/files/clockspeed-0.62-r1-gentoo.diff deleted file mode 100644 index 9e996aa78206..000000000000 --- a/net-misc/clockspeed/files/clockspeed-0.62-r1-gentoo.diff +++ /dev/null @@ -1,34 +0,0 @@ -diff -ur clockspeed-0.62.orig/conf-cc clockspeed-0.62/conf-cc ---- clockspeed-0.62.orig/conf-cc Tue Oct 13 13:37:49 1998 -+++ clockspeed-0.62/conf-cc Thu Apr 19 19:55:16 2001 -@@ -1,3 +1,3 @@ --gcc -O2 -+gcc @CFLAGS@ - - This will be used to compile .c files. -diff -ur clockspeed-0.62.orig/conf-home clockspeed-0.62/conf-home ---- clockspeed-0.62.orig/conf-home Tue Oct 13 13:37:49 1998 -+++ clockspeed-0.62/conf-home Thu Apr 19 19:55:00 2001 -@@ -1,4 +1,4 @@ --/usr/local/clockspeed -+/usr - - This is the clockspeed home directory. Programs will be installed in - .../bin. -diff -ur clockspeed-0.62.orig/conf-ld clockspeed-0.62/conf-ld ---- clockspeed-0.62.orig/conf-ld Tue Oct 13 13:37:49 1998 -+++ clockspeed-0.62/conf-ld Thu Apr 19 19:54:54 2001 -@@ -1,3 +1,3 @@ --gcc -s -+gcc - - This will be used to link .o files into an executable. ---- clockspeed-0.62/clockview.c~ Tue Oct 13 19:37:49 1998 -+++ clockspeed-0.62/clockview.c Thu Apr 26 01:11:43 2001 -@@ -1,5 +1,5 @@ - #include <sys/types.h> --#include <sys/time.h> -+#include <time.h> - #include "substdio.h" - #include "readwrite.h" - #include "strerr.h" diff --git a/net-misc/clockspeed/files/clockspeed-0.62-r2-gentoo.diff b/net-misc/clockspeed/files/clockspeed-0.62-r2-gentoo.diff deleted file mode 100644 index be4359465518..000000000000 --- a/net-misc/clockspeed/files/clockspeed-0.62-r2-gentoo.diff +++ /dev/null @@ -1,57 +0,0 @@ -diff -ur clockspeed-0.62.orig/conf-cc clockspeed-0.62/conf-cc ---- clockspeed-0.62.orig/conf-cc Tue Oct 13 13:37:49 1998 -+++ clockspeed-0.62/conf-cc Thu Apr 19 19:55:16 2001 -@@ -1,3 +1,3 @@ --gcc -O2 -+gcc @CFLAGS@ - - This will be used to compile .c files. -diff -ur clockspeed-0.62.orig/conf-home clockspeed-0.62/conf-home ---- clockspeed-0.62.orig/conf-home Tue Oct 13 13:37:49 1998 -+++ clockspeed-0.62/conf-home Thu Apr 19 19:55:00 2001 -@@ -1,4 +1,4 @@ --/usr/local/clockspeed -+/usr - - This is the clockspeed home directory. Programs will be installed in - .../bin. -diff -ur clockspeed-0.62.orig/conf-ld clockspeed-0.62/conf-ld ---- clockspeed-0.62.orig/conf-ld Tue Oct 13 13:37:49 1998 -+++ clockspeed-0.62/conf-ld Thu Apr 19 19:54:54 2001 -@@ -1,3 +1,3 @@ --gcc -s -+gcc @LDFLAGS@ - - This will be used to link .o files into an executable. ---- clockspeed-0.62/clockview.c~ Tue Oct 13 19:37:49 1998 -+++ clockspeed-0.62/clockview.c Thu Apr 26 01:11:43 2001 -@@ -1,5 +1,5 @@ - #include <sys/types.h> --#include <sys/time.h> -+#include <time.h> - #include "substdio.h" - #include "readwrite.h" - #include "strerr.h" -diff -ur clockspeed-0.62.orig/error.h clockspeed-0.62/error.h ---- clockspeed-0.62.orig/error.h 2003-03-10 14:41:55.000000000 +0000 -+++ clockspeed-0.62/error.h 2003-03-10 14:45:09.000000000 +0000 -@@ -1,7 +1,7 @@ - #ifndef ERROR_H - #define ERROR_H - --extern int errno; -+#include <errno.h> - - extern int error_intr; - extern int error_nomem; -diff -ur clockspeed-0.62.orig/leapsecs_read.c clockspeed-0.62/leapsecs_read.c ---- clockspeed-0.62.orig/leapsecs_read.c 2003-03-10 14:41:55.000000000 +0000 -+++ clockspeed-0.62/leapsecs_read.c 2003-03-10 14:44:40.000000000 +0000 -@@ -2,7 +2,6 @@ - #include <sys/stat.h> - #include <fcntl.h> - #include <errno.h> --extern int errno; - #include "tai.h" - #include "leapsecs.h" - diff --git a/net-misc/clockspeed/files/digest-clockspeed-0.62-r2 b/net-misc/clockspeed/files/digest-clockspeed-0.62-r2 deleted file mode 100644 index 3009c656b67d..000000000000 --- a/net-misc/clockspeed/files/digest-clockspeed-0.62-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 425614174fcfe2ad42d22d3d02e2d567 clockspeed-0.62.tar.gz 25797 diff --git a/net-misc/clockspeed/files/digest-clockspeed-0.62-r1 b/net-misc/clockspeed/files/digest-clockspeed-0.62-r3 index 3009c656b67d..3009c656b67d 100644 --- a/net-misc/clockspeed/files/digest-clockspeed-0.62-r1 +++ b/net-misc/clockspeed/files/digest-clockspeed-0.62-r3 diff --git a/net-misc/clockspeed/files/ntpclockset b/net-misc/clockspeed/files/ntpclockset index 6657da712b33..61efd48e928e 100644 --- a/net-misc/clockspeed/files/ntpclockset +++ b/net-misc/clockspeed/files/ntpclockset @@ -7,8 +7,9 @@ else NTPSERVER="${1}" fi +tmpfile=`mktemp` #display how much your clock is off by -sntpclock $NTPSERVER > /tmp/sntpclock +sntpclock $NTPSERVER > ${tmpfile} if [ "${?}" != "0" ] then @@ -17,10 +18,10 @@ then fi echo ">>> Current clock sync:" -cat /tmp/sntpclock | clockview +cat ${tmpfile} | clockview echo echo -n ">>> Now setting clock..." -cat /tmp/sntpclock | clockadd +cat ${tmpfile} | clockadd echo " done." #wite data to the hardware clock so it survives a reboot echo -n ">>> Writing time to hardware clock..." @@ -29,3 +30,4 @@ echo " done." echo echo ">>> New clock sync:" sntpclock $NTPSERVER | clockview +rm ${tmpfile} |