Date: Sat, 20 May 2017 08:18:58 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r441292 - in head/net: asterisk13 pjsip pjsip/files Message-ID: <201705200818.v4K8Iwdb099464@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Sat May 20 08:18:58 2017 New Revision: 441292 URL: https://svnweb.freebsd.org/changeset/ports/441292 Log: - Update net/asterisk13 to 13.15.1 - 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 Added: head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c (contents, props changed) head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c (contents, props changed) Modified: head/net/asterisk13/Makefile head/net/asterisk13/distinfo head/net/pjsip/Makefile head/net/pjsip/files/patch-aconfigure head/net/pjsip/files/patch-build.mak.in head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in head/net/pjsip/files/patch-third__party_build_os-auto.mak.in Modified: head/net/asterisk13/Makefile ============================================================================== --- head/net/asterisk13/Makefile Sat May 20 06:49:50 2017 (r441291) +++ head/net/asterisk13/Makefile Sat May 20 08:18:58 2017 (r441292) @@ -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/ \ Modified: head/net/asterisk13/distinfo ============================================================================== --- head/net/asterisk13/distinfo Sat May 20 06:49:50 2017 (r441291) +++ head/net/asterisk13/distinfo Sat May 20 08:18:58 2017 (r441292) @@ -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 Modified: head/net/pjsip/Makefile ============================================================================== --- head/net/pjsip/Makefile Sat May 20 06:49:50 2017 (r441291) +++ head/net/pjsip/Makefile Sat May 20 08:18:58 2017 (r441292) @@ -2,6 +2,7 @@ PORTNAME= pjsip PORTVERSION= 2.6 +PORTREVISION= 1 CATEGORIES= net MASTER_SITES= http://www.pjsip.org/release/${PORTVERSION}/ DISTNAME= pjproject-${DISTVERSION} Modified: head/net/pjsip/files/patch-aconfigure ============================================================================== --- head/net/pjsip/files/patch-aconfigure Sat May 20 06:49:50 2017 (r441291) +++ head/net/pjsip/files/patch-aconfigure Sat May 20 08:18:58 2017 (r441292) @@ -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" ;; Modified: head/net/pjsip/files/patch-build.mak.in ============================================================================== --- head/net/pjsip/files/patch-build.mak.in Sat May 20 06:49:50 2017 (r441291) +++ head/net/pjsip/files/patch-build.mak.in Sat May 20 08:18:58 2017 (r441292) @@ -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 Modified: head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c ============================================================================== --- head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c Sat May 20 06:49:50 2017 (r441291) +++ head/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c Sat May 20 08:18:58 2017 (r441292) @@ -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) { Modified: head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in ============================================================================== --- head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in Sat May 20 06:49:50 2017 (r441291) +++ head/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in Sat May 20 08:18:58 2017 (r441292) @@ -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 Added: head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c Sat May 20 08:18:58 2017 (r441292) @@ -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. Added: head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c Sat May 20 08:18:58 2017 (r441292) @@ -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. */ Modified: head/net/pjsip/files/patch-third__party_build_os-auto.mak.in ============================================================================== --- head/net/pjsip/files/patch-third__party_build_os-auto.mak.in Sat May 20 06:49:50 2017 (r441291) +++ head/net/pjsip/files/patch-third__party_build_os-auto.mak.in Sat May 20 08:18:58 2017 (r441292) @@ -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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705200818.v4K8Iwdb099464>