> Hello ports@,
> Please commit this fix as soon as ports are unlocked.
> This fixes a nasty segfault on amd64
Confirmed on my end too. Here is another version of the patch which also
bumps PKGNAME and updates PLIST and DESCR.
Also, keyword substitution should probably be turned off when checking in
patch-Makefile.
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/net/bing/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile 15 Sep 2007 22:36:52 -0000 1.21
+++ Makefile 18 Feb 2010 17:33:42 -0000
@@ -3,7 +3,7 @@
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/
Index: patches/patch-Makefile
===================================================================
RCS file: /usr/cvs/ports/net/bing/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -r1.3 patch-Makefile
--- patches/patch-Makefile 12 May 2007 21:36:28 -0000 1.3
+++ patches/patch-Makefile 18 Feb 2010 17:24:24 -0000
@@ -1,8 +1,8 @@
$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
+--- Makefile.orig Thu Jul 20 20:03:30 1995
++++ Makefile Thu Feb 18 12:23:59 2010
@@ -2,7 +2,7 @@
- # $Id: patch-Makefile,v 1.3 2007/05/12 21:36:28 rui Exp $
+ # $Id: Makefile,v 1.4 1995/07/21 00:03:30 pb Exp $
#
MANDIR=/usr/local/man
-BINDIR=/usr/local/bin
Index: patches/patch-bing_c
===================================================================
RCS file: /usr/cvs/ports/net/bing/patches/patch-bing_c,v
retrieving revision 1.2
diff -u -r1.2 patch-bing_c
--- patches/patch-bing_c 12 May 2007 21:36:28 -0000 1.2
+++ patches/patch-bing_c 18 Feb 2010 17:35:43 -0000
@@ -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)
+--- 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 @@
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 @@
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 @@
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;
Index: pkg/DESCR
===================================================================
RCS file: /usr/cvs/ports/net/bing/pkg/DESCR,v
retrieving revision 1.3
diff -u -r1.3 DESCR
--- pkg/DESCR 15 May 2007 09:24:09 -0000 1.3
+++ pkg/DESCR 18 Feb 2010 17:37:24 -0000
@@ -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.
Index: pkg/PLIST
===================================================================
RCS file: /usr/cvs/ports/net/bing/pkg/PLIST,v
retrieving revision 1.6
diff -u -r1.6 PLIST
--- pkg/PLIST 9 Oct 2006 09:42:24 -0000 1.6
+++ pkg/PLIST 18 Feb 2010 17:24:15 -0000
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.6 2006/10/09 09:42:24 espie Exp $
@man man/man8/bing.8
@mode u+s
-sbin/bing
+...@bin sbin/bing
@mode
share/doc/bing/
share/doc/bing/README
