head 1.14; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.3.2.3 OPENPKG_E1_FP:1.3.2.3 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.3.2.2 OPENPKG_2_STABLE:1.3.0.2; locks; strict; comment @# @; 1.14 date 2008.08.09.10.16.46; author rse; state dead; branches; next 1.13; commitid BP9c9yL19w8Hb6et; 1.13 date 2008.04.02.07.45.05; author rse; state Exp; branches; next 1.12; commitid k1hC3YkSheLJuvXs; 1.12 date 2007.12.19.09.55.31; author rse; state Exp; branches; next 1.11; commitid r9tR8uARR6dKA1Ks; 1.11 date 2007.12.13.16.50.14; author cs; state Exp; branches; next 1.10; commitid rWfVP2ub3NbY4iJs; 1.10 date 2007.11.24.18.44.10; author rse; state Exp; branches; next 1.9; commitid rzv03NG4vztVjRGs; 1.9 date 2007.11.12.07.48.38; author rse; state Exp; branches; next 1.8; commitid uHAwO6mYkX4X4gFs; 1.8 date 2007.05.24.07.13.31; author rse; state Exp; branches; next 1.7; commitid 75PTpuxcAmoGp9js; 1.7 date 2007.04.13.19.23.51; author rse; state Exp; branches; next 1.6; commitid c6jJzbWdgzBWLWds; 1.6 date 2007.03.13.07.16.28; author rse; state Exp; branches; next 1.5; commitid bXiuPcUkepKbKT9s; 1.5 date 2007.01.22.16.33.05; author rse; state Exp; branches; next 1.4; commitid xR7l5I8VdpVMqw3s; 1.4 date 2006.10.24.12.50.43; author rse; state Exp; branches; next 1.3; commitid EEx39NPiXEmR5WRr; 1.3 date 2006.10.12.17.42.00; author rse; state Exp; branches 1.3.2.1; next 1.2; commitid CXHSBnuynoQH5qQr; 1.2 date 2006.07.16.08.01.00; author rse; state Exp; branches; next 1.1; commitid mKGUUPtboMkLH3Fr; 1.1 date 2005.10.09.19.27.05; author rse; state Exp; branches; next ; 1.3.2.1 date 2006.10.12.17.42.00; author rse; state dead; branches; next 1.3.2.2; commitid iZxwRSmmWscPXUQr; 1.3.2.2 date 2006.10.16.14.53.43; author rse; state Exp; branches; next 1.3.2.3; commitid iZxwRSmmWscPXUQr; 1.3.2.3 date 2006.10.24.12.51.36; author rse; state Exp; branches; next ; commitid 6lLT8kSB0DIa6WRr; desc @@ 1.14 log @remove obsolete 'openser' module (OpenSER was renamed to OpenSIPS and the 'opensips' package is now existing) @ text @Index: Makefile.defs --- Makefile.defs.orig 2007-12-13 14:39:06 +0100 +++ Makefile.defs 2007-12-19 10:45:51 +0100 @@@@ -1018,6 +1018,8 @@@@ endif #mode=release +LDFLAGS += -L$(prefix)/lib +LIBS += -lfsl #*FLAGS used for compiling the modules ifeq ($(CC_NAME), gcc) @@@@ -1254,8 +1256,8 @@@@ #add libssl if needed ifneq ($(TLS),) -DEFS+= -I$(LOCALBASE)/ssl/include -I$(LOCALBASE)/include -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 2007-12-13 14:38:28 +0100 +++ modules/permissions/parse_config.c 2007-12-19 10:45:51 +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/main.c --- rtpproxy/main.c.orig 2007-12-19 03:17:03 +0100 +++ rtpproxy/main.c 2007-12-19 10:45:51 +0100 @@@@ -111,7 +111,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 @@@@ -1265,7 +1272,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; @@@@ -1579,7 +1586,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/rtpp_util.h --- rtpproxy/rtpp_util.h.orig 2007-12-19 03:17:03 +0100 +++ rtpproxy/rtpp_util.h 2007-12-19 10:45:51 +0100 @@@@ -90,7 +90,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...) \ @ 1.13 log @modifying package: openser-1.3.1 20080401 -> 20080402 @ text @@ 1.12 log @modifying package: openser-1.3.0 20071213 -> 20071219 @ text @a65 24 @@@@ -370,10 +374,9 @@@@ rtpp_log_write(RTPP_LOG_DBUG, cf->glog, "received command \"%s\"", buf); - cp = buf; argc = 0; memset(argv, 0, sizeof(argv)); - for (ap = argv; (*ap = strsep(&cp, "\r\n\t ")) != NULL;) + for (ap = argv, cp = strtok(buf, "\r\n\t "); (cp = strtok(NULL, "\r\n\t ")) != NULL;) if (**ap != '\0') { argc++; if (++ap >= &argv[10]) @@@@ -665,7 +668,11 @@@@ } } else { rtpp_log_write(RTPP_LOG_ERR, cf->glog, "getaddrinfo: %s", +#if defined(__sun__) + "unknown"); +#else gai_strerror(n)); +#endif } } } @ 1.11 log @upgrading package: openser 1.2.2 -> 1.3.0 @ text @d3 1 a3 1 +++ Makefile.defs 2007-12-13 17:37:18 +0100 d25 2 a26 2 --- modules/permissions/parse_config.c.orig 2007-08-16 16:22:57 +0200 +++ modules/permissions/parse_config.c 2007-11-24 19:39:03 +0100 d52 3 a54 12 --- rtpproxy/main.c.orig 2007-11-23 11:17:02 +0100 +++ rtpproxy/main.c 2007-11-24 19:39:55 +0100 @@@@ -40,7 +40,7 @@@@ #include #include #include -#if !defined(__solaris__) +#if !defined(__sun__) #include #endif #include @@@@ -113,7 +113,11 @@@@ d66 1 a66 1 @@@@ -371,10 +375,9 @@@@ d78 1 a78 1 @@@@ -651,7 +654,11 @@@@ d90 1 a90 1 @@@@ -1222,7 +1229,7 @@@@ d99 1 a99 1 @@@@ -1537,7 +1544,7 @@@@ d109 3 a111 3 --- rtpproxy/rtpp_util.h.orig 2007-07-28 10:17:02 +0200 +++ rtpproxy/rtpp_util.h 2007-11-24 19:39:03 +0100 @@@@ -84,7 +84,7 @@@@ @ 1.10 log @modifying package: openser-1.2.2 20071120 -> 20071124 @ text @d2 3 a4 3 --- Makefile.defs.orig 2007-08-16 16:23:20 +0200 +++ Makefile.defs 2007-11-24 19:39:03 +0100 @@@@ -983,6 +983,8 @@@@ d13 1 a13 1 @@@@ -1205,8 +1207,8 @@@@ d17 1 a17 1 -DEFS+= -I$(LOCALBASE)/ssl/include d23 1 a23 1 ifneq ($(found_lock_method), yes) @ 1.9 log @modifying package: openser-1.2.2 20071110 -> 20071112 @ text @d3 1 a3 1 +++ Makefile.defs 2007-11-12 08:39:32 +0100 d26 1 a26 1 +++ modules/permissions/parse_config.c 2007-11-12 08:39:32 +0100 d52 2 a53 2 --- rtpproxy/main.c.orig 2007-11-12 03:17:02 +0100 +++ rtpproxy/main.c 2007-11-12 08:43:47 +0100 d63 1 a63 1 @@@@ -139,7 +139,11 @@@@ d75 1 a75 1 @@@@ -399,10 +403,9 @@@@ d77 1 a77 1 rtpp_log_write(RTPP_LOG_DBUG, glog, "received command \"%s\"", buf); d87 1 a87 1 @@@@ -660,7 +663,11 @@@@ d90 1 a90 1 rtpp_log_write(RTPP_LOG_ERR, glog, "getaddrinfo: %s", d99 1 a99 1 @@@@ -1181,7 +1188,7 @@@@ d108 1 a108 1 @@@@ -1483,7 +1490,7 @@@@ d119 1 a119 1 +++ rtpproxy/rtpp_util.h 2007-11-12 08:39:32 +0100 @ 1.8 log @upgrading package: openser 1.2.0 -> 1.2.1 @ text @d2 2 a3 2 --- Makefile.defs.orig 2007-05-23 18:53:19 +0200 +++ Makefile.defs 2007-05-24 08:59:11 +0200 d24 27 d52 3 a54 3 --- rtpproxy/main.c.orig 2006-07-05 02:14:19 +0200 +++ rtpproxy/main.c 2007-05-24 08:55:28 +0200 @@@@ -38,7 +38,7 @@@@ d63 1 a63 1 @@@@ -128,7 +128,11 @@@@ d75 1 a75 1 @@@@ -386,10 +390,9 @@@@ d87 1 a87 1 @@@@ -642,7 +645,11 @@@@ d99 2 a100 2 @@@@ -1170,7 +1177,7 @@@@ if (umode == 0) { d108 3 a110 3 @@@@ -1203,7 +1210,7 @@@@ flags = fcntl(controlfd, F_GETFL); fcntl(controlfd, F_SETFL, flags | O_NONBLOCK); d114 1 a114 1 if (nodaemon == 0) { d118 3 a120 3 --- rtpproxy/rtpp_util.h.orig 2006-04-13 06:29:19 +0200 +++ rtpproxy/rtpp_util.h 2007-05-24 08:55:28 +0200 @@@@ -83,7 +83,7 @@@@ a128 32 ------------------------------------------------------------------------------ Security Fix (OpenPKG-SA-2006.042, OpenPKG-TT-E1#29) Index: modules/permissions/parse_config.c --- modules/permissions/parse_config.c.orig 2007-03-12 16:22:54 +0100 +++ modules/permissions/parse_config.c 2007-05-24 08:55:28 +0200 @@@@ -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; } @ 1.7 log @MFE: Security Fix (OpenPKG-SA-2006.042, OpenPKG-TT-E1#29) @ text @d2 3 a4 12 --- Makefile.defs.orig 2007-03-12 17:39:09 +0100 +++ Makefile.defs 2007-03-13 08:10:29 +0100 @@@@ -652,7 +652,7 @@@@ ifeq ($(CC_CLASS), 4.x) CPU_TYPE ?= ultrasparc #use 32bit for now - CFLAGS+=-mcpu=ultrasparc -minline-all-stringops \ + CFLAGS+=-mcpu=ultrasparc \ -mtune=$(CPU_TYPE) \ -ftree-vectorize else @@@@ -974,6 +974,8 @@@@ d13 1 a13 1 @@@@ -1196,8 +1198,8 @@@@ d26 1 a26 1 +++ rtpproxy/main.c 2007-03-13 08:08:02 +0100 d92 1 a92 1 +++ rtpproxy/rtpp_util.h 2007-03-13 08:08:02 +0100 d103 1 a103 1 ----------------------------------------------------------------------------- d108 3 a110 3 --- modules/permissions/parse_config.c.orig 2005-06-13 18:47:43 +0200 +++ modules/permissions/parse_config.c 2006-12-26 11:15:25 +0100 @@@@ -111,8 +111,11 @@@@ d124 1 a124 1 @@@@ -121,7 +124,8 @@@@ d133 1 a133 1 @ 1.6 log @upgrading package: openser 1.1.1 -> 1.2.0 @ text @d111 32 @ 1.5 log @upgrading package: openser 1.1.0 -> 1.1.1 @ text @d2 5 a6 5 --- Makefile.defs.orig 2007-01-22 13:16:11 +0100 +++ Makefile.defs 2007-01-22 17:28:29 +0100 @@@@ -629,7 +629,7 @@@@ ifeq ($(CC_SHORTVER), 4.x) CPU ?= ultrasparc d10 1 a10 1 -mtune=$(CPU) \ d13 1 a13 1 @@@@ -989,6 +989,8 @@@@ d22 1 a22 1 @@@@ -1203,8 +1205,8 @@@@ d35 1 a35 1 +++ rtpproxy/main.c 2007-01-22 17:28:29 +0100 d101 1 a101 1 +++ rtpproxy/rtpp_util.h 2007-01-22 17:28:29 +0100 @ 1.4 log @fix building under Sun Solaris @ text @d2 3 a4 3 --- Makefile.defs.orig 2006-07-10 19:57:20.000000000 +0200 +++ Makefile.defs 2006-10-24 14:37:21.637521203 +0200 @@@@ -628,7 +628,7 @@@@ d13 1 a13 1 @@@@ -987,6 +987,8 @@@@ d22 1 a22 1 @@@@ -1199,8 +1201,8 @@@@ a32 12 Index: cfg.y --- cfg.y.orig 2006-07-10 15:37:02.000000000 +0200 +++ cfg.y 2006-10-24 14:36:05.572200941 +0200 @@@@ -854,7 +854,7 @@@@ tos=IPTOS_THROUGHPUT; } else if (strcasecmp($3,"IPTOS_RELIABILITY")) { tos=IPTOS_RELIABILITY; -#if !defined(__OS_solaris) || !defined(__OS_netbsd) +#if (!defined(__OS_solaris) || !defined(__OS_netbsd)) && defined(IPTOS_MINCOST) } else if (strcasecmp($3,"IPTOS_MINCOST")) { tos=IPTOS_MINCOST; #endif d34 2 a35 2 --- rtpproxy/main.c.orig 2006-07-05 02:14:19.000000000 +0200 +++ rtpproxy/main.c 2006-10-24 14:36:05.573430941 +0200 d100 2 a101 2 --- rtpproxy/rtpp_util.h.orig 2006-04-13 06:29:19.000000000 +0200 +++ rtpproxy/rtpp_util.h 2006-10-24 14:36:05.573806775 +0200 @ 1.3 log @port to Solaris @ text @d3 10 a12 1 +++ Makefile.defs 2006-10-12 16:46:28.371048766 +0200 d35 1 a35 1 +++ cfg.y 2006-10-12 16:46:28.371878474 +0200 d47 1 a47 1 +++ rtpproxy/main.c 2006-10-12 18:52:30.244787676 +0200 d113 1 a113 1 +++ rtpproxy/rtpp_util.h 2006-10-12 16:50:58.099769521 +0200 @ 1.3.2.1 log @file openser.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:53:43 +0000 @ text @d1 113 @ 1.3.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 113 Index: Makefile.defs --- Makefile.defs.orig 2006-07-10 19:57:20.000000000 +0200 +++ Makefile.defs 2006-10-12 16:46:28.371048766 +0200 @@@@ -987,6 +987,8 @@@@ endif #mode=release +LDFLAGS += -L$(prefix)/lib +LIBS += -lfsl #*FLAGS used for compiling the modules ifeq ($(CC_NAME), gcc) @@@@ -1199,8 +1201,8 @@@@ #add libssl if needed ifneq ($(TLS),) -DEFS+= -I$(LOCALBASE)/ssl/include -LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto +DEFS+= -I$(prefix)/include +LIBS+= -L$(prefix)/lib -lssl -lcrypto endif ifneq ($(found_lock_method), yes) Index: cfg.y --- cfg.y.orig 2006-07-10 15:37:02.000000000 +0200 +++ cfg.y 2006-10-12 16:46:28.371878474 +0200 @@@@ -854,7 +854,7 @@@@ tos=IPTOS_THROUGHPUT; } else if (strcasecmp($3,"IPTOS_RELIABILITY")) { tos=IPTOS_RELIABILITY; -#if !defined(__OS_solaris) || !defined(__OS_netbsd) +#if (!defined(__OS_solaris) || !defined(__OS_netbsd)) && defined(IPTOS_MINCOST) } else if (strcasecmp($3,"IPTOS_MINCOST")) { tos=IPTOS_MINCOST; #endif Index: rtpproxy/main.c --- rtpproxy/main.c.orig 2006-07-05 02:14:19.000000000 +0200 +++ rtpproxy/main.c 2006-10-12 18:52:30.244787676 +0200 @@@@ -38,7 +38,7 @@@@ #include #include #include -#if !defined(__solaris__) +#if !defined(__sun__) #include #endif #include @@@@ -128,7 +128,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 @@@@ -386,10 +390,9 @@@@ rtpp_log_write(RTPP_LOG_DBUG, glog, "received command \"%s\"", buf); - cp = buf; argc = 0; memset(argv, 0, sizeof(argv)); - for (ap = argv; (*ap = strsep(&cp, "\r\n\t ")) != NULL;) + for (ap = argv, cp = strtok(buf, "\r\n\t "); (cp = strtok(NULL, "\r\n\t ")) != NULL;) if (**ap != '\0') { argc++; if (++ap >= &argv[10]) @@@@ -642,7 +645,11 @@@@ } } else { rtpp_log_write(RTPP_LOG_ERR, glog, "getaddrinfo: %s", +#if defined(__sun__) + "unknown"); +#else gai_strerror(n)); +#endif } } } @@@@ -1170,7 +1177,7 @@@@ if (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; @@@@ -1203,7 +1210,7 @@@@ flags = fcntl(controlfd, F_GETFL); fcntl(controlfd, F_SETFL, flags | O_NONBLOCK); -#if !defined(__solaris__) +#if !defined(__sun__) if (nodaemon == 0) { if (daemon(0, 0) == -1) err(1, "can't switch into daemon mode"); Index: rtpproxy/rtpp_util.h --- rtpproxy/rtpp_util.h.orig 2006-04-13 06:29:19.000000000 +0200 +++ rtpproxy/rtpp_util.h 2006-10-12 16:50:58.099769521 +0200 @@@@ -83,7 +83,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...) \ @ 1.3.2.3 log @MFC: fix building under Sun Solaris @ text @d3 1 a3 10 +++ Makefile.defs 2006-10-24 14:37:21.637521203 +0200 @@@@ -628,7 +628,7 @@@@ ifeq ($(CC_SHORTVER), 4.x) CPU ?= ultrasparc #use 32bit for now - CFLAGS+=-mcpu=ultrasparc -minline-all-stringops \ + CFLAGS+=-mcpu=ultrasparc \ -mtune=$(CPU) \ -ftree-vectorize else d26 1 a26 1 +++ cfg.y 2006-10-24 14:36:05.572200941 +0200 d38 1 a38 1 +++ rtpproxy/main.c 2006-10-24 14:36:05.573430941 +0200 d104 1 a104 1 +++ rtpproxy/rtpp_util.h 2006-10-24 14:36:05.573806775 +0200 @ 1.2 log @upgrading package: openser 1.0.1 -> 1.1.0 @ text @d2 2 a3 2 --- Makefile.defs.orig 2006-07-10 19:57:20 +0200 +++ Makefile.defs 2006-07-16 09:54:39 +0200 d24 90 @ 1.1 log @new package: openser 0.9.5 (Open SIP Express Router) @ text @d2 5 a6 5 --- Makefile.defs.orig 2005-07-01 14:13:43 +0200 +++ Makefile.defs 2005-10-09 18:37:26 +0200 @@@@ -982,6 +982,8 @@@@ found_lock_method=yes endif d11 3 d15 7 d23 1 @