Hi ports@,
This is update kamailio port to version 4.3.3
Tested on stable 5.8 and current (amd64).
Ok? Comments?
- Roman
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/kamailio/Makefile,v
retrieving revision 1.32
diff -u -p -u -p -r1.32 Makefile
--- Makefile 30 Oct 2015 12:59:16 -0000 1.32
+++ Makefile 20 Nov 2015 07:20:14 -0000
@@ -4,9 +4,7 @@ COMMENT-main = mature and flexible open
SHARED_ONLY = Yes
-VERSION = 4.0.0
-REVISION-main = 0
-REVISION-mysql = 2
+VERSION = 4.3.3
DISTNAME = kamailio-${VERSION}_src
PKGNAME-main = kamailio-${VERSION}
PKGNAME-mysql = kamailio-mysql-${VERSION}
@@ -26,18 +24,18 @@ HOMEPAGE = http://www.kamailio.org/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-SHARED_LIBS = kcore 2.0 # 1.0
-SHARED_LIBS += kmi 2.0 # 1.0
-SHARED_LIBS += srdb1 2.0 # 1.0
-SHARED_LIBS += srdb2 2.0 # 1.0
-SHARED_LIBS += trie 2.0 # 1.0
-SHARED_LIBS += binrpc 1.0 # 0.1
-SHARED_LIBS += srutils 1.0 # 1.0
-SHARED_LIBS += print 0.0 # 1.2
+SHARED_LIBS = kcore 3.0 # 1.0
+SHARED_LIBS += kmi 3.0 # 1.0
+SHARED_LIBS += srdb1 3.0 # 1.0
+SHARED_LIBS += srdb2 3.0 # 1.0
+SHARED_LIBS += trie 3.0 # 1.0
+SHARED_LIBS += binrpc 2.0 # 0.1
+SHARED_LIBS += srutils 2.0 # 1.0
+SHARED_LIBS += print 1.0 # 1.2
MAKE_ENV = CC="${CC}" \
- CC_EXTRA_OPTS="${CFLAGS} -DOPENSSL_NO_BUF_FREELISTS" \
- LD_EXTRA_OPTS="${LDFLAGS} -pthread" \
+ CC_EXTRA_OPTS="${CFLAGS} -DOPENSSL_NO_BUF_FREELISTS
-DHAVE_ARC4RANDOM -I${LOCALBASE}/include" \
+ LD_EXTRA_OPTS="${LDFLAGS} -pthread -L${LOCALBASE}/lib" \
QUIET=verbose
MASTER_SITES = http://www.kamailio.org/pub/kamailio/${VERSION}/src/
@@ -70,7 +68,8 @@ MAKE_FLAGS = LIBDIR=lib \
BASEDIR=${WRKINST} \
cfg-prefix=${WRKINST} \
SYSCONFDIR=${SYSCONFDIR} \
- C_INCLUDES="-I${LOCALBASE}/include" \
+ VARBASE=${VARBASE} \
+ SCTP=0 \
include_modules="${KAMAILIO_MODULES}" \
LIBkcore_VERSION=${LIBkcore_VERSION} \
LIBkmi_VERSION=${LIBkmi_VERSION} \
@@ -148,7 +147,6 @@ COMMENT-perl = kamailio perl modules
KAMAILIO_MODULES += app_perl db_perlvdb
WANTLIB-perl = c m perl pthread util lib/kamailio/kmi
lib/kamailio/srdb1
LIB_DEPENDS-perl = telephony/kamailio,-main
-RUN_DEPENDS-perl = databases/p5-ldap
.endif
# TODO
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/kamailio/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo 16 Apr 2013 11:13:04 -0000 1.6
+++ distinfo 20 Nov 2015 07:20:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (kamailio-4.0.0_src.tar.gz) =
pQyU8b9pT+iNZlslkxbTytR8RNfvl4PglNw0BQ+Gv/E=
-SIZE (kamailio-4.0.0_src.tar.gz) = 10331908
+SHA256 (kamailio-4.3.3_src.tar.gz) =
rg4D2jc+jUpFGUonorrPiPnheQDEKPmCeKyH2jCpGIo=
+SIZE (kamailio-4.3.3_src.tar.gz) = 11364814
Index: patches/patch-Makefile_defs
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-Makefile_defs,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Makefile_defs
--- patches/patch-Makefile_defs 16 Apr 2013 11:13:04 -0000 1.5
+++ patches/patch-Makefile_defs 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_defs,v 1.5 2013/04/16 11:13:04 sthen Exp $
---- Makefile.defs.orig Mon Mar 11 17:27:19 2013
-+++ Makefile.defs Thu Mar 14 15:52:28 2013
-@@ -362,9 +362,9 @@ ppc_macros= __powerpc __powerpc__ __POWERPC__ __ppc__
+--- Makefile.defs.orig Fri Oct 2 15:35:19 2015
++++ Makefile.defs Wed Oct 21 02:36:24 2015
+@@ -300,9 +300,9 @@ ppc_macros= __powerpc __powerpc__ __POWERPC__ __ppc__
ppc64_macros= __ppc64__ _ARCH_PPC64
mips_macros= __mips__ __mips _MIPS_ARCH_MIPS1
@@ -13,7 +13,7 @@ $OpenBSD: patch-Makefile_defs,v 1.5 2013
alpha_macros= __alpha__ __alpha _M_ALPHA_
-@@ -435,7 +435,7 @@ endif
+@@ -373,7 +373,7 @@ endif
endif
# dirs
@@ -22,7 +22,7 @@ $OpenBSD: patch-Makefile_defs,v 1.5 2013
bin_dir = sbin/
share_dir = share/$(MAIN_NAME)/
# lib/$(MAIN_NAME)/modules , lib/$(MAIN_NAME)/modules-s,
lib/$(MAIN_NAME)/modules-k
-@@ -517,7 +517,7 @@ data_prefix = $(basedir)$(prefix)
+@@ -459,11 +459,11 @@ data_prefix = $(basedir)$(prefix)
# target dirs for various stuff
@@ -31,16 +31,41 @@ $OpenBSD: patch-Makefile_defs,v 1.5 2013
bin_target = $(prefix)/$(bin_dir)
#modules_target = $(prefix)/$(modules_dir)
lib_target = $(prefix)/$(lib_dir)
-@@ -976,7 +976,7 @@ ifeq ($(ARCH), x86_64)
+-run_target = $(run_prefix)/$(run_dir)
++run_target = $(VARBASE)/run/$(MAIN_NAME)/
+ doc_target = $(prefix)/$(doc_dir)
+ data_target = $(prefix)/$(data_dir)
+
+@@ -841,16 +841,12 @@ ifeq ($(ARCH), i386)
+ ifeq ($(CC_NAME), gcc)
+ C_DEFS+=-DCC_GCC_LIKE_ASM
+ #common stuff
+- CFLAGS=-g $(CC_OPT) -funroll-loops
-Wcast-align $(PROFILE)
++ CFLAGS=
+ #if gcc 5.0+, 4.5+ or 4.2+
+ ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER))))
+ $(call set_if_empty,CPU,athlon64)
+- CFLAGS+=-m32 -minline-all-stringops \
+- -falign-loops \
+- -ftree-vectorize \
+- -fno-strict-overflow \
+- -mtune=$(CPU)
+- LDFLAGS+=-m32
++ CFLAGS+=
++ LDFLAGS+=
+ else
+ #if gcc 4.0+
+ ifeq ($(CC_SHORTVER), 4.x)
+@@ -923,7 +919,7 @@ ifeq ($(ARCH), x86_64)
ifeq ($(CC_NAME), gcc)
C_DEFS+=-DCC_GCC_LIKE_ASM
#common stuff
-- CFLAGS=-g -O9 -funroll-loops -Wcast-align
$(PROFILE)
+- CFLAGS=-g $(CC_OPT) -funroll-loops
-Wcast-align $(PROFILE)
+ CFLAGS=
#if gcc 4.5+
# don't add '-mtune=$(CPU)' - gcc failure
- ifeq ($(CC_SHORTVER), 4.5+)
-@@ -990,12 +990,8 @@ else
+ ifeq ($(CC_SHORTVER),$(filter $(CC_SHORTVER),4.5+ 5.0+))
+@@ -937,12 +933,8 @@ else
#if gcc 4.2+
ifeq ($(CC_SHORTVER), 4.2+)
$(call set_if_empty,CPU,opteron)
@@ -55,16 +80,7 @@ $OpenBSD: patch-Makefile_defs,v 1.5 2013
else
#if gcc 4.0+
ifeq ($(CC_SHORTVER), 4.x)
-@@ -1416,7 +1412,7 @@ ifeq ($(CC_NAME), gcc)
- CFLAGS= -mips64 -O9 -funroll-loops $(PROFILE)
- #if gcc 4.5+ or 4.2+
- ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER))))
-- CFLAGS+=-minline-all-stringops
-ftree-vectorize \
-+ CFLAGS+=-ftree-vectorize \
- -fno-strict-overflow
- else
- #if gcc 4.0+
-@@ -1962,9 +1958,10 @@ endif
+@@ -1848,9 +1840,10 @@ endif
ifeq ($(OS), openbsd)
C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \
Index: patches/patch-Makefile_libs
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-Makefile_libs,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile_libs
--- patches/patch-Makefile_libs 15 Sep 2012 12:16:18 -0000 1.2
+++ patches/patch-Makefile_libs 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile_libs,v 1.2 2012/09/15 12:16:18 sthen Exp $
---- Makefile.libs.orig Mon Jun 18 14:36:09 2012
-+++ Makefile.libs Sun Jul 29 18:01:15 2012
-@@ -57,14 +57,19 @@ ifeq ($(OS), darwin)
+--- Makefile.libs.orig Fri Oct 2 15:35:17 2015
++++ Makefile.libs Mon Oct 19 14:00:40 2015
+@@ -50,14 +50,19 @@ ifeq ($(OS), darwin)
NAME_LD_FLAGS= -compatibility_version $(MAJOR_VER).$(MINOR_VER) \
-current_version
$(MAJOR_VER).$(MINOR_VER).$(BUGFIX_VER) \
-install_name $(LIB_INSTALL_NAME)
@@ -22,7 +22,7 @@ $OpenBSD: patch-Makefile_libs,v 1.2 2012
ifeq ($(strip $(compile_for_install)),yes)
LIB_INSTALL_NAME:=$(lib_target)/$(LIB_RUNTIME_NAME)
-@@ -111,14 +116,18 @@ endif
+@@ -104,14 +109,18 @@ endif
$(NAME): $(LIB_RUNTIME_NAME) $(LIB_LINK_NAME) $(LIBINAME_F)
$(LIB_RUNTIME_NAME):
@@ -41,7 +41,7 @@ $OpenBSD: patch-Makefile_libs,v 1.2 2012
.PHONY: link_clean
link_clean:
-@@ -144,21 +153,31 @@ ifeq ($(OS), freebsd)
+@@ -137,21 +146,31 @@ ifeq ($(OS), freebsd)
rm -f $(lib_prefix)/$(lib_dir)/$(LIB_LINK_NAME)
cd $(lib_prefix)/$(lib_dir) ; ln -s $(LIB_RUNTIME_NAME) $(LIB_LINK_NAME)
else
Index: patches/patch-etc_kamailio_cfg
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-etc_kamailio_cfg,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-etc_kamailio_cfg
--- patches/patch-etc_kamailio_cfg 16 Apr 2013 11:13:04 -0000 1.3
+++ patches/patch-etc_kamailio_cfg 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-etc_kamailio_cfg,v 1.3 2013/04/16 11:13:04 sthen Exp $
---- etc/kamailio.cfg.orig Mon Mar 11 17:27:18 2013
-+++ etc/kamailio.cfg Thu Mar 14 15:52:28 2013
-@@ -149,6 +149,9 @@ log_facility=LOG_LOCAL0
+--- etc/kamailio.cfg.orig Fri Oct 2 15:35:17 2015
++++ etc/kamailio.cfg Mon Oct 19 14:00:40 2015
+@@ -150,6 +150,9 @@ log_facility=LOG_LOCAL0
fork=yes
children=4
Index: patches/patch-lib_binrpc_binrpc_api_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-lib_binrpc_binrpc_api_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-lib_binrpc_binrpc_api_c
--- patches/patch-lib_binrpc_binrpc_api_c 15 Sep 2012 12:16:18 -0000
1.1
+++ patches/patch-lib_binrpc_binrpc_api_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-lib_binrpc_binrpc_api_c,v 1.1 2012/09/15 12:16:18 sthen Exp $
---- lib/binrpc/binrpc_api.c.orig Sun Jul 29 23:47:24 2012
-+++ lib/binrpc/binrpc_api.c Sun Jul 29 23:49:21 2012
-@@ -149,10 +149,10 @@ static int connect_unix_sock(char* name, int type, str
+--- lib/binrpc/binrpc_api.c.orig Fri Oct 2 15:35:17 2015
++++ lib/binrpc/binrpc_api.c Mon Oct 19 14:00:40 2015
+@@ -138,10 +138,10 @@ static int connect_unix_sock(char* name, int type, str
s=-1;
memset(&ifsun, 0, sizeof (struct sockaddr_un));
len=strlen(name);
@@ -14,7 +14,7 @@ $OpenBSD: patch-lib_binrpc_binrpc_api_c,
goto error;
}
ifsun.sun_family=AF_UNIX;
-@@ -174,16 +174,16 @@ static int connect_unix_sock(char* name, int type, str
+@@ -163,16 +163,16 @@ static int connect_unix_sock(char* name, int type, str
if (sock_dir==0)
sock_dir="/tmp";
retry:
Index: patches/patch-lib_kcore_Makefile
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-lib_kcore_Makefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-lib_kcore_Makefile
--- patches/patch-lib_kcore_Makefile 22 Apr 2012 21:44:24 -0000 1.1
+++ patches/patch-lib_kcore_Makefile 20 Nov 2015 07:20:14 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-lib_kcore_Makefile,v 1.1 2012/04/22 21:44:24 sthen Exp $
---- lib/kcore/Makefile.orig Mon Feb 6 23:55:58 2012
-+++ lib/kcore/Makefile Mon Feb 6 23:56:16 2012
+--- lib/kcore/Makefile.orig Fri Oct 2 15:35:17 2015
++++ lib/kcore/Makefile Mon Oct 19 14:00:40 2015
@@ -4,6 +4,7 @@ NAME:=kcore
MAJOR_VER=1
MINOR_VER=0
@@ -8,4 +8,4 @@ $OpenBSD: patch-lib_kcore_Makefile,v 1.1
+OBSD_VER=$(LIBkcore_VERSION)
LIBS=
- include ../../Makefile.libs
+ SERLIBPATH=..
Index: patches/patch-main_c
===================================================================
RCS file: patches/patch-main_c
diff -N patches/patch-main_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-main_c 20 Nov 2015 07:20:14 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- main.c.orig Fri Oct 2 15:35:19 2015
++++ main.c Wed Oct 21 00:00:47 2015
+@@ -1787,8 +1787,10 @@ int main(int argc, char** argv)
+ int proto;
+ char *options;
+ int ret;
++#ifndef HAVE_ARC4RANDOM
+ unsigned int seed;
+ int rfd;
++#endif
+ int debug_save, debug_flag;
+ int dont_fork_cnt;
+ struct name_lst* n_lst;
+@@ -2026,6 +2028,7 @@ int main(int argc, char** argv)
+ goto error;
+ }
+
++#ifndef HAVE_ARC4RANDOM
+ /* seed the prng */
+ /* try to use /dev/urandom if possible */
+ seed=0;
+@@ -2046,6 +2049,7 @@ try_again:
+ fastrand_seed(rand());
+ srandom(rand()+time(0));
+ LM_DBG("test random numbers %u %lu %u\n", rand(), random(), fastrand());
++#endif
+
+ /*register builtin modules*/
+ register_builtin_modules();
Index: patches/patch-modules_app_perl_app_perl_mod_c
===================================================================
RCS file: patches/patch-modules_app_perl_app_perl_mod_c
diff -N patches/patch-modules_app_perl_app_perl_mod_c
--- patches/patch-modules_app_perl_app_perl_mod_c 16 Apr 2013 11:13:04
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-modules_app_perl_app_perl_mod_c,v 1.1 2013/04/16 11:13:04
sthen Exp $
---- modules/app_perl/app_perl_mod.c.orig Sun Mar 31 17:21:32 2013
-+++ modules/app_perl/app_perl_mod.c Sun Mar 31 17:22:09 2013
-@@ -319,6 +319,8 @@ struct mi_root* perl_mi_reload(struct mi_root *cmd_tre
- static int mod_init(void) {
-
- int ret = 0;
-+ int argc = 0;
-+ char **argv = NULL;
-
- if(register_mi_mod(exports.name, mi_cmds)!=0)
- {
-@@ -337,7 +339,7 @@ static int mod_init(void) {
- return -1;
- }
-
-- PERL_SYS_INIT3(NULL, NULL, &environ);
-+ PERL_SYS_INIT3(&argc, &argv, &environ);
-
- if ((my_perl = parser_init())) {
- ret = 0;
Index: patches/patch-modules_auth_auth_mod_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-modules_auth_auth_mod_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-modules_auth_auth_mod_c
--- patches/patch-modules_auth_auth_mod_c 16 Apr 2013 11:13:04 -0000
1.3
+++ patches/patch-modules_auth_auth_mod_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_auth_auth_mod_c,v 1.3 2013/04/16 11:13:04 sthen Exp $
---- modules/auth/auth_mod.c.orig Mon Mar 11 17:27:18 2013
-+++ modules/auth/auth_mod.c Sat Apr 13 09:30:54 2013
-@@ -974,7 +974,7 @@ static int proxy_challenge(struct sip_msg *msg, char*
+--- modules/auth/auth_mod.c.orig Fri Oct 2 15:35:17 2015
++++ modules/auth/auth_mod.c Mon Oct 19 14:00:40 2015
+@@ -958,7 +958,7 @@ static int proxy_challenge(struct sip_msg *msg, char*
goto error;
}
@@ -10,7 +10,7 @@ $OpenBSD: patch-modules_auth_auth_mod_c,
error:
if(!(vflags&4)) {
-@@ -1007,7 +1007,7 @@ static int www_challenge(struct sip_msg *msg, char* re
+@@ -991,7 +991,7 @@ static int www_challenge(struct sip_msg *msg, char* re
goto error;
}
@@ -19,7 +19,7 @@ $OpenBSD: patch-modules_auth_auth_mod_c,
error:
if(!(vflags&4)) {
-@@ -1045,9 +1045,9 @@ static int w_auth_challenge(struct sip_msg *msg, char*
+@@ -1029,9 +1029,9 @@ static int w_auth_challenge(struct sip_msg *msg, char*
}
if(msg->REQ_METHOD==METHOD_REGISTER)
Index: patches/patch-modules_carrierroute_Makefile
===================================================================
RCS file: patches/patch-modules_carrierroute_Makefile
diff -N patches/patch-modules_carrierroute_Makefile
--- patches/patch-modules_carrierroute_Makefile 16 Apr 2013 11:13:04 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
-$OpenBSD: patch-modules_carrierroute_Makefile,v 1.3 2013/04/16 11:13:04 sthen
Exp $
---- modules/carrierroute/Makefile.orig Thu Mar 14 16:45:32 2013
-+++ modules/carrierroute/Makefile Thu Mar 14 16:50:38 2013
-@@ -11,10 +11,10 @@ NAME=carrierroute.so
-
- ifeq ($(CROSS_COMPILE),)
- CONFUSE_BUILDER = $(shell \
-- if which confuse-config &>/dev/null;then \
-- echo 'confuse-config'; \
-- elif pkg-config --exists libconfuse; then \
-+ if pkg-config --exists libconfuse; then \
- echo 'pkg-config libconfuse'; \
-+ elif which confuse-config &>/dev/null;then \
-+ echo 'confuse-config'; \
- fi)
- endif
-
Index: patches/patch-modules_ctl_init_socks_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-modules_ctl_init_socks_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_ctl_init_socks_c
--- patches/patch-modules_ctl_init_socks_c 15 Sep 2012 12:16:18 -0000
1.1
+++ patches/patch-modules_ctl_init_socks_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_ctl_init_socks_c,v 1.1 2012/09/15 12:16:18 sthen Exp $
---- modules/ctl/init_socks.c.orig Sun Jul 29 23:51:54 2012
-+++ modules/ctl/init_socks.c Sun Jul 29 23:52:30 2012
-@@ -96,9 +96,9 @@ int init_unix_sock(struct sockaddr_un* su, char* name,
+--- modules/ctl/init_socks.c.orig Fri Oct 2 15:35:17 2015
++++ modules/ctl/init_socks.c Mon Oct 19 14:00:40 2015
+@@ -85,9 +85,9 @@ int init_unix_sock(struct sockaddr_un* su, char* name,
unlink(name);
memset(&ifsun, 0, sizeof (struct sockaddr_un));
len=strlen(name);
Index: patches/patch-modules_db_berkeley_Makefile
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_db_berkeley_Makefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_db_berkeley_Makefile
--- patches/patch-modules_db_berkeley_Makefile 22 Apr 2012 21:44:24 -0000
1.1
+++ patches/patch-modules_db_berkeley_Makefile 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_db_berkeley_Makefile,v 1.1 2012/04/22 21:44:24 sthen
Exp $
---- modules/db_berkeley/Makefile.orig Tue Jan 31 16:47:40 2012
-+++ modules/db_berkeley/Makefile Fri Feb 3 15:24:29 2012
-@@ -11,10 +11,10 @@ NAME=db_berkeley.so
+--- modules/db_berkeley/Makefile.orig Fri Oct 2 15:35:17 2015
++++ modules/db_berkeley/Makefile Mon Oct 19 14:00:40 2015
+@@ -10,10 +10,10 @@ NAME=db_berkeley.so
# extra debug messages
# -DBDB_EXTRA_DEBUG is optional
DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include
-I$(LOCALBASE)/BerkeleyDB.4.6/include \
@@ -14,7 +14,7 @@ $OpenBSD: patch-modules_db_berkeley_Make
SERLIBPATH=../../lib
SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1
$(SERLIBPATH)/kmi/kmi
-@@ -25,7 +25,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
+@@ -24,7 +24,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
# extra install for kamailio
install-berkeley-scripts: $(bin_prefix)/$(bin_dir)
Index: patches/patch-modules_db_berkeley_bdb_lib_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_db_berkeley_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_db_berkeley_bdb_lib_c
--- patches/patch-modules_db_berkeley_bdb_lib_c 9 May 2012 21:27:47 -0000
1.1
+++ patches/patch-modules_db_berkeley_bdb_lib_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_db_berkeley_bdb_lib_c,v 1.1 2012/05/09 21:27:47 sthen
Exp $
---- modules/db_berkeley/bdb_lib.c.orig Mon Apr 23 19:38:24 2012
-+++ modules/db_berkeley/bdb_lib.c Mon Apr 23 19:38:50 2012
-@@ -671,7 +671,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+--- modules/db_berkeley/bdb_lib.c.orig Fri Oct 2 15:35:17 2015
++++ modules/db_berkeley/bdb_lib.c Mon Oct 19 14:00:40 2015
+@@ -666,7 +666,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
{
char *s;
char fn[1024];
@@ -10,7 +10,7 @@ $OpenBSD: patch-modules_db_berkeley_bdb_
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -691,7 +691,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+@@ -686,7 +686,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
s+=_tp->name.len;
t = localtime( &tim );
Index: patches/patch-modules_db_berkeley_km_bdb_lib_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_db_berkeley_km_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_db_berkeley_km_bdb_lib_c
--- patches/patch-modules_db_berkeley_km_bdb_lib_c 9 May 2012 21:27:47
-0000 1.1
+++ patches/patch-modules_db_berkeley_km_bdb_lib_c 20 Nov 2015 07:20:14
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_db_berkeley_km_bdb_lib_c,v 1.1 2012/05/09 21:27:47
sthen Exp $
---- modules/db_berkeley/km_bdb_lib.c.orig Mon Apr 23 07:29:39 2012
-+++ modules/db_berkeley/km_bdb_lib.c Mon Apr 23 07:30:26 2012
-@@ -724,7 +724,7 @@ int km_bdblib_create_journal(table_p _tp)
+--- modules/db_berkeley/km_bdb_lib.c.orig Fri Oct 2 15:35:17 2015
++++ modules/db_berkeley/km_bdb_lib.c Mon Oct 19 14:00:40 2015
+@@ -719,7 +719,7 @@ int km_bdblib_create_journal(table_p _tp)
{
char *s;
char fn[1024];
@@ -10,7 +10,7 @@ $OpenBSD: patch-modules_db_berkeley_km_b
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -745,7 +745,7 @@ int km_bdblib_create_journal(table_p _tp)
+@@ -740,7 +740,7 @@ int km_bdblib_create_journal(table_p _tp)
s+=_tp->name.len;
t = localtime( &tim );
Index: patches/patch-modules_db_mysql_my_cmd_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_db_mysql_my_cmd_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-modules_db_mysql_my_cmd_c
--- patches/patch-modules_db_mysql_my_cmd_c 15 Sep 2012 12:16:18 -0000
1.2
+++ patches/patch-modules_db_mysql_my_cmd_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_db_mysql_my_cmd_c,v 1.2 2012/09/15 12:16:18 sthen Exp $
---- modules/db_mysql/my_cmd.c.orig Mon Jun 18 14:36:10 2012
-+++ modules/db_mysql/my_cmd.c Sat Jul 28 12:32:54 2012
-@@ -29,7 +29,7 @@
+--- modules/db_mysql/my_cmd.c.orig Fri Oct 2 15:35:17 2015
++++ modules/db_mysql/my_cmd.c Mon Oct 19 14:00:40 2015
+@@ -24,7 +24,7 @@
*/
/* the following macro will break the compile on solaris */
@@ -10,7 +10,7 @@ $OpenBSD: patch-modules_db_mysql_my_cmd_
#define _XOPEN_SOURCE 4 /* bsd */
#endif
#define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
-@@ -47,6 +47,7 @@
+@@ -42,6 +42,7 @@
#include "../../ut.h"
#include "../../dprint.h"
Index: patches/patch-modules_db_postgres_Makefile
===================================================================
RCS file: patches/patch-modules_db_postgres_Makefile
diff -N patches/patch-modules_db_postgres_Makefile
--- patches/patch-modules_db_postgres_Makefile 22 Apr 2012 21:44:24 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_db_postgres_Makefile,v 1.1 2012/04/22 21:44:24 sthen
Exp $
---- modules/db_postgres/Makefile.orig Fri Feb 3 15:08:40 2012
-+++ modules/db_postgres/Makefile Fri Feb 3 15:09:06 2012
-@@ -40,7 +40,7 @@ ifeq ($(INSTALL_FLAVOUR),kamailio)
- # extra install for kamailio
-
- install-pgsql-scripts: $(bin_prefix)/$(bin_dir)
-- PGSQLON=yes make -C ../../utils/kamctl/ install-modules
-+ PGSQLON=yes $(MAKE) -C ../../utils/kamctl/ install-modules
-
- install-scripts: install-pgsql-scripts
-
Index: patches/patch-modules_dmq_usrloc_usrloc_sync_c
===================================================================
RCS file: patches/patch-modules_dmq_usrloc_usrloc_sync_c
diff -N patches/patch-modules_dmq_usrloc_usrloc_sync_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_dmq_usrloc_usrloc_sync_c 20 Nov 2015 07:20:14
-0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- modules/dmq_usrloc/usrloc_sync.c.orig Wed Oct 21 00:58:01 2015
++++ modules/dmq_usrloc/usrloc_sync.c Wed Oct 21 01:01:22 2015
+@@ -278,8 +278,8 @@ int usrloc_dmq_handle_msg(struct sip_msg* msg, peer_re
+ srjson_t *it = NULL;
+ static ucontact_info_t ci;
+
+- int action, expires, cseq, flags, cflags, q, last_modified, methods,
reg_id;
+- str aor, ruid, c, received, path, callid, user_agent, instance;
++ int action = 0, expires = 0, cseq = 0, flags = 0, cflags = 0, q = 0,
last_modified = 0, methods = 0, reg_id = 0;
++ str aor = {NULL, 0}, ruid = {NULL, 0}, c, received = {NULL, 0}, path,
callid, user_agent, instance = {NULL, 0};
+
+ parse_from_header(msg);
+ body = ((struct to_body*)msg->from->parsed)->uri;
Index: patches/patch-modules_lcr_lcr_mod_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-modules_lcr_lcr_mod_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_lcr_lcr_mod_c
--- patches/patch-modules_lcr_lcr_mod_c 22 Apr 2012 21:44:24 -0000 1.1
+++ patches/patch-modules_lcr_lcr_mod_c 20 Nov 2015 07:20:14 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-modules_lcr_lcr_mod_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
---- modules/lcr/lcr_mod.c.orig Sun Apr 22 22:24:08 2012
-+++ modules/lcr/lcr_mod.c Sun Apr 22 22:24:28 2012
+--- modules/lcr/lcr_mod.c.orig Fri Oct 2 15:35:19 2015
++++ modules/lcr/lcr_mod.c Wed Oct 21 00:44:53 2015
@@ -55,6 +55,9 @@
* least cost rules). Each such instance has its own LCR identifier.
*/
@@ -11,3 +11,18 @@ $OpenBSD: patch-modules_lcr_lcr_mod_c,v
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+@@ -2049,10 +2052,11 @@ static int generate_uris(struct sip_msg* _m, char *r_u
+ {
+ int_str gw_uri_val;
+ struct usr_avp *gu_avp;
+- str scheme, prefix, hostname, port, params, transport, addr_str,
+- tmp_tag;
++ str scheme = {NULL, 0}, prefix = {NULL, 0}, hostname = {NULL, 0},
++ port = {NULL, 0}, params = {NULL, 0}, transport = {NULL, 0},
++ addr_str, tmp_tag = {NULL, 0};
+ char *at;
+- unsigned int strip;
++ unsigned int strip = 0;
+
+ gu_avp = search_first_avp(gw_uri_avp_type, gw_uri_avp, &gw_uri_val, 0);
+
Index: patches/patch-modules_mediaproxy_mediaproxy_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_mediaproxy_mediaproxy_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_mediaproxy_mediaproxy_c
--- patches/patch-modules_mediaproxy_mediaproxy_c 22 Apr 2012 21:44:24
-0000 1.1
+++ patches/patch-modules_mediaproxy_mediaproxy_c 20 Nov 2015 07:20:14
-0000
@@ -1,8 +1,8 @@
$OpenBSD: patch-modules_mediaproxy_mediaproxy_c,v 1.1 2012/04/22 21:44:24
sthen Exp $
---- modules/mediaproxy/mediaproxy.c.orig Sun Apr 22 22:26:56 2012
-+++ modules/mediaproxy/mediaproxy.c Sun Apr 22 22:27:32 2012
+--- modules/mediaproxy/mediaproxy.c.orig Fri Oct 2 15:35:18 2015
++++ modules/mediaproxy/mediaproxy.c Mon Oct 19 14:00:40 2015
@@ -19,6 +19,9 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
*/
+#include <sys/types.h>
Index: patches/patch-modules_mi_xmlrpc_abyss_data_h
===================================================================
RCS file: patches/patch-modules_mi_xmlrpc_abyss_data_h
diff -N patches/patch-modules_mi_xmlrpc_abyss_data_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_mi_xmlrpc_abyss_data_h 20 Nov 2015 07:20:14
-0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- modules/mi_xmlrpc/abyss_data.h.orig Mon Oct 19 16:30:34 2015
++++ modules/mi_xmlrpc/abyss_data.h Mon Oct 19 16:30:44 2015
+@@ -3,7 +3,7 @@
+
+ #include "abyss_thread.h"
+
+-#ifndef XMLRPC_OLD_VERSION
++#ifdef XMLRPC_OLD_VERSION
+ #define MAX_CONN 16
+ typedef struct
+ {
Index: patches/patch-modules_nat_traversal_nat_traversal_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_nat_traversal_nat_traversal_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_nat_traversal_nat_traversal_c
--- patches/patch-modules_nat_traversal_nat_traversal_c 16 Apr 2013 11:13:04
-0000 1.1
+++ patches/patch-modules_nat_traversal_nat_traversal_c 20 Nov 2015 07:20:14
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_nat_traversal_nat_traversal_c,v 1.1 2013/04/16
11:13:04 sthen Exp $
---- modules/nat_traversal/nat_traversal.c.orig Sun Mar 31 13:52:19 2013
-+++ modules/nat_traversal/nat_traversal.c Sun Mar 31 13:54:27 2013
-@@ -1643,7 +1643,7 @@ static void
+--- modules/nat_traversal/nat_traversal.c.orig Fri Oct 2 15:35:18 2015
++++ modules/nat_traversal/nat_traversal.c Mon Oct 19 14:00:40 2015
+@@ -1662,7 +1662,7 @@ static void
restore_keepalive_state(void)
{
char uri[64], socket[64];
@@ -10,7 +10,7 @@ $OpenBSD: patch-modules_nat_traversal_na
NAT_Contact *contact;
struct socket_info *sock;
int port, proto, res;
-@@ -1661,7 +1661,7 @@ restore_keepalive_state(void)
+@@ -1680,7 +1680,7 @@ restore_keepalive_state(void)
return;
}
Index: patches/patch-modules_nathelper_nathelper_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_nathelper_nathelper_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_nathelper_nathelper_c
--- patches/patch-modules_nathelper_nathelper_c 16 Apr 2013 11:13:04 -0000
1.1
+++ patches/patch-modules_nathelper_nathelper_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_nathelper_nathelper_c,v 1.1 2013/04/16 11:13:04 sthen
Exp $
---- modules/nathelper/nathelper.c.orig Sun Mar 31 14:42:56 2013
-+++ modules/nathelper/nathelper.c Sun Mar 31 14:44:27 2013
-@@ -1575,7 +1575,7 @@ replace_sdp_ip(struct sip_msg* msg, str *org_body, cha
+--- modules/nathelper/nathelper.c.orig Fri Oct 2 15:35:19 2015
++++ modules/nathelper/nathelper.c Mon Oct 19 14:00:40 2015
+@@ -1656,7 +1656,7 @@ replace_sdp_ip(struct sip_msg* msg, str *org_body, cha
str body1, oldip, newip;
str body = *org_body;
unsigned hasreplaced = 0;
Index: patches/patch-modules_p_usrloc_ul_db_h
===================================================================
RCS file: patches/patch-modules_p_usrloc_ul_db_h
diff -N patches/patch-modules_p_usrloc_ul_db_h
--- patches/patch-modules_p_usrloc_ul_db_h 16 Apr 2013 11:13:04 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_p_usrloc_ul_db_h,v 1.1 2013/04/16 11:13:04 sthen Exp $
---- modules/p_usrloc/ul_db.h.orig Sun Mar 31 13:56:42 2013
-+++ modules/p_usrloc/ul_db.h Sun Mar 31 13:57:04 2013
-@@ -38,7 +38,7 @@
- #define DB_POL_QUERY 1
- #define DB_POL_MOD 2
-
--#ifdef __i386__
-+#if defined(__i386__) || defined(__OpenBSD__)
- #define UL_DB_ZERO_TIME 0x80000000
- #else
- #define UL_DB_ZERO_TIME 0xFFFFFFFF80000000
Index: patches/patch-modules_pv_pv_time_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-modules_pv_pv_time_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_pv_pv_time_c
--- patches/patch-modules_pv_pv_time_c 16 Apr 2013 11:13:04 -0000 1.1
+++ patches/patch-modules_pv_pv_time_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_pv_pv_time_c,v 1.1 2013/04/16 11:13:04 sthen Exp $
---- modules/pv/pv_time.c.orig Sun Mar 31 14:53:52 2013
-+++ modules/pv/pv_time.c Sun Mar 31 14:55:46 2013
-@@ -117,7 +117,7 @@ int pv_get_time(struct sip_msg *msg, pv_param_t *param
+--- modules/pv/pv_time.c.orig Fri Oct 2 15:35:19 2015
++++ modules/pv/pv_time.c Mon Oct 19 14:00:40 2015
+@@ -115,7 +115,7 @@ int pv_get_time(struct sip_msg *msg, pv_param_t *param
{
msg_set_time(msg);
msg_ctx_id_set(msg, &_cfgutils_msgid);
@@ -10,7 +10,7 @@ $OpenBSD: patch-modules_pv_pv_time_c,v 1
{
LM_ERR("unable to break time to attributes\n");
return -1;
-@@ -168,7 +168,7 @@ int pv_get_strftime(struct sip_msg *msg, pv_param_t *p
+@@ -166,7 +166,7 @@ int pv_get_strftime(struct sip_msg *msg, pv_param_t *p
{
msg_set_time(msg);
msg_ctx_id_set(msg, &_cfgutils_msgid);
@@ -19,7 +19,7 @@ $OpenBSD: patch-modules_pv_pv_time_c,v 1
{
LM_ERR("unable to break time to attributes\n");
return -1;
-@@ -225,7 +225,7 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *para
+@@ -223,7 +223,7 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *para
msg_set_time(msg);
Index: patches/patch-modules_rls_utils_c
===================================================================
RCS file: patches/patch-modules_rls_utils_c
diff -N patches/patch-modules_rls_utils_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_rls_utils_c 20 Nov 2015 07:20:14 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- modules/rls/utils.c.orig Wed Oct 21 00:09:23 2015
++++ modules/rls/utils.c Wed Oct 21 00:14:37 2015
+@@ -26,14 +26,14 @@
+ #define SIP_PREFIX "sip:"
+ #define SIP_PREFIX_LEN sizeof(SIP_PREFIX)-1
+
+-str* normalize_sip_uri(const str *uri)
++str* normalize_sip_uri(str *uri)
+ {
+ static str normalized_uri;
+ static str null_str = {NULL, 0};
+ static char buf[MAX_URI_SIZE];
+
+ normalized_uri.s = buf;
+- if (un_escape((str *)uri, &normalized_uri) < 0)
++ if (un_escape(uri, &normalized_uri) < 0)
+ {
+ LM_ERR("un-escaping URI\n");
+ return &null_str;
Index: patches/patch-modules_rls_utils_h
===================================================================
RCS file: patches/patch-modules_rls_utils_h
diff -N patches/patch-modules_rls_utils_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_rls_utils_h 20 Nov 2015 07:20:14 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- modules/rls/utils.h.orig Wed Oct 21 00:14:47 2015
++++ modules/rls/utils.h Wed Oct 21 00:15:06 2015
+@@ -26,6 +26,6 @@
+
+ #include "../../ut.h"
+
+-extern str* normalize_sip_uri(const str *uri);
++extern str* normalize_sip_uri(str *uri);
+
+ #endif
Index: patches/patch-modules_sca_sca_subscribe_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_sca_sca_subscribe_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_sca_sca_subscribe_c
--- patches/patch-modules_sca_sca_subscribe_c 16 Apr 2013 11:13:04 -0000
1.1
+++ patches/patch-modules_sca_sca_subscribe_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_sca_sca_subscribe_c,v 1.1 2013/04/16 11:13:04 sthen
Exp $
---- modules/sca/sca_subscribe.c.orig Mon Mar 11 17:27:19 2013
-+++ modules/sca/sca_subscribe.c Sun Mar 31 16:03:23 2013
-@@ -82,7 +82,7 @@ sca_subscription_purge_expired( unsigned int ticks, vo
+--- modules/sca/sca_subscribe.c.orig Fri Oct 2 15:35:18 2015
++++ modules/sca/sca_subscribe.c Mon Oct 19 14:00:40 2015
+@@ -78,7 +78,7 @@ sca_subscription_purge_expired( unsigned int ticks, vo
sca_hash_table *ht;
sca_hash_entry *ent, *ent_tmp;
sca_subscription *sub;
@@ -10,7 +10,7 @@ $OpenBSD: patch-modules_sca_sca_subscrib
int state;
int i;
-@@ -250,7 +250,7 @@ sca_subscriptions_restore_from_db( sca_mod *scam )
+@@ -246,7 +246,7 @@ sca_subscriptions_restore_from_db( sca_mod *scam )
int i;
int idx;
int rc = -1;
@@ -19,7 +19,7 @@ $OpenBSD: patch-modules_sca_sca_subscrib
db_con = scam->db_api->init( scam->cfg->db_url );
if ( db_con == NULL ) {
-@@ -445,7 +445,7 @@ sca_subscription_db_delete_expired( db1_con_t *db_con
+@@ -456,7 +456,7 @@ sca_subscription_db_delete_expired( db1_con_t *db_con
db_key_t delete_columns[ 1 ];
db_val_t delete_values[ 1 ];
db_op_t delete_ops[ 1 ];
@@ -28,7 +28,7 @@ $OpenBSD: patch-modules_sca_sca_subscrib
int kv_count = 0;
delete_columns[ 0 ] = (str *)&SCA_DB_EXPIRES_COL_NAME;
-@@ -473,7 +473,7 @@ sca_subscription_db_update( void )
+@@ -484,7 +484,7 @@ sca_subscription_db_update( void )
sca_subscription *sub;
int i;
int rc = -1;
Index: patches/patch-modules_sca_sca_subscribe_h
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_sca_sca_subscribe_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_sca_sca_subscribe_h
--- patches/patch-modules_sca_sca_subscribe_h 16 Apr 2013 11:13:04 -0000
1.1
+++ patches/patch-modules_sca_sca_subscribe_h 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_sca_sca_subscribe_h,v 1.1 2013/04/16 11:13:04 sthen
Exp $
---- modules/sca/sca_subscribe.h.orig Sun Mar 31 15:51:58 2013
-+++ modules/sca/sca_subscribe.h Sun Mar 31 15:52:17 2013
-@@ -43,7 +43,7 @@ struct _sca_subscription {
+--- modules/sca/sca_subscribe.h.orig Fri Oct 2 15:35:18 2015
++++ modules/sca/sca_subscribe.h Mon Oct 19 14:00:40 2015
+@@ -39,7 +39,7 @@ struct _sca_subscription {
str subscriber; /* contact: user@ip */
str target_aor; /* account of record to watch:
user@domain */
int event; /* "call-info", "line-seize" */
Index: patches/patch-modules_sipcapture_sipcapture_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_sipcapture_sipcapture_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-modules_sipcapture_sipcapture_c
--- patches/patch-modules_sipcapture_sipcapture_c 15 Sep 2012 12:16:18
-0000 1.3
+++ patches/patch-modules_sipcapture_sipcapture_c 20 Nov 2015 07:20:14
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_sipcapture_sipcapture_c,v 1.3 2012/09/15 12:16:18
sthen Exp $
---- modules/sipcapture/sipcapture.c.orig Mon Jul 9 00:10:51 2012
-+++ modules/sipcapture/sipcapture.c Mon Jul 9 00:11:30 2012
-@@ -48,6 +48,7 @@
+--- modules/sipcapture/sipcapture.c.orig Fri Oct 2 15:35:19 2015
++++ modules/sipcapture/sipcapture.c Wed Oct 21 01:03:18 2015
+@@ -47,6 +47,7 @@
#ifndef __USE_BSD
#define __USE_BSD /* on linux use bsd version of iphdr (more portable) */
#endif /* __USE_BSD */
@@ -9,3 +9,21 @@ $OpenBSD: patch-modules_sipcapture_sipca
#include <netinet/ip.h>
#define __FAVOR_BSD /* on linux use bsd version of udphdr (more portable) */
#include <netinet/udp.h>
+@@ -1085,7 +1086,7 @@ static int sip_capture_store(struct _sipcapture_object
+ db_key_t db_keys[NR_KEYS];
+ db_val_t db_vals[NR_KEYS];
+
+- str tmp, corrtmp;
++ str tmp, corrtmp = {NULL, 0};
+ int ii = 0;
+ int ret = 0;
+ int counter = 0;
+@@ -2056,7 +2057,7 @@ int receive_logging_json_msg(char * buf, unsigned int
+ struct timezone tz;
+ time_t epoch_time_as_time_t;
+
+- str tmp, corrtmp, table;
++ str tmp, corrtmp = {NULL, 0}, table;
+ _capture_mode_data_t *c = NULL;
+
+ c = capture_def;
Index: patches/patch-modules_snmpstats_Makefile
===================================================================
RCS file: patches/patch-modules_snmpstats_Makefile
diff -N patches/patch-modules_snmpstats_Makefile
--- patches/patch-modules_snmpstats_Makefile 16 Apr 2013 11:13:04 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_snmpstats_Makefile,v 1.1 2013/04/16 11:13:04 sthen Exp
$
---- modules/snmpstats/Makefile.orig Sun Mar 31 19:29:40 2013
-+++ modules/snmpstats/Makefile Sun Mar 31 19:30:05 2013
-@@ -27,7 +27,7 @@ SERLIBPATH=../../lib
- SER_LIBS+=$(SERLIBPATH)/kcore/kcore
- include ../../Makefile.modules
-
--install_module_custom:
-+install-scripts:
- echo "installing mibs ..."
- mkdir -p $(INSTALLMIBDIR)
- $(INSTALL_CFG) mibs/KAMAILIO* $(INSTALLMIBDIR)
Index: patches/patch-modules_tls_tls_init_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-modules_tls_tls_init_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_tls_tls_init_c
--- patches/patch-modules_tls_tls_init_c 18 Jul 2015 19:59:48 -0000
1.1
+++ patches/patch-modules_tls_tls_init_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_tls_tls_init_c,v 1.1 2015/07/18 19:59:48 jca Exp $
---- modules/tls/tls_init.c.orig Mon Mar 11 09:27:18 2013
-+++ modules/tls/tls_init.c Sat Jul 18 12:09:30 2015
-@@ -347,9 +347,11 @@ static void init_ssl_methods(void)
+--- modules/tls/tls_init.c.orig Fri Oct 2 15:35:18 2015
++++ modules/tls/tls_init.c Mon Oct 19 15:14:01 2015
+@@ -344,9 +344,11 @@ static void init_ssl_methods(void)
ssl_methods[TLS_USE_SSLv2 - 1] = SSLv2_method();
#endif
@@ -10,6 +10,6 @@ $OpenBSD: patch-modules_tls_tls_init_c,v
ssl_methods[TLS_USE_SSLv3_srv - 1] = SSLv3_server_method();
ssl_methods[TLS_USE_SSLv3 - 1] = SSLv3_method();
+#endif
-
+
ssl_methods[TLS_USE_TLSv1_cli - 1] = TLSv1_client_method();
ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method();
Index: patches/patch-modules_tsilo_ts_hash_h
===================================================================
RCS file: patches/patch-modules_tsilo_ts_hash_h
diff -N patches/patch-modules_tsilo_ts_hash_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-modules_tsilo_ts_hash_h 20 Nov 2015 07:20:14 -0000
@@ -0,0 +1,10 @@
+$OpenBSD$
+--- modules/tsilo/ts_hash.h.orig Tue Oct 20 23:40:28 2015
++++ modules/tsilo/ts_hash.h Tue Oct 20 23:40:51 2015
+@@ -175,5 +175,5 @@ ts_transaction_t* clone_ts_transaction(ts_transaction_
+ */
+ void remove_ts_transaction(ts_transaction_t* ts_t);
+
+-void free_ts_transaction(void *ts_t);
++inline void free_ts_transaction(void *ts_t);
+ #endif
Index: patches/patch-modules_websocket_Makefile
===================================================================
RCS file: patches/patch-modules_websocket_Makefile
diff -N patches/patch-modules_websocket_Makefile
--- patches/patch-modules_websocket_Makefile 16 Apr 2013 11:13:04 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_websocket_Makefile,v 1.1 2013/04/16 11:13:04 sthen Exp
$
---- modules/websocket/Makefile.orig Sun Mar 31 17:48:54 2013
-+++ modules/websocket/Makefile Sun Mar 31 17:50:37 2013
-@@ -27,7 +27,7 @@ else
- # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5"
- endif
-
--LIBS+= $(TLS_EXTRA_LIBS) -lunistring
-+LIBS+= $(TLS_EXTRA_LIBS) -L$(LOCALBASE)/lib -lunistring
-
- # Static linking, if you'd like to use TLS and WEBSOCKET at the same time
- #
Index: patches/patch-modules_websocket_ws_handshake_c
===================================================================
RCS file: patches/patch-modules_websocket_ws_handshake_c
diff -N patches/patch-modules_websocket_ws_handshake_c
--- patches/patch-modules_websocket_ws_handshake_c 16 Apr 2013 11:13:04
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-modules_websocket_ws_handshake_c,v 1.1 2013/04/16 11:13:04
sthen Exp $
---- modules/websocket/ws_handshake.c.orig Sun Mar 31 17:56:22 2013
-+++ modules/websocket/ws_handshake.c Sun Mar 31 17:56:38 2013
-@@ -114,7 +114,7 @@ int ws_handle_handshake(struct sip_msg *msg)
- str key = {0, 0}, headers = {0, 0}, reply_key = {0, 0};
- unsigned char sha1[SHA_DIGEST_LENGTH];
- unsigned int hdr_flags = 0, sub_protocol = 0;
-- int version;
-+ int version = 0;
- struct hdr_field *hdr = msg->headers;
- struct tcp_connection *con;
- ws_connection_t *wsc;
Index: patches/patch-modules_xhttp_pi_xhttp_pi_fnc_c
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-modules_xhttp_pi_xhttp_pi_fnc_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-modules_xhttp_pi_xhttp_pi_fnc_c
--- patches/patch-modules_xhttp_pi_xhttp_pi_fnc_c 16 Apr 2013 11:13:04
-0000 1.1
+++ patches/patch-modules_xhttp_pi_xhttp_pi_fnc_c 20 Nov 2015 07:20:14
-0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-modules_xhttp_pi_xhttp_pi_fnc_c,v 1.1 2013/04/16 11:13:04
sthen Exp $
---- modules/xhttp_pi/xhttp_pi_fnc.c.orig Sun Mar 31 18:12:15 2013
-+++ modules/xhttp_pi/xhttp_pi_fnc.c Sun Mar 31 18:13:17 2013
-@@ -2814,7 +2814,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+--- modules/xhttp_pi/xhttp_pi_fnc.c.orig Fri Oct 2 15:35:18 2015
++++ modules/xhttp_pi/xhttp_pi_fnc.c Mon Oct 19 14:00:40 2015
+@@ -3178,7 +3178,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
if(db_time2str(values[j].val.time_val,
val_str.s, &val_str.len)!=0){
LM_ERR("Unable to
convert double [%ld]\n",
@@ -10,7 +10,7 @@ $OpenBSD: patch-modules_xhttp_pi_xhttp_p
goto error;
}
p += val_str.len;
-@@ -2823,7 +2823,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+@@ -3188,7 +3188,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
"[%ld][%.*s]\n",
command->q_keys[j]->len,
command->q_keys[j]->s,
i,
Index: patches/patch-msg_translator_c
===================================================================
RCS file: patches/patch-msg_translator_c
diff -N patches/patch-msg_translator_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-msg_translator_c 20 Nov 2015 07:20:14 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- msg_translator.c.orig Fri Oct 2 15:35:19 2015
++++ msg_translator.c Wed Oct 21 00:05:06 2015
+@@ -520,7 +520,11 @@ static inline int lump_check_opt( struct lump *l,
+ return 1;
+ }
+ case COND_IF_RAND:
++#ifdef HAVE_ARC4RANDOM
++ if(arc4random()>=RAND_MAX/2) {
++#else
+ if(rand()>=RAND_MAX/2) {
++#endif
+ LUMP_SET_COND_TRUE(l);
+ return 1;
+ } else return 0;
+@@ -2284,6 +2288,7 @@ char * build_res_buf_from_sip_req( unsigned int code,
+
+ body = 0;
+ buf=0;
++ pvia=0;
+ received_buf=rport_buf=warning_buf=content_len_buf=0;
+ received_len=rport_len=warning_len=content_len_len=0;
+
Index: patches/patch-pt_c
===================================================================
RCS file: patches/patch-pt_c
diff -N patches/patch-pt_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-pt_c 20 Nov 2015 07:20:14 -0000
@@ -0,0 +1,71 @@
+$OpenBSD$
+--- pt.c.orig Fri Oct 2 15:35:18 2015
++++ pt.c Tue Oct 20 23:45:46 2015
+@@ -244,8 +244,10 @@ int fork_process(int child_id, char *desc, int make_so
+ {
+ int pid, child_process_no;
+ int ret;
++#ifndef HAVE_ARC4RANDOM
+ unsigned int new_seed1;
+ unsigned int new_seed2;
++#endif
+ #ifdef USE_TCP
+ int sockfd[2];
+ #endif
+@@ -284,8 +286,10 @@ int fork_process(int child_id, char *desc, int make_so
+
+
+ child_process_no = *process_count;
++#ifndef HAVE_ARC4RANDOM
+ new_seed1=rand();
+ new_seed2=random();
++#endif
+ pid = fork();
+ if (pid<0) {
+ lock_release(process_lock);
+@@ -300,9 +304,11 @@ int fork_process(int child_id, char *desc, int make_so
+ #ifdef USE_TCP
+ close_extra_socks(child_id, process_no);
+ #endif /* USE_TCP */
++#ifndef HAVE_ARC4RANDOM
+ srand(new_seed1);
+ fastrand_seed(rand());
+ srandom(new_seed2+time(0));
++#endif
+ shm_malloc_on_fork();
+ #ifdef PROFILING
+ monstartup((u_long) &_start, (u_long) &etext);
+@@ -379,8 +385,10 @@ int fork_tcp_process(int child_id, char *desc, int r,
+ int reader_fd[2]; /* for comm. with the tcp children read */
+ int ret;
+ int i;
++#ifndef HAVE_ARC4RANDOM
+ unsigned int new_seed1;
+ unsigned int new_seed2;
++#endif
+
+ /* init */
+ sockfd[0]=sockfd[1]=-1;
+@@ -419,8 +427,10 @@ int fork_tcp_process(int child_id, char *desc, int r,
+
+
+ child_process_no = *process_count;
++#ifndef HAVE_ARC4RANDOM
+ new_seed1=rand();
+ new_seed2=random();
++#endif
+ pid = fork();
+ if (pid<0) {
+ lock_release(process_lock);
+@@ -442,9 +452,11 @@ int fork_tcp_process(int child_id, char *desc, int r,
+ }
+ }
+ daemon_status_on_fork_cleanup();
++#ifndef HAVE_ARC4RANDOM
+ srand(new_seed1);
+ fastrand_seed(rand());
+ srandom(new_seed2+time(0));
++#endif
+ shm_malloc_on_fork();
+ #ifdef PROFILING
+ monstartup((u_long) &_start, (u_long) &etext);
Index: patches/patch-rand_fastrand_c
===================================================================
RCS file: patches/patch-rand_fastrand_c
diff -N patches/patch-rand_fastrand_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-rand_fastrand_c 20 Nov 2015 07:20:14 -0000
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- rand/fastrand.c.orig Fri Oct 2 15:35:18 2015
++++ rand/fastrand.c Wed Oct 21 00:26:56 2015
+@@ -25,6 +25,18 @@
+ #include "fastrand.h"
+
+ #include <stdlib.h>
++
++#ifdef HAVE_ARC4RANDOM
++unsigned int fastrand()
++{
++ return arc4random();
++}
++
++unsigned int fastrand_max(unsigned int max)
++{
++ return arc4random_uniform(max+1);
++}
++#else
+ #include "isaac/rand.h"
+
+ #define FASTRAND_MAX ((unsigned int)(-1))
+@@ -54,3 +66,4 @@ unsigned int fastrand_max(unsigned int max)
+ {
+ return fastrand()%(max+1);
+ }
++#endif
Index: patches/patch-rand_fastrand_h
===================================================================
RCS file: patches/patch-rand_fastrand_h
diff -N patches/patch-rand_fastrand_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-rand_fastrand_h 20 Nov 2015 07:20:14 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- rand/fastrand.h.orig Wed Oct 21 00:27:08 2015
++++ rand/fastrand.h Wed Oct 21 00:27:38 2015
+@@ -22,9 +22,10 @@
+ #ifndef _fastrand_h
+ #define _fastrand_h
+
+-
++#ifndef HAVE_ARC4RANDOM
+ /* side effect: seeds also random w/ seed */
+ void fastrand_seed(unsigned int seed);
++#endif
+ /* generate a 32 bit random number */
+ unsigned int fastrand(void);
+ /* generate a random number between 0 and max inclusive ( 0 <= r <= max)
Index: patches/patch-select_core_c
===================================================================
RCS file: patches/patch-select_core_c
diff -N patches/patch-select_core_c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-select_core_c 20 Nov 2015 07:20:14 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- select_core.c.orig Wed Oct 21 00:28:31 2015
++++ select_core.c Wed Oct 21 00:29:26 2015
+@@ -1512,7 +1512,11 @@ int select_sys_unique(str* res, select_t* s, struct si
+ for (i = UNIQUE_ID_FIX_LEN, cb = 0, x = 0; i <
UNIQUE_ID_FIX_LEN+UNIQUE_ID_RAND_LEN; i++) {
+ if (!cb) {
+ cb = rb;
++#ifdef HAVE_ARC4RANDOM
++ x = arc4random();
++#else
+ x = rand();
++#endif
+ }
+ uniq_id[i] = fourbits2char[x & 0x0F];
+ x >>= rb;
Index: patches/patch-sip_msg_clone_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-sip_msg_clone_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-sip_msg_clone_c
--- patches/patch-sip_msg_clone_c 16 Apr 2013 11:13:04 -0000 1.1
+++ patches/patch-sip_msg_clone_c 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-sip_msg_clone_c,v 1.1 2013/04/16 11:13:04 sthen Exp $
---- sip_msg_clone.c.orig Sun Mar 31 13:50:02 2013
-+++ sip_msg_clone.c Sun Mar 31 13:50:27 2013
-@@ -193,7 +193,7 @@ static inline struct via_body* via_body_cloner( char*
+--- sip_msg_clone.c.orig Fri Oct 2 15:35:18 2015
++++ sip_msg_clone.c Mon Oct 19 14:00:40 2015
+@@ -183,7 +183,7 @@ static inline struct via_body* via_body_cloner( char*
if ( org_via->param_lst )
{
Index: patches/patch-timer_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-timer_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-timer_c
--- patches/patch-timer_c 22 Apr 2012 21:44:24 -0000 1.1
+++ patches/patch-timer_c 20 Nov 2015 07:20:14 -0000
@@ -1,30 +1,15 @@
-$OpenBSD: patch-timer_c,v 1.1 2012/04/22 21:44:24 sthen Exp $
---- timer.c.orig Sun Feb 5 00:24:53 2012
-+++ timer.c Sun Feb 5 00:33:11 2012
-@@ -337,7 +337,7 @@ again:
- strerror(errno), errno);
- goto error;
- }
--#ifdef __OS_darwin
-+#if defined(__OS_darwin) || defined(__OpenBSD__)
- /* workaround for darwin sigwait bug, see slow_timer_main() for more
- info (or grep __OS_darwin) */
- /* keep in sync wih main.c: sig_usr() - signals we are interested in */
-@@ -1090,7 +1090,7 @@ ticks_t get_ticks()
- * -it increments *s_idx (at the end it will be == *t_idx)
- * -all list operations are protected by the "slow" timer lock
- */
--#ifdef __OS_darwin
-+#if defined(__OS_darwin) || defined(__OpenBSD__)
- extern void sig_usr(int signo);
- #endif
+$OpenBSD$
+--- timer.c.orig Wed Oct 21 00:01:29 2015
++++ timer.c Wed Oct 21 00:02:57 2015
+@@ -243,7 +243,11 @@ int init_timer()
-@@ -1120,7 +1120,7 @@ void slow_timer_main()
- }
- #ifdef USE_SIGWAIT
- if (sig!=SLOW_TIMER_SIG){
--#ifdef __OS_darwin
-+#if defined(__OS_darwin) || defined(__OpenBSD__)
- /* on darwin sigwait is buggy: it will cause extreme slow down
- on signal delivery for the signals it doesn't wait on
- (on darwin 8.8.0, g4 1.5Ghz I've measured a 36s delay!).
+ /* initial values */
+ memset(timer_lst, 0, sizeof(struct timer_lists));
++#ifdef HAVE_ARC4RANDOM
++ *ticks=arc4random();
++#else
+ *ticks=random(); /* random value for start, for debugging */
++#endif
+ prev_ticks=last_ticks=last_adj_check=*ticks;
+ *running_timer=0;
+ if (gettimeofday(&start_time, 0)<0){
Index: patches/patch-utils_kamctl_kamctl
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctl,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-utils_kamctl_kamctl
--- patches/patch-utils_kamctl_kamctl 16 Apr 2013 11:13:04 -0000 1.3
+++ patches/patch-utils_kamctl_kamctl 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-utils_kamctl_kamctl,v 1.3 2013/04/16 11:13:04 sthen Exp $
---- utils/kamctl/kamctl.orig Mon Mar 11 17:27:18 2013
-+++ utils/kamctl/kamctl Thu Mar 14 16:14:24 2013
-@@ -56,7 +56,7 @@ fi
+--- utils/kamctl/kamctl.orig Fri Oct 2 15:35:18 2015
++++ utils/kamctl/kamctl Mon Oct 19 14:00:40 2015
+@@ -75,7 +75,7 @@ fi
if [ -f "$MYLIBDIR/kamctl.base" ]; then
. "$MYLIBDIR/kamctl.base"
else
@@ -10,7 +10,7 @@ $OpenBSD: patch-utils_kamctl_kamctl,v 1.
exit -1
fi
-@@ -1800,7 +1800,7 @@ kamailio_stop() {
+@@ -1900,7 +1900,7 @@ kamailio_stop() {
options_ping() {
myhost=`get_my_host`
require_ctlengine
Index: patches/patch-utils_kamctl_kamctl_base
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctl_base,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-utils_kamctl_kamctl_base
--- patches/patch-utils_kamctl_kamctl_base 16 Apr 2013 11:13:04 -0000
1.3
+++ patches/patch-utils_kamctl_kamctl_base 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-utils_kamctl_kamctl_base,v 1.3 2013/04/16 11:13:04 sthen Exp $
---- utils/kamctl/kamctl.base.orig Mon Mar 11 17:27:18 2013
-+++ utils/kamctl/kamctl.base Thu Mar 14 16:14:41 2013
-@@ -501,7 +501,7 @@ EOF
+--- utils/kamctl/kamctl.base.orig Fri Oct 2 15:35:18 2015
++++ utils/kamctl/kamctl.base Mon Oct 19 14:00:40 2015
+@@ -536,7 +536,7 @@ EOF
mdbg() {
if [ "0$VERBOSE" -ne 0 ] ; then
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -10,7 +10,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -510,7 +510,7 @@ mdbg() {
+@@ -545,7 +545,7 @@ mdbg() {
mwarn() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -19,7 +19,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** WARNING: $1"
fi
-@@ -518,7 +518,7 @@ mwarn() {
+@@ -553,7 +553,7 @@ mwarn() {
minfo() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -28,7 +28,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** INFO: $1"
fi
-@@ -526,7 +526,7 @@ minfo() {
+@@ -561,7 +561,7 @@ minfo() {
mecho() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -37,7 +37,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -534,7 +534,7 @@ mecho() {
+@@ -569,7 +569,7 @@ mecho() {
merr() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
Index: patches/patch-utils_kamctl_kamctlrc
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctlrc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-utils_kamctl_kamctlrc
--- patches/patch-utils_kamctl_kamctlrc 16 Apr 2013 11:13:04 -0000 1.2
+++ patches/patch-utils_kamctl_kamctlrc 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-utils_kamctl_kamctlrc,v 1.2 2013/04/16 11:13:04 sthen Exp $
---- utils/kamctl/kamctlrc.orig Mon Mar 11 17:27:18 2013
-+++ utils/kamctl/kamctlrc Thu Mar 14 16:15:00 2013
-@@ -64,7 +64,7 @@
+--- utils/kamctl/kamctlrc.orig Fri Oct 2 15:35:18 2015
++++ utils/kamctl/kamctlrc Mon Oct 19 15:19:01 2015
+@@ -60,7 +60,7 @@
# Program to calculate a message-digest fingerprint
@@ -10,11 +10,11 @@ $OpenBSD: patch-utils_kamctl_kamctlrc,v
# awk tool
# AWK="awk"
-@@ -140,8 +140,11 @@
+@@ -142,8 +142,11 @@
## Kamailio START Options
## PID file path - default is: /var/run/kamailio.pid
--# PID_FILE=/var/run/kamailio.pid
+-# PID_FILE=/var/run/kamailio/kamailio.pid
+PID_FILE=/var/run/kamailio/kamailio.pid
## Extra start options - default is: not set
Index: patches/patch-utils_kamctl_kamdbctl
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamdbctl,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-utils_kamctl_kamdbctl
--- patches/patch-utils_kamctl_kamdbctl 22 Apr 2012 21:44:24 -0000 1.1
+++ patches/patch-utils_kamctl_kamdbctl 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-utils_kamctl_kamdbctl,v 1.1 2012/04/22 21:44:24 sthen Exp $
---- utils/kamctl/kamdbctl.orig Fri Feb 3 16:47:27 2012
-+++ utils/kamctl/kamdbctl Fri Feb 3 16:47:46 2012
-@@ -51,7 +51,7 @@ fi
+--- utils/kamctl/kamdbctl.orig Fri Oct 2 15:35:18 2015
++++ utils/kamctl/kamdbctl Mon Oct 19 14:00:40 2015
+@@ -70,7 +70,7 @@ fi
if [ -f "$MYLIBDIR/kamdbctl.base" ]; then
. "$MYLIBDIR/kamdbctl.base"
else
Index: patches/patch-utils_kamctl_kamdbctl_base
===================================================================
RCS file:
/cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamdbctl_base,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-utils_kamctl_kamdbctl_base
--- patches/patch-utils_kamctl_kamdbctl_base 16 Apr 2013 11:13:04 -0000
1.2
+++ patches/patch-utils_kamctl_kamdbctl_base 20 Nov 2015 07:20:14 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-utils_kamctl_kamdbctl_base,v 1.2 2013/04/16 11:13:04 sthen Exp
$
---- utils/kamctl/kamdbctl.base.orig Mon Mar 11 17:27:18 2013
-+++ utils/kamctl/kamdbctl.base Thu Mar 14 16:15:21 2013
-@@ -157,7 +157,7 @@ credentials()
+--- utils/kamctl/kamdbctl.base.orig Fri Oct 2 15:35:18 2015
++++ utils/kamctl/kamdbctl.base Mon Oct 19 14:00:40 2015
+@@ -154,7 +154,7 @@ credentials()
mdbg() {
if [ "0$VERBOSE" -ne 0 ] ; then
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -10,7 +10,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
else
echo "$1"
fi
-@@ -166,7 +166,7 @@ mdbg() {
+@@ -163,7 +163,7 @@ mdbg() {
mwarn() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -19,7 +19,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
else
echo "** WARNING: $1"
fi
-@@ -174,7 +174,7 @@ mwarn() {
+@@ -171,7 +171,7 @@ mwarn() {
minfo() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -28,7 +28,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
else
echo "** INFO: $1"
fi
-@@ -182,7 +182,7 @@ minfo() {
+@@ -179,7 +179,7 @@ minfo() {
mecho() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -37,7 +37,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
else
echo "$1"
fi
-@@ -190,7 +190,7 @@ mecho() {
+@@ -187,7 +187,7 @@ mecho() {
merr() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -46,7 +46,7 @@ $OpenBSD: patch-utils_kamctl_kamdbctl_ba
else
echo "** ERROR: $1"
fi
-@@ -216,8 +216,8 @@ get_answer ()
+@@ -213,8 +213,8 @@ get_answer ()
else
ANSWER=${value}
fi
Index: patches/patch-utils_sercmd_sercmd_c
===================================================================
RCS file: patches/patch-utils_sercmd_sercmd_c
diff -N patches/patch-utils_sercmd_sercmd_c
--- patches/patch-utils_sercmd_sercmd_c 15 Sep 2012 12:16:18 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,34 +0,0 @@
-$OpenBSD: patch-utils_sercmd_sercmd_c,v 1.1 2012/09/15 12:16:18 sthen Exp $
---- utils/sercmd/sercmd.c.orig Sun Jul 29 23:49:56 2012
-+++ utils/sercmd/sercmd.c Sun Jul 29 23:51:28 2012
-@@ -471,9 +471,9 @@ int connect_unix_sock(char* name, int type)
- s=-1;
- memset(&ifsun, 0, sizeof (struct sockaddr_un));
- len=strlen(name);
-- if (len>UNIX_PATH_MAX){
-+ if (len>sizeof(ifsun.sun_path)){
- fprintf(stderr, "ERROR: connect_unix_sock: name too long "
-- "(%d > %d): %s\n", len, UNIX_PATH_MAX, name);
-+ "(%d > %ld): %s\n", len,
sizeof(ifsun.sun_path), name);
- goto error;
- }
- ifsun.sun_family=AF_UNIX;
-@@ -493,15 +493,15 @@ int connect_unix_sock(char* name, int type)
- if (sock_dir==0)
- sock_dir="/tmp";
- retry:
-- ret=snprintf(mysun.sun_path, UNIX_PATH_MAX, "%s/" NAME
"_%d",
-+ ret=snprintf(mysun.sun_path, sizeof(mysun.sun_path),
"%s/" NAME "_%d",
- sock_dir, rand());
-- if ((ret<0) ||(ret>=UNIX_PATH_MAX)){
-+ if ((ret<0) ||(ret>=sizeof(mysun.sun_path))){
- fprintf(stderr, "ERROR: buffer overflow while
trying to"
- "generate unix datagram
socket name");
- goto error;
- }
- }else{
-- if (strlen(reply_socket)>UNIX_PATH_MAX){
-+ if (strlen(reply_socket)>sizeof(mysun.sun_path)){
- fprintf(stderr, "ERROR: buffer overflow while
trying to"
- "use the provided unix
datagram socket name (%s)",
- reply_socket);
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 16 Apr 2013 11:13:04 -0000 1.4
+++ pkg/PLIST-main 20 Nov 2015 07:20:14 -0000
@@ -32,6 +32,7 @@ lib/kamailio/modules/async.so
lib/kamailio/modules/auth.so
lib/kamailio/modules/auth_db.so
lib/kamailio/modules/auth_diameter.so
+lib/kamailio/modules/auth_xkeys.so
lib/kamailio/modules/avp.so
lib/kamailio/modules/avpops.so
lib/kamailio/modules/benchmark.so
@@ -56,6 +57,7 @@ lib/kamailio/modules/dialplan.so
lib/kamailio/modules/dispatcher.so
lib/kamailio/modules/diversion.so
lib/kamailio/modules/dmq.so
+lib/kamailio/modules/dmq_usrloc.so
lib/kamailio/modules/domain.so
lib/kamailio/modules/domainpolicy.so
lib/kamailio/modules/drouting.so
@@ -65,6 +67,7 @@ lib/kamailio/modules/group.so
lib/kamailio/modules/htable.so
lib/kamailio/modules/imc.so
lib/kamailio/modules/ipops.so
+lib/kamailio/modules/jsonrpc-s.so
lib/kamailio/modules/kex.so
lib/kamailio/modules/lcr.so
lib/kamailio/modules/malloc_test.so
@@ -75,12 +78,14 @@ lib/kamailio/modules/mediaproxy.so
lib/kamailio/modules/mi_datagram.so
lib/kamailio/modules/mi_fifo.so
lib/kamailio/modules/mi_rpc.so
+lib/kamailio/modules/mohqueue.so
lib/kamailio/modules/mqueue.so
lib/kamailio/modules/msilo.so
lib/kamailio/modules/msrp.so
lib/kamailio/modules/mtree.so
lib/kamailio/modules/nat_traversal.so
lib/kamailio/modules/nathelper.so
+lib/kamailio/modules/nosip.so
lib/kamailio/modules/p_usrloc.so
lib/kamailio/modules/path.so
lib/kamailio/modules/pdb.so
@@ -111,12 +116,15 @@ lib/kamailio/modules/registrar.so
lib/kamailio/modules/rls.so
lib/kamailio/modules/rr.so
lib/kamailio/modules/rtimer.so
+lib/kamailio/modules/rtjson.so
+lib/kamailio/modules/rtpengine.so
lib/kamailio/modules/rtpproxy.so
lib/kamailio/modules/sanity.so
lib/kamailio/modules/sca.so
lib/kamailio/modules/sdpops.so
lib/kamailio/modules/seas.so
lib/kamailio/modules/sipcapture.so
+lib/kamailio/modules/sipt.so
lib/kamailio/modules/siptrace.so
lib/kamailio/modules/siputils.so
lib/kamailio/modules/sl.so
@@ -125,6 +133,9 @@ lib/kamailio/modules/speeddial.so
lib/kamailio/modules/sqlops.so
lib/kamailio/modules/sst.so
lib/kamailio/modules/statistics.so
+lib/kamailio/modules/statsd.so
+lib/kamailio/modules/stun.so
+lib/kamailio/modules/tcpops.so
lib/kamailio/modules/textops.so
lib/kamailio/modules/textopsx.so
lib/kamailio/modules/timer.so
@@ -133,6 +144,7 @@ lib/kamailio/modules/tm.so
lib/kamailio/modules/tmrec.so
lib/kamailio/modules/tmx.so
lib/kamailio/modules/topoh.so
+lib/kamailio/modules/tsilo.so
lib/kamailio/modules/uac.so
lib/kamailio/modules/uac_redirect.so
lib/kamailio/modules/uid_auth_db.so
@@ -175,6 +187,7 @@ share/doc/kamailio/modules/README.async
share/doc/kamailio/modules/README.auth
share/doc/kamailio/modules/README.auth_db
share/doc/kamailio/modules/README.auth_diameter
+share/doc/kamailio/modules/README.auth_xkeys
share/doc/kamailio/modules/README.avp
share/doc/kamailio/modules/README.avpops
share/doc/kamailio/modules/README.benchmark
@@ -199,6 +212,7 @@ share/doc/kamailio/modules/README.dialpl
share/doc/kamailio/modules/README.dispatcher
share/doc/kamailio/modules/README.diversion
share/doc/kamailio/modules/README.dmq
+share/doc/kamailio/modules/README.dmq_usrloc
share/doc/kamailio/modules/README.domain
share/doc/kamailio/modules/README.domainpolicy
share/doc/kamailio/modules/README.drouting
@@ -208,6 +222,7 @@ share/doc/kamailio/modules/README.group
share/doc/kamailio/modules/README.htable
share/doc/kamailio/modules/README.imc
share/doc/kamailio/modules/README.ipops
+share/doc/kamailio/modules/README.jsonrpc-s
share/doc/kamailio/modules/README.kex
share/doc/kamailio/modules/README.lcr
share/doc/kamailio/modules/README.malloc_test
@@ -218,12 +233,14 @@ share/doc/kamailio/modules/README.mediap
share/doc/kamailio/modules/README.mi_datagram
share/doc/kamailio/modules/README.mi_fifo
share/doc/kamailio/modules/README.mi_rpc
+share/doc/kamailio/modules/README.mohqueue
share/doc/kamailio/modules/README.mqueue
share/doc/kamailio/modules/README.msilo
share/doc/kamailio/modules/README.msrp
share/doc/kamailio/modules/README.mtree
share/doc/kamailio/modules/README.nat_traversal
share/doc/kamailio/modules/README.nathelper
+share/doc/kamailio/modules/README.nosip
share/doc/kamailio/modules/README.p_usrloc
share/doc/kamailio/modules/README.path
share/doc/kamailio/modules/README.pdb
@@ -254,12 +271,15 @@ share/doc/kamailio/modules/README.regist
share/doc/kamailio/modules/README.rls
share/doc/kamailio/modules/README.rr
share/doc/kamailio/modules/README.rtimer
+share/doc/kamailio/modules/README.rtjson
+share/doc/kamailio/modules/README.rtpengine
share/doc/kamailio/modules/README.rtpproxy
share/doc/kamailio/modules/README.sanity
share/doc/kamailio/modules/README.sca
share/doc/kamailio/modules/README.sdpops
share/doc/kamailio/modules/README.seas
share/doc/kamailio/modules/README.sipcapture
+share/doc/kamailio/modules/README.sipt
share/doc/kamailio/modules/README.siptrace
share/doc/kamailio/modules/README.siputils
share/doc/kamailio/modules/README.sl
@@ -268,6 +288,9 @@ share/doc/kamailio/modules/README.speedd
share/doc/kamailio/modules/README.sqlops
share/doc/kamailio/modules/README.sst
share/doc/kamailio/modules/README.statistics
+share/doc/kamailio/modules/README.statsd
+share/doc/kamailio/modules/README.stun
+share/doc/kamailio/modules/README.tcpops
share/doc/kamailio/modules/README.textops
share/doc/kamailio/modules/README.textopsx
share/doc/kamailio/modules/README.timer
@@ -276,6 +299,7 @@ share/doc/kamailio/modules/README.tm
share/doc/kamailio/modules/README.tmrec
share/doc/kamailio/modules/README.tmx
share/doc/kamailio/modules/README.topoh
+share/doc/kamailio/modules/README.tsilo
share/doc/kamailio/modules/README.uac
share/doc/kamailio/modules/README.uac_redirect
share/doc/kamailio/modules/README.uid_auth_db
@@ -299,6 +323,7 @@ share/examples/kamailio/
@sample ${SYSCONFDIR}/kamailio/
@comment share/examples/kamailio/dictionary.kamailio
share/examples/kamailio/kamailio-advanced.cfg
+share/examples/kamailio/kamailio-basic.cfg
share/examples/kamailio/kamailio-selfsigned.key
@sample ${SYSCONFDIR}/kamailio/kamailio-selfsigned.key
share/examples/kamailio/kamailio-selfsigned.pem
@@ -314,6 +339,7 @@ share/kamailio/
share/kamailio/db_berkeley/
share/kamailio/db_berkeley/kamailio/
share/kamailio/db_berkeley/kamailio/acc
+share/kamailio/db_berkeley/kamailio/acc_cdrs
share/kamailio/db_berkeley/kamailio/active_watchers
share/kamailio/db_berkeley/kamailio/address
share/kamailio/db_berkeley/kamailio/aliases
@@ -346,6 +372,8 @@ share/kamailio/db_berkeley/kamailio/loca
share/kamailio/db_berkeley/kamailio/location_attrs
share/kamailio/db_berkeley/kamailio/matrix
share/kamailio/db_berkeley/kamailio/missed_calls
+share/kamailio/db_berkeley/kamailio/mohqcalls
+share/kamailio/db_berkeley/kamailio/mohqueues
share/kamailio/db_berkeley/kamailio/mtree
share/kamailio/db_berkeley/kamailio/mtrees
share/kamailio/db_berkeley/kamailio/pdt
@@ -356,6 +384,7 @@ share/kamailio/db_berkeley/kamailio/purp
share/kamailio/db_berkeley/kamailio/re_grp
share/kamailio/db_berkeley/kamailio/rls_presentity
share/kamailio/db_berkeley/kamailio/rls_watchers
+share/kamailio/db_berkeley/kamailio/rtpproxy
share/kamailio/db_berkeley/kamailio/sca_subscriptions
share/kamailio/db_berkeley/kamailio/silo
share/kamailio/db_berkeley/kamailio/sip_trace
@@ -379,6 +408,7 @@ share/kamailio/db_berkeley/kamailio/xcap
share/kamailio/dbtext/
share/kamailio/dbtext/kamailio/
share/kamailio/dbtext/kamailio/acc
+share/kamailio/dbtext/kamailio/acc_cdrs
share/kamailio/dbtext/kamailio/active_watchers
share/kamailio/dbtext/kamailio/address
share/kamailio/dbtext/kamailio/aliases
@@ -411,6 +441,8 @@ share/kamailio/dbtext/kamailio/location
share/kamailio/dbtext/kamailio/location_attrs
share/kamailio/dbtext/kamailio/matrix
share/kamailio/dbtext/kamailio/missed_calls
+share/kamailio/dbtext/kamailio/mohqcalls
+share/kamailio/dbtext/kamailio/mohqueues
share/kamailio/dbtext/kamailio/mtree
share/kamailio/dbtext/kamailio/mtrees
share/kamailio/dbtext/kamailio/pdt
@@ -421,6 +453,7 @@ share/kamailio/dbtext/kamailio/purplemap
share/kamailio/dbtext/kamailio/re_grp
share/kamailio/dbtext/kamailio/rls_presentity
share/kamailio/dbtext/kamailio/rls_watchers
+share/kamailio/dbtext/kamailio/rtpproxy
share/kamailio/dbtext/kamailio/sca_subscriptions
share/kamailio/dbtext/kamailio/silo
share/kamailio/dbtext/kamailio/sip_trace
@@ -476,6 +509,8 @@ share/kamailio/xhttp_pi/lcr-mod
share/kamailio/xhttp_pi/lcr-table
share/kamailio/xhttp_pi/matrix-mod
share/kamailio/xhttp_pi/matrix-table
+share/kamailio/xhttp_pi/mohqueue-mod
+share/kamailio/xhttp_pi/mohqueue-table
share/kamailio/xhttp_pi/msilo-mod
share/kamailio/xhttp_pi/msilo-table
share/kamailio/xhttp_pi/mtree-mod
@@ -498,6 +533,8 @@ share/kamailio/xhttp_pi/registrar-mod
share/kamailio/xhttp_pi/registrar-table
share/kamailio/xhttp_pi/rls-mod
share/kamailio/xhttp_pi/rls-table
+share/kamailio/xhttp_pi/rtpproxy-mod
+share/kamailio/xhttp_pi/rtpproxy-table
share/kamailio/xhttp_pi/sca-mod
share/kamailio/xhttp_pi/sca-table
share/kamailio/xhttp_pi/siptrace-mod
Index: pkg/PLIST-mysql
===================================================================
RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-mysql,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST-mysql
--- pkg/PLIST-mysql 16 Apr 2013 11:13:04 -0000 1.3
+++ pkg/PLIST-mysql 20 Nov 2015 07:20:14 -0000
@@ -11,6 +11,7 @@ share/kamailio/mysql/avpops-create.sql
share/kamailio/mysql/carrierroute-create.sql
share/kamailio/mysql/cpl-create.sql
share/kamailio/mysql/dialog-create.sql
+share/kamailio/mysql/dialog_ng-create.sql
share/kamailio/mysql/dialplan-create.sql
share/kamailio/mysql/dispatcher-create.sql
share/kamailio/mysql/domain-create.sql
@@ -19,8 +20,12 @@ share/kamailio/mysql/drouting-create.sql
share/kamailio/mysql/group-create.sql
share/kamailio/mysql/htable-create.sql
share/kamailio/mysql/imc-create.sql
+share/kamailio/mysql/ims_charging_create.sql
+share/kamailio/mysql/ims_usrloc_pcscf-create.sql
+share/kamailio/mysql/ims_usrloc_scscf-create.sql
share/kamailio/mysql/lcr-create.sql
share/kamailio/mysql/matrix-create.sql
+share/kamailio/mysql/mohqueue-create.sql
share/kamailio/mysql/msilo-create.sql
share/kamailio/mysql/mtree-create.sql
share/kamailio/mysql/pdt-create.sql
@@ -30,6 +35,7 @@ share/kamailio/mysql/presence-create.sql
share/kamailio/mysql/purple-create.sql
share/kamailio/mysql/registrar-create.sql
share/kamailio/mysql/rls-create.sql
+share/kamailio/mysql/rtpproxy-create.sql
share/kamailio/mysql/sca-create.sql
share/kamailio/mysql/siptrace-create.sql
share/kamailio/mysql/speeddial-create.sql
Index: pkg/PLIST-postgresql
===================================================================
RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-postgresql,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST-postgresql
--- pkg/PLIST-postgresql 16 Apr 2013 11:13:04 -0000 1.3
+++ pkg/PLIST-postgresql 20 Nov 2015 07:20:14 -0000
@@ -21,6 +21,7 @@ share/kamailio/postgres/htable-create.sq
share/kamailio/postgres/imc-create.sql
share/kamailio/postgres/lcr-create.sql
share/kamailio/postgres/matrix-create.sql
+share/kamailio/postgres/mohqueue-create.sql
share/kamailio/postgres/msilo-create.sql
share/kamailio/postgres/mtree-create.sql
share/kamailio/postgres/pdt-create.sql
@@ -30,6 +31,7 @@ share/kamailio/postgres/presence-create.
share/kamailio/postgres/purple-create.sql
share/kamailio/postgres/registrar-create.sql
share/kamailio/postgres/rls-create.sql
+share/kamailio/postgres/rtpproxy-create.sql
share/kamailio/postgres/sca-create.sql
share/kamailio/postgres/siptrace-create.sql
share/kamailio/postgres/speeddial-create.sql
Index: pkg/kamailio.rc
===================================================================
RCS file: /cvs/ports/telephony/kamailio/pkg/kamailio.rc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 kamailio.rc
--- pkg/kamailio.rc 22 Apr 2012 21:44:24 -0000 1.1
+++ pkg/kamailio.rc 20 Nov 2015 07:20:14 -0000
@@ -6,6 +6,8 @@ daemon="${TRUEPREFIX}/sbin/kamailio"
. /etc/rc.d/rc.subr
+pexp="${daemon}.*"
+
rc_pre() {
install -d -o _kamailio /var/run/kamailio
}
