From aa3d062b6aa9c456bfdece958aa5e8703e1b20a5 Mon Sep 17 00:00:00 2001 From: abs Date: Mon, 18 Feb 2002 18:40:41 +0000 Subject: Updated fping to 1.20nb1 When on an alpha you cannot be lazy and assume -1 matches INADDR_NONE Now mono.org's new alpha can run rconfig... This should make norm happy. --- net/fping/Makefile | 3 ++- net/fping/distinfo | 8 ++++---- net/fping/patches/patch-aa | 4 ++-- net/fping/patches/patch-ab | 32 ++++++++++++++++++++++++++++++-- net/fping/patches/patch-ac | 4 ++-- 5 files changed, 40 insertions(+), 11 deletions(-) (limited to 'net') diff --git a/net/fping/Makefile b/net/fping/Makefile index dbb6fc5f188..ee053c1b93f 100644 --- a/net/fping/Makefile +++ b/net/fping/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2001/10/31 17:05:59 zuntum Exp $ +# $NetBSD: Makefile,v 1.6 2002/02/18 18:40:41 abs Exp $ # FreeBSD Id: ports/net/fping/Makefile,v 1.10 2000/04/20 20:18:57 mharo Exp DISTNAME= part01 PKGNAME= fping-1.20 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ftp://ftp.uu.net/usenet/comp.sources.unix/volume26/fping/ \ ftp://ftp.digital.com/pub/usenet/comp.sources.unix/volume26/fping/ \ diff --git a/net/fping/distinfo b/net/fping/distinfo index 42ec95b7a71..8d1282c28b2 100644 --- a/net/fping/distinfo +++ b/net/fping/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2001/08/23 17:15:15 abs Exp $ +$NetBSD: distinfo,v 1.4 2002/02/18 18:40:41 abs Exp $ SHA1 (fping/part01.Z) = 5da77db8996539095e4da7b253f0f80b6f3896bc Size (fping/part01.Z) = 21232 bytes -SHA1 (patch-aa) = 2bb877107a2d2b01197d45170f5ef17d2b2a6e40 -SHA1 (patch-ab) = 27e9dd5012839d0e7dab2b9b47a154f390193e3d -SHA1 (patch-ac) = b7f2d0ca9df377fedf8dc5db70a6076750afe9dd +SHA1 (patch-aa) = e073ab796bd754cba1df980ec848d442cc8d87d0 +SHA1 (patch-ab) = b519acb30c55877bc1bfb3d6b4f54f7317ac8d2d +SHA1 (patch-ac) = 3422e05ef6a0ea0fde0869be38b4cb0a1b0cfa78 diff --git a/net/fping/patches/patch-aa b/net/fping/patches/patch-aa index 139a2692b5f..871e2039805 100644 --- a/net/fping/patches/patch-aa +++ b/net/fping/patches/patch-aa @@ -1,6 +1,6 @@ -$NetBSD: patch-aa,v 1.3 2001/08/23 17:15:15 abs Exp $ +$NetBSD: patch-aa,v 1.4 2002/02/18 18:40:41 abs Exp $ ---- Makefile.orig Thu Aug 23 18:10:14 2001 +--- Makefile.orig Mon Feb 18 18:37:42 2002 +++ Makefile @@ -2,10 +2,10 @@ PROG= fping diff --git a/net/fping/patches/patch-ab b/net/fping/patches/patch-ab index a74cfb9c06c..3ed205ec0f0 100644 --- a/net/fping/patches/patch-ab +++ b/net/fping/patches/patch-ab @@ -1,7 +1,16 @@ -$NetBSD: patch-ab,v 1.2 2001/08/23 17:15:15 abs Exp $ +$NetBSD: patch-ab,v 1.3 2002/02/18 18:40:42 abs Exp $ ---- fping.c.orig Thu Aug 23 18:10:14 2001 +--- fping.c.orig Fri Feb 18 19:29:52 2022 +++ fping.c +@@ -153,7 +153,7 @@ + #include + #include + +-#ifdef _POSIX_SOURCE ++#if defined(_POSIX_SOURCE) || defined(__NetBSD__) + #include + #endif + @@ -185,7 +185,9 @@ extern char *optarg; @@ -108,6 +117,24 @@ $NetBSD: patch-ab,v 1.2 2001/08/23 17:15:15 abs Exp $ printf("\n"); } num_alive++; +@@ -649,7 +655,7 @@ + + u_long ipaddress = inet_addr(host); + +- if ( (ipaddress == -1) && ++ if ( (ipaddress == INADDR_NONE) && + ( ((host_ent=gethostbyname(host)) == 0) || + ((host_add = (struct in_addr *) *(host_ent->h_addr_list))==0)) + ) { +@@ -669,7 +675,7 @@ + bzero((char*) &p->saddr, sizeof(p->saddr)); + p->saddr.sin_family = AF_INET; + +- if (ipaddress==-1) p->saddr.sin_addr = *host_add; ++ if (ipaddress==INADDR_NONE) p->saddr.sin_addr = *host_add; + else p->saddr.sin_addr.s_addr = ipaddress; + + if (!rrlist) { @@ -756,7 +762,7 @@ temp = @@ -117,3 +144,4 @@ $NetBSD: patch-ab,v 1.2 2001/08/23 17:15:15 abs Exp $ return (long) temp; + diff --git a/net/fping/patches/patch-ac b/net/fping/patches/patch-ac index 643e32bcecb..ce06962a6ae 100644 --- a/net/fping/patches/patch-ac +++ b/net/fping/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.2 2001/08/23 17:15:15 abs Exp $ +$NetBSD: patch-ac,v 1.3 2002/02/18 18:40:42 abs Exp $ ---- fping.man.orig Thu Aug 23 18:10:14 2001 +--- fping.man.orig Mon Feb 18 18:37:42 2002 +++ fping.man @@ -1,4 +1,4 @@ -.TH fping l -- cgit v1.2.3