svn commit: r487308 - in head/net/kamailio: . files

[Kurt Jaeger]

Author: pi
Date: Wed Dec 12 17:59:31 2018
New Revision: 487308
URL: https://svnweb.freebsd.org/changeset/ports/487308

Log:
  net/kamailio: update 5.1.6 -> 5.2.0, fix build with libressl
  
  PR:		230202
  Submitted by:	dewayne at heuristicsystems.com.au
  Relnotes:	https://www.kamailio.org/w/kamailio-v5-2-0-release-notes/

Added:
  head/net/kamailio/files/patch-src_modules_tls_tls__bio.c   (contents, props changed)
Deleted:
  head/net/kamailio/files/patch-src_modules_tls_sip-router__cert.sh
Modified:
  head/net/kamailio/Makefile
  head/net/kamailio/distinfo
  head/net/kamailio/pkg-plist

Modified: head/net/kamailio/Makefile
==============================================================================
--- head/net/kamailio/Makefile	Wed Dec 12 17:34:57 2018	(r487307)
+++ head/net/kamailio/Makefile	Wed Dec 12 17:59:31 2018	(r487308)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	kamailio
-PORTVERSION=	5.1.6
+PORTVERSION=	5.2.0
 
 CATEGORIES=	net
 MASTER_SITES=	http://www.kamailio.org/pub/kamailio/${PORTVERSION}/src/

Modified: head/net/kamailio/distinfo
==============================================================================
--- head/net/kamailio/distinfo	Wed Dec 12 17:34:57 2018	(r487307)
+++ head/net/kamailio/distinfo	Wed Dec 12 17:59:31 2018	(r487308)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1540935356
-SHA256 (kamailio-5.1.6_src.tar.gz) = 99880df20dd836e4d9ec03fe863f7a5fc77bb29e3d56f59ea92b8b986deb5186
-SIZE (kamailio-5.1.6_src.tar.gz) = 12072159
+TIMESTAMP = 1544566071
+SHA256 (kamailio-5.2.0_src.tar.gz) = 74862a7503906b8d154cc9252c9dcec20a58638d451d1c17a4eab05fe35d1cdd
+SIZE (kamailio-5.2.0_src.tar.gz) = 12234968

Added: head/net/kamailio/files/patch-src_modules_tls_tls__bio.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/kamailio/files/patch-src_modules_tls_tls__bio.c	Wed Dec 12 17:59:31 2018	(r487308)
@@ -0,0 +1,20 @@
+--- src/modules/tls/tls_bio.c.orig	2018-11-28 11:08:42.000000000 +0100
++++ src/modules/tls/tls_bio.c	2018-12-12 18:28:16.580475000 +0100
+@@ -63,7 +63,7 @@
+ static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2);
+ 
+ 
+-#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x010100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL )
+ static BIO_METHOD tls_mbuf_method = {
+ 	BIO_TYPE_TLS_MBUF,	/* type */
+ 	"sr_tls_mbuf",		/* name */
+@@ -109,7 +109,7 @@
+ /** returns a custom tls_mbuf BIO. */
+ BIO_METHOD* tls_BIO_mbuf(void)
+ {
+-#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x010100000L || ( defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL )
+ 	return &tls_mbuf_method;
+ #else
+ 	if(tls_mbuf_method != NULL) {

Modified: head/net/kamailio/pkg-plist
==============================================================================
--- head/net/kamailio/pkg-plist	Wed Dec 12 17:34:57 2018	(r487307)
+++ head/net/kamailio/pkg-plist	Wed Dec 12 17:59:31 2018	(r487308)
@@ -47,6 +47,7 @@ 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/carrierroute.so
 %%MYSQL%%lib/kamailio/modules/cfg_db.so
 lib/kamailio/modules/cfg_rpc.so
 lib/kamailio/modules/cfgt.so
@@ -120,6 +121,7 @@ lib/kamailio/modules/sdpops.so
 lib/kamailio/modules/seas.so
 %%MYSQL%%lib/kamailio/modules/sipcapture.so
 lib/kamailio/modules/sipdump.so
+lib/kamailio/modules/sipjson.so
 lib/kamailio/modules/sipt.so
 %%MYSQL%%lib/kamailio/modules/siptrace.so
 lib/kamailio/modules/siputils.so