5 files changed, 58 insertions, 94 deletions

diff --git a/net/pjsip/Makefile b/net/pjsip/Makefile
index e8b8dd698336..2676bc036fcb 100644
--- a/net/pjsip/Makefile
+++ b/net/pjsip/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	pjsip
-PORTVERSION=	2.6
-PORTREVISION=	2
+PORTVERSION=	2.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.pjsip.org/release/${PORTVERSION}/
 DISTNAME=	pjproject-${DISTVERSION}
diff --git a/net/pjsip/distinfo b/net/pjsip/distinfo
index f0b51f7da731..0884e5d11e69 100644
--- a/net/pjsip/distinfo
+++ b/net/pjsip/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486460881
-SHA256 (pjproject-2.6.tar.bz2) = 2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4
-SIZE (pjproject-2.6.tar.bz2) = 4933273
+TIMESTAMP = 1507196337
+SHA256 (pjproject-2.7.tar.bz2) = 1c80621a11c39151b3c2511f06abc8ef031fc712bb2f9e9923b5301b04b28f6b
+SIZE (pjproject-2.7.tar.bz2) = 4875407
diff --git a/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c b/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c
deleted file mode 100644
index c26fa42e95e4..000000000000
--- a/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- 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.
diff --git a/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c b/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c
deleted file mode 100644
index 159312fd0999..000000000000
--- a/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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. */
diff --git a/net/pjsip/pkg-plist b/net/pjsip/pkg-plist
index 386e3de886a1..d7cde6461c95 100644
--- a/net/pjsip/pkg-plist
+++ b/net/pjsip/pkg-plist
@@ -1,16 +1,5 @@
-include/pj++/file.hpp
-include/pj++/hash.hpp
-include/pj++/list.hpp
-include/pj++/lock.hpp
-include/pj++/os.hpp
-include/pj++/pool.hpp
-include/pj++/proactor.hpp
-include/pj++/scanner.hpp
-include/pj++/sock.hpp
-include/pj++/string.hpp
-include/pj++/timer.hpp
-include/pj++/tree.hpp
-include/pj++/types.hpp
+%%PJSUA%%bin/pjsua
+%%PJSUA%%bin/pjsystest
 include/pj/activesock.h
 include/pj/addr_resolv.h
 include/pj/array.h
@@ -38,14 +27,14 @@ include/pj/compat/malloc.h
 include/pj/compat/os_auto.h
 include/pj/compat/os_auto.h.in
 include/pj/compat/os_darwinos.h
-include/pj/compat/os_linux.h
 include/pj/compat/os_linux_kernel.h
+include/pj/compat/os_linux.h
 include/pj/compat/os_palmos.h
 include/pj/compat/os_rtems.h
 include/pj/compat/os_sunos.h
 include/pj/compat/os_symbian.h
-include/pj/compat/os_win32.h
 include/pj/compat/os_win32_wince.h
+include/pj/compat/os_win32.h
 include/pj/compat/os_winphone8.h
 include/pj/compat/os_winuwp.h
 include/pj/compat/rand.h
@@ -56,9 +45,9 @@ include/pj/compat/stdarg.h
 include/pj/compat/stdfileio.h
 include/pj/compat/string.h
 include/pj/compat/time.h
-include/pj/config.h
-include/pj/config_site.h
 include/pj/config_site_sample.h
+include/pj/config_site.h
+include/pj/config.h
 include/pj/ctype.h
 include/pj/doxygen.h
 include/pj/errno.h
@@ -70,38 +59,50 @@ include/pj/guid.h
 include/pj/hash.h
 include/pj/ioqueue.h
 include/pj/ip_helper.h
-include/pj/list.h
 include/pj/list_i.h
+include/pj/list.h
 include/pj/lock.h
 include/pj/log.h
 include/pj/math.h
 include/pj/os.h
-include/pj/pool.h
 include/pj/pool_alt.h
 include/pj/pool_buf.h
 include/pj/pool_i.h
+include/pj/pool.h
 include/pj/rand.h
 include/pj/rbtree.h
-include/pj/sock.h
 include/pj/sock_qos.h
 include/pj/sock_select.h
+include/pj/sock.h
 include/pj/ssl_sock.h
-include/pj/string.h
 include/pj/string_i.h
+include/pj/string.h
 include/pj/timer.h
 include/pj/types.h
 include/pj/unicode.h
-include/pjlib++.hpp
+include/pj++/file.hpp
+include/pj++/hash.hpp
+include/pj++/list.hpp
+include/pj++/lock.hpp
+include/pj++/os.hpp
+include/pj++/pool.hpp
+include/pj++/proactor.hpp
+include/pj++/scanner.hpp
+include/pj++/sock.hpp
+include/pj++/string.hpp
+include/pj++/timer.hpp
+include/pj++/tree.hpp
+include/pj++/types.hpp
 include/pjlib-util.h
 include/pjlib-util/base64.h
