cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 4.2.6p2, which incorporates most of our patches

Browse Source
This commit is contained in:
naddy 2010-07-10 19:48:32 +00:00
parent 5b0c712762
commit 1f6f6d3a51
12 changed files with 28 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/ntp/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.43 2010/07/03 02:49:43 naddy Exp $
# $OpenBSD: Makefile,v 1.44 2010/07/10 19:48:32 naddy Exp $
COMMENT= Network Time Protocol reference implementation
@ -6,7 +6,7 @@ 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.6p1
VERSION= 4.2.6p2
DISTNAME= ntp-${VERSION}
PKGNAME= ntp-${VERSION:S/p/pl/}
CATEGORIES= net
@ -22,16 +22,15 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c crypto edit kvm m termcap
BUILD_DEPENDS= ::devel/bison
# enabling SEPARATE_BUILD causes the parser to be rebuilt .y -> .c,
# which requires bison
SEPARATE_BUILD= simple
USE_LIBTOOL= Yes
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

10
net/ntp/distinfo
View File

@ -1,5 +1,5 @@
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
MD5 (ntp-4.2.6p2.tar.gz) = z3PNhfJIIyxi+AKebrBZOA==
RMD160 (ntp-4.2.6p2.tar.gz) = gF54RQF7l+TVqMOOx1TIxzc6NTE=
SHA1 (ntp-4.2.6p2.tar.gz) = BLXjw3Vf6eW87FvV0pJVz+8hAsQ=
SHA256 (ntp-4.2.6p2.tar.gz) = QomLeQOi2gSiQohckpGZA9Vu5pwCk+yChWjKtx3T6dg=
SIZE (ntp-4.2.6p2.tar.gz) = 4338873

12
net/ntp/patches/patch-libntp_inttoa_c
View File

@ -1,12 +0,0 @@
$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
View File

@ -1,17 +0,0 @@
$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
View File

@ -1,21 +0,0 @@
$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);
}

27
net/ntp/patches/patch-ntpd_ntp_intres_c
View File

@ -1,23 +1,12 @@
$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 {
$OpenBSD: patch-ntpd_ntp_intres_c,v 1.2 2010/07/10 19:48:32 naddy Exp $
--- ntpd/ntp_intres.c.orig Sat Jul 10 18:22:29 2010
+++ ntpd/ntp_intres.c Sat Jul 10 18:22:51 2010
@@ -849,7 +849,7 @@ request(
n = authencrypt(req_keyid, (void *)&reqpkt, req_len);
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)));
- "intres maclen %d expected %u\n",
+ "intres maclen %d expected %lu\n",
n, (u_long)(req_hashlen +
sizeof(reqpkt.keyid)));
resolver_exit(1);
}
req_len += n;

30
net/ntp/patches/patch-ntpd_ntp_request_c
View File

@ -1,30 +0,0 @@
$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;
}

22
net/ntp/patches/patch-ntpd_ntp_scanner_c
View File

@ -1,12 +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);
$OpenBSD: patch-ntpd_ntp_scanner_c,v 1.2 2010/07/10 19:48:32 naddy Exp $
--- ntpd/ntp_scanner.c.orig Sat Jul 10 18:30:24 2010
+++ ntpd/ntp_scanner.c Sat Jul 10 18:30:39 2010
@@ -351,7 +351,7 @@ is_special(
int ch
)
{
- return (int)strchr(special_chars, ch);
+ return strchr(special_chars, ch) != NULL;
}
/*
* If we hit the length limit reading the startup configuration

12
net/ntp/patches/patch-ntpd_refclock_acts_c
View File

@ -1,12 +0,0 @@
$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
View File

@ -1,14 +0,0 @@
$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
View File

@ -1,32 +0,0 @@
$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
View File

@ -1,32 +0,0 @@
$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;
}