mykola/freebsd-ports
1
0
Fork 0
forked from Lainports/freebsd-ports
Code Pull requests Activity

- Update pjsip to 2.9

Browse source 
- Remove patches already applied upstream
- Bump PORTREVISION on asterisk ports to avoid crashes
This commit is contained in:
Guido Falsi 2019-06-19 17:18:05 +00:00
parent b8aeb489a3
commit f4bee3e260
8 changed files with 8 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net/asterisk13/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= asterisk
PORTVERSION= 13.27.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \

2
net/asterisk15/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= asterisk
PORTVERSION= 15.7.2
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \

1
net/asterisk16/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= asterisk
PORTVERSION= 16.4.0
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \

3
net/pjsip/Makefile
View file

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= pjsip
PORTVERSION= 2.8
PORTREVISION= 2
PORTVERSION= 2.9
CATEGORIES= net
MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/
DISTNAME= pjproject-${DISTVERSION}

6
net/pjsip/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1544602652
SHA256 (pjproject-2.8.tar.bz2) = 503d0bd7f9f13dc1492ac9b71b761b1089851fbb608b9a13996edc3c42006f79
SIZE (pjproject-2.8.tar.bz2) = 4976501
TIMESTAMP = 1560947683
SHA256 (pjproject-2.9.tar.bz2) = d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636
SIZE (pjproject-2.9.tar.bz2) = 5009546

33
net/pjsip/files/patch-0010-outgoing_connected_line_method_update
View file

@ -1,33 +0,0 @@
diff --git a/pjsip/src/pjsip-ua/sip_inv.c b/pjsip/src/pjsip-ua/sip_inv.c
--- pjsip/src/pjsip-ua/sip_inv.c
+++ pjsip/src/pjsip-ua/sip_inv.c
@@ -4185,6 +4185,29 @@
if (tsx->status_code != 100) {
+ if (inv->role == PJSIP_ROLE_UAC) {
+ pjsip_rx_data *rdata = e->body.tsx_state.src.rdata;
+ pjsip_allow_hdr *allow = NULL;
+ pjsip_msg *msg = rdata->msg_info.msg;
+
+ if (msg) {
+ allow = (pjsip_allow_hdr*) pjsip_msg_find_hdr(msg, PJSIP_H_ALLOW,
+ NULL);
+ }
+ if (allow) {
+ unsigned i;
+ const pj_str_t STR_UPDATE = { "UPDATE", 6 };
+
+ for (i=0; i<allow->count; ++i) {
+ if (pj_stricmp(&allow->values[i], &STR_UPDATE)==0) {
+ /* UPDATE is present in Allow */
+ inv->options |= PJSIP_INV_SUPPORT_UPDATE;
+ break;
+ }
+ }
+ }
+ }
+
if (dlg->remote.info->tag.slen)
inv_set_state(inv, PJSIP_INV_STATE_EARLY, e);

42
net/pjsip/files/patch-0020-Fixed-2172-Avoid-double-reference-counter-decrements
View file

@ -1,42 +0,0 @@
From 1fed39fe1488abd654a5488b5e6ad59b4b973331 Mon Sep 17 00:00:00 2001
From: nanang <nanang@localhost>
Date: Tue, 8 Jan 2019 09:07:47 +0000
Subject: [PATCH 1/5] Fixed #2172: Avoid double reference counter decrements in
timer in the scenario of race condition between pj_timer_heap_cancel() and
pj_timer_heap_poll().
---
pjlib/src/pj/timer.c | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/pjlib/src/pj/timer.c b/pjlib/src/pj/timer.c
index 90a95e37b..7bae084ef 100644
--- pjlib/src/pj/timer.c
+++ pjlib/src/pj/timer.c
@@ -580,13 +580,16 @@ static int cancel_timer(pj_timer_heap_t *ht,
lock_timer_heap(ht);
count = cancel(ht, entry, flags | F_DONT_CALL);
- if (flags & F_SET_ID) {
- entry->id = id_val;
- }
- if (entry->_grp_lock) {
- pj_grp_lock_t *grp_lock = entry->_grp_lock;
- entry->_grp_lock = NULL;
- pj_grp_lock_dec_ref(grp_lock);
+ if (count > 0) {
+ /* Timer entry found & cancelled */
+ if (flags & F_SET_ID) {
+ entry->id = id_val;
+ }
+ if (entry->_grp_lock) {
+ pj_grp_lock_t *grp_lock = entry->_grp_lock;
+ entry->_grp_lock = NULL;
+ pj_grp_lock_dec_ref(grp_lock);
+ }
}
unlock_timer_heap(ht);
--
2.20.1

1
net/pjsip/pkg-plist
View file

@ -220,6 +220,7 @@ include/pjmedia/transport.h
include/pjmedia/types.h
include/pjmedia/vid_codec_util.h
include/pjmedia/vid_codec.h
include/pjmedia/vid_conf.h
include/pjmedia/vid_port.h
include/pjmedia/vid_stream.h
include/pjmedia/vid_tee.h