svn commit: r413425 - in branches/2016Q2/net: asterisk13 pjsip

[Guido Falsi]

Author: madpilot
Date: Sat Apr 16 10:14:31 2016
New Revision: 413425
URL: https://svnweb.freebsd.org/changeset/ports/413425

Log:
  MFH: r413365
  
  - Update net/asterisk13 to 13.8.1
  - Change PJ_IOQUEUE_MAX_HANDLES build time limit in pjsip as suggested
    by asterisk project [1] to mitigate potential DoS [2]
  - Add DEBUG and IPV6 options to pjsip port
  
  Obtained from:	https://wiki.asterisk.org/wiki/display/AST/Building+and+Installing+pjproject [1]
  Security:	ee50726e-0319-11e6-aa86-001999f8d30b
  		e21474c6-031a-11e6-aa86-001999f8d30b [2]
  
  Approved by:	ports-secteam (feld)

Modified:
  branches/2016Q2/net/asterisk13/Makefile
  branches/2016Q2/net/asterisk13/distinfo
  branches/2016Q2/net/pjsip/Makefile
Directory Properties:
  branches/2016Q2/   (props changed)

Modified: branches/2016Q2/net/asterisk13/Makefile
==============================================================================
--- branches/2016Q2/net/asterisk13/Makefile	Sat Apr 16 10:06:16 2016	(r413424)
+++ branches/2016Q2/net/asterisk13/Makefile	Sat Apr 16 10:14:31 2016	(r413425)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	13.8.0
+PORTVERSION=	13.8.1
 CATEGORIES=	net
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:main,g729
 MASTER_SITE_SUBDIR=	asterisk/:main \

Modified: branches/2016Q2/net/asterisk13/distinfo
==============================================================================
--- branches/2016Q2/net/asterisk13/distinfo	Sat Apr 16 10:06:16 2016	(r413424)
+++ branches/2016Q2/net/asterisk13/distinfo	Sat Apr 16 10:14:31 2016	(r413425)
@@ -1,5 +1,5 @@
-SHA256 (asterisk-13.8.0.tar.gz) = 9953d3ea0023f7be0e14aed587725dacc199116c9453587093e1489073b53d5d
-SIZE (asterisk-13.8.0.tar.gz) = 32520658
+SHA256 (asterisk-13.8.1.tar.gz) = 87edf926855bcccc0ef1838acc6bc5e767da1f403e0482dc328b982d044b770d
+SIZE (asterisk-13.8.1.tar.gz) = 32488096
 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: branches/2016Q2/net/pjsip/Makefile
==============================================================================
--- branches/2016Q2/net/pjsip/Makefile	Sat Apr 16 10:06:16 2016	(r413424)
+++ branches/2016Q2/net/pjsip/Makefile	Sat Apr 16 10:14:31 2016	(r413425)
@@ -2,6 +2,7 @@
 
 PORTNAME=	pjsip
 PORTVERSION=	2.4.5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.pjsip.org/release/${PORTVERSION}/
 DISTNAME=	pjproject-${DISTVERSION}
@@ -23,7 +24,7 @@ USE_LDCONFIG=	yes
 PLIST_SUB=	CONFIGURE_TARGET="${CONFIGURE_TARGET}"
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	FFMPEG G711 G722 G7221 GSM ILBC L16 OPENH264 RESAMPLE RESAMPLEDLL \
+OPTIONS_DEFINE=	DEBUG FFMPEG G711 G722 G7221 GSM ILBC IPV6 L16 OPENH264 RESAMPLE RESAMPLEDLL \
 		SAMPLERATE SDL SHARED SPEEX SPEEXAEC V4L IPV6 SOUND VIDEO AMR EXTSRTP
 OPTIONS_DEFAULT=G711 G722 G7221 GSM ILBC L16 SHARED SPEEX SPEEXAEC
 
@@ -43,6 +44,8 @@ EXTSRTP_DESC=	Use libsrtp port (needed t
 
 OPTIONS_SUB=	yes
 
+DEBUG_CFLAGS=			-DNDEBUG=0
+DEBUG_CFLAGS_OFF=		-DNDEBUG=1
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg
 FFMPEG_LIB_DEPENDS=		libswresample.so:multimedia/ffmpeg
 G711_CONFIGURE_ENABLE=		g711-codec
@@ -52,6 +55,8 @@ GSM_CONFIGURE_ENABLE=		gsm-codec
 GSM_LIB_DEPENDS=		libgsm.so:audio/gsm
 GSM_CONFIGURE_ON=		--with-external-gsm
 ILBC_CONFIGURE_ENABLE=		ilbc-codec
+IPV6_CFLAGS=			-DPJ_HAS_IPV6=1
+IPV6_CFLAGS_OFF=		-DPJ_HAS_IPV6=1
 L16_CONFIGURE_ENABLE=		l16-codec
 OPENH264_CONFIGURE_ENABLE=	openh264
 OPENH264_LIB_DEPENDS=		libopenh264.so:multimedia/openh264
@@ -81,5 +86,7 @@ EXTSRTP_LIB_DEPENDS=		libsrtp.so:net/lib
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		${WRKSRC}/pkgconfig.py
+	@${ECHO} "#include <sys/select.h>" > ${WRKSRC}/pjlib/include/pj/config_site.h
+	@${ECHO} "#define PJ_IOQUEUE_MAX_HANDLES (FD_SETSIZE)" >> ${WRKSRC}/pjlib/include/pj/config_site.h
 
 .include <bsd.port.mk>