From 872f6945dd82f629f7b78a5ab00a047a76acf6a8 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Thu, 9 Feb 2017 19:00:51 +0100 Subject: [PATCH 1/7] Use alpine packages of perl modules instead of cpan --- Dockerfile | 82 +++++++++++++++++++++--------------------------------- 1 file changed, 32 insertions(+), 50 deletions(-) diff --git a/Dockerfile b/Dockerfile index 29ddd0a..8ebbb70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,6 @@ MAINTAINER saarg # package version ARG ARGTABLE_VER="2.13" -ARG UNICODE_VER="2.09" ARG XMLTV_VER="0.5.68" # set version label @@ -66,6 +65,7 @@ RUN \ perl-compress-raw-zlib \ perl-date-manip \ perl-datetime \ + perl-datetime-format-strptime \ perl-digest-sha1 \ perl-file-slurp \ perl-file-temp \ @@ -76,26 +76,56 @@ 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-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 && \ +# install perl modules for xmltv + curl -L http://cpanmin.us | perl - App::cpanminus && \ + cpanm DateTime::Format::ISO8601 && \ + cpanm HTML::Entities && \ + cpanm HTML::TableExtract && \ + cpanm HTTP::Cache::Transparent && \ + cpanm inc && \ + cpanm JSON::PP && \ + cpanm LWP::Simple && \ + cpanm LWP::UserAgent && \ + cpanm PerlIO::gzip && \ + cpanm SOAP::Lite && \ + cpanm Storable && \ + cpanm Unicode::UTF8simple && \ + cpanm version && \ + cpanm WWW::Mechanize && \ + cpanm XML::DOM && \ + # build libiconv mkdir -p \ /tmp/iconv-src && \ @@ -113,54 +143,6 @@ RUN \ make install && \ libtool --finish /usr/local/lib && \ -# install perl modules - curl -L http://cpanmin.us | perl - App::cpanminus && \ - cpanm Date::Language && \ - cpanm DateTime::Format::ISO8601 && \ - cpanm DateTime::Format::Strptime && \ - 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 - mkdir -p \ - /tmp/unicode && \ - 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 && \ - make && \ - make test && \ - make install && \ - # build dvb-apps hg clone http://linuxtv.org/hg/dvb-apps /tmp/dvb-apps && \ cd /tmp/dvb-apps && \ @@ -188,7 +170,7 @@ RUN \ --prefix=/usr \ --sysconfdir=/config && \ make && \ - make install && \ + make install && \ # build XMLTV curl -o /tmp/xmtltv-src.tar.bz2 -L \ From 3a6ae839ba77344a128ecf5bc318c1909d98bd8f Mon Sep 17 00:00:00 2001 From: tobbenb Date: Thu, 9 Feb 2017 19:01:59 +0100 Subject: [PATCH 2/7] Add picons.tar.bz2 to .gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 96374c4..71109ee 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,6 @@ $RECYCLE.BIN/ Network Trash Folder Temporary Items .apdisk + +# Picons file +picons.tar.bz2 From b995fe10416eb72b7fe78130a062bbc791a3c0dc Mon Sep 17 00:00:00 2001 From: tobbenb Date: Thu, 9 Feb 2017 19:03:11 +0100 Subject: [PATCH 3/7] Update XMLTV to 0.5.69 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 8ebbb70..e1ce894 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ MAINTAINER saarg # package version ARG ARGTABLE_VER="2.13" -ARG XMLTV_VER="0.5.68" +ARG XMLTV_VER="0.5.69" # set version label ARG BUILD_DATE From 41876bfedc6b87d7f79c1e73e4f62ce3b1cd79c6 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Thu, 9 Feb 2017 20:00:04 +0100 Subject: [PATCH 4/7] Update XMLTV to 0.5.69 --- Dockerfile | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Dockerfile b/Dockerfile index e1ce894..4184c92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -63,12 +63,17 @@ RUN \ 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 \ @@ -88,6 +93,7 @@ RUN \ perl-net-ssleay \ perl-parse-recdescent \ perl-path-class \ + perl-scalar-list-utils \ perl-term-progressbar \ perl-term-readkey \ perl-test-exception \ @@ -111,6 +117,10 @@ RUN \ # install perl modules for xmltv curl -L http://cpanmin.us | perl - App::cpanminus && \ cpanm DateTime::Format::ISO8601 && \ + cpanm DateTime::Format::SQLite && \ + cpanm Encode && \ + cpanm File::HomeDir && \ + cpanm File::Path && \ cpanm HTML::Entities && \ cpanm HTML::TableExtract && \ cpanm HTTP::Cache::Transparent && \ From 452c471a566102dc316f4874b1b819fb584233d0 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Thu, 9 Feb 2017 22:25:03 +0100 Subject: [PATCH 5/7] Update README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 687e06e..0e751e2 100644 --- a/README.md +++ b/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. From 131e9994ad9724a482b55f7107adc322560aa238 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Thu, 9 Feb 2017 22:27:34 +0100 Subject: [PATCH 6/7] Delete perl-unicode patch --- patches/perl-unicode.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 patches/perl-unicode.patch diff --git a/patches/perl-unicode.patch b/patches/perl-unicode.patch deleted file mode 100644 index 518d8ae..0000000 --- a/patches/perl-unicode.patch +++ /dev/null @@ -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)} - } - From 82b4aa477849c1e0d6d9bdc680083911691c54b3 Mon Sep 17 00:00:00 2001 From: tobbenb Date: Thu, 9 Feb 2017 23:03:58 +0100 Subject: [PATCH 7/7] Change from openssl to libressl --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4184c92..3ac601e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -37,7 +37,7 @@ RUN \ libxslt-dev \ make \ mercurial \ - openssl-dev \ + libressl-dev \ patch \ perl-dev \ pkgconf \ @@ -56,7 +56,7 @@ RUN \ libcurl \ libssl1.0 \ linux-headers \ - openssl \ + libressl \ perl \ perl-archive-zip \ perl-boolean \