comparison: opensips/opensips.patch
opensips/opensips.patch
- changeset 677
- bbdbd736796e
- parent 416
- 0bc1d0d1fe3a
equal
deleted
inserted
replaced
| 5:65d84d7b8bc5 | 6:1e7941efa602 |
|---|---|
| 1 Index: main.c | 1 Index: main.c |
| 2 diff -Nau main.c.orig main.c | 2 diff -Nau main.c.orig main.c |
| 3 --- main.c.orig 2012-03-21.orig 10:29:31.458420799 +0100 | 3 --- main.c.orig 2012-03-21.orig 10:29:31.458420799 +0100 |
| 4 +++ main.c 2012-03-21 10:30:52.034994020 +0100 | 4 +++ main.c 2012-03-21 10:30:52.034994020 +0100 |
| 5 @@ -1025,6 +1025,10 @@ | 5 @@ -1029,6 +1029,10 @@ |
| 6 ret=-1; | 6 ret=-1; |
| 7 my_argc=argc; my_argv=argv; | 7 my_argc=argc; my_argv=argv; |
| 8 | 8 |
| 9 + /* if (!log_stderr), that's not usable yet! '/ | 9 + /* if (!log_stderr), that's not usable yet! '/ |
| 10 + /* ...so unconditionally log to syslog for now */ | 10 + /* ...so unconditionally log to syslog for now */ |
| 11 + openlog(argv[0], LOG_PID|LOG_CONS, log_facility); | 11 + openlog(argv[0], LOG_PID|LOG_CONS, log_facility); |
| 12 + | 12 + |
| 13 /*init pkg mallocs (before parsing cfg or cmd line !)*/ | 13 /* process pkg mem size from command line */ |
| 14 if (init_pkg_mallocs()==-1) | 14 opterr=0; |
| 15 goto error00; | 15 options="f:cCm:M:b:l:n:N:rRvdDETSVhw:t:u:g:P:G:W:o:"; |
| 16 @@ -1357,6 +1361,11 @@ | 16 @@ -1387,6 +1391,11 @@ |
| 17 | 17 |
| 18 /* init_daemon? */ | 18 /* init_daemon? */ |
| 19 if (!dont_fork){ | 19 if (!dont_fork){ |
| 20 + /* shortly after main() we called openlog(3) to log */ | 20 + /* shortly after main() we called openlog(3) to log */ |
| 21 + /* the initialization, but since daemonize() has its */ | 21 + /* the initialization, but since daemonize() has its */ |
| 36 - data-dir = $(MAIN_NAME)/ | 36 - data-dir = $(MAIN_NAME)/ |
| 37 + data-dir = share/$(MAIN_NAME)/ | 37 + data-dir = share/$(MAIN_NAME)/ |
| 38 LOCALBASE ?= $(SYSBASE)/local | 38 LOCALBASE ?= $(SYSBASE)/local |
| 39 endif | 39 endif |
| 40 endif | 40 endif |
| 41 @@ -1432,6 +1432,10 @@ | 41 @@ -1411,6 +1411,10 @@ |
| 42 LIBS+= -lsctp | 42 LIBS+= -lsctp |
| 43 endif | 43 endif |
| 44 | 44 |
| 45 +#conditionally add libfsl | 45 +#conditionally add libfsl |
| 46 +LDFLAGS += -L$(prefix)/lib | 46 +LDFLAGS += -L$(prefix)/lib |
| 72 use POSIX; | 72 use POSIX; |
| 73 -use Frontier::RPC2; | 73 -use Frontier::RPC2; |
| 74 use IO::Socket; | 74 use IO::Socket; |
| 75 use Socket; | 75 use Socket; |
| 76 #use Net::IP; | 76 #use Net::IP; |
| 77 @@ -378,6 +377,12 @@ | 77 @@ -376,6 +375,12 @@ |
| 78 } | 78 } |
| 79 } | 79 } |
| 80 | 80 |
| 81 + if ( $MD5 eq "" ) { | 81 + if ( $MD5 eq "" ) { |
| 82 + if ( $arr[0] =~ /^\s*MD5/ ) { | 82 + if ( $arr[0] =~ /^\s*MD5/ ) { |
| 223 - return -1; | 223 - return -1; |
| 224 + LM_WARN("tls[%s:%d] proceeding with no key at all!\n", ip_addr2a(&d->addr), d->port); | 224 + LM_WARN("tls[%s:%d] proceeding with no key at all!\n", ip_addr2a(&d->addr), d->port); |
| 225 d = d->next; | 225 d = d->next; |
| 226 } | 226 } |
| 227 return 0; | 227 return 0; |
| 228 Index: menuconfig/Makefile | |
| 229 diff -Nau menuconfig/Makefile.orig menuconfig/Makefile | |
| 230 --- menuconfig/Makefile.orig 2012-03-26 12:11:03.000000000 +0200 | |
| 231 +++ menuconfig/Makefile 2012-08-21 21:44:18.781092313 +0200 | |
| 232 @@ -5,10 +5,10 @@ | |
| 233 CFLAGS=-g -Wall -DMENUCONFIG_CFG_PATH=\"$(MENUCONFIG_CFG_PATH)\" \ | |
| 234 -DMENUCONFIG_GEN_PATH=\"$(MENUCONFIG_GEN_PATH)\" \ | |
| 235 -DMENUCONFIG_HAVE_SOURCES=$(MENUCONFIG_HAVE_SOURCES) | |
| 236 -MY_LDFLAGS=-lcurses | |
| 237 +MY_LDFLAGS=-lncurses | |
| 238 EXEC_NAME=configure | |
| 239 all: $(MENUCONFIG_FILES) | |
| 240 - $(CC) -o $(EXEC_NAME) $(CFLAGS) $^ $(MY_LDFLAGS) | |
| 241 + $(CC) -o $(EXEC_NAME) $(CFLAGS) $(CPPFLAGS) $^ $(LDFLAGS) $(LIBS) | |
| 242 | |
| 243 proper: | |
| 244 rm -f $(EXEC_NAME) | |
| 245 Index: menuconfig/Makefile | |
| 246 diff -Nau menuconfig/Makefile.orig menuconfig/Makefile | |
| 247 --- menuconfig/curses.c.orig 2012-03-23 11:47:37.000000000 +0100 | |
| 248 +++ menuconfig/curses.c 2012-08-21 21:49:29.506561887 +0200 | |
| 249 @@ -28,6 +28,7 @@ | |
| 250 #include<string.h> | |
| 251 | |
| 252 #include<sys/ioctl.h> | |
| 253 +#include<sys/termio.h> | |
| 254 #include<errno.h> | |
| 255 | |
| 256 #include "curses.h" |
