Merge pull request #8381 from heitbaum/pcsc-lite

pcscd and oscam addon updates with pcsc-lite 2.0.1

packages/addons/addon-depends/pcsc-lite/package.mk

@@ -2,12 +2,12 @@
 # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="pcsc-lite"
-PKG_VERSION="2.0.0"
-PKG_SHA256="d6c3e2b64510e5ed6fcd3323febf2cc2a8e5fda5a6588c7671f2d77f9f189356"
+PKG_VERSION="2.0.1"
+PKG_SHA256="5edcaf5d4544403bdab6ee2b5d6c02c6f97ea64eebf0825b8d0fa61ba417dada"
 PKG_LICENSE="GPL"
 PKG_SITE="https://pcsclite.apdu.fr"
 PKG_URL="https://pcsclite.apdu.fr/files/pcsc-lite-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain libusb"
+PKG_DEPENDS_TARGET="toolchain libusb polkit"
 PKG_LONGDESC="Middleware to access a smart card using SCard API (PC/SC)."
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
@@ -16,6 +16,10 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \
             --enable-libusb \
             --enable-usbdropdir=/storage/.kodi/addons/service.pcscd/drivers"
 
+pre_configure_target() {
+  export PKG_CONFIG_PATH="$(get_install_dir polkit)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}"
+}
+
 post_configure_target() {
   libtool_remove_rpath libtool
 }

packages/addons/addon-depends/polkit/package.mk

@@ -0,0 +1,16 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="polkit"
+PKG_VERSION="123"
+PKG_SHA256="72d9119b0aa35da871fd0660601d812c7a3d6af7e4e53e237840b71bb43d0c63"
+PKG_LICENSE="GPL"
+PKG_SITE="https://www.freedesktop.org/software/polkit/docs/latest/"
+PKG_URL="https://gitlab.freedesktop.org/polkit/polkit/-/archive/${PKG_VERSION}/polkit-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_TARGET="toolchain expat glib"
+PKG_LONGDESC="polkit provides an authorization API intended to be used by privileged programs offering service to unprivileged programs"
+PKG_BUILD_FLAGS="-sysroot"
+
+PKG_MESON_OPTS_TARGET="-Dauthfw=shadow \
+                       -Dlibs-only=true \
+                       -Dintrospection=false"

packages/addons/service/oscam/package.mk

@@ -5,7 +5,7 @@ PKG_NAME="oscam"
 PKG_VERSION="db7c4cbdbd34a9b0464070b1a46e146e6029a2cb" # 2022-10-22
 PKG_SHA256="b5dd1d0dc71553c8504d6982b6bae437d6bef17c6cd8a38ac4710a38300018cf"
 PKG_VERSION_NUMBER="11715"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://www.streamboard.tv/oscam/wiki"

packages/addons/service/pcscd/package.mk

@@ -5,7 +5,7 @@
 
 PKG_NAME="pcscd"
 PKG_VERSION="1.0"
-PKG_REV="1"
+PKG_REV="2"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
@@ -21,8 +21,10 @@ PKG_ADDON_NAME="PC/SC Smart Card Daemon"
 PKG_ADDON_TYPE="xbmc.service"
 
 addon() {
-  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/
+  mkdir -p ${ADDON_BUILD}/${PKG_ADDON_ID}/{bin,lib.private}
     cp -Pa $(get_install_dir pcsc-lite)/usr/sbin/pcscd ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/pcscd.bin
+    patchelf --add-rpath '$ORIGIN/../lib.private' ${ADDON_BUILD}/${PKG_ADDON_ID}/bin/pcscd.bin
+    cp -L $(get_install_dir polkit)/usr/lib/libpolkit-gobject-1.so.0 ${ADDON_BUILD}/${PKG_ADDON_ID}/lib.private
 
   cp -a $(get_install_dir ccid)/storage/.kodi/addons/${PKG_ADDON_ID}/drivers ${ADDON_BUILD}/${PKG_ADDON_ID}
 

packages/addons/tools/rpi-tools/package.mk

@@ -8,7 +8,7 @@ PKG_ARCH="arm aarch64"
 PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain lg-gpio gpiozero colorzero lan951x-led-ctl patchelf:host"
+PKG_DEPENDS_TARGET="toolchain lg-gpio gpiozero colorzero lan951x-led-ctl"
 PKG_SECTION="virtual"
 PKG_SHORTDESC="A bundle of tools and programs for use on the Raspberry Pi"
 PKG_LONGDESC="This bundle currently includes lg-gpio, gpiozero and lan951x-led-ctl"

packages/devel/pax-utils/package.mk

@@ -0,0 +1,11 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv)
+
+PKG_NAME="pax-utils"
+PKG_VERSION="1.3.7"
+PKG_SHA256="907fdcfc6c6c2913a8e42847f8096027b0a953b9344208d14daf2324fd711638"
+PKG_LICENSE="GPL-2.0"
+PKG_SITE="https://wiki.gentoo.org/wiki/Hardened/PaX_Utilities"
+PKG_URL="https://gitweb.gentoo.org/proj/pax-utils.git/snapshot/pax-utils-${PKG_VERSION}.tar.bz2"
+PKG_DEPENDS_HOST="toolchain:host"
+PKG_LONGDESC="ELF utils that can check files for security relevant properties"

packages/virtual/toolchain/package.mk

@@ -8,6 +8,6 @@ PKG_LICENSE="GPL"
 PKG_SITE="https://libreelec.tv"
 PKG_URL=""
 PKG_DEPENDS_HOST="7-zip:host autoconf:host autoconf-archive:host automake:host bison:host configtools:host cmake:host flex:host intltool:host libtool:host ninja:host make:host meson:host openssl:host pigz:host sed:host xmlstarlet:host xz:host"
-PKG_DEPENDS_TARGET="toolchain:host gcc:host"
+PKG_DEPENDS_TARGET="toolchain:host gcc:host patchelf:host pax-utils:host"
 PKG_SECTION="virtual"
 PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages"