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