opensips/opensips.patch@8f552d1cd671 (annotated)
opensips/opensips.patch
Wed, 21 Sep 2011 14:02:13 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 21 Sep 2011 14:02:13 +0200
- changeset 376
- 8f552d1cd671
- child 377
- 67e813202d53
- permissions
- -rw-r--r--
Import package vendor original specs for necessary manipulations.
| michael@376 | 1 | Index: Makefile.defs |
| michael@376 | 2 | --- Makefile.defs.orig 2009-03-23 19:32:01 +0100 |
| michael@376 | 3 | +++ Makefile.defs 2009-03-24 19:10:36 +0100 |
| michael@376 | 4 | @@ -1161,6 +1161,8 @@ |
| michael@376 | 5 | |
| michael@376 | 6 | endif #mode=release |
| michael@376 | 7 | |
| michael@376 | 8 | +LDFLAGS += -L$(prefix)/lib |
| michael@376 | 9 | +LIBS += -lfsl |
| michael@376 | 10 | |
| michael@376 | 11 | #*FLAGS used for compiling the modules |
| michael@376 | 12 | ifeq ($(CC_NAME), gcc) |
| michael@376 | 13 | @@ -1397,8 +1399,8 @@ |
| michael@376 | 14 | |
| michael@376 | 15 | #add libssl if needed |
| michael@376 | 16 | ifneq ($(TLS),) |
| michael@376 | 17 | -DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include -I$(SYSBASE)/include/openssl |
| michael@376 | 18 | -LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto |
| michael@376 | 19 | +DEFS+= -I$(prefix)/include |
| michael@376 | 20 | +LIBS+= -L$(prefix)/lib -lssl -lcrypto |
| michael@376 | 21 | endif |
| michael@376 | 22 | |
| michael@376 | 23 | #add libsctp if needed |
| michael@376 | 24 | Index: modules/permissions/parse_config.c |
| michael@376 | 25 | --- modules/permissions/parse_config.c.orig 2009-03-23 19:31:32 +0100 |
| michael@376 | 26 | +++ modules/permissions/parse_config.c 2009-03-24 19:10:36 +0100 |
| michael@376 | 27 | @@ -114,8 +114,11 @@ |
| michael@376 | 28 | except = strstr(str, " EXCEPT "); |
| michael@376 | 29 | if (except) { |
| michael@376 | 30 | /* exception found */ |
| michael@376 | 31 | - strncpy(str2, str, except-str); |
| michael@376 | 32 | - str2[except-str] = '\0'; |
| michael@376 | 33 | + int l = except - str; |
| michael@376 | 34 | + if (l > sizeof(str2) - 1) |
| michael@376 | 35 | + l = sizeof(str2) - 1; |
| michael@376 | 36 | + strncpy(str2, str, l); |
| michael@376 | 37 | + str2[l] = '\0'; |
| michael@376 | 38 | /* except+8 points to the exception */ |
| michael@376 | 39 | if (parse_expression_list(except+8, e_exceptions)) { |
| michael@376 | 40 | /* error */ |
| michael@376 | 41 | @@ -124,7 +127,8 @@ |
| michael@376 | 42 | } |
| michael@376 | 43 | } else { |
| michael@376 | 44 | /* no exception */ |
| michael@376 | 45 | - strcpy(str2, str); |
| michael@376 | 46 | + strncpy(str2, str, sizeof(str2)-1); |
| michael@376 | 47 | + str2[sizeof(str2)-1] = '\0'; |
| michael@376 | 48 | *e_exceptions = NULL; |
| michael@376 | 49 | } |
| michael@376 | 50 | |
| michael@376 | 51 | Index: rtpproxy-1.2.1/main.c |
| michael@376 | 52 | --- rtpproxy-1.2.1/main.c.orig 2009-03-24 05:46:13 +0100 |
| michael@376 | 53 | +++ rtpproxy-1.2.1/main.c 2009-03-24 19:10:36 +0100 |
| michael@376 | 54 | @@ -88,7 +88,11 @@ |
| michael@376 | 55 | bindhost = NULL; |
| michael@376 | 56 | |
| michael@376 | 57 | if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0) |
| michael@376 | 58 | +#if defined(__sun__) |
| michael@376 | 59 | + errx(1, "setbindhost"); |
| michael@376 | 60 | +#else |
| michael@376 | 61 | errx(1, "setbindhost: %s", gai_strerror(n)); |
| michael@376 | 62 | +#endif |
| michael@376 | 63 | } |
| michael@376 | 64 | |
| michael@376 | 65 | static void |
