Update to openntpd-3.7p1.

Changes:
20050523
 - (dtucker) [configure.ac defines.h] Add flags to allow ntpd to build on
   AIX, mostly from tomwilliams14 at comcast.net.
 - (dtucker) [contrib/redhat/openntpd.spec] Specfile update from Bernhard
   Weisshuhn (bkw at weisshuhn de):
  - Use 'ntp' (not _ntp) with id 38 as privsep user
  - Add openssl-devel to Build-Requires
  - mkdir -p /var/empty/ntpd
  - Added ChangeLog, README LICENCE and CREDITS as docfiles
  - removed fluff, use %{_variables} where appropriate
 - (dtucker) [configure.ac] Fall back to builtin arc4random if we don't find
   a usable OpenSSL.
 - (dtucker) [README] Update known-working platforms and misc info.
 - (dtucker) [README] Add CVS Id.
 - (dtucker) [configure.ac includes.h] Check for and include arpa/nameser.h,
   fixes build on Solaris 2.5.1.
 - (dtucker) [version.h contrib/redhat/openntpd.spec] Enter 3.7p1.

20050313
 - (dtucker) OpenBSD CVS Sync
  - dtucker@cvs.openbsd.org 2005/01/27 15:44:00
    [client.c ntp.c ntpd.h]
    Scale query interval by the overall offset not per-peer offset, so we
    don't query outliers more often than any other server.  ok henning@
  - dtucker@cvs.openbsd.org 2005/01/28 13:01:32
    [client.c server.c]
    Make network unreachable errors non-fatal; ok henning@
  - henning@cvs.openbsd.org 2005/01/28 13:32:24
    [ntpd.c]
    fatal() if daemon() fails, Alexander von Gernler <grunk@pestilenz.org>
  - dtucker@cvs.openbsd.org 2005/01/28 13:37:20
    [client.c ntp.c ntpd.h]
    Simplify interval scaling and randomize query intervals; ok henning@
  - henning@cvs.openbsd.org 2005/02/02 19:52:32
    [ntpd.c]
    usage() is __dead
    pt out by Alexander v Gernler
  - henning@cvs.openbsd.org 2005/02/02 19:57:09
    [buffer.c ntpd.h]
    buffer structs and API ssize_t -> size_t; from bgpd
  - henning@cvs.openbsd.org 2005/02/02 20:03:52
    [ntp.c]
    KNF
  - dtucker@cvs.openbsd.org 2005/02/03 11:53:33
    [client.c ntpd.h]
    Implement simple duplicate suppression of peer errors; ok henning@
  - henning@cvs.openbsd.org 2005/02/21 18:58:43
    [client.c]
    fix an error message
  - henning@cvs.openbsd.org 2005/02/22 13:03:24
    [ntp.c]
    when sending a query already returns a failure, we're not going to see
    a reply to that query.
    if we get errors for all queries and the initial settime() is still due
    and thus the parent process still waits (not yet daemonized!), send an
    IMSG_SETTIME with offset 0.
    shortens the delay dramatically when you boot without network
    idea from a discussion with theo
  - henning@cvs.openbsd.org 2005/03/06 19:36:52
    [imsg.c]
    fix error message, Benedikt Steinbusch <bsteinb@hamazone.de>
  - henning@cvs.openbsd.org 2005/03/08 13:31:40
    [client.c]
    let client_query return 0 if it requested dns resolution
  - henning@cvs.openbsd.org 2005/03/08 15:28:55
    [ntpd.c]
    from the "shut the fuck up, ntpd" department:
    move log_debug call to tell about skipping the settime due to lack of
    answers down slightly below the 2nd (and final) log_init call so it becomes
    a -d only thing. tested by dlg and me
  - deraadt@cvs.openbsd.org 2005/03/08 15:37:16
    [ntp.c]
    missing break spotted by lint
  - henning@cvs.openbsd.org 2005/03/08 15:59:36
    [config.c]
    from the "shut the fuck up, ntpd" department:
    don't whine about temporary dns errors
  - deraadt@cvs.openbsd.org 2005/03/08 17:27:14
    [ntp.c]
    knf
  - henning@cvs.openbsd.org 2005/03/08 17:33:43
    [ntp.c]
    when trying short-circuit the wait for the first reply for -s, only
    do so when
    -we tried to send at least one query (that is the change)
    -we could not send ou a single one without failure (this was already in
     place but catched too much)
    problem independently noticed by nick and danh, ok mickey danh, testing by
    many
  - henning@cvs.openbsd.org 2005/03/09 15:07:00
    [imsg.c]
    when, after processing all complete imsgs we found in the buffer,
    there are some bytes left (less than an imsg header, or less than the
    imsg header len field says) we copy it to the very beginning of the buffer.
    use memmove instead of memcpy since it is not guaranteed that there's no
    overlap. while memcpy on OpenBSD is safe, it might not elsewhere, and
    we want our code to be correct anyways.
    funny enough theo and I talked at length about that last week in dublin,
    and I said I believe I had no memcpys with the chance of overlap in ntpd/
    bgpd - well, here is one, and Alexander von Gernler <grunk@pestilenz.org>
    pointed me to it.
  - henning@cvs.openbsd.org 2005/03/09 21:31:11
    [config.c ntpd.c]
    nasty: host_dns used to run before forking and chrooting etc, so it was
    guaranteed that its res_init() call was done once before fork etc...
    that is no longer the case. call res_init() in main() early.
  - dtucker@cvs.openbsd.org 2005/03/13 11:06:27
    [ntpd.c]
    Fixes in ntpd_settime (ie ntpd -s):
    - Handle errors from syscalls better
    - Prevent curtime.tv_usec from being negative for negative offsets.
    - Don't claim to have done settimeofday if it fails.
    ok henning@
    (brought to my attention by holger at wizards.de)
 - (dtucker) [defines.h] defined __dead if the system doesn't.

