[Pkg-voip-commits] r10703 - in /sip-tester/trunk/debian: changelog patches/Makefile.patch patches/enable-gsl.patch patches/gnutls.patch patches/include-limits.patch patches/series patches/sipp.hpp.patch patches/spelling-error-in-binary

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Thu Mar 24 12:18:10 2016
New Revision: 10703

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10703
Log:
refresh patches for 3.5.1 (3 down, 3 left)

* Makefile.patch: removed. no longer needed
* enable-gsl.patch: removed. use a ./configure option
* spelling-error-in-binary: removed. merged upstream.

Other patches adapted to new version.

Removed:
    sip-tester/trunk/debian/patches/Makefile.patch
    sip-tester/trunk/debian/patches/enable-gsl.patch
    sip-tester/trunk/debian/patches/spelling-error-in-binary
Modified:
    sip-tester/trunk/debian/changelog
    sip-tester/trunk/debian/patches/gnutls.patch
    sip-tester/trunk/debian/patches/include-limits.patch
    sip-tester/trunk/debian/patches/series
    sip-tester/trunk/debian/patches/sipp.hpp.patch

Modified: sip-tester/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/changelog?rev=10703&op=diff
==============================================================================
--- sip-tester/trunk/debian/changelog	(original)
+++ sip-tester/trunk/debian/changelog	Thu Mar 24 12:18:10 2016
@@ -2,6 +2,9 @@
 
   * New upstream release (Closes: #809196).
     - Upstream switched to autotools (Closes: #722831).
+    - Makefile.patch: removed. no longer needed
+    - enable-gsl.patch: removed. use a ./configure option
+    - spelling-error-in-binary: removed. merged upstream.
   * Patch gnutls: TLS support using GNU TLS.
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Thu, 21 Mar 2013 07:15:27 +0200

Modified: sip-tester/trunk/debian/patches/gnutls.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/patches/gnutls.patch?rev=10703&op=diff
==============================================================================
--- sip-tester/trunk/debian/patches/gnutls.patch	(original)
+++ sip-tester/trunk/debian/patches/gnutls.patch	Thu Mar 24 12:18:10 2016
@@ -1,8 +1,8 @@
 Author: Tzafrir Cohen <tzafrir at debian.org>
 Description: Emulate OpenSSL support with GNU TLS
 
---- a/sslcommon.h
-+++ b/sslcommon.h
+--- a/include/sslcommon.h
++++ b/include/sslcommon.h
 @@ -19,11 +19,7 @@
  #ifndef _ccnv_2_common_h_H
  #define _ccnv_2_common_h_H
@@ -16,14 +16,3 @@
  #include <pthread.h>
  
  #define MUTEX_TYPE pthread_mutex_t
---- a/auth.c
-+++ b/auth.c
-@@ -29,7 +29,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
--#include <openssl/md5.h>
-+#include <gnutls/openssl.h>
- #include "milenage.h"
- #include "screen.hpp"
- 

Modified: sip-tester/trunk/debian/patches/include-limits.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/patches/include-limits.patch?rev=10703&op=diff
==============================================================================
--- sip-tester/trunk/debian/patches/include-limits.patch	(original)
+++ sip-tester/trunk/debian/patches/include-limits.patch	Thu Mar 24 12:18:10 2016
@@ -1,20 +1,20 @@
---- a/call.cpp
-+++ b/call.cpp
+--- a/src/call.cpp
++++ b/src/call.cpp
 @@ -44,6 +44,7 @@
- #include <iostream>
  #include <sys/types.h>
  #include <sys/wait.h>
+ #include <assert.h>
 +#include <limits.h>
  
  #ifdef PCAPPLAY
  #include "send_packets.h"
---- a/scenario.cpp
-+++ b/scenario.cpp
+--- a/src/scenario.cpp
++++ b/src/scenario.cpp
 @@ -28,6 +28,7 @@
   */
  
  #include <stdlib.h>
 +#include <limits.h>
  #include "sipp.hpp"
+ #ifdef HAVE_GSL
  #include <gsl/gsl_rng.h>
- #include <gsl/gsl_randist.h>

Modified: sip-tester/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/patches/series?rev=10703&op=diff
==============================================================================
--- sip-tester/trunk/debian/patches/series	(original)
+++ sip-tester/trunk/debian/patches/series	Thu Mar 24 12:18:10 2016
@@ -1,6 +1,3 @@
-enable-gsl.patch
 include-limits.patch
-Makefile.patch
 sipp.hpp.patch
-spelling-error-in-binary
 gnutls.patch

Modified: sip-tester/trunk/debian/patches/sipp.hpp.patch
URL: http://svn.debian.org/wsvn/pkg-voip/sip-tester/trunk/debian/patches/sipp.hpp.patch?rev=10703&op=diff
==============================================================================
--- sip-tester/trunk/debian/patches/sipp.hpp.patch	(original)
+++ sip-tester/trunk/debian/patches/sipp.hpp.patch	Thu Mar 24 12:18:10 2016
@@ -1,6 +1,6 @@
 
---- a/sipp.hpp
-+++ b/sipp.hpp
+--- a/include/socket.hpp
++++ b/include/socket.hpp
 @@ -582,7 +582,7 @@ void sipp_close_socket(struct sipp_socke
  #define WS_BUFFER 2 /* Buffer the message if there is no room for writing the message. */