head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2009.10.21.16.22.34;	author rse;	state Exp;
branches;
next	1.2;
commitid	o55zRphMHDMh8q8u;

1.2
date	2009.03.24.18.34.53;	author rse;	state Exp;
branches;
next	1.1;
commitid	xKGb38LyjLecEjHt;

1.1
date	2008.08.09.10.15.48;	author rse;	state Exp;
branches;
next	;
commitid	LixK7lGtVSxmb6et;


desc
@@


1.3
log
@modifying package: opensips-1.6.0 20091016 -> 20091021
@
text
@Index: Makefile.defs
--- Makefile.defs.orig	2009-03-23 19:32:01 +0100
+++ Makefile.defs	2009-03-24 19:10:36 +0100
@@@@ -1161,6 +1161,8 @@@@
 
 endif #mode=release
 
+LDFLAGS += -L$(prefix)/lib
+LIBS    += -lfsl
 
 #*FLAGS used for compiling the modules
 ifeq	($(CC_NAME), gcc)
@@@@ -1397,8 +1399,8 @@@@
 
 #add libssl if needed
 ifneq ($(TLS),)
-DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include -I$(SYSBASE)/include/openssl
-LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl  -lcrypto
+DEFS+= -I$(prefix)/include
+LIBS+= -L$(prefix)/lib -lssl -lcrypto
 endif
 
 #add libsctp if needed
Index: modules/permissions/parse_config.c
--- modules/permissions/parse_config.c.orig	2009-03-23 19:31:32 +0100
+++ modules/permissions/parse_config.c	2009-03-24 19:10:36 +0100
@@@@ -114,8 +114,11 @@@@
 	except = strstr(str, " EXCEPT ");
 	if (except) {
 		/* exception found */
-		strncpy(str2, str, except-str);
-		str2[except-str] = '\0';
+		int l = except - str;
+		if (l > sizeof(str2) - 1)
+			l = sizeof(str2) - 1;
+		strncpy(str2, str, l);
+		str2[l] = '\0';
 		/* except+8 points to the exception */
 		if (parse_expression_list(except+8, e_exceptions)) {
 			/* error */
@@@@ -124,7 +127,8 @@@@
 		}
 	} else {
 		/* no exception */
-		strcpy(str2, str);
+		strncpy(str2, str, sizeof(str2)-1);
+		str2[sizeof(str2)-1] = '\0';
 		*e_exceptions = NULL;
 	}
 
Index: rtpproxy-1.2.1/main.c
--- rtpproxy-1.2.1/main.c.orig	2009-03-24 05:46:13 +0100
+++ rtpproxy-1.2.1/main.c	2009-03-24 19:10:36 +0100
@@@@ -88,7 +88,11 @@@@
 	bindhost = NULL;
 
     if ((n = resolve(ia, pf, bindhost, servname, AI_PASSIVE)) != 0)
+#if defined(__sun__)
+	errx(1, "setbindhost");
+#else
 	errx(1, "setbindhost: %s", gai_strerror(n));
+#endif
 }
 
 static void
@


1.2
log
@upgrading package: opensips 1.4.4 -> 1.5.0
@
text
@d51 3
a53 3
Index: rtpproxy-1.2.0/main.c
--- rtpproxy-1.2.0/main.c.orig	2009-03-24 05:46:13 +0100
+++ rtpproxy-1.2.0/main.c	2009-03-24 19:10:36 +0100
@


1.1
log
@new package: opensips 1.4.0 (Open SIP Express Router)
@
text
@d2 3
a4 3
--- Makefile.defs.orig	2008-08-03 16:02:20 +0200
+++ Makefile.defs	2008-08-09 11:59:33 +0200
@@@@ -1068,6 +1068,8 @@@@
d13 1
a13 1
@@@@ -1304,8 +1306,8 @@@@
d25 2
a26 2
--- modules/permissions/parse_config.c.orig	2008-08-03 15:54:01 +0200
+++ modules/permissions/parse_config.c	2008-08-09 11:58:55 +0200
d51 4
a54 4
Index: rtpproxy-1.1/main.c
--- rtpproxy-1.1/main.c.orig	2008-06-17 05:19:48 +0200
+++ rtpproxy-1.1/main.c	2008-08-09 11:58:55 +0200
@@@@ -86,7 +86,11 @@@@
a65 30
@@@@ -352,7 +356,7 @@@@
     if (cf->umode == 0) {
 	unlink(cmd_sock);
 	memset(&ifsun, '\0', sizeof ifsun);
-#if !defined(__linux__) && !defined(__solaris__)
+#if !defined(__linux__) && !defined(__sun__)
 	ifsun.sun_len = strlen(cmd_sock);
 #endif
 	ifsun.sun_family = AF_LOCAL;
@@@@ -685,7 +689,7 @@@@
 
     controlfd = init_controlfd(&cf);
 
-#if !defined(__solaris__)
+#if !defined(__sun__)
     if (cf.nodaemon == 0) {
 	if (daemon(0, 0) == -1)
 	    err(1, "can't switch into daemon mode");
Index: rtpproxy-1.1/rtpp_util.h
--- rtpproxy-1.1/rtpp_util.h.orig	2008-04-02 00:32:03 +0200
+++ rtpproxy-1.1/rtpp_util.h	2008-08-09 11:58:55 +0200
@@@@ -92,7 +92,7 @@@@
 #define	DEFFILEMODE	(S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
 #endif
 
-#if defined(__solaris__)
+#if defined(__sun__)
 #define err(exitcode, format, args...) \
   errx(exitcode, format ": %s", ## args, strerror(errno))
 #define errx(exitcode, format, args...) \
@