diff --git a/sipp/Makefile b/sipp/Makefile index 45f3ecae4c..c02be40cf4 100644 --- a/sipp/Makefile +++ b/sipp/Makefile @@ -1,17 +1,17 @@ -# $NetBSD: Makefile,v 1.8 2009/04/19 20:27:45 gschwarz Exp $ +# $NetBSD: Makefile,v 1.9 2011/12/20 16:46:02 gschwarz Exp $ -DISTNAME= sipp.3.1.src -PKGNAME= sipp-3.1 +DISTNAME= sipp.svn +PKGNAME= sipp-3.2 CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sipp/} +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sipp/3.2/} MAINTAINER= schwarz@NetBSD.org HOMEPAGE= http://sipp.sourceforge.net/ COMMENT= SIPp is a free Open Source SIP test tool/traffic generator +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/sipp.svn NO_CONFIGURE= yes USE_TOOLS+= gmake USE_LANGUAGES= c c++ diff --git a/sipp/distinfo b/sipp/distinfo index fd99731b54..867b13524a 100644 --- a/sipp/distinfo +++ b/sipp/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.9 2009/12/25 21:18:24 gschwarz Exp $ +$NetBSD: distinfo,v 1.10 2011/12/20 16:46:02 gschwarz Exp $ -SHA1 (sipp.3.1.src.tar.gz) = 781e50a74844abbdff1b90781fa24d062f0c1352 -RMD160 (sipp.3.1.src.tar.gz) = bd89c94b3a006fdc5717d43765776901976dbf71 -Size (sipp.3.1.src.tar.gz) = 9428792 bytes -SHA1 (patch-aa) = 770b01682dcc0ac3e22e0baea0848453d65db3f1 +SHA1 (sipp.svn.tar.gz) = cef9e061b3223b228ae403f897edc192b3ce2ce7 +RMD160 (sipp.svn.tar.gz) = bb929337be299c3d9e279097f3a232a3aedfcdc0 +Size (sipp.svn.tar.gz) = 9447097 bytes +SHA1 (patch-aa) = def63f0af45587d996629313fc0c44c3d575171b SHA1 (patch-ab) = af7df29abfc0ae49e2e52a138e3a0c5c156b2a30 -SHA1 (patch-ac) = 16ecd2344318b4af570cc062bf357dfde0676831 +SHA1 (patch-ac) = 373c80b62a903daaf26436bbc2a4a2db1407912a SHA1 (patch-ad) = c5927fd3026bccc344e9a0b095435b5a3dd72aa0 -SHA1 (patch-ae) = 2ec35d0077019a3cb0915e1f428750b0eee4aea7 -SHA1 (patch-af) = c7e48619f39d10bb94c891aba27c5aba7313c376 +SHA1 (patch-ae) = 1e335811d12c2c71549a6ff5986164cea4940b8a +SHA1 (patch-af) = fcf048fadbf0767df5536c5bc28457e3aa32a77b diff --git a/sipp/patches/patch-aa b/sipp/patches/patch-aa index 9dd81d43f7..3f2566f8dc 100644 --- a/sipp/patches/patch-aa +++ b/sipp/patches/patch-aa @@ -1,10 +1,10 @@ -$NetBSD: patch-aa,v 1.7 2009/12/25 21:18:24 gschwarz Exp $ +$NetBSD: patch-aa,v 1.8 2011/12/20 16:46:02 gschwarz Exp $ ---- Makefile.orig 2008-04-11 14:26:37.000000000 +0200 -+++ Makefile 2008-07-12 16:35:34.000000000 +0200 -@@ -29,15 +29,6 @@ - OBJ= xp_parser.o message.o scenario.o screen.o call.o comp.o sipp.o stat.o \ - actions.o variables.o infile.o deadcall.o task.o socketowner.o listener.o +--- Makefile.orig 2011-12-20 16:06:37.000000000 +0100 ++++ Makefile 2011-12-20 16:15:27.000000000 +0100 +@@ -30,15 +30,6 @@ + actions.o variables.o infile.o deadcall.o task.o socketowner.o listener.o \ + opentask.o reporttask.o watchdog.o -# Libraries directories -LIBDIR_linux= @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.7 2009/12/25 21:18:24 gschwarz Exp $ # Archive file created in your home directory when building the archive target # ARCHIVE= $(HOME)/$(OUTPUT).tgz ARCHIVE= $(OUTPUT).tgz -@@ -49,102 +40,9 @@ +@@ -50,102 +41,9 @@ ################################################################### # Generic Rules @@ -124,18 +124,18 @@ $NetBSD: patch-aa,v 1.7 2009/12/25 21:18:24 gschwarz Exp $ # Include directories INCDIR_linux=-I. -I/usr/include/openssl -@@ -159,8 +57,7 @@ +@@ -160,8 +58,7 @@ -include local.mk # Building without TLS and authentication (no openssl pre-requisite) -all: -- make OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` $(OUTPUT) +- $(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` $(OUTPUT) +all: ${OUTPUT} # Building with TLS and authentication ossl: -@@ -186,7 +83,7 @@ - make OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_TLS="auth.o sslinit.o sslthreadsafe.o milenage.o rijndael.o" TLS_LIBS="-lssl -lcrypto" TLS="-D_USE_OPENSSL -DOPENSSL_NO_KRB5" OBJ_PCAPPLAY="send_packets.o prepare_pcap.o" PCAPPLAY_LIBS="-lwpcap" PCAPPLAY="-DPCAPPLAY" $(OUTPUT) +@@ -187,7 +84,7 @@ + $(MAKE) OSNAME=`uname|sed -e "s/CYGWIN.*/CYGWIN/"` MODELNAME=`uname -m|sed "s/Power Macintosh/ppc/"` OBJ_TLS="auth.o sslinit.o sslthreadsafe.o milenage.o rijndael.o" TLS_LIBS="-lssl -lcrypto" TLS="-D_USE_OPENSSL -DOPENSSL_NO_KRB5" OBJ_PCAPPLAY="send_packets.o prepare_pcap.o" PCAPPLAY_LIBS="-lwpcap" PCAPPLAY="-DPCAPPLAY" $(OUTPUT) $(OUTPUT): $(OBJ_TLS) $(OBJ_PCAPPLAY) $(OBJ) - $(CCLINK) $(LFLAGS) $(MFLAGS) $(LIBDIR_$(SYSTEM)) \ @@ -143,7 +143,7 @@ $NetBSD: patch-aa,v 1.7 2009/12/25 21:18:24 gschwarz Exp $ $(DEBUG_FLAGS) -o $@ $(OBJ_TLS) $(OBJ_PCAPPLAY) $(OBJ) $(LIBS) $(TLS_LIBS) $(PCAPPLAY_LIBS) $(EXTRAENDLIBS) debug: -@@ -217,10 +114,10 @@ +@@ -221,14 +118,14 @@ *.o: *.h *.hpp .C.o: @@ -157,3 +157,9 @@ $NetBSD: patch-aa,v 1.7 2009/12/25 21:18:24 gschwarz Exp $ .c.o: - $(CC) $(CFLAGS) $(MFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o $*.o $< + $(CC) $(CFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o $*.o $< + + fortune.so: fortune.cpp +- g++ -fPIC $(CPPFLAGS) $(MFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o fortune.o $< +- gcc -shared -Wl,-soname,fortune.so -o $@ fortune.o ++ $(CXX) -fPIC $(CXXFLAGS) $(DEBUG_FLAGS) $(_HPUX_LI_FLAG) $(INCDIR) -c -o fortune.o $< ++ $(CC) -shared -Wl,-soname,fortune.so -o $@ fortune.o diff --git a/sipp/patches/patch-ac b/sipp/patches/patch-ac index e919dbf05f..c369a8e727 100644 --- a/sipp/patches/patch-ac +++ b/sipp/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2008/07/12 15:08:49 gschwarz Exp $ +$NetBSD: patch-ac,v 1.3 2011/12/20 16:46:02 gschwarz Exp $ ---- sipp.cpp.orig 2008-07-12 15:57:53.000000000 +0200 -+++ sipp.cpp 2008-07-12 16:05:00.000000000 +0200 -@@ -3587,7 +3587,7 @@ +--- sipp.cpp.orig 2011-12-20 16:04:08.000000000 +0100 ++++ sipp.cpp 2011-12-20 16:04:13.000000000 +0100 +@@ -3455,7 +3455,7 @@ msg, media_bufsize, 0, (sockaddr *)(void *) &remote_rtp_addr, diff --git a/sipp/patches/patch-ae b/sipp/patches/patch-ae index f8d573a517..4236e3df0b 100644 --- a/sipp/patches/patch-ae +++ b/sipp/patches/patch-ae @@ -1,8 +1,8 @@ -$NetBSD: patch-ae,v 1.1 2008/07/12 15:08:49 gschwarz Exp $ +$NetBSD: patch-ae,v 1.2 2011/12/20 16:46:02 gschwarz Exp $ ---- call.cpp.orig 2008-07-12 16:46:12.000000000 +0200 -+++ call.cpp 2008-07-12 17:00:24.000000000 +0200 -@@ -124,7 +124,14 @@ +--- call.cpp.orig 2011-12-20 16:51:43.000000000 +0100 ++++ call.cpp 2011-12-20 16:59:12.000000000 +0100 +@@ -133,7 +133,14 @@ char pattern[] = "c=IN IP4 "; char *begin, *end; char ip[32]; @@ -18,7 +18,7 @@ $NetBSD: patch-ae,v 1.1 2008/07/12 15:08:49 gschwarz Exp $ if (!begin) { /* Can't find what we're looking at -> return no address */ return INADDR_NONE; -@@ -133,8 +140,11 @@ +@@ -142,8 +149,11 @@ end = strstr(begin, "\r\n"); if (!end) return INADDR_NONE; @@ -31,13 +31,13 @@ $NetBSD: patch-ae,v 1.1 2008/07/12 15:08:49 gschwarz Exp $ return inet_addr(ip); } -@@ -147,11 +157,13 @@ +@@ -156,11 +166,13 @@ char pattern[] = "c=IN IP6 "; char *begin, *end; char ip[128]; + char *tmp = strdup(msg); - memset(&addr, 0, sizeof(addr)); + memset(addr, 0, sizeof(*addr)); memset(ip, 0, 128); - begin = strstr(msg, pattern); @@ -46,20 +46,20 @@ $NetBSD: patch-ae,v 1.1 2008/07/12 15:08:49 gschwarz Exp $ if (!begin) { /* Can't find what we're looking at -> return no address */ return 0; -@@ -160,7 +172,11 @@ +@@ -169,7 +181,11 @@ end = strstr(begin, "\r\n"); if (!end) return 0; - strncpy(ip, begin, end - begin); -+ ++ + *end = 0; + strncpy(ip, begin, sizeof(ip) - 1); + ip[sizeof(ip) - 1] = 0; + free(tmp); - if (!inet_pton(AF_INET6, ip, &addr)) { + if (!inet_pton(AF_INET6, ip, addr)) { return 0; } -@@ -187,7 +203,10 @@ +@@ -196,7 +212,10 @@ ERROR("Internal error: Undefined media pattern %d\n", 3); } @@ -71,7 +71,7 @@ $NetBSD: patch-ae,v 1.1 2008/07/12 15:08:49 gschwarz Exp $ if (!begin) { /* m=audio not found */ return 0; -@@ -196,8 +215,11 @@ +@@ -205,8 +224,11 @@ end = strstr(begin, "\r\n"); if (!end) ERROR("get_remote_port_media: no CRLF found"); diff --git a/sipp/patches/patch-af b/sipp/patches/patch-af index 8e3cc66b83..98ed3af172 100644 --- a/sipp/patches/patch-af +++ b/sipp/patches/patch-af @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.2 2009/12/06 18:45:25 gschwarz Exp $ +$NetBSD: patch-af,v 1.3 2011/12/20 16:46:02 gschwarz Exp $ ---- sipp.hpp.orig 2008-04-11 14:26:37.000000000 +0200 -+++ sipp.hpp 2009-11-09 18:02:01.560006000 +0100 +--- sipp.hpp.orig 2011-12-20 16:05:24.000000000 +0100 ++++ sipp.hpp 2011-12-20 16:05:32.000000000 +0100 @@ -25,6 +25,9 @@ #include @@ -12,7 +12,7 @@ $NetBSD: patch-af,v 1.2 2009/12/06 18:45:25 gschwarz Exp $ #include #include #include -@@ -52,6 +55,9 @@ +@@ -53,6 +56,9 @@ #else #include #endif