From owner-svn-ports-branches@freebsd.org Sun Dec 11 15:35:35 2016 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA72AC72EC0; Sun, 11 Dec 2016 15:35:35 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AB09BFF7; Sun, 11 Dec 2016 15:35:35 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uBBFZYU5003572; Sun, 11 Dec 2016 15:35:34 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uBBFZYao003566; Sun, 11 Dec 2016 15:35:34 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201612111535.uBBFZYao003566@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sun, 11 Dec 2016 15:35:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r428356 - in branches/2016Q4/net/asterisk13: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 11 Dec 2016 15:35:36 -0000 Author: madpilot Date: Sun Dec 11 15:35:34 2016 New Revision: 428356 URL: https://svnweb.freebsd.org/changeset/ports/428356 Log: MFH: r424697 r424815 r425883 r427103 r427462 r428328 - Update asterisk13 to 13.13.1 [3] - Include patches submitted upstream to fix a regression [2] - Make user provided makeopts work again [1] PR: 214810 [1] Submitted by: yani@pi-greece.eu Obtained from: https://issues.asterisk.org/jira/browse/ASTERISK-26617 [2] Security: c0b13887-be44-11e6-b04f-001999f8d30b [3] Security: 9e6640fe-be3a-11e6-b04f-001999f8d30b [3] Approved by: ports-secteam (junovitch) Added: branches/2016Q4/net/asterisk13/files/patch-include_asterisk_utils.h - copied unchanged from r427462, head/net/asterisk13/files/patch-include_asterisk_utils.h branches/2016Q4/net/asterisk13/files/patch-main_utils.c - copied unchanged from r427462, head/net/asterisk13/files/patch-main_utils.c branches/2016Q4/net/asterisk13/files/patch-res_res__pjsip__sdp__rtp.c - copied unchanged from r427462, head/net/asterisk13/files/patch-res_res__pjsip__sdp__rtp.c branches/2016Q4/net/asterisk13/files/patch-res_res__pjsip__t38.c - copied unchanged from r427462, head/net/asterisk13/files/patch-res_res__pjsip__t38.c Deleted: branches/2016Q4/net/asterisk13/files/patch-res_res__rtp__asterisk.c Modified: branches/2016Q4/net/asterisk13/Makefile branches/2016Q4/net/asterisk13/distinfo Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/net/asterisk13/Makefile ============================================================================== --- branches/2016Q4/net/asterisk13/Makefile Sun Dec 11 15:30:15 2016 (r428355) +++ branches/2016Q4/net/asterisk13/Makefile Sun Dec 11 15:35:34 2016 (r428356) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= asterisk -PORTVERSION= 13.11.2 +PORTVERSION= 13.13.1 CATEGORIES= net MASTER_SITES= http://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ @@ -250,15 +250,12 @@ post-patch-SYSINFO-on: post-patch-SYSINFO-off: @${REINPLACE_CMD} -e '/#define HAVE_SYSINFO 1/d' ${WRKSRC}/configure @${REINPLACE_CMD} -e '/%%LIBSYSINFO%%/d' ${WRKSRC}/main/Makefile - .if exists(${FILESDIR}/.asterisk.makeopts) -USER_MAKEOPTS_FILE=${FILESDIR}/.asterisk.makeopts -.else -USER_MAKEOPTS_FILE= + ${CP} ${USER_MAKEOPTS_FILE} ${WRKSRC}/menuselect.makeopts .endif post-configure: - @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts USER_MAKEOPTS="${USER_MAKEOPTS_FILE}" + @cd ${WRKSRC} && ${MAKE_CMD} menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --disable res_timing_kqueue menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable chan_mgcp menuselect.makeopts @cd ${WRKSRC} && ./menuselect/menuselect --enable res_pktccops menuselect.makeopts Modified: branches/2016Q4/net/asterisk13/distinfo ============================================================================== --- branches/2016Q4/net/asterisk13/distinfo Sun Dec 11 15:30:15 2016 (r428355) +++ branches/2016Q4/net/asterisk13/distinfo Sun Dec 11 15:35:34 2016 (r428356) @@ -1,6 +1,6 @@ -TIMESTAMP = 1473494815 -SHA256 (asterisk-13.11.2.tar.gz) = 6ea7001bb11ba11fcdbb5febb028b2fd62c44c7bda3cc966b8aaafcb429c5a3a -SIZE (asterisk-13.11.2.tar.gz) = 32630702 +TIMESTAMP = 1481311854 +SHA256 (asterisk-13.13.1.tar.gz) = 6da3c46a22e919b92edf2ccb5b3a2f51bc17e8819e6fca704026869bf349007a +SIZE (asterisk-13.13.1.tar.gz) = 32743348 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/2016Q4/net/asterisk13/files/patch-include_asterisk_utils.h (from r427462, head/net/asterisk13/files/patch-include_asterisk_utils.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/net/asterisk13/files/patch-include_asterisk_utils.h Sun Dec 11 15:35:34 2016 (r428356, copy of r427462, head/net/asterisk13/files/patch-include_asterisk_utils.h) @@ -0,0 +1,16 @@ +--- include/asterisk/utils.h.orig 2016-11-23 15:26:01 UTC ++++ include/asterisk/utils.h +@@ -1127,4 +1127,13 @@ int ast_file_is_readable(const char *fil + */ + int ast_compare_versions(const char *version1, const char *version2); + ++/* ++ * \brief Test that an OS supports IPv6 Networking. ++ * \since 13.14.0 ++ * ++ * \return True (non-zero) if the IPv6 supported. ++ * \return False (zero) if the OS doesn't support IPv6. ++ */ ++int ast_check_ipv6(void); ++ + #endif /* _ASTERISK_UTILS_H */ Copied: branches/2016Q4/net/asterisk13/files/patch-main_utils.c (from r427462, head/net/asterisk13/files/patch-main_utils.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/net/asterisk13/files/patch-main_utils.c Sun Dec 11 15:35:34 2016 (r428356, copy of r427462, head/net/asterisk13/files/patch-main_utils.c) @@ -0,0 +1,21 @@ +--- main/utils.c.orig 2016-11-23 15:26:01 UTC ++++ main/utils.c +@@ -2425,6 +2425,18 @@ char *ast_utils_which(const char *binary + return NULL; + } + ++int ast_check_ipv6(void) ++{ ++ int udp6_socket = socket(AF_INET6, SOCK_DGRAM, 0); ++ ++ if (udp6_socket < 0) { ++ return 0; ++ } ++ ++ close(udp6_socket); ++ return 1; ++} ++ + void DO_CRASH_NORETURN ast_do_crash(void) + { + #if defined(DO_CRASH) Copied: branches/2016Q4/net/asterisk13/files/patch-res_res__pjsip__sdp__rtp.c (from r427462, head/net/asterisk13/files/patch-res_res__pjsip__sdp__rtp.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/net/asterisk13/files/patch-res_res__pjsip__sdp__rtp.c Sun Dec 11 15:35:34 2016 (r428356, copy of r427462, head/net/asterisk13/files/patch-res_res__pjsip__sdp__rtp.c) @@ -0,0 +1,23 @@ +--- res/res_pjsip_sdp_rtp.c.orig 2016-11-23 15:26:01 UTC ++++ res/res_pjsip_sdp_rtp.c +@@ -51,6 +51,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi + #include "asterisk/acl.h" + #include "asterisk/sdp_srtp.h" + #include "asterisk/dsp.h" ++#include "asterisk/utils.h" + + #include "asterisk/res_pjsip.h" + #include "asterisk/res_pjsip_session.h" +@@ -1493,7 +1494,11 @@ static int load_module(void) + { + CHECK_PJSIP_SESSION_MODULE_LOADED(); + +- ast_sockaddr_parse(&address_rtp, "::", 0); ++ if (ast_check_ipv6()) { ++ ast_sockaddr_parse(&address_rtp, "::", 0); ++ } else { ++ ast_sockaddr_parse(&address_rtp, "0.0.0.0", 0); ++ } + + if (!(sched = ast_sched_context_create())) { + ast_log(LOG_ERROR, "Unable to create scheduler context.\n"); Copied: branches/2016Q4/net/asterisk13/files/patch-res_res__pjsip__t38.c (from r427462, head/net/asterisk13/files/patch-res_res__pjsip__t38.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/net/asterisk13/files/patch-res_res__pjsip__t38.c Sun Dec 11 15:35:34 2016 (r428356, copy of r427462, head/net/asterisk13/files/patch-res_res__pjsip__t38.c) @@ -0,0 +1,23 @@ +--- res/res_pjsip_t38.c.orig 2016-11-23 15:26:01 UTC ++++ res/res_pjsip_t38.c +@@ -44,6 +44,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi + #include "asterisk/netsock2.h" + #include "asterisk/channel.h" + #include "asterisk/acl.h" ++#include "asterisk/utils.h" + + #include "asterisk/res_pjsip.h" + #include "asterisk/res_pjsip_session.h" +@@ -918,7 +919,11 @@ static int load_module(void) + { + CHECK_PJSIP_SESSION_MODULE_LOADED(); + +- ast_sockaddr_parse(&address, "::", 0); ++ if (ast_check_ipv6()) { ++ ast_sockaddr_parse(&address, "::", 0); ++ } else { ++ ast_sockaddr_parse(&address, "0.0.0.0", 0); ++ } + + if (ast_sip_session_register_supplement(&t38_supplement)) { + ast_log(LOG_ERROR, "Unable to register T.38 session supplement\n");