From 284432cf4f1f2a2d7da82f5199936f478ccc34c9 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 2 May 2019 00:28:24 +0100 Subject: [PATCH 01/68] samba: update to samba-4.9.7 --- packages/network/samba/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 6460c86da7..48feee04c6 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="samba" -PKG_VERSION="4.9.6" -PKG_SHA256="c9205a651a83d69e200fec9dd65e9fa360f0c75ab3275b3dcb74e5cbaec60807" +PKG_VERSION="4.9.7" +PKG_SHA256="44e5bc58dcae6d86ca8d5f269fa927f20ff91bce97cde86fe4e83addcb89c001" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" PKG_URL="https://download.samba.org/pub/samba/stable/$PKG_NAME-$PKG_VERSION.tar.gz" From 08c06b05cfe82f1fb69d4495babcca279bc8ceba Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 30 Apr 2019 17:39:25 +0100 Subject: [PATCH 02/68] tools/pkginfo: simple tool to dump a package.mk --- tools/pkginfo | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100755 tools/pkginfo diff --git a/tools/pkginfo b/tools/pkginfo new file mode 100755 index 0000000000..bcdd664846 --- /dev/null +++ b/tools/pkginfo @@ -0,0 +1,27 @@ +#!/bin/bash + +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) + +STRIP=no +if [ "$1" = "--strip" -o "$1" = "-s" ]; then + shift + STRIP=yes +fi + +. config/options "$1" + +shift + +echo "PROJECT=${PROJECT}, DEVICE=${DEVICE}, ARCH=${ARCH}" + +for v in PKG_NAME PKG_VERSION PKG_SITE PKG_URL PKG_DIR \ + PKG_NEED_UNPACK PKG_DEPENDS_UNPACK \ + PKG_DEPENDS_BOOTSTRAP PKG_DEPENDS_INIT PKG_DEPENDS_HOST PKG_DEPENDS_TARGET \ + PKG_IS_ADDON PKG_IS_KERNEL_PKG $@; do + if [ "${STRIP}" = "yes" ]; then + echo "${v}=\"${!v}\"" | sed "s#${ROOT}/##g" + else + echo "${v}=\"${!v}\"" + fi +done From ca952e8937b980f3c5ee89433acf4f6e38b71a5d Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 29 Apr 2019 11:50:10 +0200 Subject: [PATCH 03/68] config/functions: add C++ compiler and linker flags to meson.conf Due to missing cpp_args and cpp_link_args in meson.conf ninja builds of projects with C++ code were performed without CPU optimization flags (-march, -mcpu, -mtune etc). Add these args so C++ code is built with proper flags. Signed-off-by: Matthias Reichl --- config/functions | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/functions b/config/functions index 44e8e85294..405f52303c 100644 --- a/config/functions +++ b/config/functions @@ -386,6 +386,8 @@ endian = '$endian' root = '$root' $(python -c "import os; print('c_args = {}'.format([x for x in os.getenv('CFLAGS').split()]))") $(python -c "import os; print('c_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))") +$(python -c "import os; print('cpp_args = {}'.format([x for x in os.getenv('CXXFLAGS').split()]))") +$(python -c "import os; print('cpp_link_args = {}'.format([x for x in os.getenv('LDFLAGS').split()]))") ${!properties} EOF } From c0ed05c6f6f2878c3da03c47cfbb3c01ac6e4843 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 19:43:08 +0000 Subject: [PATCH 04/68] libc: add libidn2 as target depend Signed-off-by: Ian Leonard --- packages/virtual/libc/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/virtual/libc/package.mk b/packages/virtual/libc/package.mk index 1f92ddaed2..01f646d185 100644 --- a/packages/virtual/libc/package.mk +++ b/packages/virtual/libc/package.mk @@ -7,7 +7,7 @@ PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="toolchain glibc tz" +PKG_DEPENDS_TARGET="toolchain glibc tz libidn2" PKG_DEPENDS_INIT="toolchain glibc:init" PKG_SECTION="virtual" PKG_LONGDESC="Meta package for installing various tools and libs needed for libc" From 58fc3e7ea9923c323ed112b020dc03835ec99850 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 20:10:44 +0000 Subject: [PATCH 05/68] libidn2: update to 2.1.1a, disable doc, static libs and idn2 binary Signed-off-by: Ian Leonard --- packages/textproc/libidn2/package.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/textproc/libidn2/package.mk b/packages/textproc/libidn2/package.mk index 2bd18e54fc..1be8dd5728 100644 --- a/packages/textproc/libidn2/package.mk +++ b/packages/textproc/libidn2/package.mk @@ -2,10 +2,18 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libidn2" -PKG_VERSION="2.1.0" -PKG_SHA256="032398dbaa9537af43f51a8d94e967e3718848547b1b2a4eb3138b20cad11d32" +PKG_VERSION="2.1.1a" +PKG_SHA256="57666bcf6ecf54230d7bac95c392379561954b57a673903aed4d3336b3048b72" PKG_LICENSE="LGPL3" PKG_SITE="https://www.gnu.org/software/libidn/" PKG_URL="http://ftpmirror.gnu.org/gnu/libidn/libidn2-$PKG_VERSION.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Free software implementation of IDNA2008, Punycode and TR46." + +PKG_CONFIGURE_OPTS_TARGET="--disable-doc \ + --enable-shared \ + --disable-static" + +post_makeinstall_target() { + safe_remove ${INSTALL}/usr/bin +} From 1fd115b699457f3da65b579fcb8a01bc488f110f Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 23:04:24 +0000 Subject: [PATCH 06/68] lftp: add libidn2 as depend Signed-off-by: Ian Leonard --- .../addons/addon-depends/network-tools-depends/lftp/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk index 6fe7095556..0b1d5c90c9 100644 --- a/packages/addons/addon-depends/network-tools-depends/lftp/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/lftp/package.mk @@ -7,7 +7,7 @@ PKG_SHA256="4ebc271e9e5cea84a683375a0f7e91086e5dac90c5d51bb3f169f75386107a62" PKG_LICENSE="GPLv3" PKG_SITE="http://lftp.yar.ru/" PKG_URL="http://lftp.yar.ru/ftp/${PKG_NAME}-${PKG_VERSION}.tar.xz" -PKG_DEPENDS_TARGET="toolchain readline openssl zlib" +PKG_DEPENDS_TARGET="toolchain readline openssl zlib libidn2" PKG_LONGDESC="A sophisticated ftp/http client, and a file transfer program supporting a number of network protocols." PKG_CONFIGURE_OPTS_TARGET="--disable-nls \ From 0f73329ce00d16c9b55037838a270cd10215f26b Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 23:04:55 +0000 Subject: [PATCH 07/68] ffmpeg-tools: use system libidn2 Signed-off-by: Ian Leonard --- packages/addons/tools/ffmpeg-tools/changelog.txt | 3 +++ packages/addons/tools/ffmpeg-tools/package.mk | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addons/tools/ffmpeg-tools/changelog.txt b/packages/addons/tools/ffmpeg-tools/changelog.txt index 349ed13ce1..a54f371b96 100644 --- a/packages/addons/tools/ffmpeg-tools/changelog.txt +++ b/packages/addons/tools/ffmpeg-tools/changelog.txt @@ -1,3 +1,6 @@ +106 +- Use system libidn2 + 105 - Removed FDK-AAC - Build with GNUTLS diff --git a/packages/addons/tools/ffmpeg-tools/package.mk b/packages/addons/tools/ffmpeg-tools/package.mk index bb28817857..9a08a1c203 100644 --- a/packages/addons/tools/ffmpeg-tools/package.mk +++ b/packages/addons/tools/ffmpeg-tools/package.mk @@ -3,7 +3,7 @@ PKG_NAME="ffmpeg-tools" PKG_VERSION="1.0" -PKG_REV="105" +PKG_REV="106" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" @@ -25,7 +25,6 @@ addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir gmp)/.install_pkg/usr/lib/libgmp.so.10 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/libgnutls.so.30 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -PL $(get_build_dir libidn2)/.install_pkg/usr/lib/libidn2.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libhogweed.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libnettle.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib } From 3d10ea2d16e5fd84b4fab285b9b916d7f195e727 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sat, 16 Mar 2019 23:05:30 +0000 Subject: [PATCH 08/68] tvheadend42: use system libidn2 Signed-off-by: Ian Leonard --- packages/addons/service/tvheadend42/changelog.txt | 3 +++ packages/addons/service/tvheadend42/package.mk | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addons/service/tvheadend42/changelog.txt b/packages/addons/service/tvheadend42/changelog.txt index ceffabb08c..907458ec73 100644 --- a/packages/addons/service/tvheadend42/changelog.txt +++ b/packages/addons/service/tvheadend42/changelog.txt @@ -1,3 +1,6 @@ +119 +- Use system libidn2 + 118 - update to 4.2.7-44 - fix tv_grab_file usage of & in urls diff --git a/packages/addons/service/tvheadend42/package.mk b/packages/addons/service/tvheadend42/package.mk index 16cb0f731f..6b9524798d 100644 --- a/packages/addons/service/tvheadend42/package.mk +++ b/packages/addons/service/tvheadend42/package.mk @@ -5,7 +5,7 @@ PKG_NAME="tvheadend42" PKG_VERSION="5c218500579d5bd1c1f7e7a4b5f7f0fb35baa626" PKG_SHA256="a9fe5a4c36aa185e3f0a73a709f0dc05794ae9c12f5d888985b559ff68a2508d" PKG_VERSION_NUMBER="4.2.7-44" -PKG_REV="118" +PKG_REV="119" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.tvheadend.org" @@ -114,7 +114,6 @@ addon() { cp -PL $(get_build_dir gnutls)/.INSTALL_PKG/usr/lib/libgnutls.so.30 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libnettle.so.6 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir nettle)/.install_pkg/usr/lib/libhogweed.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib - cp -PL $(get_build_dir libidn2)/.install_pkg/usr/lib/libidn2.so.4 $ADDON_BUILD/$PKG_ADDON_ID/lib cp -PL $(get_build_dir gmp)/.install_pkg/usr/lib/libgmp.so.10 $ADDON_BUILD/$PKG_ADDON_ID/lib # set only version (revision will be added by buildsystem) From 902f198d46164d057fcfe3c92ac53bc7942ff5fc Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Sun, 14 Apr 2019 21:17:10 +0000 Subject: [PATCH 09/68] systemd: add depend on libidn2 Signed-off-by: Ian Leonard --- packages/sysutils/systemd/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/systemd/package.mk b/packages/sysutils/systemd/package.mk index 13618cd697..d545fe27ba 100644 --- a/packages/sysutils/systemd/package.mk +++ b/packages/sysutils/systemd/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="8a11b1b07d620f4c06a16e95bba4dd2a97e90efdf2a5ba47ed0a935085787a14" PKG_LICENSE="LGPL2.1+" PKG_SITE="http://www.freedesktop.org/wiki/Software/systemd" PKG_URL="https://github.com/systemd/systemd/archive/v$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux entropy" +PKG_DEPENDS_TARGET="toolchain libcap kmod util-linux entropy libidn2" PKG_LONGDESC="A system and session manager for Linux, compatible with SysV and LSB init scripts." PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ @@ -31,7 +31,7 @@ PKG_MESON_OPTS_TARGET="--libdir=/usr/lib \ -Dlibcryptsetup=false \ -Dlibcurl=false \ -Dlibidn=false \ - -Dlibidn2=false \ + -Dlibidn2=true \ -Dlibiptc=false \ -Dqrencode=false \ -Dgcrypt=false \ From 8f4bdc77ccaa988833e8cc96e9ab0a2f3f5628d2 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 14 May 2019 23:51:38 +0100 Subject: [PATCH 10/68] samba: update to samba-4.9.8 --- packages/network/samba/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 48feee04c6..900e242f98 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="samba" -PKG_VERSION="4.9.7" -PKG_SHA256="44e5bc58dcae6d86ca8d5f269fa927f20ff91bce97cde86fe4e83addcb89c001" +PKG_VERSION="4.9.8" +PKG_SHA256="82ebb7c3f1847c39341dd97ff8b73f40fa83f5f794daeceb80f3c349ace3cf56" PKG_LICENSE="GPLv3+" PKG_SITE="https://www.samba.org" PKG_URL="https://download.samba.org/pub/samba/stable/$PKG_NAME-$PKG_VERSION.tar.gz" From 50fc3b55693c248aaa2bf24949a6d913193b8852 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 15 May 2019 02:08:33 +0100 Subject: [PATCH 11/68] heimdal: update to heimdal-7.6.0 --- packages/devel/heimdal/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk index f7ce5e4cf2..f7f95b7d55 100644 --- a/packages/devel/heimdal/package.mk +++ b/packages/devel/heimdal/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="heimdal" -PKG_VERSION="7.5.0" -PKG_SHA256="ad67fef994dc2268fb0b1a8164b39330d184f425057867485a178e9785a7f35a" +PKG_VERSION="7.6.0" +PKG_SHA256="25f7df36cf1305d64052e51b31a5ac57ba4fc51e3d99dcdca46ff63aea71ce98" PKG_LICENSE="BSD-3c" PKG_SITE="http://www.h5l.org/" PKG_URL="https://github.com/heimdal/heimdal/archive/$PKG_NAME-$PKG_VERSION.tar.gz" From 505ccecbc82ab55fd901ddfe2235d7f6a72a56e7 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 9 May 2019 22:02:54 +0100 Subject: [PATCH 12/68] mesa: update to mesa-19.0.4 --- packages/graphics/mesa/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 42e8e4fc80..251c8de276 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mesa" -PKG_VERSION="19.0.3" -PKG_SHA256="46a8b46bfbd3f8a3eccf3edcfa94e68f13bd6429b71ed8b57a24c6a0543c824e" +PKG_VERSION="19.0.4" +PKG_SHA256="a0154c436e3e040b3a2c528554cd52b6ef724fea1906c0a862401c4fc641147d" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" PKG_URL="https://github.com/mesa3d/mesa/archive/mesa-$PKG_VERSION.tar.gz" From 18d984782995e3414aa810516ff262e9de7d6c31 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 9 May 2019 12:31:50 +0100 Subject: [PATCH 13/68] config/functions: endianness in meson cross is always little --- config/functions | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/config/functions b/config/functions index 405f52303c..793ba089ca 100644 --- a/config/functions +++ b/config/functions @@ -357,11 +357,9 @@ setup_toolchain() { create_meson_conf() { local endian root properties case "$1" in - target|init) endian="little" - root="$SYSROOT_PREFIX/usr" + target|init) root="$SYSROOT_PREFIX/usr" ;; - host|bootstrap) endian="big" - root="$TOOLCHAIN" + host|bootstrap) root="$TOOLCHAIN" ;; esac @@ -380,7 +378,7 @@ llvm-config = '$SYSROOT_PREFIX/usr/bin/llvm-config-host' system = 'linux' cpu_family = '$TARGET_ARCH' cpu = '$TARGET_SUBARCH' -endian = '$endian' +endian = 'little' [properties] root = '$root' From caaf06761518ae9c3f49db443edc0c373fa72ae6 Mon Sep 17 00:00:00 2001 From: CvH <1355173+CvH@users.noreply.github.com> Date: Mon, 6 May 2019 20:06:48 +0200 Subject: [PATCH 14/68] tvmosaic: fix PKG_ARCH --- packages/addons/service/tvmosaic/package.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/addons/service/tvmosaic/package.mk b/packages/addons/service/tvmosaic/package.mk index 923ed57bf8..f220d98d4d 100644 --- a/packages/addons/service/tvmosaic/package.mk +++ b/packages/addons/service/tvmosaic/package.mk @@ -5,7 +5,6 @@ PKG_NAME="tvmosaic" PKG_VERSION="1.0.0-16296" PKG_SHA256="63d48e7b0912f2efb6e894252a13d8312679cdcb155ebe3fa758dc88b4f91816" PKG_REV="100" -PKG_ARCH="any" PKG_ARCH="arm" PKG_LICENSE="Prop." PKG_SITE="https://tv-mosaic.com" From 6202251a6c7055a3f3b593c039573bdaca82a853 Mon Sep 17 00:00:00 2001 From: CvH Date: Sun, 5 May 2019 20:42:07 +0200 Subject: [PATCH 15/68] oscam: update to 11518 --- packages/addons/service/oscam/changelog.txt | 4 ++ packages/addons/service/oscam/package.mk | 66 ++++++++++++++++----- 2 files changed, 55 insertions(+), 15 deletions(-) diff --git a/packages/addons/service/oscam/changelog.txt b/packages/addons/service/oscam/changelog.txt index 61670e36fc..f1d9c1f84b 100644 --- a/packages/addons/service/oscam/changelog.txt +++ b/packages/addons/service/oscam/changelog.txt @@ -1,3 +1,7 @@ +109 +- Update to version 11518 +- fixed missing Modules + 108 - Update to version 11517 diff --git a/packages/addons/service/oscam/package.mk b/packages/addons/service/oscam/package.mk index c7aabd710f..681029ab73 100644 --- a/packages/addons/service/oscam/package.mk +++ b/packages/addons/service/oscam/package.mk @@ -2,10 +2,10 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="oscam" -PKG_VERSION="a2ee0528f1de527748aaf7a79982ed112ffa3183" -PKG_SHA256="24315471faea612a25b39fc14050f4fad4365715fde48dcb0032ebdce770282d" -PKG_VERSION_NUMBER="11517" -PKG_REV="108" +PKG_VERSION="e8ce7359fa920ca8d63aca9dde4f0eeb1f1f72f1" +PKG_SHA256="93610d3d61479cae87340a0a3d7dc8c04b326b662f58f4181ac08c87897bd80b" +PKG_VERSION_NUMBER="11518" +PKG_REV="109" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.streamboard.tv/oscam/wiki" @@ -19,17 +19,53 @@ PKG_IS_ADDON="yes" PKG_ADDON_NAME="OSCam" PKG_ADDON_TYPE="xbmc.service" -PKG_CMAKE_OPTS_TARGET="-DLIBUSBDIR=$SYSROOT_PREFIX/usr \ - -DWITH_SSL=1 \ - -DHAVE_LIBCRYPTO=1 \ - -DHAVE_DVBAPI=1 \ - -DWITH_STAPI=0 \ - -DWEBIF=1 \ - -DWITH_DEBUG=0 \ - -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \ - -DSTATIC_LIBUSB=1 \ - -DCLOCKFIX=0 \ - -DCARDREADER_DB2COM=OFF" +PKG_CMAKE_OPTS_TARGET="\ + `#Building` \ + -DLIBUSBDIR=$SYSROOT_PREFIX/usr \ + -DOPTIONAL_INCLUDE_DIR=$SYSROOT_PREFIX/usr/include \ + \ + `#Readers` \ + -DCARDREADER_DB2COM=OFF \ + -DCARDREADER_DRECAS=ON \ + -DCARDREADER_INTERNAL=OFF \ + -DCARDREADER_MP35=ON \ + -DCARDREADER_PHOENIX=ON \ + -DCARDREADER_SC8IN1=ON \ + -DCARDREADER_SMARGO=ON \ + -DCARDREADER_STAPI5=OFF \ + -DCARDREADER_STAPI=OFF \ + -DCARDREADER_STINGER=ON \ + \ + `#Protocol` \ + -DMODULE_CAMD33=OFF \ + -DMODULE_CAMD35=ON \ + -DMODULE_CAMD35_TCP=ON \ + -DMODULE_CCCAM=ON \ + -DMODULE_CCCSHARE=ON \ + -DMODULE_CONSTCW=ON \ + -DMODULE_GBOX=ON \ + -DMODULE_GHTTP=ON \ + -DMODULE_NEWCAMD=ON \ + -DMODULE_PANDORA=ON \ + -DMODULE_RADEGAST=ON \ + -DMODULE_SCAM=ON \ + -DMODULE_SERIAL=ON \ + \ + `#Features` \ + -DCLOCKFIX=0 \ + -DCS_ANTICASC=ON \ + -DCS_CACHEEX=ON \ + -DCW_CYCLE_CHECK=ON \ + -DHAVE_DVBAPI=1 \ + -DHAVE_LIBCRYPTO=1 \ + -DSTATIC_LIBUSB=1 \ + -DTOUCH=ON \ + -DWEBIF=1 \ + -DWEBIF_LIVELOG=1 \ + -DWEBIF_JQUERY=1 \ + -DWITH_DEBUG=0 \ + -DWITH_SSL=1 \ + -DWITH_STAPI=0" pre_configure_target() { export OSCAM_ADDON_VERSION="$PKG_VERSION_NUMBER" From 2fb1df6623a5539dd979c8168b30e56b57c369bb Mon Sep 17 00:00:00 2001 From: kszaq Date: Sun, 28 Apr 2019 00:05:34 +0200 Subject: [PATCH 16/68] ethmactool: new package for getting HW MAC address or generating from CPU SN Ethernet MAC address should be passed by u-boot in device tree. In many cases this address is not correct: ethmactool package allows userspace to take care of it. Currently these are possible sources of "real" MAC: - Amlogic: cmdline, eFuse, CPU SN - Rockchip: CPU SN --- packages/sysutils/ethmactool/package.mk | 17 +++++ .../ethmactool/scripts/ethmactool-config | 73 +++++++++++++++++++ .../system.d/ethmactool-config.service | 13 ++++ 3 files changed, 103 insertions(+) create mode 100644 packages/sysutils/ethmactool/package.mk create mode 100755 packages/sysutils/ethmactool/scripts/ethmactool-config create mode 100644 packages/sysutils/ethmactool/system.d/ethmactool-config.service diff --git a/packages/sysutils/ethmactool/package.mk b/packages/sysutils/ethmactool/package.mk new file mode 100644 index 0000000000..9edc7d01b7 --- /dev/null +++ b/packages/sysutils/ethmactool/package.mk @@ -0,0 +1,17 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="ethmactool" +PKG_VERSION="1.0" +PKG_LICENSE="GPLv2" +PKG_LONGDESC="ethmactool: udev rule for obtaining real MAC address or creating a persistent MAC from the CPU serial" +PKG_TOOLCHAIN="manual" + +makeinstall_target() { + mkdir -p $INSTALL/usr/bin + cp $PKG_DIR/scripts/ethmactool-config $INSTALL/usr/bin +} + +post_install() { + enable_service ethmactool-config.service +} diff --git a/packages/sysutils/ethmactool/scripts/ethmactool-config b/packages/sysutils/ethmactool/scripts/ethmactool-config new file mode 100755 index 0000000000..e704f32620 --- /dev/null +++ b/packages/sysutils/ethmactool/scripts/ethmactool-config @@ -0,0 +1,73 @@ +#!/bin/sh + +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) + +COMPATIBLE=$(/usr/bin/dtsoc) +MAC_STEP="" + +validate_mac() { + [ ${#MAC} -eq 12 -a "${MAC}" != "000000000000" ] +} + +fixup_self_mac() { + # clear multicast bit and set local assignment bit (IEEE802) + MAC=$(printf '%012X' "$(( (0x$MAC & 0xFEFFFFFFFFFF) | 0x020000000000 ))") +} + +from_cmdline() { + for arg in $(cat /proc/cmdline | tr -d ':'); do + case ${arg} in + mac=*) + MAC=${arg#*=} + ;; + esac + done +} + +aml_from_efuse_gxbb() { + if [ -e /sys/devices/platform/efuse/efuse0/nvmem ] ; then + MAC=$(od -x -A n -j 0x34 -N 6 /sys/bus/nvmem/devices/efuse0/nvmem | tr -d ' ') + MAC=${MAC:2:2}${MAC:0:2}${MAC:6:2}${MAC:4:2}${MAC:10:2}${MAC:8:2} + fi +} + +aml_from_efuse_gxl() { + if [ -e /sys/devices/platform/efuse/efuse0/nvmem ] ; then + MAC=$(cat /sys/devices/platform/efuse/efuse0/nvmem) + fi +} + +aml_from_cpu_sn() { + if [ -e /sys/bus/platform/devices/firmware\:secure-monitor/serial ] ; then + MAC=$(cat /sys/bus/platform/devices/firmware\:secure-monitor/serial 2>/dev/null | cut -b-12) + fixup_self_mac + fi +} + +from_cpu_sn() { + MAC=$(cat /proc/cpuinfo 2>/dev/null | awk '/Serial/ {print substr($3,1,12)}') + fixup_self_mac +} + +case $COMPATIBLE in + amlogic*) + MAC_STEPS="from_cmdline aml_from_efuse_gxbb aml_from_efuse_gxl aml_from_cpu_sn" + ;; + *) + MAC_STEPS="from_cpu_sn" + ;; +esac + +for MAC_STEP in $MAC_STEPS ; do + $MAC_STEP + validate_mac && break +done + +if validate_mac ; then + MAC=$(echo "$MAC" | sed 's/\(..\)/\1:/g' | cut -b-17) + echo "MAC=${MAC}" > /run/libreelec/ethmactool-$1 + /usr/sbin/ip link set dev $1 down + /usr/sbin/ip link set dev $1 address $MAC + /usr/sbin/ip link set dev $1 up +fi diff --git a/packages/sysutils/ethmactool/system.d/ethmactool-config.service b/packages/sysutils/ethmactool/system.d/ethmactool-config.service new file mode 100644 index 0000000000..e11180b467 --- /dev/null +++ b/packages/sysutils/ethmactool/system.d/ethmactool-config.service @@ -0,0 +1,13 @@ +[Unit] +Description=Configure eth0 MAC address +BindsTo=sys-subsystem-net-devices-eth0.device +After=sys-subsystem-net-devices-eth0.device +Before=connman.service + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/usr/bin/ethmactool-config eth0 + +[Install] +WantedBy=multi-user.target From 69f3db483e80169f038704f5bf1ff7b0d622747d Mon Sep 17 00:00:00 2001 From: kszaq Date: Thu, 2 May 2019 10:44:57 +0200 Subject: [PATCH 17/68] linux: amend uimage load address for proper decompression When kernel image is compressed, it is first loaded to RAM at load address specified in command line, then unpacks to loadaddr provided by uImage. For decompressed image not to overwrite compressed data, uncompressed image load address needs to be shifted by compressed image size + 1 MiB alignment. --- packages/linux/package.mk | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 9d225b78c4..18db63534e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -243,8 +243,19 @@ make_target() { fi if [ -n "$KERNEL_UIMAGE_TARGET" ] ; then + # determine compression used for kernel image KERNEL_UIMAGE_COMP=${KERNEL_UIMAGE_TARGET:7} KERNEL_UIMAGE_COMP=${KERNEL_UIMAGE_COMP:-none} + + # calculate new load address to make kernel Image unpack to memory area after compressed image + if [ "$KERNEL_UIMAGE_COMP" != "none" ] ; then + COMPRESSED_SIZE=$(stat -t "arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET" | awk '{print $2}') + # align to 1 MiB + COMPRESSED_SIZE=$(( (($COMPRESSED_SIZE - 1 >> 20) + 1) << 20 )) + KERNEL_UIMAGE_LOADADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_LOADADDR + $COMPRESSED_SIZE ))") + KERNEL_UIMAGE_ENTRYADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_ENTRYADDR + $COMPRESSED_SIZE ))") + fi + mkimage -A $TARGET_KERNEL_ARCH \ -O linux \ -T kernel \ From 4ef5e73ae603818bcf283ff552a78d7a0841f1e6 Mon Sep 17 00:00:00 2001 From: kszaq Date: Fri, 3 May 2019 20:54:28 +0200 Subject: [PATCH 18/68] linux: abort building arm64 uImage if KERNEL_UIMAGE_LOADADDR or KERNEL_UIMAGE_ENTRYADDR is not set If either of these values is not set, resulting uImage will not load properly. Abort if these are not set. --- packages/linux/package.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 18db63534e..0ac70ded6b 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -212,6 +212,9 @@ make_target() { # arm64 target does not support creating uImage. # Build Image first, then wrap it using u-boot's mkimage. if [[ "$TARGET_KERNEL_ARCH" == "arm64" && "$KERNEL_TARGET" == uImage* ]]; then + if [ -z "$KERNEL_UIMAGE_LOADADDR" -o -z "$KERNEL_UIMAGE_ENTRYADDR" ]; then + die "ERROR: KERNEL_UIMAGE_LOADADDR and KERNEL_UIMAGE_ENTRYADDR have to be set to build uImage - aborting" + fi KERNEL_UIMAGE_TARGET="$KERNEL_TARGET" KERNEL_TARGET="${KERNEL_TARGET/uImage/Image}" fi From ffdd6878a38057b2bcf1f29e93b37f4d3ef83fc3 Mon Sep 17 00:00:00 2001 From: kszaq Date: Fri, 3 May 2019 23:51:27 +0200 Subject: [PATCH 19/68] linux: use PKG_UIMAGE_*ADDR for the used address If a package is sources multiple times, the destination address may be recalculated and overwritten a few times. Prevent this by using PKG-prefixed variables for results. Thanks to MilhouseVH for suggesting this. --- packages/linux/package.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 0ac70ded6b..f04b74518e 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -255,16 +255,19 @@ make_target() { COMPRESSED_SIZE=$(stat -t "arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET" | awk '{print $2}') # align to 1 MiB COMPRESSED_SIZE=$(( (($COMPRESSED_SIZE - 1 >> 20) + 1) << 20 )) - KERNEL_UIMAGE_LOADADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_LOADADDR + $COMPRESSED_SIZE ))") - KERNEL_UIMAGE_ENTRYADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_ENTRYADDR + $COMPRESSED_SIZE ))") + PKG_KERNEL_UIMAGE_LOADADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_LOADADDR + $COMPRESSED_SIZE ))") + PKG_KERNEL_UIMAGE_ENTRYADDR=$(printf '%X' "$(( $KERNEL_UIMAGE_ENTRYADDR + $COMPRESSED_SIZE ))") + else + PKG_KERNEL_UIMAGE_LOADADDR=${KERNEL_UIMAGE_LOADADDR} + PKG_KERNEL_UIMAGE_ENTRYADDR=${KERNEL_UIMAGE_ENTRYADDR} fi mkimage -A $TARGET_KERNEL_ARCH \ -O linux \ -T kernel \ -C $KERNEL_UIMAGE_COMP \ - -a $KERNEL_UIMAGE_LOADADDR \ - -e $KERNEL_UIMAGE_ENTRYADDR \ + -a $PKG_KERNEL_UIMAGE_LOADADDR \ + -e $PKG_KERNEL_UIMAGE_ENTRYADDR \ -d arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET \ arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_UIMAGE_TARGET fi From 1122893a50f07489c8ade5599af2c557120bc79e Mon Sep 17 00:00:00 2001 From: kszaq Date: Sat, 4 May 2019 01:45:52 +0200 Subject: [PATCH 20/68] linux: restore original KERNEL_TARGET after creating uImage --- packages/linux/package.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index f04b74518e..3485f7c081 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -270,6 +270,8 @@ make_target() { -e $PKG_KERNEL_UIMAGE_ENTRYADDR \ -d arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_TARGET \ arch/$TARGET_KERNEL_ARCH/boot/$KERNEL_UIMAGE_TARGET + + KERNEL_TARGET="${KERNEL_UIMAGE_TARGET}" fi } From 9e39ce6f1cf60e851a7029850cdace4b4e59eb17 Mon Sep 17 00:00:00 2001 From: kszaq Date: Sun, 5 May 2019 22:26:41 +0200 Subject: [PATCH 21/68] u-boot: explicitly enable decompression u-boot defconfigs don't enable decompression routines required if we want to use compressed kernel image. Enable them to be able to compress kernel and run it. --- packages/tools/u-boot/package.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index 6af7f48b80..ebc74e6327 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -33,6 +33,13 @@ case "$PROJECT" in ;; esac +post_patch() { + if [ -n "$UBOOT_SYSTEM" ]; then + # Enable LZ4, LZO and LZMA decompression support + echo -e "CONFIG_LZ4=y\nCONFIG_LZO=y\nCONFIG_LZMA=y" >> "$PKG_BUILD/configs/$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config)" + fi +} + make_target() { if [ -z "$UBOOT_SYSTEM" ]; then echo "UBOOT_SYSTEM must be set to build an image" From 7ae3eb5b10a46fc5bc36a6622082c80ff1161560 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 16 May 2019 17:24:04 +0200 Subject: [PATCH 22/68] Allwinner: linux: Add HDMI 4K init fix --- .../patches/linux/0011-hdmi-init-fix.patch | 118 ++++++++++++++++++ .../patches/linux/0013-cec-improvements.patch | 10 +- 2 files changed, 123 insertions(+), 5 deletions(-) create mode 100644 projects/Allwinner/patches/linux/0011-hdmi-init-fix.patch diff --git a/projects/Allwinner/patches/linux/0011-hdmi-init-fix.patch b/projects/Allwinner/patches/linux/0011-hdmi-init-fix.patch new file mode 100644 index 0000000000..7022c77884 --- /dev/null +++ b/projects/Allwinner/patches/linux/0011-hdmi-init-fix.patch @@ -0,0 +1,118 @@ +From 4029cb43656ede363011e199e589357b2de95617 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Tue, 14 May 2019 22:02:46 +0200 +Subject: [PATCH 1/2] drm/sun4i: Fix sun8i HDMI PHY clock initialization + +Current code initializes HDMI PHY clock driver before reset line is +deasserted and clocks enabled. Because of that, initial readout of +clock divider is incorrect (0 instead of 2). This causes any clock +rate with divider 1 (register value 0) to be set incorrectly. + +Fix this by moving initialization of HDMI PHY clock driver after reset +line is deasserted and clocks enabled. + +Cc: stable@vger.kernel.org # 4.17+ +Fixes: 4f86e81748fe ("drm/sun4i: Add support for H3 HDMI PHY variant") +Signed-off-by: Jernej Skrabec +--- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 26 ++++++++++++++------------ + 1 file changed, 14 insertions(+), 12 deletions(-) + +diff --git a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +index 66ea3a902e36..afc6d4a9c20b 100644 +--- a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c ++++ b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +@@ -672,22 +672,13 @@ int sun8i_hdmi_phy_probe(struct sun8i_dw_hdmi *hdmi, struct device_node *node) + goto err_put_clk_pll0; + } + } +- +- ret = sun8i_phy_clk_create(phy, dev, +- phy->variant->has_second_pll); +- if (ret) { +- dev_err(dev, "Couldn't create the PHY clock\n"); +- goto err_put_clk_pll1; +- } +- +- clk_prepare_enable(phy->clk_phy); + } + + phy->rst_phy = of_reset_control_get_shared(node, "phy"); + if (IS_ERR(phy->rst_phy)) { + dev_err(dev, "Could not get phy reset control\n"); + ret = PTR_ERR(phy->rst_phy); +- goto err_disable_clk_phy; ++ goto err_put_clk_pll1; + } + + ret = reset_control_deassert(phy->rst_phy); +@@ -708,18 +699,29 @@ int sun8i_hdmi_phy_probe(struct sun8i_dw_hdmi *hdmi, struct device_node *node) + goto err_disable_clk_bus; + } + ++ if (phy->variant->has_phy_clk) { ++ ret = sun8i_phy_clk_create(phy, dev, ++ phy->variant->has_second_pll); ++ if (ret) { ++ dev_err(dev, "Couldn't create the PHY clock\n"); ++ goto err_disable_clk_mod; ++ } ++ ++ clk_prepare_enable(phy->clk_phy); ++ } ++ + hdmi->phy = phy; + + return 0; + ++err_disable_clk_mod: ++ clk_disable_unprepare(phy->clk_mod); + err_disable_clk_bus: + clk_disable_unprepare(phy->clk_bus); + err_deassert_rst_phy: + reset_control_assert(phy->rst_phy); + err_put_rst_phy: + reset_control_put(phy->rst_phy); +-err_disable_clk_phy: +- clk_disable_unprepare(phy->clk_phy); + err_put_clk_pll1: + clk_put(phy->clk_pll1); + err_put_clk_pll0: +-- +2.21.0 + +From 3ebe28afd2b9250375d38bc1144a4aac74340464 Mon Sep 17 00:00:00 2001 +From: Jernej Skrabec +Date: Tue, 14 May 2019 22:26:20 +0200 +Subject: [PATCH 2/2] drm/sun4i: Fix sun8i HDMI PHY configuration for > 148.5 + MHz + +Vendor provided documentation says that EMP bits should be set to 3 for +pixel clocks greater than 148.5 MHz. + +Fix that. + +Cc: stable@vger.kernel.org # 4.17+ +Fixes: 4f86e81748fe ("drm/sun4i: Add support for H3 HDMI PHY variant") +Signed-off-by: Jernej Skrabec +--- + drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +index afc6d4a9c20b..43643ad31730 100644 +--- a/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c ++++ b/drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c +@@ -293,7 +293,8 @@ static int sun8i_hdmi_phy_config_h3(struct dw_hdmi *hdmi, + SUN8I_HDMI_PHY_ANA_CFG2_REG_BIGSW | + SUN8I_HDMI_PHY_ANA_CFG2_REG_SLV(4); + ana_cfg3_init |= SUN8I_HDMI_PHY_ANA_CFG3_REG_AMPCK(9) | +- SUN8I_HDMI_PHY_ANA_CFG3_REG_AMP(13); ++ SUN8I_HDMI_PHY_ANA_CFG3_REG_AMP(13) | ++ SUN8I_HDMI_PHY_ANA_CFG3_REG_EMP(3); + } + + regmap_update_bits(phy->regs, SUN8I_HDMI_PHY_ANA_CFG1_REG, +-- +2.21.0 + diff --git a/projects/Allwinner/patches/linux/0013-cec-improvements.patch b/projects/Allwinner/patches/linux/0013-cec-improvements.patch index a7367c738d..f9360ec979 100644 --- a/projects/Allwinner/patches/linux/0013-cec-improvements.patch +++ b/projects/Allwinner/patches/linux/0013-cec-improvements.patch @@ -166,7 +166,7 @@ index 66ea3a902e36..70e291353569 100644 .is_custom_phy = true, .phy_init = &sun8i_hdmi_phy_init_h3, @@ -708,10 +753,40 @@ int sun8i_hdmi_phy_probe(struct sun8i_dw_hdmi *hdmi, struct device_node *node) - goto err_disable_clk_bus; + clk_prepare_enable(phy->clk_phy); } +#ifdef CONFIG_DRM_SUN8I_DW_HDMI_CEC @@ -201,11 +201,11 @@ index 66ea3a902e36..70e291353569 100644 + cec_delete_adapter(phy->cec_adapter); +err_put_cec_notifier: + cec_notifier_put(phy->cec_notifier); -+err_disable_clk_mod: -+ clk_disable_unprepare(phy->clk_mod); ++err_disable_clk_phy: ++ clk_disable_unprepare(phy->clk_phy); + err_disable_clk_mod: + clk_disable_unprepare(phy->clk_mod); err_disable_clk_bus: - clk_disable_unprepare(phy->clk_bus); - err_deassert_rst_phy: @@ -736,6 +811,10 @@ void sun8i_hdmi_phy_remove(struct sun8i_dw_hdmi *hdmi) { struct sun8i_hdmi_phy *phy = hdmi->phy; From b96e205f147e7f6d6c76cb28420d7972e942127a Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 16 May 2019 17:24:57 +0200 Subject: [PATCH 23/68] u-boot: Allow to add project/device specific configuration --- packages/tools/u-boot/package.mk | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index ebc74e6327..d412494677 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -34,9 +34,8 @@ case "$PROJECT" in esac post_patch() { - if [ -n "$UBOOT_SYSTEM" ]; then - # Enable LZ4, LZO and LZMA decompression support - echo -e "CONFIG_LZ4=y\nCONFIG_LZO=y\nCONFIG_LZMA=y" >> "$PKG_BUILD/configs/$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config)" + if [ -n "$UBOOT_SYSTEM" ] && find_file_path bootloader/config; then + cat $FOUND_PATH >> "$PKG_BUILD/configs/$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config)" fi } From 0b13c7b6fef11df0134638c35123cecd80a2e567 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 16 May 2019 17:26:00 +0200 Subject: [PATCH 24/68] Allwinner: Fix HDMI monitor/TV detection and speed up boot --- projects/Allwinner/bootloader/config | 4 ++++ .../patches/u-boot/002-disable-usb-keyboard.patch | 13 ------------- 2 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 projects/Allwinner/bootloader/config delete mode 100644 projects/Allwinner/patches/u-boot/002-disable-usb-keyboard.patch diff --git a/projects/Allwinner/bootloader/config b/projects/Allwinner/bootloader/config new file mode 100644 index 0000000000..58d44d1a2e --- /dev/null +++ b/projects/Allwinner/bootloader/config @@ -0,0 +1,4 @@ +# CONFIG_VIDEO_DE2 is not set +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +CONFIG_BOOTDELAY=0 diff --git a/projects/Allwinner/patches/u-boot/002-disable-usb-keyboard.patch b/projects/Allwinner/patches/u-boot/002-disable-usb-keyboard.patch deleted file mode 100644 index 2b52175a60..0000000000 --- a/projects/Allwinner/patches/u-boot/002-disable-usb-keyboard.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -Nur a/arch/arm/Kconfig usb/arch/arm/Kconfig ---- a/arch/arm/Kconfig 2016-09-12 16:05:51.000000000 +0200 -+++ usb/arch/arm/Kconfig 2016-09-21 19:19:44.533396743 +0200 -@@ -590,9 +590,8 @@ - select SPL_SYS_THUMB_BUILD if !ARM64 - select SYS_NS16550 - select SYS_THUMB_BUILD if !ARM64 - select USB if DISTRO_DEFAULTS -- select USB_KEYBOARD if DISTRO_DEFAULTS - select USB_STORAGE if DISTRO_DEFAULTS - select USE_TINY_PRINTF - imply CMD_DM - imply CMD_GPT From e50834fd82c05ad0ea20afff9c6dc827f090642b Mon Sep 17 00:00:00 2001 From: kszaq Date: Mon, 13 May 2019 21:05:10 +0200 Subject: [PATCH 25/68] scripts/build: strip all executables in /usr Some packages install outside /usr/*bin, e.g. /usr/lib/bluetooth and executables remain unstripped. Try to strip everything executable except .ko and .so which are handled in separate cases. --- scripts/build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/build b/scripts/build index 13a3545078..20c804ca89 100755 --- a/scripts/build +++ b/scripts/build @@ -488,7 +488,7 @@ if [ "$TARGET" = "target" -o "$TARGET" = "init" ]; then if [ "$TARGET" = "init" ]; then $STRIP $(find $INSTALL -type f -name "*.so*" 2>/dev/null) 2>/dev/null || : fi - $STRIP $(find $INSTALL/bin $INSTALL/usr/bin $INSTALL/sbin $INSTALL/usr/sbin \ + $STRIP $(find $INSTALL ! -name "*.so*" ! -name "*.ko" \ -type f -executable 2>/dev/null) 2>/dev/null || : fi fi From 26e3588d7970fbe0e521802f6ad51aa80a0379f9 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Thu, 16 May 2019 22:14:32 +0200 Subject: [PATCH 26/68] libdrm: Update package to 2.4.98 --- packages/graphics/libdrm/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/libdrm/package.mk b/packages/graphics/libdrm/package.mk index fffa8dd01e..b8d9be5f28 100644 --- a/packages/graphics/libdrm/package.mk +++ b/packages/graphics/libdrm/package.mk @@ -4,8 +4,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libdrm" -PKG_VERSION="2.4.97" -PKG_SHA256="77d0ccda3e10d6593398edb70b1566bfe1a23a39bd3da98ace2147692eadd123" +PKG_VERSION="2.4.98" +PKG_SHA256="8be0edccaca3abde8b6bb1431b46354c7fab46e9b91cc6946ba65b51f56f1894" PKG_LICENSE="GPL" PKG_SITE="http://dri.freedesktop.org" PKG_URL="http://dri.freedesktop.org/libdrm/$PKG_NAME-$PKG_VERSION.tar.bz2" From 4fb34fc66a4e046f69a61c34411bd068697c3066 Mon Sep 17 00:00:00 2001 From: kszaq Date: Wed, 15 May 2019 21:12:32 +0200 Subject: [PATCH 27/68] u-boot-script: add package to compile env scripts for u-boot Some targets require to have scripts for u-boot included in system image. Provide a package to compile them. --- packages/tools/u-boot-script/package.mk | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/tools/u-boot-script/package.mk diff --git a/packages/tools/u-boot-script/package.mk b/packages/tools/u-boot-script/package.mk new file mode 100644 index 0000000000..808cb5f499 --- /dev/null +++ b/packages/tools/u-boot-script/package.mk @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="u-boot-script" +PKG_VERSION="1.0" +PKG_LICENSE="GPL" +PKG_DEPENDS_TARGET="u-boot-tools:host" +PKG_TOOLCHAIN="manual" +PKG_LONGDESC="Compile scripts for u-boot environment." + +PKG_NEED_UNPACK="$PROJECT_DIR/$PROJECT/bootloader" +[ -n "$DEVICE" ] && PKG_NEED_UNPACK+=" $PROJECT_DIR/$PROJECT/devices/$DEVICE/bootloader" + +make_target() { + if find_dir_path bootloader/scripts ; then + for src in $FOUND_PATH/*.src ; do + mkimage -A $TARGET_KERNEL_ARCH -O linux -T script -C none -d "$src" "$(basename $src .src)" + done + fi +} + +makeinstall_target() { + mkdir -p $INSTALL/usr/share/bootloader + cp -a $PKG_BUILD/* $INSTALL/usr/share/bootloader/ +} From 8ebda35e84487130a6f69ecd728ee7a777b2437e Mon Sep 17 00:00:00 2001 From: kszaq Date: Fri, 10 May 2019 23:33:11 +0200 Subject: [PATCH 28/68] addons: drop references to legacy projects --- .../addons/repository/repository.linuxserver.docker/package.mk | 1 - packages/addons/service/docker/package.mk | 1 - .../mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk | 1 - 3 files changed, 3 deletions(-) diff --git a/packages/addons/repository/repository.linuxserver.docker/package.mk b/packages/addons/repository/repository.linuxserver.docker/package.mk index 33701a542a..800d057faf 100644 --- a/packages/addons/repository/repository.linuxserver.docker/package.mk +++ b/packages/addons/repository/repository.linuxserver.docker/package.mk @@ -5,7 +5,6 @@ PKG_NAME="repository.linuxserver.docker" PKG_VERSION="9.0" PKG_REV="102" PKG_ARCH="any" -PKG_ADDON_PROJECTS="any !WeTek_Core !WeTek_Play" PKG_LICENSE="GPL" PKG_SITE="https://linuxserver.io" PKG_URL="" diff --git a/packages/addons/service/docker/package.mk b/packages/addons/service/docker/package.mk index 2b724e87d8..94164388b9 100644 --- a/packages/addons/service/docker/package.mk +++ b/packages/addons/service/docker/package.mk @@ -7,7 +7,6 @@ PKG_VERSION="18.09.5" PKG_SHA256="57f2a5d3374d86a8eb680c91df4351f5cb648351b9b32520c6fd2d66e7e97fd5" PKG_REV="125" PKG_ARCH="any" -PKG_ADDON_PROJECTS="any !WeTek_Core !WeTek_Play" PKG_LICENSE="ASL" PKG_SITE="http://www.docker.com/" PKG_URL="https://github.com/docker/docker-ce/archive/v${PKG_VERSION}.tar.gz" diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk index d37beb4660..3529a1507c 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk @@ -17,4 +17,3 @@ PKG_LONGDESC="audiodecoder.usf" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" -PKG_ADDON_PROJECTS="Generic Nvidia_Legacy RPi2 imx6 WeTek_Play" From 06f48133bba72790ae961e758031da39f7264731 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 22 May 2019 02:15:50 +0100 Subject: [PATCH 29/68] mesa: update to mesa-19.0.5 --- packages/graphics/mesa/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 251c8de276..7e334fa639 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mesa" -PKG_VERSION="19.0.4" -PKG_SHA256="a0154c436e3e040b3a2c528554cd52b6ef724fea1906c0a862401c4fc641147d" +PKG_VERSION="19.0.5" +PKG_SHA256="c0b760b0bdc4f65e0df0a74a59a6af5bbd1ddd401317a0343bb38ab8e6258c2d" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" PKG_URL="https://github.com/mesa3d/mesa/archive/mesa-$PKG_VERSION.tar.gz" From f470d833b7b79f5a6046029f5c782401dadba0ba Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 May 2019 17:48:45 +0100 Subject: [PATCH 30/68] curl: update to curl-7.65.0 --- packages/web/curl/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index 8936dc1788..1d867ae0f5 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -11,8 +11,8 @@ # there: http://forum.xbmc.org/showthread.php?tid=177557 PKG_NAME="curl" -PKG_VERSION="7.64.1" -PKG_SHA256="9252332a7f871ce37bfa7f78bdd0a0e3924d8187cc27cb57c76c9474a7168fb3" +PKG_VERSION="7.65.0" +PKG_SHA256="7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd" PKG_LICENSE="MIT" PKG_SITE="http://curl.haxx.se" PKG_URL="http://curl.haxx.se/download/$PKG_NAME-$PKG_VERSION.tar.xz" From 9e9e6befb3baf10ac69a524451d2c0bb85df19a5 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 2 May 2019 14:48:08 +0100 Subject: [PATCH 31/68] kernel-firmware: update to kernel-firmware-92e17d0 --- packages/linux-firmware/kernel-firmware/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index 23f8d82ff8..72132a52bb 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kernel-firmware" -PKG_VERSION="b0d9583f9528890dfcb28d338fe70b50371084bf" -PKG_SHA256="6ce9bdbe9df28756e8a633c5d6a2c8ced3597e32b75f6897cbc4f576851f611a" +PKG_VERSION="92e17d0dd2437140fab044ae62baf69b35d7d1fa" +PKG_SHA256="614aeecebe641a20fbc2825b6cd749d5c5528cba40a75503a5fd93321681e312" PKG_LICENSE="other" PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/" PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz" From 6c8ab49eec9cb686c7e5d70d7b5483cdacec5bb9 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 15 May 2019 00:53:50 +0100 Subject: [PATCH 32/68] intel-ucode: update to intel-ucode-20190514, switch url, drop unnecessary depends --- packages/linux-firmware/intel-ucode/package.mk | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/packages/linux-firmware/intel-ucode/package.mk b/packages/linux-firmware/intel-ucode/package.mk index 3b267d82c2..c603ce2443 100644 --- a/packages/linux-firmware/intel-ucode/package.mk +++ b/packages/linux-firmware/intel-ucode/package.mk @@ -2,18 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="intel-ucode" -PKG_VERSION="20180807a" -PKG_SHA256="46ab18699ec42eb6cc01ee1846ec4d7ca979766dee2156f92d69e2f6df548137" +PKG_VERSION="20190514" +PKG_SHA256="553858de4315d267d1f259d1146db028eec5112a797379a7a83f5c8a22e626b3" PKG_ARCH="x86_64" PKG_LICENSE="other" PKG_SITE="https://downloadcenter.intel.com/search?keyword=linux+microcode" -PKG_URL="https://downloadmirror.intel.com/28087/eng/microcode-${PKG_VERSION}.tgz" -PKG_DEPENDS_HOST="toolchain" -PKG_DEPENDS_TARGET="toolchain intel-ucode:host" +PKG_URL="https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/microcode-${PKG_VERSION}.tar.gz" PKG_LONGDESC="intel-ucode: Intel CPU microcodes" PKG_TOOLCHAIN="manual" - -unpack() { - mkdir -p $PKG_BUILD - tar xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tgz -C $PKG_BUILD -} From c10e761b0de05a5669e9af9488c6c0c01baa9ab5 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 15 May 2019 01:04:00 +0100 Subject: [PATCH 33/68] kernel-firmware: update to kernel-firmware-20190514 --- packages/linux-firmware/kernel-firmware/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index 72132a52bb..92d5f7e6e7 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kernel-firmware" -PKG_VERSION="92e17d0dd2437140fab044ae62baf69b35d7d1fa" -PKG_SHA256="614aeecebe641a20fbc2825b6cd749d5c5528cba40a75503a5fd93321681e312" +PKG_VERSION="20190514" +PKG_SHA256="13dede60a1ba7b967f0eef72f40720a2ea0678dee54ea3fc44800f58ec38aafc" PKG_LICENSE="other" PKG_SITE="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/" PKG_URL="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/$PKG_VERSION.tar.gz" From 85cb44de99dbdee7a9065ad4f453cd7be45a1db4 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 15 May 2019 14:19:36 +0100 Subject: [PATCH 34/68] kernel-firmware: add project & device support; use config dir --- packages/linux-firmware/kernel-firmware/package.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index 92d5f7e6e7..486af4a443 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -16,12 +16,16 @@ PKG_TOOLCHAIN="manual" makeinstall_target() { FW_TARGET_DIR=$INSTALL/$(get_full_firmware_dir) - if find_file_path firmwares/kernel-firmware.dat; then + if find_file_path config/kernel-firmware.dat; then FW_LISTS="${FOUND_PATH}" else FW_LISTS="${PKG_DIR}/firmwares/any.dat ${PKG_DIR}/firmwares/${TARGET_ARCH}.dat" fi + FW_LISTS+=" ${PROJECT_DIR}/${PROJECT}/config/kernel-firmware-any.dat ${PROJECT_DIR}/${PROJECT}/config/kernel-firmware-${TARGET_ARCH}.dat" + + FW_LISTS+=" ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/config/kernel-firmware-any.dat ${PROJECT_DIR}/${PROJECT}/devices/${DEVICE}/config/kernel-firmware-${TARGET_ARCH}.dat" + for fwlist in ${FW_LISTS}; do [ -f "${fwlist}" ] || continue From f8ec58745ea56a13f99b3446a8e460dc3f1ab6a9 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 16 May 2019 00:45:29 +0100 Subject: [PATCH 35/68] kernel-firmware: add mediatek mt7662 firmwares --- packages/linux-firmware/kernel-firmware/firmwares/any.dat | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/linux-firmware/kernel-firmware/firmwares/any.dat b/packages/linux-firmware/kernel-firmware/firmwares/any.dat index e6a29070d2..19f6e30b22 100644 --- a/packages/linux-firmware/kernel-firmware/firmwares/any.dat +++ b/packages/linux-firmware/kernel-firmware/firmwares/any.dat @@ -5,11 +5,15 @@ htc_9271.fw ath3k-1.fw ar5523.bin carl9170-1.fw -mt7601u.bin rt2870.bin rt73.bin vntwusb.fw +#mediatek +mt7601u.bin +mt7662*.bin +mediatek/mt7662u*.bin + ath6k/AR6004/hw1.?/bdata.bin ath9k_htc/* brcm/* From dc1d83925e0e819dc660054743d5a5e5703f3eb9 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Sat, 1 Jun 2019 10:32:12 +0200 Subject: [PATCH 36/68] u-boot: Fail if config is wrongly configured --- packages/tools/u-boot/package.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/tools/u-boot/package.mk b/packages/tools/u-boot/package.mk index d412494677..0860e00846 100644 --- a/packages/tools/u-boot/package.mk +++ b/packages/tools/u-boot/package.mk @@ -35,7 +35,10 @@ esac post_patch() { if [ -n "$UBOOT_SYSTEM" ] && find_file_path bootloader/config; then - cat $FOUND_PATH >> "$PKG_BUILD/configs/$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config)" + PKG_CONFIG_FILE="$PKG_BUILD/configs/$($ROOT/$SCRIPTS/uboot_helper $PROJECT $DEVICE $UBOOT_SYSTEM config)" + if [ -f "$PKG_CONFIG_FILE" ]; then + cat $FOUND_PATH >> "$PKG_CONFIG_FILE" + fi fi } From 9d6a971612ab3465be6f0938e455dd806aa653cc Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Sat, 1 Jun 2019 10:32:45 +0200 Subject: [PATCH 37/68] uboot_helper: Fix Allwinner boards and add NanoPi M1 --- scripts/uboot_helper | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/uboot_helper b/scripts/uboot_helper index 71f7886a29..8d993311c9 100755 --- a/scripts/uboot_helper +++ b/scripts/uboot_helper @@ -12,13 +12,14 @@ devices = { 'A64' : { 'pine64' : { 'dtb' : 'sun50i-a64-pine64.dtb', 'config' : 'pine64_plus_defconfig' }, 'pine64_plus' : { 'dtb' : 'sun50i-a64-pine64-plus.dtb', 'config' : 'pine64_plus_defconfig' }, - 'pine64_lts' : { 'dtb' : 'sun50i-a64-sopine-baseboard.dtb', 'config' : 'sopine_baseboard_defconfig' }, + 'pine64_lts' : { 'dtb' : 'sun50i-a64-pine64-lts.dtb', 'config' : 'pine64-lts_defconfig' }, 'orangepi_win' : { 'dtb' : 'sun50i-a64-orangepi-win.dtb', 'config' : 'orangepi_win_defconfig' }, }, 'H3' : { - 'bananapi_m2p' : { 'dtb' : 'sun8i-h3-bananapi-m2-plus.dtb', 'config' : 'Sinovoip_BPI_M2_Plus_defconfig' }, + 'bananapi_m2p' : { 'dtb' : 'sun8i-h3-bananapi-m2-plus.dtb', 'config' : 'bananapi_m2_plus_h3_defconfig' }, 'beelink_x2' : { 'dtb' : 'sun8i-h3-beelink-x2.dtb', 'config' : 'beelink_x2_defconfig' }, 'libretech_h3' : { 'dtb' : 'sun8i-h3-libretech-all-h3-cc.dtb', 'config' : 'libretech_all_h3_cc_h3_defconfig' }, + 'nanopi_m1' : { 'dtb' : 'sun8i-h3-nanopi-m1.dtb', 'config' : 'nanopi_m1_defconfig' }, 'orangepi_2' : { 'dtb' : 'sun8i-h3-orangepi-2.dtb', 'config' : 'orangepi_2_defconfig' }, 'orangepi_pc': { 'dtb': 'sun8i-h3-orangepi-pc.dtb', 'config': 'orangepi_pc_defconfig' }, 'orangepi_pc_plus': { 'dtb': 'sun8i-h3-orangepi-pc-plus.dtb', 'config': 'orangepi_pc_plus_defconfig' }, From 5cdbdf030332be8f46e7f273ccee64aaaf942ade Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Mon, 20 May 2019 21:58:36 +0200 Subject: [PATCH 38/68] linux: drop ati_remote.conf modprobe file Disabling mouse support in the driver not only makes the mouse feature of the remote non-functional but also results in a kernel crash when a pressing a mouse button on the remote. See https://forum.libreelec.tv/thread/17562-le-9-0-2-freeze-when-ati-remote-is-used/ Signed-off-by: Matthias Reichl --- packages/linux/modprobe.d/ati_remote.conf | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 packages/linux/modprobe.d/ati_remote.conf diff --git a/packages/linux/modprobe.d/ati_remote.conf b/packages/linux/modprobe.d/ati_remote.conf deleted file mode 100644 index 6a211834f7..0000000000 --- a/packages/linux/modprobe.d/ati_remote.conf +++ /dev/null @@ -1,3 +0,0 @@ -# /etc/modprobe.d/ati_remote.conf: setup modload options for module ati_remote. - -options ati_remote mouse=no From 7aabe781cb2aec00b24ae3396eb5e074eb13281c Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 9 May 2019 01:53:52 +0100 Subject: [PATCH 39/68] buildsystem: addons install minor cleanup --- config/functions | 2 ++ packages/addons/service/slice/package.mk | 4 +--- scripts/install_addon | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/config/functions b/config/functions index 793ba089ca..af1020e884 100644 --- a/config/functions +++ b/config/functions @@ -1155,6 +1155,8 @@ done } install_addon_files() { + mkdir -p "$1" + install_addon_source "$1" install_addon_images "$1" create_addon_xml "$1" diff --git a/packages/addons/service/slice/package.mk b/packages/addons/service/slice/package.mk index 5fa2876837..c78baa5b30 100644 --- a/packages/addons/service/slice/package.mk +++ b/packages/addons/service/slice/package.mk @@ -20,9 +20,7 @@ PKG_ADDON_PROJECTS="Slice Slice3" PKG_ADDON_TYPE="xbmc.service" makeinstall_target() { - PKG_ADDON_INSTALL_DIR="${INSTALL}/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME}" - mkdir -p "${PKG_ADDON_INSTALL_DIR}" - install_addon_files "${PKG_ADDON_INSTALL_DIR}" + install_addon_files "${INSTALL}/usr/share/kodi/addons/${PKG_SECTION}.${PKG_NAME}" } addon() { diff --git a/scripts/install_addon b/scripts/install_addon index 289b934b39..0a6220328a 100755 --- a/scripts/install_addon +++ b/scripts/install_addon @@ -12,8 +12,6 @@ setup_toolchain target ADDON_DIRECTORY="$ADDON_BUILD/$PKG_ADDON_ID" -mkdir -p "$ADDON_DIRECTORY" - install_addon_files "$ADDON_DIRECTORY" debug_strip "$ADDON_DIRECTORY" From 6400a8cb7ed29368734bf249f26c0e99ba5e2e08 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 19 May 2019 23:25:32 +0100 Subject: [PATCH 40/68] linux: avoid building host and target concurrently --- packages/linux/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/linux/package.mk b/packages/linux/package.mk index 3485f7c081..cad5441f3a 100644 --- a/packages/linux/package.mk +++ b/packages/linux/package.mk @@ -6,7 +6,7 @@ PKG_NAME="linux" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org" PKG_DEPENDS_HOST="ccache:host openssl:host" -PKG_DEPENDS_TARGET="toolchain cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET" +PKG_DEPENDS_TARGET="toolchain linux:host cpio:host kmod:host xz:host wireless-regdb keyutils $KERNEL_EXTRA_DEPENDS_TARGET" PKG_DEPENDS_INIT="toolchain" PKG_NEED_UNPACK="$LINUX_DEPENDS" PKG_LONGDESC="This package contains a precompiled kernel image and the modules." From 5f777dcbe8de742974869abbf2b887d94e0b1a98 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 May 2019 22:56:24 +0100 Subject: [PATCH 41/68] buildsystem: don't allow unpack folder to become visible until tagged --- scripts/clean | 9 ++++++--- scripts/unpack | 35 +++++++++++++++++++++-------------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/scripts/clean b/scripts/clean index 9e7ca86984..9097af794d 100755 --- a/scripts/clean +++ b/scripts/clean @@ -22,10 +22,13 @@ clean_package() { build_msg "CLR_WARNING" "*" "$(print_color "CLR_WARNING_DIM" "Removing ${i} ...")" rm -rf "${i}" fi - else + elif [ -d "${i}" -a -f "${i}/.libreelec-package" ]; then # force clean if no stamp found (previous unpack failed) - build_msg "" "" "* Removing ${i} ..." - rm -rf "${i}" + . "${i}/.libreelec-package" + if [ "${INFO_PKG_NAME}" = "${1}" ]; then + build_msg "" "" "* Removing ${i} ..." + rm -rf "${i}" + fi fi done rm -f "${STAMPS}/${1}/build_"* diff --git a/scripts/unpack b/scripts/unpack index 5415acf5aa..1f4342a5f4 100755 --- a/scripts/unpack +++ b/scripts/unpack @@ -60,40 +60,46 @@ if [ -d "$SOURCES/${PKG_NAME}" -o -d "$PKG_DIR/sources" ]; then pkg_call_exists pre_unpack && pkg_call pre_unpack if pkg_call_exists unpack; then - pkg_call unpack + ( + PKG_BUILD="${PKG_UNPACK_DIR}/${PKG_NAME}-${PKG_VERSION}" + pkg_call unpack + ) else if [ -n "$PKG_URL" ]; then ${SCRIPTS}/extract "${PKG_NAME}" "${PKG_UNPACK_DIR}" fi fi - _pkg_build="$(basename "${PKG_BUILD}")" - [ -z "${PKG_SOURCE_DIR}" -a -d "${PKG_UNPACK_DIR}/${_pkg_build}"* ] && mv "${PKG_UNPACK_DIR}/${_pkg_build}"* "${PKG_BUILD}" + if [ -z "${PKG_SOURCE_DIR}" -a -d "${PKG_UNPACK_DIR}/${PKG_NAME}-${PKG_VERSION}"* ]; then + mv "${PKG_UNPACK_DIR}/${PKG_NAME}-${PKG_VERSION}"* "${PKG_UNPACK_DIR}/.intermediate" + fi - if [ ! -d "${PKG_BUILD}" ]; then + if [ ! -d "${PKG_UNPACK_DIR}/.intermediate" ]; then if [ -n "${PKG_SOURCE_DIR}" ]; then if [ -d "${PKG_UNPACK_DIR}"/${PKG_SOURCE_DIR} ]; then - mv "${PKG_UNPACK_DIR}"/${PKG_SOURCE_DIR} "${PKG_BUILD}" + mv "${PKG_UNPACK_DIR}"/${PKG_SOURCE_DIR} "${PKG_UNPACK_DIR}/.intermediate" else # fallback - mv "${BUILD}"/${PKG_SOURCE_DIR} "${PKG_BUILD}" + mv "${BUILD}"/${PKG_SOURCE_DIR} "${PKG_UNPACK_DIR}/.intermediate" fi elif [ -d "${PKG_BUILD}"* ]; then - mv "${PKG_BUILD}"* "${PKG_BUILD}" + mv "${PKG_BUILD}"* "${PKG_UNPACK_DIR}/.intermediate" fi fi - # cleanup - rm -rf "${PKG_UNPACK_DIR}" + [ ! -d "${PKG_UNPACK_DIR}/.intermediate" ] && mkdir -p "${PKG_UNPACK_DIR}/.intermediate" if [ -d "$PKG_DIR/sources" ]; then - [ ! -d "$PKG_BUILD" ] && mkdir -p "$PKG_BUILD" - cp -PRf "$PKG_DIR/sources/"* "$PKG_BUILD" + cp -PRf "$PKG_DIR/sources/"* "${PKG_UNPACK_DIR}/.intermediate" fi - if [ -z "$PKG_URL" ]; then - mkdir -p "${PKG_BUILD}" - fi + echo "INFO_PKG_NAME=\"${PKG_NAME}\"" > "${PKG_UNPACK_DIR}/.intermediate/.libreelec-package" + + rm -fr "${PKG_BUILD}" + mv "${PKG_UNPACK_DIR}/.intermediate" "${PKG_BUILD}" + + # cleanup + rm -rf "${PKG_UNPACK_DIR}" pkg_call_exists post_unpack && pkg_call post_unpack @@ -184,6 +190,7 @@ fi if [ "$PKG_SECTION" != "virtual" ]; then mkdir -p "$PKG_BUILD" + echo "INFO_PKG_NAME=\"${PKG_NAME}\"" > "${PKG_BUILD}/.libreelec-package" rm -f $STAMPS/${PKG_NAME}/build_* From c3e674ed7dcb1708b07482df5c197b2d568b83a0 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 May 2019 22:57:05 +0100 Subject: [PATCH 42/68] dotnet-runtime: redundant custom unpack() --- packages/addons/tools/dotnet-runtime/package.mk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/addons/tools/dotnet-runtime/package.mk b/packages/addons/tools/dotnet-runtime/package.mk index b3dd996ed4..40ed87f919 100644 --- a/packages/addons/tools/dotnet-runtime/package.mk +++ b/packages/addons/tools/dotnet-runtime/package.mk @@ -36,11 +36,6 @@ PKG_ADDON_NAME=".Net Core Runtime" PKG_ADDON_TYPE="xbmc.python.script" PKG_MAINTAINER="Anton Voyl (awiouy)" -unpack() { - mkdir -p $PKG_BUILD - $SCRIPTS/extract $PKG_NAME $PKG_BUILD -} - addon() { mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/bin cp -r $PKG_BUILD/$PKG_NAME-$PKG_VERSION/* \ From bb9f7fa623f445fe415d4e10b356d24cd31d7f76 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 May 2019 23:28:02 +0100 Subject: [PATCH 43/68] media_tree/media_tree_cc: use post_unpack() --- packages/linux-driver-addons/dvb/depends/media_tree/package.mk | 2 ++ .../linux-driver-addons/dvb/depends/media_tree_cc/package.mk | 2 ++ 2 files changed, 4 insertions(+) diff --git a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk index 2aa920e299..ae3fd907a6 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree/package.mk +++ b/packages/linux-driver-addons/dvb/depends/media_tree/package.mk @@ -15,7 +15,9 @@ PKG_TOOLCHAIN="manual" unpack() { mkdir -p $PKG_BUILD/ tar -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2 -C $PKG_BUILD/ +} +post_unpack() { # hack/workaround for borked upstream kernel/media_build # without removing atomisp there a lot additional includes that # slowdown build process after modpost from 3min to 6min diff --git a/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk b/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk index b04f4771eb..ccce3a9c7e 100644 --- a/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk +++ b/packages/linux-driver-addons/dvb/depends/media_tree_cc/package.mk @@ -15,7 +15,9 @@ PKG_TOOLCHAIN="manual" unpack() { mkdir -p $PKG_BUILD/ tar -xf $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2 -C $PKG_BUILD/ +} +post_unpack() { # hack/workaround for borked upstream kernel/media_build # without removing atomisp there a lot additional includes that # slowdown build process after modpost from 3min to 6min From 17ab4518fd7e141cae442d839564d93b799979dc Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 23 May 2019 23:33:17 +0100 Subject: [PATCH 44/68] firmware-imx: unpack into unique unpack folder not $BUILD --- packages/linux-firmware/firmware-imx/package.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/linux-firmware/firmware-imx/package.mk b/packages/linux-firmware/firmware-imx/package.mk index 4d895b40e2..89dd714efb 100644 --- a/packages/linux-firmware/firmware-imx/package.mk +++ b/packages/linux-firmware/firmware-imx/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="firmware-imx" PKG_VERSION="5.4" @@ -13,9 +14,8 @@ PKG_LONGDESC="firmware-imx: Freescale IMX firmware such as for the VPU" PKG_TOOLCHAIN="manual" unpack() { - mkdir -p $BUILD - cd $BUILD - sh $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.bin --auto-accept + cd $(dirname $PKG_BUILD) + sh $SOURCES/$PKG_NAME/$PKG_NAME-$PKG_VERSION.bin --auto-accept } makeinstall_target() { From 7604df2686168f3e702b83be488f81a3e63720a9 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 24 May 2019 04:40:09 +0100 Subject: [PATCH 45/68] fontconfig: needs util-linux for uuid support --- packages/x11/other/fontconfig/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/x11/other/fontconfig/package.mk b/packages/x11/other/fontconfig/package.mk index 0dd1f233a1..6b0000b5f1 100644 --- a/packages/x11/other/fontconfig/package.mk +++ b/packages/x11/other/fontconfig/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f" PKG_LICENSE="OSS" PKG_SITE="http://www.fontconfig.org" PKG_URL="http://www.freedesktop.org/software/fontconfig/release/$PKG_NAME-$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain util-macros freetype libxml2 zlib expat" +PKG_DEPENDS_TARGET="toolchain util-linux util-macros freetype libxml2 zlib expat" PKG_LONGDESC="Fontconfig is a library for font customization and configuration." PKG_CONFIGURE_OPTS_TARGET="--with-arch=$TARGET_ARCH \ From 775df5da16d1627eb2bfa8f626fe68e4207bdd34 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 25 May 2019 00:35:43 +0100 Subject: [PATCH 46/68] audiodecoder.usf: don't build for RPi1, broken in #3503 --- .../mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk index 3529a1507c..b28e165a36 100644 --- a/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk +++ b/packages/mediacenter/kodi-binary-addons/audiodecoder.usf/package.mk @@ -17,3 +17,4 @@ PKG_LONGDESC="audiodecoder.usf" PKG_IS_ADDON="yes" PKG_ADDON_TYPE="kodi.audiodecoder" +PKG_ADDON_PROJECTS="any !RPi1" From 9a24528e3fa64f496bfe1a47495a79b7ffda7df5 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 25 May 2019 01:38:48 +0100 Subject: [PATCH 47/68] udpxy: broken since gcc-8.0 --- .../addon-depends/network-tools-depends/udpxy/package.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk b/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk index 9009849291..a8ed4de2ee 100644 --- a/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk +++ b/packages/addons/addon-depends/network-tools-depends/udpxy/package.mk @@ -10,6 +10,10 @@ PKG_URL="http://www.udpxy.com/download/1_23/${PKG_NAME}.${PKG_VERSION}-prod.tar. PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="A UDP-to-HTTP multicast traffic relay daemon." +configure_target() { + export CFLAGS+=" -Wno-stringop-truncation" +} + makeinstall_target() { : } From fbf0c54b7190fd3266efb608e1ad5a9dfff0971f Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 25 May 2019 12:12:26 +0100 Subject: [PATCH 48/68] screensaver.greynetic: needs glm --- .../kodi-binary-addons/screensaver.greynetic/package.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk b/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk index 0b7090e9f7..0e443fbabe 100644 --- a/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk +++ b/packages/mediacenter/kodi-binary-addons/screensaver.greynetic/package.mk @@ -10,7 +10,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/xbmc/screensaver.greynetic" PKG_URL="https://github.com/xbmc/screensaver.greynetic/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain kodi-platform" +PKG_DEPENDS_TARGET="toolchain kodi-platform glm" PKG_SECTION="" PKG_SHORTDESC="screensaver.greynetic" PKG_LONGDESC="screensaver.greynetic" From 195c2066696285714802a22ec6d39e0d7fd13ade Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 25 May 2019 13:59:07 +0100 Subject: [PATCH 49/68] distro-tool: handle garbage in error response --- tools/distro-tool | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/distro-tool b/tools/distro-tool index 075a855a60..71b3b1473c 100755 --- a/tools/distro-tool +++ b/tools/distro-tool @@ -104,7 +104,13 @@ class MyUtility(object): return (0, subprocess.check_output(command.split(" "), stderr=_logfile)) except subprocess.CalledProcessError as cpe: if MyUtility.isPython3: - return (cpe.returncode, cpe.output.decode("utf-8")) + # Clean up undecodable garbage in response (eg. libftdi1 error page) + output = bytearray() + for c in cpe.output: + if c <= 127: + output.append(c) + + return (cpe.returncode, output.decode("utf-8")) else: return (cpe.returncode, cpe.output) finally: From 0eb36d786b76f3485dafe324f80c6393f127cc45 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 26 May 2019 18:50:07 +0100 Subject: [PATCH 50/68] buildsystem: add pre_configure() function that is not target specific --- packages/readme.md | 2 +- scripts/build | 1 + tools/pkgcheck | 13 +++++++------ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/readme.md b/packages/readme.md index 26bc6cce55..e67a1c6e33 100644 --- a/packages/readme.md +++ b/packages/readme.md @@ -148,7 +148,7 @@ Full list of overwrittable functions. | unpack
pre_unpack
post_unpack | - | Extract the source from the downloaded file | | pre_patch
post_patch | - | Apply the patches to the source, after extraction. The patch function it self is not allowed to overwritten | | pre_build_\[stage] | yes | Runs before of the start of the build | -| configure_\[stage]
pre_configure_\[stage]
post_configure_\[stage] | yes | Configure the package for the compile. This is only relevant for toolchain, that supports it (e.g. meson, cmake, configure, manual) | +| pre_configure
pre_configure_\[stage]
configure_\[stage]
post_configure_\[stage] | yes | Configure the package for the compile. This is only relevant for toolchain, that supports it (e.g. meson, cmake, configure, manual) | | make_\[stage]
pre_make_\[stage]
post_make_\[stage] | yes | Build of the package | | makeinstall_\[stage]
pre_makeinstall_\[stage]
post_makeinstall_\[stage] | yes | Installation of the files in the correct pathes
host: TOOLCHAIN
target: SYSROOT and IMAGE
bootstrap and init: temporary destination | addon | - | Copy all files together for addon creation. This is requiered for addons | diff --git a/scripts/build b/scripts/build index 20c804ca89..1d068051c7 100755 --- a/scripts/build +++ b/scripts/build @@ -238,6 +238,7 @@ if [ -f "$PKG_CONFIGURE_SCRIPT" -o -f "$PKG_CMAKE_SCRIPT" -o -f "$PKG_MESON_SCRI fi # configure +pkg_call_exists pre_configure && pkg_call pre_configure pkg_call_exists pre_configure_$TARGET && pkg_call pre_configure_$TARGET if pkg_call_exists configure_$TARGET; then diff --git a/tools/pkgcheck b/tools/pkgcheck index af298edc6c..55282dc9b7 100755 --- a/tools/pkgcheck +++ b/tools/pkgcheck @@ -76,8 +76,8 @@ process_line() { [ -n "${matches}" ] && log "${filename}" ${lc} "FAIL" "late binding violation" "${matches:2}" } -init_multi_func() { - local f t multi +init_target_funcs() { + local f t funcs for t in target host init bootstrap; do for f in pre_build \ @@ -85,10 +85,10 @@ init_multi_func() { pre_make make post_make \ pre_makeinstall makeinstall post_makeinstall \ ; do - multi+=" ${f}_${t}" + funcs+=" ${f}_${t}" done done - echo "${multi:1}" + echo "${funcs:1}" } check_func_name() { @@ -98,7 +98,8 @@ check_func_name() { for f in configure_package \ pre_unpack unpack post_unpack \ pre_patch post_patch \ - ${MULTI_FUNC} \ + pre_configure \ + ${TARGET_FUNCS} \ pre_install post_install \ addon \ ; do @@ -146,7 +147,7 @@ process_pkg() { done <<< "$(grep -E ".*() {" "${filename}" | sed 's/[[:space:]]*{.*//' | sort | uniq -c | grep -v ^[[:space:]]*1[[:space:]])" } -MULTI_FUNC="$(init_multi_func)" +TARGET_FUNCS="$(init_target_funcs)" if [ $# -ne 0 ]; then for arg in ${@}; do From 04b8036e32c42f70f316514fc3c71a79a8e51cd6 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 29 May 2019 00:49:26 +0100 Subject: [PATCH 51/68] buildsystem: replace $(cat file) with faster alternative See: https://www.gnu.org/software/bash/manual/html_node/Command-Substitution.html " ... Bash performs the expansion by executing command in a subshell environment and replacing the command substitution with the standard output of the command, with any trailing newlines deleted. Embedded newlines are not deleted, but they may be removed during word splitting. The command substitution $(cat file) can be replaced by the equivalent but faster $(< file). " Testing indicates var=$(< file) is twice as fast as var=$(cat file). --- config/functions | 6 +++--- config/multithread | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/config/functions b/config/functions index af1020e884..2c5529b70f 100644 --- a/config/functions +++ b/config/functions @@ -1264,7 +1264,7 @@ pkg_lock() { # As we now have the lock, if .failed still exists then a previous process must have failed if [ -f "${THREAD_CONTROL}/locks/${pkg}.${task}.failed" ]; then - fail_seq="$(cat "${THREAD_CONTROL}/locks/${pkg}.${task}.failed")" + fail_seq="$(< "${THREAD_CONTROL}/locks/${pkg}.${task}.failed")" print_color CLR_ERROR "FAILURE: ${pkg}.${task}.failed exists, a previous dependency process has failed (seq: ${fail_seq})\n" if [ -d "${THREAD_CONTROL}/logs" ]; then cat <>"${THREAD_CONTROL}/status"; num=$((num + 1)); done - num=$(($(cat "${THREAD_CONTROL}/progress.prev") + 1)) + num=$(< "${THREAD_CONTROL}/progress.prev") projdevarch="${PROJECT}/" [ -n "${DEVICE}" ] && projdevarch+="${DEVICE}/" projdevarch+="${TARGET_ARCH}" TZ=UTC0 printf -v elapsed "%(%H:%M:%S)T" $(($(date +%s) - MTBUILDSTART)) - printf -v preamble "%s Dashboard (%s) - %d of %d jobs completed, %s elapsed" "${DISTRONAME}" "${projdevarch}" ${num} ${MTMAXJOBS} "${elapsed}" + printf -v preamble "%s Dashboard (%s) - %d of %d jobs completed, %s elapsed" "${DISTRONAME}" "${projdevarch}" $((num + 1)) ${MTMAXJOBS} "${elapsed}" printf -v preamble "%b%-105s %s" "\e[2J\e[0;0H" "${preamble//\//\\/}" "$(date "+%Y-%m-%d %H:%M:%S")" if [ "${DISABLE_COLORS}" != "yes" ]; then diff --git a/config/multithread b/config/multithread index cb96bfa574..902c6f5a83 100644 --- a/config/multithread +++ b/config/multithread @@ -107,8 +107,9 @@ package_worker() { ( flock --exclusive 95 [ ${result} -eq 0 ] && status="DONE" || status="FAIL" - num=$(($(cat "${THREAD_CONTROL}/progress") + 1)) + num=$(< "${THREAD_CONTROL}/progress") mv "${THREAD_CONTROL}/progress" "${THREAD_CONTROL}/progress.prev" + num=$((num + 1)) echo ${num} >"${THREAD_CONTROL}/progress" printf "[%0*d/%0*d] [%-4s] %-7s %s\n" ${#jobs} ${num} ${#jobs} ${jobs} "${status}" "${task}" "${pkgname}" >&2 ) 95>"${THREAD_CONTROL}/locks/.progress" From 0bd4793492e528e812709b1f0278e09cb8e100cd Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 29 May 2019 00:56:10 +0100 Subject: [PATCH 52/68] buildsystem: avoid process forks to init dashboard status file A typical image build will update the dashboard 3500-4500 times. This change avoids two process forks (cat, wc) per update, and the remaining $(< file) is faster than $(cat file). --- config/functions | 7 +++++-- config/multithread | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/config/functions b/config/functions index 2c5529b70f..85579cf4de 100644 --- a/config/functions +++ b/config/functions @@ -1322,8 +1322,11 @@ update_dashboard() { sedline=$((MTJOBID + 2)) - num=$(cat "${THREAD_CONTROL}/status" | wc -l) - while [ ${num} -lt ${sedline} ]; do echo "" >>"${THREAD_CONTROL}/status"; num=$((num + 1)); done + num=$(< "${THREAD_CONTROL}/status.max") + if [ ${num} -lt ${sedline} ]; then + echo ${sedline} >"${THREAD_CONTROL}/status.max" + for i in $(seq $((num + 1)) ${sedline}); do echo "" >>"${THREAD_CONTROL}/status"; done + fi num=$(< "${THREAD_CONTROL}/progress.prev") projdevarch="${PROJECT}/" diff --git a/config/multithread b/config/multithread index 902c6f5a83..ca389cddbe 100644 --- a/config/multithread +++ b/config/multithread @@ -144,6 +144,7 @@ start_multithread_build() { mkdir -p "${THREAD_CONTROL}/locks" echo -1 >"${THREAD_CONTROL}/progress.prev" echo 0 >"${THREAD_CONTROL}/progress" + echo 0 >"${THREAD_CONTROL}/status.max" touch "${THREAD_CONTROL}/status" [ "${THREADCOUNT}" = "0" ] && THREADCOUNT=1 From 08565fa0e3f6cf789de9538576a0b3f0c8efba7f Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 10 Jun 2019 17:51:09 +0100 Subject: [PATCH 53/68] xf86-video-nvidia: update to xf86-video-nvidia-430.14 --- .../x11/driver/xf86-video-nvidia/package.mk | 6 +- .../xf86-video-nvidia/udev.d/96-nvidia.rules | 70 ++++++------------- 2 files changed, 24 insertions(+), 52 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index a5871ce2a1..5291789e43 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -6,8 +6,8 @@ PKG_NAME="xf86-video-nvidia" # Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to # "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version. # Host may require installation of python-lxml and python-requests packages. -PKG_VERSION="410.104" -PKG_SHA256="0f4f61a742831d82a94457ff12c4583a6e17ace71e0e6ca794ee3ce0a0b9db32" +PKG_VERSION="430.14" +PKG_SHA256="0f583a277b1731cb8327510b75dba9cf7adf5c781247e4f48bcc9f358253278f" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" @@ -48,7 +48,7 @@ makeinstall_target() { cp -P libnvidia-glcore.so.$PKG_VERSION $INSTALL/usr/lib cp -P libnvidia-ml.so.$PKG_VERSION $INSTALL/usr/lib ln -sf /var/lib/libnvidia-ml.so.1 $INSTALL/usr/lib/libnvidia-ml.so.1 - cp -P tls/libnvidia-tls.so.$PKG_VERSION $INSTALL/usr/lib + cp -P libnvidia-tls.so.$PKG_VERSION $INSTALL/usr/lib # rename to not conflicting with Mesa libGL.so cp -P libGL.so.$PKG_VERSION $INSTALL/usr/lib/libGL_nvidia.so.1 diff --git a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules index 9d93888062..6cbab3badc 100644 --- a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules +++ b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules @@ -9,33 +9,11 @@ ATTRS{device}=="0x0fc2", GOTO="configure_nvidia" ATTRS{device}=="0x0fc6", GOTO="configure_nvidia" ATTRS{device}=="0x0fc8", GOTO="configure_nvidia" ATTRS{device}=="0x0fc9", GOTO="configure_nvidia" -ATTRS{device}=="0x0fcd", GOTO="configure_nvidia" -ATTRS{device}=="0x0fce", GOTO="configure_nvidia" -ATTRS{device}=="0x0fd1", GOTO="configure_nvidia" ATTRS{device}=="0x0fd2", GOTO="configure_nvidia" -ATTRS{device}=="0x0fd3", GOTO="configure_nvidia" -ATTRS{device}=="0x0fd4", GOTO="configure_nvidia" -ATTRS{device}=="0x0fd5", GOTO="configure_nvidia" -ATTRS{device}=="0x0fd8", GOTO="configure_nvidia" -ATTRS{device}=="0x0fd9", GOTO="configure_nvidia" -ATTRS{device}=="0x0fdf", GOTO="configure_nvidia" -ATTRS{device}=="0x0fe0", GOTO="configure_nvidia" -ATTRS{device}=="0x0fe1", GOTO="configure_nvidia" -ATTRS{device}=="0x0fe2", GOTO="configure_nvidia" ATTRS{device}=="0x0fe3", GOTO="configure_nvidia" -ATTRS{device}=="0x0fe4", GOTO="configure_nvidia" -ATTRS{device}=="0x0fe9", GOTO="configure_nvidia" -ATTRS{device}=="0x0fea", GOTO="configure_nvidia" -ATTRS{device}=="0x0fec", GOTO="configure_nvidia" -ATTRS{device}=="0x0fed", GOTO="configure_nvidia" -ATTRS{device}=="0x0fee", GOTO="configure_nvidia" ATTRS{device}=="0x0ff3", GOTO="configure_nvidia" -ATTRS{device}=="0x0ff6", GOTO="configure_nvidia" -ATTRS{device}=="0x0ff8", GOTO="configure_nvidia" ATTRS{device}=="0x0ff9", GOTO="configure_nvidia" ATTRS{device}=="0x0ffa", GOTO="configure_nvidia" -ATTRS{device}=="0x0ffb", GOTO="configure_nvidia" -ATTRS{device}=="0x0ffc", GOTO="configure_nvidia" ATTRS{device}=="0x0ffd", GOTO="configure_nvidia" ATTRS{device}=="0x0ffe", GOTO="configure_nvidia" ATTRS{device}=="0x0fff", GOTO="configure_nvidia" @@ -70,25 +48,9 @@ ATTRS{device}=="0x118f", GOTO="configure_nvidia" ATTRS{device}=="0x1193", GOTO="configure_nvidia" ATTRS{device}=="0x1194", GOTO="configure_nvidia" ATTRS{device}=="0x1195", GOTO="configure_nvidia" -ATTRS{device}=="0x1198", GOTO="configure_nvidia" ATTRS{device}=="0x1199", GOTO="configure_nvidia" -ATTRS{device}=="0x119a", GOTO="configure_nvidia" -ATTRS{device}=="0x119d", GOTO="configure_nvidia" -ATTRS{device}=="0x119e", GOTO="configure_nvidia" -ATTRS{device}=="0x119f", GOTO="configure_nvidia" -ATTRS{device}=="0x11a0", GOTO="configure_nvidia" -ATTRS{device}=="0x11a1", GOTO="configure_nvidia" -ATTRS{device}=="0x11a2", GOTO="configure_nvidia" -ATTRS{device}=="0x11a3", GOTO="configure_nvidia" -ATTRS{device}=="0x11a7", GOTO="configure_nvidia" ATTRS{device}=="0x11b4", GOTO="configure_nvidia" -ATTRS{device}=="0x11b6", GOTO="configure_nvidia" -ATTRS{device}=="0x11b7", GOTO="configure_nvidia" -ATTRS{device}=="0x11b8", GOTO="configure_nvidia" ATTRS{device}=="0x11ba", GOTO="configure_nvidia" -ATTRS{device}=="0x11bc", GOTO="configure_nvidia" -ATTRS{device}=="0x11bd", GOTO="configure_nvidia" -ATTRS{device}=="0x11be", GOTO="configure_nvidia" ATTRS{device}=="0x11c0", GOTO="configure_nvidia" ATTRS{device}=="0x11c2", GOTO="configure_nvidia" ATTRS{device}=="0x11c3", GOTO="configure_nvidia" @@ -97,12 +59,8 @@ ATTRS{device}=="0x11c5", GOTO="configure_nvidia" ATTRS{device}=="0x11c6", GOTO="configure_nvidia" ATTRS{device}=="0x11c8", GOTO="configure_nvidia" ATTRS{device}=="0x11cb", GOTO="configure_nvidia" -ATTRS{device}=="0x11e0", GOTO="configure_nvidia" -ATTRS{device}=="0x11e1", GOTO="configure_nvidia" -ATTRS{device}=="0x11e2", GOTO="configure_nvidia" ATTRS{device}=="0x11e3", GOTO="configure_nvidia" ATTRS{device}=="0x11fa", GOTO="configure_nvidia" -ATTRS{device}=="0x11fc", GOTO="configure_nvidia" ATTRS{device}=="0x1280", GOTO="configure_nvidia" ATTRS{device}=="0x1281", GOTO="configure_nvidia" ATTRS{device}=="0x1282", GOTO="configure_nvidia" @@ -113,16 +71,9 @@ ATTRS{device}=="0x1288", GOTO="configure_nvidia" ATTRS{device}=="0x1289", GOTO="configure_nvidia" ATTRS{device}=="0x128b", GOTO="configure_nvidia" ATTRS{device}=="0x1290", GOTO="configure_nvidia" -ATTRS{device}=="0x1291", GOTO="configure_nvidia" ATTRS{device}=="0x1292", GOTO="configure_nvidia" -ATTRS{device}=="0x1293", GOTO="configure_nvidia" ATTRS{device}=="0x1295", GOTO="configure_nvidia" -ATTRS{device}=="0x1296", GOTO="configure_nvidia" -ATTRS{device}=="0x1298", GOTO="configure_nvidia" ATTRS{device}=="0x1299", GOTO="configure_nvidia" -ATTRS{device}=="0x129a", GOTO="configure_nvidia" -ATTRS{device}=="0x12b9", GOTO="configure_nvidia" -ATTRS{device}=="0x12ba", GOTO="configure_nvidia" ATTRS{device}=="0x1340", GOTO="configure_nvidia" ATTRS{device}=="0x1341", GOTO="configure_nvidia" ATTRS{device}=="0x1344", GOTO="configure_nvidia" @@ -237,6 +188,7 @@ ATTRS{device}=="0x1c21", GOTO="configure_nvidia" ATTRS{device}=="0x1c22", GOTO="configure_nvidia" ATTRS{device}=="0x1c23", GOTO="configure_nvidia" ATTRS{device}=="0x1c30", GOTO="configure_nvidia" +ATTRS{device}=="0x1c31", GOTO="configure_nvidia" ATTRS{device}=="0x1c60", GOTO="configure_nvidia" ATTRS{device}=="0x1c61", GOTO="configure_nvidia" ATTRS{device}=="0x1c62", GOTO="configure_nvidia" @@ -246,6 +198,8 @@ ATTRS{device}=="0x1c83", GOTO="configure_nvidia" ATTRS{device}=="0x1c8c", GOTO="configure_nvidia" ATTRS{device}=="0x1c8d", GOTO="configure_nvidia" ATTRS{device}=="0x1c8f", GOTO="configure_nvidia" +ATTRS{device}=="0x1c90", GOTO="configure_nvidia" +ATTRS{device}=="0x1c91", GOTO="configure_nvidia" ATTRS{device}=="0x1c92", GOTO="configure_nvidia" ATTRS{device}=="0x1cb1", GOTO="configure_nvidia" ATTRS{device}=="0x1cb2", GOTO="configure_nvidia" @@ -254,10 +208,14 @@ ATTRS{device}=="0x1cb6", GOTO="configure_nvidia" ATTRS{device}=="0x1cba", GOTO="configure_nvidia" ATTRS{device}=="0x1cbb", GOTO="configure_nvidia" ATTRS{device}=="0x1cbc", GOTO="configure_nvidia" +ATTRS{device}=="0x1cbd", GOTO="configure_nvidia" ATTRS{device}=="0x1d01", GOTO="configure_nvidia" ATTRS{device}=="0x1d10", GOTO="configure_nvidia" +ATTRS{device}=="0x1d11", GOTO="configure_nvidia" ATTRS{device}=="0x1d12", GOTO="configure_nvidia" +ATTRS{device}=="0x1d13", GOTO="configure_nvidia" ATTRS{device}=="0x1d33", GOTO="configure_nvidia" +ATTRS{device}=="0x1d52", GOTO="configure_nvidia" ATTRS{device}=="0x1d81", GOTO="configure_nvidia" ATTRS{device}=="0x1db1", GOTO="configure_nvidia" ATTRS{device}=="0x1db3", GOTO="configure_nvidia" @@ -268,16 +226,30 @@ ATTRS{device}=="0x1db7", GOTO="configure_nvidia" ATTRS{device}=="0x1db8", GOTO="configure_nvidia" ATTRS{device}=="0x1dba", GOTO="configure_nvidia" ATTRS{device}=="0x1df5", GOTO="configure_nvidia" +ATTRS{device}=="0x1e02", GOTO="configure_nvidia" ATTRS{device}=="0x1e04", GOTO="configure_nvidia" ATTRS{device}=="0x1e07", GOTO="configure_nvidia" ATTRS{device}=="0x1e30", GOTO="configure_nvidia" ATTRS{device}=="0x1e82", GOTO="configure_nvidia" ATTRS{device}=="0x1e87", GOTO="configure_nvidia" +ATTRS{device}=="0x1e90", GOTO="configure_nvidia" ATTRS{device}=="0x1eb0", GOTO="configure_nvidia" ATTRS{device}=="0x1eb1", GOTO="configure_nvidia" ATTRS{device}=="0x1eb8", GOTO="configure_nvidia" +ATTRS{device}=="0x1ed0", GOTO="configure_nvidia" ATTRS{device}=="0x1f02", GOTO="configure_nvidia" ATTRS{device}=="0x1f07", GOTO="configure_nvidia" +ATTRS{device}=="0x1f08", GOTO="configure_nvidia" +ATTRS{device}=="0x1f10", GOTO="configure_nvidia" +ATTRS{device}=="0x1f11", GOTO="configure_nvidia" +ATTRS{device}=="0x1f50", GOTO="configure_nvidia" +ATTRS{device}=="0x1f51", GOTO="configure_nvidia" +ATTRS{device}=="0x1f82", GOTO="configure_nvidia" +ATTRS{device}=="0x1f91", GOTO="configure_nvidia" +ATTRS{device}=="0x2182", GOTO="configure_nvidia" +ATTRS{device}=="0x2184", GOTO="configure_nvidia" +ATTRS{device}=="0x2191", GOTO="configure_nvidia" +ATTRS{device}=="0x21d1", GOTO="configure_nvidia" GOTO="configure_nvidia-legacy" LABEL="configure_nvidia" From 5b5284cd6a6eb3aa3bb4b5ef0b8c65ea50c14ab9 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Mon, 6 May 2019 09:02:25 +0000 Subject: [PATCH 54/68] rpi: make update.sh and canupdate.sh part of project or device files Signed-off-by: Ian Leonard --- packages/tools/bcm2835-bootloader/package.mk | 3 ++- .../scripts => projects/RPi/bootloader}/update.sh | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename {packages/tools/bcm2835-bootloader/scripts => projects/RPi/bootloader}/update.sh (100%) diff --git a/packages/tools/bcm2835-bootloader/package.mk b/packages/tools/bcm2835-bootloader/package.mk index 972aca1e11..dd28f623a9 100644 --- a/packages/tools/bcm2835-bootloader/package.mk +++ b/packages/tools/bcm2835-bootloader/package.mk @@ -22,7 +22,8 @@ makeinstall_target() { find_file_path config/dt-blob.bin && cp -PRv $FOUND_PATH $INSTALL/usr/share/bootloader - cp -PRv $PKG_DIR/scripts/update.sh $INSTALL/usr/share/bootloader + find_file_path bootloader/update.sh && cp -PRv $FOUND_PATH $INSTALL/usr/share/bootloader + find_file_path bootloader/canupdate.sh && cp -PRv $FOUND_PATH $INSTALL/usr/share/bootloader find_file_path config/distroconfig.txt $PKG_DIR/files/3rdparty/bootloader/distroconfig.txt && cp -PRv ${FOUND_PATH} $INSTALL/usr/share/bootloader find_file_path config/config.txt $PKG_DIR/files/3rdparty/bootloader/config.txt && cp -PRv ${FOUND_PATH} $INSTALL/usr/share/bootloader diff --git a/packages/tools/bcm2835-bootloader/scripts/update.sh b/projects/RPi/bootloader/update.sh similarity index 100% rename from packages/tools/bcm2835-bootloader/scripts/update.sh rename to projects/RPi/bootloader/update.sh From 8ac3106fb61c57d0fbd7712bf1245b8badf838ef Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Wed, 8 May 2019 22:41:00 +0000 Subject: [PATCH 55/68] rpi: update.sh: drop leading spaces and misplaced comment Signed-off-by: Ian Leonard --- projects/RPi/bootloader/update.sh | 61 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/projects/RPi/bootloader/update.sh b/projects/RPi/bootloader/update.sh index ead9443504..b6bd085b06 100755 --- a/projects/RPi/bootloader/update.sh +++ b/projects/RPi/bootloader/update.sh @@ -7,46 +7,45 @@ [ -z "$SYSTEM_ROOT" ] && SYSTEM_ROOT="" # mount $BOOT_ROOT r/w - mount -o remount,rw $BOOT_ROOT +mount -o remount,rw $BOOT_ROOT # Something has gone horribly wrong... clean up - [ -s $BOOT_ROOT/overlays ] || rm -fr $BOOT_ROOT/overlays $BOOT_ROOT/FSCK*.REC +[ -s $BOOT_ROOT/overlays ] || rm -fr $BOOT_ROOT/overlays $BOOT_ROOT/FSCK*.REC # update bootloader files - cp -p $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT - cp -p $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT - cp -p $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT - cp -p $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT - [ -f $SYSTEM_ROOT/usr/share/bootloader/dt-blob.bin ] && cp -p $SYSTEM_ROOT/usr/share/bootloader/dt-blob.bin $BOOT_ROOT +cp -p $SYSTEM_ROOT/usr/share/bootloader/LICENCE* $BOOT_ROOT +cp -p $SYSTEM_ROOT/usr/share/bootloader/bootcode.bin $BOOT_ROOT +cp -p $SYSTEM_ROOT/usr/share/bootloader/fixup.dat $BOOT_ROOT +cp -p $SYSTEM_ROOT/usr/share/bootloader/start.elf $BOOT_ROOT +[ -f $SYSTEM_ROOT/usr/share/bootloader/dt-blob.bin ] && cp -p $SYSTEM_ROOT/usr/share/bootloader/dt-blob.bin $BOOT_ROOT - rm -f $BOOT_ROOT/bcm283*.dtb # cleanup excess dtb's used by upstream kernels (ie. not LE) - cp -p $SYSTEM_ROOT/usr/share/bootloader/*.dtb $BOOT_ROOT - cp -pR $SYSTEM_ROOT/usr/share/bootloader/overlays $BOOT_ROOT +rm -f $BOOT_ROOT/bcm283*.dtb # cleanup excess dtb's used by upstream kernels (ie. not LE) +cp -p $SYSTEM_ROOT/usr/share/bootloader/*.dtb $BOOT_ROOT +cp -pR $SYSTEM_ROOT/usr/share/bootloader/overlays $BOOT_ROOT -# cleanup not more needed files - rm -rf $BOOT_ROOT/loader.bin - rm -rf $BOOT_ROOT/fixup_x.dat - rm -rf $BOOT_ROOT/start_x.elf +# cleanup unneeded files +rm -rf $BOOT_ROOT/loader.bin +rm -rf $BOOT_ROOT/fixup_x.dat +rm -rf $BOOT_ROOT/start_x.elf # some config.txt magic - if [ ! -f $BOOT_ROOT/config.txt ]; then - cp -p $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT - elif [ -z "`grep "^[ ]*gpu_mem.*" $BOOT_ROOT/config.txt`" ]; then - mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk - cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \ +if [ ! -f $BOOT_ROOT/config.txt ]; then + cp -p $SYSTEM_ROOT/usr/share/bootloader/config.txt $BOOT_ROOT +elif [ -z "`grep "^[ ]*gpu_mem.*" $BOOT_ROOT/config.txt`" ]; then + mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk + cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \ $BOOT_ROOT/config.txt.bk > $BOOT_ROOT/config.txt -# else -# sed -e "s,gpu_mem=100,gpu_mem=128,g" -i $BOOT_ROOT/config.txt -# sed -e "s,gpu_mem_256=100,# gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt -# sed -e "s,gpu_mem_512=128,# gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt - # Add distribution specific extra configuration file for the bootloader - fi +#else +# sed -e "s,gpu_mem=100,gpu_mem=128,g" -i $BOOT_ROOT/config.txt +# sed -e "s,gpu_mem_256=100,# gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt +# sed -e "s,gpu_mem_512=128,# gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt +fi -# Add distro config file. - if [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then - cp -p $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT - fi +# Add distro config file +if [ -f $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt ]; then + cp -p $SYSTEM_ROOT/usr/share/bootloader/distroconfig.txt $BOOT_ROOT +fi # mount $BOOT_ROOT r/o - sync - mount -o remount,ro $BOOT_ROOT +sync +mount -o remount,ro $BOOT_ROOT From 235fb0c12bc61df9d6ebf2a5c7695371534b7cfe Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Wed, 8 May 2019 22:44:09 +0000 Subject: [PATCH 56/68] rpi: update.sh: drop code commented 5+ years Signed-off-by: Ian Leonard --- projects/RPi/bootloader/update.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/projects/RPi/bootloader/update.sh b/projects/RPi/bootloader/update.sh index b6bd085b06..058d357a9d 100755 --- a/projects/RPi/bootloader/update.sh +++ b/projects/RPi/bootloader/update.sh @@ -35,10 +35,6 @@ elif [ -z "`grep "^[ ]*gpu_mem.*" $BOOT_ROOT/config.txt`" ]; then mv $BOOT_ROOT/config.txt $BOOT_ROOT/config.txt.bk cat $SYSTEM_ROOT/usr/share/bootloader/config.txt \ $BOOT_ROOT/config.txt.bk > $BOOT_ROOT/config.txt -#else -# sed -e "s,gpu_mem=100,gpu_mem=128,g" -i $BOOT_ROOT/config.txt -# sed -e "s,gpu_mem_256=100,# gpu_mem_256=128,g" -i $BOOT_ROOT/config.txt -# sed -e "s,gpu_mem_512=128,# gpu_mem_512=128,g" -i $BOOT_ROOT/config.txt fi # Add distro config file From 08c38cb59aa3d98c9c4e2145f6f2747e7bbe5a5c Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 11 Jun 2019 16:54:14 +0100 Subject: [PATCH 57/68] LibreELEC-settings: update to LibreELEC-settings-f59dcc8 --- packages/mediacenter/LibreELEC-settings/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/mediacenter/LibreELEC-settings/package.mk b/packages/mediacenter/LibreELEC-settings/package.mk index c6e26498cc..d969d3edac 100644 --- a/packages/mediacenter/LibreELEC-settings/package.mk +++ b/packages/mediacenter/LibreELEC-settings/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="LibreELEC-settings" -PKG_VERSION="171142f0bfe5e0d875618b8b1f016c1355476691" -PKG_SHA256="03d6d79bf55c214f3e526de6f5b6a64f6bb3d7fe80869d93cc884ec92b3a2e62" +PKG_VERSION="f59dcc824fd8fe5b79c0a709a0c70676cc9ab3b1" +PKG_SHA256="0dcfa78f80386c0bcbf550ef0cb0e28a99e6aca1208ccb0664a5fccaff20d01e" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="https://github.com/LibreELEC/service.libreelec.settings/archive/$PKG_VERSION.tar.gz" From 54072e33c8c987b31906592b24dccd03ebd111d4 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 7 Jun 2019 17:46:37 +0100 Subject: [PATCH 58/68] openssl: update to openssl-1.1.1c --- packages/security/openssl/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/security/openssl/package.mk b/packages/security/openssl/package.mk index 497b134eeb..e8c4072f63 100644 --- a/packages/security/openssl/package.mk +++ b/packages/security/openssl/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="openssl" -PKG_VERSION="1.1.1b" -PKG_SHA256="5c557b023230413dfb0756f3137a13e6d726838ccd1430888ad15bfb2b43ea4b" +PKG_VERSION="1.1.1c" +PKG_SHA256="f6fb3079ad15076154eda9413fed42877d668e7069d9b87396d0804fdb3f4c90" PKG_LICENSE="BSD" PKG_SITE="https://www.openssl.org" PKG_URL="https://www.openssl.org/source/$PKG_NAME-$PKG_VERSION.tar.gz" From 6e69cd582fd07da286a715f3092358438f8b08b7 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Fri, 7 Jun 2019 16:43:38 +0100 Subject: [PATCH 59/68] heimdal: update to heimdal-7.7.0 --- packages/devel/heimdal/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/heimdal/package.mk b/packages/devel/heimdal/package.mk index f7f95b7d55..15f6dfd7d8 100644 --- a/packages/devel/heimdal/package.mk +++ b/packages/devel/heimdal/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="heimdal" -PKG_VERSION="7.6.0" -PKG_SHA256="25f7df36cf1305d64052e51b31a5ac57ba4fc51e3d99dcdca46ff63aea71ce98" +PKG_VERSION="7.7.0" +PKG_SHA256="f7d414d0914abb0e151a276b4de22cf4977fd6c28bd9ecdd990407b1138a945c" PKG_LICENSE="BSD-3c" PKG_SITE="http://www.h5l.org/" PKG_URL="https://github.com/heimdal/heimdal/archive/$PKG_NAME-$PKG_VERSION.tar.gz" From 0e5401939eb80fcf440c51f6e14933956eff2ac6 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 9 Jun 2019 20:24:31 +0100 Subject: [PATCH 60/68] config/functions: ln -sf is not always thread safe --- config/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/functions b/config/functions index 85579cf4de..9be3e921d9 100644 --- a/config/functions +++ b/config/functions @@ -1192,7 +1192,7 @@ add_user() { mkdir -p ${INSTALL}/usr/cache touch ${INSTALL}/usr/cache/shadow - ln -sf /storage/.cache/shadow ${INSTALL}/etc/shadow + ln -sf /storage/.cache/shadow ${INSTALL}/etc/shadow 2>/dev/null || true PASSWORD="$2" if [ "$PASSWORD" = "x" ]; then From abc9d658a2048a87508356d6a058165908703777 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 10 Jun 2019 17:43:42 +0100 Subject: [PATCH 61/68] xf86-video-nvidia: update to xf86-video-nvidia-430.26 --- packages/x11/driver/xf86-video-nvidia/package.mk | 4 ++-- .../x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/x11/driver/xf86-video-nvidia/package.mk b/packages/x11/driver/xf86-video-nvidia/package.mk index 5291789e43..6705b14cfd 100644 --- a/packages/x11/driver/xf86-video-nvidia/package.mk +++ b/packages/x11/driver/xf86-video-nvidia/package.mk @@ -6,8 +6,8 @@ PKG_NAME="xf86-video-nvidia" # Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to # "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version. # Host may require installation of python-lxml and python-requests packages. -PKG_VERSION="430.14" -PKG_SHA256="0f583a277b1731cb8327510b75dba9cf7adf5c781247e4f48bcc9f358253278f" +PKG_VERSION="430.26" +PKG_SHA256="a7dfb1bdd7591f42bbe501b8a9a80349415bdb51723db3cd11b08ce2e2d4679c" PKG_ARCH="x86_64" PKG_LICENSE="nonfree" PKG_SITE="http://www.nvidia.com/" diff --git a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules index 6cbab3badc..7ac42c7f3d 100644 --- a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules +++ b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules @@ -215,6 +215,7 @@ ATTRS{device}=="0x1d11", GOTO="configure_nvidia" ATTRS{device}=="0x1d12", GOTO="configure_nvidia" ATTRS{device}=="0x1d13", GOTO="configure_nvidia" ATTRS{device}=="0x1d33", GOTO="configure_nvidia" +ATTRS{device}=="0x1d34", GOTO="configure_nvidia" ATTRS{device}=="0x1d52", GOTO="configure_nvidia" ATTRS{device}=="0x1d81", GOTO="configure_nvidia" ATTRS{device}=="0x1db1", GOTO="configure_nvidia" @@ -235,6 +236,8 @@ ATTRS{device}=="0x1e87", GOTO="configure_nvidia" ATTRS{device}=="0x1e90", GOTO="configure_nvidia" ATTRS{device}=="0x1eb0", GOTO="configure_nvidia" ATTRS{device}=="0x1eb1", GOTO="configure_nvidia" +ATTRS{device}=="0x1eb5", GOTO="configure_nvidia" +ATTRS{device}=="0x1eb6", GOTO="configure_nvidia" ATTRS{device}=="0x1eb8", GOTO="configure_nvidia" ATTRS{device}=="0x1ed0", GOTO="configure_nvidia" ATTRS{device}=="0x1f02", GOTO="configure_nvidia" @@ -242,10 +245,13 @@ ATTRS{device}=="0x1f07", GOTO="configure_nvidia" ATTRS{device}=="0x1f08", GOTO="configure_nvidia" ATTRS{device}=="0x1f10", GOTO="configure_nvidia" ATTRS{device}=="0x1f11", GOTO="configure_nvidia" +ATTRS{device}=="0x1f36", GOTO="configure_nvidia" ATTRS{device}=="0x1f50", GOTO="configure_nvidia" ATTRS{device}=="0x1f51", GOTO="configure_nvidia" ATTRS{device}=="0x1f82", GOTO="configure_nvidia" ATTRS{device}=="0x1f91", GOTO="configure_nvidia" +ATTRS{device}=="0x1fb8", GOTO="configure_nvidia" +ATTRS{device}=="0x1fb9", GOTO="configure_nvidia" ATTRS{device}=="0x2182", GOTO="configure_nvidia" ATTRS{device}=="0x2184", GOTO="configure_nvidia" ATTRS{device}=="0x2191", GOTO="configure_nvidia" From 8bfb08e5559b476d57a5a6788b51e5d26a002a2f Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Sun, 21 Apr 2019 10:41:04 -0700 Subject: [PATCH 62/68] procps-ng: build and install libprocps.a --- packages/tools/procps-ng/package.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index dfff4919c7..dc7931cb8c 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -9,6 +9,7 @@ PKG_SITE="https://gitlab.com/procps-ng/procps" PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/Production/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain ncurses" PKG_LONGDESC="Command line and full screen utilities for browsing procfs." +PKG_BUILD_FLAGS="+pic" PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ ac_cv_func_realloc_0_nonnull=yes \ @@ -16,7 +17,13 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-modern-top \ --enable-static" +PKG_MAKE_OPTS_TARGET="top/top proc/libprocps.la proc/libprocps.pc" + +PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA" + makeinstall_target() { mkdir -p $INSTALL/usr/bin cp -P $PKG_BUILD/.$TARGET_NAME/top/top $INSTALL/usr/bin + + make DESTDIR=$SYSROOT_PREFIX -j1 $PKG_MAKEINSTALL_OPTS_TARGET } From d7fc0eb6f09908db8f3e658b9c402ab1827d8754 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Mon, 10 Jun 2019 21:44:02 +0100 Subject: [PATCH 63/68] procps-ng: free from busybox doesn't match top --- packages/sysutils/busybox/config/busybox-target.conf | 2 +- packages/tools/procps-ng/package.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf index 335cdc181c..354d2593e9 100644 --- a/packages/sysutils/busybox/config/busybox-target.conf +++ b/packages/sysutils/busybox/config/busybox-target.conf @@ -1007,7 +1007,7 @@ CONFIG_FEATURE_MIME_CHARSET="" # # Process Utilities # -CONFIG_FREE=y +# CONFIG_FREE is not set CONFIG_FUSER=y CONFIG_IOSTAT=y CONFIG_KILL=y diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index dc7931cb8c..4794eaa43a 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -17,12 +17,13 @@ PKG_CONFIGURE_OPTS_TARGET="ac_cv_func_malloc_0_nonnull=yes \ --disable-modern-top \ --enable-static" -PKG_MAKE_OPTS_TARGET="top/top proc/libprocps.la proc/libprocps.pc" +PKG_MAKE_OPTS_TARGET="free top/top proc/libprocps.la proc/libprocps.pc" PKG_MAKEINSTALL_OPTS_TARGET="install-libLTLIBRARIES install-pkgconfigDATA" makeinstall_target() { mkdir -p $INSTALL/usr/bin + cp -P $PKG_BUILD/.$TARGET_NAME/free $INSTALL/usr/bin cp -P $PKG_BUILD/.$TARGET_NAME/top/top $INSTALL/usr/bin make DESTDIR=$SYSROOT_PREFIX -j1 $PKG_MAKEINSTALL_OPTS_TARGET From fb0007845a3f1f0f47e06a2a377ee16ca3385db2 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 13 Jun 2019 14:58:01 +0100 Subject: [PATCH 64/68] packages: mega bump --- packages/audio/alsa-lib/package.mk | 4 +- packages/audio/alsa-utils/package.mk | 4 +- packages/audio/libmodplug/package.mk | 5 +- packages/audio/libopenmpt/package.mk | 4 +- packages/audio/libsamplerate/package.mk | 5 +- packages/audio/rpi-cirrus-config/package.mk | 4 +- packages/audio/sbc/package.mk | 5 +- packages/compress/lz4/package.mk | 4 +- packages/compress/minizip/package.mk | 4 +- .../databases/mariadb-connector-c/package.mk | 4 +- packages/devel/cmake/package.mk | 4 +- packages/devel/flatbuffers/package.mk | 4 +- packages/devel/fribidi/package.mk | 4 +- packages/devel/glib/package.mk | 4 +- packages/devel/libcap/package.mk | 4 +- packages/devel/swig/package.mk | 9 +- packages/graphics/glew/package.mk | 5 +- packages/graphics/glm/package.mk | 4 +- packages/graphics/libepoxy/package.mk | 4 +- packages/graphics/libraw/package.mk | 8 +- .../patches/libraw-01-fix-glibc-2.27.patch | 340 ------------------ packages/lang/Python2/package.mk | 4 +- packages/lang/Python3/package.mk | 4 +- packages/multimedia/SDL2/package.mk | 4 +- packages/multimedia/dav1d/package.mk | 4 +- .../multimedia/intel-vaapi-driver/package.mk | 1 - packages/network/ethtool/package.mk | 5 +- packages/network/iptables/package.mk | 4 +- ...-0001-fix-build-with-pre-4.2-kernels.patch | 52 --- packages/network/libnftnl/package.mk | 4 +- packages/network/libssh/package.mk | 4 +- packages/network/libtirpc/package.mk | 5 +- ...btirpc-0001-include-missing-stdint.h.patch | 11 - packages/network/openvpn/package.mk | 4 +- packages/network/wpa_supplicant/package.mk | 21 +- ...d-key-reinstallation-in-FT-handshake.patch | 174 --------- ...lation-of-an-already-in-use-group-ke.patch | 250 ------------- ...n-of-GTK-IGTK-reinstallation-of-WNM-.patch | 184 ---------- ...event-installation-of-an-all-zero-TK.patch | 79 ---- ...TK-rekeying-to-generate-a-new-ANonce.patch | 64 ---- ...k-TDLS-Reject-TPK-TK-reconfiguration.patch | 132 ------- ...leep-Mode-Response-without-pending-r.patch | 43 --- ...multiple-Reassociation-Response-fram.patch | 82 ----- ...thenticated-encrypted-EAPOL-Key-data.patch | 44 --- packages/print/freetype/package.mk | 4 +- packages/python/devel/Mako/package.mk | 4 +- packages/python/graphics/Pillow/package.mk | 5 +- .../patches/Pillow-0001-crosscompiling.patch | 10 +- .../python/security/pycryptodome/package.mk | 4 +- packages/python/system/simplejson/package.mk | 5 +- packages/security/libgpg-error/package.mk | 4 +- packages/sysutils/busybox/package.mk | 4 +- packages/sysutils/dbus/package.mk | 9 +- packages/sysutils/e2fsprogs/package.mk | 59 ++- packages/sysutils/fuse-exfat/package.mk | 5 +- packages/sysutils/fuse/package.mk | 5 +- packages/sysutils/keyutils/package.mk | 5 +- packages/sysutils/libevdev/package.mk | 5 +- packages/sysutils/lirc/package.mk | 4 +- packages/sysutils/open-vm-tools/package.mk | 5 +- packages/sysutils/pciutils/package.mk | 5 +- packages/sysutils/tz/package.mk | 4 +- packages/sysutils/util-linux/package.mk | 4 +- packages/textproc/jsoncpp/package.mk | 5 +- packages/textproc/libxml2/package.mk | 4 +- packages/textproc/libxslt/package.mk | 4 +- packages/tools/hdparm/package.mk | 4 +- packages/tools/mtools/package.mk | 4 +- ...s-01-fix-creation-of-dot-directories.patch | 11 - packages/tools/newt/package.mk | 4 +- packages/tools/procps-ng/package.mk | 4 +- packages/web/curl/package.mk | 4 +- packages/web/libmicrohttpd/package.mk | 4 +- ...pd-001-remove-extra-unescape-PR14991.patch | 15 - packages/web/nghttp2/package.mk | 4 +- packages/x11/lib/libXcomposite/package.mk | 4 +- packages/x11/lib/libXdamage/package.mk | 4 +- packages/x11/lib/libXext/package.mk | 4 +- packages/x11/lib/libXmu/package.mk | 4 +- packages/x11/lib/libXrandr/package.mk | 4 +- packages/x11/lib/libxkbfile/package.mk | 4 +- packages/x11/lib/xtrans/package.mk | 5 +- packages/x11/xserver/xorg-server/package.mk | 4 +- 83 files changed, 193 insertions(+), 1669 deletions(-) delete mode 100644 packages/graphics/libraw/patches/libraw-01-fix-glibc-2.27.patch delete mode 100644 packages/network/iptables/patches/iptables-0001-fix-build-with-pre-4.2-kernels.patch delete mode 100644 packages/network/libtirpc/patches/libtirpc-0001-include-missing-stdint.h.patch delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-001-krack-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-002-krack-Prevent-reinstallation-of-an-already-in-use-group-ke.patch delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-003-krack-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-004-krack-Prevent-installation-of-an-all-zero-TK.patch delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-005-krack-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-006-krack-TDLS-Reject-TPK-TK-reconfiguration.patch delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-007-krack-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-008-krack-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch delete mode 100644 packages/network/wpa_supplicant/patches/wpa_supplicant-100-EAPOL-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch delete mode 100644 packages/tools/mtools/patches/mtools-01-fix-creation-of-dot-directories.patch delete mode 100644 packages/web/libmicrohttpd/patches/libmicrohttpd-001-remove-extra-unescape-PR14991.patch diff --git a/packages/audio/alsa-lib/package.mk b/packages/audio/alsa-lib/package.mk index e32803a049..248a0fab27 100644 --- a/packages/audio/alsa-lib/package.mk +++ b/packages/audio/alsa-lib/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="alsa-lib" -PKG_VERSION="1.1.8" -PKG_SHA256="3cdc3a93a6427a26d8efab4ada2152e64dd89140d981f6ffa003e85be707aedf" +PKG_VERSION="1.1.9" +PKG_SHA256="488373aef5396682f3a411a6d064ae0ad196b9c96269d0bb912fbdeec94b994b" PKG_LICENSE="GPL" PKG_SITE="http://www.alsa-project.org/" PKG_URL="ftp://ftp.alsa-project.org/pub/lib/alsa-lib-$PKG_VERSION.tar.bz2" diff --git a/packages/audio/alsa-utils/package.mk b/packages/audio/alsa-utils/package.mk index c123f219af..7edc9ce9c8 100644 --- a/packages/audio/alsa-utils/package.mk +++ b/packages/audio/alsa-utils/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="alsa-utils" -PKG_VERSION="1.1.8" -PKG_SHA256="fd9bf528922b3829a91913b89a1858c58a0b24271a7b5f529923aa9ea12fa4cf" +PKG_VERSION="1.1.9" +PKG_SHA256="5ddf2cbddb4bd1a4a2a6492a09c25898b08c3ad64893c3655be14194cf0a213a" PKG_LICENSE="GPL" PKG_SITE="http://www.alsa-project.org/" PKG_URL="ftp://ftp.alsa-project.org/pub/utils/alsa-utils-$PKG_VERSION.tar.bz2" diff --git a/packages/audio/libmodplug/package.mk b/packages/audio/libmodplug/package.mk index e93f82fbc6..ee45fd2725 100644 --- a/packages/audio/libmodplug/package.mk +++ b/packages/audio/libmodplug/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libmodplug" -PKG_VERSION="0.8.8.5" -PKG_SHA256="77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad" +PKG_VERSION="0.8.9.0" +PKG_SHA256="457ca5a6c179656d66c01505c0d95fafaead4329b9dbaa0f997d00a3508ad9de" PKG_LICENSE="GPL" PKG_SITE="http://modplug-xmms.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/modplug-xmms/libmodplug/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/audio/libopenmpt/package.mk b/packages/audio/libopenmpt/package.mk index af38eb6167..ad458e64f5 100644 --- a/packages/audio/libopenmpt/package.mk +++ b/packages/audio/libopenmpt/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libopenmpt" -PKG_VERSION="0.3.1" -PKG_SHA256="6fc5614926edd523d5585e40fdaf0b2ea08689d4dc91de49511d02503744cbb5" +PKG_VERSION="0.4.5" +PKG_SHA256="0b4cc0cc8fbbdabc6263a900ff3560dae7be43be011b6f2bc9913f7a0ed3a521" PKG_LICENSE="BSD" PKG_SITE="http://lib.openmpt.org/libopenmpt/" PKG_URL="http://lib.openmpt.org/files/libopenmpt/src/${PKG_NAME}-${PKG_VERSION}+release.autotools.tar.gz" diff --git a/packages/audio/libsamplerate/package.mk b/packages/audio/libsamplerate/package.mk index 4f42bd3ec3..75194dc676 100644 --- a/packages/audio/libsamplerate/package.mk +++ b/packages/audio/libsamplerate/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libsamplerate" -PKG_VERSION="0.1.8" -PKG_SHA256="93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06" +PKG_VERSION="0.1.9" +PKG_SHA256="0a7eb168e2f21353fb6d84da152e4512126f7dc48ccb0be80578c565413444c1" PKG_LICENSE="GPL" PKG_SITE="http://www.mega-nerd.com/SRC/" PKG_URL="http://www.mega-nerd.com/SRC/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/audio/rpi-cirrus-config/package.mk b/packages/audio/rpi-cirrus-config/package.mk index dd69847f2a..d775489fdb 100644 --- a/packages/audio/rpi-cirrus-config/package.mk +++ b/packages/audio/rpi-cirrus-config/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="rpi-cirrus-config" -PKG_VERSION="0.0.1" -PKG_SHA256="a2a580d9738aaf4e901d8215cedd1df5d95b1e057165cfd9b72335e0dc6c40e4" +PKG_VERSION="0.0.2" +PKG_SHA256="cc11c47f1f2b6d5e72dcdea828ba57e0dcaf74161f675a4a9f395054f5d82d31" PKG_LICENSE="GPL" PKG_SITE="https://github.com/HiassofT/rpi-cirrus-config" PKG_URL="https://github.com/HiassofT/rpi-cirrus-config/archive/$PKG_VERSION.tar.gz" diff --git a/packages/audio/sbc/package.mk b/packages/audio/sbc/package.mk index 7f286512e5..0735e4938b 100644 --- a/packages/audio/sbc/package.mk +++ b/packages/audio/sbc/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="sbc" -PKG_VERSION="1.3" -PKG_SHA256="4a358581fb57b98e0c1c34606a35343f31f908f57c26659e51495f75e283785d" +PKG_VERSION="1.4" +PKG_SHA256="050058cfc5a2709d324868ddbb82f9b796ba6c4f5e00cb6a715b3841ee13dfe9" PKG_LICENSE="GPL" PKG_SITE="http://www.bluez.org/" PKG_URL="http://www.kernel.org/pub/linux/bluetooth/sbc-$PKG_VERSION.tar.gz" diff --git a/packages/compress/lz4/package.mk b/packages/compress/lz4/package.mk index 2ea86a2775..02f935da31 100644 --- a/packages/compress/lz4/package.mk +++ b/packages/compress/lz4/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="lz4" -PKG_VERSION="1.8.2" -PKG_SHA256="0963fbe9ee90acd1d15e9f09e826eaaf8ea0312e854803caf2db0a6dd40f4464" +PKG_VERSION="1.9.1" +PKG_SHA256="f8377c89dad5c9f266edc0be9b73595296ecafd5bfa1000de148096c50052dc4" PKG_LICENSE="GPL" PKG_SITE="https://github.com/lz4/lz4" PKG_URL="https://github.com/lz4/lz4/archive/v$PKG_VERSION.tar.gz" diff --git a/packages/compress/minizip/package.mk b/packages/compress/minizip/package.mk index 0fbe9b9d13..e9e6a4c307 100644 --- a/packages/compress/minizip/package.mk +++ b/packages/compress/minizip/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="minizip" -PKG_VERSION="1.1" -PKG_SHA256="5666b5ee3e85dfd2dd119970613c12e6267d31813f07d3ffa5d359fe272cb6d1" +PKG_VERSION="2.8.8" +PKG_SHA256="a551063636ae4f989baefc6a20870f5b28246052a372a2ce124ebf3f66018db0" PKG_LICENSE="zlib" PKG_SITE="https://github.com/nmoinvaz/minizip" PKG_URL="https://github.com/nmoinvaz/minizip/archive/$PKG_VERSION.tar.gz" diff --git a/packages/databases/mariadb-connector-c/package.mk b/packages/databases/mariadb-connector-c/package.mk index 7368858a50..f191780f68 100644 --- a/packages/databases/mariadb-connector-c/package.mk +++ b/packages/databases/mariadb-connector-c/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mariadb-connector-c" -PKG_VERSION="3.0.6" -PKG_SHA256="46181f8c95c096ac1aa6cb0ca80f4ed0e746873cfd6af84f3bac925d7e2cd091" +PKG_VERSION="3.1.0" +PKG_SHA256="feb82b124fd492264a07ca9618bf68d65487ec4a39c8375015f6b0f58c0ab17c" PKG_LICENSE="LGPL" PKG_SITE="https://mariadb.org/" PKG_URL="https://github.com/MariaDB/mariadb-connector-c/archive/v$PKG_VERSION.tar.gz" diff --git a/packages/devel/cmake/package.mk b/packages/devel/cmake/package.mk index 2df4e0c99e..1002dace46 100644 --- a/packages/devel/cmake/package.mk +++ b/packages/devel/cmake/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="cmake" -PKG_VERSION="3.14.3" -PKG_SHA256="215d0b64e81307182b29b63e562edf30b3875b834efdad09b3fcb5a7d2f4b632" +PKG_VERSION="3.14.5" +PKG_SHA256="505ae49ebe3c63c595fa5f814975d8b72848447ee13b6613b0f8b96ebda18c06" PKG_LICENSE="BSD" PKG_SITE="http://www.cmake.org/" PKG_URL="http://www.cmake.org/files/v${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/devel/flatbuffers/package.mk b/packages/devel/flatbuffers/package.mk index 083b3f4070..4f4224c052 100644 --- a/packages/devel/flatbuffers/package.mk +++ b/packages/devel/flatbuffers/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="flatbuffers" -PKG_VERSION="1.10.0" -PKG_SHA256="3714e3db8c51e43028e10ad7adffb9a36fc4aa5b1a363c2d0c4303dd1be59a7c" +PKG_VERSION="1.11.0" +PKG_SHA256="3f4a286642094f45b1b77228656fbd7ea123964f19502f9ecfd29933fd23a50b" PKG_LICENSE="Apache-2.0" PKG_SITE="https://github.com/google/flatbuffers" PKG_URL="https://github.com/google/flatbuffers/archive/v$PKG_VERSION.tar.gz" diff --git a/packages/devel/fribidi/package.mk b/packages/devel/fribidi/package.mk index 8079ea2651..737ae29db7 100644 --- a/packages/devel/fribidi/package.mk +++ b/packages/devel/fribidi/package.mk @@ -18,9 +18,7 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ --disable-debug \ --disable-deprecated \ --disable-silent-rules \ - --enable-charsets \ - --with-gnu-ld \ - --without-glib" + --with-gnu-ld" pre_configure_target() { export CFLAGS="$CFLAGS -DFRIBIDI_CHUNK_SIZE=4080" diff --git a/packages/devel/glib/package.mk b/packages/devel/glib/package.mk index 22bc2a7d7c..d557cb1b31 100644 --- a/packages/devel/glib/package.mk +++ b/packages/devel/glib/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glib" -PKG_VERSION="2.59.3" -PKG_SHA256="dfefafbc37bbcfb8101f3f181f880e8b7a8bee48620c92869ec4ef1d3d648e5e" +PKG_VERSION="2.61.1" +PKG_SHA256="f8d827955f0d8e197ff5c2105dd6ac4f6b63d15cd021eb1de66534c92a762161" PKG_LICENSE="LGPL" PKG_SITE="http://www.gtk.org/" PKG_URL="http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/devel/libcap/package.mk b/packages/devel/libcap/package.mk index c922947c0c..ea2c10d5fe 100644 --- a/packages/devel/libcap/package.mk +++ b/packages/devel/libcap/package.mk @@ -4,8 +4,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libcap" -PKG_VERSION="2.26" -PKG_SHA256="b630b7c484271b3ba867680d6a14b10a86cfa67247a14631b14c06731d5a458b" +PKG_VERSION="2.27" +PKG_SHA256="dac1792d0118bee6aae6ba7fb93ff1602c6a9bda812fd63916eee1435b9c486a" PKG_LICENSE="GPL" PKG_SITE="" PKG_URL="http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/devel/swig/package.mk b/packages/devel/swig/package.mk index 14850898ed..e8f0fde297 100644 --- a/packages/devel/swig/package.mk +++ b/packages/devel/swig/package.mk @@ -1,16 +1,17 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="swig" -PKG_VERSION="3.0.12" -PKG_SHA256="7cf9f447ae7ed1c51722efc45e7f14418d15d7a1e143ac9f09a668999f4fc94d" +PKG_VERSION="4.0.0" +PKG_SHA256="e8a39cd6437e342cdcbd5af27a9bf11b62dc9efec9248065debcb8276fcbb925" PKG_LICENSE="GPL" PKG_SITE="http://www.swig.org" PKG_URL="$SOURCEFORGE_SRC/swig/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_DEPENDS_HOST="ccache:host" PKG_LONGDESC="SWIG is a software development tool that connects programs written in C and C++ with a variety of high-level programming languages." -PKG_CONFIGURE_OPTS_HOST="--program-suffix=3.0 \ +PKG_CONFIGURE_OPTS_HOST="--program-suffix=4.0 \ --with-pcre-prefix=$TOOLCHAIN \ --with-boost=no \ --without-pcre \ @@ -39,5 +40,5 @@ PKG_CONFIGURE_OPTS_HOST="--program-suffix=3.0 \ --without-d" post_makeinstall_host() { - ln -sf swig3.0 $TOOLCHAIN/bin/swig + ln -sf swig4.0 $TOOLCHAIN/bin/swig } diff --git a/packages/graphics/glew/package.mk b/packages/graphics/glew/package.mk index 7d3c3593fc..31d5a68a03 100644 --- a/packages/graphics/glew/package.mk +++ b/packages/graphics/glew/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glew" -PKG_VERSION="1.13.0" -PKG_SHA256="aa25dc48ed84b0b64b8d41cdd42c8f40f149c37fa2ffa39cd97f42c78d128bc7" +PKG_VERSION="2.1.0" +PKG_SHA256="04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95" PKG_LICENSE="BSD" PKG_SITE="http://glew.sourceforge.net/" PKG_URL="$SOURCEFORGE_SRC/glew/glew/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tgz" diff --git a/packages/graphics/glm/package.mk b/packages/graphics/glm/package.mk index fb6b0e8449..11a95d2c0a 100644 --- a/packages/graphics/glm/package.mk +++ b/packages/graphics/glm/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="glm" -PKG_VERSION="0.9.9.2" -PKG_SHA256="209b5943d393925e1a6ecb6734e7507b8f6add25e72a605b25d0d0d382e64fd4" +PKG_VERSION="0.9.9.5" +PKG_SHA256="4fe34860ce69156f63eea6c3d84c91cadfc330353cf275ff394aef4e163cafee" PKG_LICENSE="MIT" PKG_SITE="https://glm.g-truc.net/" PKG_URL="https://github.com/g-truc/glm/releases/download/$PKG_VERSION/glm-$PKG_VERSION.zip" diff --git a/packages/graphics/libepoxy/package.mk b/packages/graphics/libepoxy/package.mk index a8f0036a1c..1b3a2714da 100644 --- a/packages/graphics/libepoxy/package.mk +++ b/packages/graphics/libepoxy/package.mk @@ -8,8 +8,8 @@ # in Xorg.log PKG_NAME="libepoxy" -PKG_VERSION="1.5.2" -PKG_SHA256="a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8" +PKG_VERSION="1.5.3" +PKG_SHA256="002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d" PKG_LICENSE="GPL" PKG_SITE="https://github.com/anholt/libepoxy" PKG_URL="https://github.com/anholt/libepoxy/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/graphics/libraw/package.mk b/packages/graphics/libraw/package.mk index c01574a623..5aab45ec02 100644 --- a/packages/graphics/libraw/package.mk +++ b/packages/graphics/libraw/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libraw" -PKG_VERSION="0.18.7" -PKG_SHA256="87e347c261a8e87935d9a23afd750d27676b99f540e8552314d40db0ea315771" +PKG_VERSION="0.19.2" +PKG_SHA256="400d47969292291d297873a06fb0535ccce70728117463927ddd9452aa849644" PKG_LICENSE="LGPL" PKG_SITE="http://www.libraw.org/" PKG_URL="http://www.libraw.org/data/LibRaw-$PKG_VERSION.tar.gz" @@ -17,6 +17,4 @@ PKG_CONFIGURE_OPTS_TARGET="--enable-static \ --enable-jpeg \ --disable-jasper \ --disable-lcms \ - --disable-examples \ - --disable-demosaic-pack-gpl2 \ - --disable-demosaic-pack-gpl3" + --disable-examples" diff --git a/packages/graphics/libraw/patches/libraw-01-fix-glibc-2.27.patch b/packages/graphics/libraw/patches/libraw-01-fix-glibc-2.27.patch deleted file mode 100644 index 8e289fcd58..0000000000 --- a/packages/graphics/libraw/patches/libraw-01-fix-glibc-2.27.patch +++ /dev/null @@ -1,340 +0,0 @@ -From 158398653a14e8b5884d744ec711ba31a8ceafdc Mon Sep 17 00:00:00 2001 -From: Alex Tutubalin -Date: Fri, 2 Feb 2018 08:31:47 +0300 -Subject: [PATCH] powf64=>libraw_powf64 - ---- - internal/dcraw_common.cpp | 98 +++++++++++++++++++++++------------------------ - 2 files changed, 98 insertions(+), 98 deletions(-) - -diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp -index a9b45db0..66eb08e4 100644 ---- a/internal/dcraw_common.cpp -+++ b/internal/dcraw_common.cpp -@@ -5849,7 +5849,7 @@ static float powf_lim(float a, float b, float limup) - { - return (b>limup || b < -limup)?0.f:powf(a,b); - } --static float powf64(float a, float b) -+static float libraw_powf64(float a, float b) - { - return powf_lim(a,b,64.f); - } -@@ -5873,7 +5873,7 @@ static float my_roundf(float x) { - static float _CanonConvertAperture(ushort in) - { - if ((in == (ushort)0xffe0) || (in == (ushort)0x7fff)) return 0.0f; -- return powf64(2.0, in/64.0); -+ return libraw_powf64(2.0, in/64.0); - } - - static float _CanonConvertEV (short in) -@@ -6336,21 +6336,21 @@ void CLASS processNikonLensData (uchar *LensData, unsigned len) - if (fabsf(imgdata.lens.makernotes.MinFocal) < 1.1f) - { - if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 2]) -- imgdata.lens.makernotes.MinFocal = 5.0f * powf64(2.0f, (float)LensData[i + 2] / 24.0f); -+ imgdata.lens.makernotes.MinFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i + 2] / 24.0f); - if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 3]) -- imgdata.lens.makernotes.MaxFocal = 5.0f * powf64(2.0f, (float)LensData[i + 3] / 24.0f); -+ imgdata.lens.makernotes.MaxFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i + 3] / 24.0f); - if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 4]) -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(2.0f, (float)LensData[i + 4] / 24.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(2.0f, (float)LensData[i + 4] / 24.0f); - if ((imgdata.lens.nikon.NikonLensType ^ (uchar)0x01) || LensData[i + 5]) -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(2.0f, (float)LensData[i + 5] / 24.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(2.0f, (float)LensData[i + 5] / 24.0f); - } - imgdata.lens.nikon.NikonMCUVersion = LensData[i + 6]; - if (i != 2) - { - if ((LensData[i - 1]) && - (fabsf(imgdata.lens.makernotes.CurFocal) < 1.1f)) -- imgdata.lens.makernotes.CurFocal = 5.0f * powf64(2.0f, (float)LensData[i - 1] / 24.0f); -- if (LensData[i + 7]) imgdata.lens.nikon.NikonEffectiveMaxAp = powf64(2.0f, (float)LensData[i + 7] / 24.0f); -+ imgdata.lens.makernotes.CurFocal = 5.0f * libraw_powf64(2.0f, (float)LensData[i - 1] / 24.0f); -+ if (LensData[i + 7]) imgdata.lens.nikon.NikonEffectiveMaxAp = libraw_powf64(2.0f, (float)LensData[i + 7] / 24.0f); - } - imgdata.lens.makernotes.LensID = - (unsigned long long) LensData[i] << 56 | -@@ -6827,13 +6827,13 @@ void CLASS PentaxLensInfo (unsigned id, unsigned len) // tag 0x0207 - if (table_buf[iLensData+9] && - (fabs(imgdata.lens.makernotes.CurFocal) < 0.1f)) - imgdata.lens.makernotes.CurFocal = -- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2); -+ 10*(table_buf[iLensData+9]>>2) * libraw_powf64(4, (table_buf[iLensData+9] & 0x03)-2); - if (table_buf[iLensData+10] & 0xf0) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); -+ libraw_powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f); - if (table_buf[iLensData+10] & 0x0f) - imgdata.lens.makernotes.MinAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); -+ libraw_powf64(2.0f, (float)((table_buf[iLensData+10] & 0x0f) + 10)/4.0f); - - if (iLensData != 12) - { -@@ -6854,14 +6854,14 @@ void CLASS PentaxLensInfo (unsigned id, unsigned len) // tag 0x0207 - if ((table_buf[iLensData+14] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); -+ libraw_powf64(2.0f, (float)((table_buf[iLensData+14] & 0x7f) -1)/32.0f); - } - else if ((id != 0x12e76) && // K-5 - (table_buf[iLensData+15] > 1) && - (fabs(imgdata.lens.makernotes.MaxAp4CurFocal) < 0.7f)) - { - imgdata.lens.makernotes.MaxAp4CurFocal = -- powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); -+ libraw_powf64(2.0f, (float)((table_buf[iLensData+15] & 0x7f) -1)/32.0f); - } - } - free(table_buf); -@@ -7349,11 +7349,11 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) - { - if (buf[0]) - imgdata.lens.makernotes.MaxAp4CurFocal = -- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; -+ my_roundf(libraw_powf64(2.0f, ((float)SonySubstitution[buf[0]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; - - if (buf[1]) - imgdata.lens.makernotes.MinAp4CurFocal = -- my_roundf(powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; -+ my_roundf(libraw_powf64(2.0f, ((float)SonySubstitution[buf[1]] / 8.0 - 1.06f) / 2.0f)*10.0f) / 10.0f; - } - - if (imgdata.lens.makernotes.CameraMount != LIBRAW_MOUNT_FixedLens) -@@ -7363,7 +7363,7 @@ void CLASS process_Sony_0x9050 (uchar * buf, unsigned id) - lid = SonySubstitution[buf[0x3d]] << 8 | - SonySubstitution[buf[0x3c]]; - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); -+ libraw_powf64(2.0f, ((float)lid/256.0f - 16.0f) / 2.0f); - } - if (buf[0x105] && - (imgdata.lens.makernotes.LensMount != LIBRAW_MOUNT_Canon_EF) && -@@ -7749,7 +7749,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - { - unsigned char cc; - fread(&cc, 1, 1, ifp); -- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0)); -+ iso_speed = (int)(100.0 * libraw_powf64(2.0, (double)(cc) / 12.0 - 5.0)); - break; - } - } -@@ -7794,7 +7794,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - } - break; - case 0x1002: -- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); -+ imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, getreal(type)/2); - break; - case 0x20100102: - stmread(imgdata.shootinginfo.InternalBodySerial, len, ifp); -@@ -7821,10 +7821,10 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - stmread(imgdata.lens.makernotes.Lens,len, ifp); - break; - case 0x20100205: -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100206: -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100207: - imgdata.lens.makernotes.MinFocal = (float)get2(); -@@ -7835,7 +7835,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; - break; - case 0x2010020a: -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100301: - imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; -@@ -8144,7 +8144,7 @@ void CLASS parse_makernote_0xc634(int base, int uptag, unsigned dng_writer) - lid = (((ushort)table_buf[2])<<8) | - ((ushort)table_buf[3]); - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); -+ libraw_powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); - } - break; - case 1536: -@@ -8675,7 +8675,7 @@ void CLASS parse_makernote (int base, int uptag) - } - break; - case 0x1002: -- imgdata.lens.makernotes.CurAp = powf64(2.0f, getreal(type)/2); -+ imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, getreal(type)/2); - break; - case 0x20401112: - imgdata.makernotes.olympus.OlympusCropID = get2(); -@@ -8709,10 +8709,10 @@ void CLASS parse_makernote (int base, int uptag) - stmread(imgdata.lens.makernotes.Lens, len, ifp); - break; - case 0x20100205: -- imgdata.lens.makernotes.MaxAp4MinFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MinFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100206: -- imgdata.lens.makernotes.MaxAp4MaxFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4MaxFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100207: - imgdata.lens.makernotes.MinFocal = (float)get2(); -@@ -8723,7 +8723,7 @@ void CLASS parse_makernote (int base, int uptag) - imgdata.lens.makernotes.MaxFocal = imgdata.lens.makernotes.MinFocal; - break; - case 0x2010020a: -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(sqrt(2.0f), get2() / 256.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(sqrt(2.0f), get2() / 256.0f); - break; - case 0x20100301: - imgdata.lens.makernotes.TeleconverterID = fgetc(ifp) << 8; -@@ -9150,7 +9150,7 @@ void CLASS parse_makernote (int base, int uptag) - lid = (((ushort)table_buf[2])<<8) | - ((ushort)table_buf[3]); - imgdata.lens.makernotes.CurAp = -- powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); -+ libraw_powf64(2.0f, ((float)lid/8.0f-1.0f)/2.0f); - } - break; - case 1536: -@@ -9248,19 +9248,19 @@ void CLASS parse_makernote (int base, int uptag) - { - unsigned char cc; - fread(&cc,1,1,ifp); -- iso_speed = int(100.0 * powf64(2.0f,float(cc)/12.0-5.0)); -+ iso_speed = int(100.0 * libraw_powf64(2.0f,float(cc)/12.0-5.0)); - } - if (tag == 4 && len > 26 && len < 35) { - if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535)) -- iso_speed = 50 * powf64(2.0, i/32.0 - 4); -+ iso_speed = 50 * libraw_powf64(2.0, i/32.0 - 4); - #ifdef LIBRAW_LIBRARY_BUILD - get4(); - #else - if ((i=(get2(),get2())) != 0x7fff && !aperture) -- aperture = powf64(2.0, i/64.0); -+ aperture = libraw_powf64(2.0, i/64.0); - #endif - if ((i=get2()) != 0xffff && !shutter) -- shutter = powf64(2.0, (short) i/-32.0); -+ shutter = libraw_powf64(2.0, (short) i/-32.0); - wbi = (get2(),get2()); - shot_order = (get2(),get2()); - } -@@ -9854,7 +9854,7 @@ void CLASS parse_exif (int base) - imgdata.lens.Lens[0] = 0; - break; - case 0x9205: -- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.EXIF_MaxAp = libraw_powf64(2.0f, (getreal(type) / 2.0f)); - break; - #endif - case 33434: tiff_ifd[tiff_nifds-1].t_shutter = -@@ -9869,11 +9869,11 @@ void CLASS parse_exif (int base) - case 36868: get_timestamp(0); break; - case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.) - tiff_ifd[tiff_nifds-1].t_shutter = -- shutter = powf64(2.0, expo); -+ shutter = libraw_powf64(2.0, expo); - break; - case 37378: // 0x9202 ApertureValue - if ((fabs(ape = getreal(type))<256.0) && (!aperture)) -- aperture = powf64(2.0, ape/2); -+ aperture = libraw_powf64(2.0, ape/2); - break; - case 37385: flash_used = getreal(type); break; - case 37386: focal_len = getreal(type); break; -@@ -10769,7 +10769,7 @@ int CLASS parse_tiff_ifd (int base) - imgdata.lens.Lens[0] = 0; - break; - case 0x9205: -- imgdata.lens.EXIF_MaxAp = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.EXIF_MaxAp = libraw_powf64(2.0f, (getreal(type) / 2.0f)); - break; - // IB end - #endif -@@ -11804,22 +11804,22 @@ void CLASS parse_ciff (int offset, int length, int depth) - thumb_length = len; - } - if (type == 0x1818) { -- shutter = powf64(2.0f, -int_to_float((get4(),get4()))); -- aperture = powf64(2.0f, int_to_float(get4())/2); -+ shutter = libraw_powf64(2.0f, -int_to_float((get4(),get4()))); -+ aperture = libraw_powf64(2.0f, int_to_float(get4())/2); - #ifdef LIBRAW_LIBRARY_BUILD - imgdata.lens.makernotes.CurAp = aperture; - #endif - } - if (type == 0x102a) { - // iso_speed = pow (2.0, (get4(),get2())/32.0 - 4) * 50; -- iso_speed = powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; -+ iso_speed = libraw_powf64(2.0f, ((get2(),get2()) + get2())/32.0f - 5.0f) * 100.0f; - #ifdef LIBRAW_LIBRARY_BUILD - aperture = _CanonConvertAperture((get2(),get2())); - imgdata.lens.makernotes.CurAp = aperture; - #else -- aperture = powf64(2.0, (get2(),(short)get2())/64.0); -+ aperture = libraw_powf64(2.0, (get2(),(short)get2())/64.0); - #endif -- shutter = powf64(2.0,-((short)get2())/32.0); -+ shutter = libraw_powf64(2.0,-((short)get2())/32.0); - wbi = (get2(),get2()); - if (wbi > 17) wbi = 0; - fseek (ifp, 32, SEEK_CUR); -@@ -12024,8 +12024,8 @@ void CLASS parse_phase_one (int base) - setPhaseOneFeatures(unique_id); - break; - case 0x0401: -- if (type == 4) imgdata.lens.makernotes.CurAp = powf64(2.0f, (int_to_float(data)/2.0f)); -- else imgdata.lens.makernotes.CurAp = powf64(2.0f, (getreal(type)/2.0f)); -+ if (type == 4) imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); -+ else imgdata.lens.makernotes.CurAp = libraw_powf64(2.0f, (getreal(type)/2.0f)); - break; - case 0x0403: - if (type == 4) imgdata.lens.makernotes.CurFocal = int_to_float(data); -@@ -12039,16 +12039,16 @@ void CLASS parse_phase_one (int base) - break; - case 0x0414: - if (type == 4) { -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); - } else { -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, (getreal(type) / 2.0f)); - } - break; - case 0x0415: - if (type == 4) { -- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (int_to_float(data)/2.0f)); -+ imgdata.lens.makernotes.MinAp4CurFocal = libraw_powf64(2.0f, (int_to_float(data)/2.0f)); - } else { -- imgdata.lens.makernotes.MinAp4CurFocal = powf64(2.0f, (getreal(type) / 2.0f)); -+ imgdata.lens.makernotes.MinAp4CurFocal = libraw_powf64(2.0f, (getreal(type) / 2.0f)); - } - break; - case 0x0416: -@@ -14237,15 +14237,15 @@ void CLASS identify() - case 18: iso_speed = 320; break; - case 19: iso_speed = 400; break; - } -- shutter = powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; -+ shutter = libraw_powf64(2.0f, (((float)get4())/8.0f)) / 16000.0f; - FORC4 cam_mul[c ^ (c >> 1)] = get4(); - fseek (ifp, 88, SEEK_SET); -- aperture = powf64(2.0f, ((float)get4())/16.0f); -+ aperture = libraw_powf64(2.0f, ((float)get4())/16.0f); - fseek (ifp, 112, SEEK_SET); - focal_len = get4(); - #ifdef LIBRAW_LIBRARY_BUILD - fseek (ifp, 104, SEEK_SET); -- imgdata.lens.makernotes.MaxAp4CurFocal = powf64(2.0f, ((float)get4())/16.0f); -+ imgdata.lens.makernotes.MaxAp4CurFocal = libraw_powf64(2.0f, ((float)get4())/16.0f); - fseek (ifp, 124, SEEK_SET); - stmread(imgdata.lens.makernotes.Lens, 32, ifp); - imgdata.lens.makernotes.CameraMount = LIBRAW_MOUNT_Contax_N; diff --git a/packages/lang/Python2/package.mk b/packages/lang/Python2/package.mk index edfe51e6b0..a0c6ebd707 100644 --- a/packages/lang/Python2/package.mk +++ b/packages/lang/Python2/package.mk @@ -4,8 +4,8 @@ PKG_NAME="Python2" # When changing PKG_VERSION remember to sync PKG_PYTHON_VERSION! -PKG_VERSION="2.7.15" -PKG_SHA256="22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574" +PKG_VERSION="2.7.16" +PKG_SHA256="f222ef602647eecb6853681156d32de4450a2c39f4de93bd5b20235f2e660ed7" PKG_LICENSE="OSS" PKG_SITE="http://www.python.org/" PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/${PKG_NAME::-1}-$PKG_VERSION.tar.xz" diff --git a/packages/lang/Python3/package.mk b/packages/lang/Python3/package.mk index 66214b6935..6ae7d80287 100644 --- a/packages/lang/Python3/package.mk +++ b/packages/lang/Python3/package.mk @@ -3,8 +3,8 @@ PKG_NAME="Python3" # When changing PKG_VERSION remember to sync PKG_PYTHON_VERSION! -PKG_VERSION="3.7.2" -PKG_SHA256="d83fe8ce51b1bb48bbcf0550fd265b9a75cdfdfa93f916f9e700aef8444bf1bb" +PKG_VERSION="3.7.3" +PKG_SHA256="da60b54064d4cfcd9c26576f6df2690e62085123826cff2e667e72a91952d318" PKG_LICENSE="OSS" PKG_SITE="http://www.python.org/" PKG_URL="http://www.python.org/ftp/python/$PKG_VERSION/${PKG_NAME::-1}-$PKG_VERSION.tar.xz" diff --git a/packages/multimedia/SDL2/package.mk b/packages/multimedia/SDL2/package.mk index 330996dc7d..63a2c79687 100644 --- a/packages/multimedia/SDL2/package.mk +++ b/packages/multimedia/SDL2/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="SDL2" -PKG_VERSION="2.0.8" -PKG_SHA256="edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec" +PKG_VERSION="2.0.9" +PKG_SHA256="255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1" PKG_LICENSE="GPL" PKG_SITE="https://www.libsdl.org/" PKG_URL="https://www.libsdl.org/release/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/multimedia/dav1d/package.mk b/packages/multimedia/dav1d/package.mk index d4c0f41ffa..3f27d2c1c3 100644 --- a/packages/multimedia/dav1d/package.mk +++ b/packages/multimedia/dav1d/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dav1d" -PKG_VERSION="0.3.0" -PKG_SHA256="22946ddd8c5122d3490b250933328c3278da21b0659db9b7fa8f875e4735c2e6" +PKG_VERSION="0.3.1" +PKG_SHA256="be511d465223cc74aab507fe3a6e4e764501662ebf1a5e233854ed064a7ae204" PKG_LICENSE="BSD" PKG_SITE="http://www.jbkempf.com/blog/post/2018/Introducing-dav1d" PKG_URL="https://code.videolan.org/videolan/dav1d/-/archive/${PKG_VERSION}/dav1d-${PKG_VERSION}.tar.bz2" diff --git a/packages/multimedia/intel-vaapi-driver/package.mk b/packages/multimedia/intel-vaapi-driver/package.mk index c342178dfe..78f18a9ed7 100644 --- a/packages/multimedia/intel-vaapi-driver/package.mk +++ b/packages/multimedia/intel-vaapi-driver/package.mk @@ -22,5 +22,4 @@ else fi PKG_CONFIGURE_OPTS_TARGET="--disable-silent-rules \ - --enable-drm \ $DISPLAYSERVER_LIBVA" diff --git a/packages/network/ethtool/package.mk b/packages/network/ethtool/package.mk index 02e16d45aa..2414126d41 100644 --- a/packages/network/ethtool/package.mk +++ b/packages/network/ethtool/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="ethtool" -PKG_VERSION="4.15" -PKG_SHA256="71f7fd32483ffdc7c6c4d882e230714eb101df0a46cbe396dbeb8ac78f1ef91a" +PKG_VERSION="5.1" +PKG_SHA256="65feac1fec6565290b7784b2efc925dee900a9b11202ce7c6c30a967c3da3387" PKG_LICENSE="GPL" PKG_SITE="http://www.kernel.org/pub/software/network/ethtool/" PKG_URL="http://www.kernel.org/pub/software/network/ethtool/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/network/iptables/package.mk b/packages/network/iptables/package.mk index 341db5a92c..366eec5bdb 100644 --- a/packages/network/iptables/package.mk +++ b/packages/network/iptables/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="iptables" -PKG_VERSION="1.8.2" -PKG_SHA256="a3778b50ed1a3256f9ca975de82c2204e508001fc2471238c8c97f3d1c4c12af" +PKG_VERSION="1.8.3" +PKG_SHA256="a23cac034181206b4545f4e7e730e76e08b5f3dd78771ba9645a6756de9cdd80" PKG_LICENSE="GPL" PKG_SITE="http://www.netfilter.org/" PKG_URL="http://www.netfilter.org/projects/iptables/files/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/network/iptables/patches/iptables-0001-fix-build-with-pre-4.2-kernels.patch b/packages/network/iptables/patches/iptables-0001-fix-build-with-pre-4.2-kernels.patch deleted file mode 100644 index 43605d62eb..0000000000 --- a/packages/network/iptables/patches/iptables-0001-fix-build-with-pre-4.2-kernels.patch +++ /dev/null @@ -1,52 +0,0 @@ -From fe9a5c043082a553ed1789cb478f2c48763e7f30 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 16 Nov 2018 09:30:33 +0200 -Subject: [PATCH] include: fix build with kernel headers before 4.2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Commit 672accf1530 (include: update kernel netfilter header files) -updated linux/netfilter.h and brought with it the update from kernel -commit a263653ed798 (netfilter: don't pull include/linux/netfilter.h -from netns headers). This triggers conflict of headers that is fixed in -kernel commit 279c6c7fa64f (api: fix compatibility of linux/in.h with -netinet/in.h) included in kernel version 4.2. For earlier kernel headers -we need a workaround that prevents the headers conflict. - -Fixes the following build failure: - -In file included from .../sysroot/usr/include/netinet/ip.h:25:0, - from ../include/libiptc/ipt_kernel_headers.h:8, - from ../include/libiptc/libiptc.h:6, - from libip4tc.c:29: -.../sysroot/usr/include/linux/in.h:26:3: error: redeclaration of enumerator ‘IPPROTO_IP’ - IPPROTO_IP = 0, /* Dummy protocol for TCP */ - ^ -.../sysroot/usr/include/netinet/in.h:33:5: note: previous definition of ‘IPPROTO_IP’ was here - IPPROTO_IP = 0, /* Dummy protocol for TCP. */ - ^~~~~~~~~~ - -Signed-off-by: Baruch Siach -Signed-off-by: Florian Westphal ---- - include/linux/netfilter.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h -index c3f087a..bacf8cd 100644 ---- a/include/linux/netfilter.h -+++ b/include/linux/netfilter.h -@@ -3,7 +3,9 @@ - - #include - -+#ifndef _NETINET_IN_H - #include -+#endif - #include - #include - --- -2.14.1 - diff --git a/packages/network/libnftnl/package.mk b/packages/network/libnftnl/package.mk index fa04fc2332..edcbaafaab 100644 --- a/packages/network/libnftnl/package.mk +++ b/packages/network/libnftnl/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libnftnl" -PKG_VERSION="1.1.2" -PKG_SHA256="a5c7b7a6c13c9c5898b13fcb1126fefce2015d5a96d7c354b19aaa40b6aece5d" +PKG_VERSION="1.1.3" +PKG_SHA256="22dd97d3b06ae8c67499506e2bfd6803ce116479076ec3700e7a4c7cd9fcba0f" PKG_LICENSE="GPL" PKG_SITE="http://netfilter.org/projects/libnftnl" PKG_URL="http://netfilter.org/projects/libnftnl/files/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/network/libssh/package.mk b/packages/network/libssh/package.mk index dfbdf4d44e..3475c8ee76 100644 --- a/packages/network/libssh/package.mk +++ b/packages/network/libssh/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libssh" -PKG_VERSION="0.8.5" -PKG_SHA256="07d2c431240fc88f6b06bcb36ae267f9afeedce2e32f6c42f8844b205ab5a335" +PKG_VERSION="0.8.7" +PKG_SHA256="43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592" PKG_LICENSE="LGPL" PKG_SITE="http://www.libssh.org/" PKG_URL="https://www.libssh.org/files/${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/network/libtirpc/package.mk b/packages/network/libtirpc/package.mk index 902bbfbdbb..6d7537d5ee 100644 --- a/packages/network/libtirpc/package.mk +++ b/packages/network/libtirpc/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libtirpc" -PKG_VERSION="1.0.2" -PKG_SHA256="723c5ce92706cbb601a8db09110df1b4b69391643158f20ff587e20e7c5f90f5" +PKG_VERSION="1.1.4" +PKG_SHA256="2ca529f02292e10c158562295a1ffd95d2ce8af97820e3534fe1b0e3aec7561d" PKG_LICENSE="GPL" PKG_SITE="https://sourceforge.net/projects/libtirpc/" PKG_URL="https://downloads.sourceforge.net/project/libtirpc/libtirpc/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/network/libtirpc/patches/libtirpc-0001-include-missing-stdint.h.patch b/packages/network/libtirpc/patches/libtirpc-0001-include-missing-stdint.h.patch deleted file mode 100644 index f832cf6dd3..0000000000 --- a/packages/network/libtirpc/patches/libtirpc-0001-include-missing-stdint.h.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur a/src/xdr_sizeof.c b/src/xdr_sizeof.c ---- a/src/xdr_sizeof.c 2017-07-05 08:02:23.000000000 -0700 -+++ b/src/xdr_sizeof.c 2017-08-02 16:37:31.839143976 -0700 -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - #include "un-namespace.h" - - /* ARGSUSED */ diff --git a/packages/network/openvpn/package.mk b/packages/network/openvpn/package.mk index 0e9dc1994b..574153108b 100644 --- a/packages/network/openvpn/package.mk +++ b/packages/network/openvpn/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="openvpn" -PKG_VERSION="2.4.6" -PKG_SHA256="4f6434fa541cc9e363434ea71a16a62cf2615fb2f16af5b38f43ab5939998c26" +PKG_VERSION="2.4.7" +PKG_SHA256="a42f53570f669eaf10af68e98d65b531015ff9e12be7a62d9269ea684652f648" PKG_LICENSE="GPL" PKG_SITE="https://openvpn.net" PKG_URL="https://swupdate.openvpn.org/community/releases/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/network/wpa_supplicant/package.mk b/packages/network/wpa_supplicant/package.mk index 561c82a1a4..d29c5c1a18 100644 --- a/packages/network/wpa_supplicant/package.mk +++ b/packages/network/wpa_supplicant/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="wpa_supplicant" -PKG_VERSION="2.6" -PKG_SHA256="b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450" +PKG_VERSION="2.8" +PKG_SHA256="a689336a12a99151b9de5e25bfccadb88438f4f4438eb8db331cd94346fd3d96" PKG_LICENSE="GPL" PKG_SITE="https://w1.fi/wpa_supplicant/" PKG_URL="https://w1.fi/releases/$PKG_NAME-$PKG_VERSION.tar.gz" @@ -19,21 +20,17 @@ configure_target() { LDFLAGS="$LDFLAGS -lpthread -lm" cp $PKG_DIR/config/makefile.config wpa_supplicant/.config - -# echo "CONFIG_TLS=gnutls" >> .config -# echo "CONFIG_GNUTLS_EXTRA=y" >> .config } post_makeinstall_target() { rm -r $INSTALL/usr/bin/wpa_cli -mkdir -p $INSTALL/etc/dbus-1/system.d - cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf $INSTALL/etc/dbus-1/system.d + mkdir -p $INSTALL/etc/dbus-1/system.d + cp wpa_supplicant/dbus/dbus-wpa_supplicant.conf $INSTALL/etc/dbus-1/system.d -mkdir -p $INSTALL/usr/lib/systemd/system - cp wpa_supplicant/systemd/wpa_supplicant.service $INSTALL/usr/lib/systemd/system + mkdir -p $INSTALL/usr/lib/systemd/system + cp wpa_supplicant/systemd/wpa_supplicant.service $INSTALL/usr/lib/systemd/system -mkdir -p $INSTALL/usr/share/dbus-1/system-services - cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service $INSTALL/usr/share/dbus-1/system-services - cp wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service $INSTALL/usr/share/dbus-1/system-services + mkdir -p $INSTALL/usr/share/dbus-1/system-services + cp wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service $INSTALL/usr/share/dbus-1/system-services } diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-001-krack-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-001-krack-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch deleted file mode 100644 index 727684865d..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-001-krack-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +++ /dev/null @@ -1,174 +0,0 @@ -From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef -Date: Fri, 14 Jul 2017 15:15:35 +0200 -Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake - -Do not reinstall TK to the driver during Reassociation Response frame -processing if the first attempt of setting the TK succeeded. This avoids -issues related to clearing the TX/RX PN that could result in reusing -same PN values for transmitted frames (e.g., due to CCM nonce reuse and -also hitting replay protection on the receiver) and accepting replayed -frames on RX side. - -This issue was introduced by the commit -0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in -authenticator') which allowed wpa_ft_install_ptk() to be called multiple -times with the same PTK. While the second configuration attempt is -needed with some drivers, it must be done only if the first attempt -failed. - -Signed-off-by: Mathy Vanhoef ---- - src/ap/ieee802_11.c | 16 +++++++++++++--- - src/ap/wpa_auth.c | 11 +++++++++++ - src/ap/wpa_auth.h | 3 ++- - src/ap/wpa_auth_ft.c | 10 ++++++++++ - src/ap/wpa_auth_i.h | 1 + - 5 files changed, 37 insertions(+), 4 deletions(-) - -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index 4e04169..333035f 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd, - { - struct ieee80211_ht_capabilities ht_cap; - struct ieee80211_vht_capabilities vht_cap; -+ int set = 1; - - /* - * Remove the STA entry to ensure the STA PS state gets cleared and -@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd, - * FT-over-the-DS, where a station re-associates back to the same AP but - * skips the authentication flow, or if working with a driver that - * does not support full AP client state. -+ * -+ * Skip this if the STA has already completed FT reassociation and the -+ * TK has been configured since the TX/RX PN must not be reset to 0 for -+ * the same key. - */ -- if (!sta->added_unassoc) -+ if (!sta->added_unassoc && -+ (!(sta->flags & WLAN_STA_AUTHORIZED) || -+ !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) { - hostapd_drv_sta_remove(hapd, sta->addr); -+ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED); -+ set = 0; -+ } - - #ifdef CONFIG_IEEE80211N - if (sta->flags & WLAN_STA_HT) -@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd, - sta->flags & WLAN_STA_VHT ? &vht_cap : NULL, - sta->flags | WLAN_STA_ASSOC, sta->qosinfo, - sta->vht_opmode, sta->p2p_ie ? 1 : 0, -- sta->added_unassoc)) { -+ set)) { - hostapd_logger(hapd, sta->addr, - HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE, - "Could not %s STA to kernel driver", -- sta->added_unassoc ? "set" : "add"); -+ set ? "set" : "add"); - - if (sta->added_unassoc) { - hostapd_drv_sta_remove(hapd, sta->addr); -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 3587086..707971d 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event) - #else /* CONFIG_IEEE80211R */ - break; - #endif /* CONFIG_IEEE80211R */ -+ case WPA_DRV_STA_REMOVED: -+ sm->tk_already_set = FALSE; -+ return 0; - } - - #ifdef CONFIG_IEEE80211R -@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm) - } - - -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm) -+{ -+ if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt)) -+ return 0; -+ return sm->tk_already_set; -+} -+ -+ - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry) - { -diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h -index 0de8d97..97461b0 100644 ---- a/src/ap/wpa_auth.h -+++ b/src/ap/wpa_auth.h -@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth, - u8 *data, size_t data_len); - enum wpa_event { - WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH, -- WPA_REAUTH_EAPOL, WPA_ASSOC_FT -+ WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED - }; - void wpa_remove_ptk(struct wpa_state_machine *sm); - int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event); -@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm); - int wpa_auth_get_pairwise(struct wpa_state_machine *sm); - int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm); - int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm); -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm); - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry); - struct rsn_pmksa_cache_entry * -diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c -index 42242a5..e63b99a 100644 ---- a/src/ap/wpa_auth_ft.c -+++ b/src/ap/wpa_auth_ft.c -@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - return; - } - -+ if (sm->tk_already_set) { -+ /* Must avoid TK reconfiguration to prevent clearing of TX/RX -+ * PN in the driver */ -+ wpa_printf(MSG_DEBUG, -+ "FT: Do not re-install same PTK to the driver"); -+ return; -+ } -+ - /* FIX: add STA entry to kernel/driver here? The set_key will fail - * most likely without this.. At the moment, STA entry is added only - * after association has been completed. This function will be called -@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - - /* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */ - sm->pairwise_set = TRUE; -+ sm->tk_already_set = TRUE; - } - - -@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm, - - sm->pairwise = pairwise; - sm->PTK_valid = TRUE; -+ sm->tk_already_set = FALSE; - wpa_ft_install_ptk(sm); - - buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + -diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h -index 72b7eb3..7fd8f05 100644 ---- a/src/ap/wpa_auth_i.h -+++ b/src/ap/wpa_auth_i.h -@@ -65,6 +65,7 @@ struct wpa_state_machine { - struct wpa_ptk PTK; - Boolean PTK_valid; - Boolean pairwise_set; -+ Boolean tk_already_set; - int keycount; - Boolean Pair; - struct wpa_key_replay_counter { --- -2.7.4 - diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-002-krack-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-002-krack-Prevent-reinstallation-of-an-already-in-use-group-ke.patch deleted file mode 100644 index 1802d664ad..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-002-krack-Prevent-reinstallation-of-an-already-in-use-group-ke.patch +++ /dev/null @@ -1,250 +0,0 @@ -From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef -Date: Wed, 12 Jul 2017 16:03:24 +0200 -Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key - -Track the current GTK and IGTK that is in use and when receiving a -(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do -not install the given key if it is already in use. This prevents an -attacker from trying to trick the client into resetting or lowering the -sequence counter associated to the group key. - -Signed-off-by: Mathy Vanhoef ---- - src/common/wpa_common.h | 11 +++++ - src/rsn_supp/wpa.c | 116 ++++++++++++++++++++++++++++++------------------ - src/rsn_supp/wpa_i.h | 4 ++ - 3 files changed, 87 insertions(+), 44 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index af1d0f0..d200285 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -217,6 +217,17 @@ struct wpa_ptk { - size_t tk_len; - }; - -+struct wpa_gtk { -+ u8 gtk[WPA_GTK_MAX_LEN]; -+ size_t gtk_len; -+}; -+ -+#ifdef CONFIG_IEEE80211W -+struct wpa_igtk { -+ u8 igtk[WPA_IGTK_MAX_LEN]; -+ size_t igtk_len; -+}; -+#endif /* CONFIG_IEEE80211W */ - - /* WPA IE version 1 - * 00-50-f2:1 (OUI:OUI type) -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 3c47879..95bd7be 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - -+ /* Detect possible key reinstallation */ -+ if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", -+ gd->keyidx, gd->tx, gd->gtk_len); -+ return 0; -+ } -+ - wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len); - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)", -@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ - return 0; - } - -@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - } - - -+#ifdef CONFIG_IEEE80211W -+static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -+ const struct wpa_igtk_kde *igtk) -+{ -+ size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); -+ u16 keyidx = WPA_GET_LE16(igtk->keyid); -+ -+ /* Detect possible key reinstallation */ -+ if (sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", -+ keyidx); -+ return 0; -+ } -+ -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x", -+ keyidx, MAC2STR(igtk->pn)); -+ wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len); -+ if (keyidx > 4095) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Invalid IGTK KeyID %d", keyidx); -+ return -1; -+ } -+ if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -+ broadcast_ether_addr, -+ keyidx, 0, igtk->pn, sizeof(igtk->pn), -+ igtk->igtk, len) < 0) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Failed to configure IGTK to the driver"); -+ return -1; -+ } -+ -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ -+ return 0; -+} -+#endif /* CONFIG_IEEE80211W */ -+ -+ - static int ieee80211w_set_keys(struct wpa_sm *sm, - struct wpa_eapol_ie_parse *ie) - { -@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - if (ie->igtk) { - size_t len; - const struct wpa_igtk_kde *igtk; -- u16 keyidx; -+ - len = wpa_cipher_key_len(sm->mgmt_group_cipher); - if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len) - return -1; -+ - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- keyidx = WPA_GET_LE16(igtk->keyid); -- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d " -- "pn %02x%02x%02x%02x%02x%02x", -- keyidx, MAC2STR(igtk->pn)); -- wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", -- igtk->igtk, len); -- if (keyidx > 4095) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Invalid IGTK KeyID %d", keyidx); -- return -1; -- } -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igtk->pn, sizeof(igtk->pn), -- igtk->igtk, len) < 0) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Failed to configure IGTK to the driver"); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } - } - - return 0; -@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm) - */ - void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - { -- int clear_ptk = 1; -+ int clear_keys = 1; - - if (sm == NULL) - return; -@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - /* Prepare for the next transition */ - wpa_ft_prepare_auth_request(sm, NULL); - -- clear_ptk = 0; -+ clear_keys = 0; - } - #endif /* CONFIG_IEEE80211R */ - -- if (clear_ptk) { -+ if (clear_keys) { - /* - * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if - * this is not part of a Fast BSS Transition. -@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - } - - #ifdef CONFIG_TDLS -@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(sm->pmk, 0, sizeof(sm->pmk)); - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); - os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0)); -@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - os_memset(&gd, 0, sizeof(gd)); - #ifdef CONFIG_IEEE80211W - } else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) { -- struct wpa_igtk_kde igd; -- u16 keyidx; -- -- os_memset(&igd, 0, sizeof(igd)); -- keylen = wpa_cipher_key_len(sm->mgmt_group_cipher); -- os_memcpy(igd.keyid, buf + 2, 2); -- os_memcpy(igd.pn, buf + 4, 6); -- -- keyidx = WPA_GET_LE16(igd.keyid); -- os_memcpy(igd.igtk, buf + 10, keylen); -- -- wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)", -- igd.igtk, keylen); -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igd.pn, sizeof(igd.pn), -- igd.igtk, keylen) < 0) { -- wpa_printf(MSG_DEBUG, "Failed to install the IGTK in " -- "WNM mode"); -- os_memset(&igd, 0, sizeof(igd)); -+ const struct wpa_igtk_kde *igtk; -+ -+ igtk = (const struct wpa_igtk_kde *) (buf + 2); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } -- os_memset(&igd, 0, sizeof(igd)); - #endif /* CONFIG_IEEE80211W */ - } else { - wpa_printf(MSG_DEBUG, "Unknown element id"); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index f653ba6..afc9e37 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -31,6 +31,10 @@ struct wpa_sm { - u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN]; - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; -+ struct wpa_gtk gtk; -+#ifdef CONFIG_IEEE80211W -+ struct wpa_igtk igtk; -+#endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ - --- -2.7.4 - diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-003-krack-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-003-krack-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch deleted file mode 100644 index e2937b851a..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-003-krack-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 1 Oct 2017 12:12:24 +0300 -Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep - Mode cases - -This extends the protection to track last configured GTK/IGTK value -separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a -corner case where these two different mechanisms may get used when the -GTK/IGTK has changed and tracking a single value is not sufficient to -detect a possible key reconfiguration. - -Signed-off-by: Jouni Malinen ---- - src/rsn_supp/wpa.c | 53 +++++++++++++++++++++++++++++++++++++--------------- - src/rsn_supp/wpa_i.h | 2 ++ - 2 files changed, 40 insertions(+), 15 deletions(-) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 95bd7be..7a2c68d 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -709,14 +709,17 @@ struct wpa_gtk_data { - - static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const struct wpa_gtk_data *gd, -- const u8 *key_rsc) -+ const u8 *key_rsc, int wnm_sleep) - { - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - - /* Detect possible key reinstallation */ -- if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -- os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ if ((sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) || -+ (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", - gd->keyidx, gd->tx, gd->gtk_len); -@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -- sm->gtk.gtk_len = gd->gtk_len; -- os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ if (wnm_sleep) { -+ sm->gtk_wnm_sleep.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len); -+ } else { -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ } - - return 0; - } -@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - (wpa_supplicant_check_group_cipher(sm, sm->group_cipher, - gtk_len, gtk_len, - &gd.key_rsc_len, &gd.alg) || -- wpa_supplicant_install_gtk(sm, &gd, key_rsc))) { -+ wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "RSN: Failed to install GTK"); - os_memset(&gd, 0, sizeof(gd)); -@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - - #ifdef CONFIG_IEEE80211W - static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -- const struct wpa_igtk_kde *igtk) -+ const struct wpa_igtk_kde *igtk, -+ int wnm_sleep) - { - size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); - u16 keyidx = WPA_GET_LE16(igtk->keyid); - - /* Detect possible key reinstallation */ -- if (sm->igtk.igtk_len == len && -- os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ if ((sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) || -+ (sm->igtk_wnm_sleep.igtk_len == len && -+ os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", - keyidx); -@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm, - return -1; - } - -- sm->igtk.igtk_len = len; -- os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ if (wnm_sleep) { -+ sm->igtk_wnm_sleep.igtk_len = len; -+ os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len); -+ } else { -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ } - - return 0; - } -@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - return -1; - - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0) - return -1; - } - -@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm, - if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc)) - key_rsc = null_rsc; - -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) || -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) || - wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0) - goto failed; - os_memset(&gd, 0, sizeof(gd)); -@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - } - -@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); -@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - - wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)", - gd.gtk, gd.gtk_len); -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) { -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) { - os_memset(&gd, 0, sizeof(gd)); - wpa_printf(MSG_DEBUG, "Failed to install the GTK in " - "WNM mode"); -@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - const struct wpa_igtk_kde *igtk; - - igtk = (const struct wpa_igtk_kde *) (buf + 2); -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0) - return -1; - #endif /* CONFIG_IEEE80211W */ - } else { -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index afc9e37..9a54631 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -32,8 +32,10 @@ struct wpa_sm { - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; - struct wpa_gtk gtk; -+ struct wpa_gtk gtk_wnm_sleep; - #ifdef CONFIG_IEEE80211W - struct wpa_igtk igtk; -+ struct wpa_igtk igtk_wnm_sleep; - #endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ --- -2.7.4 - diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-004-krack-Prevent-installation-of-an-all-zero-TK.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-004-krack-Prevent-installation-of-an-all-zero-TK.patch deleted file mode 100644 index 22ee217947..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-004-krack-Prevent-installation-of-an-all-zero-TK.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef -Date: Fri, 29 Sep 2017 04:22:51 +0200 -Subject: [PATCH 4/8] Prevent installation of an all-zero TK - -Properly track whether a PTK has already been installed to the driver -and the TK part cleared from memory. This prevents an attacker from -trying to trick the client into installing an all-zero TK. - -This fixes the earlier fix in commit -ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the -driver in EAPOL-Key 3/4 retry case') which did not take into account -possibility of an extra message 1/4 showing up between retries of -message 3/4. - -Signed-off-by: Mathy Vanhoef ---- - src/common/wpa_common.h | 1 + - src/rsn_supp/wpa.c | 5 ++--- - src/rsn_supp/wpa_i.h | 1 - - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index d200285..1021ccb 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -215,6 +215,7 @@ struct wpa_ptk { - size_t kck_len; - size_t kek_len; - size_t tk_len; -+ int installed; /* 1 if key has already been installed to driver */ - }; - - struct wpa_gtk { -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 7a2c68d..0550a41 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm, - os_memset(buf, 0, sizeof(buf)); - } - sm->tptk_set = 1; -- sm->tk_to_set = 1; - - kde = sm->assoc_wpa_ie; - kde_len = sm->assoc_wpa_ie_len; -@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - enum wpa_alg alg; - const u8 *key_rsc; - -- if (!sm->tk_to_set) { -+ if (sm->ptk.installed) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Do not re-install same PTK to the driver"); - return 0; -@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - - /* TK is not needed anymore in supplicant */ - os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN); -- sm->tk_to_set = 0; -+ sm->ptk.installed = 1; - - if (sm->wpa_ptk_rekey) { - eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 9a54631..41f371f 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -24,7 +24,6 @@ struct wpa_sm { - struct wpa_ptk ptk, tptk; - int ptk_set, tptk_set; - unsigned int msg_3_of_4_ok:1; -- unsigned int tk_to_set:1; - u8 snonce[WPA_NONCE_LEN]; - u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */ - int renew_snonce; --- -2.7.4 - diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-005-krack-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-005-krack-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch deleted file mode 100644 index c19c4c7102..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-005-krack-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 1 Oct 2017 12:32:57 +0300 -Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce - -The Authenticator state machine path for PTK rekeying ended up bypassing -the AUTHENTICATION2 state where a new ANonce is generated when going -directly to the PTKSTART state since there is no need to try to -determine the PMK again in such a case. This is far from ideal since the -new PTK would depend on a new nonce only from the supplicant. - -Fix this by generating a new ANonce when moving to the PTKSTART state -for the purpose of starting new 4-way handshake to rekey PTK. - -Signed-off-by: Jouni Malinen ---- - src/ap/wpa_auth.c | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 707971d..bf10cc1 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2) - } - - -+static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm) -+{ -+ if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) { -+ wpa_printf(MSG_ERROR, -+ "WPA: Failed to get random data for ANonce"); -+ sm->Disconnect = TRUE; -+ return -1; -+ } -+ wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce, -+ WPA_NONCE_LEN); -+ sm->TimeoutCtr = 0; -+ return 0; -+} -+ -+ - SM_STATE(WPA_PTK, INITPMK) - { - u8 msk[2 * PMK_LEN]; -@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK) - SM_ENTER(WPA_PTK, AUTHENTICATION); - else if (sm->ReAuthenticationRequest) - SM_ENTER(WPA_PTK, AUTHENTICATION2); -- else if (sm->PTKRequest) -- SM_ENTER(WPA_PTK, PTKSTART); -- else switch (sm->wpa_ptk_state) { -+ else if (sm->PTKRequest) { -+ if (wpa_auth_sm_ptk_update(sm) < 0) -+ SM_ENTER(WPA_PTK, DISCONNECTED); -+ else -+ SM_ENTER(WPA_PTK, PTKSTART); -+ } else switch (sm->wpa_ptk_state) { - case WPA_PTK_INITIALIZE: - break; - case WPA_PTK_DISCONNECT: --- -2.7.4 - diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-006-krack-TDLS-Reject-TPK-TK-reconfiguration.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-006-krack-TDLS-Reject-TPK-TK-reconfiguration.patch deleted file mode 100644 index e1bd5a5726..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-006-krack-TDLS-Reject-TPK-TK-reconfiguration.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Fri, 22 Sep 2017 11:03:15 +0300 -Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration - -Do not try to reconfigure the same TPK-TK to the driver after it has -been successfully configured. This is an explicit check to avoid issues -related to resetting the TX/RX packet number. There was already a check -for this for TPK M2 (retries of that message are ignored completely), so -that behavior does not get modified. - -For TPK M3, the TPK-TK could have been reconfigured, but that was -followed by immediate teardown of the link due to an issue in updating -the STA entry. Furthermore, for TDLS with any real security (i.e., -ignoring open/WEP), the TPK message exchange is protected on the AP path -and simple replay attacks are not feasible. - -As an additional corner case, make sure the local nonce gets updated if -the peer uses a very unlikely "random nonce" of all zeros. - -Signed-off-by: Jouni Malinen ---- - src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 36 insertions(+), 2 deletions(-) - -diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c -index e424168..9eb9738 100644 ---- a/src/rsn_supp/tdls.c -+++ b/src/rsn_supp/tdls.c -@@ -112,6 +112,7 @@ struct wpa_tdls_peer { - u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */ - } tpk; - int tpk_set; -+ int tk_set; /* TPK-TK configured to the driver */ - int tpk_success; - int tpk_in_progress; - -@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - u8 rsc[6]; - enum wpa_alg alg; - -+ if (peer->tk_set) { -+ /* -+ * This same TPK-TK has already been configured to the driver -+ * and this new configuration attempt (likely due to an -+ * unexpected retransmitted frame) would result in clearing -+ * the TX/RX sequence number which can break security, so must -+ * not allow that to happen. -+ */ -+ wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR -+ " has already been configured to the driver - do not reconfigure", -+ MAC2STR(peer->addr)); -+ return -1; -+ } -+ - os_memset(rsc, 0, 6); - - switch (peer->cipher) { -@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - return -1; - } - -+ wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR, -+ MAC2STR(peer->addr)); - if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1, - rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) { - wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the " - "driver"); - return -1; - } -+ peer->tk_set = 1; - return 0; - } - -@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - peer->cipher = 0; - peer->qos_info = 0; - peer->wmm_capable = 0; -- peer->tpk_set = peer->tpk_success = 0; -+ peer->tk_set = peer->tpk_set = peer->tpk_success = 0; - peer->chan_switch_enabled = 0; - os_memset(&peer->tpk, 0, sizeof(peer->tpk)); - os_memset(peer->inonce, 0, WPA_NONCE_LEN); -@@ -1159,6 +1177,7 @@ skip_rsnie: - wpa_tdls_peer_free(sm, peer); - return -1; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake", - peer->inonce, WPA_NONCE_LEN); - os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN); -@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer, - } - - -+static int tdls_nonce_set(const u8 *nonce) -+{ -+ int i; -+ -+ for (i = 0; i < WPA_NONCE_LEN; i++) { -+ if (nonce[i]) -+ return 1; -+ } -+ -+ return 0; -+} -+ -+ - static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr, - const u8 *buf, size_t len) - { -@@ -2004,7 +2036,8 @@ skip_rsn: - peer->rsnie_i_len = kde.rsn_ie_len; - peer->cipher = cipher; - -- if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) { -+ if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 || -+ !tdls_nonce_set(peer->inonce)) { - /* - * There is no point in updating the RNonce for every obtained - * TPK M1 frame (e.g., retransmission due to timeout) with the -@@ -2020,6 +2053,7 @@ skip_rsn: - "TDLS: Failed to get random data for responder nonce"); - goto error; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - } - - #if 0 --- -2.7.4 - diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-007-krack-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-007-krack-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch deleted file mode 100644 index 85ea1d62bc..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-007-krack-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 53c5eb58e95004f86e65ee9fbfccbc291b139057 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Fri, 22 Sep 2017 11:25:02 +0300 -Subject: [PATCH 7/8] WNM: Ignore WNM-Sleep Mode Response without pending - request - -Commit 03ed0a52393710be6bdae657d1b36efa146520e5 ('WNM: Ignore WNM-Sleep -Mode Response if WNM-Sleep Mode has not been used') started ignoring the -response when no WNM-Sleep Mode Request had been used during the -association. This can be made tighter by clearing the used flag when -successfully processing a response. This adds an additional layer of -protection against unexpected retransmissions of the response frame. - -Signed-off-by: Jouni Malinen ---- - wpa_supplicant/wnm_sta.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c -index 1b3409c..67a07ff 100644 ---- a/wpa_supplicant/wnm_sta.c -+++ b/wpa_supplicant/wnm_sta.c -@@ -260,7 +260,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - - if (!wpa_s->wnmsleep_used) { - wpa_printf(MSG_DEBUG, -- "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association"); -+ "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested"); - return; - } - -@@ -299,6 +299,8 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - return; - } - -+ wpa_s->wnmsleep_used = 0; -+ - if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT || - wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) { - wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response " --- -2.7.4 - diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-008-krack-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-008-krack-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch deleted file mode 100644 index b9678f6815..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-008-krack-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Fri, 22 Sep 2017 12:06:37 +0300 -Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames - -The driver is expected to not report a second association event without -the station having explicitly request a new association. As such, this -case should not be reachable. However, since reconfiguring the same -pairwise or group keys to the driver could result in nonce reuse issues, -be extra careful here and do an additional state check to avoid this -even if the local driver ends up somehow accepting an unexpected -Reassociation Response frame. - -Signed-off-by: Jouni Malinen ---- - src/rsn_supp/wpa.c | 3 +++ - src/rsn_supp/wpa_ft.c | 8 ++++++++ - src/rsn_supp/wpa_i.h | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 0550a41..2a53c6f 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm) - #ifdef CONFIG_TDLS - wpa_tdls_disassoc(sm); - #endif /* CONFIG_TDLS */ -+#ifdef CONFIG_IEEE80211R -+ sm->ft_reassoc_completed = 0; -+#endif /* CONFIG_IEEE80211R */ - - /* Keys are not needed in the WPA state machine anymore */ - wpa_sm_drop_sa(sm); -diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c -index 205793e..d45bb45 100644 ---- a/src/rsn_supp/wpa_ft.c -+++ b/src/rsn_supp/wpa_ft.c -@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len, - u16 capab; - - sm->ft_completed = 0; -+ sm->ft_reassoc_completed = 0; - - buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + - 2 + sm->r0kh_id_len + ric_ies_len + 100; -@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ if (sm->ft_reassoc_completed) { -+ wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission"); -+ return 0; -+ } -+ - if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) { - wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs"); - return -1; -@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ sm->ft_reassoc_completed = 1; -+ - if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0) - return -1; - -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 41f371f..56f88dc 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -128,6 +128,7 @@ struct wpa_sm { - size_t r0kh_id_len; - u8 r1kh_id[FT_R1KH_ID_LEN]; - int ft_completed; -+ int ft_reassoc_completed; - int over_the_ds_in_progress; - u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */ - int set_ptk_after_assoc; --- -2.7.4 - diff --git a/packages/network/wpa_supplicant/patches/wpa_supplicant-100-EAPOL-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch b/packages/network/wpa_supplicant/patches/wpa_supplicant-100-EAPOL-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch deleted file mode 100644 index a62b52c6b9..0000000000 --- a/packages/network/wpa_supplicant/patches/wpa_supplicant-100-EAPOL-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3e34cfdff6b192fe337c6fb3f487f73e96582961 Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef -Date: Sun, 15 Jul 2018 01:25:53 +0200 -Subject: [PATCH] WPA: Ignore unauthenticated encrypted EAPOL-Key data - -Ignore unauthenticated encrypted EAPOL-Key data in supplicant -processing. When using WPA2, these are frames that have the Encrypted -flag set, but not the MIC flag. - -When using WPA2, EAPOL-Key frames that had the Encrypted flag set but -not the MIC flag, had their data field decrypted without first verifying -the MIC. In case the data field was encrypted using RC4 (i.e., when -negotiating TKIP as the pairwise cipher), this meant that -unauthenticated but decrypted data would then be processed. An adversary -could abuse this as a decryption oracle to recover sensitive information -in the data field of EAPOL-Key messages (e.g., the group key). -(CVE-2018-14526) - -Signed-off-by: Mathy Vanhoef ---- - src/rsn_supp/wpa.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff -upr wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c wpa_supplicant-2.6/src/rsn_supp/wpa.c ---- wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c 2016-10-02 21:51:11.000000000 +0300 -+++ wpa_supplicant-2.6/src/rsn_supp/wpa.c 2018-08-08 16:55:11.506831029 +0300 -@@ -2016,6 +2016,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, c - - if ((sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN) && - (key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) { -+ /* -+ * Only decrypt the Key Data field if the frame's authenticity -+ * was verified. When using AES-SIV (FILS), the MIC flag is not -+ * set, so this check should only be performed if mic_len != 0 -+ * which is the case in this code branch. -+ */ -+ if (!(key_info & WPA_KEY_INFO_MIC)) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Ignore EAPOL-Key with encrypted but unauthenticated data"); -+ goto out; -+ } - if (wpa_supplicant_decrypt_key_data(sm, key, ver, key_data, - &key_data_len)) - goto out; diff --git a/packages/print/freetype/package.mk b/packages/print/freetype/package.mk index 0216b83bac..5a13dd7ce4 100644 --- a/packages/print/freetype/package.mk +++ b/packages/print/freetype/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="freetype" -PKG_VERSION="2.9.1" -PKG_SHA256="db8d87ea720ea9d5edc5388fc7a0497bb11ba9fe972245e0f7f4c7e8b1e1e84d" +PKG_VERSION="2.10.0" +PKG_SHA256="fccc62928c65192fff6c98847233b28eb7ce05f12d2fea3f6cc90e8b4e5fbe06" PKG_LICENSE="GPL" PKG_SITE="http://www.freetype.org" PKG_URL="http://download.savannah.gnu.org/releases/freetype/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/python/devel/Mako/package.mk b/packages/python/devel/Mako/package.mk index 41217f6f55..c829adeeee 100644 --- a/packages/python/devel/Mako/package.mk +++ b/packages/python/devel/Mako/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="Mako" -PKG_VERSION="1.0.7" -PKG_SHA256="4e02fde57bd4abb5ec400181e4c314f56ac3e49ba4fb8b0d50bba18cb27d25ae" +PKG_VERSION="1.0.10" +PKG_SHA256="7165919e78e1feb68b4dbe829871ea9941398178fa58e6beedb9ba14acf63965" PKG_LICENSE="GPL" PKG_SITE="https://pypi.org/project/Mako" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/python/graphics/Pillow/package.mk b/packages/python/graphics/Pillow/package.mk index 4cd15bb7fd..29f46b48ac 100644 --- a/packages/python/graphics/Pillow/package.mk +++ b/packages/python/graphics/Pillow/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="Pillow" -PKG_VERSION="5.1.0" -PKG_SHA256="cee9bc75bff455d317b6947081df0824a8f118de2786dc3d74a3503fd631f4ef" +PKG_VERSION="6.0.0" +PKG_SHA256="809c0a2ce9032cbcd7b5313f71af4bdc5c8c771cb86eb7559afd954cab82ebb5" PKG_LICENSE="BSD" PKG_SITE="http://www.pythonware.com/products/pil/" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/python/graphics/Pillow/patches/Pillow-0001-crosscompiling.patch b/packages/python/graphics/Pillow/patches/Pillow-0001-crosscompiling.patch index 083e5037de..ab662d7b2e 100644 --- a/packages/python/graphics/Pillow/patches/Pillow-0001-crosscompiling.patch +++ b/packages/python/graphics/Pillow/patches/Pillow-0001-crosscompiling.patch @@ -1,13 +1,13 @@ diff --git a/setup.py b/setup.py -index 4a0ad86c5..c07e1a938 100755 +index 8eb0b3c..277e44a 100755 --- a/setup.py +++ b/setup.py -@@ -194,7 +194,7 @@ class pil_build_ext(build_ext): - ] - +@@ -253,7 +253,7 @@ class pil_build_ext(build_ext): + ] + [('add-imaging-libs=', None, 'Add libs to _imaging build')] + def initialize_options(self): - self.disable_platform_guessing = None + self.disable_platform_guessing = True + self.add_imaging_libs = "" build_ext.initialize_options(self) for x in self.feature: - setattr(self, 'disable_%s' % x, None) diff --git a/packages/python/security/pycryptodome/package.mk b/packages/python/security/pycryptodome/package.mk index b331879fb7..a191c3f932 100644 --- a/packages/python/security/pycryptodome/package.mk +++ b/packages/python/security/pycryptodome/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pycryptodome" -PKG_VERSION="3.6.1" -PKG_SHA256="15013007e393d0cc0e69f4329a47c4c8597b7f3d02c12c03f805405542f70c71" +PKG_VERSION="3.8.1" +PKG_SHA256="68ad0ce4a374577a26bb7f458575abe3c2a342818b5280de6e5738870b7761b3" PKG_LICENSE="BSD" PKG_SITE="https://pypi.org/project/pycryptodome" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/python/system/simplejson/package.mk b/packages/python/system/simplejson/package.mk index 07cbd708ad..29b56ca822 100644 --- a/packages/python/system/simplejson/package.mk +++ b/packages/python/system/simplejson/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2017 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="simplejson" -PKG_VERSION="3.15.0" -PKG_SHA256="ad332f65d9551ceffc132d0a683f4ffd12e4bc7538681100190d577ced3473fb" +PKG_VERSION="3.16.0" +PKG_SHA256="b1f329139ba647a9548aa05fb95d046b4a677643070dc2afc05fa2e975d09ca5" PKG_LICENSE="OSS" PKG_SITE="http://pypi.org/project/simplejson" PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk index 04019f1d66..2f47d337c0 100644 --- a/packages/security/libgpg-error/package.mk +++ b/packages/security/libgpg-error/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libgpg-error" -PKG_VERSION="1.35" -PKG_SHA256="cbd5ee62a8a8c88d48c158fff4fc9ead4132aacd1b4a56eb791f9f997d07e067" +PKG_VERSION="1.36" +PKG_SHA256="babd98437208c163175c29453f8681094bcaf92968a15cafb1a276076b33c97c" PKG_LICENSE="GPLv2" PKG_SITE="https://www.gnupg.org" PKG_URL="https://www.gnupg.org/ftp/gcrypt/libgpg-error/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index bd982ae944..68a7ae24b3 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="busybox" -PKG_VERSION="1.30.0" -PKG_SHA256="9553da068c0a30b1b8b72479908c1ba58672e2be7b535363a88de5e0f7bc04ce" +PKG_VERSION="1.30.1" +PKG_SHA256="3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc" PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/sysutils/dbus/package.mk b/packages/sysutils/dbus/package.mk index 9d31dd48a7..65e82e3e8a 100644 --- a/packages/sysutils/dbus/package.mk +++ b/packages/sysutils/dbus/package.mk @@ -1,14 +1,16 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="dbus" -PKG_VERSION="1.11.16" -PKG_SHA256="7cf993e97df62c73b939b77dcd920e8883d8e866f9ced1a9b5c715eb28e4b031" +PKG_VERSION="1.13.10" +PKG_SHA256="a11239e504b99adfa9ded0bbdb2f752fd51f1afc768d78a7e5642282622855f2" PKG_LICENSE="GPL" PKG_SITE="https://dbus.freedesktop.org" -PKG_URL="https://dbus.freedesktop.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" +PKG_URL="https://dbus.freedesktop.org/releases/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_TARGET="toolchain expat systemd" PKG_LONGDESC="D-Bus is a message bus, used for sending messages between applications." +PKG_TOOLCHAIN="configure" PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \ --with-sysroot=$SYSROOT_PREFIX \ @@ -20,7 +22,6 @@ PKG_CONFIGURE_OPTS_TARGET="export ac_cv_have_abstract_sockets=yes \ --disable-ansi \ --disable-xml-docs \ --disable-doxygen-docs \ - --enable-abstract-sockets \ --disable-x11-autolaunch \ --disable-selinux \ --disable-libaudit \ diff --git a/packages/sysutils/e2fsprogs/package.mk b/packages/sysutils/e2fsprogs/package.mk index 410ada8963..b29564be7c 100644 --- a/packages/sysutils/e2fsprogs/package.mk +++ b/packages/sysutils/e2fsprogs/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="e2fsprogs" -PKG_VERSION="1.43.9" -PKG_SHA256="926f8e8de1ffba55d791f21b71334e8a32b5227257ad370f2bf7e4396629e97f" +PKG_VERSION="1.45.1" +PKG_SHA256="24acedbe376a9c1b5c0a0b15c9fb84b3bef4943d669caf40b2e3e41e86d95548" PKG_LICENSE="GPL" PKG_SITE="http://e2fsprogs.sourceforge.net/" PKG_URL="https://www.kernel.org/pub/linux/kernel/people/tytso/$PKG_NAME/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.xz" @@ -22,36 +22,33 @@ PKG_CONFIGURE_OPTS_HOST="--prefix=$TOOLCHAIN/ \ --bindir=$TOOLCHAIN/bin \ --sbindir=$TOOLCHAIN/sbin" -pre_configure_target() { - PKG_CONFIGURE_OPTS_TARGET="BUILD_CC=$HOST_CC \ - --enable-verbose-makecmds \ - --enable-symlink-install \ - --enable-symlink-build \ - --disable-elf-shlibs \ - --disable-bsd-shlibs \ - --disable-profile \ - --disable-jbd-debug \ - --disable-blkid-debug \ - --disable-testio-debug \ - --enable-libuuid \ - --enable-libblkid \ - --disable-debugfs \ - --disable-imager \ - --enable-resizer \ - --enable-fsck \ - --disable-e2initrd-helper \ - --enable-tls \ - --disable-uuidd \ - --disable-nls \ - --disable-rpath \ - --disable-fuse2fs \ - --with-gnu-ld" -} +pre_configure() { + PKG_CONFIGURE_OPTS_INIT="BUILD_CC=$HOST_CC \ + --enable-verbose-makecmds \ + --enable-symlink-install \ + --enable-symlink-build \ + --disable-subset \ + --disable-elf-shlibs \ + --disable-bsd-shlibs \ + --disable-profile \ + --disable-jbd-debug \ + --disable-blkid-debug \ + --disable-testio-debug \ + --enable-libuuid \ + --enable-libblkid \ + --disable-debugfs \ + --disable-imager \ + --enable-resizer \ + --enable-fsck \ + --disable-e2initrd-helper \ + --enable-tls \ + --disable-uuidd \ + --disable-nls \ + --disable-rpath \ + --disable-fuse2fs \ + --with-gnu-ld" -pre_configure_init() { - pkg_call pre_configure_target - - PKG_CONFIGURE_OPTS_INIT="$PKG_CONFIGURE_OPTS_TARGET" + PKG_CONFIGURE_OPTS_TARGET="$PKG_CONFIGURE_OPTS_INIT" } post_makeinstall_target() { diff --git a/packages/sysutils/fuse-exfat/package.mk b/packages/sysutils/fuse-exfat/package.mk index 3c4dbe4a07..06a66c3058 100644 --- a/packages/sysutils/fuse-exfat/package.mk +++ b/packages/sysutils/fuse-exfat/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="fuse-exfat" -PKG_VERSION="1.2.6" -PKG_SHA256="e1105256d75860c0678f98bbae0b8fe465d4c96ed187b7035556097f152478e7" +PKG_VERSION="1.2.8" +PKG_SHA256="1f357e7026407cba6617acd2a0109ede8292e5ede4addd918c65a7b700ef96cb" PKG_LICENSE="GPLv2+" PKG_SITE="https://github.com/relan/exfat" PKG_URL="https://github.com/relan/exfat/releases/download/v$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/sysutils/fuse/package.mk b/packages/sysutils/fuse/package.mk index ef0cf9bd8c..c5d417aff9 100644 --- a/packages/sysutils/fuse/package.mk +++ b/packages/sysutils/fuse/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="fuse" -PKG_VERSION="2.9.7" -PKG_SHA256="832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874" +PKG_VERSION="2.9.9" +PKG_SHA256="d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7c1b4b5" PKG_LICENSE="GPL" PKG_SITE="https://github.com/libfuse/libfuse/" PKG_URL="https://github.com/libfuse/libfuse/releases/download/$PKG_NAME-$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/sysutils/keyutils/package.mk b/packages/sysutils/keyutils/package.mk index 5bf399522e..e8a2160daf 100644 --- a/packages/sysutils/keyutils/package.mk +++ b/packages/sysutils/keyutils/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="keyutils" -PKG_VERSION="1.5.10" -PKG_SHA256="115c3deae7f181778fd0e0ffaa2dad1bf1fe2f5677cf2e0e348cdb7a1c93afb6" +PKG_VERSION="1.6" +PKG_SHA256="d3aef20cec0005c0fa6b4be40079885567473185b1a57b629b030e67942c7115" PKG_LICENSE="GPL" PKG_SITE="http://people.redhat.com/~dhowells/keyutils/" PKG_URL="http://people.redhat.com/~dhowells/keyutils/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/sysutils/libevdev/package.mk b/packages/sysutils/libevdev/package.mk index 3e49abe558..c90e030f05 100644 --- a/packages/sysutils/libevdev/package.mk +++ b/packages/sysutils/libevdev/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libevdev" -PKG_VERSION="1.5.7" -PKG_SHA256="a1e59e37a2f0d397ffd7e83b73af0e638db83b8dd08902ef0f651a21cc1dd422" +PKG_VERSION="1.6.0" +PKG_SHA256="f5005c865987d980cc1279b9ec6131b06a89fd9892f649f2a68262b8786ef814" PKG_LICENSE="GPL" PKG_SITE="http://www.freedesktop.org/wiki/Software/libevdev/" PKG_URL="http://www.freedesktop.org/software/libevdev/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/sysutils/lirc/package.mk b/packages/sysutils/lirc/package.mk index c273a591e4..9b29d91193 100644 --- a/packages/sysutils/lirc/package.mk +++ b/packages/sysutils/lirc/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="lirc" -PKG_VERSION="0.10.0" -PKG_SHA256="e57c2de8b1b91325d23f1c14fc553ec7912b0add7891e653d048300d38c3f553" +PKG_VERSION="0.10.1" +PKG_SHA256="8b753c60df2a7f5dcda2db72c38e448ca300c3b4f6000c1501fcb0bd5df414f2" PKG_LICENSE="GPL" PKG_SITE="http://www.lirc.org" PKG_URL="https://sourceforge.net/projects/lirc/files/LIRC/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/sysutils/open-vm-tools/package.mk b/packages/sysutils/open-vm-tools/package.mk index f91ea7339a..b5be36883c 100644 --- a/packages/sysutils/open-vm-tools/package.mk +++ b/packages/sysutils/open-vm-tools/package.mk @@ -4,8 +4,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="open-vm-tools" -PKG_VERSION="stable-10.3.0" -PKG_SHA256="b3d0b5fd272a8dc35cab1ddd732f9d436f72682925212a6cdeccdab283e2f5ec" +PKG_VERSION="stable-10.3.10" +PKG_SHA256="6e39e643edcd85bae04ba8db608bd500d14ff3771e6e89b171ffb31020fed945" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="https://github.com/vmware/open-vm-tools" @@ -24,7 +24,6 @@ PKG_CONFIGURE_OPTS_TARGET="--disable-docs \ --without-x \ --without-xerces \ --without-icu \ - --without-procps \ --without-kernel-modules \ --with-udev-rules-dir=/usr/lib/udev/rules.d/ \ --with-sysroot=$SYSROOT_PREFIX" diff --git a/packages/sysutils/pciutils/package.mk b/packages/sysutils/pciutils/package.mk index 9307a94117..019fd8cd3c 100644 --- a/packages/sysutils/pciutils/package.mk +++ b/packages/sysutils/pciutils/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="pciutils" -PKG_VERSION="3.5.4" -PKG_SHA256="64293c6ab9318c40ef262b76d87bd9097531759752bac556e50979b1e63cfe66" +PKG_VERSION="3.6.2" +PKG_SHA256="db452ec986edefd88af0d222d22f6102f8030a8633fdfe846c3ae4bde9bb93f3" PKG_ARCH="x86_64" PKG_LICENSE="GPL" PKG_SITE="http://mj.ucw.cz/pciutils.shtml" diff --git a/packages/sysutils/tz/package.mk b/packages/sysutils/tz/package.mk index a12e38333f..fbc653ec8b 100644 --- a/packages/sysutils/tz/package.mk +++ b/packages/sysutils/tz/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="tz" -PKG_VERSION="2018i" -PKG_SHA256="b5d41b1b7cd4a763cff858e5d01f2af884103e91c3cee0980e2dca8c4e16c923" +PKG_VERSION="2019a" +PKG_SHA256="b8d449925e7883cbeb656fd660737cc5dcc7689f961b0b44c65d6644baf1a21a" PKG_LICENSE="Public Domain" PKG_SITE="http://www.iana.org/time-zones" PKG_URL="https://github.com/eggert/tz/archive/$PKG_VERSION.tar.gz" diff --git a/packages/sysutils/util-linux/package.mk b/packages/sysutils/util-linux/package.mk index 09adc687f4..0316b1a9da 100644 --- a/packages/sysutils/util-linux/package.mk +++ b/packages/sysutils/util-linux/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="util-linux" -PKG_VERSION="2.33.1" -PKG_SHA256="c14bd9f3b6e1792b90db87696e87ec643f9d63efa0a424f092a5a6b2f2dbef21" +PKG_VERSION="2.33.2" +PKG_SHA256="631be8eac6cf6230ba478de211941d526808dba3cd436380793334496013ce97" PKG_LICENSE="GPL" PKG_URL="http://www.kernel.org/pub/linux/utils/util-linux/v${PKG_VERSION%.*}/$PKG_NAME-$PKG_VERSION.tar.xz" PKG_DEPENDS_HOST="gcc:host pkg-config:host" diff --git a/packages/textproc/jsoncpp/package.mk b/packages/textproc/jsoncpp/package.mk index ddcf4e414b..5bf39aadc0 100644 --- a/packages/textproc/jsoncpp/package.mk +++ b/packages/textproc/jsoncpp/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="jsoncpp" -PKG_VERSION="1.8.3" -PKG_SHA256="3671ba6051e0f30849942cc66d1798fdf0362d089343a83f704c09ee7156604f" +PKG_VERSION="1.8.4" +PKG_SHA256="c49deac9e0933bcb7044f08516861a2d560988540b23de2ac1ad443b219afdb6" PKG_LICENSE="GPL" PKG_SITE="https://github.com/open-source-parsers/jsoncpp/" PKG_URL="https://github.com/open-source-parsers/jsoncpp/archive/$PKG_VERSION.tar.gz" diff --git a/packages/textproc/libxml2/package.mk b/packages/textproc/libxml2/package.mk index c0a11893cf..7f2385e7c1 100644 --- a/packages/textproc/libxml2/package.mk +++ b/packages/textproc/libxml2/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libxml2" -PKG_VERSION="2.9.8" -PKG_SHA256="0b74e51595654f958148759cfef0993114ddccccbb6f31aee018f3558e8e2732" +PKG_VERSION="2.9.9" +PKG_SHA256="94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org" PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/textproc/libxslt/package.mk b/packages/textproc/libxslt/package.mk index 8bcadd1373..8794609151 100644 --- a/packages/textproc/libxslt/package.mk +++ b/packages/textproc/libxslt/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libxslt" -PKG_VERSION="1.1.32" -PKG_SHA256="526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460" +PKG_VERSION="1.1.33" +PKG_SHA256="8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8" PKG_LICENSE="MIT" PKG_SITE="http://xmlsoft.org/xslt/" PKG_URL="ftp://xmlsoft.org/libxml2/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/tools/hdparm/package.mk b/packages/tools/hdparm/package.mk index 908b2549b1..a41ae9c758 100644 --- a/packages/tools/hdparm/package.mk +++ b/packages/tools/hdparm/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="hdparm" -PKG_VERSION="9.56" -PKG_SHA256="6ff9ed695f1017396eec4101f990f114b7b0e0a04c5aa6369c0394053d16e4da" +PKG_VERSION="9.58" +PKG_SHA256="9ae78e883f3ce071d32ee0f1b9a2845a634fc4dd94a434e653fdbef551c5e10f" PKG_LICENSE="BSD" PKG_SITE="http://sourceforge.net/projects/hdparm/" PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/tools/mtools/package.mk b/packages/tools/mtools/package.mk index e0dd42e0e8..eed9d81b93 100644 --- a/packages/tools/mtools/package.mk +++ b/packages/tools/mtools/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mtools" -PKG_VERSION="4.0.18" -PKG_SHA256="59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85" +PKG_VERSION="4.0.23" +PKG_SHA256="f188db26751aeb5692a79b2380b440ecc05fd1848a52f869d7ca1193f2ef8ee3" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/mtools/" PKG_URL="http://ftpmirror.gnu.org/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/tools/mtools/patches/mtools-01-fix-creation-of-dot-directories.patch b/packages/tools/mtools/patches/mtools-01-fix-creation-of-dot-directories.patch deleted file mode 100644 index 282666b694..0000000000 --- a/packages/tools/mtools/patches/mtools-01-fix-creation-of-dot-directories.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur a/direntry.c b/direntry.c ---- a/direntry.c 2016-06-09 11:43:10.440631427 +0100 -+++ b/direntry.c 2016-06-09 11:44:02.084949449 +0100 -@@ -24,6 +24,7 @@ - - void initializeDirentry(direntry_t *entry, Stream_t *Dir) - { -+ memset(entry, 0, sizeof(direntry_t)); - entry->entry = -1; - /* entry->parent = getDirentry(Dir);*/ - entry->Dir = Dir; diff --git a/packages/tools/newt/package.mk b/packages/tools/newt/package.mk index bc28e9118d..6eaece09e2 100644 --- a/packages/tools/newt/package.mk +++ b/packages/tools/newt/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="newt" -PKG_VERSION="0.52.20" -PKG_SHA256="8d66ba6beffc3f786d4ccfee9d2b43d93484680ef8db9397a4fb70b5adbb6dbc" +PKG_VERSION="0.52.21" +PKG_SHA256="265eb46b55d7eaeb887fca7a1d51fe115658882dfe148164b6c49fccac5abb31" PKG_LICENSE="GPL" PKG_SITE="https://pagure.io/newt" PKG_URL="https://releases.pagure.org/newt/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/tools/procps-ng/package.mk b/packages/tools/procps-ng/package.mk index 4794eaa43a..900389a0bb 100644 --- a/packages/tools/procps-ng/package.mk +++ b/packages/tools/procps-ng/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="procps-ng" -PKG_VERSION="3.3.12" -PKG_SHA256="6ed65ab86318f37904e8f9014415a098bec5bc53653e5d9ab404f95ca5e1a7d4" +PKG_VERSION="3.3.15" +PKG_SHA256="10bd744ffcb3de2d591d2f6acf1a54a7ba070fdcc432a855931a5057149f0465" PKG_LICENSE="GPL" PKG_SITE="https://gitlab.com/procps-ng/procps" PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/Production/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/web/curl/package.mk b/packages/web/curl/package.mk index 1d867ae0f5..0c1b1d3210 100644 --- a/packages/web/curl/package.mk +++ b/packages/web/curl/package.mk @@ -11,8 +11,8 @@ # there: http://forum.xbmc.org/showthread.php?tid=177557 PKG_NAME="curl" -PKG_VERSION="7.65.0" -PKG_SHA256="7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd" +PKG_VERSION="7.65.1" +PKG_SHA256="f6c22074877f235aebc7c53057dbc7ee82358f8ae58bfb767e955c18c859a77a" PKG_LICENSE="MIT" PKG_SITE="http://curl.haxx.se" PKG_URL="http://curl.haxx.se/download/$PKG_NAME-$PKG_VERSION.tar.xz" diff --git a/packages/web/libmicrohttpd/package.mk b/packages/web/libmicrohttpd/package.mk index 885772a717..8144bc2934 100644 --- a/packages/web/libmicrohttpd/package.mk +++ b/packages/web/libmicrohttpd/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libmicrohttpd" -PKG_VERSION="0.9.61" -PKG_SHA256="dbc469b4a930a79e61f67dc69c665317d44d9d8eb8378d1bd715775ea849d435" +PKG_VERSION="0.9.63" +PKG_SHA256="37c36f1be177f0e37ef181a645cd3baac1000bd322a01c2eff70f3cc8c91749c" PKG_LICENSE="LGPLv2.1" PKG_SITE="http://www.gnu.org/software/libmicrohttpd/" PKG_URL="http://ftpmirror.gnu.org/libmicrohttpd/$PKG_NAME-$PKG_VERSION.tar.gz" diff --git a/packages/web/libmicrohttpd/patches/libmicrohttpd-001-remove-extra-unescape-PR14991.patch b/packages/web/libmicrohttpd/patches/libmicrohttpd-001-remove-extra-unescape-PR14991.patch deleted file mode 100644 index 0ca847d01a..0000000000 --- a/packages/web/libmicrohttpd/patches/libmicrohttpd-001-remove-extra-unescape-PR14991.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c -index abc622e..cd4e825 100644 ---- a/src/microhttpd/connection.c -+++ b/src/microhttpd/connection.c -@@ -2307,10 +2307,6 @@ parse_initial_message_line (struct MHD_Connection *connection, - &connection_add_header, - &unused_num_headers); - } -- if (NULL != uri) -- daemon->unescape_callback (daemon->unescape_callback_cls, -- connection, -- uri); - connection->url = curi; - return MHD_YES; - } diff --git a/packages/web/nghttp2/package.mk b/packages/web/nghttp2/package.mk index e0b7d7b0f6..e0f68b9a65 100644 --- a/packages/web/nghttp2/package.mk +++ b/packages/web/nghttp2/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="nghttp2" -PKG_VERSION="1.36.0" -PKG_SHA256="e9bb86157b88eda5a6844a232e039febbb52c1aa44b640acbbfabe729b8287fc" +PKG_VERSION="1.38.0" +PKG_SHA256="ef75c761858241c6b4372fa6397aa0481a984b84b7b07c4ec7dc2d7b9eee87f8" PKG_LICENSE="MIT" PKG_SITE="http://www.linuxfromscratch.org/blfs/view/cvs/basicnet/nghttp2.html" PKG_URL="https://github.com/nghttp2/nghttp2/releases/download/v$PKG_VERSION/nghttp2-$PKG_VERSION.tar.xz" diff --git a/packages/x11/lib/libXcomposite/package.mk b/packages/x11/lib/libXcomposite/package.mk index 0398b21c0a..8c6320c355 100644 --- a/packages/x11/lib/libXcomposite/package.mk +++ b/packages/x11/lib/libXcomposite/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXcomposite" -PKG_VERSION="0.4.4" -PKG_SHA256="ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178" +PKG_VERSION="0.4.5" +PKG_SHA256="b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/lib/libXdamage/package.mk b/packages/x11/lib/libXdamage/package.mk index 6444b7a4b2..05d9df6b86 100644 --- a/packages/x11/lib/libXdamage/package.mk +++ b/packages/x11/lib/libXdamage/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXdamage" -PKG_VERSION="1.1.4" -PKG_SHA256="7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad" +PKG_VERSION="1.1.5" +PKG_SHA256="b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/lib/libXext/package.mk b/packages/x11/lib/libXext/package.mk index ef5d90d3e5..32e22a406d 100644 --- a/packages/x11/lib/libXext/package.mk +++ b/packages/x11/lib/libXext/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXext" -PKG_VERSION="1.3.3" -PKG_SHA256="b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35" +PKG_VERSION="1.3.4" +PKG_SHA256="59ad6fcce98deaecc14d39a672cf218ca37aba617c9a0f691cac3bcd28edf82b" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/lib/libXmu/package.mk b/packages/x11/lib/libXmu/package.mk index 1530b0aced..ed61419991 100644 --- a/packages/x11/lib/libXmu/package.mk +++ b/packages/x11/lib/libXmu/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXmu" -PKG_VERSION="1.1.2" -PKG_SHA256="756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" +PKG_VERSION="1.1.3" +PKG_SHA256="9c343225e7c3dc0904f2122b562278da5fed639b1b5e880d25111561bac5b731" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/lib/libXrandr/package.mk b/packages/x11/lib/libXrandr/package.mk index 492ee55a69..21a71ab930 100644 --- a/packages/x11/lib/libXrandr/package.mk +++ b/packages/x11/lib/libXrandr/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libXrandr" -PKG_VERSION="1.5.1" -PKG_SHA256="1ff9e7fa0e4adea912b16a5f0cfa7c1d35b0dcda0e216831f7715c8a3abcf51a" +PKG_VERSION="1.5.2" +PKG_SHA256="8aea0ebe403d62330bb741ed595b53741acf45033d3bda1792f1d4cc3daee023" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/lib/libxkbfile/package.mk b/packages/x11/lib/libxkbfile/package.mk index 6a1dbd053b..b8625de30e 100644 --- a/packages/x11/lib/libxkbfile/package.mk +++ b/packages/x11/lib/libxkbfile/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libxkbfile" -PKG_VERSION="1.0.9" -PKG_SHA256="51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a" +PKG_VERSION="1.1.0" +PKG_SHA256="758dbdaa20add2db4902df0b1b7c936564b7376c02a0acd1f2a331bd334b38c7" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/lib/xtrans/package.mk b/packages/x11/lib/xtrans/package.mk index 7f304f4e40..abd8dff183 100644 --- a/packages/x11/lib/xtrans/package.mk +++ b/packages/x11/lib/xtrans/package.mk @@ -1,9 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xtrans" -PKG_VERSION="1.3.5" -PKG_SHA256="adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301" +PKG_VERSION="1.4.0" +PKG_SHA256="377c4491593c417946efcd2c7600d1e62639f7a8bbca391887e2c4679807d773" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/lib/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/x11/xserver/xorg-server/package.mk b/packages/x11/xserver/xorg-server/package.mk index a4ab4eec04..bf3c23edbc 100644 --- a/packages/x11/xserver/xorg-server/package.mk +++ b/packages/x11/xserver/xorg-server/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="xorg-server" -PKG_VERSION="1.20.4" -PKG_SHA256="fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee" +PKG_VERSION="1.20.5" +PKG_SHA256="a81d8243f37e75a03d4f8c55f96d0bc25802be6ec45c3bfa5cb614c6d01bac9d" PKG_LICENSE="OSS" PKG_SITE="http://www.X.org" PKG_URL="http://xorg.freedesktop.org/archive/individual/xserver/$PKG_NAME-$PKG_VERSION.tar.bz2" From 2082afff7863d18f54f29f0be3015d79f607ce93 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Tue, 11 Jun 2019 18:42:38 +0100 Subject: [PATCH 65/68] mesa: update to mesa-19.1.0 --- packages/graphics/mesa/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/graphics/mesa/package.mk b/packages/graphics/mesa/package.mk index 7e334fa639..be0000923b 100644 --- a/packages/graphics/mesa/package.mk +++ b/packages/graphics/mesa/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="mesa" -PKG_VERSION="19.0.5" -PKG_SHA256="c0b760b0bdc4f65e0df0a74a59a6af5bbd1ddd401317a0343bb38ab8e6258c2d" +PKG_VERSION="19.1.0" +PKG_SHA256="0cb9a6dbc7019dd99be581488ff05ff56f49445cab82c28f0e610b2a4221620f" PKG_LICENSE="OSS" PKG_SITE="http://www.mesa3d.org/" PKG_URL="https://github.com/mesa3d/mesa/archive/mesa-$PKG_VERSION.tar.gz" From 1e505759d7442a0d2627c9b562a4faeab370f788 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 12 Jun 2019 00:40:02 +0100 Subject: [PATCH 66/68] busybox: update to busybox-1.31.0 --- packages/sysutils/busybox/config/busybox-host.conf | 12 +++++++++--- packages/sysutils/busybox/config/busybox-init.conf | 12 +++++++++--- packages/sysutils/busybox/config/busybox-target.conf | 12 +++++++++--- packages/sysutils/busybox/package.mk | 4 ++-- .../busybox-06-prevent-root-weak-passwd.patch | 8 +++++--- 5 files changed, 34 insertions(+), 14 deletions(-) diff --git a/packages/sysutils/busybox/config/busybox-host.conf b/packages/sysutils/busybox/config/busybox-host.conf index fe917ebea2..2af35c8e6a 100644 --- a/packages/sysutils/busybox/config/busybox-host.conf +++ b/packages/sysutils/busybox/config/busybox-host.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.0 -# Sun Dec 30 18:54:27 2018 +# Busybox version: 1.31.0 +# Wed Jun 12 00:50:03 2019 # CONFIG_HAVE_DOT_CONFIG=y @@ -34,6 +34,7 @@ CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SYSLOG_INFO is not set # CONFIG_FEATURE_SYSLOG is not set CONFIG_PLATFORM_LINUX=y @@ -236,7 +237,6 @@ CONFIG_GZIP_FAST=0 # CONFIG_FACTOR is not set # CONFIG_FALSE is not set # CONFIG_FOLD is not set -# CONFIG_FSYNC is not set # CONFIG_HEAD is not set # CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_HOSTID is not set @@ -299,6 +299,7 @@ CONFIG_GZIP_FAST=0 # CONFIG_SUM is not set # CONFIG_SYNC is not set # CONFIG_FEATURE_SYNC_FANCY is not set +# CONFIG_FSYNC is not set # CONFIG_TAC is not set # CONFIG_TAIL is not set # CONFIG_FEATURE_FANCY_TAIL is not set @@ -623,6 +624,7 @@ CONFIG_DEFAULT_DEPMOD_FILE="" # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set # CONFIG_FEATURE_MDEV_EXEC is not set # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # CONFIG_MKE2FS is not set @@ -762,6 +764,7 @@ CONFIG_FEATURE_CROND_DIR="" # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set +# CONFIG_I2CTRANSFER is not set # CONFIG_INOTIFYD is not set # CONFIG_LESS is not set CONFIG_FEATURE_LESS_MAXLINES=0 @@ -795,6 +798,7 @@ CONFIG_FEATURE_LESS_MAXLINES=0 # CONFIG_SETSERIAL is not set # CONFIG_STRINGS is not set # CONFIG_TIME is not set +# CONFIG_TS is not set # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set @@ -922,6 +926,7 @@ CONFIG_FEATURE_IP_ROUTE_DIR="" # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set @@ -1127,6 +1132,7 @@ CONFIG_BASH_IS_NONE=y # # CONFIG_FEATURE_SH_MATH is not set # CONFIG_FEATURE_SH_MATH_64 is not set +# CONFIG_FEATURE_SH_MATH_BASE is not set # CONFIG_FEATURE_SH_EXTRA_QUIET is not set # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set diff --git a/packages/sysutils/busybox/config/busybox-init.conf b/packages/sysutils/busybox/config/busybox-init.conf index be043295f5..2c39056f81 100644 --- a/packages/sysutils/busybox/config/busybox-init.conf +++ b/packages/sysutils/busybox/config/busybox-init.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.0 -# Sun Dec 30 18:55:59 2018 +# Busybox version: 1.31.0 +# Wed Jun 12 00:51:44 2019 # CONFIG_HAVE_DOT_CONFIG=y @@ -34,6 +34,7 @@ CONFIG_FEATURE_PREFER_APPLETS=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +# CONFIG_FEATURE_SYSLOG_INFO is not set # CONFIG_FEATURE_SYSLOG is not set CONFIG_PLATFORM_LINUX=y @@ -236,7 +237,6 @@ CONFIG_FEATURE_FANCY_ECHO=y # CONFIG_FACTOR is not set # CONFIG_FALSE is not set # CONFIG_FOLD is not set -# CONFIG_FSYNC is not set CONFIG_HEAD=y # CONFIG_FEATURE_FANCY_HEAD is not set # CONFIG_HOSTID is not set @@ -303,6 +303,7 @@ CONFIG_STAT=y # CONFIG_SUM is not set CONFIG_SYNC=y CONFIG_FEATURE_SYNC_FANCY=y +# CONFIG_FSYNC is not set # CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -635,6 +636,7 @@ CONFIG_LOSETUP=y # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set # CONFIG_FEATURE_MDEV_EXEC is not set # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # CONFIG_MKE2FS is not set @@ -782,6 +784,7 @@ CONFIG_FLASH_ERASEALL=y # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set +# CONFIG_I2CTRANSFER is not set # CONFIG_INOTIFYD is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -815,6 +818,7 @@ CONFIG_NANDWRITE=y # CONFIG_SETSERIAL is not set # CONFIG_STRINGS is not set # CONFIG_TIME is not set +# CONFIG_TS is not set # CONFIG_TTYSIZE is not set # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set @@ -942,6 +946,7 @@ CONFIG_FEATURE_FANCY_PING=y # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set @@ -1147,6 +1152,7 @@ CONFIG_CTTYHACK=y # CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y CONFIG_FEATURE_SH_STANDALONE=y # CONFIG_FEATURE_SH_NOFORK is not set diff --git a/packages/sysutils/busybox/config/busybox-target.conf b/packages/sysutils/busybox/config/busybox-target.conf index 354d2593e9..6be2607bc6 100644 --- a/packages/sysutils/busybox/config/busybox-target.conf +++ b/packages/sysutils/busybox/config/busybox-target.conf @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Busybox version: 1.30.0 -# Sun Dec 30 18:56:54 2018 +# Busybox version: 1.31.0 +# Wed Jun 12 00:53:01 2019 # CONFIG_HAVE_DOT_CONFIG=y @@ -34,6 +34,7 @@ CONFIG_FEATURE_SUID=y CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" # CONFIG_SELINUX is not set # CONFIG_FEATURE_CLEAN_UP is not set +CONFIG_FEATURE_SYSLOG_INFO=y CONFIG_FEATURE_SYSLOG=y CONFIG_PLATFORM_LINUX=y @@ -236,7 +237,6 @@ CONFIG_ENV=y # CONFIG_FACTOR is not set # CONFIG_FALSE is not set # CONFIG_FOLD is not set -# CONFIG_FSYNC is not set CONFIG_HEAD=y CONFIG_FEATURE_FANCY_HEAD=y # CONFIG_HOSTID is not set @@ -303,6 +303,7 @@ CONFIG_STAT=y # CONFIG_SUM is not set CONFIG_SYNC=y CONFIG_FEATURE_SYNC_FANCY=y +# CONFIG_FSYNC is not set # CONFIG_TAC is not set CONFIG_TAIL=y CONFIG_FEATURE_FANCY_TAIL=y @@ -635,6 +636,7 @@ CONFIG_IONICE=y # CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set # CONFIG_FEATURE_MDEV_EXEC is not set # CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set +# CONFIG_FEATURE_MDEV_DAEMON is not set # CONFIG_MESG is not set # CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP is not set # CONFIG_MKE2FS is not set @@ -782,6 +784,7 @@ CONFIG_FLASH_ERASEALL=y # CONFIG_I2CSET is not set # CONFIG_I2CDUMP is not set # CONFIG_I2CDETECT is not set +# CONFIG_I2CTRANSFER is not set # CONFIG_INOTIFYD is not set CONFIG_LESS=y CONFIG_FEATURE_LESS_MAXLINES=9999999 @@ -815,6 +818,7 @@ CONFIG_NANDWRITE=y CONFIG_SETSERIAL=y # CONFIG_STRINGS is not set CONFIG_TIME=y +# CONFIG_TS is not set CONFIG_TTYSIZE=y # CONFIG_UBIATTACH is not set # CONFIG_UBIDETACH is not set @@ -942,6 +946,7 @@ CONFIG_FEATURE_TELNET_AUTOLOGIN=y # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_TFTP is not set # CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set +# CONFIG_FEATURE_TFTP_HPA_COMPAT is not set # CONFIG_TFTPD is not set # CONFIG_FEATURE_TFTP_GET is not set # CONFIG_FEATURE_TFTP_PUT is not set @@ -1147,6 +1152,7 @@ CONFIG_ASH_CMDCMD=y # CONFIG_FEATURE_SH_MATH=y CONFIG_FEATURE_SH_MATH_64=y +CONFIG_FEATURE_SH_MATH_BASE=y CONFIG_FEATURE_SH_EXTRA_QUIET=y # CONFIG_FEATURE_SH_STANDALONE is not set # CONFIG_FEATURE_SH_NOFORK is not set diff --git a/packages/sysutils/busybox/package.mk b/packages/sysutils/busybox/package.mk index 68a7ae24b3..8a1e79f42e 100644 --- a/packages/sysutils/busybox/package.mk +++ b/packages/sysutils/busybox/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="busybox" -PKG_VERSION="1.30.1" -PKG_SHA256="3d1d04a4dbd34048f4794815a5c48ebb9eb53c5277e09ffffc060323b95dfbdc" +PKG_VERSION="1.31.0" +PKG_SHA256="0e4925392fd9f3743cc517e031b68b012b24a63b0cf6c1ff03cce7bb3846cc99" PKG_LICENSE="GPL" PKG_SITE="http://www.busybox.net" PKG_URL="http://busybox.net/downloads/$PKG_NAME-$PKG_VERSION.tar.bz2" diff --git a/packages/sysutils/busybox/patches/busybox-06-prevent-root-weak-passwd.patch b/packages/sysutils/busybox/patches/busybox-06-prevent-root-weak-passwd.patch index 932848bfbb..a8e5c706cf 100644 --- a/packages/sysutils/busybox/patches/busybox-06-prevent-root-weak-passwd.patch +++ b/packages/sysutils/busybox/patches/busybox-06-prevent-root-weak-passwd.patch @@ -1,9 +1,11 @@ +diff --git a/loginutils/passwd.c b/loginutils/passwd.c +index 6c643d3..df8859d 100644 --- a/loginutils/passwd.c +++ b/loginutils/passwd.c -@@ -72,7 +72,6 @@ static char* new_password(const struct p - newp = xstrdup(newp); /* we are going to bb_ask_stdin() again, so save it */ +@@ -69,7 +69,6 @@ static char* new_password(const struct passwd *pw, uid_t myuid, const char *algo + goto err_ret; if (ENABLE_FEATURE_PASSWD_WEAK_CHECK - && obscure(orig, newp, pw) + && obscure(orig, newp, pw) /* NB: passing NULL orig is ok */ - && myuid != 0 ) { goto err_ret; /* non-root is not allowed to have weak passwd */ From b1ace294eb699eb3fca3a442c64de6506d031379 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 25 May 2019 12:29:35 +0100 Subject: [PATCH 67/68] amremote: drop reference to non-existent package --- packages/virtual/remote/package.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/virtual/remote/package.mk b/packages/virtual/remote/package.mk index 8a2255699a..02dbeaf47e 100644 --- a/packages/virtual/remote/package.mk +++ b/packages/virtual/remote/package.mk @@ -1,5 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="remote" PKG_VERSION="1" @@ -13,7 +14,3 @@ PKG_LONGDESC="Meta package for installing various tools needed for remote suppor if [ "$ATVCLIENT_SUPPORT" = "yes" ]; then PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET atvclient" fi - -if [ "$AMREMOTE_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET amremote" -fi From 2ab4c72852e5f777a9a89973ce430945abaaeff1 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sat, 25 May 2019 12:32:23 +0100 Subject: [PATCH 68/68] atvclient: used by macmini hw, should be other support in kernel now --- config/show_config | 1 - distributions/LibreELEC/options | 3 --- packages/sysutils/atvclient/package.mk | 11 ----------- .../atvclient-0.1-change_config_location-0.1.patch | 12 ------------ .../sysutils/atvclient/system.d/atvclient.service | 8 -------- .../sysutils/atvclient/tmpfiles.d/63_atvclient.conf | 4 ---- packages/sysutils/atvclient/udev.d/98-appleir.rules | 4 ---- packages/virtual/remote/package.mk | 4 ---- projects/Allwinner/options | 3 --- projects/RPi/options | 3 --- projects/Rockchip/options | 3 --- 11 files changed, 56 deletions(-) delete mode 100644 packages/sysutils/atvclient/package.mk delete mode 100644 packages/sysutils/atvclient/patches/atvclient-0.1-change_config_location-0.1.patch delete mode 100644 packages/sysutils/atvclient/system.d/atvclient.service delete mode 100644 packages/sysutils/atvclient/tmpfiles.d/63_atvclient.conf delete mode 100644 packages/sysutils/atvclient/udev.d/98-appleir.rules diff --git a/config/show_config b/config/show_config index dc18851a32..c8d27265ea 100644 --- a/config/show_config +++ b/config/show_config @@ -53,7 +53,6 @@ show_config() { config_message="$config_message\n $dashes$dashes" config_message="$config_message\n - Remote support:\t\t\t $REMOTE_SUPPORT" - config_message="$config_message\n - ATV Remote support:\t\t\t $ATVCLIENT_SUPPORT" config_message="$config_message\n - CEC Adapter support:\t\t\t $CEC_SUPPORT" config_message="$config_message\n - CEC Framework support:\t\t $CEC_FRAMEWORK_SUPPORT" config_message="$config_message\n - Kodi Joystick support:\t\t $JOYSTICK_SUPPORT" diff --git a/distributions/LibreELEC/options b/distributions/LibreELEC/options index cb446938e4..59fe3e9798 100644 --- a/distributions/LibreELEC/options +++ b/distributions/LibreELEC/options @@ -140,9 +140,6 @@ # build and install remote support (yes / no) REMOTE_SUPPORT="yes" -# build and install ATV IR remote support (yes / no) - ATVCLIENT_SUPPORT="yes" - # build and install Joystick support (yes / no) JOYSTICK_SUPPORT="yes" diff --git a/packages/sysutils/atvclient/package.mk b/packages/sysutils/atvclient/package.mk deleted file mode 100644 index 4775f7d62d..0000000000 --- a/packages/sysutils/atvclient/package.mk +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) - -PKG_NAME="atvclient" -PKG_VERSION="0263b0a" -PKG_SHA256="9f741cf36655736ef578eaaca615fd9ce10e290f956cebcff3316d77152f0761" -PKG_LICENSE="GPL" -PKG_SITE="http://github.com/Evinyatar/atvclient/wiki" -PKG_URL="https://github.com/Evinyatar/atvclient/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain libusb-compat" -PKG_LONGDESC="A background application for Linux that reads input from the AppleTV’s internal infra-red receiver." diff --git a/packages/sysutils/atvclient/patches/atvclient-0.1-change_config_location-0.1.patch b/packages/sysutils/atvclient/patches/atvclient-0.1-change_config_location-0.1.patch deleted file mode 100644 index 439134eb76..0000000000 --- a/packages/sysutils/atvclient/patches/atvclient-0.1-change_config_location-0.1.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur atvclient-0.1/src/atvclient.cpp atvclient-0.1.patch/src/atvclient.cpp ---- atvclient-0.1/src/atvclient.cpp 2010-10-09 15:44:27.000000000 +0200 -+++ atvclient-0.1.patch/src/atvclient.cpp 2010-10-09 16:01:29.774444638 +0200 -@@ -161,7 +161,7 @@ - static CPacketNOTIFICATION remote_unpaired("Remote unpaired", "You can now control XBMC with any Apple remote.", NULL, NULL); - static CPacketNOTIFICATION remote_pair_failed("Remote already paired", "This AppleTV was paired to another remote. To unpair, hold down menu and rewind for 6 seconds.", NULL, NULL); - --const char* remoteIdFile = "/etc/atvremoteid"; -+const char* remoteIdFile = "/storage/.cache/atvremoteid"; - static int pairedRemoteId = 0; - - /* figure out kernel name corresponding to usb device */ diff --git a/packages/sysutils/atvclient/system.d/atvclient.service b/packages/sysutils/atvclient/system.d/atvclient.service deleted file mode 100644 index b67f76aa11..0000000000 --- a/packages/sysutils/atvclient/system.d/atvclient.service +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=ATV client remote support -After=syslog.target - -[Service] -ExecStart=/usr/sbin/atvclient -m -KillMode=process - diff --git a/packages/sysutils/atvclient/tmpfiles.d/63_atvclient.conf b/packages/sysutils/atvclient/tmpfiles.d/63_atvclient.conf deleted file mode 100644 index 747adb7d3e..0000000000 --- a/packages/sysutils/atvclient/tmpfiles.d/63_atvclient.conf +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) - -d /storage/.cache 0755 root root - - diff --git a/packages/sysutils/atvclient/udev.d/98-appleir.rules b/packages/sysutils/atvclient/udev.d/98-appleir.rules deleted file mode 100644 index 420e7af0dc..0000000000 --- a/packages/sysutils/atvclient/udev.d/98-appleir.rules +++ /dev/null @@ -1,4 +0,0 @@ -ACTION=="add", SUBSYSTEM=="usb", \ - ATTR{idVendor}=="05ac", ATTR{idProduct}=="824[012]", \ - RUN+="wakeup_enable", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="atvclient.service" diff --git a/packages/virtual/remote/package.mk b/packages/virtual/remote/package.mk index 02dbeaf47e..14aff9c3d0 100644 --- a/packages/virtual/remote/package.mk +++ b/packages/virtual/remote/package.mk @@ -10,7 +10,3 @@ PKG_URL="" PKG_DEPENDS_TARGET="toolchain eventlircd libirman v4l-utils" PKG_SECTION="virtual" PKG_LONGDESC="Meta package for installing various tools needed for remote support" - -if [ "$ATVCLIENT_SUPPORT" = "yes" ]; then - PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET atvclient" -fi diff --git a/projects/Allwinner/options b/projects/Allwinner/options index bc5690cb93..3e0aa6c8d8 100644 --- a/projects/Allwinner/options +++ b/projects/Allwinner/options @@ -77,9 +77,6 @@ # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" FIRMWARE="misc-firmware wlan-firmware dvb-firmware brcmfmac_sdio-firmware" - # build and install ATV IR remote support (yes / no) - ATVCLIENT_SUPPORT="no" - # build and install CEC framework support (yes / no) CEC_FRAMEWORK_SUPPORT="yes" diff --git a/projects/RPi/options b/projects/RPi/options index 172f569997..3713f2e866 100644 --- a/projects/RPi/options +++ b/projects/RPi/options @@ -111,9 +111,6 @@ # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" FIRMWARE="misc-firmware wlan-firmware dvb-firmware brcmfmac_sdio-firmware-rpi" - # build and install ATV IR remote support (yes / no) - ATVCLIENT_SUPPORT="no" - # build with installer (yes / no) INSTALLER_SUPPORT="no" diff --git a/projects/Rockchip/options b/projects/Rockchip/options index 4d9e18fab6..409645769a 100644 --- a/projects/Rockchip/options +++ b/projects/Rockchip/options @@ -66,9 +66,6 @@ # additional packages to install ADDITIONAL_PACKAGES="dtc" - # build and install ATV IR remote support (yes / no) - ATVCLIENT_SUPPORT="no" - # build and install CEC framework support (yes / no) CEC_FRAMEWORK_SUPPORT="yes"