Attachment #131822 for bug #175992

View | Details | Raw Unified | Return to bug 175992
Collapse All | Expand All




#

PORTNAME=	sipp
PORTVERSION=	3.3
PORTREVISION=	1
CATEGORIES=	benchmarks net
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	sipp/sipp/${PORTVERSION}
DISTNAME=	${PORTNAME}-3.3beta2

MAINTAINER=	tut@nhamon.com.ua
COMMENT=	SIP benchmarking and testing tool

LICENSE=	GPLv2


CPP=		${CXX}
MAKE_ENV+=	CCLINK="${CXX}"
CPPFLAGS+=	${CXXFLAGS}
WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

OPTIONS=	OPENSSL		"OpenSSL support (for digest auth and SIP over TLS)" on \
		GSL		"GSL support (for statistical distributed pauses)" off \

.endif #defined(WITH_GSL)

.if defined(WITH_PCAPPLAY)
PCAP_FILES=	dtmf_2833_0.pcap dtmf_2833_1.pcap dtmf_2833_2.pcap \
		dtmf_2833_3.pcap dtmf_2833_4.pcap dtmf_2833_5.pcap \
		dtmf_2833_6.pcap dtmf_2833_7.pcap dtmf_2833_8.pcap \
		dtmf_2833_9.pcap dtmf_2833_pound.pcap dtmf_2833_star.pcap \
		g711a.pcap

PLIST_DIRS=	%%DATADIR%%/pcap \
		%%DATADIR%%

Lines 1-2 Link Here

(-)sipp/distinfo (-2 / +2 lines)
1	SHA256 (sipp.2009-07-29.tar.gz) = 25624e6c3108df0acb8aaaed1cf36696721cd4017ce97cc678857a7e47d41822	1	SHA256 (sipp-3.3beta2.tar.gz) = 998fbffa84107a6c7113dc1f801c449648f415fabb3fb3cf0f6620afeef6dd9a
2	SIZE (sipp.2009-07-29.tar.gz) = 225486	2	SIZE (sipp-3.3beta2.tar.gz) = 240886




--- Makefile.orig	2013-01-10 22:58:10.000000000 +0000
+++ Makefile	2013-02-09 19:53:19.000000000 +0000
@@ -18,10 +18,6 @@
 #           From Hewlett Packard Company.
 #

 # Output binary to be built
 OUTPUT=sipp
 
@@ -73,7 +69,7 @@
 CC_SunOS=gcc
 CC_Cygwin=cc  
 CC_Darwin=cc  

 
 # C++ compiler mapping
 CPP_hpux=aCC  
@@ -83,7 +79,7 @@
 CPP_SunOS=g++
 CPP_Cygwin=g++  
 CPP_Darwin=g++  

 
 #Model specific flags
 MFLAGS_ia64=+DD64
@@ -106,7 +102,7 @@
 CFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
 CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
 CFLAGS_Darwin=-D__DARWIN
-CFLAGS=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACFLAGS) $(UNITTEST)
+CFLAGS+=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACFLAGS) $(UNITTEST)
 
 #C++ Compiler Flags
 CPPFLAGS_hpux=-AA -mt -D__HPUX -D_INCLUDE_LONGLONG -DNOMACROS +W829  
@@ -116,7 +112,7 @@
 CPPFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
 CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
 CPPFLAGS_Darwin=-D__DARWIN
-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACPPFLAGS) $(UNITTEST)
+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACPPFLAGS) $(UNITTEST)
 
 #Linker mapping
 CCLINK_hpux=aCC
@@ -126,7 +122,7 @@
 CCLINK_SunOS=gcc
 CCLINK_Cygwin=g++
 CCLINK_Darwin=g++

 
 #Linker Flags
 LFLAGS_hpux=-AA -mt
@@ -158,8 +154,6 @@
 INCDIR_Darwin=-I. -I/usr/local/ssl/include
 INCDIR=$(INCDIR_$(SYSTEM)) 
 
