Bot Updating Package Versions

* Create tv_grab_url

URL grabber

* Update README.md

* Update README.md

* Update readme-vars.yml

Dockerfile

@@ -209,7 +209,7 @@ RUN \
 
 RUN \
  echo "***** compile comskip ****" && \
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
  cd /tmp/comskip && \
  ./autogen.sh && \
  ./configure \

Dockerfile.aarch64

@@ -207,7 +207,7 @@ RUN \
 
 RUN \
  echo "***** compile comskip ****" && \
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
  cd /tmp/comskip && \
  ./autogen.sh && \
  ./configure \

Dockerfile.armhf

@@ -208,7 +208,7 @@ RUN \
 
 RUN \
  echo "***** compile comskip ****" && \
- git clone git://github.com/erikkaashoek/Comskip /tmp/comskip && \
+ git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
  cd /tmp/comskip && \
  ./autogen.sh && \
  ./configure \

Jenkinsfile

@@ -353,9 +353,11 @@ pipeline {
               if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                 cd ${TEMPDIR}/unraid/templates/
                 if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, removing Unraid template"
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                 else
                   cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                   git add unraid/${CONTAINER_NAME}.xml

README.md

@@ -48,26 +48,26 @@ Multiple EPG sources are supported (over-the-air DVB and ATSC including OpenTV D
 
 ## Supported Architectures
 
-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/tvheadend` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/tvheadend:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
-| Architecture | Tag |
+| Architecture | Available | Tag |
-| :----: | --- |
+| :----: | :----: | ---- |
-| x86-64 | amd64-latest |
+| x86-64 | ✅ | amd64-\<version tag\> |
-| arm64 | arm64v8-latest |
+| arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | arm32v7-latest |
+| armhf| ✅ | arm32v7-\<version tag\> |
 
 ## Version Tags
 
-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.
 
-| Tag | Description |
+| Tag | Available | Description |
-| :----: | --- |
+| :----: | :----: |--- |
-| latest | Current latest release. |
+| latest | ✅ | Current latest release. |
-| release-4.2 | Latest release from 4.2 branch. |
+| release-4.2 | ✅ | Latest release from 4.2 branch. |
 
 ## Application Setup
 
@@ -140,7 +140,7 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
   tvheadend:
-    image: lscr.io/linuxserver/tvheadend
+    image: lscr.io/linuxserver/tvheadend:latest
     container_name: tvheadend
     environment:
       - PUID=1000
@@ -175,7 +175,7 @@ docker run -d \
   --device /dev/dri:/dev/dri `#optional` \
   --device /dev/dvb:/dev/dvb `#optional` \
   --restart unless-stopped \
-  lscr.io/linuxserver/tvheadend
+  lscr.io/linuxserver/tvheadend:latest
 ```
 
 #### Host vs. Bridge
@@ -243,7 +243,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
   * `docker inspect -f '{{ index .Config.Labels "build_version" }}' tvheadend`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/tvheadend`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/tvheadend:latest`
 
 ## Updating Info
 
@@ -261,7 +261,7 @@ Below are the instructions for updating containers:
 
 ### Via Docker Run
 
-* Update the image: `docker pull lscr.io/linuxserver/tvheadend`
+* Update the image: `docker pull lscr.io/linuxserver/tvheadend:latest`
 * Stop the running container: `docker stop tvheadend`
 * Delete the container: `docker rm tvheadend`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
@@ -309,6 +309,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **16.04.22:** - Added URL XMLTV grabber.
 * **05.01.22:** - Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv.
 * **11.05.21:** - Added Intel iHD driver support.
 * **02.06.20:** - Update to Alpine 3.12.

package_versions.txt

@@ -3,20 +3,20 @@ alpine-keys-2.4-r1
 alsa-lib-1.2.5.1-r1
 aom-libs-3.2.0-r0
 apk-tools-2.12.7-r3
-bash-5.1.8-r0
+bash-5.1.16-r0
 brotli-libs-1.0.9-r5
 bsd-compat-headers-0.7.2-r3
-busybox-1.34.1-r4
+busybox-1.34.1-r5
 bzip2-1.0.8-r1
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
 coreutils-9.0-r2
-curl-7.80.0-r0
+curl-7.80.0-r1
-expat-2.4.4-r0
+expat-2.4.7-r0
 ffmpeg-4.4.1-r2
 ffmpeg-libs-4.4.1-r2
 fontconfig-2.13.1-r4
-freetype-2.11.0-r0
+freetype-2.11.1-r2
 fribidi-1.0.11-r0
 fts-1.2.7-r1
 gdbm-1.22-r0
@@ -25,7 +25,7 @@ gmp-6.2.1-r1
 gnu-libiconv-1.16-r0
 gnutls-3.7.1-r0
 graphite2-1.3.14-r0
-gzip-1.11-r0
+gzip-1.12-r0
 harfbuzz-3.0.0-r2
 intel-gmmlib-21.3.3-r0
 intel-media-driver-21.4.1-r0
@@ -34,12 +34,12 @@ less-590-r0
 libacl-2.2.53-r0
 libass-0.15.2-r0
 libattr-2.5.1-r1
-libblkid-2.37.3-r0
+libblkid-2.37.4-r0
 libbsd-0.11.3-r1
 libbz2-1.0.8-r1
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1l-r8
+libcrypto1.1-1.1.1o-r0
-libcurl-7.80.0-r0
+libcurl-7.80.0-r1
 libdav1d-0.9.2-r0
 libdrm-2.4.109-r0
 libdvbcsa-1.1.0-r1
@@ -54,21 +54,21 @@ libidn2-2.3.2-r0
 libintl-0.21-r0
 libjpeg-turbo-2.1.2-r0
 libmd-1.0.3-r0
-libmount-2.37.3-r0
+libmount-2.37.4-r0
 libogg-1.3.5-r0
 libpciaccess-0.16-r0
 libpng-1.6.37-r1
 libproc-3.3.17-r0
-libretls-3.3.4-r2
+libretls-3.3.4-r3
 libsrt-1.4.2-r1
 libssh-0.9.6-r1
-libssl1.1-1.1.1l-r8
+libssl1.1-1.1.1o-r0
 libstdc++-10.3.1_git20211027-r0
 libtasn1-4.18.0-r0
 libtheora-1.1.1-r16
 libunistring-0.9.10-r1
 liburiparser-0.9.6-r0
-libuuid-2.37.3-r0
+libuuid-2.37.4-r0
 libva-2.13.0-r0
 libva-intel-driver-2.4.1-r0
 libvdpau-1.4-r0
@@ -81,9 +81,9 @@ libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-6.0.0-r0
-libxml2-2.9.12-r2
+libxml2-2.9.14-r0
 libxshmfence-1.3-r1
-libxslt-1.1.34-r1
+libxslt-1.1.35-r0
 linux-headers-5.10.41-r0
 linux-pam-1.5.2-r0
 llvm12-libs-12.0.1-r0
@@ -101,11 +101,11 @@ ncurses-libs-6.3_p20211120-r0
 ncurses-terminfo-base-6.3_p20211120-r0
 nettle-3.7.3-r0
 nghttp2-libs-1.46.0-r0
-openssl-1.1.1l-r8
+openssl-1.1.1o-r0
 opus-1.3.1-r1
 p11-kit-0.24.0-r1
 pcre-8.45-r1
-pcre2-10.39-r0
+pcre2-10.40-r0
 perl-5.34.0-r1
 perl-archive-zip-1.68-r1
 perl-b-hooks-endofscope-0.25-r0
@@ -240,9 +240,9 @@ shadow-4.8.1-r1
 skalibs-2.11.0.0-r0
 soxr-0.1.3-r2
 sqlite-libs-3.36.0-r0
-ssl_client-1.34.1-r4
+ssl_client-1.34.1-r5
 tar-1.34-r0
-tzdata-2021e-r0
+tzdata-2022a-r0
 uriparser-0.9.6-r0
 utmps-0.1.0.3-r0
 v4l-utils-libs-1.22.1-r1
@@ -255,7 +255,7 @@ x264-libs-20210613-r0
 x265-3.5-r0
 x265-libs-3.5-r0
 xvidcore-1.3.7-r1
-xz-5.2.5-r0
+xz-5.2.5-r1
-xz-libs-5.2.5-r0
+xz-libs-5.2.5-r1
-zlib-1.2.11-r3
+zlib-1.2.12-r1
 zstd-libs-1.5.0-r0

readme-vars.yml

@@ -124,6 +124,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "16.04.22:", desc: "Added URL XMLTV grabber." }
   - { date: "05.01.22:", desc: "Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv." }
   - { date: "11.05.21:", desc: "Added Intel iHD driver support." }
   - { date: "02.06.20:", desc: "Update to Alpine 3.12." }

root/usr/bin/tv_grab_url

@@ -0,0 +1,67 @@
+#!/bin/bash
+
+dflag=
+vflag=
+cflag=
+
+if (( $# < 1 ))
+then
+  exit 0
+fi
+
+OPTARG=""
+URL=$1
+
+for arg
+do
+    delim=""
+    case "$arg" in
+    #translate --gnu-long-options to -g (short options)
+       --description) args="${args}-d ";;
+       --version) args="${args}-v ";;
+       --capabilities) args="${args}-c ";;
+       #pass through anything else
+       *) if [ "${arg:0:1}" == "-" ] || delim="\""
+          then
+           args="${args}${delim}${arg}${delim} "
+          else
+           OPTARG=${arg}
+          fi
+    esac
+done
+
+#Reset the positional parameters to the short options
+eval set -- $args
+
+while getopts "dvc" option
+do
+    case $option in
+        d)  dflag=1;;
+        v)  vflag=1;;
+        c)  cflag=1;;
+        \?) printf "unknown option: -%s\n" $OPTARG
+            printf "Usage: %s: [--description] [--version] [--capabilities] \n" $(basename $0)
+            exit 2
+            ;;
+    esac >&2
+done
+
+if [ "$dflag" ]
+then
+   printf "XMLTV URL grabber\n"
+   exit 0
+fi
+if [ "$vflag" ]
+then
+   printf "0.1\n"
+   exit 0
+fi
+if [ "$cflag" ]
+then
+   printf "baseline\n"
+   exit 0
+fi
+
+curl -s "$URL"
+
+exit 0