From bdfb938257cbc5538ab49ee9ce5f689b72415c58 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 3 Nov 2022 10:58:28 -0400 Subject: [PATCH 1/2] rebase to 3.16, upgrade to s6v3, update pcsd driver download link --- Dockerfile | 8 ++++---- Dockerfile.aarch64 | 8 ++++---- Dockerfile.armhf | 8 ++++---- readme-vars.yml | 3 ++- .../init-config-end/dependencies.d/init-oscam-config | 0 .../s6-rc.d/init-oscam-config/dependencies.d/init-config | 0 .../s6-rc.d/init-oscam-config/run} | 0 root/etc/s6-overlay/s6-rc.d/init-oscam-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-oscam-config/up | 1 + .../s6-overlay/s6-rc.d/svc-oscam/dependencies.d/svc-pcsd | 0 root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-oscam/run | 5 +++++ root/etc/s6-overlay/s6-rc.d/svc-oscam/type | 1 + .../s6-rc.d/svc-pcsd/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-pcsd/run | 4 ++++ root/etc/s6-overlay/s6-rc.d/svc-pcsd/type | 1 + .../s6-overlay/s6-rc.d/user/contents.d/init-oscam-config | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-oscam | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-pcsd | 0 root/etc/services.d/oscam/run | 3 --- root/etc/services.d/pcscd/run | 3 --- 21 files changed, 28 insertions(+), 19 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-oscam-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-oscam-config/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-oscam-config/run} (100%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-oscam-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-oscam-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-oscam/dependencies.d/svc-pcsd create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-oscam/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-oscam/type create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-pcsd/dependencies.d/init-services create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-pcsd/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-pcsd/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-oscam-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-oscam create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-pcsd delete mode 100644 root/etc/services.d/oscam/run delete mode 100644 root/etc/services.d/pcscd/run diff --git a/Dockerfile b/Dockerfile index 1f2c636..9b10ac1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:3.16 # set version label ARG BUILD_DATE @@ -61,10 +61,10 @@ RUN \ mkdir -p \ /tmp/omnikey && \ curl -o \ - /tmp/omnikey.tar.gz -L \ - https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \ + /tmp/omnikey.tar.gz -L \ + "https://www3.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz" && \ tar xzf \ - /tmp/omnikey.tar.gz -C \ + /tmp/omnikey.tar.gz -C \ /tmp/omnikey --strip-components=2 && \ cd /tmp/omnikey && \ ./install && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0668203..0b6e1b7 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 # set version label ARG BUILD_DATE @@ -61,10 +61,10 @@ RUN \ mkdir -p \ /tmp/omnikey && \ curl -o \ - /tmp/omnikey.tar.gz -L \ - https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \ + /tmp/omnikey.tar.gz -L \ + "https://www3.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz" && \ tar xzf \ - /tmp/omnikey.tar.gz -C \ + /tmp/omnikey.tar.gz -C \ /tmp/omnikey --strip-components=2 && \ cd /tmp/omnikey && \ ./install && \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1062377..49aea9f 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 # set version label ARG BUILD_DATE @@ -61,10 +61,10 @@ RUN \ mkdir -p \ /tmp/omnikey && \ curl -o \ - /tmp/omnikey.tar.gz -L \ - https://www.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz && \ + /tmp/omnikey.tar.gz -L \ + "https://www3.hidglobal.com/sites/default/files/drivers/ifdokccid_linux_x86_64-v4.2.8.tar.gz" && \ tar xzf \ - /tmp/omnikey.tar.gz -C \ + /tmp/omnikey.tar.gz -C \ /tmp/omnikey --strip-components=2 && \ cd /tmp/omnikey && \ ./install && \ diff --git a/readme-vars.yml b/readme-vars.yml index 7713a54..6b92446 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -73,7 +73,8 @@ app_setup_block: | # changelog changelogs: - - { date: "19.12.19:", desc: "Rebasing to alpine 3.15." } + - { date: "03.11.22:", desc: "Rebasing to alpine 3.16 and s6v3. Update pcsd driver link." } + - { date: "13.02.22:", desc: "Rebasing to alpine 3.15." } - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." } - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." } - { date: "29.04.19:", desc: "Add revision check, so pipeline can build new revisions." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-oscam-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-oscam-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-oscam-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/run old mode 100644 new mode 100755 similarity index 100% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-oscam-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/init-oscam-config/type b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-oscam-config/up b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/up new file mode 100644 index 0000000..af01702 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-oscam-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-oscam-config/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-oscam/dependencies.d/svc-pcsd b/root/etc/s6-overlay/s6-rc.d/svc-oscam/dependencies.d/svc-pcsd new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd new file mode 100644 index 0000000..e440e5c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-oscam/notification-fd @@ -0,0 +1 @@ +3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-oscam/run b/root/etc/s6-overlay/s6-rc.d/svc-oscam/run new file mode 100755 index 0000000..6c1f92b --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-oscam/run @@ -0,0 +1,5 @@ +#!/usr/bin/with-contenv bash + +exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8888" \ + s6-setuidgid abc /usr/bin/oscam -c /config/oscam diff --git a/root/etc/s6-overlay/s6-rc.d/svc-oscam/type b/root/etc/s6-overlay/s6-rc.d/svc-oscam/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-oscam/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-pcsd/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-pcsd/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-pcsd/run b/root/etc/s6-overlay/s6-rc.d/svc-pcsd/run new file mode 100755 index 0000000..a1e0d49 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-pcsd/run @@ -0,0 +1,4 @@ +#!/usr/bin/with-contenv bash + +exec \ + /usr/sbin/pcscd -f diff --git a/root/etc/s6-overlay/s6-rc.d/svc-pcsd/type b/root/etc/s6-overlay/s6-rc.d/svc-pcsd/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-pcsd/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-oscam-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-oscam-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-oscam b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-oscam new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-pcsd b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-pcsd new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/oscam/run b/root/etc/services.d/oscam/run deleted file mode 100644 index d18b4c3..0000000 --- a/root/etc/services.d/oscam/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash -exec \ - s6-setuidgid abc /usr/bin/oscam -c /config/oscam diff --git a/root/etc/services.d/pcscd/run b/root/etc/services.d/pcscd/run deleted file mode 100644 index c4e0632..0000000 --- a/root/etc/services.d/pcscd/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash -exec \ - s6-setuidgid root /usr/sbin/pcscd -f From bd329a8509cc9d8472e57b9a5629cdc618da20f5 Mon Sep 17 00:00:00 2001 From: aptalca Date: Thu, 3 Nov 2022 14:31:02 -0400 Subject: [PATCH 2/2] update allowed ip ranges --- root/defaults/oscam.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/defaults/oscam.conf b/root/defaults/oscam.conf index 1a2b1d6..980833d 100644 --- a/root/defaults/oscam.conf +++ b/root/defaults/oscam.conf @@ -9,4 +9,4 @@ logfile = stdout [webif] httpport = 8888 -httpallowed = 127.0.0.1,192.168.0.0-192.168.255.255,10.0.0.0-10.255.255.255,255.255.255.255 +httpallowed = 127.0.0.1,172.16.0.0-172.31.255.255,192.168.0.0-192.168.255.255,10.0.0.0-10.255.255.255,255.255.255.255