From 593b038b555f48222f03716144c493925d51ccd3 Mon Sep 17 00:00:00 2001
From: Hosh Sadiq <hoshsadiq@users.noreply.github.com>
Date: Wed, 11 Nov 2020 13:58:42 +0000
Subject: [PATCH] Bump XMLTV version to v0.6.3 #169

---
 Dockerfile                   | 10 ++++------
 Dockerfile.aarch64           |  4 +---
 Dockerfile.armhf             |  4 +---
 patches/test_tv_imdb.t.patch | 20 --------------------
 4 files changed, 6 insertions(+), 32 deletions(-)
 delete mode 100644 patches/test_tv_imdb.t.patch

diff --git a/Dockerfile b/Dockerfile
index 4b939e4..01a4241 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage
 
 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
+ARG XMLTV_VER="v0.6.3"
 
 # environment settings
 ARG TZ="Europe/Oslo"
@@ -119,7 +119,7 @@ RUN \
 
 RUN \
  echo "**** install perl modules for xmltv ****" && \
- curl -L https://cpanmin.us | perl - App::cpanminus && \
+ curl -s -L https://cpanmin.us | perl - App::cpanminus && \
  cpanm --installdeps /tmp/patches
 
 RUN \
@@ -127,8 +127,6 @@ RUN \
  git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
  cd /tmp/xmltv && \
  git checkout ${XMLTV_VER} && \
- echo "**** Fix test for xmltv alpine 3.11 ****" && \
- patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
  echo "**** Perl 5.26 fixes for XMTLV ****" && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
@@ -193,7 +191,7 @@ RUN \
  ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
  mkdir -p \
 	/tmp/argtable && \
- curl -o \
+ curl -s -o \
  /tmp/argtable-src.tar.gz -L \
 	"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
  tar xf \
@@ -321,7 +319,7 @@ RUN \
 	zlib && \
  echo "**** Add Picons ****" && \
  mkdir -p /picons && \
- curl -o \
+ curl -s -o \
         /picons.tar.bz2 -L \
         https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 2736bbf..c2be166 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.12 as buildstage
 
 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
+ARG XMLTV_VER="v0.6.3"
 
 # environment settings
 ARG TZ="Europe/Oslo"
@@ -126,8 +126,6 @@ RUN \
  git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
  cd /tmp/xmltv && \
  git checkout ${XMLTV_VER} && \
- echo "**** Fix test for xmltv alpine 3.11 ****" && \
- patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
  echo "**** Perl 5.26 fixes for XMTLV ****" && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 2608c79..c569145 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -3,7 +3,7 @@ FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.12 as buildstage
 
 # package versions
 ARG ARGTABLE_VER="2.13"
-ARG XMLTV_VER="v0.6.1"
+ARG XMLTV_VER="v0.6.3"
 
 # environment settings
 ARG TZ="Europe/Oslo"
@@ -126,8 +126,6 @@ RUN \
  git clone https://github.com/XMLTV/xmltv.git /tmp/xmltv && \
  cd /tmp/xmltv && \
  git checkout ${XMLTV_VER} && \
- echo "**** Fix test for xmltv alpine 3.11 ****" && \
- patch -p1 -i /tmp/patches/test_tv_imdb.t.patch && \
  echo "**** Perl 5.26 fixes for XMTLV ****" && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_latex && \
  sed "s/use POSIX 'tmpnam';//" -i filter/tv_to_text && \
diff --git a/patches/test_tv_imdb.t.patch b/patches/test_tv_imdb.t.patch
deleted file mode 100644
index 3e31bad..0000000
--- a/patches/test_tv_imdb.t.patch
+++ /dev/null
@@ -1,20 +0,0 @@
----
- t/test_tv_imdb.t | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/t/test_tv_imdb.t b/t/test_tv_imdb.t
-index ad504464..4dc281a1 100755
---- a/t/test_tv_imdb.t
-+++ b/t/test_tv_imdb.t
-@@ -84,9 +84,9 @@ INPUT: foreach my $input (@inputs) {
-     my $output="$tmpDir/".File::Basename::basename($input)."-output.xml";
- 
-     # Make temporary directory and split into it.
--    my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
-+    my $cmd="$cmds_dir/tv_imdb --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
-     if ( $input=~m/movies-only/ ) {
--	$cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot < $input > '$output' 2>&1";
-+	$cmd="$cmds_dir/tv_imdb --movies-only --quiet --imdbdir '$tmpDir' --with-keywords --with-plot --output '$output' '$input' 2>&1";
-     }
-     #print STDERR "\nRUN:$cmd\n";
-     my $r = system($cmd);
\ No newline at end of file