-include/pjlib-util/cli.h
 include/pjlib-util/cli_console.h
 include/pjlib-util/cli_imp.h
 include/pjlib-util/cli_telnet.h
+include/pjlib-util/cli.h
 include/pjlib-util/config.h
 include/pjlib-util/crc32.h
-include/pjlib-util/dns.h
 include/pjlib-util/dns_server.h
+include/pjlib-util/dns.h
 include/pjlib-util/errno.h
 include/pjlib-util/getopt.h
 include/pjlib-util/hmac_md5.h
@@ -111,9 +112,9 @@ include/pjlib-util/json.h
 include/pjlib-util/md5.h
 include/pjlib-util/pcap.h
 include/pjlib-util/resolver.h
-include/pjlib-util/scanner.h
 include/pjlib-util/scanner_cis_bitwise.h
 include/pjlib-util/scanner_cis_uint.h
+include/pjlib-util/scanner.h
 include/pjlib-util/sha1.h
 include/pjlib-util/srv_resolver.h
 include/pjlib-util/string.h
@@ -121,8 +122,11 @@ include/pjlib-util/stun_simple.h
 include/pjlib-util/types.h
 include/pjlib-util/xml.h
 include/pjlib.h
-include/pjmedia-audiodev/audiodev.h
+include/pjlib++.hpp
+include/pjmedia_audiodev.h
+include/pjmedia_videodev.h
 include/pjmedia-audiodev/audiodev_imp.h
+include/pjmedia-audiodev/audiodev.h
 include/pjmedia-audiodev/audiotest.h
 include/pjmedia-audiodev/config.h
 include/pjmedia-audiodev/errno.h
@@ -130,13 +134,14 @@ include/pjmedia-codec.h
 include/pjmedia-codec/amr_helper.h
 include/pjmedia-codec/amr_sdp_match.h
 include/pjmedia-codec/audio_codecs.h
-include/pjmedia-codec/config.h
+include/pjmedia-codec/bcg729.h
 include/pjmedia-codec/config_auto.h
 include/pjmedia-codec/config_auto.h.in
+include/pjmedia-codec/config.h
 include/pjmedia-codec/ffmpeg_vid_codecs.h
 include/pjmedia-codec/g722.h
-include/pjmedia-codec/g7221.h
 include/pjmedia-codec/g7221_sdp_match.h
+include/pjmedia-codec/g7221.h
 include/pjmedia-codec/gsm.h
 include/pjmedia-codec/h263_packetizer.h
 include/pjmedia-codec/h264_packetizer.h
@@ -150,30 +155,31 @@ include/pjmedia-codec/passthrough.h
 include/pjmedia-codec/silk.h
 include/pjmedia-codec/speex.h
 include/pjmedia-codec/types.h
+include/pjmedia-codec/vid_toolbox.h
 include/pjmedia-videodev/avi_dev.h
 include/pjmedia-videodev/config.h
 include/pjmedia-videodev/errno.h
 include/pjmedia-videodev/opengl_dev.h
-include/pjmedia-videodev/videodev.h
 include/pjmedia-videodev/videodev_imp.h
+include/pjmedia-videodev/videodev.h
 include/pjmedia.h
 include/pjmedia/alaw_ulaw.h
 include/pjmedia/audiodev.h
-include/pjmedia/avi.h
 include/pjmedia/avi_stream.h
+include/pjmedia/avi.h
 include/pjmedia/bidirectional.h
 include/pjmedia/circbuf.h
 include/pjmedia/clock.h
 include/pjmedia/codec.h
 include/pjmedia/conference.h
-include/pjmedia/config.h
 include/pjmedia/config_auto.h
 include/pjmedia/config_auto.h.in
+include/pjmedia/config.h
 include/pjmedia/converter.h
 include/pjmedia/delaybuf.h
 include/pjmedia/doxygen.h
-include/pjmedia/echo.h
 include/pjmedia/echo_port.h
+include/pjmedia/echo.h
 include/pjmedia/endpoint.h
 include/pjmedia/errno.h
 include/pjmedia/event.h
@@ -187,31 +193,31 @@ include/pjmedia/null_port.h
 include/pjmedia/plc.h
 include/pjmedia/port.h
 include/pjmedia/resample.h
-include/pjmedia/rtcp.h
 include/pjmedia/rtcp_xr.h
+include/pjmedia/rtcp.h
 include/pjmedia/rtp.h
-include/pjmedia/sdp.h
 include/pjmedia/sdp_neg.h
+include/pjmedia/sdp.h
 include/pjmedia/session.h
 include/pjmedia/signatures.h
 include/pjmedia/silencedet.h
-include/pjmedia/sound.h
 include/pjmedia/sound_port.h
+include/pjmedia/sound.h
 include/pjmedia/splitcomb.h
 include/pjmedia/stereo.h
-include/pjmedia/stream.h
 include/pjmedia/stream_common.h
+include/pjmedia/stream.h
 include/pjmedia/symbian_sound_aps.h
 include/pjmedia/tonegen.h
-include/pjmedia/transport.h
 include/pjmedia/transport_adapter_sample.h
 include/pjmedia/transport_ice.h
 include/pjmedia/transport_loop.h
 include/pjmedia/transport_srtp.h
 include/pjmedia/transport_udp.h
+include/pjmedia/transport.h
 include/pjmedia/types.h
-include/pjmedia/vid_codec.h
 include/pjmedia/vid_codec_util.h
+include/pjmedia/vid_codec.h
 include/pjmedia/vid_port.h
 include/pjmedia/vid_stream.h
 include/pjmedia/vid_tee.h
@@ -220,8 +226,6 @@ include/pjmedia/wav_playlist.h
 include/pjmedia/wav_port.h
 include/pjmedia/wave.h
 include/pjmedia/wsola.h
-include/pjmedia_audiodev.h
-include/pjmedia_videodev.h
 include/pjnath.h
 include/pjnath/config.h
 include/pjnath/errno.h
@@ -237,9 +241,12 @@ include/pjnath/stun_transaction.h
 include/pjnath/turn_session.h
 include/pjnath/turn_sock.h
 include/pjnath/types.h
+include/pjsip_auth.h
+include/pjsip_simple.h
+include/pjsip_ua.h
 include/pjsip-simple/errno.h
-include/pjsip-simple/evsub.h
 include/pjsip-simple/evsub_msg.h
+include/pjsip-simple/evsub.h
 include/pjsip-simple/iscomposing.h
 include/pjsip-simple/mwi.h
 include/pjsip-simple/pidf.h
@@ -256,10 +263,10 @@ include/pjsip-ua/sip_timer.h
 include/pjsip-ua/sip_xfer.h
 include/pjsip.h
 include/pjsip/print_util.h
-include/pjsip/sip_auth.h
 include/pjsip/sip_auth_aka.h
 include/pjsip/sip_auth_msg.h
 include/pjsip/sip_auth_parser.h
+include/pjsip/sip_auth.h
 include/pjsip/sip_autoconf.h
 include/pjsip/sip_autoconf.h.in
 include/pjsip/sip_config.h
@@ -275,20 +282,17 @@ include/pjsip/sip_private.h
 include/pjsip/sip_resolve.h
 include/pjsip/sip_tel_uri.h
 include/pjsip/sip_transaction.h
-include/pjsip/sip_transport.h
 include/pjsip/sip_transport_loop.h
 include/pjsip/sip_transport_tcp.h
 include/pjsip/sip_transport_tls.h
 include/pjsip/sip_transport_udp.h
+include/pjsip/sip_transport.h
 include/pjsip/sip_types.h
 include/pjsip/sip_ua_layer.h
 include/pjsip/sip_uri.h
 include/pjsip/sip_util.h
-include/pjsip_auth.h
-include/pjsip_simple.h
-include/pjsip_ua.h
-include/pjsua-lib/pjsua.h
 include/pjsua-lib/pjsua_internal.h
+include/pjsua-lib/pjsua.h
 include/pjsua.h
 include/pjsua2.hpp
 include/pjsua2/account.hpp
@@ -344,9 +348,6 @@ lib/libpjsua-%%CONFIGURE_TARGET%%.a
 lib/libpjsua2-%%CONFIGURE_TARGET%%.a
 %%SHARED%%lib/libpjsua2.so
 %%SHARED%%lib/libpjsua2.so.2
-%%SHARED%%%%VIDEO%%lib/libyuv.so
-%%SHARED%%%%VIDEO%%lib/libyuv.so.2
-%%VIDEO%%lib/libyuv-%%CONFIGURE_TARGET%%.a
 %%NO_SAMPLERATE%%%%RESAMPLE%%lib/libresample-%%CONFIGURE_TARGET%%.a
 %%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so
 %%NO_SAMPLERATE%%%%RESAMPLE%%%%RESAMPLEDLL%%lib/libresample.so.2
@@ -356,6 +357,7 @@ lib/libpjsua2-%%CONFIGURE_TARGET%%.a
 %%WEBRTC%%lib/libwebrtc-%%CONFIGURE_TARGET%%.a
 %%WEBRTC%%%%SHARED%%lib/libwebrtc.so
 %%WEBRTC%%%%SHARED%%lib/libwebrtc.so.2
+%%SHARED%%%%VIDEO%%lib/libyuv.so
+%%SHARED%%%%VIDEO%%lib/libyuv.so.2
+%%VIDEO%%lib/libyuv-%%CONFIGURE_TARGET%%.a
 libdata/pkgconfig/libpjproject.pc
-%%PJSUA%%bin/pjsua
-%%PJSUA%%bin/pjsystest