From owner-svn-ports-head@freebsd.org Wed Dec 12 17:59:33 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1C8B4131711E; Wed, 12 Dec 2018 17:59:33 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AA9D6702EF; Wed, 12 Dec 2018 17:59:32 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 961BBB764; Wed, 12 Dec 2018 17:59:32 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wBCHxWof077432; Wed, 12 Dec 2018 17:59:32 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wBCHxVRc077428; Wed, 12 Dec 2018 17:59:31 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201812121759.wBCHxVRc077428@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Wed, 12 Dec 2018 17:59:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r487308 - in head/net/kamailio: . files X-SVN-Group: ports-head X-SVN-Commit-Author: pi X-SVN-Commit-Paths: in head/net/kamailio: . files X-SVN-Commit-Revision: 487308 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AA9D6702EF X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-0.42 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.42)[-0.420,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2018 17:59:33 -0000 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@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