svn commit: r441360 - in branches/2017Q2/net: asterisk13 asterisk13/files pjsip pjsip/files

Guido Falsi madpilot at FreeBSD.org
Sun May 21 09:02:25 UTC 2017 

Author: madpilot
Date: Sun May 21 09:02:22 2017
New Revision: 441360
URL: https://svnweb.freebsd.org/changeset/ports/441360

Log:
  MFH: r437954 r438620 r441292
  
  Update net/asterisk13 to 13.15.0.
  
  - Add patches to fix build with LibreSSL [1]
  - Add dependencies and new SHEBANG_FILE to per stage-qa warnings
  - Stop istalling python script to avoid stage-qa error about wrong
    python shabang(adding a python dependency just for a contributed
    python script seems overkill)
  
  PR:		218599 [1]
  Submitted by:	OlivierW <olivierw1+bugzilla-freebsd at hotmail.com>
  Obtained from:	https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/telephony/asterisk/patches/ [1]
  
  - 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]
  Security:	0537afa3-3ce0-11e7-bf9d-001999f8d30b
  Security:	fab87bff-3ce5-11e7-bf9d-001999f8d30b
  
  Approved by:	ports-secteam (miwi)

Added:
  branches/2017Q2/net/asterisk13/files/patch-contrib_Makefile
     - copied unchanged from r438620, head/net/asterisk13/files/patch-contrib_Makefile
  branches/2017Q2/net/asterisk13/files/patch-main_libasteriskssl.c
     - copied unchanged from r438620, head/net/asterisk13/files/patch-main_libasteriskssl.c
  branches/2017Q2/net/asterisk13/files/patch-main_tcptls.c
     - copied unchanged from r438620, head/net/asterisk13/files/patch-main_tcptls.c
  branches/2017Q2/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c
     - copied unchanged from r441292, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c
  branches/2017Q2/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c
     - copied unchanged from r441292, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c
Modified:
  branches/2017Q2/net/asterisk13/Makefile
  branches/2017Q2/net/asterisk13/distinfo
  branches/2017Q2/net/asterisk13/files/patch-main__Makefile
  branches/2017Q2/net/asterisk13/pkg-plist
  branches/2017Q2/net/pjsip/Makefile
  branches/2017Q2/net/pjsip/files/patch-aconfigure
  branches/2017Q2/net/pjsip/files/patch-build.mak.in
  branches/2017Q2/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c
  branches/2017Q2/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
  branches/2017Q2/net/pjsip/files/patch-third__party_build_os-auto.mak.in
Directory Properties:
  branches/2017Q2/   (props changed)

Modified: branches/2017Q2/net/asterisk13/Makefile
==============================================================================
--- branches/2017Q2/net/asterisk13/Makefile	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/asterisk13/Makefile	Sun May 21 09:02:22 2017	(r441360)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	13.14.1
+PORTVERSION=	13.15.1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
@@ -171,6 +171,8 @@ PGSQL_USES=		pgsql
 
 PJSIP_CONFIGURE_WITH=	pjproject
 PJSIP_USES=		pkgconfig
+PJSIP_LIB_DEPENDS=	libspeex.so:audio/speex \
+			libspeexdsp.so:audio/speexdsp
 
 PORTAUDIO_CONFIGURE_WITH=	portaudio
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
@@ -179,13 +181,16 @@ RADIUS_CONFIGURE_WITH=	radius
 RADIUS_LIB_DEPENDS=	libradiusclient-ng.so:net/radiusclient
 
 SNMP_CONFIGURE_WITH=	netsnmp
-SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
+SNMP_LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp \
+			libpkg.so:ports-mgmt/pkg
 
 SPANDSP_CONFIGURE_WITH=	spandsp
-SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp
+SPANDSP_LIB_DEPENDS=	libspandsp.so:comms/spandsp \
+			libtiff.so:graphics/tiff
 
 SPEEX_CONFIGURE_WITH=	speex
-SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
+SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex \
+			libspeexdsp.so:audio/speexdsp
 
 SQLITE2_CONFIGURE_WITH=	sqlite
 SQLITE2_LIB_DEPENDS=	libsqlite.so:databases/sqlite2
@@ -195,7 +200,8 @@ SRTP_CONFIGURE_WITH=	srtp
 SYSINFO_LIB_DEPENDS=	libsysinfo.so:devel/libsysinfo
 
 VORBIS_CONFIGURE_WITH=	ogg
-VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
+VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis \
+			libogg.so:audio/libogg
 
 XMPP_CONFIGURE_WITH=	iksemel
 XMPP_LIB_DEPENDS=	libiksemel.so:textproc/iksemel

Modified: branches/2017Q2/net/asterisk13/distinfo
==============================================================================
--- branches/2017Q2/net/asterisk13/distinfo	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/asterisk13/distinfo	Sun May 21 09:02:22 2017	(r441360)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1491323117
-SHA256 (asterisk-13.14.1.tar.gz) = 8ff01bad466fc5a96998a327937353fac92cf2eee97fc3f23343218e445a8afc
-SIZE (asterisk-13.14.1.tar.gz) = 32787798
+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

Copied: branches/2017Q2/net/asterisk13/files/patch-contrib_Makefile (from r438620, head/net/asterisk13/files/patch-contrib_Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/net/asterisk13/files/patch-contrib_Makefile	Sun May 21 09:02:22 2017	(r441360, copy of r438620, head/net/asterisk13/files/patch-contrib_Makefile)
@@ -0,0 +1,15 @@
+--- contrib/Makefile.orig	2017-04-12 21:47:53 UTC
++++ contrib/Makefile
+@@ -24,10 +24,10 @@ install:
+ 	$(INSTALL) -m 755 scripts/ast_logescalator "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"
+ 	$(INSTALL) -m 755 scripts/ast_loggrabber "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber"
+ 	$(INSTALL) -m 755 scripts/ast_coredumper "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper"
+-	$(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
++#	$(INSTALL) -m 755 scripts/refcounter.py "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
+ 
+ uninstall:
+ 	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"
+ 	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_loggrabber"
+ 	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/ast_coredumper"
+-	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"
++#	-rm -f "$(DESTDIR)$(ASTDATADIR)/scripts/refcounter.py"

Modified: branches/2017Q2/net/asterisk13/files/patch-main__Makefile
==============================================================================
--- branches/2017Q2/net/asterisk13/files/patch-main__Makefile	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/asterisk13/files/patch-main__Makefile	Sun May 21 09:02:22 2017	(r441360)
@@ -1,6 +1,6 @@
---- main/Makefile.orig	2016-07-21 14:54:02 UTC
+--- main/Makefile.orig	2017-03-24 08:40:58 UTC
 +++ main/Makefile
-@@ -79,9 +79,12 @@ endif
+@@ -81,9 +81,12 @@ endif
  
  ifeq ($(OSARCH),FreeBSD)
    # -V is understood by BSD Make, not by GNU make.
@@ -14,13 +14,3 @@
  endif
  
  ifneq ($(findstring $(OSARCH), mingw32 cygwin ),)
-@@ -351,9 +354,6 @@ else # Darwin
- 	$(INSTALL) -m 755 $(ASTPJ_LIB) "$(DESTDIR)$(ASTLIBDIR)/"
- endif
- endif
--ifneq ($(LDCONFIG),)
--	$(LDCONFIG) $(LDCONFIG_FLAGS) "$(DESTDIR)$(ASTLIBDIR)/"
--endif
- 	$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
- 
- binuninstall:

Copied: branches/2017Q2/net/asterisk13/files/patch-main_libasteriskssl.c (from r438620, head/net/asterisk13/files/patch-main_libasteriskssl.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/net/asterisk13/files/patch-main_libasteriskssl.c	Sun May 21 09:02:22 2017	(r441360, copy of r438620, head/net/asterisk13/files/patch-main_libasteriskssl.c)
@@ -0,0 +1,20 @@
+--- main/libasteriskssl.c.orig	2017-04-12 21:07:31 UTC
++++ main/libasteriskssl.c
+@@ -74,7 +74,7 @@ static void ssl_lock(int mode, int n, const char *file
+ 	}
+ }
+ 
+-#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
++#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ int SSL_library_init(void)
+ {
+ #if defined(AST_DEVMODE)
+@@ -129,7 +129,7 @@ void ERR_free_strings(void)
+ int ast_ssl_init(void)
+ {
+ #if defined(HAVE_OPENSSL) && defined(OPENSSL_VERSION_NUMBER) && \
+-	OPENSSL_VERSION_NUMBER < 0x10100000L
++	(OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER))
+ 	unsigned int i;
+ 	int (*real_SSL_library_init)(void);
+ 	void (*real_CRYPTO_set_id_callback)(unsigned long (*)(void));

Copied: branches/2017Q2/net/asterisk13/files/patch-main_tcptls.c (from r438620, head/net/asterisk13/files/patch-main_tcptls.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/net/asterisk13/files/patch-main_tcptls.c	Sun May 21 09:02:22 2017	(r441360, copy of r438620, head/net/asterisk13/files/patch-main_tcptls.c)
@@ -0,0 +1,18 @@
+--- main/tcptls.c.orig	2017-04-12 21:06:16 UTC
++++ main/tcptls.c
+@@ -400,13 +400,13 @@ static int tcptls_stream_close(void *cookie)
+ 					SSL_get_error(stream->ssl, res));
+ 			}
+ 
+-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L
++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
+ 			if (!SSL_is_server(stream->ssl)) {
+ #else
+ 			if (!stream->ssl->server) {
+ #endif
+ 				/* For client threads, ensure that the error stack is cleared */
+-#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
++#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+ #if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L
+ 				ERR_remove_thread_state(NULL);
+ #else

Modified: branches/2017Q2/net/asterisk13/pkg-plist
==============================================================================
--- branches/2017Q2/net/asterisk13/pkg-plist	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/asterisk13/pkg-plist	Sun May 21 09:02:22 2017	(r441360)
@@ -364,7 +364,6 @@ sbin/safe_asterisk
 %%DATADIR%%/scripts/ast_coredumper
 %%DATADIR%%/scripts/ast_logescalator
 %%DATADIR%%/scripts/ast_loggrabber
-%%DATADIR%%/scripts/refcounter.py
 %%DATADIR%%/static-http/appdocsxml.xslt
 %%DATADIR%%/static-http/ajamdemo.html
 %%DATADIR%%/static-http/astman.css

Modified: branches/2017Q2/net/pjsip/Makefile
==============================================================================
--- branches/2017Q2/net/pjsip/Makefile	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/pjsip/Makefile	Sun May 21 09:02:22 2017	(r441360)
@@ -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: branches/2017Q2/net/pjsip/files/patch-aconfigure
==============================================================================
--- branches/2017Q2/net/pjsip/files/patch-aconfigure	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/pjsip/files/patch-aconfigure	Sun May 21 09:02:22 2017	(r441360)
@@ -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: branches/2017Q2/net/pjsip/files/patch-build.mak.in
==============================================================================
--- branches/2017Q2/net/pjsip/files/patch-build.mak.in	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/pjsip/files/patch-build.mak.in	Sun May 21 09:02:22 2017	(r441360)
@@ -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: branches/2017Q2/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c
==============================================================================
--- branches/2017Q2/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/pjsip/files/patch-pjlib_src_pj_ssl__sock__ossl.c	Sun May 21 09:02:22 2017	(r441360)
@@ -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: branches/2017Q2/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in
==============================================================================
--- branches/2017Q2/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/pjsip/files/patch-pjmedia_build_os-auto.mak.in	Sun May 21 09:02:22 2017	(r441360)
@@ -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
  

Copied: branches/2017Q2/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c (from r441292, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c	Sun May 21 09:02:22 2017	(r441360, copy of r441292, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__multipart.c)
@@ -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.

Copied: branches/2017Q2/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c (from r441292, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2017Q2/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c	Sun May 21 09:02:22 2017	(r441360, copy of r441292, head/net/pjsip/files/patch-pjsip_src_pjsip_sip__transaction.c)
@@ -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: branches/2017Q2/net/pjsip/files/patch-third__party_build_os-auto.mak.in
==============================================================================
--- branches/2017Q2/net/pjsip/files/patch-third__party_build_os-auto.mak.in	Sun May 21 09:00:34 2017	(r441359)
+++ branches/2017Q2/net/pjsip/files/patch-third__party_build_os-auto.mak.in	Sun May 21 09:02:22 2017	(r441360)
@@ -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, at ac_webrtc
+@@ -104,8 +104,7 @@ else ifneq ($(findstring mips, at ac_webrtc_instset@),)
  else # Generic fixed point
      WEBRTC_SRC = \
  	      modules/audio_processing/aecm/aecm_core_c.o                \

More information about the svn-ports-all mailing list