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

net/pjsip: sync with upstream

Browse source 
Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2017-05-20 15:24:52 +02:00
parent 6eab98399e
commit 70809a6ccb
8 changed files with 46 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
net/pjsip/Makefile
View file

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

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

@ -1,6 +1,6 @@
--- aconfigure.orig 2017-01-25 11:23:08 UTC
+++ aconfigure
@@ -6310,14 +6310,7 @@ $as_echo "Checking sound device backend.
@@ -6310,14 +6310,7 @@ $as_echo "Checking sound device backend... null sound"
;;
*)
ac_pjmedia_snd=alsa
@ -24,7 +24,7 @@
fi
for ac_prog in pkg-config "python pkgconfig.py"
@@ -8493,7 +8486,7 @@ $as_echo "Checking if libwebrtc is disab
@@ -8493,7 +8486,7 @@ $as_echo "Checking if libwebrtc is disabled...no" >&6;
ac_webrtc_instset=sse2
ac_webrtc_cflags="-msse2"
;;

2
net/pjsip/files/patch-build.mak.in
View file

@ -1,6 +1,6 @@
--- build.mak.in.orig 2016-08-25 01:36:33 UTC
+++ build.mak.in
@@ -106,7 +106,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/t
@@ -106,7 +106,7 @@ APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib
endif
endif

6
net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c
View file

@ -9,7 +9,7 @@
# include <openssl/obj_mac.h>
@@ -112,7 +112,7 @@ static unsigned get_nid_from_cid(unsigne
@@ -112,7 +112,7 @@ static unsigned get_nid_from_cid(unsigned cid)
#endif
@ -27,7 +27,7 @@
openssl_curves_num = SSL_get_shared_curve(ssl,-1);
if (openssl_curves_num > PJ_ARRAY_SIZE(openssl_curves))
openssl_curves_num = PJ_ARRAY_SIZE(openssl_curves);
@@ -1069,7 +1069,7 @@ static pj_status_t set_cipher_list(pj_ss
@@ -1069,7 +1069,7 @@ static pj_status_t set_cipher_list(pj_ssl_sock_t *ssoc
static pj_status_t set_curves_list(pj_ssl_sock_t *ssock)
{
@ -36,7 +36,7 @@
int ret;
int curves[PJ_SSL_SOCK_MAX_CURVES];
unsigned cnt;
@@ -1100,7 +1100,7 @@ static pj_status_t set_curves_list(pj_ss
@@ -1100,7 +1100,7 @@ static pj_status_t set_curves_list(pj_ssl_sock_t *ssoc
static pj_status_t set_sigalgs(pj_ssl_sock_t *ssock)
{

2
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
@@ -215,50 +215,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc
@@ -215,50 +215,7 @@ export CFLAGS += -I$(THIRD_PARTY)/webrtc/src
endif
endif

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

@ -0,0 +1,25 @@
--- pjsip/src/pjsip/sip_multipart.c.orig 2017-01-24 05:59:05 UTC
+++ pjsip/src/pjsip/sip_multipart.c
@@ -646,13 +646,15 @@ PJ_DEF(pjsip_msg_body*) pjsip_multipart_parse(pj_pool_
end_body = curptr;
- /* The newline preceeding the delimiter is conceptually part of
- * the delimiter, so trim it from the body.
- */
- if (*(end_body-1) == '\n')
- --end_body;
- if (*(end_body-1) == '\r')
- --end_body;
+ if (end_body > start_body) {
+ /* The newline preceeding the delimiter is conceptually part of
+ * the delimiter, so trim it from the body.
+ */
+ if (*(end_body-1) == '\n')
+ --end_body;
+ if (*(end_body-1) == '\r')
+ --end_body;
+ }
/* Now that we have determined the part's boundary, parse it
* to get the header and body part of the part.

12
net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c Normal file
View file

@ -0,0 +1,12 @@
--- pjsip/src/pjsip/sip_transaction.c.orig 2016-02-22 13:36:31 UTC
+++ pjsip/src/pjsip/sip_transaction.c
@@ -288,7 +288,8 @@ static pj_status_t create_tsx_key_2543( pj_pool_t *poo
host = &rdata->msg_info.via->sent_by.host;
/* Calculate length required. */
- len_required = 9 + /* CSeq number */
+ len_required = method->name.slen + /* Method */
+ 9 + /* CSeq number */
rdata->msg_info.from->tag.slen + /* From tag. */
rdata->msg_info.cid->id.slen + /* Call-ID */
host->slen + /* Via host. */

2
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
@@ -104,8 +104,7 @@ else ifneq ($(findstring mips,@ac_webrtc
@@ -104,8 +104,7 @@ else ifneq ($(findstring mips,@ac_webrtc_instset@),)
else # Generic fixed point
WEBRTC_SRC = \
modules/audio_processing/aecm/aecm_core_c.o \