20050211
 - (dtucker) [defines.h] Fix SA_LEN macro for platforms that have different
   sized sockaddr_in and sockaddr_in6 structs but don't define their own
   SA_LEN.  Patch from Leonardo C. Filho <leonardo at fesppr br>.

20050127
 - (dtucker) OpenBSD CVS Sync
  - henning@cvs.openbsd.org 2004/12/22 17:04:11
    [ntpd.c]
    d can be negative, take that into account when comparing to the logging
    threshold. spotted by Constantine Murenin <mureninc@gmail.com>, mickey ok
  - henning@cvs.openbsd.org 2004/12/23 17:10:10
    [ntp.c]
    KNF
  - dtucker@cvs.openbsd.org 2005/01/27 11:32:29
    [client.c ntp.c ntpd.h]
    Delay before retrying a query on timeout; ok henning@

20050109
 - (dtucker) [LICENCE] Fix typos and omissions, tidy up formatting.
 - (dtucker) [LICENCE] Add CVS Id.

20050107
 - (dtucker) [LICENCE] Add an OpenSSH-style licence summary.

20041222
 - (dtucker) OpenBSD CVS Sync
  - moritz@cvs.openbsd.org 2004/12/20 16:10:05
    [ntpd.c]
    some typos in log messages.
  - henning@cvs.openbsd.org 2004/12/22 06:34:52
    [ntp.c]
    if our first getpwnam(), testing for NTPD_USER, succeeded, but the second
    returns NULL, we don't need loooong explanations, but at least some
    indicator what went wrong, From: Michael Knudsen <e@molioner.dk>
  - dtucker@cvs.openbsd.org 2004/12/22 06:36:11
    [server.c]
    Save original value returned by getifaddrs to free later; ok henning@
 - (dtucker) [openbsd-compat/uidswap.c] Include includes.h

20041220
 - (dtucker) [README] Queries and bug reports to me.
 - (dtucker) [configure.ac defines.h] on QNX, socklen_t is really size_t.
 - (dtucker) [configure.ac openbsd-compat/Makefile.in openbsd-compat/port-qnx.c]
   Add an adjtime() function for QNX, written by Anthony O.Zabelin.

