Merge pull request #42 from linuxserver/perl

Perl changes, add picons file to gitignore and update XMLTV to 0.5.69

.gitignore

@@ -41,3 +41,6 @@ $RECYCLE.BIN/
 Network Trash Folder
 Temporary Items
 .apdisk
+
+# Picons file
+picons.tar.bz2

Dockerfile

@@ -3,8 +3,7 @@ MAINTAINER saarg
 
 # package version
 ARG ARGTABLE_VER="2.13"
-ARG UNICODE_VER="2.09"
-ARG XMLTV_VER="0.5.68"
+ARG XMLTV_VER="0.5.69"
 
 # set version label
 ARG BUILD_DATE
@@ -38,7 +37,7 @@ RUN \
 	libxslt-dev \
 	make \
 	mercurial \
-	openssl-dev \
+	libressl-dev \
 	patch \
 	perl-dev \
 	pkgconf \
@@ -57,18 +56,24 @@ RUN \
 	libcurl	\
 	libssl1.0 \
 	linux-headers \
-	openssl \
+	libressl \
 	perl \
 	perl-archive-zip \
 	perl-boolean \
 	perl-capture-tiny \
 	perl-cgi \
 	perl-compress-raw-zlib \
+	perl-data-dumper \
 	perl-date-manip \
 	perl-datetime \
+	perl-datetime-format-strptime \
+	perl-datetime-timezone \
+	perl-dbd-sqlite \
+	perl-dbi \
 	perl-digest-sha1 \
 	perl-file-slurp \
 	perl-file-temp \
+	perl-file-which \
 	perl-getopt-long \
 	perl-html-parser \
 	perl-html-tree \
@@ -76,90 +81,77 @@ RUN \
 	perl-io \
 	perl-io-compress \
 	perl-io-html \
+	perl-io-socket-ssl \
 	perl-io-stringy \
 	perl-json \
 	perl-libwww \
+	perl-lingua-en-numbers-ordinate \
+	perl-lingua-preferred \
+	perl-list-moreutils \
 	perl-module-build \
 	perl-module-pluggable \
 	perl-net-ssleay \
 	perl-parse-recdescent \
 	perl-path-class \
+	perl-scalar-list-utils \
+	perl-term-progressbar \
 	perl-term-readkey \
 	perl-test-exception \
 	perl-test-requires \
+	perl-timedate \
 	perl-try-tiny \
+	perl-unicode-string \
+	perl-xml-libxml \
+	perl-xml-libxslt \
 	perl-xml-parser \
 	perl-xml-sax \
+	perl-xml-treepp \
+	perl-xml-twig \
+	perl-xml-writer \
 	python \
 	tar \
 	uriparser \
 	wget \
 	zlib && \
 
-# build libiconv
- mkdir -p \
- /tmp/iconv-src && \
- curl -o \
- /tmp/iconv.tar.gz -L \
-	ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz && \
- tar xf /tmp/iconv.tar.gz -C \
-	/tmp/iconv-src --strip-components=1 && \
- cd /tmp/iconv-src && \
- ./configure \
-	--prefix=/usr/local && \
- patch -p1 -i \
-	/tmp/patches/libiconv-1-fixes.patch && \
- make && \
- make install && \
- libtool --finish /usr/local/lib && \
-
-# install perl modules
+# install perl modules for xmltv
  curl -L http://cpanmin.us | perl - App::cpanminus && \
- cpanm Date::Language && \
  cpanm DateTime::Format::ISO8601 && \
- cpanm DateTime::Format::Strptime && \
+ cpanm DateTime::Format::SQLite && \
+ cpanm Encode && \
+ cpanm File::HomeDir && \
+ cpanm File::Path && \
  cpanm HTML::Entities && \
  cpanm HTML::TableExtract && \
- cpanm HTML::TreeBuilder && \
  cpanm HTTP::Cache::Transparent && \
  cpanm inc && \
- cpanm IO::Scalar && \
- cpanm IO::Socket::SSL && \
  cpanm JSON::PP && \
- cpanm Lingua::EN::Numbers::Ordinate && \
- cpanm Lingua::Preferred && \
- cpanm List::MoreUtils && \
  cpanm LWP::Simple && \
  cpanm LWP::UserAgent && \
  cpanm PerlIO::gzip && \
  cpanm SOAP::Lite && \
  cpanm Storable && \
- cpanm Term::ProgressBar && \
  cpanm Unicode::UTF8simple && \
  cpanm version && \
  cpanm WWW::Mechanize && \
  cpanm XML::DOM && \
- cpanm XML::LibXML && \
- cpanm XML::LibXSLT && \
- cpanm XML::TreePP && \
- cpanm XML::Twig && \
- cpanm XML::Writer && \
 
-# patch and build perl-unicode-string
+# build libiconv
  mkdir -p \
-	/tmp/unicode && \
+ /tmp/iconv-src && \
  curl -o \
- /tmp/unicode-src.tar.gz -L \
-	"http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/Unicode-String-${UNICODE_VER}.tar.gz" && \
- tar xzf /tmp/unicode-src.tar.gz -C \
-	/tmp/unicode --strip-components=1 && \
- cd /tmp/unicode/lib/Unicode && \
- patch -i /tmp/patches/perl-unicode.patch && \
- cd /tmp/unicode && \
- perl Makefile.PL && \
+ /tmp/iconv.tar.gz -L \
+	ftp://www.mirrorservice.org/sites/ftp.gnu.org/gnu/libiconv/libiconv-1.14.tar.gz && \
+ tar xf /tmp/iconv.tar.gz -C \
+	/tmp/iconv-src --strip-components=1 && \
+ cd /tmp/iconv-src && \
+ ./configure \
+	--prefix=/usr/local && \
+ patch -p1 -i \
+	/tmp/patches/libiconv-1-fixes.patch && \
  make && \
- make test && \
  make install && \
+ libtool --finish /usr/local/lib && \
 
 # build dvb-apps
  hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \
@@ -188,7 +180,7 @@ RUN \
 	--prefix=/usr \
 	--sysconfdir=/config && \
  make && \
- make install && \
+ make install && \	
 
 # build XMLTV
  curl -o /tmp/xmtltv-src.tar.bz2 -L \

README.md

@@ -151,6 +151,7 @@ You need to enable minimum advanced view level to see the picons options.
 
 ## Versions
 
++ **09.02.2017:** Perl changes, add picons file to gitignore and update XMLTV to 0.5.69.
 + **07.02.2017:** Add variable to add additional runtime paramters.
 + **05.02.2017:** Update to alpine 3.5 and change dvb-apps to only compile needed libs.
 + **14.11.2016:** Add picons from picons.xyz to /picons folder and add info to README.

patches/perl-unicode.patch

@@ -1,11 +0,0 @@
---- CharName.pm	2005-10-25 20:11:00.000000000 +0200
-+++ CharName.pm.mod	2016-08-12 23:25:51.752348000 +0200
-@@ -77,7 +77,7 @@
- 	    return join("", "HANGUL SYLLABLE ", @s)
- 	}
-     }
--    _init_names() unless defined %NAMES;
-+    _init_names() unless %NAMES;
-     $NAMES{sprintf("%04X",$code)}
- }
-