r3457 - in vdr/vdradmin-am/trunk/debian: . patches

[Tobias Grimm]

Author: tiber-guest
Date: 2006-09-29 20:52:56 +0000 (Fri, 29 Sep 2006)
New Revision: 3457

Modified:
   vdr/vdradmin-am/trunk/debian/changelog
   vdr/vdradmin-am/trunk/debian/patches/00list
   vdr/vdradmin-am/trunk/debian/patches/05_ipv6-support.dpatch
Log:
Updated 05_ipv6-support.dpatch


Modified: vdr/vdradmin-am/trunk/debian/changelog
===================================================================
--- vdr/vdradmin-am/trunk/debian/changelog	2006-09-29 20:50:10 UTC (rev 3456)
+++ vdr/vdradmin-am/trunk/debian/changelog	2006-09-29 20:52:56 UTC (rev 3457)
@@ -1,3 +1,10 @@
+vdradmin-am (3.4.7-1) UNRELEASED; urgency=low
+
+  * (NOT RELEASED YET) New upstream release
+  * Updated 05_ipv6-support.dpatch
+
+ -- Tobias Grimm <tg at e-tobi.net>  Fri, 29 Sep 2006 22:45:53 +0200
+
 vdradmin-am (3.4.6-2) unstable; urgency=low
 
   * Bumped Standards-Version to 3.7.2

Modified: vdr/vdradmin-am/trunk/debian/patches/00list
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/00list	2006-09-29 20:50:10 UTC (rev 3456)
+++ vdr/vdradmin-am/trunk/debian/patches/00list	2006-09-29 20:52:56 UTC (rev 3457)
@@ -1,4 +1,4 @@
 01_dist-var
 03_cfgfiles-fhs
 04_epg_filename
-05_ipv6-support.dpatch
+05_ipv6-support

Modified: vdr/vdradmin-am/trunk/debian/patches/05_ipv6-support.dpatch
===================================================================
--- vdr/vdradmin-am/trunk/debian/patches/05_ipv6-support.dpatch	2006-09-29 20:50:10 UTC (rev 3456)
+++ vdr/vdradmin-am/trunk/debian/patches/05_ipv6-support.dpatch	2006-09-29 20:52:56 UTC (rev 3457)
@@ -6,18 +6,19 @@
 ## DP: Adds IPV6-Support to the webinterface (closes: #351764)
 
 @DPATCH@
-diff -urNad vdradmin-am-3.4.5/vdradmind.pl /tmp/dpep.MOnIXb/vdradmin-am-3.4.5/vdradmind.pl
---- vdradmin-am-3.4.5/vdradmind.pl	2006-05-14 22:04:38.028465000 +0200
-+++ /tmp/dpep.MOnIXb/vdradmin-am-3.4.5/vdradmind.pl	2006-05-14 22:06:03.881830500 +0200
-@@ -55,6 +55,7 @@
+diff -urNad vdradmin-am-3.4.7~/vdradmind.pl vdradmin-am-3.4.7/vdradmind.pl
+--- vdradmin-am-3.4.7~/vdradmind.pl	2006-09-29 22:47:05.000000000 +0200
++++ vdradmin-am-3.4.7/vdradmind.pl	2006-09-29 22:48:41.000000000 +0200
+@@ -63,7 +63,7 @@
+ use locale;
  use Env qw(@PATH LANGUAGE);
  use CGI qw(:no_debug);
- use IO::Socket;
+-use IO::Socket;
 +use IO::Socket::INET6;
- use HTML::Template::Expr();
  use Template;
  use Time::Local qw(timelocal);
-@@ -389,7 +390,7 @@
+ use POSIX ":sys_wait_h", qw(strftime mktime locale_h);
+@@ -428,7 +428,7 @@
  my @vdrcmds = loadCommandsConf("$CONFIG{VDRCONFDIR}/commands.conf");
  
  my ($Socket) =
@@ -26,3 +27,12 @@
                          LocalPort => $CONFIG{SERVERPORT},
                          LocalAddr => $CONFIG{SERVERHOST},
                          Listen    => 10,
+@@ -5020,7 +5020,7 @@
+     main::Log(LOG_VDRCOM, "LOG_VDRCOM: connect to $CONFIG{VDR_HOST}:$CONFIG{VDR_PORT}");
+ 
+     $SOCKET =
+-      IO::Socket::INET->new(PeerAddr => $CONFIG{VDR_HOST},
++      IO::Socket::INET6->new(PeerAddr => $CONFIG{VDR_HOST},
+                             PeerPort => $CONFIG{VDR_PORT},
+                             Proto    => 'tcp'
+       )