Hi ports@,
This is update kamailio port.
Changelog:
- update to version 5.1.2
- sync pathes
- sync WANTLIB
- switch to compile with system malloc
Tested on current amd64.
Ok? Comments?
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/kamailio/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile 20 Mar 2018 22:03:35 -0000 1.44
+++ Makefile 31 Mar 2018 09:00:39 -0000
@@ -2,7 +2,7 @@
COMMENT-main = mature and flexible open source SIP server
-VERSION = 5.0.6
+VERSION = 5.1.2
DISTNAME = kamailio-${VERSION}_src
@@ -21,25 +21,26 @@ PKGNAME-radius = kamailio-radius-${VERSI
CATEGORIES = telephony
MAINTAINER = Roman Kravchuk <kravchuk...@gmail.com>
-HOMEPAGE = http://www.kamailio.org/
+HOMEPAGE = https://www.kamailio.org/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-SHARED_LIBS = srdb1 4.0 # 1.0
-SHARED_LIBS += srdb2 4.0 # 1.0
-SHARED_LIBS += trie 4.0 # 1.0
-SHARED_LIBS += srutils 3.0 # 1.0
+SHARED_LIBS = srdb1 5.0 # 1.0
+SHARED_LIBS += srdb2 5.0 # 1.0
+SHARED_LIBS += trie 5.0 # 1.0
+SHARED_LIBS += srutils 4.0 # 1.0
MAKE_ENV = CC="${CC}" \
CC_EXTRA_OPTS="${CFLAGS} -DOPENSSL_NO_BUF_FREELISTS -DHAVE_ARC4RANDOM -I${LOCALBASE}/include" \
LD_EXTRA_OPTS="${LDFLAGS} -pthread -L${LOCALBASE}/lib"
-MASTER_SITES = http://www.kamailio.org/pub/kamailio/${VERSION}/src/
+MASTER_SITES = https://www.kamailio.org/pub/kamailio/${VERSION}/src/
WRKDIST = ${WRKDIR}/kamailio-${VERSION}
-WANTLIB-main = c crypto curl expat event_core event_extra iconv m \
- pcre pthread ssl lzma xml2 curses readline unistring z
+WANTLIB-main = c crypto curl curses expat event_core event_extra iconv m \
+ pcre pthread ssl lzma xml2 ncurses readline unistring z \
+ ${COMPILER_LIBCXX}
LIB_DEPENDS-main = converters/libiconv \
converters/libunistring \
@@ -53,6 +54,7 @@ KAMAILIO_GROUPS = kstandard kcpl khttp_a
FLAVOR ?=
MULTI_PACKAGES = -main
+CONFIGURE_STYLE = No
USE_GMAKE = Yes
NO_TEST = Yes
@@ -62,15 +64,20 @@ MAKE_FLAGS = LIBDIR=lib \
cfg-prefix=${WRKINST} \
cfg_dir=share/examples/kamailio/ \
cfg_target=${SYSCONFDIR}/kamailio/ \
- run_target=${VARBASE}/run/kamailio/ \
+ run_target=${VARBASE}/run/kamailio \
QUIET=verbose \
RADCLI=1 \
SCTP=0 \
+ MEMPKG=sys \
group_include="${KAMAILIO_GROUPS}" \
LIBsrdb1_VERSION=${LIBsrdb1_VERSION} \
LIBsrdb2_VERSION=${LIBsrdb2_VERSION} \
LIBtrie_VERSION=${LIBtrie_VERSION} \
LIBsrutils_VERSION=${LIBsrutils_VERSION} \
+
+MODULES = lang/python
+MODPY_BUILDDEP = No
+MODPY_ADJ_FILES = utils/kamctl/dbtextdb/dbtextdb.py
PSEUDO_FLAVORS += no_berkeley
.if !${FLAVOR:Mno_berkeley}
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/kamailio/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 20 Mar 2018 22:03:35 -0000 1.10
+++ distinfo 31 Mar 2018 09:00:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (kamailio-5.0.6_src.tar.gz) = yhYma1WYZtWMa3fyNfvPXwcfYnSSwo8z7PWY5B2V1Co=
-SIZE (kamailio-5.0.6_src.tar.gz) = 11724268
+SHA256 (kamailio-5.1.2_src.tar.gz) = bsnO+h+gt+IJDkHzQXLbUR2vonwMEeK4whQLyHWxa10=
+SIZE (kamailio-5.1.2_src.tar.gz) = 12010615
Index: patches/patch-etc_kamailio_cfg
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-etc_kamailio_cfg,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-etc_kamailio_cfg
--- patches/patch-etc_kamailio_cfg 3 Jul 2017 22:14:20 -0000 1.5
+++ patches/patch-etc_kamailio_cfg 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-etc_kamailio_cfg,v 1.5 2017/07/03 22:14:20 sthen Exp $
---- etc/kamailio.cfg.orig Wed Apr 5 16:32:38 2017
-+++ etc/kamailio.cfg Mon May 15 21:48:56 2017
-@@ -160,6 +160,9 @@ log_facility=LOG_LOCAL0
+Index: etc/kamailio.cfg
+--- etc/kamailio.cfg.orig
++++ etc/kamailio.cfg
+@@ -161,6 +161,9 @@ log_prefix="{$mt $hdr(CSeq) $ci} "
/* number of SIP routing processes */
children=8
Index: patches/patch-src_core_rand_fastrand_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_rand_fastrand_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_core_rand_fastrand_c
--- patches/patch-src_core_rand_fastrand_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_core_rand_fastrand_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_core_rand_fastrand_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/core/rand/fastrand.c.orig Mon May 15 22:48:56 2017
-+++ src/core/rand/fastrand.c Mon May 15 22:50:19 2017
-@@ -25,6 +25,18 @@
+Index: src/core/rand/fastrand.c
+--- src/core/rand/fastrand.c.orig
++++ src/core/rand/fastrand.c
+@@ -23,6 +23,18 @@
#include "fastrand.h"
#include <stdlib.h>
@@ -20,7 +21,7 @@ $OpenBSD: patch-src_core_rand_fastrand_c
#include "isaac/rand.h"
#define FASTRAND_MAX ((unsigned int)(-1))
-@@ -54,3 +66,4 @@ unsigned int fastrand_max(unsigned int max)
+@@ -52,3 +64,4 @@ unsigned int fastrand_max(unsigned int max)
{
return fastrand()%(max+1);
}
Index: patches/patch-src_core_select_core_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_select_core_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_core_select_core_c
--- patches/patch-src_core_select_core_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_core_select_core_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_core_select_core_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/core/select_core.c.orig Mon May 15 22:51:55 2017
-+++ src/core/select_core.c Mon May 15 22:53:45 2017
-@@ -1513,7 +1513,11 @@ int select_sys_unique(str* res, select_t* s, struct si
+Index: src/core/select_core.c
+--- src/core/select_core.c.orig
++++ src/core/select_core.c
+@@ -1504,7 +1504,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;
Index: patches/patch-src_core_tcp_read_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_tcp_read_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_core_tcp_read_c
--- patches/patch-src_core_tcp_read_c 20 Mar 2018 22:03:35 -0000 1.3
+++ patches/patch-src_core_tcp_read_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_core_tcp_read_c,v 1.
Index: src/core/tcp_read.c
--- src/core/tcp_read.c.orig
+++ src/core/tcp_read.c
-@@ -1530,6 +1530,14 @@ void release_tcpconn(struct tcp_connection* c, long st
+@@ -1663,6 +1663,14 @@ void release_tcpconn(struct tcp_connection* c, long st
ip_addr2a(&c->rcv.src_ip), c->rcv.src_port,
ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);
LM_DBG("extra_data %p\n", c->extra_data);
Index: patches/patch-src_main_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_main_c
--- patches/patch-src_main_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_main_c 31 Mar 2018 09:00:39 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_main_c,v 1.2 2017/09
Index: src/main.c
--- src/main.c.orig
+++ src/main.c
-@@ -1842,8 +1842,10 @@ int main(int argc, char** argv)
+@@ -1845,8 +1845,10 @@ int main(int argc, char** argv)
int proto;
char *options;
int ret;
@@ -13,7 +13,7 @@ Index: src/main.c
int debug_save, debug_flag;
int dont_fork_cnt;
struct name_lst* n_lst;
-@@ -2109,6 +2111,7 @@ int main(int argc, char** argv)
+@@ -2112,6 +2114,7 @@ int main(int argc, char** argv)
goto error;
}
@@ -21,7 +21,7 @@ Index: src/main.c
/* seed the prng */
/* try to use /dev/urandom if possible */
seed=0;
-@@ -2129,6 +2132,7 @@ try_again:
+@@ -2132,6 +2135,7 @@ try_again:
fastrand_seed(kam_rand());
srandom(kam_rand()+time(0));
LM_DBG("test random numbers %u %lu %u\n", kam_rand(), random(), fastrand());
Index: patches/patch-src_modules_db_berkeley_bdb_lib_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_db_berkeley_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_db_berkeley_bdb_lib_c
--- patches/patch-src_modules_db_berkeley_bdb_lib_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_db_berkeley_bdb_lib_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_db_berkeley_bdb_lib_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/modules/db_berkeley/bdb_lib.c.orig Mon May 15 23:34:21 2017
-+++ src/modules/db_berkeley/bdb_lib.c Mon May 15 23:34:56 2017
-@@ -666,7 +666,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+Index: src/modules/db_berkeley/bdb_lib.c
+--- src/modules/db_berkeley/bdb_lib.c.orig
++++ src/modules/db_berkeley/bdb_lib.c
+@@ -623,7 +623,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
{
char *s;
char fn[1024];
@@ -10,12 +11,12 @@ $OpenBSD: patch-src_modules_db_berkeley_
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -686,7 +686,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
- s+=_tp->name.len;
-
- t = localtime( &tim );
-- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
-+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
+@@ -645,7 +645,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+ s += _tp->name.len;
+
+ t = localtime(&tim);
+- bl = strftime(d, 128, "-%Y%m%d%H%M%S.jnl", t);
++ bl = strftime(d, sizeof(d), "-%Y%m%d%H%M%S.jnl",t);
strncpy(s, d, bl);
- s+= bl;
+ s += bl;
*s = 0;
Index: patches/patch-src_modules_db_berkeley_km_bdb_lib_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_db_berkeley_km_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_db_berkeley_km_bdb_lib_c
--- patches/patch-src_modules_db_berkeley_km_bdb_lib_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_db_berkeley_km_bdb_lib_c 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_db_berkeley_km_bdb_lib_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/modules/db_berkeley/km_bdb_lib.c.orig Mon May 15 23:35:24 2017
-+++ src/modules/db_berkeley/km_bdb_lib.c Mon May 15 23:36:06 2017
-@@ -719,7 +719,7 @@ int km_bdblib_create_journal(table_p _tp)
+Index: src/modules/db_berkeley/km_bdb_lib.c
+--- src/modules/db_berkeley/km_bdb_lib.c.orig
++++ src/modules/db_berkeley/km_bdb_lib.c
+@@ -676,7 +676,7 @@ int km_bdblib_create_journal(table_p _tp)
{
char *s;
char fn[1024];
@@ -10,12 +11,12 @@ $OpenBSD: patch-src_modules_db_berkeley_
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -740,7 +740,7 @@ int km_bdblib_create_journal(table_p _tp)
- s+=_tp->name.len;
-
- t = localtime( &tim );
-- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
-+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
+@@ -699,7 +699,7 @@ int km_bdblib_create_journal(table_p _tp)
+ s += _tp->name.len;
+
+ t = localtime(&tim);
+- bl = strftime(d, 128, "-%Y%m%d%H%M%S.jnl", t);
++ bl = strftime(d, sizeof(d), "-%Y%m%d%H%M%S.jnl",t);
strncpy(s, d, bl);
- s+= bl;
+ s += bl;
*s = 0;
Index: patches/patch-src_modules_ipops_detailed_ip_type_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_ipops_detailed_ip_type_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_ipops_detailed_ip_type_c
--- patches/patch-src_modules_ipops_detailed_ip_type_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_ipops_detailed_ip_type_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_modules_ipops_detail
Index: src/modules/ipops/detailed_ip_type.c
--- src/modules/ipops/detailed_ip_type.c.orig
+++ src/modules/ipops/detailed_ip_type.c
-@@ -26,7 +26,7 @@
+@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <arpa/inet.h>
Index: patches/patch-src_modules_nat_traversal_nat_traversal_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_nat_traversal_nat_traversal_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_modules_nat_traversal_nat_traversal_c
--- patches/patch-src_modules_nat_traversal_nat_traversal_c 20 Mar 2018 22:03:35 -0000 1.3
+++ patches/patch-src_modules_nat_traversal_nat_traversal_c 31 Mar 2018 09:00:39 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-src_modules_nat_traversa
Index: src/modules/nat_traversal/nat_traversal.c
--- src/modules/nat_traversal/nat_traversal.c.orig
+++ src/modules/nat_traversal/nat_traversal.c
-@@ -1724,7 +1724,7 @@ restore_keepalive_state(void)
- res = fscanf(f, STATE_FILE_HEADER); // skip header
+@@ -1754,7 +1754,7 @@ static void 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));
+ 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",
Index: patches/patch-src_modules_rls_utils_c
===================================================================
RCS file: patches/patch-src_modules_rls_utils_c
diff -N patches/patch-src_modules_rls_utils_c
--- patches/patch-src_modules_rls_utils_c 21 Sep 2017 09:34:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_modules_rls_utils_c,v 1.2 2017/09/21 09:34:32 sthen Exp $
-
-Index: src/modules/rls/utils.c
---- src/modules/rls/utils.c.orig
-+++ src/modules/rls/utils.c
-@@ -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-src_modules_rls_utils_h
===================================================================
RCS file: patches/patch-src_modules_rls_utils_h
diff -N patches/patch-src_modules_rls_utils_h
--- patches/patch-src_modules_rls_utils_h 3 Jul 2017 22:14:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_modules_rls_utils_h,v 1.1 2017/07/03 22:14:20 sthen Exp $
-
-Index: src/modules/rls/utils.h
---- src/modules/rls/utils.h.orig
-+++ src/modules/rls/utils.h
-@@ -26,6 +26,6 @@
-
- #include "../../core/ut.h"
-
--extern str* normalize_sip_uri(const str *uri);
-+extern str* normalize_sip_uri(str *uri);
-
- #endif
Index: patches/patch-src_modules_tls_tls_domain_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_domain_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_domain_c
--- patches/patch-src_modules_tls_tls_domain_c 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_domain_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,17 @@ $OpenBSD: patch-src_modules_tls_tls_doma
Index: src/modules/tls/tls_domain.c
--- src/modules/tls/tls_domain.c.orig
+++ src/modules/tls/tls_domain.c
-@@ -734,7 +734,7 @@ static void sr_ssl_ctx_info_callback(const SSL *ssl, i
+@@ -124,7 +124,8 @@ static void setup_dh(SSL_CTX *ctx)
+ return;
+ }
+
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
+ /* libssl >= v1.1.0 */
+ DH_set0_pqg(dh, p, NULL, g);
+ #else
+@@ -734,7 +735,7 @@ static void sr_ssl_ctx_info_callback(const SSL *ssl, i
if(data==0)
data = (struct tls_extra_data*)SSL_get_app_data(ssl);
LOG(tls_dbg, "SSL handshake done\n");
@@ -12,7 +22,7 @@ Index: src/modules/tls/tls_domain.c
/* CVE-2009-3555 - disable renegotiation */
if (ssl->s3) {
LOG(tls_dbg, "SSL disable renegotiation\n");
-@@ -858,7 +858,7 @@ static int tls_ssl_ctx_mode(SSL_CTX* ctx, long mode, v
+@@ -858,7 +859,7 @@ static int tls_ssl_ctx_mode(SSL_CTX* ctx, long mode, v
*/
static int tls_ssl_ctx_set_freelist(SSL_CTX* ctx, long val, void* unused)
{
@@ -21,12 +31,13 @@ Index: src/modules/tls/tls_domain.c
if (val >= 0)
#if OPENSSL_VERSION_NUMBER >= 0x01000000L
#ifndef OPENSSL_NO_BUF_FREELISTS
-@@ -997,7 +997,7 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* d
+@@ -997,7 +998,8 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* d
memset(d->ctx, 0, sizeof(SSL_CTX*) * procs_no);
for(i = 0; i < procs_no; i++) {
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* libssl < 1.1.0 */
if(d->method>TLS_USE_TLSvRANGE) {
d->ctx[i] = SSL_CTX_new(SSLv23_method());
Index: patches/patch-src_modules_tls_tls_init_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_init_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_modules_tls_tls_init_c
--- patches/patch-src_modules_tls_tls_init_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_modules_tls_tls_init_c 31 Mar 2018 09:00:39 -0000
@@ -3,131 +3,27 @@ $OpenBSD: patch-src_modules_tls_tls_init
Index: src/modules/tls/tls_init.c
--- src/modules/tls/tls_init.c.orig
+++ src/modules/tls/tls_init.c
-@@ -119,7 +119,7 @@ to compile on the _target_ system)"
+@@ -119,7 +119,8 @@ static int tls_mod_initialized = 0;
int openssl_kssl_malloc_bug=0; /* is openssl bug #1467 present ? */
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
const SSL_METHOD* ssl_methods[TLS_METHOD_MAX];
#else
sr_tls_methods_t sr_tls_methods[TLS_METHOD_MAX];
-@@ -143,7 +143,7 @@ sr_tls_methods_t sr_tls_methods[TLS_METHOD_MAX];
- */
-
-
--
-+#ifndef LIBRESSL_VERSION_NUMBER
- inline static char* buf_append(char* buf, char* end, char* str, int str_len)
- {
- if ( (buf+str_len)<end){
-@@ -321,6 +321,7 @@ static void ser_free(void *ptr, const char *fname, int
- }
- #endif
-
-+#endif /* LIBRESSL_VERSION_NUMBER */
-
- /*
- * Initialize TLS socket
-@@ -356,7 +357,7 @@ error:
+@@ -361,7 +362,8 @@ error:
*/
static void init_ssl_methods(void)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* libssl < 1.1.0 */
memset(ssl_methods, 0, sizeof(ssl_methods));
-@@ -366,7 +367,7 @@ static void init_ssl_methods(void)
- ssl_methods[TLS_USE_SSLv23 - 1] = SSLv23_method();
-
- /* only specific SSL or TLS version */
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_SSL2
- ssl_methods[TLS_USE_SSLv2_cli - 1] = SSLv2_client_method();
- ssl_methods[TLS_USE_SSLv2_srv - 1] = SSLv2_server_method();
-@@ -384,13 +385,13 @@ static void init_ssl_methods(void)
- ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method();
- ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method();
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method();
- ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method();
- ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method();
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method();
- ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method();
- ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method();
-@@ -399,11 +400,11 @@ static void init_ssl_methods(void)
- /* ranges of TLS versions (require a minimum TLS version) */
- ssl_methods[TLS_USE_TLSv1_PLUS - 1] = (void*)TLS_OP_TLSv1_PLUS;
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_1_PLUS - 1] = (void*)TLS_OP_TLSv1_1_PLUS;
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_2_PLUS - 1] = (void*)TLS_OP_TLSv1_2_PLUS;
- #endif
-
-@@ -477,6 +478,7 @@ static void init_ssl_methods(void)
- */
- static int init_tls_compression(void)
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
- #if OPENSSL_VERSION_NUMBER < 0x010100000L
- #if OPENSSL_VERSION_NUMBER >= 0x00908000L
- int n, r;
-@@ -563,6 +565,7 @@ static int init_tls_compression(void)
- end:
- #endif /* OPENSSL_VERSION_NUMBER >= 0.9.8 */
- #endif /* OPENSSL_VERSION_NUMBER < 1.1.0 */
-+#endif /* LIBRESSL_VERSION_NUMBER */
- return 0;
- }
-
-@@ -573,6 +576,7 @@ end:
- */
- int tls_pre_init(void)
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
- #if OPENSSL_VERSION_NUMBER < 0x010100000L
- void *(*mf)(size_t) = NULL;
- void *(*rf)(void *, size_t) = NULL;
-@@ -599,6 +603,7 @@ int tls_pre_init(void)
- " (can be loaded first to be safe)\n");
- return -1;
- }
-+#endif /* LIBRESSL_VERSION_NUMBER */
-
- if (tls_init_locks()<0)
- return -1;
-@@ -632,7 +637,7 @@ int init_tls_h(void)
- {
- /*struct socket_info* si;*/
- long ssl_version;
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
- int lib_kerberos;
- int lib_zlib;
- int kerberos_support;
-@@ -676,7 +681,7 @@ int init_tls_h(void)
- }
-
- /* check kerberos support using compile flags only for version < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef TLS_KERBEROS_SUPPORT
- kerberos_support=1;
-@@ -847,7 +852,7 @@ void destroy_tls_h(void)
+@@ -857,7 +859,7 @@ void destroy_tls_h(void)
tls_destroy_cfg();
tls_destroy_locks();
tls_ct_wq_destroy();
@@ -135,4 +31,4 @@ Index: src/modules/tls/tls_init.c
+#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
/* explicit execution of libssl cleanup to avoid being executed again
* by atexit(), when shm is gone */
- DBG("executing openssl v1.1+ cleanup\n");
+ LM_DBG("executing openssl v1.1+ cleanup\n");
Index: patches/patch-src_modules_tls_tls_init_h
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_init_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_init_h
--- patches/patch-src_modules_tls_tls_init_h 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_init_h 31 Mar 2018 09:00:39 -0000
@@ -3,12 +3,13 @@ $OpenBSD: patch-src_modules_tls_tls_init
Index: src/modules/tls/tls_init.h
--- src/modules/tls/tls_init.h.orig
+++ src/modules/tls/tls_init.h
-@@ -45,7 +45,7 @@ extern int openssl_kssl_malloc_bug; /* is openssl bug
+@@ -45,7 +45,8 @@ extern int openssl_kssl_malloc_bug; /* is openssl bug
#endif
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
extern const SSL_METHOD* ssl_methods[];
#else
typedef struct sr_tls_methods_s {
Index: patches/patch-src_modules_tls_tls_locking_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_locking_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_locking_c
--- patches/patch-src_modules_tls_tls_locking_c 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_locking_c 31 Mar 2018 09:00:39 -0000
@@ -3,21 +3,43 @@ $OpenBSD: patch-src_modules_tls_tls_lock
Index: src/modules/tls/tls_locking.c
--- src/modules/tls/tls_locking.c.orig
+++ src/modules/tls/tls_locking.c
-@@ -33,7 +33,7 @@ static int n_static_locks=0;
+@@ -33,7 +33,8 @@ static int n_static_locks=0;
static gen_lock_set_t* static_locks=0;
/* OpenSSL is thread-safe since 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* "dynamic" locks */
-@@ -168,7 +168,7 @@ int tls_init_locks()
+@@ -94,8 +95,8 @@ static void dyn_destroy_f(struct CRYPTO_dynlock_value
+ shm_free(l);
+ }
+
++#endif /* openssl < 0x10100000L (1.1.0) or LibreSSL */
+
+-
+ /* normal locking callback */
+ static void locking_f(int mode, int n, const char* file, int line)
+ {
+@@ -118,9 +119,7 @@ static void locking_f(int mode, int n, const char* fil
+ }
+ }
+
+-#endif /* openssl < 0x10100000L (1.1.0) or LibreSSL */
+
+-
+ void tls_destroy_locks()
+ {
+ if (static_locks){
+@@ -168,7 +167,8 @@ int tls_init_locks()
}
/* OpenSSL is thread-safe since 1.1.0 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* set "dynamic" locks callbacks */
CRYPTO_set_dynlock_create_callback(dyn_create_f);
CRYPTO_set_dynlock_lock_callback(dyn_lock_f);
Index: patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
--- patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c 31 Mar 2018 09:00:39 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_modules_xhttp_pi_xht
Index: src/modules/xhttp_pi/xhttp_pi_fnc.c
--- src/modules/xhttp_pi/xhttp_pi_fnc.c.orig
+++ src/modules/xhttp_pi/xhttp_pi_fnc.c
-@@ -3193,7 +3193,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+@@ -3186,7 +3186,7 @@ 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){
@@ -12,7 +12,7 @@ Index: src/modules/xhttp_pi/xhttp_pi_fnc
values[j].val.time_val);
goto error;
}
-@@ -3201,7 +3201,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+@@ -3194,7 +3194,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
ctx->reply.body.len += val_str.len;
if(link_on) XHTTP_PI_COPY_2(p,XHTTP_PI_SQUOT_GT,val_str);
LM_DBG(" got %.*s[%d]=>"
Index: patches/patch-src_modules_xmlrpc_xmlrpc_c
===================================================================
RCS file: patches/patch-src_modules_xmlrpc_xmlrpc_c
diff -N patches/patch-src_modules_xmlrpc_xmlrpc_c
--- patches/patch-src_modules_xmlrpc_xmlrpc_c 3 Jul 2017 22:14:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_modules_xmlrpc_xmlrpc_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
-
-Index: src/modules/xmlrpc/xmlrpc.c
---- src/modules/xmlrpc/xmlrpc.c.orig
-+++ src/modules/xmlrpc/xmlrpc.c
-@@ -19,7 +19,7 @@
- * Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
- /*This define breaks on Solaris OS */
--#ifndef __OS_solaris
-+#if !defined (__OS_solaris) && !defined (__OpenBSD__)
- #define _XOPEN_SOURCE 4 /* strptime */
- #endif
- #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
Index: patches/patch-utils_kamctl_kamctl_base
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctl_base,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-utils_kamctl_kamctl_base
--- patches/patch-utils_kamctl_kamctl_base 3 Jul 2017 22:14:20 -0000 1.5
+++ patches/patch-utils_kamctl_kamctl_base 31 Mar 2018 09:00:39 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-utils_kamctl_kamctl_base,v 1.5 2017/07/03 22:14:20 sthen Exp $
---- utils/kamctl/kamctl.base.orig Wed Apr 5 16:32:39 2017
-+++ utils/kamctl/kamctl.base Mon May 15 21:48:56 2017
-@@ -556,7 +556,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"
+Index: utils/kamctl/kamctl.base
+--- utils/kamctl/kamctl.base.orig
++++ utils/kamctl/kamctl.base
+@@ -559,7 +559,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"
mdbg() {
if [ "0$VERBOSE" -ne 0 ] ; then
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -10,7 +11,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -565,7 +565,7 @@ mdbg() {
+@@ -568,7 +568,7 @@ mdbg() {
mwarn() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -19,7 +20,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** WARNING: $1"
fi
-@@ -573,7 +573,7 @@ mwarn() {
+@@ -576,7 +576,7 @@ mwarn() {
minfo() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -28,7 +29,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** INFO: $1"
fi
-@@ -581,7 +581,7 @@ minfo() {
+@@ -584,7 +584,7 @@ minfo() {
mecho() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -37,7 +38,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -589,7 +589,7 @@ mecho() {
+@@ -592,7 +592,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.5
diff -u -p -u -p -r1.5 patch-utils_kamctl_kamctlrc
--- patches/patch-utils_kamctl_kamctlrc 20 Mar 2018 22:03:35 -0000 1.5
+++ patches/patch-utils_kamctl_kamctlrc 31 Mar 2018 09:00:39 -0000
@@ -11,7 +11,7 @@ Index: utils/kamctl/kamctlrc
# awk tool
# AWK="awk"
-@@ -151,8 +151,11 @@
+@@ -155,8 +155,11 @@
## Kamailio START Options
## PID file path - default is: /var/run/kamailio.pid
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 3 Jul 2017 22:14:20 -0000 1.6
+++ pkg/PLIST-main 31 Mar 2018 09:00:39 -0000
@@ -19,8 +19,10 @@ lib/kamailio/kamctl/kamdbctl.dbtext
@lib lib/kamailio/libtrie.so.${LIBtrie_VERSION}
lib/kamailio/modules/
lib/kamailio/modules/acc.so
+lib/kamailio/modules/acc_diameter.so
lib/kamailio/modules/alias_db.so
lib/kamailio/modules/app_jsdt.so
+lib/kamailio/modules/app_sqlang.so
lib/kamailio/modules/async.so
lib/kamailio/modules/auth.so
lib/kamailio/modules/auth_db.so
@@ -32,6 +34,7 @@ lib/kamailio/modules/avpops.so
lib/kamailio/modules/benchmark.so
lib/kamailio/modules/blst.so
lib/kamailio/modules/call_control.so
+lib/kamailio/modules/call_obj.so
lib/kamailio/modules/cfg_db.so
lib/kamailio/modules/cfg_rpc.so
lib/kamailio/modules/cfgt.so
@@ -56,6 +59,7 @@ lib/kamailio/modules/domain.so
lib/kamailio/modules/domainpolicy.so
lib/kamailio/modules/drouting.so
lib/kamailio/modules/enum.so
+lib/kamailio/modules/evrexec.so
lib/kamailio/modules/exec.so
lib/kamailio/modules/group.so
lib/kamailio/modules/htable.so
@@ -64,6 +68,7 @@ lib/kamailio/modules/http_client.so
lib/kamailio/modules/imc.so
lib/kamailio/modules/ipops.so
lib/kamailio/modules/jsonrpcs.so
+lib/kamailio/modules/keepalive.so
lib/kamailio/modules/kex.so
lib/kamailio/modules/lcr.so
lib/kamailio/modules/log_custom.so
@@ -103,6 +108,7 @@ lib/kamailio/modules/sca.so
lib/kamailio/modules/sdpops.so
lib/kamailio/modules/seas.so
lib/kamailio/modules/sipcapture.so
+lib/kamailio/modules/sipdump.so
lib/kamailio/modules/sipt.so
lib/kamailio/modules/siptrace.so
lib/kamailio/modules/siputils.so
@@ -159,8 +165,10 @@ share/doc/kamailio/INSTALL
share/doc/kamailio/README
share/doc/kamailio/modules/
share/doc/kamailio/modules/README.acc
+share/doc/kamailio/modules/README.acc_diameter
share/doc/kamailio/modules/README.alias_db
share/doc/kamailio/modules/README.app_jsdt
+share/doc/kamailio/modules/README.app_sqlang
share/doc/kamailio/modules/README.async
share/doc/kamailio/modules/README.auth
share/doc/kamailio/modules/README.auth_db
@@ -172,6 +180,7 @@ share/doc/kamailio/modules/README.avpops
share/doc/kamailio/modules/README.benchmark
share/doc/kamailio/modules/README.blst
share/doc/kamailio/modules/README.call_control
+share/doc/kamailio/modules/README.call_obj
share/doc/kamailio/modules/README.cfg_db
share/doc/kamailio/modules/README.cfg_rpc
share/doc/kamailio/modules/README.cfgt
@@ -196,6 +205,7 @@ share/doc/kamailio/modules/README.domain
share/doc/kamailio/modules/README.domainpolicy
share/doc/kamailio/modules/README.drouting
share/doc/kamailio/modules/README.enum
+share/doc/kamailio/modules/README.evrexec
share/doc/kamailio/modules/README.exec
share/doc/kamailio/modules/README.group
share/doc/kamailio/modules/README.htable
@@ -204,6 +214,7 @@ share/doc/kamailio/modules/README.http_c
share/doc/kamailio/modules/README.imc
share/doc/kamailio/modules/README.ipops
share/doc/kamailio/modules/README.jsonrpcs
+share/doc/kamailio/modules/README.keepalive
share/doc/kamailio/modules/README.kex
share/doc/kamailio/modules/README.lcr
share/doc/kamailio/modules/README.log_custom
@@ -243,6 +254,7 @@ 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.sipdump
share/doc/kamailio/modules/README.sipt
share/doc/kamailio/modules/README.siptrace
share/doc/kamailio/modules/README.siputils
@@ -288,8 +300,6 @@ share/doc/kamailio/modules/README.xprint
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.cfg
@sample ${SYSCONFDIR}/kamailio/kamailio.cfg
share/examples/kamailio/kamctlrc
