Accepting request 24483 from network:utilities

Copy from network:utilities/bing based on submit request 24483 from user msmeissn

OBS-URL: https://build.opensuse.org/request/show/24483
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bing?expand=0&rev=7

bing-1.0.5.dif

@@ -1,8 +1,10 @@
---- Makefile
+Index: Makefile
-+++ Makefile	2000/02/02 16:03:05
+===================================================================
+--- Makefile.orig
++++ Makefile
 @@ -1,8 +1,8 @@
  #
- # Makefile,v 1.4 1995/07/21 00:03:30 pb Exp
+ # $Id: Makefile,v 1.4 1995/07/21 00:03:30 pb Exp $
  #
 -MANDIR=/usr/local/man
 -BINDIR=/usr/local/bin
@@ -11,7 +13,7 @@
  INSTALL=install -c
  GROFF=groff
  NROFF=nroff
-@@ -28,5 +28,5 @@
+@@ -28,5 +28,5 @@ clean:
  	$(RM) -f bing bing.ps bing.0
  
  install: bing bing.8
@@ -19,9 +21,16 @@
 -	$(INSTALL) -m 4555 -o root -g staff bing $(BINDIR)
 +	$(INSTALL) -m 644 bing.8 $(MANDIR)/man8
 +	$(INSTALL) -m 4555 -o root -g root bing $(BINDIR)
---- bing.c
+Index: bing.c
-+++ bing.c	2000/02/02 16:03:23
+===================================================================
-@@ -171,6 +171,8 @@
+--- bing.c.orig
++++ bing.c
+@@ -170,10 +170,13 @@ static char rcsid[] = "$Id: bing.c,v 1.1
+ #include <netdb.h>
+ #include <unistd.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
  #include <errno.h>
  #include <string.h>
  #include <limits.h>
@@ -30,7 +39,7 @@
  
  #include "sysdep.h"
  
-@@ -527,7 +529,7 @@
+@@ -530,7 +533,7 @@ void pr_iph(ip)
  	(void)printf("   %1x %04x", ((ip->ip_off) & 0xe000) >> 13,
  	    (ip->ip_off) & 0x1fff);
  	(void)printf("  %02x  %02x %04x", ip->ip_ttl, ip->ip_p, ip->ip_sum);
@@ -39,7 +48,7 @@
  	(void)printf(" %s ", inet_ntoa(ip->ip_src));
  	(void)printf(" %s ", inet_ntoa(ip->ip_dst));
  #else
-@@ -641,7 +643,7 @@
+@@ -644,7 +647,7 @@ void pr_icmph(icp)
  			(void)printf("Redirect, Bad Code: %d", icp->icmp_code);
  			break;
  		}
@@ -48,7 +57,7 @@
  		(void)printf("(New addr: 0x%08lx)\n", icp->icmp_gwaddr);
  #else
  		(void)printf("(New addr: 0x%08lx)\n", icp->icmp_gwaddr.s_addr);
-@@ -668,7 +670,7 @@
+@@ -671,7 +674,7 @@ void pr_icmph(icp)
  		pr_retip((struct ip *)ICMP_TO_DATA(icp));
  		break;
  	case ICMP_PARAMPROB:
@@ -57,7 +66,7 @@
  		(void)printf("Parameter problem: pointer = 0x%02x\n",
  		    icp->un.gateway);
  #else
-@@ -1226,6 +1228,7 @@
+@@ -1229,11 +1232,12 @@ int main(argc, argv)
  	struct protoent *proto;
  	struct in_addr ifaddr;
  	struct hoststats *hs1, *hs2;
@@ -65,7 +74,25 @@
  	int ntrans, nloops, bits;
  	int i;
  	int ch, hold, recv_packlen, preload;
-@@ -1403,6 +1406,21 @@
+ 	u_char *datap, *recv_packet;
+-	char *target1, *target2, *malloc();
++	char *target1, *target2;
+ 	u_char ttl, loop;
+ #ifdef IP_OPTIONS
+ 	char rspace[3 + 4 * NROUTES + 1];	/* record route space */
+@@ -1348,9 +1352,10 @@ int main(argc, argv)
+ 			moptions |= MULTICAST_IF;
+ 			{
+ 				int i1, i2, i3, i4;
++				char dummy;
+ 
+ 				if (sscanf(optarg, "%u.%u.%u.%u%c",
+-					   &i1, &i2, &i3, &i4, &i) != 4) {
++					   &i1, &i2, &i3, &i4, &dummy) != 4) {
+ 					printf("bad interface address '%s'\n",
+ 					       optarg);
+ 					exit(1);
+@@ -1406,6 +1411,21 @@ int main(argc, argv)
  		perror("bing: socket");
  		exit(1);
  	}
@@ -87,8 +114,10 @@
  	hold = 1;
  	if (options & F_SO_DEBUG)
  		(void)setsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&hold,
---- sysdep.h
+Index: sysdep.h
-+++ sysdep.h	2000/02/02 16:03:05
+===================================================================
+--- sysdep.h.orig
++++ sysdep.h
 @@ -46,7 +46,7 @@
  #ifndef _SYSDEP_H_
  #define _SYSDEP_H_
@@ -108,34 +137,3 @@
  #define ICMP_MINLEN	16
  
  #define IPOPT_MINOFF	4
---- bing.c.xx	2005-01-26 12:50:36.266794880 +0100
-+++ bing.c	2005-01-26 12:52:08.935169111 +0100
-@@ -168,6 +168,7 @@
- #include <netdb.h>
- #include <unistd.h>
- #include <stdio.h>
-+#include <stdlib.h>
- #include <ctype.h>
- #include <errno.h>
- #include <string.h>
-@@ -1234,7 +1235,7 @@
- 	int i;
- 	int ch, hold, recv_packlen, preload;
- 	u_char *datap, *recv_packet;
--	char *target1, *target2, *malloc();
-+	char *target1, *target2;
- 	u_char ttl, loop;
- #ifdef IP_OPTIONS
- 	char rspace[3 + 4 * NROUTES + 1];	/* record route space */
-@@ -1349,9 +1350,10 @@
- 			moptions |= MULTICAST_IF;
- 			{
- 				int i1, i2, i3, i4;
-+				char dummy;
- 
- 				if (sscanf(optarg, "%u.%u.%u.%u%c",
--					   &i1, &i2, &i3, &i4, &i) != 4) {
-+					   &i1, &i2, &i3, &i4, &dummy) != 4) {
- 					printf("bad interface address '%s'\n",
- 					       optarg);
- 					exit(1);

bing.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov  3 19:09:08 UTC 2009 - coolo@novell.com
+
+- updated patches to apply with fuzz=0
+
 -------------------------------------------------------------------
 Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
 

bing.spec

@@ -26,7 +26,7 @@ AutoReqProv:    on
 Url:            http://www.freenix.fr/freenix/logiciels/bing.html
 Summary:        A Point-to-Point Bandwidth Measurement Tool
 Version:        1.0.5
-Release:        135
+Release:        136
 Source:         bing-%{version}.tar.bz2
 Patch0:         bing-%{version}.dif
 Patch1:         %{name}-%{version}-permissions.patch