kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Update pjsip to 2.7.1

Browse source 
- Import patches from the asterisk project
- Regenrate patches

Security:	19b052c9-c533-11e7-8da5-001999f8d30b
MFH:		2017Q4
This commit is contained in:
Guido Falsi 2017-11-15 18:27:19 +00:00
parent e06fc56461
commit 9e8af6a0fa
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=454258
8 changed files with 59 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
net/pjsip/Makefile
View file

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

6
net/pjsip/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1507196337
SHA256 (pjproject-2.7.tar.bz2) = 1c80621a11c39151b3c2511f06abc8ef031fc712bb2f9e9923b5301b04b28f6b
SIZE (pjproject-2.7.tar.bz2) = 4875407
TIMESTAMP = 1510760850
SHA256 (pjproject-2.7.1.tar.bz2) = 59fabc62a02b2b80857297cfb10e2c68c473f4a0acc6e848cfefe8421f2c3126
SIZE (pjproject-2.7.1.tar.bz2) = 4880007

8
net/pjsip/files/patch-aconfigure
View file

@ -1,6 +1,6 @@
--- aconfigure.orig 2017-01-25 11:23:08 UTC
--- aconfigure.orig 2017-11-01 05:23:36 UTC
+++ aconfigure
@@ -6310,14 +6310,7 @@ $as_echo "Checking sound device backend... null sound"
@@ -6362,14 +6362,7 @@ $as_echo "Checking sound device backend... null sound"
;;
*)
ac_pjmedia_snd=alsa
@ -15,7 +15,7 @@
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking sound device backend... unix" >&5
@@ -6941,7 +6934,7 @@ else
@@ -7022,7 +7015,7 @@ else
FFMPEG_PREFIX=$with_ffmpeg
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Using ffmpeg prefix... $FFMPEG_PREFIX" >&5
$as_echo "Using ffmpeg prefix... $FFMPEG_PREFIX" >&6; }
@ -24,7 +24,7 @@
fi
for ac_prog in pkg-config "python pkgconfig.py"
@@ -8493,7 +8486,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6;
@@ -8669,7 +8662,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6;
ac_webrtc_instset=sse2
ac_webrtc_cflags="-msse2"
;;

4
net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
View file

@ -1,6 +1,6 @@
--- pjmedia/build/os-auto.mak.in.orig 2016-08-25 01:36:33 UTC
--- pjmedia/build/os-auto.mak.in.orig 2017-09-22 02:42:22 UTC
+++ pjmedia/build/os-auto.mak.in
@@ -215,50 +215,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc/src
@@ -220,50 +220,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc/src
endif
endif

20
net/pjsip/files/patch-pjsip_src_pjsip_sip__parser.c Normal file
View file

@ -0,0 +1,20 @@
--- pjsip/src/pjsip/sip_parser.c.orig 2017-11-08 02:58:18 UTC
+++ pjsip/src/pjsip/sip_parser.c
@@ -834,13 +834,13 @@ PJ_DEF(pj_status_t) pjsip_find_msg( const char *buf, p
pj_bool_t is_datagram, pj_size_t *msg_size)
{
#if PJ_HAS_TCP
- const char *hdr_end;
- const char *body_start;
+ const char *volatile hdr_end;
+ const char *volatile body_start;
const char *pos;
- const char *line;
+ const char *volatile line;
int content_length = -1;
pj_str_t cur_msg;
- pj_status_t status = PJ_SUCCESS;
+ volatile pj_status_t status = PJSIP_EMISSINGHDR;
const pj_str_t end_hdr = { "\n\r\n", 3};
*msg_size = size;

25
net/pjsip/files/patch-pjsip_src_pjsip_sip__transport.c Normal file
View file

@ -0,0 +1,25 @@
--- pjsip/src/pjsip/sip_transport.c.orig 2017-11-08 02:58:18 UTC
+++ pjsip/src/pjsip/sip_transport.c
@@ -974,7 +974,21 @@ static pj_bool_t is_transport_valid(pjsip_transport *t
const pjsip_transport_key *key,
int key_len)
{
- return (pj_hash_get(tpmgr->table, key, key_len, NULL) == (void*)tp);
+ transport *tp_iter;
+
+ if (pj_hash_get(tpmgr->table, key, key_len, NULL) == (void*)tp) {
+ return PJ_TRUE;
+ }
+
+ tp_iter = tpmgr->tp_list.next;
+ while (tp_iter != &tpmgr->tp_list) {
+ if (tp_iter->tp == tp) {
+ return PJ_TRUE;
+ }
+ tp_iter = tp_iter->next;
+ }
+
+ return PJ_FALSE;
}
/*

4
net/pjsip/files/patch-third__party_build_os-auto.mak.in
View file

@ -1,6 +1,6 @@
--- third_party/build/os-auto.mak.in.orig 2016-12-22 09:33:55 UTC
--- third_party/build/os-auto.mak.in.orig 2017-09-22 02:42:22 UTC
+++ third_party/build/os-auto.mak.in
@@ -104,8 +104,7 @@ else ifneq ($(findstring mips,@ac_webrtc_instset@),)
@@ -112,8 +112,7 @@ else ifneq ($(findstring mips,@ac_webrtc_instset@),)
else # Generic fixed point
WEBRTC_SRC = \
modules/audio_processing/aecm/aecm_core_c.o \

2
net/pjsip/pkg-plist
View file

@ -14,6 +14,7 @@ include/pj/compat/cc_mwcc.h
include/pj/compat/ctype.h
include/pj/compat/errno.h
include/pj/compat/high_precision.h
include/pj/compat/limits.h
include/pj/compat/m_alpha.h
include/pj/compat/m_armv4.h
include/pj/compat/m_auto.h
@ -59,6 +60,7 @@ include/pj/guid.h
include/pj/hash.h
include/pj/ioqueue.h
include/pj/ip_helper.h
include/pj/limits.h
include/pj/list_i.h
include/pj/list.h
include/pj/lock.h