update to 4.2.6p1 and remove a lot of cruft
This commit is contained in:
parent
e3ee31b058
commit
87b33f29ca
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.42 2010/01/20 20:43:59 naddy Exp $
|
||||
# $OpenBSD: Makefile,v 1.43 2010/07/03 02:49:43 naddy Exp $
|
||||
|
||||
COMMENT= Network Time Protocol reference implementation
|
||||
|
||||
@ -6,42 +6,41 @@ COMMENT= Network Time Protocol reference implementation
|
||||
# to confuse with the ports system's 'pN' convention, so we
|
||||
# convert it to 'pl' for local use.
|
||||
|
||||
VERSION= 4.2.4p7
|
||||
VERSION= 4.2.6p1
|
||||
DISTNAME= ntp-${VERSION}
|
||||
PKGNAME= ntp-${VERSION:S/p/pl/}p0
|
||||
PKGNAME= ntp-${VERSION:S/p/pl/}
|
||||
CATEGORIES= net
|
||||
MASTER_SITES= ftp://archive.ntp.org/ntp4/ntp-4.2/ \
|
||||
http://archive.ntp.org/ntp4/ntp-4.2/
|
||||
MASTER_SITES= http://archive.ntp.org/ntp4/ntp-4.2/
|
||||
|
||||
HOMEPAGE= http://www.ntp.org/
|
||||
|
||||
# modified ISC license. However, some files include different
|
||||
# copyrights.
|
||||
PERMIT_PACKAGE_CDROM= No
|
||||
# modified ISC
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= No
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB= c crypto curses kvm m readline
|
||||
WANTLIB= c crypto edit kvm m termcap
|
||||
|
||||
BUILD_DEPENDS= ::devel/bison
|
||||
|
||||
SEPARATE_BUILD= simple
|
||||
USE_LIBTOOL= Yes
|
||||
AUTOCONF_VERSION= 2.59
|
||||
CONFIGURE_STYLE= autoconf
|
||||
CONFIGURE_ARGS+= --bindir='${PREFIX}/sbin' \
|
||||
--with-binsubdir=sbin \
|
||||
--enable-accurate-adjtime --disable-IRIG \
|
||||
--enable-parse-clocks \
|
||||
--with-openssl-libdir=/usr/lib \
|
||||
--with-openssl-incdir=/usr/include \
|
||||
--with-crypto=openssl
|
||||
CONFIGURE_STYLE=gnu
|
||||
CONFIGURE_ARGS= --enable-parse-clocks \
|
||||
--with-binsubdir=sbin
|
||||
CONFIGURE_ENV= CPPFLAGS='-DCONFIG_FILE="\"${SYSCONFDIR}/ntp.conf\"" \
|
||||
-DKEYFILE="\"${SYSCONFDIR}/ntp.keys\""'
|
||||
YACC= bison -y
|
||||
|
||||
post-build:
|
||||
@${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD ${WRKBUILD}/README.OpenBSD
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ntp
|
||||
@cd ${WRKSRC}/html && pax -rw * ${PREFIX}/share/doc/ntp
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ntp
|
||||
@cd ${WRKSRC}/conf && pax -rw * ${PREFIX}/share/examples/ntp
|
||||
@${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD ${WRKBUILD}/README.OpenBSD
|
||||
${INSTALL_DATA} ${WRKBUILD}/README.OpenBSD \
|
||||
${PREFIX}/share/examples/ntp/
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
MD5 (ntp-4.2.4p7.tar.gz) = jBn/Yu1PfWT44qpZyxHzZA==
|
||||
RMD160 (ntp-4.2.4p7.tar.gz) = EdaRdsjLS5X36fRow3q4/FOiiHY=
|
||||
SHA1 (ntp-4.2.4p7.tar.gz) = hHb3Xa/+mFHMbzPRcJArzndjdJk=
|
||||
SHA256 (ntp-4.2.4p7.tar.gz) = VoGIPOXNBmbXPBuQfihGU5ZKJa1MAqMIqxG1SsqPAcM=
|
||||
SIZE (ntp-4.2.4p7.tar.gz) = 3382146
|
||||
MD5 (ntp-4.2.6p1.tar.gz) = BRA5bfveQGeLkvgI7AfA0g==
|
||||
RMD160 (ntp-4.2.6p1.tar.gz) = lVJ6zVh6Qvcm+i3NBFCr+RFn0+Y=
|
||||
SHA1 (ntp-4.2.6p1.tar.gz) = xPpVr7jyEEFG0lt1oJQ36/+01lc=
|
||||
SHA256 (ntp-4.2.6p1.tar.gz) = 7EDzUl5tZjcQk3BWiBMMjIo9arLJCsbj28GrRV+8fF0=
|
||||
SIZE (ntp-4.2.6p1.tar.gz) = 4327920
|
||||
|
@ -1,54 +1,18 @@
|
||||
Several steps need to be taken to properly configure the NTP daemon.
|
||||
|
||||
1) First, create or update the file /etc/ntp.conf. Several
|
||||
1. First, create or update the file ${SYSCONFDIR}/ntp.conf. Several
|
||||
example configuration files can be found here:
|
||||
|
||||
${TRUEPREFIX}/share/examples/ntp
|
||||
${PREFIX}/share/examples/ntp
|
||||
|
||||
2) Next, several command scripts for system startup need to be
|
||||
modified.
|
||||
2. Add the following to /etc/rc.local
|
||||
|
||||
(a) Add the following to /etc/rc.securelevel:
|
||||
if [ X"${xntpd_flags}" != X"NO" -a -x ${PREFIX}/sbin/ntpd \
|
||||
-a -f ${SYSCONFDIR}/ntp.conf ]; then
|
||||
echo -n ' ntpd'; ${PREFIX}/sbin/ntpd ${xntpd_flags}
|
||||
fi
|
||||
|
||||
# Securelevel > 1 does not allow the clock to be set backwards
|
||||
if [ $securelevel -gt 1 -a X"${xntpdate_flags}" != X"NO" \
|
||||
-a -x ${TRUEPREFIX}/sbin/ntpdate ]; then
|
||||
echo -n ' ntpdate'
|
||||
${TRUEPREFIX}/sbin/ntpdate -b ${xntpdate_flags} >/dev/null
|
||||
fi
|
||||
3. Edit /etc/rc.conf.local:
|
||||
|
||||
# tickadj is not always needed
|
||||
if [ X"${xntpd}" == X"YES" -a -x ${TRUEPREFIX}/sbin/tickadj \
|
||||
-a -e /etc/ntp.conf ]; then
|
||||
echo -n ' tickadj'; ${TRUEPREFIX}/sbin/tickadj -Aq
|
||||
fi
|
||||
|
||||
(b) Add the following to /etc/rc.local:
|
||||
|
||||
# run ntpdate prior to ntpd
|
||||
if [ $securelevel -le 1 -a X"${xntpdate_flags}" != X"NO" \
|
||||
-a -x ${TRUEPREFIX}/sbin/ntpdate ]; then
|
||||
echo -n ' ntpdate'
|
||||
${TRUEPREFIX}/sbin/ntpdate -b ${xntpdate_flags} >/dev/null
|
||||
fi
|
||||
|
||||
if [ X"${xntpd}" == X"YES" -a -x ${TRUEPREFIX}/sbin/ntpd \
|
||||
-a -e /etc/ntp.conf ]; then
|
||||
xntpd_flags="-p /var/run/ntpd.pid"
|
||||
if [ $securelevel -ge 1 ]; then
|
||||
xntpd_flags="${xntpd_flags} -x"
|
||||
fi
|
||||
echo -n ' ntpd'; ${TRUEPREFIX}/sbin/ntpd ${xntpd_flags}
|
||||
fi
|
||||
|
||||
(c) Then, in /etc/rc.conf.local, set the following variables accordingly.
|
||||
|
||||
xntpd=YES # change to NO to disable
|
||||
xntpdate_flags="pool.ntp.org" # set to list of NTP servers
|
||||
|
||||
(refer to rc.conf(8) for more information regarding its use)
|
||||
|
||||
3) Finally, restart your system. The system restart is necessary as
|
||||
tickadj is run from /etc/rc.securelevel before the system securelevel
|
||||
is raised.
|
||||
xntpd_flags="" # change to NO to disable
|
||||
|
||||
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-config_h_in,v 1.5 2009/05/23 16:32:29 naddy Exp $
|
||||
--- config.h.in.orig Mon May 18 10:53:23 2009
|
||||
+++ config.h.in Sat May 23 17:03:44 2009
|
||||
@@ -352,6 +352,9 @@
|
||||
/* Define to 1 if you have the `getdtablesize' function. */
|
||||
#undef HAVE_GETDTABLESIZE
|
||||
|
||||
+/* Define to 1 if you have the `geteuid' function. */
|
||||
+#undef HAVE_GETEUID
|
||||
+
|
||||
/* Define to 1 if you have the `getifaddrs' function. */
|
||||
#undef HAVE_GETIFADDRS
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-configure_ac,v 1.2 2009/05/23 16:32:29 naddy Exp $
|
||||
--- configure.ac.orig Tue May 12 07:58:54 2009
|
||||
+++ configure.ac Sat May 23 17:03:43 2009
|
||||
@@ -1183,7 +1183,7 @@ esac])
|
||||
case "$host" in
|
||||
*-pc-cygwin*)
|
||||
;;
|
||||
- *) AC_CHECK_FUNCS(getuid)
|
||||
+ *) AC_CHECK_FUNCS(getuid geteuid)
|
||||
;;
|
||||
esac
|
||||
AC_CHECK_FUNCS(hstrerror)
|
12
net/ntp/patches/patch-libntp_inttoa_c
Normal file
12
net/ntp/patches/patch-libntp_inttoa_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-libntp_inttoa_c,v 1.1 2010/07/03 02:49:43 naddy Exp $
|
||||
--- libntp/inttoa.c.orig Thu Jul 1 14:50:26 2010
|
||||
+++ libntp/inttoa.c Thu Jul 1 14:50:36 2010
|
||||
@@ -15,7 +15,7 @@ inttoa(
|
||||
register char *buf;
|
||||
|
||||
LIB_GETBUF(buf);
|
||||
- snprintf(buf, sizeof(buf), "%ld", val);
|
||||
+ snprintf(buf, LIB_BUFLENGTH, "%ld", val);
|
||||
|
||||
return buf;
|
||||
}
|
17
net/ntp/patches/patch-libntp_ssl_init_c
Normal file
17
net/ntp/patches/patch-libntp_ssl_init_c
Normal file
@ -0,0 +1,17 @@
|
||||
$OpenBSD: patch-libntp_ssl_init_c,v 1.1 2010/07/03 02:49:43 naddy Exp $
|
||||
--- libntp/ssl_init.c.orig Thu Jul 1 14:52:27 2010
|
||||
+++ libntp/ssl_init.c Thu Jul 1 15:23:08 2010
|
||||
@@ -99,11 +99,11 @@ keytype_from_text(
|
||||
fprintf(stderr,
|
||||
"key type %s %u octet digests are too big, max %u\n",
|
||||
keytype_name(key_type), digest_len,
|
||||
- MAX_MAC_LEN - sizeof(keyid_t));
|
||||
+ (u_int)(MAX_MAC_LEN - sizeof(keyid_t)));
|
||||
msyslog(LOG_ERR,
|
||||
"key type %s %u octet digests are too big, max %u",
|
||||
keytype_name(key_type), digest_len,
|
||||
- MAX_MAC_LEN - sizeof(keyid_t));
|
||||
+ (u_int)(MAX_MAC_LEN - sizeof(keyid_t)));
|
||||
return 0;
|
||||
}
|
||||
#else
|
21
net/ntp/patches/patch-ntpd_ntp_config_c
Normal file
21
net/ntp/patches/patch-ntpd_ntp_config_c
Normal file
@ -0,0 +1,21 @@
|
||||
$OpenBSD: patch-ntpd_ntp_config_c,v 1.3 2010/07/03 02:49:43 naddy Exp $
|
||||
--- ntpd/ntp_config.c.orig Thu Jul 1 15:14:11 2010
|
||||
+++ ntpd/ntp_config.c Thu Jul 1 15:15:14 2010
|
||||
@@ -2694,7 +2694,7 @@ config_phone(
|
||||
else
|
||||
msyslog(LOG_INFO,
|
||||
"phone: Number of phone entries exceeds %d. Ignoring phone %s...",
|
||||
- COUNTOF(sys_phone) - 1, *s);
|
||||
+ (int)COUNTOF(sys_phone) - 1, *s);
|
||||
s = next_node(s);
|
||||
}
|
||||
|
||||
@@ -2852,7 +2852,7 @@ config_ttl(
|
||||
else
|
||||
msyslog(LOG_INFO,
|
||||
"ttl: Number of TTL entries exceeds %d. Ignoring TTL %d...",
|
||||
- COUNTOF(sys_ttl), *curr_ttl);
|
||||
+ (int)COUNTOF(sys_ttl), *curr_ttl);
|
||||
|
||||
curr_ttl = next_node(curr_ttl);
|
||||
}
|
23
net/ntp/patches/patch-ntpd_ntp_intres_c
Normal file
23
net/ntp/patches/patch-ntpd_ntp_intres_c
Normal file
@ -0,0 +1,23 @@
|
||||
$OpenBSD: patch-ntpd_ntp_intres_c,v 1.1 2010/07/03 02:49:43 naddy Exp $
|
||||
--- ntpd/ntp_intres.c.orig Thu Jul 1 14:55:24 2010
|
||||
+++ ntpd/ntp_intres.c Thu Jul 1 15:23:51 2010
|
||||
@@ -830,8 +830,8 @@ request(
|
||||
if (total_len > sizeof(reqpkt)) {
|
||||
msyslog(LOG_ERR,
|
||||
"intres total_len %u limit is %u (%u octet digest)\n",
|
||||
- total_len, sizeof(reqpkt),
|
||||
- req_hashlen);
|
||||
+ (u_int)total_len, (u_int)sizeof(reqpkt),
|
||||
+ (u_int)req_hashlen);
|
||||
resolver_exit(1);
|
||||
}
|
||||
} else {
|
||||
@@ -849,7 +849,7 @@ request(
|
||||
if ((size_t)n != req_hashlen + sizeof(reqpkt.keyid)) {
|
||||
msyslog(LOG_ERR,
|
||||
"intres maclen %d expected %u\n",
|
||||
- n, req_hashlen + sizeof(reqpkt.keyid));
|
||||
+ n, (u_int)(req_hashlen + sizeof(reqpkt.keyid)));
|
||||
resolver_exit(1);
|
||||
}
|
||||
req_len += n;
|
@ -1,28 +1,30 @@
|
||||
$OpenBSD: patch-ntpd_ntp_request_c,v 1.1 2010/01/20 20:43:59 naddy Exp $
|
||||
--- ntpd/ntp_request.c.orig Tue May 12 07:59:01 2009
|
||||
+++ ntpd/ntp_request.c Wed Jan 20 21:24:13 2010
|
||||
@@ -409,6 +409,7 @@ process_private(
|
||||
int mod_okay
|
||||
)
|
||||
{
|
||||
+ static u_long quiet_until;
|
||||
struct req_pkt *inpkt;
|
||||
struct req_pkt_tail *tailinpkt;
|
||||
struct sockaddr_storage *srcadr;
|
||||
@@ -444,8 +445,14 @@ process_private(
|
||||
|| (++ec, INFO_MBZ(inpkt->mbz_itemsize) != 0)
|
||||
|| (++ec, rbufp->recv_length < REQ_LEN_HDR)
|
||||
) {
|
||||
- msyslog(LOG_ERR, "process_private: INFO_ERR_FMT: test %d failed, pkt from %s", ec, stoa(srcadr));
|
||||
- req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
|
||||
+ NLOG(NLOG_SYSEVENT)
|
||||
+ if (current_time >= quiet_until) {
|
||||
+ msyslog(LOG_ERR,
|
||||
+ "process_private: drop test %d"
|
||||
+ " failed, pkt from %s",
|
||||
+ ec, stoa(srcadr));
|
||||
+ quiet_until = current_time + 60;
|
||||
+ }
|
||||
return;
|
||||
}
|
||||
|
||||
$OpenBSD: patch-ntpd_ntp_request_c,v 1.2 2010/07/03 02:49:43 naddy Exp $
|
||||
--- ntpd/ntp_request.c.orig Thu Jul 1 14:56:30 2010
|
||||
+++ ntpd/ntp_request.c Thu Jul 1 15:24:35 2010
|
||||
@@ -585,22 +585,22 @@ process_private(
|
||||
DPRINTF(5, ("failed auth %d info_auth_keyid %u pkt keyid %u maclen %u\n",
|
||||
INFO_IS_AUTH(inpkt->auth_seq),
|
||||
info_auth_keyid,
|
||||
- ntohl(tailinpkt->keyid), mac_len));
|
||||
+ ntohl(tailinpkt->keyid), (u_int)mac_len));
|
||||
#ifdef DEBUG
|
||||
msyslog(LOG_DEBUG,
|
||||
"process_private: failed auth %d info_auth_keyid %u pkt keyid %u maclen %u\n",
|
||||
INFO_IS_AUTH(inpkt->auth_seq),
|
||||
info_auth_keyid,
|
||||
- ntohl(tailinpkt->keyid), mac_len);
|
||||
+ ntohl(tailinpkt->keyid), (u_int)mac_len);
|
||||
#endif
|
||||
req_ack(srcadr, inter, inpkt, INFO_ERR_AUTH);
|
||||
return;
|
||||
}
|
||||
if (recv_len > REQ_LEN_NOMAC + MAX_MAC_LEN) {
|
||||
- DPRINTF(5, ("bad pkt length %d\n", recv_len));
|
||||
+ DPRINTF(5, ("bad pkt length %d\n", (int)recv_len));
|
||||
msyslog(LOG_ERR,
|
||||
"process_private: bad pkt length %d",
|
||||
- recv_len);
|
||||
+ (int)recv_len);
|
||||
req_ack(srcadr, inter, inpkt, INFO_ERR_FMT);
|
||||
return;
|
||||
}
|
||||
|
12
net/ntp/patches/patch-ntpd_ntp_scanner_c
Normal file
12
net/ntp/patches/patch-ntpd_ntp_scanner_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-ntpd_ntp_scanner_c,v 1.1 2010/07/03 02:49:43 naddy Exp $
|
||||
--- ntpd/ntp_scanner.c.orig Thu Jul 1 15:15:49 2010
|
||||
+++ ntpd/ntp_scanner.c Thu Jul 1 15:16:09 2010
|
||||
@@ -637,7 +637,7 @@ lex_too_long:
|
||||
yytext[min(sizeof(yytext) - 1, 50)] = 0;
|
||||
msyslog(LOG_ERR,
|
||||
"configuration item on line %d longer than limit of %d, began with '%s'",
|
||||
- ip_file->line_no, sizeof(yytext) - 1, yytext);
|
||||
+ ip_file->line_no, (int)sizeof(yytext) - 1, yytext);
|
||||
|
||||
/*
|
||||
* If we hit the length limit reading the startup configuration
|
@ -1,21 +0,0 @@
|
||||
$OpenBSD: patch-ntpd_ntpd_c,v 1.4 2009/05/23 16:32:29 naddy Exp $
|
||||
--- ntpd/ntpd.c.orig Mon May 18 10:22:36 2009
|
||||
+++ ntpd/ntpd.c Sat May 23 17:02:24 2009
|
||||
@@ -484,11 +484,16 @@ ntpdmain(
|
||||
}
|
||||
#endif
|
||||
|
||||
-#if defined(HAVE_GETUID) && !defined(MPE) /* MPE lacks the concept of root */
|
||||
+#if (defined(HAVE_GETUID) || defined(HAVE_GETEUID)) \
|
||||
+ && !defined(MPE) /* MPE lacks the concept of root */
|
||||
{
|
||||
uid_t uid;
|
||||
|
||||
+#if defined(HAVE_GETEUID)
|
||||
+ uid = geteuid();
|
||||
+#else
|
||||
uid = getuid();
|
||||
+#endif
|
||||
if (uid)
|
||||
{
|
||||
msyslog(LOG_ERR, "ntpd: must be run as root, not uid %ld", (long)uid);
|
12
net/ntp/patches/patch-ntpd_refclock_acts_c
Normal file
12
net/ntp/patches/patch-ntpd_refclock_acts_c
Normal file
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-ntpd_refclock_acts_c,v 1.1 2010/07/03 02:49:43 naddy Exp $
|
||||
--- ntpd/refclock_acts.c.orig Thu Jul 1 15:05:23 2010
|
||||
+++ ntpd/refclock_acts.c Thu Jul 1 15:06:16 2010
|
||||
@@ -363,7 +363,7 @@ acts_message(
|
||||
#ifdef DEBUG
|
||||
ioctl(pp->io.fd, TIOCMGET, (char *)&modem);
|
||||
snprintf(tbuf, sizeof(tbuf), "acts: %04x (%d %d) %d %s", modem,
|
||||
- up->state, up->timer, strlen(pp->a_lastcode),
|
||||
+ up->state, up->timer, (int)strlen(pp->a_lastcode),
|
||||
pp->a_lastcode);
|
||||
if (debug)
|
||||
printf("%s\n", tbuf);
|
14
net/ntp/patches/patch-ntpd_refclock_irig_c
Normal file
14
net/ntp/patches/patch-ntpd_refclock_irig_c
Normal file
@ -0,0 +1,14 @@
|
||||
$OpenBSD: patch-ntpd_refclock_irig_c,v 1.1 2010/07/03 02:49:43 naddy Exp $
|
||||
--- ntpd/refclock_irig.c.orig Thu Jul 1 15:13:32 2010
|
||||
+++ ntpd/refclock_irig.c Thu Jul 1 15:13:50 2010
|
||||
@@ -844,8 +844,8 @@ irig_decode(
|
||||
* Local variables
|
||||
*/
|
||||
int syncdig; /* sync digit (Spectracom) */
|
||||
- char sbs[6]; /* binary seconds since 0h */
|
||||
- char spare[2]; /* mulligan digits */
|
||||
+ char sbs[6+1]; /* binary seconds since 0h */
|
||||
+ char spare[2+1]; /* mulligan digits */
|
||||
int temp;
|
||||
|
||||
pp = peer->procptr;
|
32
net/ntp/patches/patch-ntpdc_ntpdc_c
Normal file
32
net/ntp/patches/patch-ntpdc_ntpdc_c
Normal file
@ -0,0 +1,32 @@
|
||||
$OpenBSD: patch-ntpdc_ntpdc_c,v 1.1 2010/07/03 02:49:43 naddy Exp $
|
||||
--- ntpdc/ntpdc.c.orig Thu Jul 1 15:16:31 2010
|
||||
+++ ntpdc/ntpdc.c Thu Jul 1 15:19:33 2010
|
||||
@@ -805,7 +805,7 @@ getresponse(
|
||||
if (debug)
|
||||
printf(
|
||||
"Received items %d, size %d (total %d), data in packet is %d\n",
|
||||
- items, size, datasize, n-RESP_HEADER_SIZE);
|
||||
+ items, size, datasize, n-(int)RESP_HEADER_SIZE);
|
||||
goto again;
|
||||
}
|
||||
|
||||
@@ -994,8 +994,8 @@ sendrequest(
|
||||
} else if (maclen != (info_auth_hashlen + sizeof(keyid_t))) {
|
||||
fprintf(stderr,
|
||||
"%d octet MAC, %u expected with %u octet digest\n",
|
||||
- maclen, (info_auth_hashlen + sizeof(keyid_t)),
|
||||
- info_auth_hashlen);
|
||||
+ maclen, (u_int)(info_auth_hashlen + sizeof(keyid_t)),
|
||||
+ (u_int)info_auth_hashlen);
|
||||
return 1;
|
||||
}
|
||||
return sendpkt(&qpkt, reqsize + maclen);
|
||||
@@ -1807,7 +1807,7 @@ keytype(
|
||||
if (!pcmd->nargs) {
|
||||
fprintf(fp, "keytype is %s with %u octet digests\n",
|
||||
keytype_name(info_auth_keytype),
|
||||
- info_auth_hashlen);
|
||||
+ (u_int)info_auth_hashlen);
|
||||
return;
|
||||
}
|
||||
|
32
net/ntp/patches/patch-ntpq_ntpq_c
Normal file
32
net/ntp/patches/patch-ntpq_ntpq_c
Normal file
@ -0,0 +1,32 @@
|
||||
$OpenBSD: patch-ntpq_ntpq_c,v 1.3 2010/07/03 02:49:43 naddy Exp $
|
||||
--- ntpq/ntpq.c.orig Thu Jul 1 15:19:59 2010
|
||||
+++ ntpq/ntpq.c Thu Jul 1 15:22:48 2010
|
||||
@@ -795,7 +795,7 @@ sendpkt(
|
||||
)
|
||||
{
|
||||
if (debug >= 3)
|
||||
- printf("Sending %u octets\n", xdatalen);
|
||||
+ printf("Sending %u octets\n", (u_int)xdatalen);
|
||||
|
||||
if (send(sockfd, xdata, (size_t)xdatalen, 0) == -1) {
|
||||
warning("write to %s failed", currenthost, "");
|
||||
@@ -1313,8 +1313,8 @@ sendrequest(
|
||||
} else if ((size_t)maclen != (info_auth_hashlen + sizeof(keyid_t))) {
|
||||
fprintf(stderr,
|
||||
"%d octet MAC, %u expected with %u octet digest\n",
|
||||
- maclen, (info_auth_hashlen + sizeof(keyid_t)),
|
||||
- info_auth_hashlen);
|
||||
+ maclen, (u_int)(info_auth_hashlen + sizeof(keyid_t)),
|
||||
+ (u_int)info_auth_hashlen);
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -2395,7 +2395,7 @@ keytype(
|
||||
if (!pcmd->nargs) {
|
||||
fprintf(fp, "keytype is %s with %u octet digests\n",
|
||||
keytype_name(info_auth_keytype),
|
||||
- info_auth_hashlen);
|
||||
+ (u_int)info_auth_hashlen);
|
||||
return;
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
@comment $OpenBSD: PLIST,v 1.15 2009/05/23 16:32:29 naddy Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.16 2010/07/03 02:49:43 naddy Exp $
|
||||
@conflict ntp-doc-*
|
||||
@pkgpath net/ntp,-main
|
||||
@man man/man1/ntp-keygen.1
|
||||
@man man/man1/ntpd.1
|
||||
@man man/man1/ntpdc.1
|
||||
@comment man/man1/ntpdsim.1
|
||||
@man man/man1/ntpq.1
|
||||
@comment @man man/man1/ntpsnmpd.1
|
||||
@man man/man1/sntp.1
|
||||
@bin sbin/ntp-keygen
|
||||
sbin/ntp-wait
|
||||
@ -21,56 +21,17 @@ share/doc/ntp/accopt.html
|
||||
share/doc/ntp/assoc.html
|
||||
share/doc/ntp/audio.html
|
||||
share/doc/ntp/authopt.html
|
||||
share/doc/ntp/build/
|
||||
share/doc/ntp/build/build.html
|
||||
share/doc/ntp/build/config.html
|
||||
share/doc/ntp/build/hints/
|
||||
share/doc/ntp/build/hints.html
|
||||
share/doc/ntp/build/hints/a-ux
|
||||
share/doc/ntp/build/hints/aix
|
||||
share/doc/ntp/build/hints/bsdi
|
||||
share/doc/ntp/build/hints/changes
|
||||
share/doc/ntp/build/hints/decosf1
|
||||
share/doc/ntp/build/hints/decosf2
|
||||
share/doc/ntp/build/hints/freebsd
|
||||
share/doc/ntp/build/hints/hpux
|
||||
share/doc/ntp/build/hints/linux
|
||||
share/doc/ntp/build/hints/mpeix
|
||||
share/doc/ntp/build/hints/netbsd
|
||||
share/doc/ntp/build/hints/notes-xntp-v3
|
||||
share/doc/ntp/build/hints/parse
|
||||
share/doc/ntp/build/hints/refclocks
|
||||
share/doc/ntp/build/hints/rs6000
|
||||
share/doc/ntp/build/hints/sco.html
|
||||
share/doc/ntp/build/hints/sgi
|
||||
share/doc/ntp/build/hints/solaris-dosynctodr.html
|
||||
share/doc/ntp/build/hints/solaris.html
|
||||
share/doc/ntp/build/hints/solaris.xtra.4023118
|
||||
share/doc/ntp/build/hints/solaris.xtra.4095849
|
||||
share/doc/ntp/build/hints/solaris.xtra.S99ntpd
|
||||
share/doc/ntp/build/hints/solaris.xtra.patchfreq
|
||||
share/doc/ntp/build/hints/sun4
|
||||
share/doc/ntp/build/hints/svr4-dell
|
||||
share/doc/ntp/build/hints/svr4_package
|
||||
share/doc/ntp/build/hints/todo
|
||||
share/doc/ntp/build/hints/vxworks.html
|
||||
share/doc/ntp/build/hints/winnt.html
|
||||
share/doc/ntp/build/patches.html
|
||||
share/doc/ntp/build/porting.html
|
||||
share/doc/ntp/build/quick.html
|
||||
share/doc/ntp/build/scripts/
|
||||
share/doc/ntp/build/scripts/footer.txt
|
||||
share/doc/ntp/build/scripts/links10.txt
|
||||
share/doc/ntp/build/scripts/links11.txt
|
||||
share/doc/ntp/build/scripts/links12.txt
|
||||
share/doc/ntp/build/scripts/links7.txt
|
||||
share/doc/ntp/build/scripts/links8.txt
|
||||
share/doc/ntp/build/scripts/links9.txt
|
||||
share/doc/ntp/build/scripts/style.css
|
||||
share/doc/ntp/bugs.html
|
||||
share/doc/ntp/build.html
|
||||
share/doc/ntp/clockopt.html
|
||||
share/doc/ntp/comdex.html
|
||||
share/doc/ntp/config.html
|
||||
share/doc/ntp/confopt.html
|
||||
share/doc/ntp/copyright.html
|
||||
share/doc/ntp/debug.html
|
||||
share/doc/ntp/decode.html
|
||||
share/doc/ntp/description_files/
|
||||
share/doc/ntp/description_files/description.jpg
|
||||
share/doc/ntp/drivers/
|
||||
share/doc/ntp/drivers/driver1.html
|
||||
share/doc/ntp/drivers/driver10.html
|
||||
@ -110,6 +71,7 @@ share/doc/ntp/drivers/driver9.html
|
||||
share/doc/ntp/drivers/icons/
|
||||
share/doc/ntp/drivers/icons/home.gif
|
||||
share/doc/ntp/drivers/icons/mail2.gif
|
||||
share/doc/ntp/drivers/mx4200data.html
|
||||
share/doc/ntp/drivers/oncore-shmem.html
|
||||
share/doc/ntp/drivers/scripts/
|
||||
share/doc/ntp/drivers/scripts/footer.txt
|
||||
@ -117,22 +79,48 @@ share/doc/ntp/drivers/scripts/style.css
|
||||
share/doc/ntp/drivers/tf582_4.html
|
||||
share/doc/ntp/extern.html
|
||||
share/doc/ntp/gadget.html
|
||||
share/doc/ntp/groups.html
|
||||
share/doc/ntp/hints/
|
||||
share/doc/ntp/hints.html
|
||||
share/doc/ntp/hints/a-ux
|
||||
share/doc/ntp/hints/aix
|
||||
share/doc/ntp/hints/bsdi
|
||||
share/doc/ntp/hints/changes
|
||||
share/doc/ntp/hints/decosf1
|
||||
share/doc/ntp/hints/decosf2
|
||||
share/doc/ntp/hints/freebsd
|
||||
share/doc/ntp/hints/hpux
|
||||
share/doc/ntp/hints/linux
|
||||
share/doc/ntp/hints/mpeix
|
||||
share/doc/ntp/hints/notes-xntp-v3
|
||||
share/doc/ntp/hints/parse
|
||||
share/doc/ntp/hints/refclocks
|
||||
share/doc/ntp/hints/rs6000
|
||||
share/doc/ntp/hints/sco.html
|
||||
share/doc/ntp/hints/sgi
|
||||
share/doc/ntp/hints/solaris-dosynctodr.html
|
||||
share/doc/ntp/hints/solaris.html
|
||||
share/doc/ntp/hints/solaris.xtra.4023118
|
||||
share/doc/ntp/hints/solaris.xtra.4095849
|
||||
share/doc/ntp/hints/solaris.xtra.S99ntpd
|
||||
share/doc/ntp/hints/solaris.xtra.patchfreq
|
||||
share/doc/ntp/hints/sun4
|
||||
share/doc/ntp/hints/svr4-dell
|
||||
share/doc/ntp/hints/svr4_package
|
||||
share/doc/ntp/hints/todo
|
||||
share/doc/ntp/hints/vxworks.html
|
||||
share/doc/ntp/hints/winnt.html
|
||||
share/doc/ntp/howto.html
|
||||
share/doc/ntp/icons/
|
||||
share/doc/ntp/icons/home.gif
|
||||
share/doc/ntp/icons/mail2.gif
|
||||
share/doc/ntp/index.html
|
||||
share/doc/ntp/kern.html
|
||||
share/doc/ntp/kernpps.html
|
||||
share/doc/ntp/keygen.html
|
||||
share/doc/ntp/ldisc.html
|
||||
share/doc/ntp/manyopt.html
|
||||
share/doc/ntp/measure.html
|
||||
share/doc/ntp/miscopt.html
|
||||
share/doc/ntp/monopt.html
|
||||
share/doc/ntp/msyslog.html
|
||||
share/doc/ntp/mx4200data.html
|
||||
share/doc/ntp/notes.html
|
||||
share/doc/ntp/ntp_conf.html
|
||||
share/doc/ntp/ntpd.html
|
||||
share/doc/ntp/ntpdate.html
|
||||
@ -148,6 +136,7 @@ share/doc/ntp/pic/
|
||||
share/doc/ntp/pic/9400n.jpg
|
||||
share/doc/ntp/pic/alice11.gif
|
||||
share/doc/ntp/pic/alice13.gif
|
||||
share/doc/ntp/pic/alice15.gif
|
||||
share/doc/ntp/pic/alice23.gif
|
||||
share/doc/ntp/pic/alice31.gif
|
||||
share/doc/ntp/pic/alice32.gif
|
||||
@ -161,19 +150,25 @@ share/doc/ntp/pic/barnstable.gif
|
||||
share/doc/ntp/pic/beaver.gif
|
||||
share/doc/ntp/pic/boom3.gif
|
||||
share/doc/ntp/pic/boom3a.gif
|
||||
share/doc/ntp/pic/boom4.gif
|
||||
share/doc/ntp/pic/broad.gif
|
||||
share/doc/ntp/pic/bustardfly.gif
|
||||
share/doc/ntp/pic/c51.jpg
|
||||
share/doc/ntp/pic/description.jpg
|
||||
share/doc/ntp/pic/dogsnake.gif
|
||||
share/doc/ntp/pic/driver29.gif
|
||||
share/doc/ntp/pic/driver43_1.gif
|
||||
share/doc/ntp/pic/driver43_2.jpg
|
||||
share/doc/ntp/pic/fg6021.gif
|
||||
share/doc/ntp/pic/fg6039.jpg
|
||||
share/doc/ntp/pic/flatheads.gif
|
||||
share/doc/ntp/pic/freq1211.gif
|
||||
share/doc/ntp/pic/gadget.jpg
|
||||
share/doc/ntp/pic/gps167.jpg
|
||||
share/doc/ntp/pic/hornraba.gif
|
||||
share/doc/ntp/pic/igclock.gif
|
||||
share/doc/ntp/pic/neoclock4x.gif
|
||||
share/doc/ntp/pic/offset1211.gif
|
||||
share/doc/ntp/pic/oncore_evalbig.gif
|
||||
share/doc/ntp/pic/oncore_remoteant.jpg
|
||||
share/doc/ntp/pic/oncore_utplusbig.gif
|
||||
@ -181,36 +176,53 @@ share/doc/ntp/pic/oz2.gif
|
||||
share/doc/ntp/pic/panda.gif
|
||||
share/doc/ntp/pic/pd_om006.gif
|
||||
share/doc/ntp/pic/pd_om011.gif
|
||||
share/doc/ntp/pic/peer.gif
|
||||
share/doc/ntp/pic/pogo.gif
|
||||
share/doc/ntp/pic/pogo1a.gif
|
||||
share/doc/ntp/pic/pogo3a.gif
|
||||
share/doc/ntp/pic/pogo4.gif
|
||||
share/doc/ntp/pic/pogo5.gif
|
||||
share/doc/ntp/pic/pogo6.gif
|
||||
share/doc/ntp/pic/pogo7.gif
|
||||
share/doc/ntp/pic/pogo8.gif
|
||||
share/doc/ntp/pic/pzf509.jpg
|
||||
share/doc/ntp/pic/pzf511.jpg
|
||||
share/doc/ntp/pic/rabbit.gif
|
||||
share/doc/ntp/pic/radio2.jpg
|
||||
share/doc/ntp/pic/sheepb.jpg
|
||||
share/doc/ntp/pic/stack1a.jpg
|
||||
share/doc/ntp/pic/thunderbolt.jpg
|
||||
share/doc/ntp/pic/tonea.gif
|
||||
share/doc/ntp/pic/tribeb.gif
|
||||
share/doc/ntp/pic/wingdorothy.gif
|
||||
share/doc/ntp/pps.html
|
||||
share/doc/ntp/prefer.html
|
||||
share/doc/ntp/quick.html
|
||||
share/doc/ntp/rate.html
|
||||
share/doc/ntp/rdebug.html
|
||||
share/doc/ntp/refclock.html
|
||||
share/doc/ntp/release.html
|
||||
share/doc/ntp/scripts/
|
||||
share/doc/ntp/scripts/accopt.txt
|
||||
share/doc/ntp/scripts/audio.txt
|
||||
share/doc/ntp/scripts/authopt.txt
|
||||
share/doc/ntp/scripts/clockopt.txt
|
||||
share/doc/ntp/scripts/command.txt
|
||||
share/doc/ntp/scripts/config.txt
|
||||
share/doc/ntp/scripts/confopt.txt
|
||||
share/doc/ntp/scripts/external.txt
|
||||
share/doc/ntp/scripts/footer.txt
|
||||
share/doc/ntp/scripts/links10.txt
|
||||
share/doc/ntp/scripts/links11.txt
|
||||
share/doc/ntp/scripts/links12.txt
|
||||
share/doc/ntp/scripts/links7.txt
|
||||
share/doc/ntp/scripts/links8.txt
|
||||
share/doc/ntp/scripts/links9.txt
|
||||
share/doc/ntp/scripts/install.txt
|
||||
share/doc/ntp/scripts/manual.txt
|
||||
share/doc/ntp/scripts/misc.txt
|
||||
share/doc/ntp/scripts/miscopt.txt
|
||||
share/doc/ntp/scripts/monopt.txt
|
||||
share/doc/ntp/scripts/refclock.txt
|
||||
share/doc/ntp/scripts/style.css
|
||||
share/doc/ntp/sitemap.html
|
||||
share/doc/ntp/sntp.html
|
||||
share/doc/ntp/tickadj.html
|
||||
share/doc/ntp/xleave.html
|
||||
share/examples/ntp/
|
||||
share/examples/ntp/README
|
||||
share/examples/ntp/README.OpenBSD
|
||||
|
Loading…
Reference in New Issue
Block a user