From owner-svn-ports-branches@freebsd.org Tue Nov 29 13:50:13 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 1A8EFC5BDE5; Tue, 29 Nov 2016 13:50:13 +0000 (UTC) (envelope-from kevlo@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 E962116D1; Tue, 29 Nov 2016 13:50:12 +0000 (UTC) (envelope-from kevlo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id uATDoCW8074161; Tue, 29 Nov 2016 13:50:12 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id uATDoCof074159; Tue, 29 Nov 2016 13:50:12 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201611291350.uATDoCof074159@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Tue, 29 Nov 2016 13:50:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r427379 - in branches/2016Q4/multimedia/ffmpeg: . 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: Tue, 29 Nov 2016 13:50:13 -0000 Author: kevlo Date: Tue Nov 29 13:50:11 2016 New Revision: 427379 URL: https://svnweb.freebsd.org/changeset/ports/427379 Log: MFH: r427233 Fix RTP stream; FreeBSD's socket calls require the sockaddr struct length to agree with the address family. PR: 214852 Submitted by: me Approved by: jbeich Approved by: ports-secteam (junovitch) Added: branches/2016Q4/multimedia/ffmpeg/files/patch-libavformat_rtsp.c - copied unchanged from r427233, head/multimedia/ffmpeg/files/patch-libavformat_rtsp.c Modified: branches/2016Q4/multimedia/ffmpeg/Makefile Directory Properties: branches/2016Q4/ (props changed) Modified: branches/2016Q4/multimedia/ffmpeg/Makefile ============================================================================== --- branches/2016Q4/multimedia/ffmpeg/Makefile Tue Nov 29 13:44:46 2016 (r427378) +++ branches/2016Q4/multimedia/ffmpeg/Makefile Tue Nov 29 13:50:11 2016 (r427379) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.8.8 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ Copied: branches/2016Q4/multimedia/ffmpeg/files/patch-libavformat_rtsp.c (from r427233, head/multimedia/ffmpeg/files/patch-libavformat_rtsp.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q4/multimedia/ffmpeg/files/patch-libavformat_rtsp.c Tue Nov 29 13:50:11 2016 (r427379, copy of r427233, head/multimedia/ffmpeg/files/patch-libavformat_rtsp.c) @@ -0,0 +1,46 @@ +--- libavformat/rtsp.c.orig 2016-11-26 17:12:14 UTC ++++ libavformat/rtsp.c +@@ -1598,7 +1598,12 @@ int ff_rtsp_make_setup_request(AVFormatC + } + if (ttl > 0) + snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl); +- getnameinfo((struct sockaddr*) &addr, sizeof(addr), ++ getnameinfo((struct sockaddr*) &addr, ++#if HAVE_STRUCT_SOCKADDR_SA_LEN ++ ((struct sockaddr*) &addr)->sa_len, ++#else ++ sizeof(addr), ++#endif + namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); + ff_url_join(url, sizeof(url), "rtp", NULL, namebuf, + port, "%s", optbuf); +@@ -1806,8 +1811,13 @@ redirect: + goto fail; + } + if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) { +- getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host), +- NULL, 0, NI_NUMERICHOST); ++ getnameinfo((struct sockaddr*) &peer, ++#if HAVE_STRUCT_SOCKADDR_SA_LEN ++ ((struct sockaddr*) &peer)->sa_len, ++#else ++ peer_len, ++#endif ++ host, sizeof(host), NULL, 0, NI_NUMERICHOST); + } + + /* request options supported by the server; this also detects server +@@ -2283,7 +2293,12 @@ static int sdp_read_header(AVFormatConte + if (!(rt->rtsp_flags & RTSP_FLAG_CUSTOM_IO)) { + AVDictionary *opts = map_to_opts(rt); + +- getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, sizeof(rtsp_st->sdp_ip), ++ getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip, ++#if HAVE_STRUCT_SOCKADDR_SA_LEN ++ ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len, ++#else ++ sizeof(rtsp_st->sdp_ip), ++#endif + namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST); + ff_url_join(url, sizeof(url), "rtp", NULL, + namebuf, rtsp_st->sdp_port,