[SCM] multicat/master: Extend 0001-nonlinux.patch with patches suggested by upstream.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5880d424834ad1357e050ddd33206d4e73a134f2
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Apr 27 14:46:20 2012 +0200

    Extend 0001-nonlinux.patch with patches suggested by upstream.
    
    Closes: #660139
    Thanks: Christophe Massiot.

diff --git a/debian/patches/0001-nonlinux.patch b/debian/patches/0001-nonlinux.patch
index f855399..127856c 100644
--- a/debian/patches/0001-nonlinux.patch
+++ b/debian/patches/0001-nonlinux.patch
@@ -2,7 +2,8 @@ Description: Add POLLRDHUP on architectures which don't define it.
 From: http://bugs.debian.org/660139
 ---
  multicat.c |    4 ++++
- 1 file changed, 4 insertions(+)
+ util.c     |   11 ++++++++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
 
 --- multicat.orig/multicat.c
 +++ multicat/multicat.c
@@ -17,3 +18,51 @@ From: http://bugs.debian.org/660139
  #include <bitstream/ietf/rtp.h>
  #include <bitstream/mpeg/ts.h>
  
+--- multicat.orig/util.c
++++ multicat/util.c
+@@ -214,6 +214,7 @@ void real_Sleep( uint64_t i_delay )
+  *****************************************************************************/
+ static int GetInterfaceIndex( const char *psz_name )
+ {
++#ifndef __FreeBSD__
+     int i_fd;
+     struct ifreq ifr;
+ 
+@@ -235,6 +236,9 @@ static int GetInterfaceIndex( const char
+     close( i_fd );
+ 
+     return ifr.ifr_ifindex;
++#else
++    return 0;
++#endif
+ }
+ 
+ /*****************************************************************************
+@@ -568,6 +572,7 @@ normal_bind:
+         if ( bind_addr.ss.ss_family == AF_INET
+               && IN_MULTICAST( ntohl(bind_addr.sin.sin_addr.s_addr)) )
+         {
++#ifdef IP_ADD_SOURCE_MEMBERSHIP /* unavailable on GNU Hurd */
+             if ( connect_addr.ss.ss_family != AF_UNSPEC )
+             {
+                 /* Source-specific multicast */
+@@ -586,7 +591,10 @@ normal_bind:
+                                  &connect_addr );
+                     exit(EXIT_FAILURE);
+             }
+-            else if ( i_bind_if_index )
++            else
++#endif
++#ifndef __FreeBSD__
++            if ( i_bind_if_index )
+             {
+                 /* Linux-specific interface-bound multicast */
+                 struct ip_mreqn imr;
+@@ -603,6 +611,7 @@ normal_bind:
+                     exit(EXIT_FAILURE);
+             }
+             else
++#endif
+             {
+                 /* Regular multicast */
+                 struct ip_mreq imr;

-- 
multicat packaging