20041219
 - (dtucker) [includes.h openbsd-compat/Makefile.in openbsd-compat/atomicio.c
   openbsd-compat/atomicio.h openbsd-compat/bsd-arc4random.c
   openbsd-compat/openbsd-compat.h]:  Add atomicio from OpenSSH and use for
   reading entropy sources to ensure complete reads.
 - (dtucker) [defines.h] Remove some dead code.
 - (dtucker) [openbsd-compat/bsd-arc4random.c] Use atomicio for write too.

20041218
 - (dtucker) [configure.ac ntp.c ntpd.c openbsd-compat/Makefile.in
   openbsd-compat/bsd-poll.c openbsd-compat/bsd-poll.h
   openbsd-compat/openbsd-compat.h] Add a poll() replacement built around
   select() and enable for platforms that don't have poll (eg QNX4).  Poll
   header file from OpenBSD, function written by me, tested on QNX4 by
   Anthony O.Zabelin.
 - (dtucker) [configure.ac] Alphabetize system-specific case block.
 - (dtucker) [configure.ac bsd-misc.c] Add a dummy setgroups() function for
   platforms that don't have it; from Anthony O.Zabelin.
 - (dtucker) [configure.ac openbsd-compat/bsd-snprintf.c] Make "long long"
   support optional.  From Anthony O.Zabelin.
 - (dtucker) [configure.ac defines.h] Define __func__ macro as required,
   stolen from OpenSSH.
 - (dtucker) [configure.ac] Add configure-time settings for QNX4.  From
   Anthony O.Zabelin.
 - (dtucker) [config.c] Add includes.h
 - (dtucker) [configure.ac includes.h] Check for sys/timers.h and include.
 - (dtucker) [openbsd-compat/bsd-arc4random.c] Add support for using EGD/PRNGD
   sockets directly when configured --with-builtin-arc4random.
 - (dtucker) [openbsd-compat/bsd-arc4random.c] Remove debugging messages.
 - (dtucker) OpenBSD CVS Sync
  - dtucker@cvs.openbsd.org 2004/12/15 00:44:20
    [client.c]
    If polling a server results in an error, drop that server to the maximum
    poll interval;  ok henning@
  - dtucker@cvs.openbsd.org 2004/12/15 13:24:21
    [client.c]
    Factor out interval scaling code; ok henning@
  - dtucker@cvs.openbsd.org 2004/12/15 13:29:25
    [client.c]
    Poll unsynchronized servers at the maximum interval and log a message about
    them when in debug mode; ok henning@
  - dtucker@cvs.openbsd.org 2004/12/16 01:38:59
    [config.c ntpd.h]
    Limit the number of addresses used by the 'servers' directive to 8;
    ok henning@

20041215
 - (dtucker) [includes.h ntpd.c] Fix warnings for RCSID from picky compilers
   and user RCSID for the release string.  Pointed out by Jason Mader.
 - (dtucker) [includes.h] Undef sa_len macro if it's defined, to prevent
   name collisions on IRIX.  With Jason Mader.
 - (dtucker) [Makefile.in] Zap a GNUmake-ism, spotted by Jason Mader.
 - (dtucker) [openbsd-compat/bsd-misc.c openbsd-compat/openbsd-compat.h]
   Tweak again to prevent warnings.

