svn commit: r406193 - in head/net/minidlna: . files

[Guido Falsi]

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 at 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)
+ 	{