diff --git a/packages/addons/addon-depends/docker/containerd/package.mk b/packages/addons/addon-depends/docker/containerd/package.mk index 2221ab1307..977aa49714 100644 --- a/packages/addons/addon-depends/docker/containerd/package.mk +++ b/packages/addons/addon-depends/docker/containerd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="containerd" -PKG_VERSION="1.6.16" -PKG_SHA256="e0a893cf67df9dfaecbcde2ba4e896efb3a86ffe48dcfe0d2b26f7cf19b5af3a" +PKG_VERSION="1.7.0" +PKG_SHA256="c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552" PKG_LICENSE="APL" PKG_SITE="https://containerd.io" PKG_URL="https://github.com/containerd/containerd/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/go/package.mk b/packages/addons/addon-depends/go/package.mk index 8dee2dfb99..bc5caa615c 100644 --- a/packages/addons/addon-depends/go/package.mk +++ b/packages/addons/addon-depends/go/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="go" -PKG_VERSION="1.19.7" -PKG_SHA256="1fe106fce9342c2a7ceeb04477341457cc9f0a3c07b9f2a993af09d654307f56" +PKG_VERSION="1.20.2" +PKG_SHA256="176969bb14216dd45121e46d5d0f63d339edb9042d1389d485fb6b21ee172388" PKG_LICENSE="BSD" PKG_SITE="https://golang.org" PKG_URL="https://github.com/golang/go/archive/${PKG_NAME}${PKG_VERSION}.tar.gz" diff --git a/packages/addons/addon-depends/libseccomp/package.mk b/packages/addons/addon-depends/libseccomp/package.mk new file mode 100644 index 0000000000..e2350aedb2 --- /dev/null +++ b/packages/addons/addon-depends/libseccomp/package.mk @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2023-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="libseccomp" +PKG_VERSION="2.5.4" +PKG_SHA256="d82902400405cf0068574ef3dc1fe5f5926207543ba1ae6f8e7a1576351dcbdb" +PKG_LICENSE="LGPLv2.1" +PKG_SITE="https://github.com/seccomp/libseccomp" +PKG_URL="https://github.com/seccomp/libseccomp/releases/download/v${PKG_VERSION}/libseccomp-${PKG_VERSION}.tar.gz" +PKG_DEPENDS_TARGET="toolchain" +PKG_LONGDESC="An easy to use, platform independent, interface to the Linux Kernel syscall filtering mechanism" +PKG_BUILD_FLAGS="-sysroot" + +PKG_CONFIGURE_OPTS_TARGET+=" --enable-static --enable-shared" diff --git a/packages/addons/addon-depends/docker/runc/package.mk b/packages/addons/addon-depends/runc/package.mk similarity index 81% rename from packages/addons/addon-depends/docker/runc/package.mk rename to packages/addons/addon-depends/runc/package.mk index 56e75e505f..47e8633976 100644 --- a/packages/addons/addon-depends/docker/runc/package.mk +++ b/packages/addons/addon-depends/runc/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="4f02077432642eebd768fc857318ae7929290b3a3511eb1be338005e360cfa34" PKG_LICENSE="APL" PKG_SITE="https://github.com/opencontainers/runc" PKG_URL="https://github.com/opencontainers/runc/archive/v${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain go:host" +PKG_DEPENDS_TARGET="toolchain go:host libseccomp" PKG_LONGDESC="A CLI tool for spawning and running containers according to the OCI specification." PKG_TOOLCHAIN="manual" @@ -19,6 +19,7 @@ pre_make_target() { go_configure export LDFLAGS="-w -extldflags -static -X main.gitCommit=${PKG_GIT_COMMIT} -X main.version=$(cat ./VERSION) -extld ${CC}" + export PKG_CONFIG_PATH="$(get_install_dir libseccomp)/usr/lib/pkgconfig:${PKG_CONFIG_PATH}" mkdir -p ${GOPATH} if [ -d ${PKG_BUILD}/vendor ]; then @@ -30,5 +31,5 @@ pre_make_target() { make_target() { mkdir -p bin - ${GOLANG} build -v -o bin/runc -a -tags "cgo static_build" -ldflags "${LDFLAGS}" ./ + ${GOLANG} build -v -o bin/runc -a -tags "cgo seccomp static_build" -ldflags "${LDFLAGS}" ./ } diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index dbbeb1e8c6..ecb0a0dea2 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -3,7 +3,7 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="docker" -PKG_REV="0" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk index b87c5de0e2..4ee8bd328e 100644 --- a/packages/addons/service/syncthing/package.mk +++ b/packages/addons/service/syncthing/package.mk @@ -2,9 +2,9 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="syncthing" -PKG_VERSION="1.22.2" -PKG_SHA256="211704904788808ef2818994fb36e33c3e33ed1b52267f7adbf1411fa5ee2d2f" -PKG_REV="0" +PKG_VERSION="1.23.2" +PKG_SHA256="3d0eca0e6f4eaaeba4879918b3f54f47d59fb5f4288a83af821d509271ada189" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="MPLv2" PKG_SITE="https://syncthing.net/"