Index: net/pjsip/Makefile =================================================================== --- net/pjsip/Makefile (revision 528058) +++ net/pjsip/Makefile (working copy) @@ -1,11 +1,8 @@ # $FreeBSD$ PORTNAME= pjsip -PORTVERSION= 2.9 -PORTREVISION= 4 +DISTVERSION= 2.10 CATEGORIES= net -MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ -DISTNAME= pjproject-${DISTVERSION} MAINTAINER= madpilot@FreeBSD.org COMMENT= Multimedia communication library written in C language @@ -13,9 +10,14 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libportaudio.so:audio/portaudio +LIB_DEPENDS= libportaudio.so:audio/portaudio \ + libopus.so:audio/opus \ + libuuid.so:misc/e2fsprogs-libuuid \ + libvpx.so:multimedia/libvpx USES= gmake localbase pathfix ssl tar:bz2 +USE_GITHUB= yes +GH_PROJECT= pjproject USE_LDCONFIG= yes CONFLICTS?= pjsip-extsrtp @@ -30,7 +32,7 @@ OPTIONS_DEFINE= AMR DEBUG EXTSRTP FFMPEG G711 G722 G7221 GSM ILBC IPV6 \ L16 OPENH264 PJSUA RESAMPLE RESAMPLEDLL SAMPLERATE SDL \ SHARED SOUND SPEEX SPEEXAEC V4L VIDEO WEBRTC -OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC +OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC VIDEO WEBRTC EXTSRTP_DESC= Use libsrtp port (needed to get SRTP support in asterisk pjsip backend) G711_DESC= G.711 codec support @@ -45,7 +47,7 @@ SHARED_DESC= Build shared libraries (other ports may depend on this) SPEEXAEC_DESC= Speex Acoustic Echo Canceller/AEC V4L_DESC= Video4Linux2 support -WEBRTC_DESC= Build linwebrtc +WEBRTC_DESC= Build libwebrtc OPTIONS_SUB= yes Index: net/pjsip/distinfo =================================================================== --- net/pjsip/distinfo (revision 528058) +++ net/pjsip/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1560947683 -SHA256 (pjproject-2.9.tar.bz2) = d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636 -SIZE (pjproject-2.9.tar.bz2) = 5009546 +TIMESTAMP = 1586797388 +SHA256 (pjsip-pjproject-2.10_GH0.tar.gz) = 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de +SIZE (pjsip-pjproject-2.10_GH0.tar.gz) = 8768705 Index: net/pjsip/files/patch-0030 =================================================================== --- net/pjsip/files/patch-0030 (revision 528058) +++ net/pjsip/files/patch-0030 (nonexistent) @@ -1,105 +0,0 @@ -From 489281f29fc7b97143cf79154f22e5007adaba39 Mon Sep 17 00:00:00 2001 -From: George Joseph -Date: Wed, 9 Oct 2019 07:49:44 -0600 -Subject: [PATCH 30/31] ssl regression fix - ---- - pjlib/src/pj/ssl_sock_gtls.c | 6 ++++-- - pjlib/src/pj/ssl_sock_imp_common.c | 4 ++++ - pjlib/src/pj/ssl_sock_imp_common.h | 3 +++ - pjlib/src/pj/ssl_sock_ossl.c | 9 +++++---- - 4 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/pjlib/src/pj/ssl_sock_gtls.c b/pjlib/src/pj/ssl_sock_gtls.c -index 311b7b757..484770ae4 100644 ---- pjlib/src/pj/ssl_sock_gtls.c -+++ pjlib/src/pj/ssl_sock_gtls.c -@@ -1050,7 +1050,8 @@ static void ssl_update_certs_info(pj_ssl_sock_t *ssock) - goto us_out; - - tls_cert_get_info(ssock->pool, &ssock->local_cert_info, cert); -- tls_cert_get_chain_raw(ssock->pool, &ssock->local_cert_info, us, 1); -+ pj_pool_reset(ssock->info_pool); -+ tls_cert_get_chain_raw(ssock->info_pool, &ssock->local_cert_info, us, 1); - - us_out: - tls_last_error = ret; -@@ -1077,7 +1078,8 @@ us_out: - goto peer_out; - - tls_cert_get_info(ssock->pool, &ssock->remote_cert_info, cert); -- tls_cert_get_chain_raw(ssock->pool, &ssock->remote_cert_info, certs, -+ pj_pool_reset(ssock->info_pool); -+ tls_cert_get_chain_raw(ssock->info_pool, &ssock->remote_cert_info, certs, - certslen); - - peer_out: -diff --git a/pjlib/src/pj/ssl_sock_imp_common.c b/pjlib/src/pj/ssl_sock_imp_common.c -index e6273d832..51a62a2fb 100644 ---- pjlib/src/pj/ssl_sock_imp_common.c -+++ pjlib/src/pj/ssl_sock_imp_common.c -@@ -616,6 +616,7 @@ static void ssl_on_destroy(void *arg) - } - - /* Secure release pool, i.e: all memory blocks will be zeroed first */ -+ pj_pool_secure_release(&ssock->info_pool); - pj_pool_secure_release(&ssock->pool); - } - -@@ -1262,15 +1263,18 @@ PJ_DEF(pj_status_t) pj_ssl_sock_create (pj_pool_t *pool, - { - pj_ssl_sock_t *ssock; - pj_status_t status; -+ pj_pool_t *info_pool; - - PJ_ASSERT_RETURN(pool && param && p_ssock, PJ_EINVAL); - PJ_ASSERT_RETURN(param->sock_type == pj_SOCK_STREAM(), PJ_ENOTSUP); - -+ info_pool = pj_pool_create(pool->factory, "ssl_chain%p", 512, 512, NULL); - pool = pj_pool_create(pool->factory, "ssl%p", 512, 512, NULL); - - /* Create secure socket */ - ssock = ssl_alloc(pool); - ssock->pool = pool; -+ ssock->info_pool = info_pool; - ssock->sock = PJ_INVALID_SOCKET; - ssock->ssl_state = SSL_STATE_NULL; - ssock->circ_buf_input.owner = ssock; -diff --git a/pjlib/src/pj/ssl_sock_imp_common.h b/pjlib/src/pj/ssl_sock_imp_common.h -index 09f259ef7..eb45f14e0 100644 ---- pjlib/src/pj/ssl_sock_imp_common.h -+++ pjlib/src/pj/ssl_sock_imp_common.h -@@ -96,6 +96,9 @@ typedef struct circ_buf_t { - struct pj_ssl_sock_t - { - pj_pool_t *pool; -+ pj_pool_t *info_pool; /* this is for certificate chain -+ * information allocation. Don't use for -+ * other purposes. */ - pj_ssl_sock_t *parent; - pj_ssl_sock_param param; - pj_ssl_sock_param newsock_param; -diff --git a/pjlib/src/pj/ssl_sock_ossl.c b/pjlib/src/pj/ssl_sock_ossl.c -index b4ac5c15f..2545b7c37 100644 ---- pjlib/src/pj/ssl_sock_ossl.c -+++ pjlib/src/pj/ssl_sock_ossl.c -@@ -1637,11 +1637,12 @@ static void ssl_update_certs_info(pj_ssl_sock_t *ssock) - - chain = SSL_get_peer_cert_chain(ossock->ossl_ssl); - if (chain) { -- ssl_update_remote_cert_chain_info(ssock->pool, -- &ssock->remote_cert_info, -- chain, PJ_TRUE); -+ pj_pool_reset(ssock->info_pool); -+ ssl_update_remote_cert_chain_info(ssock->info_pool, -+ &ssock->remote_cert_info, -+ chain, PJ_TRUE); - } else { -- ssock->remote_cert_info.raw_chain.cnt = 0; -+ ssock->remote_cert_info.raw_chain.cnt = 0; - } - } - --- -2.21.0 - Property changes on: net/pjsip/files/patch-0030 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/pjsip/files/patch-0031 =================================================================== --- net/pjsip/files/patch-0031 (revision 528058) +++ net/pjsip/files/patch-0031 (nonexistent) @@ -1,187 +0,0 @@ -From 9c6108ca392d5e0392e7fb5d2ffde85e3c44ce55 Mon Sep 17 00:00:00 2001 -From: George Joseph -Date: Wed, 9 Oct 2019 07:50:32 -0600 -Subject: [PATCH 31/31] transport regression fix - ---- - pjsip/src/pjsip/sip_transport.c | 73 +++++++++++++++++++++++++++------ - 1 file changed, 61 insertions(+), 12 deletions(-) - -diff --git a/pjsip/src/pjsip/sip_transport.c b/pjsip/src/pjsip/sip_transport.c -index 65ac823d4..da6b70e50 100644 ---- pjsip/src/pjsip/sip_transport.c -+++ pjsip/src/pjsip/sip_transport.c -@@ -50,6 +50,24 @@ static const char *addr_string(const pj_sockaddr_t *addr) - str, sizeof(str)); - return str; - } -+static const char* print_tpsel_info(const pjsip_tpselector *sel) -+{ -+ static char tpsel_info_buf[80]; -+ if (!sel) return "(null)"; -+ if (sel->type==PJSIP_TPSELECTOR_LISTENER) -+ pj_ansi_snprintf(tpsel_info_buf, sizeof(tpsel_info_buf), -+ "listener[%s], reuse=%d", sel->u.listener->obj_name, -+ !sel->disable_connection_reuse); -+ else if (sel->type==PJSIP_TPSELECTOR_TRANSPORT) -+ pj_ansi_snprintf(tpsel_info_buf, sizeof(tpsel_info_buf), -+ "transport[%s], reuse=%d", sel->u.transport->info, -+ !sel->disable_connection_reuse); -+ else -+ pj_ansi_snprintf(tpsel_info_buf, sizeof(tpsel_info_buf), -+ "unknown[%p], reuse=%d", sel->u.ptr, -+ !sel->disable_connection_reuse); -+ return tpsel_info_buf; -+} - #else - # define TRACE_(x) - #endif -@@ -1210,10 +1228,14 @@ PJ_DEF(pj_status_t) pjsip_transport_register( pjsip_tpmgr *mgr, - * new transport to the list. - */ - pj_list_push_back(tp_ref, tp_add); -+ TRACE_((THIS_FILE, "Remote address already registered, " -+ "appended the transport to the list")); - } else { - /* Transport list not found, add it to the hash table. */ - pj_hash_set_np(mgr->table, &tp->key, key_len, hval, tp_add->tp_buf, - tp_add); -+ TRACE_((THIS_FILE, "Remote address not registered, " -+ "added the transport to the hash")); - } - - /* Add ref transport group lock, if any */ -@@ -1283,6 +1305,13 @@ static pj_status_t destroy_transport( pjsip_tpmgr *mgr, - /* The transport list has multiple entry. */ - pj_hash_set_np(mgr->table, &tp_next->tp->key, key_len, - hval, tp_next->tp_buf, tp_next); -+ TRACE_((THIS_FILE, "Hash entry updated after " -+ "transport %d being destroyed", -+ tp->obj_name)); -+ } else { -+ TRACE_((THIS_FILE, "Hash entry deleted after " -+ "transport %d being destroyed", -+ tp->obj_name)); - } - } - -@@ -1294,6 +1323,14 @@ static pj_status_t destroy_transport( pjsip_tpmgr *mgr, - } - tp_iter = tp_iter->next; - } while (tp_iter != tp_ref); -+ -+ if (tp_iter->tp != tp) { -+ PJ_LOG(3, (THIS_FILE, "Warning: transport %s being destroyed is " -+ "not registered", tp->obj_name)); -+ } -+ } else { -+ PJ_LOG(3, (THIS_FILE, "Warning: transport %s being destroyed is " -+ "not found in the hash table", tp->obj_name)); - } - - pj_lock_release(mgr->lock); -@@ -2159,6 +2196,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport(pjsip_tpmgr *mgr, - NULL, tp); - } - -+ - /* - * pjsip_tpmgr_acquire_transport2() - * -@@ -2176,8 +2214,9 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - pjsip_tpfactory *factory; - pj_status_t status; - -- TRACE_((THIS_FILE,"Acquiring transport type=%s, remote=%s:%d", -+ TRACE_((THIS_FILE,"Acquiring transport type=%s, sel=%s remote=%s:%d", - pjsip_transport_get_type_name(type), -+ print_tpsel_info(sel), - addr_string(remote), - pj_sockaddr_get_port(remote))); - -@@ -2194,6 +2233,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - /* See if the transport is (not) suitable */ - if (seltp->key.type != type) { - pj_lock_release(mgr->lock); -+ TRACE_((THIS_FILE, "Transport type in tpsel not matched")); - return PJSIP_ETPNOTSUITABLE; - } - -@@ -2234,6 +2274,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - { - if (sel->u.listener->type != type) { - pj_lock_release(mgr->lock); -+ TRACE_((THIS_FILE, "Listener type in tpsel not matched")); - return PJSIP_ETPNOTSUITABLE; - } - } -@@ -2249,21 +2290,25 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - tp_entry = (transport *)pj_hash_get(mgr->table, &key, key_len, - NULL); - if (tp_entry) { -- if (sel && sel->type == PJSIP_TPSELECTOR_LISTENER) { -- transport *tp_iter = tp_entry; -- do { -+ transport *tp_iter = tp_entry; -+ do { -+ /* Don't use transport being shutdown */ -+ if (!tp_iter->tp->is_shutdown) { - if (sel && sel->type == PJSIP_TPSELECTOR_LISTENER && -- sel->u.listener && -- tp_iter->tp->factory == sel->u.listener) -+ sel->u.listener) - { -+ /* Match listener if selector is set */ -+ if (tp_iter->tp->factory == sel->u.listener) { -+ tp_ref = tp_iter->tp; -+ break; -+ } -+ } else { - tp_ref = tp_iter->tp; - break; - } -- tp_iter = tp_iter->next; -- } while (tp_iter != tp_entry); -- } else { -- tp_ref = tp_entry->tp; -- } -+ } -+ tp_iter = tp_iter->next; -+ } while (tp_iter != tp_entry); - } - } - -@@ -2276,7 +2321,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - - /* Ignore address for loop transports. */ - if (type == PJSIP_TRANSPORT_LOOP || -- type == PJSIP_TRANSPORT_LOOP_DGRAM) -+ type == PJSIP_TRANSPORT_LOOP_DGRAM) - { - pj_sockaddr *addr = &key.rem_addr; - -@@ -2315,6 +2360,7 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - * 'duplicate' of the existing transport (same type & remote addr, - * but different factory). - */ -+ TRACE_((THIS_FILE, "Transport found but from different listener")); - } - - if (tp_ref!=NULL && !tp_ref->is_shutdown) { -@@ -2347,10 +2393,13 @@ PJ_DEF(pj_status_t) pjsip_tpmgr_acquire_transport2(pjsip_tpmgr *mgr, - */ - - /* Verify that the listener type matches the destination type */ -+ /* Already checked above. */ -+ /* - if (sel->u.listener->type != type) { - pj_lock_release(mgr->lock); - return PJSIP_ETPNOTSUITABLE; - } -+ */ - - /* We'll use this listener to create transport */ - factory = sel->u.listener; --- -2.21.0 - Property changes on: net/pjsip/files/patch-0031 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: net/pjsip/pkg-plist =================================================================== --- net/pjsip/pkg-plist (revision 528058) +++ net/pjsip/pkg-plist (working copy) @@ -229,6 +229,7 @@ include/pjmedia/wav_port.h include/pjmedia/wave.h include/pjmedia/wsola.h +include/pjmedia-codec/vpx.h include/pjnath.h include/pjnath/config.h include/pjnath/errno.h