* bump patch level of ntp package

* check return of RAND_file_name better; allows ntp-genkeys to continue
  if a seed file is not found.
* regen configure patch
* quote package comments
* files/md5 -> distinfo
This commit is contained in:
danh 2001-12-20 06:14:15 +00:00
parent e01d1839bb
commit ff3fdbc687
4 changed files with 45 additions and 11 deletions

View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.16 2001/10/04 20:44:45 jakob Exp $
# $OpenBSD: Makefile,v 1.17 2001/12/20 06:14:15 danh Exp $
COMMENT= network time protocol implementation
COMMENT-doc= network time protocol documentation
COMMENT= "network time protocol implementation"
COMMENT-doc= "network time protocol documentation"
VERSION= 4.1.71
DISTNAME= ntp-${VERSION}
PKGNAME= ntp-${VERSION}
PKGNAME= ntp-${VERSION}p1
PKGNAME-doc= ntp-doc-${VERSION}
CATEGORIES= net
NEED_VERSION= 1.434

View File

@ -1,16 +1,16 @@
$OpenBSD: patch-configure,v 1.4 2001/08/10 19:08:51 danh Exp $
--- configure.orig Fri Aug 10 14:45:11 2001
+++ configure Fri Aug 10 14:46:51 2001
@@ -3851,7 +3851,7 @@ if test "${ac_cv_lib_readline_readline+s
$OpenBSD: patch-configure,v 1.5 2001/12/20 06:14:16 danh Exp $
--- configure.orig Wed Sep 19 02:09:06 2001
+++ configure Wed Dec 19 21:16:23 2001
@@ -3691,7 +3691,7 @@ if test "${ac_cv_lib_readline_readline+s
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline $LIBS"
+LIBS="-lreadline -ltermcap $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line 3856 "configure"
#line 3696 "configure"
#include "confdefs.h"
@@ -3899,7 +3899,7 @@ if test $ac_cv_lib_readline_readline = y
@@ -3739,7 +3739,7 @@ if test $ac_cv_lib_readline_readline = y
#define HAVE_LIBREADLINE 1
EOF
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.4 2001/08/10 19:08:51 danh Exp $
fi
@@ -9215,6 +9215,9 @@ fi
@@ -9056,6 +9056,9 @@ fi
done
case "$target" in

View File

@ -0,0 +1,34 @@
$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",