r7399 - in /vdr/vdr-plugin-live/trunk/debian: changelog control patches/ patches/00list patches/01_ipv6.dpatch rules

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

Author: tiber-guest
Date: Sat Aug 30 19:50:17 2008
New Revision: 7399

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=7399
Log:
Added 01_ipv6 to allow usage of IPV6 addresses (Closes: #496936)

Added:
    vdr/vdr-plugin-live/trunk/debian/patches/
    vdr/vdr-plugin-live/trunk/debian/patches/00list
    vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.dpatch
Modified:
    vdr/vdr-plugin-live/trunk/debian/changelog
    vdr/vdr-plugin-live/trunk/debian/control
    vdr/vdr-plugin-live/trunk/debian/rules

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=7399&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/changelog (original)
+++ vdr/vdr-plugin-live/trunk/debian/changelog Sat Aug 30 19:50:17 2008
@@ -1,3 +1,9 @@
+vdr-plugin-live (0.2.0-4) unstable; urgency=low
+
+  * Added 01_ipv6 to allow usage of IPV6 addresses (Closes: #496936)
+
+ -- Tobias Grimm <tg at e-tobi.net>  Sat, 30 Aug 2008 21:28:37 +0200
+
 vdr-plugin-live (0.2.0-3) unstable; urgency=low
 
   [ Tobias Grimm ]

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=7399&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/control (original)
+++ vdr/vdr-plugin-live/trunk/debian/control Sat Aug 30 19:50:17 2008
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org>
 Uploaders: Thomas Schmidt <tschmidt at debian.org>, Tobias Grimm <tg at e-tobi.net>, Thomas Günther <tom at toms-cafe.de>
-Build-Depends: debhelper (>= 5), cdbs, vdr-dev (>= 1.6.0-5),
+Build-Depends: debhelper (>= 5), cdbs, dpatch, vdr-dev (>= 1.6.0-5),
  libtntnet-dev (>= 1.6.0.1-1.1), libcxxtools-dev (>= 1.4.3.6-1.1),
  libssl-dev, libboost-dev, gettext
 Standards-Version: 3.8.0

Added: vdr/vdr-plugin-live/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/patches/00list?rev=7399&op=file
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/patches/00list (added)
+++ vdr/vdr-plugin-live/trunk/debian/patches/00list Sat Aug 30 19:50:17 2008
@@ -1,0 +1,1 @@
+01_ipv6

Added: vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.dpatch?rev=7399&op=file
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.dpatch (added)
+++ vdr/vdr-plugin-live/trunk/debian/patches/01_ipv6.dpatch Sat Aug 30 19:50:17 2008
@@ -1,0 +1,35 @@
+#! /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.
+
+ 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 @@
+ 
+ bool Setup::CheckServerIps()
+ {
++	struct in6_addr buf;
++
+ 	if ( m_serverIps.empty() ) {
+-		m_serverIps.push_back( "0.0.0.0" );
++		m_serverIps.push_back( "::" );
+ 		return true;
+ 	}
+ 
+ 	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;

Modified: vdr/vdr-plugin-live/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdr-plugin-live/trunk/debian/rules?rev=7399&op=diff
==============================================================================
--- vdr/vdr-plugin-live/trunk/debian/rules (original)
+++ vdr/vdr-plugin-live/trunk/debian/rules Sat Aug 30 19:50:17 2008
@@ -1,7 +1,7 @@
 #! /bin/sh /usr/share/vdr-dev/make-special-vdr.sh
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-#include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/rules/dpatch.mk
 
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY