net/kamailio: update 5.1.6 -> 5.2.0, fix build with libressl

PR:		230202
Submitted by:	dewayne@heuristicsystems.com.au
Relnotes:	https://www.kamailio.org/w/kamailio-v5-2-0-release-notes/
This commit is contained in:
Kurt Jaeger 2018-12-12 17:59:31 +00:00
parent 5107fb4b8a
commit 05a7fc95fb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=487308
5 changed files with 26 additions and 13 deletions

View File

@ -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/

View File

@ -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

View File

@ -1,9 +0,0 @@
--- src/modules/tls/sip-router_cert.sh.orig 2018-03-01 16:24:10 UTC
+++ src/modules/tls/sip-router_cert.sh
@@ -197,5 +197,6 @@ if [ $? != 0 ] ; then
else
echo "Private key stored in '$DIR/$KEY_FILENAME'."
echo "Certificate stored in '$DIR/$CERT_FILENAME'."
+ rm ~/.rnd
exit 0;
fi

View File

@ -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) {

View File

@ -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