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

Fix an LP64 segfault and flesh out PLIST. Original diff from

Browse Source 
Aaron Stellman, revised by Daniel Dickman and myself.

ok jasper@

ports is unlocked for a while only for those who have been informed.
IF JASPER DID NOT MAIL YOU, DO NOT COMMIT!
This commit is contained in:
sthen 2010-02-23 21:35:37 +00:00
parent 872ea89026
commit e43d961628
5 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/bing/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.21 2007/09/15 22:36:52 merdely Exp $
# $OpenBSD: Makefile,v 1.22 2010/02/23 21:35:37 sthen Exp $
COMMENT= point-to-point bandwidth measurement tool
DISTNAME= bing-1.0.5
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= net
MASTER_SITES= ftp://ftp.ens.fr/pub/unix/syst/

11
net/bing/patches/patch-Makefile
View File

@ -1,8 +1,11 @@
$OpenBSD: patch-Makefile,v 1.3 2007/05/12 21:36:28 rui Exp $
--- Makefile.orig Fri May 11 20:06:31 2007
+++ Makefile Fri May 11 20:07:51 2007
$OpenBSD: patch-Makefile,v 1.4 2010/02/23 21:35:37 sthen Exp $
XXX hand-edited, CVS keywords
--- Makefile.orig Fri Jul 21 01:03:30 1995
+++ Makefile Thu Feb 18 22:15:14 2010
@@ -2,7 +2,7 @@
# $Id: patch-Makefile,v 1.3 2007/05/12 21:36:28 rui Exp $
# $Id: patch-Makefile,v 1.4 2010/02/23 21:35:37 sthen Exp $
#
MANDIR=/usr/local/man
-BINDIR=/usr/local/bin

22
net/bing/patches/patch-bing_c
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-bing_c,v 1.2 2007/05/12 21:36:28 rui Exp $
--- bing.c.orig Fri Jan 19 18:28:53 2001
+++ bing.c Sat May 12 14:52:52 2007
@@ -755,7 +755,7 @@ int pr_pack(buf, cc, from)
$OpenBSD: patch-bing_c,v 1.3 2010/02/23 21:35:37 sthen Exp $
--- bing.c.orig Fri Jan 19 13:28:53 2001
+++ bing.c Thu Feb 18 12:35:25 2010
@@ -162,6 +162,7 @@ static char rcsid[] = "$Id: bing.c,v 1.16.2.1 2001/01/
#include <netinet/in_systm.h>
#include <netinet/in.h>
+#include <arpa/inet.h>
#include <netinet/ip.h>
#include <netinet/ip_icmp.h>
#ifndef linux
@@ -755,7 +756,7 @@ int pr_pack(buf, cc, from)
static int old_rrlen;
static char old_rr[MAX_IPOPTLEN];
struct ip *ip;
@ -10,7 +18,7 @@ $OpenBSD: patch-bing_c,v 1.2 2007/05/12 21:36:28 rui Exp $
double triptime;
int hlen, dupflag;
@@ -798,9 +798,12 @@ int pr_pack(buf, cc, from)
@@ -798,9 +799,12 @@ int pr_pack(buf, cc, from)
cc -= hlen;
icp = (struct icmp *)(buf + hlen);
if (icp->icmp_type == ICMP_ECHOREPLY) {
@ -24,7 +32,7 @@ $OpenBSD: patch-bing_c,v 1.2 2007/05/12 21:36:28 rui Exp $
tvsub(&tv, tp);
triptime = tv_usval(&tv);
@@ -1231,17 +1234,30 @@ int main(argc, argv)
@@ -1231,17 +1235,30 @@ int main(argc, argv)
struct hoststats *hs1, *hs2;
int ntrans, nloops, bits;
int i;
@ -57,7 +65,7 @@ $OpenBSD: patch-bing_c,v 1.2 2007/05/12 21:36:28 rui Exp $
preload = 0;
datap = &outpack[8 + sizeof(struct timeval)];
while ((ch = getopt(argc, argv, "I:LRc:dDe:fh:i:l:nPp:rS:s:t:vVwz")) != EOF)
@@ -1398,15 +1414,6 @@ int main(argc, argv)
@@ -1398,15 +1415,6 @@ int main(argc, argv)
ident = getpid() & 0xFFFF;

6
net/bing/pkg/DESCR
View File

@ -1,2 +1,4 @@
Bing is a point-to-point bandwidth measurement tool (hence the 'b'), based
on ping.
Bing is a point-to-point bandwidth measurement tool (hence the 'b'),
based on ping. Bing determines the real (raw, as opposed to available
or average) throughput on a link by measuring ICMP echo requests
roundtrip times for different packet sizes for each end of the link.

4
net/bing/pkg/PLIST
View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.6 2006/10/09 09:42:24 espie Exp $
@comment $OpenBSD: PLIST,v 1.7 2010/02/23 21:35:37 sthen Exp $
@man man/man8/bing.8
@mode u+s
sbin/bing
@bin sbin/bing
@mode
share/doc/bing/
share/doc/bing/README