Hello ports@, This is update kamailio port to version 4.1.1
Change log: - update version to 4.1.1 - review (clean) patches for 64 bit time_t Tested on current amd64. Ok? Comments? - Roman
Index: Makefile =================================================================== RCS file: /cvs/ports/telephony/kamailio/Makefile,v retrieving revision 1.27 diff -u -p -u -p -r1.27 Makefile --- Makefile 12 Jun 2013 20:36:34 -0000 1.27 +++ Makefile 6 Feb 2014 07:30:21 -0000 @@ -4,7 +4,7 @@ COMMENT-main = mature and flexible open SHARED_ONLY = Yes -VERSION = 4.0.0 +VERSION = 4.1.1 DISTNAME = kamailio-${VERSION}_src PKGNAME-main = kamailio-${VERSION} PKGNAME-mysql = kamailio-mysql-${VERSION} @@ -16,8 +16,6 @@ PKGNAME-snmpstats = kamailio-snmpstats-$ PKGNAME-perl = kamailio-perl-${VERSION} #PKGNAME-radius = kamailio-radius-${VERSION} TODO -REVISION-mysql = 1 - CATEGORIES = telephony MAINTAINER = Roman Kravchuk <kravchuk...@gmail.com> @@ -26,14 +24,14 @@ 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}" LD_EXTRA_OPTS="${LDFLAGS} -pthread" QUIET=verbose 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 6 Feb 2014 07:30:21 -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.1.1_src.tar.gz) = eYOJYax3JSPrphD2p/RzWKAKMpfwwZEsTnSEP+WdNzQ= +SIZE (kamailio-4.1.1_src.tar.gz) = 10785435 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 6 Feb 2014 07:30:21 -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 Thu Jan 9 17:09:40 2014 ++++ Makefile.defs Thu Feb 6 09:00:09 2014 +@@ -366,9 +366,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 +@@ -439,7 +439,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) +@@ -521,7 +521,7 @@ data_prefix = $(basedir)$(prefix) # target dirs for various stuff @@ -31,16 +31,25 @@ $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) +@@ -889,7 +889,7 @@ 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 4.5+ or 4.2+ + ifeq (,$(strip $(filter-out 4.2+ 4.5+,$(CC_SHORTVER)))) + $(call set_if_empty,CPU,athlon64) +@@ -974,7 +974,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 +@@ -988,12 +988,8 @@ else #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) $(call set_if_empty,CPU,opteron) @@ -55,8 +64,8 @@ $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) +@@ -1414,7 +1410,7 @@ ifeq ($(CC_NAME), gcc) + CFLAGS= -mips64 $(CC_OPT) -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 \ @@ -64,7 +73,7 @@ $OpenBSD: patch-Makefile_defs,v 1.5 2013 -fno-strict-overflow else #if gcc 4.0+ -@@ -1962,9 +1958,10 @@ endif +@@ -1888,9 +1884,10 @@ endif ifeq ($(OS), openbsd) C_DEFS+=-DHAVE_SOCKADDR_SA_LEN -DHAVE_GETHOSTBYNAME2 \ Index: patches/patch-etc_kamailio-basic_cfg =================================================================== RCS file: patches/patch-etc_kamailio-basic_cfg diff -N patches/patch-etc_kamailio-basic_cfg --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-etc_kamailio-basic_cfg 6 Feb 2014 07:30:21 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- etc/kamailio-basic.cfg.orig Thu Jan 9 02:01:06 2014 ++++ etc/kamailio-basic.cfg Thu Jan 9 02:01:17 2014 +@@ -106,6 +106,9 @@ log_facility=LOG_LOCAL0 + fork=yes + children=4 + ++user="_kamailio" ++group="_kamailio" ++ + /* uncomment the next line to disable TCP (default on) */ + #disable_tcp=yes + Index: patches/patch-etc_kamailio-oob_cfg =================================================================== RCS file: patches/patch-etc_kamailio-oob_cfg diff -N patches/patch-etc_kamailio-oob_cfg --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-etc_kamailio-oob_cfg 6 Feb 2014 07:30:21 -0000 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- etc/kamailio-oob.cfg.orig Thu Jan 9 02:24:31 2014 ++++ etc/kamailio-oob.cfg Thu Jan 9 02:24:45 2014 +@@ -160,6 +160,9 @@ log_facility=LOG_LOCAL0 + fork=yes + children=4 + ++user="_kamailio" ++group="_kamailio" ++ + /* uncomment the next line to disable TCP (default on) */ + #disable_tcp=yes + 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_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_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 6 Feb 2014 07:30:21 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- modules/mi_xmlrpc/abyss_data.h.orig Sat Dec 21 02:41:04 2013 ++++ modules/mi_xmlrpc/abyss_data.h Sat Dec 21 02:41:20 2013 +@@ -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 6 Feb 2014 07:30:21 -0000 @@ -1,21 +1,12 @@ $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 - restore_keepalive_state(void) - { - char uri[64], socket[64]; -- time_t rtime, stime, now; -+ long rtime, stime, now; - NAT_Contact *contact; - struct socket_info *sock; - int port, proto, res; -@@ -1661,7 +1661,7 @@ restore_keepalive_state(void) - return; - } - -- now = time(NULL); -+ now = (long)time(NULL); - +--- modules/nat_traversal/nat_traversal.c.orig Sat Dec 21 03:14:37 2013 ++++ modules/nat_traversal/nat_traversal.c Sat Dec 21 03:15:31 2013 +@@ -1666,7 +1666,7 @@ restore_keepalive_state(void) res = fscanf(f, STATE_FILE_HEADER); // skip header + while (True) { +- res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime); ++ res = fscanf(f, "%63s %63s %lld %lld", uri, socket, &rtime, &stime); + if (res == EOF) { + if (ferror(f)) + LM_ERR("error while reading keepalive state file: %s\n", strerror(errno)); 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 6 Feb 2014 07:30:21 -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 Wed Dec 4 16:40:16 2013 ++++ modules/nathelper/nathelper.c Sat Dec 21 02:00:19 2013 +@@ -1647,7 +1647,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: patches/patch-modules_pv_pv_time_c diff -N patches/patch-modules_pv_pv_time_c --- patches/patch-modules_pv_pv_time_c 16 Apr 2013 11:13:04 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$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 - { - msg_set_time(msg); - msg_ctx_id_set(msg, &_cfgutils_msgid); -- if(localtime_r(&msg->tval.tv_sec, &_cfgutils_ts) == NULL) -+ if(localtime_r((time_t*)&msg->tval.tv_sec, &_cfgutils_ts) == NULL) - { - 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 - { - msg_set_time(msg); - msg_ctx_id_set(msg, &_cfgutils_msgid); -- if(localtime_r(&msg->tval.tv_sec, &_cfgutils_ts) == NULL) -+ if(localtime_r((time_t*)&msg->tval.tv_sec, &_cfgutils_ts) == NULL) - { - 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 - - msg_set_time(msg); - -- s.s = ctime(&msg->tval.tv_sec); -+ s.s = ctime((time_t*)&msg->tval.tv_sec); - s.len = strlen(s.s)-1; - return pv_get_strintval(msg, param, res, &s, (int)msg->tval.tv_sec); - } 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 6 Feb 2014 07:30:21 -0000 @@ -0,0 +1,20 @@ +$OpenBSD$ +--- modules/rls/utils.c.orig Thu Jan 9 01:40:06 2014 ++++ modules/rls/utils.c Thu Jan 9 01:41:12 2014 +@@ -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 6 Feb 2014 07:30:21 -0000 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- modules/rls/utils.h.orig Thu Jan 9 01:40:18 2014 ++++ modules/rls/utils.h Thu Jan 9 01:41:31 2014 +@@ -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: patches/patch-modules_sca_sca_subscribe_c diff -N patches/patch-modules_sca_sca_subscribe_c --- patches/patch-modules_sca_sca_subscribe_c 16 Apr 2013 11:13:04 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,39 +0,0 @@ -$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 - sca_hash_table *ht; - sca_hash_entry *ent, *ent_tmp; - sca_subscription *sub; -- time_t now = time( NULL ); -+ long now = (long)time( NULL ); - int state; - int i; - -@@ -250,7 +250,7 @@ sca_subscriptions_restore_from_db( sca_mod *scam ) - int i; - int idx; - int rc = -1; -- time_t now = time( NULL ); -+ long now = (long)time( NULL ); - - 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 - db_key_t delete_columns[ 1 ]; - db_val_t delete_values[ 1 ]; - db_op_t delete_ops[ 1 ]; -- time_t now = time( NULL ); -+ long now = (long)time(NULL); - int kv_count = 0; - - delete_columns[ 0 ] = (str *)&SCA_DB_EXPIRES_COL_NAME; -@@ -473,7 +473,7 @@ sca_subscription_db_update( void ) - sca_subscription *sub; - int i; - int rc = -1; -- time_t now = time( NULL ); -+ long now = (long)time( NULL ); - - db_con = sca_db_get_connection(); - if ( db_con == NULL ){ Index: patches/patch-modules_sca_sca_subscribe_h =================================================================== RCS file: patches/patch-modules_sca_sca_subscribe_h diff -N patches/patch-modules_sca_sca_subscribe_h --- patches/patch-modules_sca_sca_subscribe_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_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 { - str subscriber; /* contact: user@ip */ - str target_aor; /* account of record to watch: user@domain */ - int event; /* "call-info", "line-seize" */ -- time_t expires; /* expiration date of subscription */ -+ long expires; /* expiration date of subscription */ - int state; /* active, pending, terminated */ - int index; /* seized appearance-index, line-seize only */ - 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_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 6 Feb 2014 07:30:21 -0000 @@ -1,21 +1,20 @@ $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 Sat Dec 21 03:01:33 2013 ++++ modules/xhttp_pi/xhttp_pi_fnc.c Sat Dec 21 03:04:11 2013 +@@ -2866,14 +2866,14 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) + val_str.len = max_page_len - ctx->reply.body.len; if(db_time2str(values[j].val.time_val, val_str.s, &val_str.len)!=0){ - LM_ERR("Unable to convert double [%ld]\n", -- values[j].val.time_val); -+ (long)values[j].val.time_val); +- LM_ERR("Unable to convert double [%ld]\n", ++ LM_ERR("Unable to convert double [%lld]\n", + values[j].val.time_val); goto error; } p += val_str.len; -@@ -2823,7 +2823,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx) - "[%ld][%.*s]\n", + ctx->reply.body.len += val_str.len; + LM_DBG(" got %.*s[%d]=>" +- "[%ld][%.*s]\n", ++ "[%lld][%.*s]\n", command->q_keys[j]->len, command->q_keys[j]->s, i, -- values[j].val.time_val, -+ (long)values[j].val.time_val, - val_str.len, val_str.s); - break; - default: + values[j].val.time_val, Index: patches/patch-timer_c =================================================================== RCS file: patches/patch-timer_c diff -N patches/patch-timer_c --- patches/patch-timer_c 22 Apr 2012 21:44:24 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$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 - -@@ -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!). 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 6 Feb 2014 07:30:21 -0000 @@ -1,6 +1,6 @@ $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 +--- utils/kamctl/kamctl.orig Wed Dec 4 16:40:17 2013 ++++ utils/kamctl/kamctl Sat Dec 21 02:47:08 2013 @@ -56,7 +56,7 @@ fi if [ -f "$MYLIBDIR/kamctl.base" ]; then . "$MYLIBDIR/kamctl.base" @@ -10,7 +10,7 @@ $OpenBSD: patch-utils_kamctl_kamctl,v 1. exit -1 fi -@@ -1800,7 +1800,7 @@ kamailio_stop() { +@@ -1856,7 +1856,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 6 Feb 2014 07:30:21 -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 Wed Dec 4 16:40:16 2013 ++++ utils/kamctl/kamctl.base Sat Dec 21 02:47:08 2013 +@@ -524,7 +524,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() { +@@ -533,7 +533,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() { +@@ -541,7 +541,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() { +@@ -549,7 +549,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() { +@@ -557,7 +557,7 @@ mecho() { merr() { if [ -t 1 -a -z "$NOHLPRINT" ] ; then 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 6 Feb 2014 07:30:21 -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 Wed Dec 4 16:40:16 2013 ++++ utils/kamctl/kamdbctl.base Sat Dec 21 02:47:08 2013 +@@ -159,7 +159,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() { +@@ -168,7 +168,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() { +@@ -176,7 +176,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() { +@@ -184,7 +184,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() { +@@ -192,7 +192,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 () +@@ -218,8 +218,8 @@ get_answer () else ANSWER=${value} fi 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 6 Feb 2014 07:30:21 -0000 @@ -40,6 +40,7 @@ lib/kamailio/modules/call_control.so lib/kamailio/modules/cfg_db.so lib/kamailio/modules/cfg_rpc.so lib/kamailio/modules/cfgutils.so +lib/kamailio/modules/cnxcc.so lib/kamailio/modules/corex.so lib/kamailio/modules/counters.so lib/kamailio/modules/cpl-c.so @@ -75,6 +76,7 @@ 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 @@ -111,12 +113,14 @@ lib/kamailio/modules/registrar.so lib/kamailio/modules/rls.so lib/kamailio/modules/rr.so lib/kamailio/modules/rtimer.so +lib/kamailio/modules/rtpproxy-ng.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 +129,7 @@ lib/kamailio/modules/speeddial.so lib/kamailio/modules/sqlops.so lib/kamailio/modules/sst.so lib/kamailio/modules/statistics.so +lib/kamailio/modules/stun.so lib/kamailio/modules/textops.so lib/kamailio/modules/textopsx.so lib/kamailio/modules/timer.so @@ -183,6 +188,7 @@ share/doc/kamailio/modules/README.call_c share/doc/kamailio/modules/README.cfg_db share/doc/kamailio/modules/README.cfg_rpc share/doc/kamailio/modules/README.cfgutils +share/doc/kamailio/modules/README.cnxcc share/doc/kamailio/modules/README.corex share/doc/kamailio/modules/README.counters share/doc/kamailio/modules/README.cpl-c @@ -218,6 +224,7 @@ 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 @@ -255,11 +262,13 @@ share/doc/kamailio/modules/README.rls share/doc/kamailio/modules/README.rr share/doc/kamailio/modules/README.rtimer share/doc/kamailio/modules/README.rtpproxy +share/doc/kamailio/modules/README.rtpproxy-ng 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 +277,7 @@ 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.stun share/doc/kamailio/modules/README.textops share/doc/kamailio/modules/README.textopsx share/doc/kamailio/modules/README.timer @@ -299,6 +309,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 +325,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 +358,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 +370,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 +394,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 +427,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 +439,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 +495,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 +519,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 6 Feb 2014 07:30:21 -0000 @@ -21,6 +21,7 @@ share/kamailio/mysql/htable-create.sql share/kamailio/mysql/imc-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 +31,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 6 Feb 2014 07:30:21 -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