cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update net/asterisk13 to 13.15.1

Browse Source 
- Import patches to fix security issues in net/pjsip [1]
- While here regenerate net/pjsip patches

Obtained from:	Asterisk 13.15.1 distribution file [1]
MFH:		2017Q2
Security:	0537afa3-3ce0-11e7-bf9d-001999f8d30b
Security:	fab87bff-3ce5-11e7-bf9d-001999f8d30b
This commit is contained in:
Guido Falsi 2017-05-20 08:18:58 +00:00
parent f5782542b3
commit 46d742e1b1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=441292
10 changed files with 50 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/asterisk13/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= asterisk
PORTVERSION= 13.15.0
PORTREVISION= 1
PORTVERSION= 13.15.1
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
MASTER_SITE_SUBDIR= asterisk/ \

6
net/asterisk13/distinfo
View File

@ -1,6 +1,6 @@
TIMESTAMP = 1491584566
SHA256 (asterisk-13.15.0.tar.gz) = 8b8a55557d9c882f9b68f61b62f5f8af5c9ad68b6da6a1aa3506fa1894fb5844
SIZE (asterisk-13.15.0.tar.gz) = 32851716
TIMESTAMP = 1495231925
SHA256 (asterisk-13.15.1.tar.gz) = 03d29bcb0e1791809fb21fa80c3a7e8ab2f521e1f4397f625d1fe982f64186e2
SIZE (asterisk-13.15.1.tar.gz) = 32828857
SHA256 (asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9
SIZE (asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123
SHA256 (asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585

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 \