r9058 - in /vdr/vdr-plugin-live/trunk/debian: changelog control patches/01_ipv6.patch

[tiber-guest at users.alioth.debian.org]

Author: tiber-guest
Date: Sat Aug 20 19:03:17 2011
New Revision: 9058

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=9058
Log:
* Build-depend on vdr-dev (>= 1.7.20)
* Standards-Version: 3.9.2
* Updated 01_ipv6.patch to the version provide by Luboš Doležel to support
  IPV4-only systems (Closes: #630627)

Modified:
    vdr/vdr-plugin-live/trunk/debian/changelog
    vdr/vdr-plugin-live/trunk/debian/control
    vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.patch

Modified: vdr/vdr-plugin-live/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/changelog?rev=9058&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-live/trunk/debian/changelog Sat Aug 20 19:03:17 2011
@@ -1,3 +1,12 @@
+vdr-plugin-live (0.2.0-13) unstable; urgency=low
+
+  * Build-depend on vdr-dev (>= 1.7.20)
+  * Standards-Version: 3.9.2
+  * Updated 01_ipv6.patch to the version provide by Luboš Doležel to support
+    IPV4-only systems (Closes: #630627)
+
+ -- Tobias Grimm <etobi at debian.org>  Sat, 20 Aug 2011 15:25:36 +0200
+
 vdr-plugin-live (0.2.0-12) unstable; urgency=low
 
   * Build-depend on vdr-dev (>= 1.7.18)

Modified: vdr/vdr-plugin-live/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/control?rev=9058&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/control (original)
+++ vdr/vdr-plugin-live/trunk/debian/control Sat Aug 20 19:03:17 2011
@@ -3,10 +3,10 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <etobi at debian.org>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.18),
+Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.20),
  libtntnet-dev (>= 1.6.0.1-1.1), libcxxtools-dev (>= 1.4.3.6-1.1),
  libssl-dev, libboost-dev, gettext
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/
 Homepage: http://live.vdr-developer.org

Modified: vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.patch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.patch?rev=9058&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.patch (original)
+++ vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.patch Sat Aug 20 19:03:17 2011
@@ -1,35 +1,39 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_ipv6.dpatch by Timo Weingärtner <timo at tiwe.de> 
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Allows to use IPV6 addresses.
+Description: Allows to use IPV6 addresses
+Forwarded: not-needed
+Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=630627#10
+Bug-Debian: http://bugs.debian.org/630627
+Author: Luboš Doležel <lubos at dolezel.info>
 
- at DPATCH@
-diff -urNad vdr-plugin-live-0.2.0~/setup.cpp vdr-plugin-live-0.2.0/setup.cpp
---- vdr-plugin-live-0.2.0~/setup.cpp	2008-04-23 01:01:53.000000000 +0200
-+++ vdr-plugin-live-0.2.0/setup.cpp	2008-08-30 18:46:38.000000000 +0200
-@@ -151,16 +151,20 @@
+--- live-0.2.0/setup.cpp.orig	2008-04-23 01:01:53.000000000 +0200
++++ live-0.2.0/setup.cpp	2011-06-15 20:22:36.577961061 +0200
+@@ -151,13 +151,28 @@
  
  bool Setup::CheckServerIps()
  {
-+	struct in6_addr buf;
-+
++	bool v6supported = false;
++	int s = socket(AF_INET6, SOCK_STREAM, 0);
++	
++	if (s != -1) {
++		close(s);
++		v6supported = true;
++	}
++	
  	if ( m_serverIps.empty() ) {
 -		m_serverIps.push_back( "0.0.0.0" );
-+		m_serverIps.push_back( "::" );
++		if (v6supported)
++			m_serverIps.push_back( "::" );
++		else
++			m_serverIps.push_back( "0.0.0.0" );
  		return true;
  	}
  
++        union {
++		in_addr in4;
++		in6_addr in6;
++	};
  	for ( IpList::const_iterator ip = m_serverIps.begin(); ip != m_serverIps.end(); ++ip ) {
- 		if ( inet_addr( ip->c_str() ) == static_cast< in_addr_t >( -1 ) ) {
--			esyslog( "ERROR: live server ip %s is not a valid ip address", ip->c_str() );
--			cerr << "ERROR: live server ip " << *ip << " is not a valid ip address" << endl;
--			return false;
-+			if ( ! inet_pton( AF_INET6, ip->c_str(), &buf ) ) {
-+				esyslog( "ERROR: live server ip %s is not a valid ip address", ip->c_str() );
-+				cerr << "ERROR: live server ip " << *ip << " is not a valid ip address" << endl;
-+				return false;
-+			}
- 		}
- 	}
- 	return true;
+-		if ( inet_addr( ip->c_str() ) == static_cast< in_addr_t >( -1 ) ) {
++		if ( !inet_pton(AF_INET, ip->c_str(), &in4) && !inet_pton(AF_INET6, ip->c_str(), &in6) ) {
+ 			esyslog( "ERROR: live server ip %s is not a valid ip address", ip->c_str() );
+ 			cerr << "ERROR: live server ip " << *ip << " is not a valid ip address" << endl;
+ 			return false;