[sipp] Ver. 3.3

[Peter Lemenkov]

commit cb225b0f06efa1a7efe12a8a13f446ea447ecd76
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Fri Feb 15 09:48:38 2013 +0400

    Ver. 3.3
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore                                         |    1 +
 ...extra-r-n-at-the-end-if-the-message-body-.patch |   44 -----
 ...p-when-authentication-header-is-used.-Pat.patch |   26 ---
 sipp-0003-Fix-for-CVE-2008-2085.patch              |  109 -----------
 ...ile-with-D_FORTIFY_SOURCE-2-gcc-parameter.patch |   64 -------
 sipp-0005-Add-autotools-support.patch              |  199 --------------------
 sipp-0006-xp_parser.h-isn-t-a-global-include.patch |   26 ---
 sipp-3.3.tar.gz.asc                                |   17 ++
 sipp.spec                                          |   47 ++---
 sources                                            |    2 +-
 10 files changed, 37 insertions(+), 498 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d93cced..80e68b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 sipp.3.1.src.tar.gz
 /sipp.svn.tar.gz
+/sipp-3.3.tar.gz
diff --git a/sipp-3.3.tar.gz.asc b/sipp-3.3.tar.gz.asc
new file mode 100644
index 0000000..136f807
--- /dev/null
+++ b/sipp-3.3.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.13 (GNU/Linux)
+
+iQIcBAABAgAGBQJRGWonAAoJEOHQwAmzFOKJtAoP/2vMipUmAZfQlsUF5XkqqCem
+UWaUFf4X9WlwJdrB3xW0Ukwb5n0dQlH0sp+KO8AlhLqZasyxeeQrHAzdAUJ887s9
+jWo9b3JjDoCRoZvDW2Nv8uWF4+S1T8VK7uvKsUWtOdqHknvBTj93JG1FllJR3UIj
+hBJd4olyW+qTKhcf13eXLXGxZr44tZgyPfeVYum3ONpP94AlAgPQRlRQM+a6K9F9
+/Q1N3TwS3xtStTZp/LAAPEjx/EEcW+c+CxcR550otUE5+KBpzWHCdB80ljNyAW9h
+X6WqTxI86PIXzqnnj2GwxaWQit04pvP9XmzGhGTF+KKwtwqFYtrlXNmngeNtqkBw
+FEIUl6kwPpFg9nCm05k6rY76QNHQoWxe8VWTDTolq9QyRmy/vsqmYYx6XYhrO0Ne
+HZipHgPtA6efQWigR2dFJI3kgnOCf5y09e2asBx6vNhTX9vvCwsVZMXJ5FK9tf7o
+qzalyk+vRgf+IC3uTtr0PUha9T3EihJz4SkbT/d5Qubvb644/YEp3sAgFns8T48x
+8Fs24+tAFm4LzfHaO7jeSvqhaoCq3f41MTTh9oYrpcuorpd0Pduq3jZx9Xh+lCup
+RbkHvoTpDKdyV3aDqpPPcotQ2rKtKP4399DCID+YDNCDzXxulpkeyOBYIdm2I0Y4
+ozKhzANtsqicC8OU8784
+=9WAw
+-----END PGP SIGNATURE-----
diff --git a/sipp.spec b/sipp.spec
index 2f83c1d..3aed2d1 100644
--- a/sipp.spec
+++ b/sipp.spec
@@ -1,34 +1,21 @@
 Summary:	SIP test tool / traffic generator
 Name:		sipp
-Version:	3.2
-Release:	7%{?dist}
+Version:	3.3
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Applications/Communications
 URL:		http://sipp.sourceforge.net/
-Source0:	http://downloads.sourceforge.net/%{name}/%{name}.svn.tar.gz
-# Taken from upstream
-Patch1:	sipp-0001-Fix-Remove-extra-r-n-at-the-end-if-the-message-body-.patch
-# Taken from upstream
-Patch2:	sipp-0002-Fix-Coredump-when-authentication-header-is-used.-Pat.patch
-# https://sourceforge.net/tracker/index.php?func=detail&aid=2011751&group_id=104305&atid=637566
-Patch3:	sipp-0003-Fix-for-CVE-2008-2085.patch
-# https://bugzilla.redhat.com/559620
-Patch4:	sipp-0004-Fix-compile-with-D_FORTIFY_SOURCE-2-gcc-parameter.patch
-# Fedora-specific
-Patch5:	sipp-0005-Add-autotools-support.patch
-# Fedora-specific
-Patch6:	sipp-0006-xp_parser.h-isn-t-a-global-include.patch
+Source0:	http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source1:	http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.gz.asc
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:	ncurses-devel
-%if 0%{?el4}
-BuildRequires:	libpcap
-%else
 BuildRequires:	libpcap-devel
-%endif
 BuildRequires:	openssl-devel
+BuildRequires:	lksctp-tools-devel
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+
 %description
 SIPp is a free Open Source test tool / traffic generator for the SIP protocol.
 It includes a few basic SipStone user agent scenarios (UAC and UAS) and
@@ -39,36 +26,38 @@ running tests (call rate, round trip delay, and message statistics), periodic
 CSV statistics dumps, TCP and UDP over multiple sockets or multiplexed with
 retransmission management and dynamically adjustable call rates.
 
+
 %prep
-%setup -qn %{name}.svn
-%patch1 -p1 -b .fix_r_n
-%patch2 -p1 -b .fix_coredump
-%patch3 -p1 -b .cve20082085
-%patch4 -p1 -b .rhbz559620
-%patch5 -p1 -b .autotools
-%patch6 -p1 -b .fix_header
+%setup -q
+
 
 %build
 autoreconf -ivf
-%configure --with-openssl --with-pcap
+%configure --with-openssl --with-pcap --with-sctp
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -D -p -m 755 sipp $RPM_BUILD_ROOT%{_bindir}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/pcap
 install -p -m 644 pcap/*.pcap $RPM_BUILD_ROOT%{_datadir}/%{name}/pcap
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
-%defattr(-,root,root,-)
-%doc LICENSE.txt MEDIA.txt README.txt
+%doc LICENSE.txt MEDIA.txt README.txt THANKS
 %{_bindir}/%{name}
 %{_datadir}/%{name}
 
+
 %changelog
+* Fri Feb 15 2013 Peter Lemenkov <lemenkov at gmail.com> - 3.3-1
+- Ver. 3.3
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index d6154d6..dc10438 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a3a60cb4317dcf8eb5482f6a955e4d0  sipp.svn.tar.gz
+8c1d513423f9dabee799e738b737e311  sipp-3.3.tar.gz