20041214
 - (dtucker) [configure.ac] On IRIX, determine IOV_MAX from sysconf(8), based
   on info from Jason Mader.
 - (dtucker) [configure.ac] Move __need_IOV_MAX define into the Linux-specific
   block, suggested by Jason Mader.
 - (dtucker) [openbsd-compat/bsd-misc.c] Cast argv0 to char * to keep IRIX's
   compiler happy.  From Jason Mader.
 - (dtucker) [Makefile.in] Add rules to ensure openbsd-compat gets rebuilt
   properly.
 - (dtucker) OpenBSD CVS Sync
  - jmc@cvs.openbsd.org 2004/12/07 11:06:12
    [ntpd.8]
    tweaks;
  - mickey@cvs.openbsd.org 2004/12/08 16:47:38
    [client.c ntp.h ntp_msg.c server.c util.c]
    uniquely name members of s_fixedpt and l_fixedpt; henning@ ok
  - mickey@cvs.openbsd.org 2004/12/08 18:35:16
    [ntp_msg.c]
    use two tiny macros for copying fields out to simplify reading; henning@ ok
  - mickey@cvs.openbsd.org 2004/12/09 21:24:46
    [client.c ntpd.h]
    define TRUSTLEVEL_MAX for the trustedlevel value of 10; henning@ ok
  - jaredy@cvs.openbsd.org 2004/12/10 04:54:18
    [ntpd.8]
    typos, then -> than, from Michael Knudsen
  - dtucker@cvs.openbsd.org 2004/12/13 13:22:52
    [client.c ntp.h]
    Discard replies with alarm flag set or invalid stratum; ok henning@
  - dtucker@cvs.openbsd.org 2004/12/13 13:36:02
    [ntp.c]
    Check for error status from poll() too; ok henning@
  - dtucker@cvs.openbsd.org 2004/12/14 07:27:13
    [ntp_msg.c]
    sendto() takes socklen_t as an argument; ok henning@

20041213
 - (dtucker) [openbsd-compat/asprintf.c] unsigned char -> char, silences
   warning from IRIX's compiler.  From Jason Mader (jason at ncac gwu edu).

20041212
 - (dtucker) [ntpd.8] Remove some OpenBSD-specific references from the man
   page.  From Christian Gut (cycloon at is-root org).
 - (dtucker) [configure.ac] Add defines needed for uid swapping functions
   to work on IRIX.  From Jason Mader (jason at ncac gwu edu).

2 files changed, 8 insertions, 7 deletions

diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index ebfde0694dc..ed613fcab87 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:27 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/06/28 17:13:25 peter Exp $
 
-DISTNAME=		openntpd-3.6.1p1
+DISTNAME=		openntpd-3.7p1
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
 			ftp://ftp5.usa.openbsd.org/pub/OpenBSD/OpenNTPD/ \
@@ -23,7 +23,8 @@ EGDIR=			${PREFIX}/share/examples/openntpd
 CONF_FILES=		${EGDIR}/ntpd.conf ${PKG_SYSCONFDIR}/ntpd.conf
 
 RCD_SCRIPTS=		openntpd
-PKG_USERS=		_ntp:nogroup::ntpd\\ pseudo-user:${VARBASE}/chroot/ntpd:/sbin/nologin
+PKG_USERS=		_ntp:_ntp::ntpd\\ pseudo-user:${VARBASE}/chroot/ntpd:/sbin/nologin
+PKG_GROUPS=		_ntp
 
 OWN_DIRS=		${VARBASE}/chroot/ntpd
 INSTALLATION_DIRS=	man/man5 man/man8 sbin
diff --git a/net/openntpd/distinfo b/net/openntpd/distinfo
index ed81de39275..3a148a4ccf8 100644
--- a/net/openntpd/distinfo
+++ b/net/openntpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:58 agc Exp $
+$NetBSD: distinfo,v 1.6 2005/06/28 17:13:25 peter Exp $
 
-SHA1 (openntpd-3.6.1p1.tar.gz) = bf8e10ab31d26923e57dd4d83413e95ea3b62fee
-RMD160 (openntpd-3.6.1p1.tar.gz) = 70eb2673c1cc91ca483f5183a8fb57870c6a58ec
-Size (openntpd-3.6.1p1.tar.gz) = 123811 bytes
+SHA1 (openntpd-3.7p1.tar.gz) = 8d6739a210906f0305606e8c144f5ea7daf737b2
+RMD160 (openntpd-3.7p1.tar.gz) = e7613e64ef3349cec2b34293b8cc749eb671c29f
+Size (openntpd-3.7p1.tar.gz) = 136251 bytes