opensips/opensips.patch

changeset 376
8f552d1cd671
child 377
67e813202d53
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/opensips/opensips.patch	Wed Sep 21 14:02:13 2011 +0200
     1.3 @@ -0,0 +1,65 @@
     1.4 +Index: Makefile.defs
     1.5 +--- Makefile.defs.orig	2009-03-23 19:32:01 +0100
     1.6 ++++ Makefile.defs	2009-03-24 19:10:36 +0100
     1.7 +@@ -1161,6 +1161,8 @@
     1.8 + 
     1.9 + endif #mode=release
    1.10 + 
    1.11 ++LDFLAGS += -L$(prefix)/lib
    1.12 ++LIBS    += -lfsl
    1.13 + 
    1.14 + #*FLAGS used for compiling the modules
    1.15 + ifeq	($(CC_NAME), gcc)
    1.16 +@@ -1397,8 +1399,8 @@
    1.17 + 
    1.18 + #add libssl if needed
    1.19 + ifneq ($(TLS),)
    1.20 +-DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include -I$(SYSBASE)/include/openssl
    1.21 +-LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl  -lcrypto
    1.22 ++DEFS+= -I$(prefix)/include
    1.23 ++LIBS+= -L$(prefix)/lib -lssl -lcrypto
    1.24 + endif
    1.25 + 
    1.26 + #add libsctp if needed
    1.27 +Index: modules/permissions/parse_config.c
    1.28 +--- modules/permissions/parse_config.c.orig	2009-03-23 19:31:32 +0100
    1.29 ++++ modules/permissions/parse_config.c	2009-03-24 19:10:36 +0100
    1.30 +@@ -114,8 +114,11 @@
    1.31 + 	except = strstr(str, " EXCEPT ");
    1.32 + 	if (except) {
    1.33 + 		/* exception found */
    1.34 +-		strncpy(str2, str, except-str);
    1.35 +-		str2[except-str] = '\0';
    1.36 ++		int l = except - str;
    1.37 ++		if (l > sizeof(str2) - 1)
    1.38 ++			l = sizeof(str2) - 1;
    1.39 ++		strncpy(str2, str, l);
    1.40 ++		str2[l] = '\0';
    1.41 + 		/* except+8 points to the exception */
    1.42 + 		if (parse_expression_list(except+8, e_exceptions)) {
    1.43 + 			/* error */
    1.44 +@@ -124,7 +127,8 @@
    1.45 + 		}
    1.46 + 	} else {
    1.47 + 		/* no exception */
    1.48 +-		strcpy(str2, str);
    1.49 ++		strncpy(str2, str, sizeof(str2)-1);
    1.50 ++		str2[sizeof(str2)-1] = '\0';
    1.51 + 		*e_exceptions = NULL;
    1.52 + 	}
    1.53 + 
    1.54 +Index: rtpproxy-1.2.1/main.c
    1.55 +--- rtpproxy-1.2.1/main.c.orig	2009-03-24 05:46:13 +0100
    1.56 ++++ rtpproxy-1.2.1/main.c	2009-03-24 19:10:36 +0100
    1.57 +@@ -88,7 +88,11 @@
    1.58 + 	bindhost = NULL;
    1.59 + 
    1.60 +     if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0)
    1.61 ++#if defined(__sun__)
    1.62 ++	errx(1, "setbindhost");
    1.63 ++#else
    1.64 + 	errx(1, "setbindhost: %s", gai_strerror(n));
    1.65 ++#endif
    1.66 + }
    1.67 + 
    1.68 + static void

mercurial