Attachment 82080 Details for Bug 117463 – file.diff

[patch] file.diff

file.diff (text/plain), 5.63 KB, created by Artem Naluzhny on 2007-10-24 22:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Artem Naluzhny

Created: 2007-10-24 22:10:01 UTC

Size: 5.63 KB

patch

obsolete

>diff -ruN sipp.bak/Makefile sipp/Makefile
>--- sipp.bak/Makefile	2007-09-15 04:25:25.000000000 +0300
>+++ sipp/Makefile	2007-10-24 23:55:58.000000000 +0300
>@@ -6,10 +6,10 @@
> #
> 
> PORTNAME=	sipp
>-PORTVERSION=	2.0.20070906
>-CATEGORIES=	net
>+PORTVERSION=	2.0.20071024
>+CATEGORIES=	benchmarks net
> MASTER_SITES=	http://sipp.sourceforge.net/snapshots/
>-DISTNAME=	${PORTNAME}.2007-09-06
>+DISTNAME=	${PORTNAME}.2007-10-24
> 
> MAINTAINER=	tut@nhamon.com.ua
> COMMENT=	SIP testing tool
>diff -ruN sipp.bak/distinfo sipp/distinfo
>--- sipp.bak/distinfo	2007-09-15 04:25:25.000000000 +0300
>+++ sipp/distinfo	2007-10-24 23:43:39.000000000 +0300
>@@ -1,3 +1,3 @@
>-MD5 (sipp.2007-09-06.tar.gz) = b96d01b1435912ea65fd0092c98f130e
>-SHA256 (sipp.2007-09-06.tar.gz) = b20de66bdd6b33b8d5441e3655f6e8f247dbcd40b9853e43ab9992f8122ff7eb
>-SIZE (sipp.2007-09-06.tar.gz) = 197176
>+MD5 (sipp.2007-10-24.tar.gz) = 430463e6d8c651a82a8826fcf76a1cb1
>+SHA256 (sipp.2007-10-24.tar.gz) = 4970692fb624e55c39ec8e954242d0a9a243744d6e46c8ace8c591d0c3efa984
>+SIZE (sipp.2007-10-24.tar.gz) = 198008
>diff -ruN sipp.bak/files/patch-Makefile sipp/files/patch-Makefile
>--- sipp.bak/files/patch-Makefile	2007-09-08 19:17:43.000000000 +0300
>+++ sipp/files/patch-Makefile	2007-10-24 23:46:04.000000000 +0300
>@@ -54,24 +54,6 @@
>  
>  #Linker Flags
>  LFLAGS_hpux=-AA -mt
>-@@ -138,7 +136,7 @@
>- LIBS_linux= -ldl -lpthread -lncurses -lstdc++ -lm -L /usr/local/lib -L /usr/lib -L /usr/lib64
>- LIBS_hpux= -lcurses -lpthread -L /opt/openssl/lib -L /usr/local/lib
>- LIBS_tru64= -lcurses -lpthread
>--LIBS_freebsd= -lcurses -pthread
>-+LIBS_freebsd= -lcurses -pthread -L /usr/local/lib
>- LIBS_SunOS= -lcurses -lpthread -lnsl -lsocket -lstdc++ -lm -ldl -L /usr/local/ssl/lib/
>- LIBS_Cygwin= -lcurses -lpthread -lstdc++ -L /usr/lib/WpdPack/Lib
>- LIBS_Darwin= -lcurses
>-@@ -146,7 +144,7 @@
>- 
>- # Include directories
>- INCDIR_linux=-I. -I/usr/include/openssl
>--INCDIR_freebsd=-I. -I/opt/openssl/include
>-+INCDIR_freebsd=-I. -I/usr/local/include
>- INCDIR_hpux=-I. -I/usr/local/include -I/opt/openssl/include
>- INCDIR_tru64=-I. -I/opt/openssl/include
>- INCDIR_SunOS=-I. -I/usr/local/ssl/include/
> @@ -154,8 +152,6 @@
>  INCDIR_Darwin=-I. -I/usr/local/ssl/include
>  INCDIR=$(INCDIR_$(SYSTEM)) 
>diff -ruN sipp.bak/files/patch-prepare_pcap.c sipp/files/patch-prepare_pcap.c
>--- sipp.bak/files/patch-prepare_pcap.c	2006-12-22 01:07:44.000000000 +0200
>+++ sipp/files/patch-prepare_pcap.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,48 +0,0 @@
>-$FreeBSD: ports/net/sipp/files/patch-prepare_pcap.c,v 1.1 2006/12/21 23:07:44 miwi Exp $
>-
>---- prepare_pcap.c.orig
>-+++ prepare_pcap.c
>-@@ -19,7 +19,7 @@
>- #include <stdlib.h>
>- #include <netinet/in.h>
>- #include <netinet/udp.h>
>--#if defined(__HPUX) || defined(__CYGWIN)
>-+#if defined(__HPUX) || defined(__CYGWIN) || defined(__FreeBSD__)
>- #include <netinet/in_systm.h>
>- #endif
>- #include <netinet/ip.h>
>-@@ -142,7 +142,7 @@
>-         fprintf(stderr, "prepare_pcap.c: Ignoring non UDP packet!\n");
>-         continue;
>-       }
>--#if defined(__DARWIN) || defined(__CYGWIN)
>-+#if defined(__DARWIN) || defined(__CYGWIN) || defined(__FreeBSD__)
>-       udphdr = (struct udphdr *)((char *)iphdr + (iphdr->ihl << 2) + 4);
>-       pktlen = (u_long)(ntohs(udphdr->uh_ulen));
>- #else
>-@@ -164,7 +164,7 @@
>-       ERROR("Can't allocate memory for pcap pkt data");
>-     memcpy(pkt_index->data, udphdr, pktlen);
>- 
>--#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN)
>-+#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) || defined(__FreeBSD__)
>-     udphdr->uh_sum = 0 ;      
>- #else
>-     udphdr->check = 0;
>-@@ -173,14 +173,14 @@
>-       // compute a partial udp checksum
>-       // not including port that will be changed
>-       // when sending RTP
>--#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN)
>-+#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) || defined(__FreeBSD__)
>-     pkt_index->partial_check = check((u_int16_t *) &udphdr->uh_ulen, pktlen - 4) + ntohs(IPPROTO_UDP + pktlen);
>- #else
>-     pkt_index->partial_check = check((u_int16_t *) &udphdr->len, pktlen - 4) + ntohs(IPPROTO_UDP + pktlen);
>- #endif
>-     if (max_length < pktlen)
>-       max_length = pktlen;
>--#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN)
>-+#if defined(__HPUX) || defined(__DARWIN) || (defined __CYGWIN) || defined(__FreeBSD__)
>-     if (base > ntohs(udphdr->uh_dport))
>-       base = ntohs(udphdr->uh_dport);
>- #else
>diff -ruN sipp.bak/files/patch-prepare_pcap.h sipp/files/patch-prepare_pcap.h
>--- sipp.bak/files/patch-prepare_pcap.h	2006-12-22 01:07:44.000000000 +0200
>+++ sipp/files/patch-prepare_pcap.h	1970-01-01 03:00:00.000000000 +0300
>@@ -1,13 +0,0 @@
>-$FreeBSD: ports/net/sipp/files/patch-prepare_pcap.h,v 1.1 2006/12/21 23:07:44 miwi Exp $
>-
>---- prepare_pcap.h.orig
>-+++ prepare_pcap.h
>-@@ -22,7 +22,7 @@
>- #include <netinet/udp.h>
>- #include <time.h>
>- 
>--#if defined(__HPUX) || defined(__DARWIN) || defined(__CYGWIN)
>-+#if defined(__HPUX) || defined(__DARWIN) || defined(__CYGWIN) || defined(__FreeBSD__)
>- #define u_int8_t uint8_t
>- #define u_int16_t uint16_t
>- #define u_int32_t uint32_t
>diff -ruN sipp.bak/files/patch-send_packets.c sipp/files/patch-send_packets.c
>--- sipp.bak/files/patch-send_packets.c	2006-12-22 01:07:44.000000000 +0200
>+++ sipp/files/patch-send_packets.c	1970-01-01 03:00:00.000000000 +0300
>@@ -1,13 +0,0 @@
>-$FreeBSD: ports/net/sipp/files/patch-send_packets.c,v 1.1 2006/12/21 23:07:44 miwi Exp $
>-
>---- send_packets.c.orig
>-+++ send_packets.c
>-@@ -45,7 +45,7 @@
>- #include <unistd.h>
>- #include <stdlib.h>
>- #include <netinet/udp.h>
>--#if defined(__DARWIN) || defined(__CYGWIN)
>-+#if defined(__DARWIN) || defined(__CYGWIN) || defined(__FreeBSD__)
>- #include <netinet/in.h>
>- #endif
>- #ifndef __CYGWIN

Actions: View | Diff

Attachments on bug 117463: 82080