r8318 - in /vdr/vdradmin-am/trunk/debian: changelog patches/00list patches/04_manpage-fixes.dpatch patches/08_fallback-to-ipv4.dpatch

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

Author: tiber-guest
Date: Thu Jan 14 22:14:19 2010
New Revision: 8318

URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/?sc=1&rev=8318
Log:
Added 08_fallback-to-ipv4.dpatch (Closes: #564527)

Added:
    vdr/vdradmin-am/trunk/debian/patches/08_fallback-to-ipv4.dpatch
Removed:
    vdr/vdradmin-am/trunk/debian/patches/04_manpage-fixes.dpatch
Modified:
    vdr/vdradmin-am/trunk/debian/changelog
    vdr/vdradmin-am/trunk/debian/patches/00list

Modified: vdr/vdradmin-am/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/changelog?rev=8318&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/changelog (original)
+++ vdr/vdradmin-am/trunk/debian/changelog Thu Jan 14 22:14:19 2010
@@ -1,11 +1,12 @@
-vdradmin-am (3.6.5-3) UNRELEASED; urgency=low
+vdradmin-am (3.6.5-3) unstable; urgency=low
 
   * Dropped 07_templates_utf8.dpatch and added 07_fix-need-recoding-detection
     (Closes #561834) - This should fix the encoding problem and allow
     ISO8859 as well as UTF-8 for VDR, while beeing able to choose a different
     encoding for VDRAdmin
-
- -- Tobias Grimm <etobi at debian.org>  Thu, 14 Jan 2010 20:56:12 +0100
+  * Added 08_fallback-to-ipv4.dpatch (Closes: #564527)
+
+ -- Tobias Grimm <etobi at debian.org>  Thu, 14 Jan 2010 23:13:57 +0100
 
 vdradmin-am (3.6.5-2) UNRELEASED; urgency=low
 

Modified: vdr/vdradmin-am/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/00list?rev=8318&op=diff
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list (original)
+++ vdr/vdradmin-am/trunk/debian/patches/00list Thu Jan 14 22:14:19 2010
@@ -1,6 +1,6 @@
 01_dist-var
 02_search-path.dpatch
 03_cfgfiles-fhs
-#04_manpage-fixes
 06_template-cache
 07_fix-need-recoding-detection
+08_fallback-to-ipv4

Added: vdr/vdradmin-am/trunk/debian/patches/08_fallback-to-ipv4.dpatch
URL: http://svn.debian.org/wsvn/pkg-vdr-dvb/vdr/vdradmin-am/trunk/debian/patches/08_fallback-to-ipv4.dpatch?rev=8318&op=file
==============================================================================
--- vdr/vdradmin-am/trunk/debian/patches/08_fallback-to-ipv4.dpatch (added)
+++ vdr/vdradmin-am/trunk/debian/patches/08_fallback-to-ipv4.dpatch Thu Jan 14 22:14:19 2010
@@ -1,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_fallback-to-ipv4.dpatch by Tobias Grimm <etobi at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: When connecting via SVDRP to VDR, fall back to IPV4, if
+## DP: the IPV6 connect fails. 
+
+ at DPATCH@
+diff -urNad vdradmin-am-3.6.5~/vdradmind.pl vdradmin-am-3.6.5/vdradmind.pl
+--- vdradmin-am-3.6.5~/vdradmind.pl	2009-12-30 13:43:05.000000000 +0100
++++ vdradmin-am-3.6.5/vdradmind.pl	2010-01-14 22:36:28.000000000 +0100
+@@ -6709,6 +6709,11 @@
+                              PeerPort => $CONFIG{VDR_PORT},
+                              Proto    => 'tcp'
+       )
++      || $InetSocketModule->new(PeerAddr => $CONFIG{VDR_HOST},
++                             PeerPort => $CONFIG{VDR_PORT},
++                             Domain   => IO::Socket::AF_INET(),
++                             Proto    => 'tcp'
++      )
+       || main::HTMLError(sprintf($ERROR_MESSAGE{connect_failed}, $CONFIG{VDR_HOST}, $CONFIG{VDR_PORT})) && return;
+ 
+     $connected = true;