Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/net-misc/ntp
diff options
context:
space:
mode:
Diffstat (limited to 'net-misc/ntp')
-rw-r--r--net-misc/ntp/ChangeLog285
-rw-r--r--net-misc/ntp/Manifest43
-rw-r--r--net-misc/ntp/files/4.2.0.20040617-debug-fix.patch7
-rw-r--r--net-misc/ntp/files/4.2.0.20040617-errno-fix.patch7
-rw-r--r--net-misc/ntp/files/4.2.0.20040617-freebsd.patch12
-rw-r--r--net-misc/ntp/files/digest-ntp-4.2.0-r21
-rw-r--r--net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch10
-rw-r--r--net-misc/ntp/files/ntp-client-4.1.2.rc4
-rw-r--r--net-misc/ntp/files/ntp-client.confd24
-rw-r--r--net-misc/ntp/files/ntp-client.rc14
-rw-r--r--net-misc/ntp/files/ntp.conf47
-rw-r--r--net-misc/ntp/files/ntpd-4.1.2.confd4
-rw-r--r--net-misc/ntp/files/ntpd-4.1.2.rc10
-rw-r--r--net-misc/ntp/files/ntpd.confd11
-rw-r--r--net-misc/ntp/files/ntpd.rc34
-rw-r--r--net-misc/ntp/ntp-4.1.2.ebuild58
-rw-r--r--net-misc/ntp/ntp-4.2.0-r2.ebuild62
17 files changed, 134 insertions, 499 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog
index 30a7533ebf97..6eae82baa25f 100644
--- a/net-misc/ntp/ChangeLog
+++ b/net-misc/ntp/ChangeLog
@@ -1,287 +1,6 @@
# ChangeLog for net-misc/ntp
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.68 2005/08/25 22:10:40 vapier Exp $
-
-*ntp-4.2.0.20050303-r1 (25 Aug 2005)
-*ntp-4.2.0.20040617-r3 (25 Aug 2005)
-
- 25 Aug 2005; Mike Frysinger <vapier@gentoo.org>
- +files/ntp-4.2.0-ntpd-using-wrong-group.patch, ntp-4.2.0-r2.ebuild,
- +ntp-4.2.0.20040617-r3.ebuild, +ntp-4.2.0.20050303-r1.ebuild:
- Fix security issue where ntpd assigns the wrong group #103719.
-
- 20 Aug 2005; Mike Frysinger <vapier@gentoo.org> files/ntpd.rc:
- Pass --exec to ssd when stopping so we kill the right process #82859 by
- Peter Wendrich.
-
- 16 Aug 2005; Mike Frysinger <vapier@gentoo.org>
- +files/ntp-4.2.0.20050303-rlimit-memlock.patch, ntp-4.2.0.20050303.ebuild:
- Add fix for memlock issues #99713 by Marcin Deranek and Christoph Gysin.
-
- 20 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> ntp-4.1.2.ebuild,
- ntp-4.2.0-r2.ebuild, ntp-4.2.0.20040617.ebuild,
- ntp-4.2.0.20040617-r2.ebuild, ntp-4.2.0.20050303.ebuild:
- Use -1 instead of /bin/false to set the shell for ntp user. Fix Gentoo/FreeBSD.
-
-*ntp-4.2.0.20050303 (18 Jul 2005)
-
- 18 Jul 2005; Mike Frysinger <vapier@gentoo.org>
- +ntp-4.2.0.20050303.ebuild:
- Version bump.
-
- 29 Jun 2005; Joshua Kinard <kumba@gentoo.org> ntp-4.2.0.20040617-r2.ebuild:
- Marked stable on mips.
-
- 17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
- ntp-4.2.0.20040617-r2.ebuild:
- Stable on ppc.
-
- 12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org>
- ntp-4.2.0.20040617-r2.ebuild:
- Stable on alpha.
-
- 09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
- ntp-4.2.0.20040617-r2.ebuild:
- Stable on sparc
-
- 06 Jun 2005; Markus Rothe <corsair@gentoo.org>
- ntp-4.2.0.20040617-r2.ebuild:
- Stable on ppc64
-
- 29 May 2005; Sven Wegener <swegener@gentoo.org>
- ntp-4.2.0.20040617-r2.ebuild:
- It's kernel_linux not linux_kernel.
-
- 26 May 2005; Diego Pettenò <flameeyes@gentoo.org>
- +files/4.2.0.20040617-freebsd.patch, ntp-4.2.0.20040617-r2.ebuild:
- Added patch to compile on Gentoo/FreeBSD. Closes bug #94038.
-
-*ntp-4.2.0.20040617-r2 (08 May 2005)
-
- 08 May 2005; Sven Wegener <swegener@gentoo.org>
- +files/4.2.0.20040617-debug-fix.patch, -ntp-4.2.0.20040617-r1.ebuild,
- +ntp-4.2.0.20040617-r2.ebuild:
- Another revision bump. Added support for the debug USE flag which was
- previously always enabled.
-
-*ntp-4.2.0.20040617-r1 (06 May 2005)
-
- 06 May 2005; Sven Wegener <swegener@gentoo.org>
- +files/4.2.0.20040617-errno-fix.patch,
- +files/4.2.0.20040617-hostname.patch,
- +files/4.2.0.20040617-ipv6-fixes.patch, +ntp-4.2.0.20040617-r1.ebuild:
- Revision bump. Added a patch (based on the one from www.ecsirt.net) that
- allows to override the hostname used in autokey authentication. Another
- patch for a drop-root issue that comes up when using autokey. And the last
- patch (from upstream) fixes some ipv6 issues.
-
- 15 Apr 2005; Mark Loeser <halcy0n@gentoo.org> +files/ntp-4.2.0-gcc4.patch,
- ntp-4.2.0.20040617.ebuild:
- Patch for GCC4 compilation issues from Fedora
-
- 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
- Change encoding to UTF-8 for GLEP 31 compliance
-
- 12 Dec 2004; Aron Griffis <agriffis@gentoo.org> ntp-4.2.0-r2.ebuild,
- ntp-4.2.0.20040617.ebuild:
- add ia64 keywords
-
-*ntp-4.2.0.20040617 (09 Nov 2004)
-
- 09 Nov 2004; Mike Frysinger <vapier@gentoo.org>
- files/ntp-4.1.1b-syscall-libc.patch, files/ntp.conf,
- +ntp-4.2.0.20040617.ebuild:
- Version bump to resolve ipv6 problems (#51721 #57355 #67654), segfaults
- (#48128 #58684), be more friendly with openntpd (#70142), clean up the
- config files (#64171 #65502), some md5 key troubles (#65099 #67408), and
- change the default install path (#66671).
-
- 07 Aug 2004; Tom Martin <slarti@gentoo.org> ntp-4.2.0-r2.ebuild:
- Stable on amd64.
-
- 08 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> ntp-4.2.0-r2.ebuild:
- Stable on alpha.
-
- 12 May 2004; Alexander Gabert <pappy@gentoo.org> ntp-4.1.2.ebuild,
- ntp-4.2.0-r2.ebuild:
- removed hardened-gcc logic
-
- 15 Apr 2004; Jason Wever <weeve@gentoo.org> ntp-4.2.0-r2.ebuild:
- Stable on sparc.
-
- 13 Apr 2004; Joshua Kinard <kumba@gentoo.org> ntp-4.2.0-r2.ebuild:
- Marked stable on mips.
-
-*ntp-4.2.0-r2 (05 Apr 2004)
-
- 05 Apr 2004; Mike Frysinger <vapier@gentoo.org> :
- Add checking for notrust in /etc/ntp.conf #41827 and
- tweak the init.d script a bit.
-
-*ntp-4.2.0-r1 (01 Mar 2004)
-
- 01 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
- New version to push accumulated fixes out.
-
- 15 Feb 2004; Jason Wever <weeve@gentoo.org> ntp-4.1.2.ebuild:
- Marked stable on sparc, fixes bug #29106.
-
-*ntp-4.2.0 (14 Feb 2004)
-
- 14 Feb 2004; Mike Frysinger <vapier@gentoo.org> :
- Version bump #31258 by Christian Strauf.
-
- 14 Dec 2003; Guy Martin <gmsoft@gentoo.org> ntp-4.1.2.ebuild:
- Marked stable on hppa.
-
- 17 Oct 2003; Chris PeBenito <pebenito@gentoo.org> ntp-4.1.1b-r6.ebuild,
- ntp-4.1.2.ebuild:
- Add SELinux policy dependancy
-
- 15 Oct 2003; Markus Nigbur <pyrania@gentoo.org> ntp-4.1.2.ebuild:
- Fixed bug 31190. Thanks to James Slater.
-
- 11 Oct 2003; Alexander Gabert <pappy@gentoo.org> ntp-4.1.2.ebuild:
- added hardened-gcc configure check flags and removal later for proper etdyn
- build
-
- 09 Oct 2003; <tuxus@gentoo.org> ntp-4.1.2.ebuild:
- stable on mips
-
- 04 Oct 2003; Markus Nigbur <pyrania@gentoo.org> ntp-4.1.2.ebuild:
- Added dependency for >=sys-devel/automake-1.7 (bug 30293).
-
- 26 Sep 2003; Aron Griffis <agriffis@gentoo.org> ntp-4.1.2.ebuild:
- Stable on alpha
-
- 20 Sep 2003; Alexander Gabert <pappy@gentoo.org> ntp-4.1.1b-r6.ebuild:
- added configure logic for hardened-gcc
-
-*ntp-4.1.2 (06 Aug 2003)
-
- 13 Sep 2003; Guy Martin <gmsoft@gentoo.org> ntp-4.1.2 :
- Marked -hppa while bug #26062 is not fixed.
-
- 06 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
- Version bump (omg about time) #26023.
- Add redhat drop root patch #21444.
- Add broadcast bug fix #17336.
- Split ntp init script into server and client scripts #21017.
-
-*ntp-4.1.1b-r6 (16 Jun 2003)
-
- 19 Jun 2003; Joshua Kinard <kumba@gentoo.org> :
- Fixed b0rked digest file: Missing Changelog
-
- 16 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
- Added custom manpages ... xsl is at #20747.
- Script used to make custom manpage tarball is also there as an attachment.
-
-*ntp-4.1.1b-r5 (26 Feb 2003)
-
- 20 Mar 2003; Zach Welch <zwelch@gentoo.org> ntp-4.1.1b-r5.ebuild:
- add arm keyword
-
- 17 Mar 2003; Seemant Kulleen <seemant@gentoo.org> ntp-4.1.1b-r5.ebuild,
- files/ntp.conf:
- added extra documentation to the ntp.conf file. thanks to: Daniel Seyffer
- <gentoo-bugs@seyffer.de> in bug #17492
-
- 02 Mar 2003; Guy Martin <gmsoft@gentoo.org> ntp-4.1.1b-r5.ebuild :
- Added hppa to keywords.
-
- 26 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
- Version bumped to fix how some extra crud was installed into
- /usr/share/ntp/ ... also add a few more files to that dir. #16403
-
-*ntp-4.1.1b-r4 (12 Jan 2003)
-
- 15 Feb 2003; Nicholas Wourms <dragon@gentoo.org> ntp-4.1.1b-r4.ebuild :
- Added mips keyword to ebuild.
-
- 14 Feb 2003; Martin Holzer <mholzer@gentoo.org> ntp-4.1.1b-r4.ebuild :
- Added one more einfo. Closes #15690.
-
- 12 Jan 2003; Mike Frysinger <vapier@gentoo.org> :
- Added a lot more comments to hopefully keep people from
- messing up their ntp installs.
-
-*ntp-4.1.1b-r3 (31 Dec 2002)
-
- 09 Jan 2003; Martin Holzer <mholzer@gentoo.org> :
- Added 'use dns logger' to init script. Closes #13541.
-
- 06 Jan 2003; Bjoern Brauel <bjb@gentoo.org> :
- Added a (nasty) hack for ntp on alpha. configure makes a false assumption
- about _adjtime on alpha. Fix forces use of libc implementation.
-
- 01 Jan 2002; Mike Frysinger <vapier@gentoo.org> :
- Added a patch to fix the namespace collision with linux include files.
- Check Bugs #13001 #6432 #8807
-
- 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)
-
- 16 Dec 2002; Mike Frysinger <vapier@gentoo.org> :
- Unified the previous set of /etc files (a) with the current set (b) and
- addressed all the issues people had.
-
-*ntp-4.1.1b (27 Nov 2002)
-
- 06 Dec 2002; Rodney Rees <manson@gentoo.org> :
- changed sparc ~sparc keywords
-
- 28 Nov 2002; Stefan Jones <cretin@gentoo.org> :
- Changed ./configure line back to fix building on sparc and others
-
- 27 Nov 2002; Mike Frysinger <vapier@gentoo.org> :
- Added new ebuild + /etc files
-
-*ntp-4.1.1a (4 May 2002)
-
- 09 Jul 2002; phoen][x <phoenix@gentoo.org> ntp-4.1.1a.ebuild :
- Added KEYWORDS, SLOT.
-
- 4 May 2002; Jon Nelson <jnelson@gentoo.org> ntp-4.1.7*.ebuild
- Removed all 4.1.7* ebuilds
-
- 13 aug 2002; Bart Verwilst <verwilst@gentoo.org> :
-
- Added a few URLs that point to NTP server in ntpd.confd, as comments.
-
-*ntp-4.1.1a (1 May 2002)
- 1 May 2002; Jon Nelson <jnelson@gentoo.org> ntp-4.1.72-r2.ebuild :
- Create 4.1.1a ebuild and mask 4.1.72* versions, the 4.1.72* versions
- are *alpha* releases for 4.2.0, and have trouble building on some
- hosts.
-
- This should finally close 1882
-
-*ntp-4.1.72-r2 (28 Apr 2002)
- 28 Apr 2002; Jon Nelson <jnelson@gentoo.org> ntp-4.1.72-r2.ebuild :
-
- Remove -lncurses from LDFLAGS environment, it screws up
- the build.
- If there is a good reason for it to be there, prefix it with
- -L/lib so that configure can find it there (it's not in /usr/lib).
- Closes bug #1882 and allows compilation
- Update ebuild for lintool compliance
-
-*ntp-4.1.72-r1 (24 March 2002)
-
- 24 March 2002; M.Schlemmer <azarah@gentoo.org> :
-
- Resolve bug #897 (add ntpdate to rc-script); add config file for ntpd.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.1 2002/02/01 21:53:35 gbevin Exp $
*ntp-4.1.72 (1 Feb 2002)
diff --git a/net-misc/ntp/Manifest b/net-misc/ntp/Manifest
index f0897cf73235..e69de29bb2d1 100644
--- a/net-misc/ntp/Manifest
+++ b/net-misc/ntp/Manifest
@@ -1,43 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 fa39d0f69bf2ba5c5aaa98c5bc1002b5 ChangeLog 10376
-MD5 047fe77e01bc9335b07bcc5d963d8683 files/4.1.2-droproot.patch 12672
-MD5 0ac690ae52fe02f336ae73f9857461ec files/4.2.0-droproot.patch 13908
-MD5 24574e6ad1b468152839c10361b51a0f files/4.2.0-linux-config-phone.patch 711
-MD5 d07dbc58315f577cc6d1dd8614f95cb1 files/4.2.0-ntpdate-quiet.patch 1117
-MD5 5fecd7747324b76551f514df62a4d78d files/4.2.0.20040617-debug-fix.patch 232
-MD5 759c1adb57e9c61f519fe938902f1df7 files/4.2.0.20040617-errno-fix.patch 493
-MD5 2bc77f5ebab9804cdc2dff52ab4c267a files/4.2.0.20040617-freebsd.patch 803
-MD5 0c3a6df816f448a870e070797c22f72e files/4.2.0.20040617-hostname.patch 8476
-MD5 c51a9f2f2c85ab3bcdc54a1a9e3bedb6 files/4.2.0.20040617-ipv6-fixes.patch 2541
-MD5 4e13c1a5fa0fa54e3b65ec311dd7270a files/broadcastclient.patch 451
-MD5 af48491e8d6820a3d8eba16a771e5c26 files/digest-ntp-4.1.2 129
-MD5 5fc28af5c2a508eeb67a4d5d0ffab341 files/digest-ntp-4.2.0-r2 135
-MD5 59c70b7499e588d6a24901a951c1bcd8 files/digest-ntp-4.2.0.20040617-r3 166
-MD5 df7cdf79440109a1535f013c796aabce files/digest-ntp-4.2.0.20050303-r1 166
-MD5 dded11ceec4b8f2c1b140341a357f507 files/linux-config-phone.patch 747
-MD5 e327d521e4dfb0c967941eeb84ad9207 files/ntp-4.1.1b-syscall-libc.patch 424
-MD5 20c344cec35350fe17773665094b2e57 files/ntp-4.2.0-gcc4.patch 1607
-MD5 621c8a8e9589eb73a7f51095d8fca090 files/ntp-4.2.0-ntpd-using-wrong-group.patch 338
-MD5 339d87d68d483b28f5b70dd76cbc20c4 files/ntp-4.2.0.20050303-rlimit-memlock.patch 839
-MD5 b8fc232f85be1313aee4c5a6f0048ca7 files/ntp-client-4.1.2.rc 840
-MD5 47d7106c23cb6ac99c5bbfdcd2f3a7fa files/ntp-client.confd 747
-MD5 5eecb47ab966b2003b73b8cbd371de40 files/ntp-client.rc 933
-MD5 5bd3924f5720b97837969ec4ec4d5e09 files/ntp.conf 1451
-MD5 4d502821fd36c5a63b14ae4b54cb3526 files/ntpd-4.1.2.confd 185
-MD5 87951141777f50b2e4a2347a96f987b8 files/ntpd-4.1.2.rc 806
-MD5 5e1591f145a63cf66ee20ab65495781a files/ntpd.confd 189
-MD5 299ea30653b1e0b93d51f19e07176bc4 files/ntpd.rc 805
-MD5 aa73d5edf312beeab44fa9d58a603ad4 metadata.xml 636
-MD5 4874c08acda470ce7373d36b64c39c09 ntp-4.1.2.ebuild 3162
-MD5 7e567989a1392464a324fd0cd64e54a3 ntp-4.2.0-r2.ebuild 3815
-MD5 45f151b05f4b7703610e2b908694ee3d ntp-4.2.0.20040617-r3.ebuild 4319
-MD5 0889dba2586d7f77d447b5235923544c ntp-4.2.0.20050303-r1.ebuild 4354
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDYskcgIKl8Uu19MoRArY7AJsHFNMBUtIE8HyvK1uM0HrXeOBb6ACfSpjj
-ZrWQNSVMeyXF8SM3C+pFu9I=
-=tVB0
------END PGP SIGNATURE-----
diff --git a/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch b/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch
index a7c35e388a80..5a97fde7a442 100644
--- a/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch
+++ b/net-misc/ntp/files/4.2.0.20040617-debug-fix.patch
@@ -1,7 +1,6 @@
-https://ntp.isc.org/bugs/show_bug.cgi?id=464
-
---- ntpd/ntp_proto.c
-+++ ntpd/ntp_proto.c
+diff -Nur ntp-stable-4.2.0a-20040617/ntpd/ntp_proto.c ntp-stable-4.2.0a-20040617-debug-fix/ntpd/ntp_proto.c
+--- ntp-stable-4.2.0a-20040617/ntpd/ntp_proto.c 2004-05-25 11:02:24.000000000 +0000
++++ ntp-stable-4.2.0a-20040617-debug-fix/ntpd/ntp_proto.c 2005-05-07 22:32:30.973867197 +0000
@@ -2293,8 +2293,8 @@
if (debug > 1)
printf("select: prefer offset %.6f\n",
diff --git a/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch b/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch
index 9eae0496a865..2c6fbdae2bc4 100644
--- a/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch
+++ b/net-misc/ntp/files/4.2.0.20040617-errno-fix.patch
@@ -1,7 +1,6 @@
-https://ntp.isc.org/bugs/show_bug.cgi?id=465
-
---- ntpd/ntp_io.c
-+++ ntpd/ntp_io.c
+diff -Nur ntp-stable-4.2.0a-20040617/ntpd/ntp_io.c ntp-stable-4.2.0a-20040617-errno-fix/ntpd/ntp_io.c
+--- ntp-stable-4.2.0a-20040617/ntpd/ntp_io.c 2004-05-25 11:02:24.000000000 +0000
++++ ntp-stable-4.2.0a-20040617-errno-fix/ntpd/ntp_io.c 2005-05-06 15:35:23.433595492 +0000
@@ -1795,16 +1795,16 @@
sizeof(rb->recv_space), 0,
(struct sockaddr *)&rb->recv_srcadr,
diff --git a/net-misc/ntp/files/4.2.0.20040617-freebsd.patch b/net-misc/ntp/files/4.2.0.20040617-freebsd.patch
index 4ca3c5367722..881faef63c53 100644
--- a/net-misc/ntp/files/4.2.0.20040617-freebsd.patch
+++ b/net-misc/ntp/files/4.2.0.20040617-freebsd.patch
@@ -1,7 +1,6 @@
-https://ntp.isc.org/bugs/show_bug.cgi?id=438
-
---- ntpdc/ntpdc.c
-+++ ntpdc/ntpdc.c
+diff -ur ntp-stable-4.2.0a-20040617/ntpdc/ntpdc.c ntp-stable-4.2.0a-20040617-fbsd/ntpdc/ntpdc.c
+--- ntp-stable-4.2.0a-20040617/ntpdc/ntpdc.c 2004-05-25 13:02:25.000000000 +0200
++++ ntp-stable-4.2.0a-20040617-fbsd/ntpdc/ntpdc.c 2005-05-26 07:25:33.091870920 +0200
@@ -449,7 +449,11 @@
hints.ai_flags = AI_NUMERICHOST;
@@ -15,8 +14,9 @@ https://ntp.isc.org/bugs/show_bug.cgi?id=438
hints.ai_flags = AI_CANONNAME;
#ifdef AI_ADDRCONFIG
hints.ai_flags |= AI_ADDRCONFIG;
---- ntpq/ntpq.c
-+++ ntpq/ntpq.c
+diff -ur ntp-stable-4.2.0a-20040617/ntpq/ntpq.c ntp-stable-4.2.0a-20040617-fbsd/ntpq/ntpq.c
+--- ntp-stable-4.2.0a-20040617/ntpq/ntpq.c 2004-05-25 13:02:25.000000000 +0200
++++ ntp-stable-4.2.0a-20040617-fbsd/ntpq/ntpq.c 2005-05-26 07:26:33.276721432 +0200
@@ -631,7 +631,11 @@
hints.ai_flags = AI_NUMERICHOST;
diff --git a/net-misc/ntp/files/digest-ntp-4.2.0-r2 b/net-misc/ntp/files/digest-ntp-4.2.0-r2
index eff87f02a9d5..a29b978410e4 100644
--- a/net-misc/ntp/files/digest-ntp-4.2.0-r2
+++ b/net-misc/ntp/files/digest-ntp-4.2.0-r2
@@ -1,2 +1 @@
MD5 0f8fabe87cf54f409b57c6283f0c0c3d ntp-4.2.0.tar.gz 2514502
-MD5 0333bcec9a94b17621c785ccae674285 ntp-4.2.0-r2-manpages.tar.bz2 25355
diff --git a/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch b/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch
index 02a7375f0e4a..48815334315b 100644
--- a/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch
+++ b/net-misc/ntp/files/ntp-4.1.1b-syscall-libc.patch
@@ -1,11 +1,17 @@
--- ntp-4.1.1b/include/ntp_syscall.h 2003-01-06 18:51:39.000000000 +0100
+++ ntp-4.1.1b-alpha/include/ntp_syscall.h 2003-01-06 18:54:57.000000000 +0100
-@@ -14,7 +14,7 @@
+@@ -14,7 +14,6 @@
# include <sys/timex.h>
#endif
-#ifndef NTP_SYSCALLS_LIBC
-+#if !defined(NTP_SYSCALLS_LIBC) || defined(__alpha__)
#ifdef NTP_SYSCALLS_STD
# define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t))
# define ntp_gettime(t) syscall(SYS_ntp_gettime, (t))
+@@ -50,6 +49,5 @@
+ # endif
+ # endif /* !HAVE_ADJTIMEX */
+ #endif /* !NTP_SYSCALLS_STD */
+-#endif /* !NTP_SYSCALLS_LIBC */
+
+ #endif /* NTP_SYSCALL_H */
diff --git a/net-misc/ntp/files/ntp-client-4.1.2.rc b/net-misc/ntp/files/ntp-client-4.1.2.rc
index 2d80a4efbed8..ba5eb15e2b88 100644
--- a/net-misc/ntp/files/ntp-client-4.1.2.rc
+++ b/net-misc/ntp/files/ntp-client-4.1.2.rc
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client-4.1.2.rc,v 1.2 2004/07/15 00:05:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client-4.1.2.rc,v 1.1 2004/02/16 01:56:32 vapier Exp $
depend() {
before cron
diff --git a/net-misc/ntp/files/ntp-client.confd b/net-misc/ntp/files/ntp-client.confd
index 44affac3924f..0760fd5c0cd4 100644
--- a/net-misc/ntp/files/ntp-client.confd
+++ b/net-misc/ntp/files/ntp-client.confd
@@ -1,4 +1,6 @@
-# /etc/conf.d/ntp-client
+# 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/ntp-client.confd,v 1.1 2003/08/06 07:42:24 vapier Exp $
# Command to run to set the clock initially
# Most people should just leave this line alone ...
@@ -7,14 +9,14 @@
NTPCLIENT_CMD="ntpdate"
# Options to pass to the above command
-# This default setting should work fine but you should
-# change the default 'pool.ntp.org' to something closer
-# to your machine. See http://www.pool.ntp.org/ or
-# try running `netselect -s 3 pool.ntp.org`.
-NTPCLIENT_OPTS="-Q -b -u pool.ntp.org"
+# Most people should just uncomment this variable and
+# change 'someserver' to a valid hostname which you
+# can aquire from the URL's below
+#NTPCLIENT_OPTS="-b someserver"
-# How long to wait (in seconds) before giving up.
-# Useful for when you boot and DNS/internet isn't
-# really available but you have your net interface
-# come up with say a static IP.
-NTPCLIENT_TIMEOUT=30
+##
+# A list of available servers is available here:
+# http://www.eecis.udel.edu/~mills/ntp/servers.html
+# Please follow the rules of engagement and use a
+# Stratum 2 server (unless you qualify for Stratum 1)
+##
diff --git a/net-misc/ntp/files/ntp-client.rc b/net-misc/ntp/files/ntp-client.rc
index d8b86ba9bfdf..b6f0be48b003 100644
--- a/net-misc/ntp/files/ntp-client.rc
+++ b/net-misc/ntp/files/ntp-client.rc
@@ -1,10 +1,9 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.8 2005/05/14 19:12:04 vapier Exp $
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntp-client.rc,v 1.1 2003/08/06 07:42:24 vapier Exp $
depend() {
- before cron portmap
need net
use dns logger
}
@@ -26,10 +25,7 @@ checkconfig() {
start() {
checkconfig || return $?
- ebegin "Setting clock via the NTP client '${NTPCLIENT_CMD}'"
- ${NTPCLIENT_CMD} ${NTPCLIENT_OPTS} >/dev/null &
- local pid=$!
- (sleep ${NTPCLIENT_TIMEOUT:-30}; kill -9 ${pid} >&/dev/null) &
- wait ${pid}
+ ebegin "Setting clock via the ntp client '${NTPCLIENT_CMD}'"
+ ${NTPCLIENT_CMD} >/dev/null ${NTPCLIENT_OPTS}
eend $? "Failed to set clock"
}
diff --git a/net-misc/ntp/files/ntp.conf b/net-misc/ntp/files/ntp.conf
index 93fc91947e8c..366399e1b638 100644
--- a/net-misc/ntp/files/ntp.conf
+++ b/net-misc/ntp/files/ntp.conf
@@ -1,47 +1,14 @@
-# NOTES:
-# - you should only have to update the server line below
-# - if you start getting lines like 'restrict' and 'fudge'
-# and you didnt add them, AND you run dhcpcd on your
-# network interfaces, be sure to add '-Y -N' to the
-# dhcpcd_ethX variables in /etc/conf.d/net
+
+logfile /var/log/ntpd.log
+driftfile /var/state/ntp.drift
# Name of the servers ntpd should sync with
# Please respect the access policy as stated by the responsible person.
#server ntp.example.tld iburst
-server pool.ntp.org
-
##
-# A list of available servers can be found here:
-# http://www.pool.ntp.org/
-# http://www.pool.ntp.org/#use
-# A good way to get servers for your machine is:
-# netselect -s 3 pool.ntp.org
+# 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
##
-
-# you should not need to modify the following paths
-driftfile /var/lib/ntp/ntp.drift
-
-#server ntplocal.example.com prefer
-#server timeserver.example.org
-
-# Warning: Using default NTP settings will leave your NTP
-# server accessible to all hosts on the Internet.
-
-# If you want to deny all machines (including your own)
-# from accessing the NTP server, uncomment:
-#restrict default ignore
-
-
-# To deny other machines from changing the
-# configuration but allow localhost:
-restrict default nomodify nopeer
-restrict 127.0.0.1
-
-
-# To allow machines within your network to synchronize
-# their clocks with your server, but ensure they are
-# not allowed to configure the server or used as peers
-# to synchronize against, uncomment this line.
-#
-#restrict 192.168.0.0 mask 255.255.255.0 nomodify nopeer notrap
diff --git a/net-misc/ntp/files/ntpd-4.1.2.confd b/net-misc/ntp/files/ntpd-4.1.2.confd
index 804271146872..2a19583b2cc3 100644
--- a/net-misc/ntp/files/ntpd-4.1.2.confd
+++ b/net-misc/ntp/files/ntpd-4.1.2.confd
@@ -1,4 +1,6 @@
-# /etc/conf.d/ntpd
+# 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-4.1.2.confd,v 1.1 2004/02/15 00:35:56 vapier Exp $
# Options to pass to the ntpd process
# Most people should leave this line alone ...
diff --git a/net-misc/ntp/files/ntpd-4.1.2.rc b/net-misc/ntp/files/ntpd-4.1.2.rc
index a8339489a998..b1f7376d8503 100644
--- a/net-misc/ntp/files/ntpd-4.1.2.rc
+++ b/net-misc/ntp/files/ntpd-4.1.2.rc
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd-4.1.2.rc,v 1.3 2004/07/15 00:05:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd-4.1.2.rc,v 1.1 2004/02/14 22:58:02 vapier Exp $
depend() {
need net
@@ -24,13 +24,13 @@ start() {
ebegin "Starting ntpd"
touch /var/run/ntpd.pid
chown ntp:ntp /var/run/ntpd.pid
- /usr/bin/ntpd -p /var/run/ntpd.pid ${NTPD_OPTS}
+ 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"
}
stop() {
ebegin "Stopping ntpd"
- start-stop-daemon --stop --pidfile /var/run/ntpd.pid
+ start-stop-daemon --stop --quiet --pidfile /var/run/ntpd.pid
eend $? "Failed to stop ntpd"
- rm -f /var/run/ntpd.pid
}
diff --git a/net-misc/ntp/files/ntpd.confd b/net-misc/ntp/files/ntpd.confd
index c651e80dcc67..7ae77e8fc443 100644
--- a/net-misc/ntp/files/ntpd.confd
+++ b/net-misc/ntp/files/ntpd.confd
@@ -1,6 +1,7 @@
-# /etc/conf.d/ntpd
+# Config file for /etc/init.d/ntpd
+
+
+# Name of the server ntpd should sync with
+
+#NTPDATESERVER=ntp.ctr.columbia.edu
-# Options to pass to the ntpd process
-# Most people should leave this line alone ...
-# however, if you know what you're doing, feel free to tweak
-NTPD_OPTS="-u ntp:ntp"
diff --git a/net-misc/ntp/files/ntpd.rc b/net-misc/ntp/files/ntpd.rc
index 73459474c788..d6b3262ac06a 100644
--- a/net-misc/ntp/files/ntpd.rc
+++ b/net-misc/ntp/files/ntpd.rc
@@ -1,38 +1,44 @@
#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/files/ntpd.rc,v 1.22 2005/08/20 04:10:15 vapier Exp $
+# 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.1 2002/12/16 16:17:46 vapier Exp $
depend() {
need net
- use dns logger
- after ntp-client
}
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=`grep '^server[[: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
+
ebegin "Starting ntpd"
- /usr/sbin/ntpd -p /var/run/ntpd.pid ${NTPD_OPTS}
+ start-stop-daemon --start --quiet --pidfile /var/run/ntpd.pid \
+ --startas /usr/bin/ntpd -- -p /var/run/ntpd.pid
eend $? "Failed to start ntpd"
}
stop() {
ebegin "Stopping ntpd"
- start-stop-daemon --stop \
- --pidfile /var/run/ntpd.pid \
- --exec /usr/sbin/ntpd
- local ret=$?
- eend ${ret} "Failed to stop ntpd"
- rm -f /var/run/ntpd.pid
- return ${ret}
+ start-stop-daemon --stop --quiet --pidfile /var/run/ntpd.pid
+ eend $? "Failed to stop ntpd"
+
+ # clean stale pidfile
+ [ -f /var/run/ntpd.pid ] && rm -f /var/run/ntpd.pid
}
diff --git a/net-misc/ntp/ntp-4.1.2.ebuild b/net-misc/ntp/ntp-4.1.2.ebuild
index 9d7ac76773a1..c38a3317f78c 100644
--- a/net-misc/ntp/ntp-4.1.2.ebuild
+++ b/net-misc/ntp/ntp-4.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 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.2.ebuild,v 1.41 2005/07/20 22:38:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.1.2.ebuild,v 1.1 2003/08/06 07:42:24 vapier Exp $
-inherit eutils flag-o-matic
+inherit eutils
DESCRIPTION="Network Time Protocol suite/programs"
HOMEPAGE="http://www.ntp.org/"
@@ -11,22 +11,19 @@ SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz
LICENSE="as-is"
SLOT="0"
-KEYWORDS="alpha amd64 hppa mips ppc sparc x86"
-IUSE="parse-clocks selinux ssl"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~amd64"
+IUSE="parse-clocks ssl"
-RDEPEND=">=sys-libs/ncurses-5.2
+DEPEND=">=sys-apps/sed-4.0.5
+ >=sys-libs/ncurses-5.2
>=sys-libs/readline-4.1
sys-libs/libcap
- ssl? ( dev-libs/openssl )
- selinux? ( sec-policy/selinux-ntp )"
-DEPEND="${RDEPEND}
- || (
- dev-libs/libelf
- dev-libs/elfutils
- )
- >=sys-devel/autoconf-2.58
- >=sys-devel/automake-1.7.7
- >=sys-apps/sed-4.0.5"
+ ssl? ( dev-libs/openssl )"
+
+pkg_setup() {
+ enewgroup ntp 123
+ enewuser ntp 123 /dev/null /bin/false ntp
+}
hax_bitkeeper() {
# the makefiles have support for bk ...
@@ -49,10 +46,9 @@ src_unpack() {
epatch ${FILESDIR}/linux-config-phone.patch #13001
sed -i "s:-Wpointer-arith::" configure.in
- # needed in order to make files with right ver info #30220.
- aclocal -I . || die "autolocal"
- automake || die "automake"
- autoconf || die "autoconf"
+ aclocal -I . || die
+ automake || die
+ autoconf || die
}
src_compile() {
@@ -63,21 +59,15 @@ src_compile() {
&& mysslconf="--with-openssl-libdir=yes" \
|| mysslconf="--with-openssl-libdir=no"
econf \
+ --build=${CHOST} \
`use_enable parse-clocks` \
${mysslconf} \
|| die
-
emake || die
}
-pkg_preinst() {
- enewgroup ntp 123
- enewuser ntp 123 -1 /dev/null ntp
-}
-
src_install() {
hax_bitkeeper
- pkg_preinst
make install DESTDIR=${D} || die
@@ -93,20 +83,14 @@ src_install() {
-name 'rc[12]' -o \
-name support`
mv scripts/* ${D}/usr/share/ntp/
- chmod -R go-w ${D}/usr/share/ntp
- [ ! -e ${ROOT}/etc/ntp.conf ] && insinto /etc && doins ${FILESDIR}/ntp.conf
+ [ ! -e /etc/ntp.conf ] && insinto /etc && doins ${FILESDIR}/ntp.conf
exeinto /etc/init.d
- newexe ${FILESDIR}/ntpd-${PV}.rc ntpd
- newexe ${FILESDIR}/ntp-client-${PV}.rc ntp-client
+ newexe ${FILESDIR}/ntpd.rc ntpd
+ newexe ${FILESDIR}/ntp-client.rc ntp-client
insinto /etc/conf.d
- newins ${FILESDIR}/ntpd-${PV}.confd ntpd
+ newins ${FILESDIR}/ntpd.confd ntpd
newins ${FILESDIR}/ntp-client.confd ntp-client
-
- dodir /var/lib/ntp
- fowners ntp:ntp /var/lib/ntp
- touch ${D}/var/lib/ntp/ntp.drift
- fowners ntp:ntp /var/lib/ntp/ntp.drift
}
pkg_postinst() {
diff --git a/net-misc/ntp/ntp-4.2.0-r2.ebuild b/net-misc/ntp/ntp-4.2.0-r2.ebuild
index b637edc5fd7b..7fb24d0887c7 100644
--- a/net-misc/ntp/ntp-4.2.0-r2.ebuild
+++ b/net-misc/ntp/ntp-4.2.0-r2.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0-r2.ebuild,v 1.25 2005/08/25 22:10:40 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.0-r2.ebuild,v 1.1 2004/04/05 23:23:50 vapier Exp $
-inherit eutils flag-o-matic gnuconfig
+inherit eutils
DESCRIPTION="Network Time Protocol suite/programs"
HOMEPAGE="http://www.ntp.org/"
-SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz
- mirror://gentoo/${PF}-manpages.tar.bz2"
+SRC_URI="http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${P}.tar.gz"
+# mirror://gentoo/${PF}-manpages.tbz2"
LICENSE="as-is"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa mips ppc ppc64 sparc x86 ia64"
+KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64"
IUSE="parse-clocks nodroproot selinux ssl"
RDEPEND=">=sys-libs/ncurses-5.2
@@ -24,6 +24,11 @@ DEPEND="${RDEPEND}
>=sys-devel/automake-1.7.7
>=sys-apps/sed-4.0.5"
+pkg_setup() {
+ enewgroup ntp 123
+ enewuser ntp 123 /bin/false /dev/null ntp
+}
+
hax_bitkeeper() {
# the makefiles have support for bk ...
# basically we have to do this or bk will try to write
@@ -36,14 +41,13 @@ hax_bitkeeper() {
src_unpack() {
unpack ${A}
- cd "${S}"
+ cd ${S}
- use alpha && epatch "${FILESDIR}"/ntp-4.1.1b-syscall-libc.patch
+ use alpha && epatch ${FILESDIR}/ntp-4.1.1b-syscall-libc.patch
- epatch "${FILESDIR}"/${PV}-ntpdate-quiet.patch
- epatch "${FILESDIR}"/${PV}-linux-config-phone.patch #13001
- epatch "${FILESDIR}"/${PV}-droproot.patch
- epatch "${FILESDIR}"/ntp-4.2.0-ntpd-using-wrong-group.patch #103719
+ epatch ${FILESDIR}/${PV}-ntpdate-quiet.patch
+ epatch ${FILESDIR}/${PV}-linux-config-phone.patch #13001
+ epatch ${FILESDIR}/${PV}-droproot.patch
sed -i "s:-Wpointer-arith::" configure.in
# needed in order to make files with right ver info #30220
@@ -51,47 +55,41 @@ src_unpack() {
automake || die "automake"
autoconf || die "autoconf"
- sed -i \
- -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"
-
- gnuconfig_update
+ sed -i 's:-lelf:-la_doe_a_deer_a_female_deer:g' configure
}
src_compile() {
hax_bitkeeper
+ has_version "sys-devel/hardened-gcc" && append-flags "-yet_exec"
+
local mysslconf
use ssl \
&& mysslconf="--with-openssl-libdir=yes" \
|| mysslconf="--with-openssl-libdir=no"
econf \
+ --build=${CHOST} \
`use_enable !nodroproot linuxcaps` \
`use_enable parse-clocks` \
${mysslconf} \
|| die
- emake || die
-}
+ has_version "sys-devel/hardened-gcc" && find ${WORKDIR} -name "Makefile" -type f -exec sed -i "s,-yet_exec,," {} \;
-pkg_preinst() {
- enewgroup ntp 123
- enewuser ntp 123 -1 /dev/null ntp
+ emake || die
}
src_install() {
hax_bitkeeper
- pkg_preinst
make install DESTDIR=${D} || die
dodoc ChangeLog INSTALL NEWS README TODO WHERE-TO-START
- doman ${WORKDIR}/man/*.1
+# doman ${WORKDIR}/man/*.1
dohtml -r html/*
insinto /usr/share/ntp
- doins "${FILESDIR}"/ntp.conf
+ doins ${FILESDIR}/ntp.conf
rm -rf `find scripts/ \
-name '*.in' -o \
-name 'Makefile*' -o \
@@ -100,13 +98,13 @@ src_install() {
cp -r scripts/* ${D}/usr/share/ntp/
chmod -R go-w ${D}/usr/share/ntp
- [ ! -e ${ROOT}/etc/ntp.conf ] && insinto /etc && doins "${FILESDIR}"/ntp.conf
+ [ ! -e /etc/ntp.conf ] && insinto /etc && doins ${FILESDIR}/ntp.conf
exeinto /etc/init.d
- newexe "${FILESDIR}"/ntpd.rc ntpd
- newexe "${FILESDIR}"/ntp-client.rc ntp-client
+ newexe ${FILESDIR}/ntpd.rc ntpd
+ newexe ${FILESDIR}/ntp-client.rc ntp-client
insinto /etc/conf.d
- newins "${FILESDIR}"/ntpd.confd ntpd
- newins "${FILESDIR}"/ntp-client.confd ntp-client
+ newins ${FILESDIR}/ntpd.confd ntpd
+ newins ${FILESDIR}/ntp-client.confd ntp-client
use nodroproot && dosed "s|-u ntp:ntp||" /etc/conf.d/ntpd
dodir /var/lib/ntp
@@ -124,7 +122,7 @@ pkg_postinst() {
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 [ ! -z "$(egrep '^[^#].*notrust' ${ROOT}/etc/ntp.conf)" ] ; then
+ if [ ! -z "$(grep 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,"