--include local.mk
-
 # Building without TLS (no openssl pre-requisite)
 all:
 	$(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` $(OUTPUT)




--- sipp.cpp.orig	2013-02-09 20:03:03.000000000 +0000
+++ sipp.cpp	2013-02-09 20:10:27.000000000 +0000
@@ -4622,7 +4622,7 @@
 	  }
 	  exit(EXIT_OTHER);
 	case SIPP_OPTION_VERSION:
-	  printf("\n SIPp v3.3-beta2"
+	  printf("\n SIPp v3.3"
 #ifdef _USE_OPENSSL
 	      "-TLS"
 #endif
@@ -4632,8 +4632,8 @@
 #ifdef PCAPPLAY
 	      "-PCAP"
 #endif
-	      ", version %s, built %s, %s.\n\n",
-	      SIPP_VERSION, __DATE__, __TIME__); 
+	      ", built %s, %s.\n\n",
+	      __DATE__, __TIME__);
 
 	  printf
 	    (" This program is free software; you can redistribute it and/or\n"

Return to bug 175992

Lines 6-19 Link Here

(-)sipp/Makefile (-10 / +11 lines)
6	#	6	#
7		7
8	PORTNAME= sipp	8	PORTNAME= sipp
9	PORTVERSION= 3.1.20090729	9	PORTVERSION= 3.3
10	PORTREVISION= 1
11	CATEGORIES= benchmarks net	10	CATEGORIES= benchmarks net
12	MASTER_SITES= http://sipp.sourceforge.net/snapshots/	11	MASTER_SITES= SF
13	DISTNAME= ${PORTNAME}.2009-07-29	12	MASTER_SITE_SUBDIR= sipp/sipp/${PORTVERSION}
		13	DISTNAME= ${PORTNAME}-3.3beta2
14		14
15	MAINTAINER= tut@nhamon.com.ua	15	MAINTAINER= tut@nhamon.com.ua
16	COMMENT= SIP testing tool	16	COMMENT= SIP benchmarking and testing tool
17		17
18	LICENSE= GPLv2	18	LICENSE= GPLv2
19		19
Lines 24-30 Link Here
24	CPP= ${CXX}	24	CPP= ${CXX}
25	MAKE_ENV+= CCLINK="${CXX}"	25	MAKE_ENV+= CCLINK="${CXX}"
26	CPPFLAGS+= ${CXXFLAGS}	26	CPPFLAGS+= ${CXXFLAGS}
27	WRKSRC= ${WRKDIR}/sipp.svn	27	WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
28		28
29	OPTIONS= OPENSSL "OpenSSL support (for digest auth and SIP over TLS)" on \	29	OPTIONS= OPENSSL "OpenSSL support (for digest auth and SIP over TLS)" on \
30	GSL "GSL support (for statistical distributed pauses)" off \	30	GSL "GSL support (for statistical distributed pauses)" off \
Lines 41-50 Link Here
41	.endif #defined(WITH_GSL)	41	.endif #defined(WITH_GSL)
42		42
43	.if defined(WITH_PCAPPLAY)	43	.if defined(WITH_PCAPPLAY)
44	PCAP_FILES= dtmf_2833_1.pcap dtmf_2833_2.pcap dtmf_2833_3.pcap \	44	PCAP_FILES= dtmf_2833_0.pcap dtmf_2833_1.pcap dtmf_2833_2.pcap \
45	dtmf_2833_4.pcap dtmf_2833_5.pcap dtmf_2833_6.pcap \	45	dtmf_2833_3.pcap dtmf_2833_4.pcap dtmf_2833_5.pcap \
46	dtmf_2833_7.pcap dtmf_2833_8.pcap dtmf_2833_9.pcap \	46	dtmf_2833_6.pcap dtmf_2833_7.pcap dtmf_2833_8.pcap \
47	dtmf_2833_pound.pcap dtmf_2833_star.pcap g711a.pcap	47	dtmf_2833_9.pcap dtmf_2833_pound.pcap dtmf_2833_star.pcap \
		48	g711a.pcap
48		49
49	PLIST_DIRS= %%DATADIR%%/pcap \	50	PLIST_DIRS= %%DATADIR%%/pcap \
50	%%DATADIR%%	51	%%DATADIR%%

Lines 1-5 Link Here

(-)sipp/files/patch-Makefile (-14 / +14 lines)
1	--- Makefile.orig 2008-04-11 15:26:37.000000000 +0300	1	--- Makefile.orig 2013-01-10 22:58:10.000000000 +0000
2	+++ Makefile 2008-05-06 20:11:59.000000000 +0300	2	+++ Makefile 2013-02-09 19:53:19.000000000 +0000
3	@@ -18,10 +18,6 @@	3	@@ -18,10 +18,6 @@
4	# From Hewlett Packard Company.	4	# From Hewlett Packard Company.
5	#	5	#
Lines 11-17 Link Here
11	# Output binary to be built	11	# Output binary to be built
12	OUTPUT=sipp	12	OUTPUT=sipp
13		13
14	@@ -71,7 +67,7 @@	14	@@ -73,7 +69,7 @@
15	CC_SunOS=gcc	15	CC_SunOS=gcc
16	CC_Cygwin=cc	16	CC_Cygwin=cc
17	CC_Darwin=cc	17	CC_Darwin=cc
Lines 20-26 Link Here
20		20
21	# C++ compiler mapping	21	# C++ compiler mapping
22	CPP_hpux=aCC	22	CPP_hpux=aCC
23	@@ -81,7 +77,7 @@	23	@@ -83,7 +79,7 @@
24	CPP_SunOS=g++	24	CPP_SunOS=g++
25	CPP_Cygwin=g++	25	CPP_Cygwin=g++
26	CPP_Darwin=g++	26	CPP_Darwin=g++
Lines 29-53 Link Here
29		29
30	#Model specific flags	30	#Model specific flags
31	MFLAGS_ia64=+DD64	31	MFLAGS_ia64=+DD64
32	@@ -104,7 +100,7 @@	32	@@ -106,7 +102,7 @@
33	CFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS	33	CFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
34	CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int	34	CFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
35	CFLAGS_Darwin=-D__DARWIN	35	CFLAGS_Darwin=-D__DARWIN
36	-CFLAGS=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)	36	-CFLAGS=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACFLAGS) $(UNITTEST)
37	+CFLAGS+=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACFLAGS)	37	+CFLAGS+=$(CFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACFLAGS) $(UNITTEST)
38		38
39	#C++ Compiler Flags	39	#C++ Compiler Flags
40	CPPFLAGS_hpux=-AA -mt -D__HPUX -D_INCLUDE_LONGLONG -DNOMACROS +W829	40	CPPFLAGS_hpux=-AA -mt -D__HPUX -D_INCLUDE_LONGLONG -DNOMACROS +W829
41	@@ -114,7 +110,7 @@	41	@@ -116,7 +112,7 @@
42	CPPFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS	42	CPPFLAGS_SunOS=${DEBUG_FLAGS} -D__SUNOS
43	CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int	43	CPPFLAGS_Cygwin=-D__CYGWIN -Dsocklen_t=int
44	CPPFLAGS_Darwin=-D__DARWIN	44	CPPFLAGS_Darwin=-D__DARWIN
45	-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)	45	-CPPFLAGS=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACPPFLAGS) $(UNITTEST)
46	+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(PCAPPLAY) $(EXTRACPPFLAGS)	46	+CPPFLAGS+=$(CPPFLAGS_$(SYSTEM)) $(VERINFO) $(TLS) $(SCTP) $(PCAPPLAY) $(EXTRACPPFLAGS) $(UNITTEST)
47		47
48	#Linker mapping	48	#Linker mapping
49	CCLINK_hpux=aCC	49	CCLINK_hpux=aCC
50	@@ -124,7 +120,7 @@	50	@@ -126,7 +122,7 @@
51	CCLINK_SunOS=gcc	51	CCLINK_SunOS=gcc
52	CCLINK_Cygwin=g++	52	CCLINK_Cygwin=g++
53	CCLINK_Darwin=g++	53	CCLINK_Darwin=g++
Lines 56-67 Link Here
56		56
57	#Linker Flags	57	#Linker Flags
58	LFLAGS_hpux=-AA -mt	58	LFLAGS_hpux=-AA -mt
59	@@ -156,8 +152,6 @@	59	@@ -158,8 +154,6 @@
60	INCDIR_Darwin=-I. -I/usr/local/ssl/include	60	INCDIR_Darwin=-I. -I/usr/local/ssl/include
61	INCDIR=$(INCDIR_$(SYSTEM))	61	INCDIR=$(INCDIR_$(SYSTEM))
62		62
63	--include local.mk	63	--include local.mk
64	-	64	-
65	# Building without TLS and authentication (no openssl pre-requisite)	65	# Building without TLS (no openssl pre-requisite)
66	all:	66	all:
67	make OSNAME=`uname\|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m\|sed "s/Power Macintosh/ppc/"` $(OUTPUT)	67	$(MAKE) OSNAME=`uname\|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m\|sed "s/Power Macintosh/ppc/"` $(OUTPUT)

Line 0 Link Here

(-)sipp/files/patch-sipp.cpp (+22 lines)
	1	--- sipp.cpp.orig 2013-02-09 20:03:03.000000000 +0000
	2	+++ sipp.cpp 2013-02-09 20:10:27.000000000 +0000
	3	@@ -4622,7 +4622,7 @@
	4	}
	5	exit(EXIT_OTHER);
	6	case SIPP_OPTION_VERSION:
	7	- printf("\n SIPp v3.3-beta2"
	8	+ printf("\n SIPp v3.3"
	9	#ifdef _USE_OPENSSL
	10	"-TLS"
	11	#endif
	12	@@ -4632,8 +4632,8 @@
	13	#ifdef PCAPPLAY
	14	"-PCAP"
	15	#endif
	16	- ", version %s, built %s, %s.\n\n",
	17	- SIPP_VERSION, __DATE__, __TIME__);
	18	+ ", built %s, %s.\n\n",
	19	+ __DATE__, __TIME__);
	20
	21	printf
	22	(" This program is free software; you can redistribute it and/or\n"