update to ntp 4.1.72
- no longer need patches for RAND_file_name; it was fixed in -current
This commit is contained in:
parent
65b3ed2f7c
commit
7a84297a59
@ -1,11 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.18 2001/12/20 15:12:11 danh Exp $
|
||||
# $OpenBSD: Makefile,v 1.19 2001/12/20 21:07:21 danh Exp $
|
||||
|
||||
COMMENT= "network time protocol implementation"
|
||||
COMMENT-doc= "network time protocol documentation"
|
||||
|
||||
VERSION= 4.1.71
|
||||
VERSION= 4.1.72
|
||||
DISTNAME= ntp-${VERSION}
|
||||
PKGNAME= ntp-${VERSION}p1
|
||||
PKGNAME= ntp-${VERSION}
|
||||
PKGNAME-doc= ntp-doc-${VERSION}
|
||||
CATEGORIES= net
|
||||
NEED_VERSION= 1.502
|
||||
|
@ -1,3 +1,3 @@
|
||||
MD5 (ntp-4.1.71.tar.gz) = d7598b507bd201b69163f7a76bbf6e48
|
||||
RMD160 (ntp-4.1.71.tar.gz) = 4cf90b4da434ebacca3e1653813fda7112b68824
|
||||
SHA1 (ntp-4.1.71.tar.gz) = d304592ebbcd8727ed6158cc033b806aecd061ed
|
||||
MD5 (ntp-4.1.72.tar.gz) = de9ed6a28f4c4ffea932a49db5b745fa
|
||||
RMD160 (ntp-4.1.72.tar.gz) = 4b3d4e1a11b160845e7b3af3ea1769a59b11e9ab
|
||||
SHA1 (ntp-4.1.72.tar.gz) = 23609b3f848b53ac84f33ec9005f6735c92c1e3b
|
||||
|
@ -1,24 +0,0 @@
|
||||
$OpenBSD: patch-ntpd_ntp_crypto_c,v 1.1 2001/12/20 15:00:09 danh Exp $
|
||||
--- ntpd/ntp_crypto.c.orig Thu Dec 20 09:40:55 2001
|
||||
+++ ntpd/ntp_crypto.c Thu Dec 20 09:51:08 2001
|
||||
@@ -1675,6 +1675,7 @@ crypto_setup(void)
|
||||
{
|
||||
struct cert_info *cinf; /* certificate information */
|
||||
char filename[MAXFILENAME]; /* name of rsa key file */
|
||||
+ const char *rf;
|
||||
l_fp tstamp; /* NTP timestamp */
|
||||
u_int len, bytes;
|
||||
u_char *ptr;
|
||||
@@ -1701,9 +1702,9 @@ crypto_setup(void)
|
||||
*/
|
||||
ERR_load_crypto_strings();
|
||||
if (rand_file == NULL) {
|
||||
- if ((RAND_file_name(filename, MAXFILENAME)) != NULL) {
|
||||
- rand_file = emalloc(strlen(filename) + 1);
|
||||
- strcpy(rand_file, filename);
|
||||
+ if ((rf = RAND_file_name(filename, MAXFILENAME)) != NULL) {
|
||||
+ rand_file = emalloc(strlen(rf) + 1);
|
||||
+ strcpy(rand_file, rf);
|
||||
}
|
||||
} else if (*rand_file != '/') {
|
||||
snprintf(filename, MAXFILENAME, "%s/%s", keysdir,
|
@ -1,34 +0,0 @@
|
||||
$OpenBSD: patch-util_genkeys_c,v 1.1 2001/12/20 06:14:16 danh Exp $
|
||||
--- util/genkeys.c.orig Wed Sep 19 02:06:58 2001
|
||||
+++ util/genkeys.c Thu Dec 20 00:54:56 2001
|
||||
@@ -8,6 +8,7 @@
|
||||
#endif
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/time.h>
|
||||
@@ -76,6 +77,7 @@ main(
|
||||
u_char seed[20]; /* seed for DSA parameters */
|
||||
int codes; /* DH check codes */
|
||||
char pathbuf[PATH_MAX];
|
||||
+ const char *p;
|
||||
#endif /* OPENSSL */
|
||||
u_char md5key[16];
|
||||
FILE *str;
|
||||
@@ -116,11 +118,13 @@ main(
|
||||
/*
|
||||
* Seed random number generator and grow weeds.
|
||||
*/
|
||||
- if (RAND_file_name(pathbuf, PATH_MAX) == NULL) {
|
||||
+ if ((p = RAND_file_name(pathbuf, PATH_MAX)) == NULL) {
|
||||
printf("RAND_file_name %s\n",
|
||||
ERR_error_string(ERR_get_error(), NULL));
|
||||
exit (-1);
|
||||
}
|
||||
+ if (p != pathbuf)
|
||||
+ strlcpy(pathbuf, p, sizeof pathbuf);
|
||||
temp = RAND_load_file(pathbuf, -1);
|
||||
if (temp == 0) {
|
||||
printf("RAND_load_file %s\n",
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2001/10/04 20:44:45 jakob Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.7 2001/12/20 21:07:21 danh Exp $
|
||||
@pkgcfl xntp3-*
|
||||
sbin/ntp-genkeys
|
||||
sbin/ntp-wait
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST-doc,v 1.3 2001/08/10 19:08:51 danh Exp $
|
||||
@comment $OpenBSD: PLIST-doc,v 1.4 2001/12/20 21:07:21 danh Exp $
|
||||
share/doc/ntp/Oncore-SHMEM.htm
|
||||
share/doc/ntp/accopt.htm
|
||||
share/doc/ntp/assoc.htm
|
||||
@ -38,6 +38,7 @@ share/doc/ntp/driver37.htm
|
||||
share/doc/ntp/driver38.htm
|
||||
share/doc/ntp/driver39.htm
|
||||
share/doc/ntp/driver4.htm
|
||||
share/doc/ntp/driver40.htm
|
||||
share/doc/ntp/driver5.htm
|
||||
share/doc/ntp/driver6.htm
|
||||
share/doc/ntp/driver7.htm
|
||||
@ -57,6 +58,7 @@ 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
|
||||
@ -146,6 +148,7 @@ 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/thumbs.db
|
||||
share/doc/ntp/pic/tonea.gif
|
||||
share/doc/ntp/pic/wingdorothy.gif
|
||||
share/doc/ntp/porting.htm
|
||||
@ -156,6 +159,7 @@ share/doc/ntp/quick.htm
|
||||
share/doc/ntp/rdebug.htm
|
||||
share/doc/ntp/refclock.htm
|
||||
share/doc/ntp/release.htm
|
||||
share/doc/ntp/thumbs.db
|
||||
share/doc/ntp/tickadj.htm
|
||||
@dirrm share/doc/ntp/pic
|
||||
@dirrm share/doc/ntp/hints
|
||||
|
Loading…
x
Reference in New Issue
Block a user