From owner-svn-ports-head@freebsd.org Fri Jan 15 22:38:37 2016 Return-Path: Delivered-To: svn-ports-head@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 AE8B1A84511; Fri, 15 Jan 2016 22:38:37 +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 6780115AF; Fri, 15 Jan 2016 22:38:37 +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 u0FMcaKU002343; Fri, 15 Jan 2016 22:38:36 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0FMcaar002341; Fri, 15 Jan 2016 22:38:36 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201601152238.u0FMcaar002341@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 15 Jan 2016 22:38:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406193 - in head/net/minidlna: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jan 2016 22:38:37 -0000 Author: madpilot Date: Fri Jan 15 22:38:36 2016 New Revision: 406193 URL: https://svnweb.freebsd.org/changeset/ports/406193 Log: Revert upstream change which prevents minidlna from replying to certain multicast queries. PR: 205430 Submitted by: pvoigt@uos.de Approved by: wg (maintainer, implicit) MFH: 2016Q1 Modified: head/net/minidlna/Makefile head/net/minidlna/files/patch-minissdp.c Modified: head/net/minidlna/Makefile ============================================================================== --- head/net/minidlna/Makefile Fri Jan 15 21:53:08 2016 (r406192) +++ head/net/minidlna/Makefile Fri Jan 15 22:38:36 2016 (r406193) @@ -3,6 +3,7 @@ PORTNAME= minidlna PORTVERSION= 1.1.5 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= net multimedia www MASTER_SITES= SF Modified: head/net/minidlna/files/patch-minissdp.c ============================================================================== --- head/net/minidlna/files/patch-minissdp.c Fri Jan 15 21:53:08 2016 (r406192) +++ head/net/minidlna/files/patch-minissdp.c Fri Jan 15 22:38:36 2016 (r406193) @@ -1,6 +1,6 @@ ---- minissdp.c.orig 2014-03-06 16:30:25.000000000 -0800 -+++ minissdp.c 2014-05-29 09:34:58.763663228 -0700 -@@ -60,7 +60,7 @@ +--- minissdp.c.orig 2015-09-10 19:24:09 UTC ++++ minissdp.c +@@ -60,7 +60,7 @@ static int AddMulticastMembership(int s, struct lan_addr_s *iface) { int ret; @@ -8,4 +8,16 @@ +#if defined(HAVE_STRUCT_IP_MREQN) && !defined(__FreeBSD__) struct ip_mreqn imr; /* Ip multicast membership */ /* setting up imr structure */ - imr.imr_multiaddr.s_addr = inet_addr(SSDP_MCAST_ADDR); + memset(&imr, '\0', sizeof(imr)); +@@ -117,7 +117,11 @@ OpenAndConfSSDPReceiveSocket(void) + * to receive datagramms send to this multicast address. + * To specify the local nics we want to use we have to use setsockopt, + * see AddMulticastMembership(...). */ ++#ifdef __FreeBSD__ ++ sockname.sin_addr.s_addr = htonl(INADDR_ANY); ++#else + sockname.sin_addr.s_addr = inet_addr(SSDP_MCAST_ADDR); ++#endif + + if (bind(s, (struct sockaddr *)&sockname, sizeof(struct sockaddr_in)) < 0) + {