Bladeren bron

upgrading package: siproxd 0.5.13 -> 0.6.0

Ralf S. Engelschall 18 jaren geleden
bovenliggende
commit
a220862055
2 gewijzigde bestanden met toevoegingen van 39 en 28 verwijderingen
  1. 36 25
      siproxd/siproxd.patch
  2. 3 3
      siproxd/siproxd.spec

+ 36 - 25
siproxd/siproxd.patch

@@ -1,18 +1,6 @@
-Index: src/log.c
---- src/log.c.orig	2006-06-18 18:28:43 +0200
-+++ src/log.c	2006-08-31 23:06:01 +0200
-@@ -213,7 +213,7 @@
-    va_list ap, ap_copy;
-    time_t t;
-    struct tm *tim;
--   char string[128];
-+   char string[512];
- 
-    if ((debug_pattern & class) == 0) return;
- 
 Index: src/plugin_shortdial.c
---- src/plugin_shortdial.c.orig	2006-05-20 13:48:53 +0200
-+++ src/plugin_shortdial.c	2006-08-31 22:38:45 +0200
+--- src/plugin_shortdial.c.orig	2007-06-08 21:43:20 +0200
++++ src/plugin_shortdial.c	2007-10-29 09:19:48 +0100
 @@ -22,6 +22,7 @@
  
  #include <stdio.h>
@@ -22,9 +10,9 @@ Index: src/plugin_shortdial.c
  
  #include <osipparser2/osip_parser.h>
 Index: src/proxy.c
---- src/proxy.c.orig	2006-06-20 08:34:27 +0200
-+++ src/proxy.c	2006-08-31 23:15:39 +0200
-@@ -1033,6 +1033,7 @@
+--- src/proxy.c.orig	2007-10-28 14:48:10 +0100
++++ src/proxy.c	2007-10-29 09:19:48 +0100
+@@ -1076,6 +1076,7 @@
                 memcpy(&addr_media, &addr_sess, sizeof(addr_sess));
              }
  
@@ -32,7 +20,7 @@ Index: src/proxy.c
              /*
               * Am I running in front of the routing device? Then I cannot
               * use the external IP to bind a listen socket to, so force
-@@ -1045,6 +1046,7 @@
+@@ -1088,6 +1089,7 @@
                        "in-front-of-NAT-Router");
                 memcpy(&map_addr, &inside_addr, sizeof (map_addr));
              }
@@ -41,8 +29,8 @@ Index: src/proxy.c
              sts = rtp_start_fwd(osip_message_get_call_id(mymsg),
                                  client_id,
 Index: src/siproxd.c
---- src/siproxd.c.orig	2006-06-18 18:28:43 +0200
-+++ src/siproxd.c	2006-08-31 22:38:45 +0200
+--- src/siproxd.c.orig	2007-06-08 21:42:10 +0200
++++ src/siproxd.c	2007-10-29 09:19:48 +0100
 @@ -28,6 +28,7 @@
  #include <signal.h>
  #include <netinet/in.h>
@@ -51,15 +39,15 @@ Index: src/siproxd.c
  
  #ifdef  HAVE_GETOPT_H
  #include <getopt.h>
-@@ -97,6 +98,7 @@
-    char *pidfilename=NULL;
-    struct sigaction act;
+@@ -99,6 +100,7 @@
+ 
+    log_init();
  
 +   openlog("siproxd", LOG_NDELAY, LOG_DAEMON);
     log_set_stderr(1);
  
  /*
-@@ -177,11 +179,16 @@
+@@ -181,11 +183,16 @@
  /*
   * Init stuff
   */
@@ -78,7 +66,7 @@ Index: src/siproxd.c
     /* if a debug level > 0 has been given on the commandline use its
        value and not what is in the config file */
     if (cmdline_debuglevel != 0) {
-@@ -212,7 +219,6 @@
+@@ -214,7 +221,6 @@
        setsid();
        if (fork()!=0) exit(0);
  
@@ -86,3 +74,26 @@ Index: src/siproxd.c
        INFO("daemonized, pid=%i", getpid());
     }
  
+Index: src/utils.c
+--- src/utils.c.orig	2007-09-03 21:55:11 +0200
++++ src/utils.c	2007-10-29 09:20:26 +0100
+@@ -23,7 +23,6 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+-#include <values.h>
+ #include <time.h>
+ #include <signal.h>
+ #include <string.h>
+@@ -46,6 +45,11 @@
+ #include "siproxd.h"
+ #include "log.h"
+ 
++#ifndef MAXINT
++#include <sys/limits.h>
++#define MAXINT INT_MAX
++#endif
++
+ static char const ident[]="$Id: siproxd.patch,v 1.3 2007/10/29 08:22:28 rse Exp $";
+ 
+ /* configuration storage */

+ 3 - 3
siproxd/siproxd.spec

@@ -32,8 +32,8 @@ Distribution: OpenPKG Community
 Class:        EVAL
 Group:        VoIP
 License:      GPL
-Version:      0.5.13
-Release:      20071027
+Version:      0.6.0
+Release:      20071029
 
 #   package options
 %option       with_fsl  yes
@@ -91,7 +91,7 @@ AutoReqProv:  no
         --with-libosip-prefix=%{l_prefix}
 
     #   build program
-    %{l_make} %{l_mflags -O}
+    %{l_make} %{l_mflags}
 
 %install
     rm -rf $RPM_BUILD_ROOT