update to scamper-20211212
This commit is contained in:
parent
cc2a9e1577
commit
c4cecbb259
@ -1,11 +1,10 @@
|
||||
# $OpenBSD: Makefile,v 1.47 2021/10/28 12:09:25 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.48 2021/12/15 12:05:23 sthen Exp $
|
||||
|
||||
SHARED_LIBS += scamperfile 3.0 # 2.0
|
||||
|
||||
COMMENT = parallel internet measurement utility
|
||||
|
||||
V = 20211026
|
||||
REVISION = 0
|
||||
V = 20211212
|
||||
DISTNAME = scamper-cvs-$V
|
||||
PKGNAME = scamper-$V
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (scamper-cvs-20211026.tar.gz) = vnWRmlnXMidZgmBmi37XX2pxBQcxDKmCd4mxjNfdpoQ=
|
||||
SIZE (scamper-cvs-20211026.tar.gz) = 1932048
|
||||
SHA256 (scamper-cvs-20211212.tar.gz) = rk+ErvKDc3AVaKnlfsRKMewghxwzwESlJy3nJqy9LRM=
|
||||
SIZE (scamper-cvs-20211212.tar.gz) = 2099070
|
||||
|
@ -1,29 +0,0 @@
|
||||
$OpenBSD: patch-scamper_host_scamper_host_do_c,v 1.1 2021/10/28 12:09:25 sthen Exp $
|
||||
|
||||
Index: scamper/host/scamper_host_do.c
|
||||
--- scamper/host/scamper_host_do.c.orig
|
||||
+++ scamper/host/scamper_host_do.c
|
||||
@@ -1419,7 +1419,7 @@ static void do_host_free(scamper_task_t *task)
|
||||
static int etc_resolv_line(char *line, void *param)
|
||||
{
|
||||
scamper_addr_t *sa;
|
||||
- int x = 0;
|
||||
+ int x = 0, y;
|
||||
|
||||
if(line[0] == '\0' || line[0] == '#')
|
||||
return 0;
|
||||
@@ -1431,6 +1431,14 @@ static int etc_resolv_line(char *line, void *param)
|
||||
x++;
|
||||
if(x == 10 || line[x] == '\0')
|
||||
return 0;
|
||||
+
|
||||
+ /* null terminate at spaces / comments */
|
||||
+ y = x;
|
||||
+ while(isspace(line[y]) == 0 && line[y] != '\0' && line[y] != '#' &&
|
||||
+ line[y] != ';')
|
||||
+ y++;
|
||||
+ line[y] = '\0';
|
||||
+
|
||||
if(strcasecmp(line+x, "fe80::1") == 0)
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user