From 10b9a80362b99fc8fcbd16c0cc5d397f651f81e3 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 27 Apr 2012 12:36:23 +0300
Subject: [PATCH] vdr-iptv: update to vdr-iptv-0.5.2

---
 packages/3rdparty/multimedia/vdr-iptv/meta    |  2 +-
 .../vdr-iptv-0.5.0-http_socket_connect.patch  | 36 -------------------
 ...dr-iptv-0.5.0-skip_header_processing.patch | 29 ---------------
 .../multimedia/vdr-addon/changelog.txt        |  1 +
 4 files changed, 2 insertions(+), 66 deletions(-)
 delete mode 100644 packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-http_socket_connect.patch
 delete mode 100644 packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-skip_header_processing.patch

diff --git a/packages/3rdparty/multimedia/vdr-iptv/meta b/packages/3rdparty/multimedia/vdr-iptv/meta
index 878c216d7b..2ecb3620f5 100644
--- a/packages/3rdparty/multimedia/vdr-iptv/meta
+++ b/packages/3rdparty/multimedia/vdr-iptv/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="vdr-iptv"
-PKG_VERSION="0.5.0"
+PKG_VERSION="0.5.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-http_socket_connect.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-http_socket_connect.patch
deleted file mode 100644
index 866c7f70ea..0000000000
--- a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-http_socket_connect.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 9766e893eb3ed1076e41f89b663b3be122355f39
-Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Wed Mar 7 00:13:55 2012 +0200
-
-    vdr-iptv: protocolhttp socket connect() fix
-
-diff --git a/protocolhttp.c b/protocolhttp.c
-index 62abbd6..2d5277a 100644
---- a/protocolhttp.c
-+++ b/protocolhttp.c
-@@ -42,6 +42,25 @@ bool cIptvProtocolHttp::Connect(void)
-   if (!isActive && !isempty(streamAddr) && !isempty(streamPath)) {
-      // Ensure that socket is valid and connect
-      OpenSocket(socketPort, streamAddr);
-+
-+     // First try only the IP address
-+     sockAddr.sin_addr.s_addr = inet_addr(streamAddr);
-+
-+     if (sockAddr.sin_addr.s_addr == INADDR_NONE) {
-+        debug("Cannot convert %s directly to internet address\n", streamAddr);
-+
-+        // It may be a host name, get the name
-+        struct hostent *host;
-+        host = gethostbyname(streamAddr);
-+        if (!host) {
-+           char tmp[64];
-+           error("%s is not valid address: %s", streamAddr, strerror_r(h_errno, tmp, sizeof(tmp)));
-+           return false;
-+           }
-+
-+        sockAddr.sin_addr.s_addr = inet_addr(*host->h_addr_list);
-+        }
-+
-      if (!ConnectSocket()) {
-         CloseSocket();
-         return false;
diff --git a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-skip_header_processing.patch b/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-skip_header_processing.patch
deleted file mode 100644
index 5fe6f94932..0000000000
--- a/packages/3rdparty/multimedia/vdr-iptv/patches/vdr-iptv-0.5.0-skip_header_processing.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit 67d5e792aa30100b111490c3c9e1c01f9def3c86
-Author: Stefan Saraev <stefan@saraev.ca>
-Date:   Thu Mar 15 00:02:50 2012 +0200
-
-    vdr-iptv: skip header processing
-
-diff --git a/protocolhttp.c b/protocolhttp.c
-index 2d5277a..9b305aa 100644
---- a/protocolhttp.c
-+++ b/protocolhttp.c
-@@ -154,17 +154,7 @@ bool cIptvProtocolHttp::ProcessHeaders(void)
-     memset(buf, '\0', sizeof(buf));
-     if (!GetHeaderLine(buf, sizeof(buf), lineLength))
-        return false;
--    if (!responseFound && sscanf(buf, "HTTP/1.%*i %i ", &response) != 1) {
--       error("Expected HTTP header not found\n");
--       continue;
--       }
--    else
--       responseFound = true;
--    // Allow only 'OK' and 'Partial Content'
--    if ((response != 200) && (response != 206)) {
--       error("Invalid HTTP response (%d): %s\n", response, buf);
--       return false;
--       }
-+      responseFound = true;
-     }
-   return true;
- }
diff --git a/packages/addons/service/multimedia/vdr-addon/changelog.txt b/packages/addons/service/multimedia/vdr-addon/changelog.txt
index 045f7f0ae4..fd3c1b415e 100644
--- a/packages/addons/service/multimedia/vdr-addon/changelog.txt
+++ b/packages/addons/service/multimedia/vdr-addon/changelog.txt
@@ -3,6 +3,7 @@
 - added rotorng plugin
 - added control plugin
 - added epgsearch plugin
+- update to vdr-iptv-0.5.2
 
 2.1.3
 - adjust for fontconfig 2.9.0