diff -Nru vdr-plugin-live-0.2.0/debian/changelog vdr-plugin-live-0.2.0/debian/changelog --- vdr-plugin-live-0.2.0/debian/changelog 2011-04-17 18:06:19.000000000 +0000 +++ vdr-plugin-live-0.2.0/debian/changelog 2011-12-11 16:47:01.000000000 +0000 @@ -1,3 +1,37 @@ +vdr-plugin-live (0.2.0-17) unstable; urgency=low + + * Build-depend on vdr-dev (>= 1.7.22) + + -- Tobias Grimm Sun, 11 Dec 2011 17:16:37 +0100 + +vdr-plugin-live (0.2.0-16) unstable; urgency=low + + * Switched to GIT using pristine tar + + -- Tobias Grimm Sat, 29 Oct 2011 20:10:49 +0200 + +vdr-plugin-live (0.2.0-15) unstable; urgency=low + + * Build-depend on vdr-dev (>= 1.7.21) + + -- Tobias Grimm Sun, 18 Sep 2011 18:23:35 +0200 + +vdr-plugin-live (0.2.0-14) unstable; urgency=low + + * Added 04_tntnet-2.0.patch to fix compatibility with Tntnet 2.0 + (Closes: #639079) + + -- Tobias Grimm Thu, 25 Aug 2011 22:09:52 +0200 + +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 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) diff -Nru vdr-plugin-live-0.2.0/debian/control vdr-plugin-live-0.2.0/debian/control --- vdr-plugin-live-0.2.0/debian/control 2011-04-17 18:06:19.000000000 +0000 +++ vdr-plugin-live-0.2.0/debian/control 2011-12-11 16:47:01.000000000 +0000 @@ -3,13 +3,13 @@ Priority: extra Maintainer: Debian VDR Team Uploaders: Thomas Schmidt , Tobias Grimm , Thomas Günther -Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.18), +Build-Depends: debhelper (>= 7.0.50~), vdr-dev (>= 1.7.22), 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 -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/ +Standards-Version: 3.9.2 Homepage: http://live.vdr-developer.org +Vcs-Git: git://git.debian.org/git/pkg-vdr-dvb/vdr-plugin-live.git +Vcs-Browser: http://git.debian.org/?p=pkg-vdr-dvb/vdr-plugin-live.git Package: vdr-plugin-live Architecture: any diff -Nru vdr-plugin-live-0.2.0/debian/patches/01_ipv6.patch vdr-plugin-live-0.2.0/debian/patches/01_ipv6.patch --- vdr-plugin-live-0.2.0/debian/patches/01_ipv6.patch 2011-04-03 20:36:37.000000000 +0000 +++ vdr-plugin-live-0.2.0/debian/patches/01_ipv6.patch 2011-12-11 16:47:01.000000000 +0000 @@ -1,35 +1,39 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_ipv6.dpatch by Timo Weingärtner -## -## 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 -@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; diff -Nru vdr-plugin-live-0.2.0/debian/patches/04_tntnet-2.0.patch vdr-plugin-live-0.2.0/debian/patches/04_tntnet-2.0.patch --- vdr-plugin-live-0.2.0/debian/patches/04_tntnet-2.0.patch 1970-01-01 00:00:00.000000000 +0000 +++ vdr-plugin-live-0.2.0/debian/patches/04_tntnet-2.0.patch 2011-12-11 16:47:01.000000000 +0000 @@ -0,0 +1,12 @@ +Index: vdr-plugin-live-0.2.0/thread.cpp +=================================================================== +--- vdr-plugin-live-0.2.0.orig/thread.cpp 2011-08-25 21:58:33.000000000 +0200 ++++ vdr-plugin-live-0.2.0/thread.cpp 2011-08-25 21:58:37.000000000 +0200 +@@ -3,6 +3,7 @@ + #include + #include + #include ++#include + #include "thread.h" + #include "tntconfig.h" + diff -Nru vdr-plugin-live-0.2.0/debian/patches/series vdr-plugin-live-0.2.0/debian/patches/series --- vdr-plugin-live-0.2.0/debian/patches/series 2011-04-03 20:38:07.000000000 +0000 +++ vdr-plugin-live-0.2.0/debian/patches/series 2011-12-11 16:47:01.000000000 +0000 @@ -1,3 +1,4 @@ 01_ipv6.patch 02_timers_colon.patch 03_live-0.2.0-fix-INCLUDES.patch +04_tntnet-2.0.patch