refresh patches for 3.3

debian/patches/Makefile.patch

@@ -1,7 +1,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -85,7 +85,7 @@ CPP_Darwin=g++  
+@@ -86,7 +86,7 @@
  CPP=$(CPP_$(SYSTEM))
  
  #Model specific flags

debian/patches/enable-gsl.patch

@@ -22,7 +22,7 @@
  
  /************************ Class Constructor *************************/
  
-@@ -1115,7 +1113,6 @@ CSample *parse_distribution(bool oldstyl
+@@ -1108,7 +1106,6 @@
      double min = xp_get_double("min", "Uniform distribution");
      double max = xp_get_double("max", "Uniform distribution");
      distribution = new CUniform(min, max);
@@ -30,7 +30,7 @@
    } else if (!strcmp(distname, "normal")) {
      double mean = xp_get_double("mean", "Normal distribution");
      double stdev = xp_get_double("stdev", "Normal distribution");
-@@ -1148,16 +1145,6 @@ CSample *parse_distribution(bool oldstyl
+@@ -1141,16 +1138,6 @@
      double n = xp_get_double("n", "Negative Binomial distribution");
      double p = xp_get_double("p", "Negative Binomial distribution");
      distribution = new CNegBin(n, p);
@@ -61,7 +61,7 @@
  
  /*
  ** Local definitions (macros)
-@@ -1862,7 +1860,6 @@ double CUniform::cdfInv(double percentil
+@@ -1862,7 +1860,6 @@
    return min + (max * percentile);
  }
  
@@ -69,7 +69,7 @@
  gsl_rng *gsl_init() {
    static gsl_rng *rng = NULL;
  
-@@ -2101,6 +2098,5 @@ int CNegBin::timeDescr(char *s, int len)
+@@ -2101,6 +2098,5 @@
  double CNegBin::cdfInv(double percentile) {
    return 0;
  }
@@ -90,7 +90,7 @@
  
  #include "variables.hpp"
  
-@@ -629,7 +627,6 @@ private:
+@@ -629,7 +627,6 @@
  	double min, max;
  };
  
@@ -98,7 +98,7 @@
  /* Normal distribution. */
  class CNormal : public CSample {
  public:
-@@ -731,6 +728,5 @@ protected:
+@@ -731,6 +728,5 @@
  	double p, n;
  	gsl_rng *rng;
  };

debian/patches/noninteractive.patch

@@ -54,7 +54,7 @@ From upstream:
        c += sprintf(c, "%s: Unable to create '%s': %s.\n",
 --- a/sipp.cpp
 +++ b/sipp.cpp
-@@ -221,6 +221,7 @@
+@@ -219,6 +219,7 @@
  		SIPP_OPTION_UNSETFLAG, &default_behaviors, 1},
  	{"nr", "Disable retransmission in UDP mode.", SIPP_OPTION_UNSETFLAG, &retrans_enabled, 1},
  
@@ -62,7 +62,7 @@ From upstream:
  	{"nostdin", "Disable stdin.\n", SIPP_OPTION_SETFLAG, &nostdin, 1},
  
  	{"p", "Set the local port number.  Default is a random free port chosen by the system.", SIPP_OPTION_INT, &user_port, 1},
-@@ -1422,7 +1423,7 @@
+@@ -1492,7 +1493,7 @@
  {
    static int first = 1;
  
@@ -71,7 +71,7 @@ From upstream:
      if(!last) {
        screen_clear();
      }
-@@ -3288,8 +3289,9 @@
+@@ -3617,8 +3618,9 @@
  void timeout_alarm(int param){
    if (timeout_error) {
      ERROR("%s timed out after '%.3lf' seconds", scenario_file, ((double)clock_tick / 1000LL));
@@ -82,7 +82,7 @@ From upstream:
    timeout_exit = true;
  }
  
-@@ -4543,7 +4545,9 @@
+@@ -4977,7 +4979,9 @@
  	  struct addrinfo   hints;
  	  struct addrinfo * local_addr;
  
@@ -93,7 +93,7 @@ From upstream:
  
  	  memset((char*)&hints, 0, sizeof(hints));
  	  hints.ai_flags  = AI_PASSIVE;
-@@ -4726,7 +4730,12 @@
+@@ -5160,7 +5164,12 @@
      sprintf(scenario_file, "%s", "sipp");
    }
  
@@ -107,7 +107,7 @@ From upstream:
  
  #ifdef _USE_OPENSSL
      if ((transport == T_TLS) && (FI_init_ssl_context() != SSL_INIT_NORMAL))
-@@ -5135,7 +5144,10 @@
+@@ -5580,7 +5589,10 @@
        struct addrinfo   hints;
        struct addrinfo * local_addr;
  
@@ -119,7 +119,7 @@ From upstream:
  
        memset((char*)&hints, 0, sizeof(hints));
        hints.ai_flags  = AI_PASSIVE;
-@@ -5168,7 +5180,9 @@
+@@ -5613,7 +5625,9 @@
            htons((short)remote_port);
          sprintf(remote_ip_escaped, "[%s]", remote_ip); 
        }
@@ -130,7 +130,7 @@ From upstream:
      }
     }
  
-@@ -5471,7 +5485,9 @@
+@@ -5916,7 +5930,9 @@
  void connect_to_peer(char *peer_host, int peer_port, struct sockaddr_storage *peer_sockaddr, char *peer_ip, struct sipp_socket **peer_socket) {
  
            /* Resolving the  peer IP */
@@ -141,7 +141,7 @@ From upstream:
        struct addrinfo   hints;
        struct addrinfo * local_addr;
        memset((char*)&hints, 0, sizeof(hints));
-@@ -5573,7 +5589,9 @@
+@@ -6018,7 +6034,9 @@
  void connect_local_twin_socket(char * twinSippHost)
  {
            /* Resolving the listener IP */
@@ -154,7 +154,7 @@ From upstream:
              memset((char*)&hints, 0, sizeof(hints));
 --- a/sipp.hpp
 +++ b/sipp.hpp
-@@ -270,6 +270,7 @@
+@@ -285,6 +285,7 @@
  extern bool               twinSippMode            _DEFVAL(false);
  extern bool               extendedTwinSippMode    _DEFVAL(false);
  

debian/patches/sipp.hpp.patch

@@ -1,7 +1,7 @@
 
 --- a/sipp.hpp
 +++ b/sipp.hpp
-@@ -582,7 +582,7 @@ void sipp_close_socket(struct sipp_socke
+@@ -605,7 +605,7 @@
  #define WS_BUFFER 2 /* Buffer the message if there is no room for writing the message. */