From c809f1b352b5f457499d952c75e2133e6e7a4b26 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sat, 9 Feb 2019 17:05:20 +0200 Subject: [PATCH 0001/7482] package/python-cython: bump to version 0.29.5 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-cython/python-cython.hash | 4 ++-- package/python-cython/python-cython.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-cython/python-cython.hash b/package/python-cython/python-cython.hash index db0549c2d2..39ce8963b2 100644 --- a/package/python-cython/python-cython.hash +++ b/package/python-cython/python-cython.hash @@ -1,6 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/cython/json -md5 867c8b48f15a5249f476dc5a2cb58758 Cython-0.29.4.tar.gz -sha256 d1ee3d39c73a094ae5b6e2f9263ae0dc61af1b549a0869ade8c3c30325ed9f26 Cython-0.29.4.tar.gz +md5 074f70ec8bd0a6bf5cf658508c63a999 Cython-0.29.5.tar.gz +sha256 9d5290d749099a8e446422adfb0aa2142c711284800fb1eb70f595101e32cbf1 Cython-0.29.5.tar.gz # Locally computed sha256 checksums sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 LICENSE.txt sha256 e1eb1c49a8508e8173dac30157e4a6439a44ad8846194746c424fbc3fc2b95d7 COPYING.txt diff --git a/package/python-cython/python-cython.mk b/package/python-cython/python-cython.mk index fbe11e8087..9ab4ebb2a9 100644 --- a/package/python-cython/python-cython.mk +++ b/package/python-cython/python-cython.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_CYTHON_VERSION = 0.29.4 +PYTHON_CYTHON_VERSION = 0.29.5 PYTHON_CYTHON_SOURCE = Cython-$(PYTHON_CYTHON_VERSION).tar.gz -PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/cf/e2/03af631ca4a2cf7bc392dd8785c7cc427bff3af4bf5864cdde734f80d052 +PYTHON_CYTHON_SITE = https://files.pythonhosted.org/packages/e0/31/4a166556f92c469d8291d4b03a187f325c773c330fffc1e798bf83d947f2 PYTHON_CYTHON_SETUP_TYPE = setuptools PYTHON_CYTHON_LICENSE = Apache-2.0 PYTHON_CYTHON_LICENSE_FILES = COPYING.txt LICENSE.txt From 44b771b06b178a35dd44192a45600374def0e1f1 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sat, 9 Feb 2019 17:05:21 +0200 Subject: [PATCH 0002/7482] package/python-lxml: bump to version 4.3.1 iso-schematron.rng change: update RNG schema to 2016 specification. Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-lxml/python-lxml.hash | 4 ++-- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index 6558f107e3..19c30f3ac6 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,6 +1,6 @@ # Locally computed -sha256 7035d9361f3ceec9ccc1dd3482094d1174580e7e1bf6870b77ea758f7cad15d2 lxml-4.2.6.tar.gz +sha256 da5e7e941d6e71c9c9a717c93725cda0708c2474f532e3680ac5e39ec57d224d lxml-4.3.1.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt -sha256 705bdfece6dbb87879d9ec40a8c9530651aefb98ae387da9134584464742d539 src/lxml/isoschematron/resources/rng/iso-schematron.rng +sha256 56c5b13f28b78958890c36e3249c34c169041e42ebcfdce8080f3324ba2bf4de src/lxml/isoschematron/resources/rng/iso-schematron.rng diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 1b46670ffd..29c77dd351 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.2.6 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/b0/06/37437e348cd296c56a8bac0396007960abb2bcdaf77e8a3bde52bb68e550 +PYTHON_LXML_VERSION = 4.3.1 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/0f/bd/bb1464d1f363dbd805862c8a1ea258b9a4f4d2049c376d1c4790b6545691 PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From 1ffe9e78127fea40a76b75b1431b443e9888cd21 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sat, 9 Feb 2019 17:05:22 +0200 Subject: [PATCH 0003/7482] package/python-pip: bump to version 19.0.2 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-pip/python-pip.hash | 4 ++-- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index 149099b118..96baf04a00 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 b6919f1a368138f73b367abccc06f5ae pip-19.0.1.tar.gz -sha256 e81ddd35e361b630e94abeda4a1eddd36d47a90e71eb00f38f46b57f787cd1a5 pip-19.0.1.tar.gz +md5 526fd9ec1e6ea956b3571ebfb42cf83c pip-19.0.2.tar.gz +sha256 f851133f8b58283fa50d8c78675eb88d4ff4cde29b6c41205cd938b06338e0e5 pip-19.0.2.tar.gz # Locally computed sha256 checksums sha256 5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 22562cc93f..94926fce09 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 19.0.1 +PYTHON_PIP_VERSION = 19.0.2 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/c8/89/ad7f27938e59db1f0f55ce214087460f65048626e2226531ba6cb6da15f0 +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/4c/4d/88bc9413da11702cbbace3ccc51350ae099bb351febae8acc85fec34f9af PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt From b00a9f04b83f1c34dd6577e51c51d6e4beada9e8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 9 Feb 2019 07:46:54 +0800 Subject: [PATCH 0004/7482] package/zbar: bump to version 681b0f305fb5c5bb0df8437f7d740b29a93a7889 Zbar now has a dbus API which we should enable when dbus is present. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/zbar/zbar.hash | 2 +- package/zbar/zbar.mk | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/package/zbar/zbar.hash b/package/zbar/zbar.hash index 6735bc67d6..47a080af12 100644 --- a/package/zbar/zbar.hash +++ b/package/zbar/zbar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 94c71c6110c705f07ba5ba2803583d09b3853e8773169c86bdcf831443156aaa zbar-57d601e82089f2f31de9e1683c3834f237421f5d.tar.gz +sha256 7eb73c180c787184ede0f98806c52b23eb9c24609673e1ed51210504ea2937f5 zbar-681b0f305fb5c5bb0df8437f7d740b29a93a7889.tar.gz sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 LICENSE diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 6df069e001..fea233239f 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZBAR_VERSION = 57d601e82089f2f31de9e1683c3834f237421f5d +ZBAR_VERSION = 681b0f305fb5c5bb0df8437f7d740b29a93a7889 ZBAR_SITE = git://linuxtv.org/zbar.git ZBAR_LICENSE = LGPL-2.1+ ZBAR_LICENSE_FILES = LICENSE @@ -23,4 +23,11 @@ ZBAR_CONF_OPTS = \ --without-x \ --without-java +ifeq ($(BR2_PACKAGE_DBUS),y) +ZBAR_DEPENDENCIES += dbus +ZBAR_CONF_OPTS += --with-dbus +else +ZBAR_CONF_OPTS += --without-dbus +endif + $(eval $(autotools-package)) From 342e950c24700861b004b39c8f77977d238d0775 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 5 Feb 2019 15:31:24 +0100 Subject: [PATCH 0005/7482] package/openjdk-bin: new package Paradoxically, building OpenJDK requires a pre-existing JDK. This pre-existing JDK is called the "boot JDK." The boot JDK for building JDK major version N should be a JDK of major version N-1, so for building JDK11, JDK10 would be needed. This requirement is an issue when building on most distributions, as the host JDK tends to be JDK8. The AdoptOpenJDK project provides binaries that can act as the boot JDK to build the target JDK, which is what this package provides. Currently, only a x86_64 host is supported, for two reasons: 1) A 32bit x86 binary distribution is not available from AdoptOpenJDK 2) We didn't had access to a host machine using an architecture other than x86-64 The provided unpack200 has an invalid RPATH and relies on libzlib. When host-libzlib runs the install step, the following error is generated: *** ERROR: package host-libzlib installs executables without proper RPATH: *** $(HOST_DIR)/bin/unpack200 Because unpack200 is a deprecated tool, removing it after installation is safe and fixes the issue. Signed-off-by: Adam Duskett [Thomas: - fix comments in the code - use the more usual "cp -dpfr" command to copy files over] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/openjdk-bin/openjdk-bin.hash | 6 ++++++ package/openjdk-bin/openjdk-bin.mk | 26 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) create mode 100644 package/openjdk-bin/openjdk-bin.hash create mode 100644 package/openjdk-bin/openjdk-bin.mk diff --git a/DEVELOPERS b/DEVELOPERS index f2e69cc041..e7ab584be6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -50,6 +50,7 @@ F: package/libselinux/ F: package/libsemanage/ F: package/libsepol/ F: package/nginx-naxsi/ +F: package/openjdk-bin/ F: package/policycoreutils/ F: package/python-flask-sqlalchemy/ F: package/python-mutagen/ diff --git a/package/openjdk-bin/openjdk-bin.hash b/package/openjdk-bin/openjdk-bin.hash new file mode 100644 index 0000000000..d36a582a33 --- /dev/null +++ b/package/openjdk-bin/openjdk-bin.hash @@ -0,0 +1,6 @@ +# From https://github.com/AdoptOpenJDK/openjdk11-binaries/releases +sha256 d02089d834f7702ac1a9776d8d0d13ee174d0656cf036c6b68b9ffb71a6f610e OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz + +# Locally calculated +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 legal/java.prefs/LICENSE +sha256 a44eb7b5caf5534c6ef536b21edb40b4d6babf91bf97d9d45596868618b2c6fb legal/java.prefs/ASSEMBLY_EXCEPTION diff --git a/package/openjdk-bin/openjdk-bin.mk b/package/openjdk-bin/openjdk-bin.mk new file mode 100644 index 0000000000..1d4f44804c --- /dev/null +++ b/package/openjdk-bin/openjdk-bin.mk @@ -0,0 +1,26 @@ +################################################################################ +# +# host-openjdk-bin +# +################################################################################ + +HOST_OPENJDK_BIN_VERSION_MAJOR = 11.0.2 +HOST_OPENJDK_BIN_VERSION_MINOR = 9 +HOST_OPENJDK_BIN_VERSION = $(HOST_OPENJDK_BIN_VERSION_MAJOR)_$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_SOURCE = OpenJDK11U-jdk_x64_linux_hotspot_$(HOST_OPENJDK_BIN_VERSION).tar.gz +HOST_OPENJDK_BIN_SITE = https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-$(HOST_OPENJDK_BIN_VERSION_MAJOR)%2B$(HOST_OPENJDK_BIN_VERSION_MINOR) +HOST_OPENJDK_BIN_LICENSE = GPL-2.0+ with exception +HOST_OPENJDK_BIN_LICENSE_FILES = legal/java.prefs/LICENSE legal/java.prefs/ASSEMBLY_EXCEPTION + +# unpack200 has an invalid RPATH and relies on libzlib. When +# host-libzlib is installed on the system, the error "ERROR: package +# host-libzlib installs executables without proper RPATH: will occur. +# Because unpack200 is a deprecated tool, removing it to fix this +# issue is safe. +define HOST_OPENJDK_BIN_INSTALL_CMDS + cp -dpfr $(@D)/bin/* $(HOST_DIR)/bin/ + cp -dpfr $(@D)/lib/* $(HOST_DIR)/lib/ + $(RM) -f $(HOST_DIR)/bin/unpack200 +endef + +$(eval $(host-generic-package)) From 6518cf4da7dd7ef2e6ff472f913d9bb28bde39cf Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Feb 2019 22:40:47 +0100 Subject: [PATCH 0006/7482] package/ncmpc: bump to version 0.33 - Remove second patch (already in version) - Replace true/false by enabled/disabled, see: https://github.com/MusicPlayerDaemon/ncmpc/commit/67d96543e64ec2eff2d3e9907c570ca09918c893 - Add new boost system dependency: https://github.com/MusicPlayerDaemon/ncmpc/commit/74cc24bdfcfd0ba288b78f0fb75f409832d7586d https://github.com/MusicPlayerDaemon/ncmpc/commit/bef9017712da31b750799e6c7fb9d2829fa5e69c - Remove glib dependency: https://github.com/MusicPlayerDaemon/ncmpc/commit/dfcb3ab0216d6c9ae35d06060cee806bd919c2ba - Disable new regex option (based on pcre) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...constructor-to-simplify-initializers.patch | 217 ------------------ package/ncmpc/Config.in | 7 +- package/ncmpc/ncmpc.hash | 2 +- package/ncmpc/ncmpc.mk | 11 +- 4 files changed, 11 insertions(+), 226 deletions(-) delete mode 100644 package/ncmpc/0002-Global-Bindings-add-KeyBindings-constructor-to-simplify-initializers.patch diff --git a/package/ncmpc/0002-Global-Bindings-add-KeyBindings-constructor-to-simplify-initializers.patch b/package/ncmpc/0002-Global-Bindings-add-KeyBindings-constructor-to-simplify-initializers.patch deleted file mode 100644 index 217fa9b55b..0000000000 --- a/package/ncmpc/0002-Global-Bindings-add-KeyBindings-constructor-to-simplify-initializers.patch +++ /dev/null @@ -1,217 +0,0 @@ -From da27fcc39e187671b5e4373848f701a3d910446c Mon Sep 17 00:00:00 2001 -From: Max Kellermann -Date: Wed, 26 Sep 2018 09:51:09 +0200 -Subject: [PATCH] {Global,}Bindings: add KeyBindings constructor to simplify - initializers - -As a side effect, this works around a build failure with GCC 4.9. - -Signed-off-by: Fabrice Fontaine -[Retrieved from -https://github.com/MusicPlayerDaemon/ncmpc/commit/da27fcc39e187671b5e4373848f701a3d910446c -and updated for 0.31 (remove NEWS update)] ---- - src/Bindings.hxx | 3 + - src/GlobalBindings.cxx | 142 ++++++++++++++++++++--------------------- - 3 files changed, 75 insertions(+), 71 deletions(-) - -diff --git a/src/Bindings.hxx b/src/Bindings.hxx -index 342d951..0c630dc 100644 ---- a/src/Bindings.hxx -+++ b/src/Bindings.hxx -@@ -42,6 +42,9 @@ struct KeyBinding { - bool modified = false; - #endif - -+ constexpr KeyBinding(int a, int b=0, int c=0) noexcept -+ :keys{{a, b, c}} {} -+ - gcc_pure - bool HasKey(int key) const { - return std::find(keys.begin(), keys.end(), key) != keys.end(); -diff --git a/src/GlobalBindings.cxx b/src/GlobalBindings.cxx -index b565848..8049ed2 100644 ---- a/src/GlobalBindings.cxx -+++ b/src/GlobalBindings.cxx -@@ -51,110 +51,110 @@ - - static KeyBindings global_key_bindings{{{ - #ifdef ENABLE_KEYDEF_SCREEN -- { {'K', 0, 0 } }, -+ {'K'}, - #endif -- { { 'q', 'Q', C('C') } }, -+ {'q', 'Q', C('C')}, - - /* movement */ -- { { UP, 'k', 0 } }, -- { { DWN, 'j', 0 } }, -- { { 'H', 0, 0 } }, -- { { 'M', 0, 0 } }, -- { { 'L', 0, 0 } }, -- { { HOME, C('A'), 0 } }, -- { { END, C('E'), 0 } }, -- { { PGUP, 0, 0 } }, -- { { PGDN, 0, 0 } }, -- { { 'v', 0, 0 } }, -- { { C('N'), 0, 0 } }, -- { { C('B'), 0, 0 } }, -- { { 'N', 0, 0 } }, -- { { 'B', 0, 0 } }, -- { { 'l', 0, 0 } }, -+ {UP, 'k'}, -+ {DWN, 'j'}, -+ {'H'}, -+ {'M'}, -+ {'L'}, -+ {HOME, C('A')}, -+ {END, C('E')}, -+ {PGUP}, -+ {PGDN}, -+ {'v', 0}, -+ {C('N'), 0}, -+ {C('B'), 0}, -+ {'N', 0}, -+ {'B', 0}, -+ {'l'}, - - /* basic screens */ -- { { '1', F1, 'h' } }, -- { { '2', F2, 0 } }, -- { { '3', F3, 0 } }, -+ {'1', F1, 'h'}, -+ {'2', F2}, -+ {'3', F3}, - - /* player commands */ -- { { RET, 0, 0 } }, -- { { 'P', 0, 0 } }, -- { { 's', BS, 0 } }, -- { { 'o', 0, 0 } }, -- { { '>', 0, 0 } }, -- { { '<', 0, 0 } }, -- { { 'f', 0, 0 } }, -- { { 'b', 0, 0 } }, -- { { '+', RGHT, 0 } }, -- { { '-', LEFT, 0 } }, -- { { ' ', 0, 0 } }, -- { { 't', 0, 0 } }, -- { { DEL, 'd', 0 } }, -- { { 'Z', 0, 0 } }, -- { { 'c', 0, 0 } }, -- { { 'r', 0, 0 } }, -- { { 'z', 0, 0 } }, -- { { 'y', 0, 0 } }, -- { { 'C', 0, 0 } }, -- { { 'x', 0, 0 } }, -- { { C('U'), 0, 0 } }, -- { { 'S', 0, 0 } }, -- { { 'a', 0, 0 } }, -- -- { { '!', 0, 0 } }, -- { { '"', 0, 0 } }, -- -- { { 'G', 0, 0 } }, -+ {RET}, -+ {'P'}, -+ {'s', BS}, -+ {'o'}, -+ {'>'}, -+ {'<'}, -+ {'f'}, -+ {'b'}, -+ {'+', RGHT}, -+ {'-', LEFT}, -+ {' '}, -+ {'t'}, -+ {DEL, 'd'}, -+ {'Z'}, -+ {'c'}, -+ {'r'}, -+ {'z'}, -+ {'y'}, -+ {'C'}, -+ {'x'}, -+ {C('U')}, -+ {'S'}, -+ {'a'}, -+ -+ {'!'}, -+ {'"'}, -+ -+ {'G'}, - - /* lists */ -- { { C('K'), 0, 0 } }, -- { { C('J'), 0, 0 } }, -- { { C('L'), 0, 0 } }, -+ {C('K')}, -+ {C('J')}, -+ {C('L')}, - - - /* ncmpc options */ -- { { 'w', 0, 0 } }, -- { { 'U', 0, 0 } }, -+ {'w'}, -+ {'U'}, - - /* change screen */ -- { { TAB, 0, 0 } }, -- { { STAB, 0, 0 } }, -- { { '`', 0, 0 } }, -+ {TAB}, -+ {STAB}, -+ {'`'}, - - - /* find */ -- { { '/', 0, 0 } }, -- { { 'n', 0, 0 } }, -- { { '?', 0, 0 } }, -- { { 'p', 0, 0 } }, -- { { '.', 0, 0 } }, -+ {'/'}, -+ {'n'}, -+ {'?'}, -+ {'p'}, -+ {'.'}, - - - /* extra screens */ - #ifdef ENABLE_ARTIST_SCREEN -- { {'4', F4, 0 } }, -+ {'4', F4}, - #endif - #ifdef ENABLE_SEARCH_SCREEN -- { {'5', F5, 0 } }, -- { {'m', 0, 0 } }, -+ {'5', F5}, -+ {'m'}, - #endif - #ifdef ENABLE_SONG_SCREEN -- { { 'i', 0, 0 } }, -+ {'i'}, - #endif - #ifdef ENABLE_LYRICS_SCREEN -- { {'7', F7, 0 } }, -- { {ESC, 0, 0 } }, -- { {'u', 0, 0 } }, -- { {'e', 0, 0 } }, -+ {'7', F7}, -+ {ESC}, -+ {'u'}, -+ {'e'}, - #endif - - #ifdef ENABLE_OUTPUTS_SCREEN -- { {'8', F8, 0 } }, -+ {'8', F8}, - #endif - - #ifdef ENABLE_CHAT_SCREEN -- { {'9', F9, 0} }, -+ {'9', F9}, - #endif - }}}; - diff --git a/package/ncmpc/Config.in b/package/ncmpc/Config.in index d22ea368b4..00639b924a 100644 --- a/package/ncmpc/Config.in +++ b/package/ncmpc/Config.in @@ -2,10 +2,11 @@ config BR2_PACKAGE_NCMPC bool "ncmpc" depends on BR2_USE_MMU # fork() depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # libglib2 -> gettext - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 + depends on BR2_USE_WCHAR # boost + depends on BR2_TOOLCHAIN_HAS_THREADS # boost depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_BOOST + select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_LIBMPDCLIENT select BR2_PACKAGE_NCURSES help diff --git a/package/ncmpc/ncmpc.hash b/package/ncmpc/ncmpc.hash index afa5260be7..368bc642d1 100644 --- a/package/ncmpc/ncmpc.hash +++ b/package/ncmpc/ncmpc.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -sha256 8d3416c5b99ec21527b506f75bd7e536ddff60e61695b05989e791a751611bcc ncmpc-0.31.tar.xz +sha256 94e04a34854015aa013b43ec15b578f4541d077cf7ae5bf7c0944475673fd7a5 ncmpc-0.33.tar.xz # Hash for license file: sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 787f58201a..4167974490 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -5,22 +5,23 @@ ################################################################################ NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).31 +NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).33 NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) -NCMPC_DEPENDENCIES = host-pkgconf libglib2 libmpdclient ncurses +NCMPC_DEPENDENCIES = boost host-pkgconf libmpdclient ncurses NCMPC_LICENSE = GPL-2.0+ NCMPC_LICENSE_FILES = COPYING NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ - -Ddocumentation=false + -Ddocumentation=disabled \ + -Dregex=disabled ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) NCMPC_DEPENDENCIES += lirc-tools -NCMPC_CONF_OPTS += -Dlirc=true +NCMPC_CONF_OPTS += -Dlirc=enabled else -NCMPC_CONF_OPTS += -Dlirc=false +NCMPC_CONF_OPTS += -Dlirc=disabled endif $(eval $(meson-package)) From 87d57e0572c5a4890aecb979d2c3474a48705a26 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Feb 2019 22:40:48 +0100 Subject: [PATCH 0007/7482] package/ncmpc: add pcre optional dependency pcre dependency has been added in version 0.32: https://github.com/MusicPlayerDaemon/ncmpc/commit/0b3169510014f0f336de58864b97a3cc0f308500 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ncmpc/ncmpc.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/ncmpc/ncmpc.mk b/package/ncmpc/ncmpc.mk index 4167974490..2e52be27d5 100644 --- a/package/ncmpc/ncmpc.mk +++ b/package/ncmpc/ncmpc.mk @@ -14,8 +14,7 @@ NCMPC_LICENSE_FILES = COPYING NCMPC_CONF_OPTS = \ -Dcurses=ncurses \ - -Ddocumentation=disabled \ - -Dregex=disabled + -Ddocumentation=disabled ifeq ($(BR2_PACKAGE_LIRC_TOOLS),y) NCMPC_DEPENDENCIES += lirc-tools @@ -24,4 +23,11 @@ else NCMPC_CONF_OPTS += -Dlirc=disabled endif +ifeq ($(BR2_PACKAGE_PCRE),y) +NCMPC_DEPENDENCIES += pcre +NCMPC_CONF_OPTS += -Dregex=enabled +else +NCMPC_CONF_OPTS += -Dregex=disabled +endif + $(eval $(meson-package)) From 95942f5fcd35d783a49adce621ccf33480f1c88c Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 30 Jan 2019 11:47:23 +0100 Subject: [PATCH 0008/7482] boot/optee-os: new package OP-TEE OS is maintained by the OP-TEE project. It provides an open source solution for development and integration of secure services for Armv7-A and Armv8-A CPU based platforms supporting the TrustZone technology. This technology enables CPUs to concurrently host a secure world as the OP-TEE OS and a non-secure world as a Linux based OS. The OP-TEE project maintains other packages to leverage OP-TEE on Linux kernel based OSes. An OP-TEE interface driver is available in the Linux kernel since 4.12 upon CONFIG_OPTEE. This change references in Buildroot the today's latest OP-TEE revision release tagged 3.4.0. https://www.op-tee.org/ https://github.com/OP-TEE/optee_os Signed-off-by: Etienne Carriere [Thomas: - pass CFG_ARM32_core=y when building for ARMv7, otherwise the build fails - add a check that verifies that BR2_TARGET_OPTEE_OS_PLATFORM is not empty - minor formatting fixes/adjustements.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 3 + boot/Config.in | 1 + boot/optee-os/3.4.0/optee-os.hash | 4 ++ boot/optee-os/Config.in | 102 +++++++++++++++++++++++++++ boot/optee-os/optee-os.mk | 110 ++++++++++++++++++++++++++++++ 5 files changed, 220 insertions(+) create mode 100644 boot/optee-os/3.4.0/optee-os.hash create mode 100644 boot/optee-os/Config.in create mode 100644 boot/optee-os/optee-os.mk diff --git a/DEVELOPERS b/DEVELOPERS index e7ab584be6..89a8e2d2a2 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -683,6 +683,9 @@ F: package/mxsldr/ N: Ernesto L. Williams Jr F: package/szip/ +N: Etienne Carriere +F: boot/optee-os/ + N: Eugene Tarassov F: package/tcf-agent/ diff --git a/boot/Config.in b/boot/Config.in index 11856fd9c7..74481e7545 100644 --- a/boot/Config.in +++ b/boot/Config.in @@ -13,6 +13,7 @@ source "boot/gummiboot/Config.in" source "boot/lpc32xxcdl/Config.in" source "boot/mv-ddr-marvell/Config.in" source "boot/mxs-bootlets/Config.in" +source "boot/optee-os/Config.in" source "boot/riscv-pk/Config.in" source "boot/s500-bootloader/Config.in" source "boot/shim/Config.in" diff --git a/boot/optee-os/3.4.0/optee-os.hash b/boot/optee-os/3.4.0/optee-os.hash new file mode 100644 index 0000000000..07afdfac8f --- /dev/null +++ b/boot/optee-os/3.4.0/optee-os.hash @@ -0,0 +1,4 @@ +# From https://github.com/OP-TEE/optee_os/archive/3.4.0.tar.gz +sha256 51d42ac7aa780ec8d8ee471eff689a29a7621aacace046722b1490b62ec2d481 optee-os-3.4.0.tar.gz +# Locally computed +sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/boot/optee-os/Config.in b/boot/optee-os/Config.in new file mode 100644 index 0000000000..a1f1b910ac --- /dev/null +++ b/boot/optee-os/Config.in @@ -0,0 +1,102 @@ +config BR2_TARGET_OPTEE_OS + bool "optee_os" + depends on BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A + help + OP-TEE OS provides the secure world boot image and the trust + application development kit of the OP-TEE project. OP-TEE OS + also provides generic trusted application one can embedded + into its system. + + http://github.com/OP-TEE/optee_os + +if BR2_TARGET_OPTEE_OS + +choice + prompt "OP-TEE OS version" + default BR2_TARGET_OPTEE_OS_LATEST + help + Select the version of OP-TEE OS you want to use + +config BR2_TARGET_OPTEE_OS_LATEST + bool "3.4.0" + help + Use the latest release tag from the OP-TEE OS official Git + repository. + +config BR2_TARGET_OPTEE_OS_CUSTOM_GIT + bool "Custom Git repository" + help + Use a custom version fetched from a Git repository. + +endchoice + +if BR2_TARGET_OPTEE_OS_CUSTOM_GIT + +config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL + string "URL of custom repository" + depends on BR2_TARGET_OPTEE_OS_CUSTOM_GIT + help + Specific location of the reference source tree Git + repository. + +config BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION + string "Custom repository version" + depends on BR2_TARGET_OPTEE_OS_CUSTOM_GIT + help + Revision to use in the typical format used by Git, i.e a + SHA1 or a tag. + +endif + +config BR2_TARGET_OPTEE_OS_VERSION + string + default "3.4.0" if BR2_TARGET_OPTEE_OS_LATEST + default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \ + if BR2_TARGET_OPTEE_OS_CUSTOM_GIT + +config BR2_TARGET_OPTEE_OS_CORE + bool "Build core" + default y + help + This option will build and install the OP-TEE core + boot images. + +config BR2_TARGET_OPTEE_OS_SDK + bool "Build TA devkit" + default y + help + This option will build and install the OP-TEE development + kit for building OP-TEE trusted application images. It is + installed in the staging directory /lib/optee. + +config BR2_TARGET_OPTEE_OS_SERVICES + bool "Build service TAs" + default y + select BR2_TARGET_OPTEE_OS_CORE + help + This option installs the service trusted applications built + from OP-TEE OS source tree. These are installed in the target + /lib/optee_armtz directory as other trusted applications. + At runtime OP-TEE OS can load trusted applications from this + non-secure filesystem/directory into the secure world for + execution. + +config BR2_TARGET_OPTEE_OS_PLATFORM + string "Target platform (mandatory)" + help + Value for the mandated PLATFORM build directive provided to + OP-TEE OS. + +config BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR + string "Target platform flavor (optional)" + help + Value for the optional PLATFORM_FLAVOR build directive + provided to OP-TEE OS. + +config BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES + string "Additional build variables" + help + Additional parameters for the OP-TEE OS build + E.g. 'CFG_TEE_CORE_LOG_LEVEL=3 CFG_UNWIND=y' + +endif # BR2_TARGET_OPTEE_OS diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk new file mode 100644 index 0000000000..aeac067309 --- /dev/null +++ b/boot/optee-os/optee-os.mk @@ -0,0 +1,110 @@ +################################################################################ +# +# optee-os +# +################################################################################ + +OPTEE_OS_VERSION = $(call qstrip,$(BR2_TARGET_OPTEE_OS_VERSION)) +OPTEE_OS_LICENSE = BSD-2-Clause +OPTEE_OS_LICENSE_FILES = LICENSE + +OPTEE_OS_INSTALL_STAGING = YES +OPTEE_OS_INSTALL_IMAGES = YES + +ifeq ($(BR2_TARGET_OPTEE_OS_CUSTOM_GIT),y) +OPTEE_OS_SITE = $(call qstrip,$(BR2_TARGET_OPTEE_OS_CUSTOM_REPO_URL)) +OPTEE_OS_SITE_METHOD = git +BR_NO_CHECK_HASH_FOR += $(OPTEE_OS_SOURCE) +else +OPTEE_OS_SITE = $(call github,OP-TEE,optee_os,$(OPTEE_OS_VERSION)) +endif + +OPTEE_OS_DEPENDENCIES = host-openssl host-python-pycrypto + +# On 64bit targets, OP-TEE OS can be built in 32bit mode, or +# can be built in 64bit mode and support 32bit and 64bit +# trusted applications. Since buildroot currently references +# a single cross compiler, build exclusively in 32bit +# or 64bit mode. +OPTEE_OS_MAKE_OPTS = \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + CROSS_COMPILE_core="$(TARGET_CROSS)" \ + CROSS_COMPILE_ta_arm64="$(TARGET_CROSS)" \ + CROSS_COMPILE_ta_arm32="$(TARGET_CROSS)" + +ifeq ($(BR2_aarch64),y) +OPTEE_OS_MAKE_OPTS += \ + CFG_ARM64_core=y \ + CFG_USER_TA_TARGETS=ta_arm64 +else +OPTEE_OS_MAKE_OPTS += \ + CFG_ARM32_core=y +endif + +# Get mandatory PLAFORM and optional PLATFORM_FLAVOR and additional +# variables +OPTEE_OS_MAKE_OPTS += PLATFORM=$(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM)) +ifneq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR)),) +OPTEE_OS_MAKE_OPTS += PLATFORM_FLAVOR=$(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM_FLAVOR)) +endif +OPTEE_OS_MAKE_OPTS += $(call qstrip,$(BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES)) + +# Requests OP-TEE OS to build from subdirectory out/ of its sourcetree +# root path otherwise the output directory path depends on the target +# platform name. +OPTEE_OS_BUILDDIR_OUT = out +ifeq ($(BR2_aarch64),y) +OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm64 +endif +ifeq ($(BR2_arm),y) +OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm32 +endif + +ifeq ($(BR2_TARGET_OPTEE_OS_CORE),y) +define OPTEE_OS_BUILD_CORE + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) O=$(OPTEE_OS_BUILDDIR_OUT) \ + $(TARGET_CONFIGURE_OPTS) $(OPTEE_OS_MAKE_OPTS) all +endef +define OPTEE_OS_INSTALL_IMAGES_CORE + mkdir -p $(BINARIES_DIR) + cp -dpf $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/core/tee.bin $(BINARIES_DIR) + cp -dpf $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/core/tee-*_v2.bin $(BINARIES_DIR) +endef +endif # BR2_TARGET_OPTEE_OS_CORE + +ifeq ($(BR2_TARGET_OPTEE_OS_SERVICES),y) +define OPTEE_OS_INSTALL_IMAGES_SERVICES + mkdir -p $(TARGET_DIR)/lib/optee_armtz + $(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz \ + $(@D)/$(OPTEE_OS_BUILDDIR_OUT)/ta/*/*.ta +endef +endif # BR2_TARGET_OPTEE_OS_SERVICES + +ifeq ($(BR2_TARGET_OPTEE_OS_SDK),y) +define OPTEE_OS_BUILD_SDK + $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) O=$(OPTEE_OS_BUILDDIR_OUT) \ + $(TARGET_CONFIGURE_OPTS) $(OPTEE_OS_MAKE_OPTS) ta_dev_kit +endef +define OPTEE_OS_INSTALL_STAGING_CMDS + mkdir -p $(STAGING_DIR)/lib/optee + cp -ardpf $(@D)/$(OPTEE_OS_LOCAL_SDK) $(STAGING_DIR)/lib/optee +endef +endif # BR2_TARGET_OPTEE_OS_SDK + +define OPTEE_OS_BUILD_CMDS + $(OPTEE_OS_BUILD_CORE) + $(OPTEE_OS_BUILD_SDK) +endef + +define OPTEE_OS_INSTALL_IMAGES_CMDS + $(OPTEE_OS_INSTALL_IMAGES_CORE) + $(OPTEE_OS_INSTALL_IMAGES_SERVICES) +endef + +ifeq ($(BR2_TARGET_OPTEE_OS)$(BR_BUILDING),yy) +ifeq ($(call qstrip,$(BR2_TARGET_OPTEE_OS_PLATFORM)),) +$(error No OP-TEE OS platform set. Check your BR2_TARGET_OPTEE_OS_PLATFORM setting) +endif +endif # BR2_TARGET_OPTEE_OS && BR2_BUILDING + +$(eval $(generic-package)) From 5d01704cff25d956dc03523ea65b9eefc98db9db Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sun, 10 Feb 2019 19:55:45 +0200 Subject: [PATCH 0009/7482] package/libuv: bump to version 1.26.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index 8f11743b5a..e0a217c625 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ce3036d444c3fb4f9a9e2994bec1f4fa07872b01456998b422ce918fdc55c254 libuv-v1.25.0.tar.gz +sha256 e414cf74615b7dae768f0f5667092f1d4975f5067c087bcbe0641e241ebe4693 libuv-v1.26.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index fec6659ed9..4ab7f754ff 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.25.0 +LIBUV_VERSION = v1.26.0 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From 9accc7f095901e62c06f2c366592b2dc0c5bac14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Sat, 9 Feb 2019 17:35:55 +0100 Subject: [PATCH 0010/7482] package/wine: bump to version 4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/wine/wine.hash | 2 +- package/wine/wine.mk | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/package/wine/wine.hash b/package/wine/wine.hash index ba007142e8..6993d6ecbc 100644 --- a/package/wine/wine.hash +++ b/package/wine/wine.hash @@ -1,2 +1,2 @@ # Locally calculated after checking pgp signature -sha256 d45a88edbe7db363e297cacedc94e66df3464504a01c2eccf04f518066a6fb0c wine-3.0.4.tar.xz +sha256 6736cdee95b2b8bb021ec0c19497ed8cad5ae2c8bfdb7ab5dc687ff92a480d4d wine-4.0.tar.xz diff --git a/package/wine/wine.mk b/package/wine/wine.mk index 7e44e3c81d..78fa860ecf 100644 --- a/package/wine/wine.mk +++ b/package/wine/wine.mk @@ -4,9 +4,9 @@ # ################################################################################ -WINE_VERSION = 3.0.4 +WINE_VERSION = 4.0 WINE_SOURCE = wine-$(WINE_VERSION).tar.xz -WINE_SITE = https://dl.winehq.org/wine/source/3.0 +WINE_SITE = https://dl.winehq.org/wine/source/4.0 WINE_LICENSE = LGPL-2.1+ WINE_LICENSE_FILES = COPYING.LIB LICENSE WINE_DEPENDENCIES = host-bison host-flex host-wine @@ -25,7 +25,9 @@ WINE_CONF_OPTS = \ --without-gsm \ --without-hal \ --without-opencl \ - --without-oss + --without-oss \ + --without-vkd3d \ + --without-vulkan # Wine uses a wrapper around gcc, and uses the value of --host to # construct the filename of the gcc to call. But for external @@ -222,6 +224,13 @@ else WINE_CONF_OPTS += --without-sane endif +ifeq ($(BR2_PACKAGE_SDL2),y) +WINE_CONF_OPTS += --with-sdl +WINE_DEPENDENCIES += sdl2 +else +WINE_CONF_OPTS += --without-sdl +endif + ifeq ($(BR2_PACKAGE_TIFF),y) WINE_CONF_OPTS += --with-tiff WINE_DEPENDENCIES += tiff @@ -356,6 +365,7 @@ HOST_WINE_CONF_OPTS += \ --without-glu \ --without-gnutls \ --without-gsm \ + --without-gssapi \ --without-gstreamer \ --without-hal \ --without-jpeg \ @@ -372,8 +382,11 @@ HOST_WINE_CONF_OPTS += \ --without-pulse \ --without-png \ --without-sane \ + --without-sdl \ --without-tiff \ --without-v4l \ + --without-vkd3d \ + --without-vulkan \ --without-x \ --without-xcomposite \ --without-xcursor \ From 7d0203387e4a7afa93773170e04e8850cde5c631 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 5 Feb 2019 21:41:49 +0100 Subject: [PATCH 0011/7482] package/libwpe: new package Signed-off-by: Francois Perrad Reviewed-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/libwpe/Config.in | 13 +++++++++++++ package/libwpe/libwpe.hash | 7 +++++++ package/libwpe/libwpe.mk | 22 ++++++++++++++++++++++ 5 files changed, 45 insertions(+) create mode 100644 package/libwpe/Config.in create mode 100644 package/libwpe/libwpe.hash create mode 100644 package/libwpe/libwpe.mk diff --git a/DEVELOPERS b/DEVELOPERS index 89a8e2d2a2..50e4ffe6a9 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -68,6 +68,7 @@ F: package/sngrep/ N: Adrian Perez de Castro F: package/brotli/ F: package/libepoxy/ +F: package/libwpe/ F: package/webkitgtk/ F: package/woff2/ @@ -827,6 +828,7 @@ F: package/gdbm/ F: package/libtomcrypt/ F: package/libtommath/ F: package/libump/ +F: package/libwpe/ F: package/linenoise/ F: package/ljlinenoise/ F: package/lpeg/ diff --git a/package/Config.in b/package/Config.in index 29862c478c..84ccb0358f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1302,6 +1302,7 @@ menu "Graphics" source "package/libva-intel-driver/Config.in" source "package/libvdpau/Config.in" source "package/libvips/Config.in" + source "package/libwpe/Config.in" source "package/menu-cache/Config.in" source "package/opencv/Config.in" source "package/opencv3/Config.in" diff --git a/package/libwpe/Config.in b/package/libwpe/Config.in new file mode 100644 index 0000000000..c11c853985 --- /dev/null +++ b/package/libwpe/Config.in @@ -0,0 +1,13 @@ +comment "libwpe needs a toolchain w/ C++, dynamic library and an OpenEGL-capable backend" + depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS + +config BR2_PACKAGE_LIBWPE + bool "libwpe" + depends on !BR2_STATIC_LIBS # dlfcn.h + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_LIBXKBCOMMON + help + Base library for the WPE WebKit port. + + https://wpewebkit.org/ diff --git a/package/libwpe/libwpe.hash b/package/libwpe/libwpe.hash new file mode 100644 index 0000000000..58dba92e6f --- /dev/null +++ b/package/libwpe/libwpe.hash @@ -0,0 +1,7 @@ +# From https://wpewebkit.org/releases/libwpe-1.0.0.tar.xz.sums +md5 b5ea32bd644811d5c6433cf1439763f7 libwpe-1.0.0.tar.xz +sha1 6e51591c00a9a6128e19920807e6874794c723fd libwpe-1.0.0.tar.xz +sha256 aff11612123f9ab85a8b9a4bcdfb3a7503eba0a0d2d96f2cdecd30e911091719 libwpe-1.0.0.tar.xz + +# Hashes for license files: +sha256 6efc9991641b47b1f4e727db7f090d0ade00117dcbbc74be622f2baceddb1f22 COPYING diff --git a/package/libwpe/libwpe.mk b/package/libwpe/libwpe.mk new file mode 100644 index 0000000000..aad1214e1d --- /dev/null +++ b/package/libwpe/libwpe.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# libwpe +# +################################################################################ + +LIBWPE_VERSION = 1.0.0 +LIBWPE_SITE = https://wpewebkit.org/releases +LIBWPE_SOURCE = libwpe-$(LIBWPE_VERSION).tar.xz +LIBWPE_INSTALL_STAGING = YES +LIBWPE_LICENSE = BSD-2-Clause +LIBWPE_LICENSE_FILES = COPYING +LIBWPE_DEPENDENCIES = libegl libxkbcommon + +# Workaround for https://github.com/raspberrypi/userland/issues/316 +ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) +LIBWPE_CONF_OPTS += \ + -DCMAKE_C_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' \ + -DCMAKE_CXX_FLAGS='$(TARGET_CFLAGS) -D_GNU_SOURCE' +endif + +$(eval $(cmake-package)) From 82f1c43aa458a357535eff6adc4bf1f7972a63d5 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 5 Feb 2019 21:41:50 +0100 Subject: [PATCH 0012/7482] package/wpebackend-fdo: new package Signed-off-by: Francois Perrad Reviewed-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/wpebackend-fdo/Config.in | 19 +++++++++++++++++++ package/wpebackend-fdo/wpebackend-fdo.hash | 7 +++++++ package/wpebackend-fdo/wpebackend-fdo.mk | 15 +++++++++++++++ 5 files changed, 44 insertions(+) create mode 100644 package/wpebackend-fdo/Config.in create mode 100644 package/wpebackend-fdo/wpebackend-fdo.hash create mode 100644 package/wpebackend-fdo/wpebackend-fdo.mk diff --git a/DEVELOPERS b/DEVELOPERS index 50e4ffe6a9..f5d302d286 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -71,6 +71,7 @@ F: package/libepoxy/ F: package/libwpe/ F: package/webkitgtk/ F: package/woff2/ +F: package/wpebackend-fdo/ N: Adrien Gallouët F: package/bird/ @@ -847,6 +848,7 @@ F: package/qemu/ F: package/sdl2_mixer/ F: package/sdl2_net/ F: package/tekui/ +F: package/wpebackend-fdo/ F: package/wsapi-fcgi/ F: package/wsapi-xavante/ F: utils/scancpan diff --git a/package/Config.in b/package/Config.in index 84ccb0358f..61ae22db02 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1321,6 +1321,7 @@ menu "Graphics" source "package/webkitgtk/Config.in" source "package/webp/Config.in" source "package/woff2/Config.in" + source "package/wpebackend-fdo/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" endmenu diff --git a/package/wpebackend-fdo/Config.in b/package/wpebackend-fdo/Config.in new file mode 100644 index 0000000000..2f5f965403 --- /dev/null +++ b/package/wpebackend-fdo/Config.in @@ -0,0 +1,19 @@ +comment "wpebackend-fdo needs a toolchain w/ C++, wchar, threads, dynamic library and an OpenEGL-capable backend" + depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS + +config BR2_PACKAGE_WPEBACKEND_FDO + bool "wpebackend-fdo" + depends on !BR2_STATIC_LIBS # wayland + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, libglib2 + depends on BR2_USE_WCHAR # libglib2 + depends on BR2_USE_MMU # libglib2 + depends on BR2_PACKAGE_HAS_LIBEGL + select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_LIBWPE + select BR2_PACKAGE_WAYLAND + help + WPEBackend interface using freedesktop.org API. + + https://wpewebkit.org/ diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash new file mode 100644 index 0000000000..20c89d324c --- /dev/null +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -0,0 +1,7 @@ +# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.0.tar.xz.sums +md5 5318728afb3bf7417293af67ce427963 wpebackend-fdo-1.0.0.tar.xz +sha1 7ee22bc1d585616f4ad2047d8be54ec396486211 wpebackend-fdo-1.0.0.tar.xz +sha256 7a747f87a1ae46d30144369050e3ce348b58986d04e1a139ba75c198fa636729 wpebackend-fdo-1.0.0.tar.xz + +# Hashes for license files: +sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk new file mode 100644 index 0000000000..06c87cb9bf --- /dev/null +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# wpebackend-fdo +# +################################################################################ + +WPEBACKEND_FDO_VERSION = 1.0.0 +WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases +WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz +WPEBACKEND_FDO_INSTALL_STAGING = YES +WPEBACKEND_FDO_LICENSE = BSD-2-Clause +WPEBACKEND_FDO_LICENSE_FILES = COPYING +WPEBACKEND_FDO_DEPENDENCIES = libglib2 libwpe wayland + +$(eval $(cmake-package)) From 5de3ceff2cae8221e6b34338c7088e58c4b19053 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 5 Feb 2019 21:41:51 +0100 Subject: [PATCH 0013/7482] package/wpewebkit: new package Signed-off-by: Francois Perrad Reviewed-by: Adrian Perez de Castro [Thomas: - add missing depends on BR2_HOST_GCC_AT_LEAST_4_8 - improve comments on depends on - add missing "comment" for toolchain dependencies - add missing "depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS" on the Config.in comment - add missing "select BR2_PACKAGE_WAYLAND", which is needed to select BR2_PACKAGE_WAYLAND_PROTOCOLS - fix typoes in the JIT enabling code that was using WEBKITGTK_CONF_OPTS instead of WPEWEBKIT_CONF_OPTS] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 + package/Config.in | 1 + package/wpewebkit/Config.in | 125 +++++++++++++++++++++++++++++++ package/wpewebkit/wpewebkit.hash | 8 ++ package/wpewebkit/wpewebkit.mk | 61 +++++++++++++++ 5 files changed, 197 insertions(+) create mode 100644 package/wpewebkit/Config.in create mode 100644 package/wpewebkit/wpewebkit.hash create mode 100644 package/wpewebkit/wpewebkit.mk diff --git a/DEVELOPERS b/DEVELOPERS index f5d302d286..9746ba6792 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -72,6 +72,7 @@ F: package/libwpe/ F: package/webkitgtk/ F: package/woff2/ F: package/wpebackend-fdo/ +F: package/wpewebkit/ N: Adrien Gallouët F: package/bird/ @@ -849,6 +850,7 @@ F: package/sdl2_mixer/ F: package/sdl2_net/ F: package/tekui/ F: package/wpebackend-fdo/ +F: package/wpewebkit/ F: package/wsapi-fcgi/ F: package/wsapi-xavante/ F: utils/scancpan diff --git a/package/Config.in b/package/Config.in index 61ae22db02..0a5180a238 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1322,6 +1322,7 @@ menu "Graphics" source "package/webp/Config.in" source "package/woff2/Config.in" source "package/wpebackend-fdo/Config.in" + source "package/wpewebkit/Config.in" source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" endmenu diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in new file mode 100644 index 0000000000..64e81a95f9 --- /dev/null +++ b/package/wpewebkit/Config.in @@ -0,0 +1,125 @@ +config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + bool + # ARM needs BLX, so v5t+, BE completely untested so disabled + default y if BR2_arm && !BR2_ARM_CPU_ARMV4 + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_i386 || BR2_x86_64 + # Disabled on MIPS big endian due to sigbus + default y if BR2_mipsel || BR2_mips64el + # Disabled on PowerPC pending runtime testing + # Disabled on SuperH because of segfault + depends on BR2_USE_MMU # libglib2 + depends on BR2_TOOLCHAIN_HAS_SYNC_4 + depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt + +config BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT + bool + # ARM needs NEON for JIT. + default y if BR2_ARM_CPU_HAS_NEON + # AArch64 is supported upstream but not well tested on big-endian mode. + default y if BR2_aarch64 + # i386 & x86_64 don't have any special requirements. + default y if BR2_i386 + default y if BR2_x86_64 + # JIT is known not to work on MIPS64. + # Plain MIPS32 (pre R2) is not well tested and likely broken, and R6 + # is unsupported, see https://bugs.webkit.org/show_bug.cgi?id=191258 + # The MIPS support is completely untested in big-endian mode. + default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R2 + default y if BR2_mipsel && BR2_MIPS_CPU_MIPS32R5 + +comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.8, host gcc >= 4.8" + depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on !BR2_BINFMT_FLAT + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ + || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_HOST_GCC_AT_LEAST_4_8 + +comment "wpewebkit needs an OpenGL ES w/ EGL backend" + depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + depends on !BR2_BINFMT_FLAT + depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL + +config BR2_PACKAGE_WPEWEBKIT + bool "wpewebkit" + depends on !BR2_STATIC_LIBS # wayland + depends on !BR2_BINFMT_FLAT # icu + depends on BR2_INSTALL_LIBSTDCPP # harfbuzz, icu + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland, icu, libsoup + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu + depends on BR2_USE_WCHAR # icu, libsoup + depends on BR2_PACKAGE_HAS_LIBGLES # libepoxy + depends on BR2_PACKAGE_HAS_LIBEGL # libepoxy + depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS + select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_CAIRO_PNG + select BR2_PACKAGE_HARFBUZZ + select BR2_PACKAGE_ICU + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBEPOXY + select BR2_PACKAGE_LIBGCRYPT + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBSOUP + select BR2_PACKAGE_LIBTASN1 + select BR2_PACKAGE_LIBXSLT + select BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_WAYLAND_PROTOCOLS + select BR2_PACKAGE_WEBP + select BR2_PACKAGE_WEBP_DEMUX + select BR2_PACKAGE_WPEBACKEND_FDO + help + WPE (Web Platform for Embedded) port of the WebKit engine, + to allow embedders to create simple and performant systems + based on Web platform technologies. + + https://wpewebkit.org/ + +if BR2_PACKAGE_WPEWEBKIT + +config BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA + bool "multimedia support" + select BR2_PACKAGE_GSTREAMER1 + select BR2_PACKAGE_GST1_PLUGINS_BAD + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX + select BR2_PACKAGE_GST1_PLUGINS_BASE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE + select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME + select BR2_PACKAGE_GST1_PLUGINS_GOOD + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP + select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX + select BR2_PACKAGE_GST1_LIBAV + help + This option pulls in all of the required dependencies + to enable multimedia (video/audio) support. + +if BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA + +config BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL + bool "use gstreamer-gl" + default y + depends on BR2_PACKAGE_GST1_PLUGINS_BASE_HAS_LIB_OPENGL + select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL + help + Use the GStreamer GL elements for handling video content. + This is recommended as it improves performance of video + playback. In some target configurations incorrect rendering + might be produced, and disabling this option may help. + +endif + +config BR2_PACKAGE_WPEWEBKIT_WEBDRIVER + bool "WebDriver support" + help + Enable support for WebDriver. This will build and install the + WebKitWebDriver program in the target. + +endif diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash new file mode 100644 index 0000000000..39937a3465 --- /dev/null +++ b/package/wpewebkit/wpewebkit.hash @@ -0,0 +1,8 @@ +# From https://wpewebkit.org/releases/wpewebkit-2.22.3.tar.xz.sums +md5 6d0c693ea49a93fc9e701cf784245ea5 wpewebkit-2.22.3.tar.xz +sha1 d8a22bec787f38939c7922dc43bf27c9144cef74 wpewebkit-2.22.3.tar.xz +sha256 241f177cded1a4ba3088716650eaaac25588878882170789b3c630ac45dbb2fa wpewebkit-2.22.3.tar.xz + +# Hashes for license files: +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce Source/WebCore/LICENSE-LGPL-2.1 diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk new file mode 100644 index 0000000000..6b3d56ab0c --- /dev/null +++ b/package/wpewebkit/wpewebkit.mk @@ -0,0 +1,61 @@ +################################################################################ +# +# wpewebkit +# +################################################################################ + +WPEWEBKIT_VERSION = 2.22.3 +WPEWEBKIT_SITE = http://www.wpewebkit.org/releases +WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz +WPEWEBKIT_INSTALL_STAGING = YES +WPEWEBKIT_LICENSE = LGPL-2.1+, BSD-2-Clause +WPEWEBKIT_LICENSE_FILES = \ + Source/WebCore/LICENSE-APPLE \ + Source/WebCore/LICENSE-LGPL-2.1 +WPEWEBKIT_DEPENDENCIES = host-gperf host-python host-ruby \ + harfbuzz cairo icu jpeg libepoxy libgcrypt libgles libsoup libtasn1 \ + libpng libxslt wayland-protocols webp wpebackend-fdo + +WPEWEBKIT_CONF_OPTS = \ + -DPORT=WPE \ + -DENABLE_API_TESTS=OFF \ + -DENABLE_MINIBROWSER=OFF + +ifeq ($(BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS_JIT),y) +WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=ON +else +WPEWEBKIT_CONF_OPTS += -DENABLE_JIT=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEWEBKIT_MULTIMEDIA),y) +WPEWEBKIT_CONF_OPTS += \ + -DENABLE_VIDEO=ON \ + -DENABLE_WEB_AUDIO=ON +WPEWEBKIT_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good +else +WPEWEBKIT_CONF_OPTS += \ + -DENABLE_VIDEO=OFF \ + -DENABLE_WEB_AUDIO=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEWEBKIT_USE_GSTREAMER_GL),y) +WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=ON +WPEWEBKIT_DEPENDENCIES += gst1-plugins-bad +else +WPEWEBKIT_CONF_OPTS += -DUSE_GSTREAMER_GL=OFF +endif + +ifeq ($(BR2_PACKAGE_WPEWEBKIT_WEBDRIVER),y) +WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=ON +else +WPEWEBKIT_CONF_OPTS += -DENABLE_WEBDRIVER=OFF +endif + +ifeq ($(BR2_PACKAGE_WOFF2),y) +WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=ON +WPEWEBKIT_DEPENDENCIES += woff2 +else +WPEWEBKIT_CONF_OPTS += -DUSE_WOFF2=OFF +endif + +$(eval $(cmake-package)) From 3d34daf3926f6735703b4548b618cd28273481ad Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 5 Feb 2019 21:41:52 +0100 Subject: [PATCH 0014/7482] package/cog: new package Signed-off-by: Francois Perrad Reviewed-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 2 ++ package/Config.in | 1 + package/cog/Config.in | 27 +++++++++++++++++++++++++++ package/cog/cog.hash | 5 +++++ package/cog/cog.mk | 17 +++++++++++++++++ 5 files changed, 52 insertions(+) create mode 100644 package/cog/Config.in create mode 100644 package/cog/cog.hash create mode 100644 package/cog/cog.mk diff --git a/DEVELOPERS b/DEVELOPERS index 9746ba6792..45b59de276 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -67,6 +67,7 @@ F: package/sngrep/ N: Adrian Perez de Castro F: package/brotli/ +F: package/cog/ F: package/libepoxy/ F: package/libwpe/ F: package/webkitgtk/ @@ -824,6 +825,7 @@ F: configs/olimex_a20_olinuxino_* F: package/4th/ F: package/botan/ F: package/chipmunk/ +F: package/cog/ F: package/dado/ F: package/ficl/ F: package/gdbm/ diff --git a/package/Config.in b/package/Config.in index 0a5180a238..1b5d5c9d7f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -263,6 +263,7 @@ endmenu menu "Graphic libraries and applications (graphic/text)" comment "Graphic applications" + source "package/cog/Config.in" source "package/fswebcam/Config.in" source "package/ghostscript/Config.in" source "package/glmark2/Config.in" diff --git a/package/cog/Config.in b/package/cog/Config.in new file mode 100644 index 0000000000..768fcefaac --- /dev/null +++ b/package/cog/Config.in @@ -0,0 +1,27 @@ +comment "cog needs wpewebkit and a toolchain w/ threads" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_WPEWEBKIT || !BR2_TOOLCHAIN_HAS_THREADS + +config BR2_PACKAGE_COG + bool "cog" + depends on BR2_PACKAGE_WPEWEBKIT + depends on BR2_TOOLCHAIN_HAS_THREADS # dbus + depends on BR2_USE_MMU # dbus + select BR2_PACKAGE_DBUS + help + Single "window" launcher for the WebKit WPE port, and + helper library for implementing WPE launcher. It does + not provide any chrome, and is suitable to be used + as a Web application container. + +if BR2_PACKAGE_COG + +config BR2_PACKAGE_COG_PROGRAMS_HOME_URI + string "home uri" + default "https://wpewebkit.org" + help + Default URI to open when "cog" is launched. If an empty + string is used, there is no default and the URI to open + must be always specified in the command line. + +endif diff --git a/package/cog/cog.hash b/package/cog/cog.hash new file mode 100644 index 0000000000..97daf72744 --- /dev/null +++ b/package/cog/cog.hash @@ -0,0 +1,5 @@ +# Locally generated +sha256 a6abadb78395226bac2e1dd5467feab2cc8c493eab6894a09a51a8e072e38c06 cog-v0.2.0.tar.gz + +# Hashes for license files: +sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING diff --git a/package/cog/cog.mk b/package/cog/cog.mk new file mode 100644 index 0000000000..43f13152c8 --- /dev/null +++ b/package/cog/cog.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# cog +# +################################################################################ + +COG_VERSION = v0.2.0 +COG_SITE = $(call github,Igalia,cog,$(COG_VERSION)) +COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo +COG_LICENSE = MIT +COG_LICENSE_FILES = COPYING +COG_CONF_OPTS = \ + -DCOG_BUILD_PROGRAMS=ON \ + -DCOG_PLATFORM_FDO=ON \ + -DCOG_HOME_URI='$(call qstrip,$(BR2_PACKAGE_COG_PROGRAMS_HOME_URI))' + +$(eval $(cmake-package)) From 248f628b03c0fb48d56821734ac6133d9a9f1db0 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 11 Feb 2019 22:43:57 +0100 Subject: [PATCH 0015/7482] package/ncmpc: fix build on sparc Fixes: - http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...uild-add-atomic-dependency-for-sparc.patch | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 package/ncmpc/0002-meson.build-add-atomic-dependency-for-sparc.patch diff --git a/package/ncmpc/0002-meson.build-add-atomic-dependency-for-sparc.patch b/package/ncmpc/0002-meson.build-add-atomic-dependency-for-sparc.patch new file mode 100644 index 0000000000..fd24589760 --- /dev/null +++ b/package/ncmpc/0002-meson.build-add-atomic-dependency-for-sparc.patch @@ -0,0 +1,43 @@ +From d2bd33ec18c146b27fb5aff7dd0089faa195ef9b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Mon, 11 Feb 2019 21:42:01 +0100 +Subject: [PATCH] meson.build: add atomic dependency for sparc + +Linking with libatomic is needed on sparc otherwise build fails on: +ncmpc@exe/src_Main.cxx.o: In function `std::__atomic_base::operator++()': +/home/buildroot/autobuild/instance-1/output/host/opt/ext-toolchain/sparc-buildroot-linux-uclibc/include/c++/6.4.0/bits/atomic_base.h:296: undefined reference to `__atomic_fetch_add_4' + +Fixes: + - http://autobuild.buildroot.org/results/7ac1a07e4f72633d3ec92b79dc5d8c062490abdc + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/45] +--- + meson.build | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/meson.build b/meson.build +index 2e6defc..b393e39 100644 +--- a/meson.build ++++ b/meson.build +@@ -174,6 +174,9 @@ else + pcre_dep = declare_dependency() + endif + ++# Needed on sparc ++atomic_dep = cc.find_library('atomic', required: false) ++ + inc = include_directories( + 'src', + +@@ -352,6 +355,7 @@ ncmpc = executable('ncmpc', + sources, + include_directories: inc, + dependencies: [ ++ atomic_dep, + thread_dep, + boost_dep, + pcre_dep, +-- +2.14.1 + From c49c1579575c5653ecd608129a8cc0d8ceb86887 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 11 Feb 2019 21:52:49 +0100 Subject: [PATCH 0016/7482] package/libinput: bump version to 1.12.6 Two quirks for specific devices, two little cleanups (for details see [1]) - rebased 0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch [1] https://lists.freedesktop.org/archives/wayland-devel/2019-January/039864.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- ...d-enable-CPP-include-check-only-in-case-CP.patch | 13 +++++++++---- package/libinput/libinput.hash | 10 +++++----- package/libinput/libinput.mk | 2 +- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch b/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch index c9a0652e40..341f6eb11d 100644 --- a/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch +++ b/package/libinput/0001-meson.build-enable-CPP-include-check-only-in-case-CP.patch @@ -1,4 +1,4 @@ -From 57383dc900e76e65ce5e5dc95f776e086100344d Mon Sep 17 00:00:00 2001 +From 3656db7fd23d166238cb8816c0d097095911b3fc Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 12 Jan 2019 10:22:38 +0100 Subject: [PATCH] meson.build: enable CPP include check only in case CPP @@ -8,22 +8,27 @@ Drop hard meson C++/CPP dependency, only needed for the build-time header inclusion test, build the test only in case C++/CPP compiler is available. +Upstream: https://gitlab.freedesktop.org/libinput/libinput/commit/4516ba977c1e22d01da4cc50a8ebffa5d11d73f1 + Signed-off-by: Peter Seiderer +[Rebased on 1.12.6, add upstream link] +Signed-off-by: Peter Seiderer +--- --- meson.build | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build -index a9c7c185..8183822e 100644 +index 8127c674..86960d84 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('libinput', 'c', 'cpp', +project('libinput', 'c', - version : '1.12.5', + version : '1.12.6', license : 'MIT/Expat', default_options : [ 'c_std=gnu99', 'warning_level=2' ], -@@ -641,12 +641,14 @@ executable('test-build-linker', +@@ -642,12 +642,14 @@ executable('test-build-linker', include_directories : [includes_src, includes_include], dependencies : [ dep_libinput, dep_libinput_util ], install : false) diff --git a/package/libinput/libinput.hash b/package/libinput/libinput.hash index 3ca3fd6771..15be6d71e2 100644 --- a/package/libinput/libinput.hash +++ b/package/libinput/libinput.hash @@ -1,8 +1,8 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2019-January/039804.html -md5 40dcc044443c9314537f605b6f30bf17 libinput-1.12.5.tar.xz -sha1 7c0b75e8cf2f1747fb8ae69300acabd46f7a7f0d libinput-1.12.5.tar.xz -sha256 7d4b6831010ef3bf69df4b41170047fa4325edef8ff5d2d28e78281af0687123 libinput-1.12.5.tar.xz -sha512 9365b91b3ac2c4ff0f9927913242afac7677979682dd7b541001b13d09d7982acd854f6d348101cfa4b0854c6a92b4c683f62593a97870e32ae3d607eaeae3ff libinput-1.12.5.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-January/039864.html +md5 8cf10cc0fdfab865b105dd28283fa0fd libinput-1.12.6.tar.xz +sha1 e3044cd2073312c24a315df1be4aa38da6bb2bbd libinput-1.12.6.tar.xz +sha256 12b4023a3fc683d3d8127db573bdf925a2ef366615042f69c87e57c32a50f45d libinput-1.12.6.tar.xz +sha512 02ad90c77a0c8c27fd96ec34e1546c5f0947ced49bad386372c1ef7c41b3b2157c39020f0766f20aaf2ab3c97128567e169279bea21115ced39499dda325d2ef libinput-1.12.6.tar.xz # License files sha256 70d5b1dfe5a9c50a1f2ea91b1c2b1c85d876c5c92339585edbb85cf69e945e14 COPYING diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk index bc4cc89825..450fd26a24 100644 --- a/package/libinput/libinput.mk +++ b/package/libinput/libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBINPUT_VERSION = 1.12.5 +LIBINPUT_VERSION = 1.12.6 LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz LIBINPUT_SITE = http://www.freedesktop.org/software/libinput LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev From 4f1550b0494d09067f1701b2306e55a7f2b39c37 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 11 Feb 2019 21:53:17 +0100 Subject: [PATCH 0017/7482] package/libxkbcommon: bump version to 0.8.3 For details see [1]: - Fix build of static libraries with meson. - New API: XKB_KEY_XF86MonBrightnessCycle/XKB_KEY_XF86RotationLockToggle [1] https://lists.freedesktop.org/archives/wayland-devel/2019-February/039970.html Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/libxkbcommon/libxkbcommon.hash | 4 ++-- package/libxkbcommon/libxkbcommon.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libxkbcommon/libxkbcommon.hash b/package/libxkbcommon/libxkbcommon.hash index 67ae4b5921..e4a56873ea 100644 --- a/package/libxkbcommon/libxkbcommon.hash +++ b/package/libxkbcommon/libxkbcommon.hash @@ -1,5 +1,5 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2018-August/039243.html -sha256 7ab8c4b3403d89d01898066b72cb6069bddeb5af94905a65368f671a026ed58c libxkbcommon-0.8.2.tar.xz +# From https://lists.freedesktop.org/archives/wayland-devel/2019-February/039970.html +sha256 b855c629849a97ab9835a4ad99d6b749a636f70d38a03f070c6ef72024825540 libxkbcommon-0.8.3.tar.xz # License file: sha256 086caee279449369d41c1157911ec7696e707b93feba7280de757d3c470b2dfb LICENSE diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index 2045d96380..801782b38c 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBXKBCOMMON_VERSION = 0.8.2 +LIBXKBCOMMON_VERSION = 0.8.3 LIBXKBCOMMON_SITE = http://xkbcommon.org/download LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz LIBXKBCOMMON_LICENSE = MIT/X11 From 057c41bc027090659e1668fec1798e8bf8b13b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Tue, 12 Feb 2019 09:33:51 +0100 Subject: [PATCH 0018/7482] package/luv: bump to version 1.25.0-0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove upstream patch which is included in the new release. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- ...lude-compat-5.3.h-in-luv-header-file.patch | 62 ------------------- package/luv/luv.hash | 2 +- package/luv/luv.mk | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch diff --git a/package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch b/package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch deleted file mode 100644 index 22428c98f7..0000000000 --- a/package/luv/0001-Do-not-include-compat-5.3.h-in-luv-header-file.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0b541b828142dab6c23b0f4415dd2fd052d69ff1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 31 Oct 2018 18:14:18 +0100 -Subject: [PATCH] Do not include compat-5.3.h in luv header file -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Do not include compat-5.3.h in luv header file - -Exposing the compat-5.3.h header file directly in the luv.h header file -is not a good idea, because it causes redefinition errors when building, -for example latest luvi version 2.8.0, with a shared luv library and -LuaJIT 2.0.5. - -Therefore, include the compat header file in the luv.c source file. - -Note, that luvi version 2.8.0 (and 2.7.6) still fails to build against the -shared luv library using LuaJIT 2.0.5, as it does use `luaL_newlib` which is -not available in Lua 5.1. However, this is unrelated to the luv library as -luvi itself should define the macro for Lua 5.1. - -Upstream status: https://github.com/luvit/luv/pull/310 - -Signed-off-by: Jörg Krause ---- - src/luv.c | 3 +++ - src/luv.h | 4 ---- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/luv.c b/src/luv.c -index c4c7cb7..4af7582 100644 ---- a/src/luv.c -+++ b/src/luv.c -@@ -15,6 +15,9 @@ - * - */ - -+#if (LUA_VERSION_NUM != 503) -+#include "c-api/compat-5.3.h" -+#endif - #include "luv.h" - #include "util.c" - #include "lhandle.c" -diff --git a/src/luv.h b/src/luv.h -index 27c8c94..4fedd3f 100644 ---- a/src/luv.h -+++ b/src/luv.h -@@ -50,10 +50,6 @@ - #define MAX_TITLE_LENGTH (8192) - #endif - --#if (LUA_VERSION_NUM != 503) --#include "c-api/compat-5.3.h" --#endif -- - #if defined(__clang__) - #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wunused-function" --- -2.19.1 - diff --git a/package/luv/luv.hash b/package/luv/luv.hash index 24440bef8e..125e7c5f03 100644 --- a/package/luv/luv.hash +++ b/package/luv/luv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 27886acb3d3f531a3d6ca70360d2593ddf1a8d4daf94ca3beea14d9381227ff7 luv-1.22.0-1.tar.gz +sha256 6003b271170a6cef1056725f3a3b9faf56e7ebf83f1d1cc05e272be808a46206 luv-1.25.0-0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/luv/luv.mk b/package/luv/luv.mk index 87158b72ed..4901088a3d 100644 --- a/package/luv/luv.mk +++ b/package/luv/luv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LUV_VERSION = 1.22.0-1 +LUV_VERSION = 1.25.0-0 LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) LUV_LICENSE = Apache-2.0 LUV_LICENSE_FILES = LICENSE.txt From 0cd5b4fa0c4dfeda38c7f76f2d45ae8e52116889 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 8 Feb 2019 22:31:18 +0100 Subject: [PATCH 0019/7482] boot/uboot: bump to version 2019.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- boot/uboot/Config.in | 4 ++-- boot/uboot/uboot.hash | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/boot/uboot/Config.in b/boot/uboot/Config.in index bd1b248e94..d4a93615ee 100644 --- a/boot/uboot/Config.in +++ b/boot/uboot/Config.in @@ -39,7 +39,7 @@ choice Select the specific U-Boot version you want to use config BR2_TARGET_UBOOT_LATEST_VERSION - bool "2018.09" + bool "2019.01" config BR2_TARGET_UBOOT_CUSTOM_VERSION bool "Custom version" @@ -87,7 +87,7 @@ endif config BR2_TARGET_UBOOT_VERSION string - default "2018.09" if BR2_TARGET_UBOOT_LATEST_VERSION + default "2019.01" if BR2_TARGET_UBOOT_LATEST_VERSION default BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE \ if BR2_TARGET_UBOOT_CUSTOM_VERSION default "custom" if BR2_TARGET_UBOOT_CUSTOM_TARBALL diff --git a/boot/uboot/uboot.hash b/boot/uboot/uboot.hash index ea07fb584d..df2b8caf89 100644 --- a/boot/uboot/uboot.hash +++ b/boot/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 839bf23cfe8ce613a77e583a60375179d0ad324e92c82fbdd07bebf0fd142268 u-boot-2018.09.tar.bz2 +sha256 50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22 u-boot-2019.01.tar.bz2 From 6ff3da375bf951ed458b502058cb8beb5b9b994e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Fri, 8 Feb 2019 22:31:19 +0100 Subject: [PATCH 0020/7482] package/uboot-tools: bump to version 2019.01 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adapt patch 0002 and 0003 for version 2019.01. Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- ...-tools-only-in-no-dot-config-targets.patch | 12 +++---- ...003-Make-FIT-support-really-optional.patch | 33 +++++++++++-------- package/uboot-tools/uboot-tools.hash | 2 +- package/uboot-tools/uboot-tools.mk | 2 +- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch index c201bf749d..33a79b16af 100644 --- a/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch +++ b/package/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch @@ -1,4 +1,4 @@ -From b8110293d70c4f43035dfd6a0904d342be6a08e0 Mon Sep 17 00:00:00 2001 +From 460646b3c4c1718860915c38586ee8d2fbda38e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sun, 1 Feb 2015 21:53:47 +0100 Subject: [PATCH] tools only in no dot config targets @@ -25,18 +25,18 @@ Signed-off-by: Fabio Estevam 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 1cf15ce..75e85eb 100644 +index 6aa08964ff..fcec83d183 100644 --- a/Makefile +++ b/Makefile -@@ -425,7 +425,7 @@ timestamp_h := include/generated/timestamp_autogenerated.h +@@ -443,7 +443,7 @@ defaultenv_h := include/generated/defaultenv_autogenerated.h no-dot-config-targets := clean clobber mrproper distclean \ help %docs check% coccicheck \ -- ubootversion backup tests -+ ubootversion backup tests tools-only +- ubootversion backup tests check qcheck ++ ubootversion backup tests tools-only check qcheck config-targets := 0 mixed-targets := 0 -- -2.7.4 +2.20.1 diff --git a/package/uboot-tools/0003-Make-FIT-support-really-optional.patch b/package/uboot-tools/0003-Make-FIT-support-really-optional.patch index 8853198b43..329245ffdd 100644 --- a/package/uboot-tools/0003-Make-FIT-support-really-optional.patch +++ b/package/uboot-tools/0003-Make-FIT-support-really-optional.patch @@ -1,7 +1,10 @@ -From d9d7d7cf8b27516d45c66daa1bf0a18c878c4e33 Mon Sep 17 00:00:00 2001 +From 794aeeb82ab7c0304e343499ee5d82c1f1c5c39a Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Sun, 8 May 2016 11:11:39 -0300 Subject: [PATCH] Make FIT support really optional +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit Due to some mistakes in the source code, it was not possible to really turn FIT support off. This commit fixes the problem by means of the @@ -22,6 +25,8 @@ Signed-off-by: Fabio Estevam [Ricardo: fix conditional compilation and linking of the files mentioned above for 2016.07] Signed-off-by: Ricardo Martincoski +[Jörg: adapt for 2019.01] +Signed-off-by: Jörg Krause --- common/bootm.c | 2 ++ include/bootm.h | 2 ++ @@ -29,10 +34,10 @@ Signed-off-by: Ricardo Martincoski 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/bootm.c b/common/bootm.c -index 2431019..7e1adc8 100644 +index 8bf84ebcb7..ecc29fb7b4 100644 --- a/common/bootm.c +++ b/common/bootm.c -@@ -901,6 +901,7 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz) +@@ -922,6 +922,7 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz) memmove(to, from, len); } @@ -40,7 +45,7 @@ index 2431019..7e1adc8 100644 static int bootm_host_load_image(const void *fit, int req_image_type) { const char *fit_uname_config = NULL; -@@ -965,5 +966,6 @@ int bootm_host_load_images(const void *fit, int cfg_noffset) +@@ -986,5 +987,6 @@ int bootm_host_load_images(const void *fit, int cfg_noffset) /* Return the first error we found */ return err; } @@ -48,10 +53,10 @@ index 2431019..7e1adc8 100644 #endif /* ndef USE_HOSTCC */ diff --git a/include/bootm.h b/include/bootm.h -index 4981377..94d62a1 100644 +index dbd6f49c2d..f5fe9cb2d3 100644 --- a/include/bootm.h +++ b/include/bootm.h -@@ -41,7 +41,9 @@ void lynxkdi_boot(image_header_t *hdr); +@@ -42,7 +42,9 @@ void lynxkdi_boot(image_header_t *hdr); boot_os_fn *bootm_os_get_boot_func(int os); @@ -62,18 +67,18 @@ index 4981377..94d62a1 100644 int boot_selected_os(int argc, char * const argv[], int state, bootm_headers_t *images, boot_os_fn *boot_fn); diff --git a/tools/Makefile b/tools/Makefile -index f72294a..ccf5120 100644 +index 081383d7a7..4d23c3941e 100644 --- a/tools/Makefile +++ b/tools/Makefile -@@ -54,6 +54,7 @@ mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o - hostprogs-y += dumpimage mkimage - hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign +@@ -58,6 +58,7 @@ hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign + + hostprogs-$(CONFIG_CMD_BOOTEFI_SELFTEST) += file2include +FIT_OBJS-$(CONFIG_FIT) := fit_common.o fit_image.o image-host.o common/image-fit.o FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o - # Flattened device tree objects - LIBFDT_OBJS := $(addprefix lib/libfdt/, \ -@@ -68,16 +69,13 @@ ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o + + # The following files are synced with upstream DTC. +@@ -80,16 +81,13 @@ ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o # common objs for dumpimage and mkimage dumpimage-mkimage-objs := aisimage.o \ atmelimage.o \ @@ -92,5 +97,5 @@ index f72294a..ccf5120 100644 imagetool.o \ imximage.o \ -- -2.9.1 +2.20.1 diff --git a/package/uboot-tools/uboot-tools.hash b/package/uboot-tools/uboot-tools.hash index 97d0bd0b5f..df2b8caf89 100644 --- a/package/uboot-tools/uboot-tools.hash +++ b/package/uboot-tools/uboot-tools.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 9f10df88bc91b35642e461217f73256bbaeeca9ae2db8db56197ba5e89e1f6d4 u-boot-2018.07.tar.bz2 +sha256 50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22 u-boot-2019.01.tar.bz2 diff --git a/package/uboot-tools/uboot-tools.mk b/package/uboot-tools/uboot-tools.mk index 5ac7b1c293..d7a631fdc8 100644 --- a/package/uboot-tools/uboot-tools.mk +++ b/package/uboot-tools/uboot-tools.mk @@ -4,7 +4,7 @@ # ################################################################################ -UBOOT_TOOLS_VERSION = 2018.07 +UBOOT_TOOLS_VERSION = 2019.01 UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot UBOOT_TOOLS_LICENSE = GPL-2.0+ From 46a4af5214ccafa6cca39e2d9136f4822f40f3a6 Mon Sep 17 00:00:00 2001 From: Artem Senichev Date: Wed, 13 Feb 2019 11:51:11 +0300 Subject: [PATCH 0021/7482] package/kexec: enable powerpc64le platforms kexec has fully support of ppc64 platform: https://www.kernel.org/doc/Documentation/kdump/kdump.txt Signed-off-by: Artem Senichev Signed-off-by: Thomas Petazzoni --- package/kexec/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kexec/Config.in b/package/kexec/Config.in index c8cdea5663..c4a09be109 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_KEXEC bool "kexec" depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ - BR2_powerpc || BR2_sh4 || BR2_sh4a || BR2_aarch64 + BR2_powerpc || BR2_powerpc64le || BR2_sh4 || BR2_sh4a || BR2_aarch64 help Kexec is a user space utility for loading another kernel and asking the currently running kernel to do something with From b5e09f3899cba0853afef2f3312c61676f2cbdaf Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 12 Feb 2019 21:56:46 +0100 Subject: [PATCH 0022/7482] package/edid-decode: bump version to 6def7bc Changes since f56f329: 0a454bc makefile: also honor LDFLAGS 9e59ba9 edid-decode: update links, add README 7684918 edid-decode: README: updates bc1e846 edid-decode: reformat to linux kernel coding style 9cb3744 edid-decode: fix spurious warning about string termination 3b26b8a edid-decode: fix wrong sample rate unit 4437dd9 edid-decode: use const for unsigned char pointers to the EDID eee377b edid-decode: add support for QuantumData 980 EDID file format 7d8f41f edid-decode: simplify data block parsing 8c81ccf Add Samsung UE49KS8005 EDID ab18bef edid-decode: add HDMI Forum VSDB fields for HDMI 2.1b e9ffafc edid-decode: add options and new output formats b2da151 edid-decode: add --extract and --check options 5eeb151 edid-decode: replace AdobeYCC/RGB by opYCC/RGB 6def7bc edid-decode: make it easier to find the out-of-range monitor values Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/edid-decode/edid-decode.hash | 2 +- package/edid-decode/edid-decode.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/edid-decode/edid-decode.hash b/package/edid-decode/edid-decode.hash index 437dcf4a66..12cd30e818 100644 --- a/package/edid-decode/edid-decode.hash +++ b/package/edid-decode/edid-decode.hash @@ -1,2 +1,2 @@ # Locally computed -sha256 94f43f93285eb5cf8133061295bcdf72b6897bf5372879c2e4032a08d359af12 edid-decode-f56f329ed23a25d002352dedba1e8f092a47286f.tar.gz +sha256 27fcf4c8693ec6fe020b18c78c70ddba9a8b3ea8c55fcfad2a38103128ec5e36 edid-decode-6def7bc83dfb0338632e06a8b14c93faa6af8879.tar.gz diff --git a/package/edid-decode/edid-decode.mk b/package/edid-decode/edid-decode.mk index b412a77a13..c43f1ae7da 100644 --- a/package/edid-decode/edid-decode.mk +++ b/package/edid-decode/edid-decode.mk @@ -4,7 +4,7 @@ # ################################################################################ -EDID_DECODE_VERSION = f56f329ed23a25d002352dedba1e8f092a47286f +EDID_DECODE_VERSION = 6def7bc83dfb0338632e06a8b14c93faa6af8879 EDID_DECODE_SITE = git://linuxtv.org/edid-decode.git EDID_DECODE_LICENSE = MIT EDID_DECODE_LICENSE_FILES = edid-decode.c From a36842af3bc9449803c73ffc7cee5e67890f2a8c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 12 Feb 2019 23:45:46 +0100 Subject: [PATCH 0023/7482] package/libcpprestsdk: add optional websocketpp dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcpprestsdk/libcpprestsdk.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/libcpprestsdk/libcpprestsdk.mk b/package/libcpprestsdk/libcpprestsdk.mk index be9ca292c5..6f5fb41999 100644 --- a/package/libcpprestsdk/libcpprestsdk.mk +++ b/package/libcpprestsdk/libcpprestsdk.mk @@ -10,6 +10,13 @@ LIBCPPRESTSDK_LICENSE = MIT LIBCPPRESTSDK_LICENSE_FILES = license.txt LIBCPPRESTSDK_SUBDIR = Release LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib -LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON +LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF + +ifeq ($(BR2_PACKAGE_WEBSOCKETPP),y) +LIBCPPRESTSDK_DEPENDENCIES += websocketpp +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_WEBSOCKETS=OFF +else +LIBCPPRESTSDK_CONF_OPTS += -DCPPREST_EXCLUDE_WEBSOCKETS=ON +endif $(eval $(cmake-package)) From 7c4d56a1cc2ec6201d2928a41b156dbd6fdb73c2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Feb 2019 22:53:15 +0100 Subject: [PATCH 0024/7482] package/libmad: remove LIBMAD_LIBTOOL_PATCH=NO Since commit eae18d01abc737182fe171c908462499d5f1aaf0 "libmad: needs autoreconf", autoreconf builds an up to date ltmain.sh so remove LIBMAD_LIBTOOL_PATCH = NO which is not needed anymore Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libmad/libmad.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/libmad/libmad.mk b/package/libmad/libmad.mk index 108c4f641b..b1c9cee5ac 100644 --- a/package/libmad/libmad.mk +++ b/package/libmad/libmad.mk @@ -7,7 +7,6 @@ LIBMAD_VERSION = 0.15.1b LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION) LIBMAD_INSTALL_STAGING = YES -LIBMAD_LIBTOOL_PATCH = NO LIBMAD_LICENSE = GPL-2.0+ LIBMAD_LICENSE_FILES = COPYING LIBMAD_PATCH = \ From 33f0fd27fadb568740f100978f859d4967cc6dc0 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 12 Feb 2019 15:09:06 +0200 Subject: [PATCH 0025/7482] package/wpebackend-fdo: bump to version 1.0.1 This release fixes contains a small fix which allows calling the backend initialization routine more than once. Release notes: https://wpewebkit.org/release/wpebackend-fdo-1.0.1.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wpebackend-fdo/wpebackend-fdo.hash | 8 ++++---- package/wpebackend-fdo/wpebackend-fdo.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpebackend-fdo/wpebackend-fdo.hash b/package/wpebackend-fdo/wpebackend-fdo.hash index 20c89d324c..6e6f9f0e3f 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.hash +++ b/package/wpebackend-fdo/wpebackend-fdo.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.0.tar.xz.sums -md5 5318728afb3bf7417293af67ce427963 wpebackend-fdo-1.0.0.tar.xz -sha1 7ee22bc1d585616f4ad2047d8be54ec396486211 wpebackend-fdo-1.0.0.tar.xz -sha256 7a747f87a1ae46d30144369050e3ce348b58986d04e1a139ba75c198fa636729 wpebackend-fdo-1.0.0.tar.xz +# From https://wpewebkit.org/releases/wpebackend-fdo-1.0.1.tar.xz.sums +md5 2ee81a4212c18110a06a0c51c12e0d2e wpebackend-fdo-1.0.1.tar.xz +sha1 cdc6ac95e302a2358204b766936a9bf8ef4f26f2 wpebackend-fdo-1.0.1.tar.xz +sha256 15b8b1febea5d9c271e95c35b3c1e13f870712a54bc5f689cfdbb96e2f070fc8 wpebackend-fdo-1.0.1.tar.xz # Hashes for license files: sha256 c9f6803371047fad3e72200ec6cd226329a5ee08ac61104c8211c2761fb46825 COPYING diff --git a/package/wpebackend-fdo/wpebackend-fdo.mk b/package/wpebackend-fdo/wpebackend-fdo.mk index 06c87cb9bf..5842861bac 100644 --- a/package/wpebackend-fdo/wpebackend-fdo.mk +++ b/package/wpebackend-fdo/wpebackend-fdo.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEBACKEND_FDO_VERSION = 1.0.0 +WPEBACKEND_FDO_VERSION = 1.0.1 WPEBACKEND_FDO_SITE = https://wpewebkit.org/releases WPEBACKEND_FDO_SOURCE = wpebackend-fdo-$(WPEBACKEND_FDO_VERSION).tar.xz WPEBACKEND_FDO_INSTALL_STAGING = YES From 5546dfd095df4f874ff3bc46e3a2cffda3693340 Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Tue, 12 Feb 2019 15:09:07 +0200 Subject: [PATCH 0026/7482] package/wpewebkit: security bump to version 2.22.4 This is a maintenance release of the current stable WPE WebKit version, which contains security fixes for CVE identifiers: CVE-2019-6212, CVE-2019-6215, CVE-2019-6216, CVE-2019-6217, CVE-2019-6226, CVE-2019-6227, CVE-2019-6229, CVE-2019-6233, and CVE-2019-6234. Additionally, it contains a few minor fixes. Release notes can be found in the announcement: https://wpewebkit.org/release/wpe-2.22.4.html More details on the issues covered by securit fixes can be found in the corresponding security advisory: https://wpewebkit.org/security/WSA-2019-0001.html Signed-off-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wpewebkit/wpewebkit.hash | 8 ++++---- package/wpewebkit/wpewebkit.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/wpewebkit/wpewebkit.hash b/package/wpewebkit/wpewebkit.hash index 39937a3465..27c6cdf33e 100644 --- a/package/wpewebkit/wpewebkit.hash +++ b/package/wpewebkit/wpewebkit.hash @@ -1,7 +1,7 @@ -# From https://wpewebkit.org/releases/wpewebkit-2.22.3.tar.xz.sums -md5 6d0c693ea49a93fc9e701cf784245ea5 wpewebkit-2.22.3.tar.xz -sha1 d8a22bec787f38939c7922dc43bf27c9144cef74 wpewebkit-2.22.3.tar.xz -sha256 241f177cded1a4ba3088716650eaaac25588878882170789b3c630ac45dbb2fa wpewebkit-2.22.3.tar.xz +# From https://wpewebkit.org/releases/wpewebkit-2.22.4.tar.xz.sums +md5 6e5c668473c57906bdec1c641bac4579 wpewebkit-2.22.4.tar.xz +sha1 002b8b25f4fc26bfef68767b3ff1eba1aac53fa5 wpewebkit-2.22.4.tar.xz +sha256 871e86b7e989de0c1224ac7ab8ed6d8b52756cf793a8c253b56ab8ba8d288c96 wpewebkit-2.22.4.tar.xz # Hashes for license files: sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE diff --git a/package/wpewebkit/wpewebkit.mk b/package/wpewebkit/wpewebkit.mk index 6b3d56ab0c..89df9b725c 100644 --- a/package/wpewebkit/wpewebkit.mk +++ b/package/wpewebkit/wpewebkit.mk @@ -4,7 +4,7 @@ # ################################################################################ -WPEWEBKIT_VERSION = 2.22.3 +WPEWEBKIT_VERSION = 2.22.4 WPEWEBKIT_SITE = http://www.wpewebkit.org/releases WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz WPEWEBKIT_INSTALL_STAGING = YES From 3777dc4bc8dc63a823d54c97392a672c4eced255 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 15 Feb 2019 20:49:48 +0100 Subject: [PATCH 0027/7482] package/ninja: bump version to 1.9.0 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/ninja/ninja.hash | 2 +- package/ninja/ninja.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ninja/ninja.hash b/package/ninja/ninja.hash index 6334c0420b..3f5bd3a279 100644 --- a/package/ninja/ninja.hash +++ b/package/ninja/ninja.hash @@ -1,2 +1,2 @@ # Locally generated -sha256 86b8700c3d0880c2b44c2ff67ce42774aaf8c28cbf57725cb881569288c1c6f4 ninja-v1.8.2.tar.gz +sha256 5d7ec75828f8d3fd1a0c2f31b5b0cea780cdfe1031359228c428c1a48bfcd5b9 ninja-v1.9.0.tar.gz diff --git a/package/ninja/ninja.mk b/package/ninja/ninja.mk index 259a87d216..9d6f30e9fe 100644 --- a/package/ninja/ninja.mk +++ b/package/ninja/ninja.mk @@ -4,7 +4,7 @@ # ################################################################################ -NINJA_VERSION = v1.8.2 +NINJA_VERSION = v1.9.0 NINJA_SITE = $(call github,ninja-build,ninja,$(NINJA_VERSION)) NINJA_LICENSE = Apache-2.0 NINJA_LICENSE_FILES = COPYING From 05bbdb876d621285783b1d71a4fd492c84cc11d8 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Fri, 15 Feb 2019 20:49:49 +0100 Subject: [PATCH 0028/7482] package/meson: bump version to 0.49.2 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index 3a5c7dd438..fadef6df8a 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.49.0/meson-0.49.0.tar.gz.asc -sha256 fb0395c4ac208eab381cd1a20571584bdbba176eb562a7efa9cb17cace0e1551 meson-0.49.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.49.2/meson-0.49.2.tar.gz.asc +sha256 ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd meson-0.49.2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index d76541cc93..49e27f5527 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.49.0 +MESON_VERSION = 0.49.2 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From 59cc32513383f0c9af4e9cb634762cd56e985725 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 30 Jan 2019 11:47:24 +0100 Subject: [PATCH 0029/7482] package/optee-client: new package OP-TEE client API library and supplicant daemon from the OP-TEE project are packaged in package/optee-client. An init script launches the tee-supplicant deamon. Package is added to the Security menu of BR configuration. This change references in Buildroot the today's latest OP-TEE revision release tagged 3.4.0. Signed-off-by: Etienne Carriere [Thomas: - remove version selection - add dependency on !BR2_STATIC_LIBS, as it unconditionally builds a shared library] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/optee-client/Config.in | 17 +++++++++ package/optee-client/S30optee | 49 ++++++++++++++++++++++++++ package/optee-client/optee-client.hash | 4 +++ package/optee-client/optee-client.mk | 18 ++++++++++ 6 files changed, 90 insertions(+) create mode 100644 package/optee-client/Config.in create mode 100644 package/optee-client/S30optee create mode 100644 package/optee-client/optee-client.hash create mode 100644 package/optee-client/optee-client.mk diff --git a/DEVELOPERS b/DEVELOPERS index 1aee2cfcc2..4089f00acd 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -689,6 +689,7 @@ F: package/szip/ N: Etienne Carriere F: boot/optee-os/ +F: package/optee-client/ N: Eugene Tarassov F: package/tcf-agent/ diff --git a/package/Config.in b/package/Config.in index 3f968498f4..7c010e1d21 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2079,6 +2079,7 @@ endmenu menu "Security" source "package/checkpolicy/Config.in" + source "package/optee-client/Config.in" source "package/paxtest/Config.in" source "package/policycoreutils/Config.in" source "package/refpolicy/Config.in" diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in new file mode 100644 index 0000000000..db0b7b7f9f --- /dev/null +++ b/package/optee-client/Config.in @@ -0,0 +1,17 @@ +config BR2_PACKAGE_OPTEE_CLIENT + bool "optee-client" + depends on !BR2_STATIC_LIBS + help + Enable the OP-TEE client package that brings non-secure + client application resources for OP-TEE support. OP-TEE + client is a component delivered by the OP-TEE project. + + The client API library allows application to invoke trusted + applications hosted in the OP-TEE OS secure world. The + supplicant provides services hosted by the non-secure world + and invoked by the secure world. + + https://github.com/OP-TEE/optee_client + +comment "optee-client needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/optee-client/S30optee b/package/optee-client/S30optee new file mode 100644 index 0000000000..17e6d6d2b8 --- /dev/null +++ b/package/optee-client/S30optee @@ -0,0 +1,49 @@ +#!/bin/sh + +DAEMON="tee-supplicant" +PIDFILE="/var/run/$DAEMON.pid" + +DAEMON_ARGS="-d /dev/teepriv0" + +start() { + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \ + -- $DAEMON_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +stop() { + printf 'Stopping %s: ' "$DAEMON" + start-stop-daemon -K -q -p "$PIDFILE" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" +} + +restart() { + stop + sleep 1 + start +} + +case "$1" in + start|stop|restart) + "$1";; + reload) + # Restart, since there is no true "reload" feature (does not + # reconfigure/restart on SIGHUP, just closes all open files). + restart;; + *) + echo "Usage: $0 {start|stop|restart|reload}" + exit 1 +esac diff --git a/package/optee-client/optee-client.hash b/package/optee-client/optee-client.hash new file mode 100644 index 0000000000..0da25ced2d --- /dev/null +++ b/package/optee-client/optee-client.hash @@ -0,0 +1,4 @@ +# From https://github.com/OP-TEE/optee_client/archive/3.4.0.tar.gz +sha256 7c131a44f4d73acb8816fba88bcd7e6a18537f0a522ae426a20e2ca7dc46a6ec optee-client-3.4.0.tar.gz +# Locally computed +sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE diff --git a/package/optee-client/optee-client.mk b/package/optee-client/optee-client.mk new file mode 100644 index 0000000000..0a9fafd0d3 --- /dev/null +++ b/package/optee-client/optee-client.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# optee-client +# +################################################################################ + +OPTEE_CLIENT_VERSION = 3.4.0 +OPTEE_CLIENT_SITE = $(call github,OP-TEE,optee_client,$(OPTEE_CLIENT_VERSION)) +OPTEE_CLIENT_LICENSE = BSD-2-Clause +OPTEE_CLIENT_LICENSE_FILES = LICENSE +OPTEE_CLIENT_INSTALL_STAGING = YES + +define OPTEE_CLIENT_INSTALL_INIT_SYSV + $(INSTALL) -m 0755 -D $(OPTEE_CLIENT_PKGDIR)/S30optee \ + $(TARGET_DIR)/etc/init.d/S30optee +endef + +$(eval $(cmake-package)) From bd64fdb32c6ebbc050ed7c5fcb34f51ff66ab4b8 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 30 Jan 2019 11:47:25 +0100 Subject: [PATCH 0030/7482] package/optee-examples: new package This package generates embedded Linux based OS userland client applications and OP-TEE OS trusted applications all embedded in the file system. These applications shows how to use the APIs OP-TEE OS is based on, both in the non secure and secure worlds. Package is added next to the OP-TEE client package in the BR package configuration. This change references in Buildroot the today's latest OP-TEE revision release tagged 3.4.0 with an added patch to fix an issue reported by recent GCC toolchains. Signed-off-by: Etienne Carriere [Thomas: - drop version selection - propagate !BR2_STATIC_LIBS dependency of optee-client - make sure BR2_TARGET_OPTEE_OS_SDK is selected - use a patch generated by git format-patch - simplify the construct to build the examples] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...-fix-deprecated-size_t-type-for-size.patch | 42 +++++++++++++++++++ package/optee-examples/Config.in | 23 ++++++++++ package/optee-examples/optee-examples.hash | 4 ++ package/optee-examples/optee-examples.mk | 37 ++++++++++++++++ 6 files changed, 108 insertions(+) create mode 100644 package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch create mode 100644 package/optee-examples/Config.in create mode 100644 package/optee-examples/optee-examples.hash create mode 100644 package/optee-examples/optee-examples.mk diff --git a/DEVELOPERS b/DEVELOPERS index 4089f00acd..dec6d004f6 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -690,6 +690,7 @@ F: package/szip/ N: Etienne Carriere F: boot/optee-os/ F: package/optee-client/ +F: package/optee-examples/ N: Eugene Tarassov F: package/tcf-agent/ diff --git a/package/Config.in b/package/Config.in index 7c010e1d21..5eb0acfd20 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2080,6 +2080,7 @@ endmenu menu "Security" source "package/checkpolicy/Config.in" source "package/optee-client/Config.in" + source "package/optee-examples/Config.in" source "package/paxtest/Config.in" source "package/policycoreutils/Config.in" source "package/refpolicy/Config.in" diff --git a/package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch b/package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch new file mode 100644 index 0000000000..4f1fb38305 --- /dev/null +++ b/package/optee-examples/0001-fix-deprecated-size_t-type-for-size.patch @@ -0,0 +1,42 @@ +From 1a2713ac698410fb1a889941d52df12a7bd75f3b Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Sun, 17 Feb 2019 22:17:21 +0100 +Subject: [PATCH] secure_storage: fix deprecated size_t type for size + +size_t types is an deprecated type used in GPD API v1.0. +Update + +Error reported by GCC 7.3-2018.05: + secure_storage_ta.c:203:6: warning: passing argument 4 of 'TEE_ReadObjectData' from incompatible pointer type [-Wincompatible-pointer-types] + &read_bytes); + +Signed-off-by: Etienne Carriere +--- + secure_storage/ta/secure_storage_ta.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/secure_storage/ta/secure_storage_ta.c b/secure_storage/ta/secure_storage_ta.c +index d120e47..3ccc12d 100644 +--- a/secure_storage/ta/secure_storage_ta.c ++++ b/secure_storage/ta/secure_storage_ta.c +@@ -146,7 +146,7 @@ static TEE_Result read_raw_object(uint32_t param_types, TEE_Param params[4]) + TEE_ObjectHandle object; + TEE_ObjectInfo object_info; + TEE_Result res; +- size_t read_bytes; ++ uint32_t read_bytes; + char *obj_id; + size_t obj_id_sz; + char *data; +@@ -202,7 +202,7 @@ static TEE_Result read_raw_object(uint32_t param_types, TEE_Param params[4]) + res = TEE_ReadObjectData(object, data, object_info.dataSize, + &read_bytes); + if (res != TEE_SUCCESS || read_bytes != object_info.dataSize) { +- EMSG("TEE_ReadObjectData failed 0x%08x, read %u over %u", ++ EMSG("TEE_ReadObjectData failed 0x%08x, read %" PRIu32 " over %u", + res, read_bytes, object_info.dataSize); + goto exit; + } +-- +2.20.1 + diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in new file mode 100644 index 0000000000..479f9204bb --- /dev/null +++ b/package/optee-examples/Config.in @@ -0,0 +1,23 @@ +config BR2_PACKAGE_OPTEE_EXAMPLES + bool "optee-examples" + depends on BR2_TARGET_OPTEE_OS + depends on !BR2_STATIC_LIBS # optee-client + select BR2_PACKAGE_OPTEE_CLIENT + select BR2_TARGET_OPTEE_OS_SDK + help + Enable the OP-TEE examples package that brings examples of + implementation of OP-TEE non-secure client applications and + secure trusted applications. OP-TEE examples is a + component delivered by the OP-TEE project. + + Trusted application binary files are installed in the target + directory /lib/optee_armtz as other trusted applications. + At runtime OP-TEE OS can load trusted applications from this + non-secure filesystem/directory into the secure world for + execution. + + https://github.com/linaro-swg/optee_examples + +comment "optee-examples needs a toolchain w/ dynamic library" + depends on BR2_TARGET_OPTEE_OS + depends on BR2_STATIC_LIBS diff --git a/package/optee-examples/optee-examples.hash b/package/optee-examples/optee-examples.hash new file mode 100644 index 0000000000..077fd9757c --- /dev/null +++ b/package/optee-examples/optee-examples.hash @@ -0,0 +1,4 @@ +# From https://github.com/linaro-swg/optee_examples/archive/3.4.0.tar.gz +sha256 d833753980ac438c1675787857bb8352997352212334274de9419770097ce039 optee-examples-3.4.0.tar.gz +# Locally computed +sha256 6f1ef8449cb82ae79d2155605f7985bdf0f08e7ab5007de9b4362e8bf28733b9 LICENSE diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk new file mode 100644 index 0000000000..10fe62b72a --- /dev/null +++ b/package/optee-examples/optee-examples.mk @@ -0,0 +1,37 @@ +################################################################################ +# +# optee-examples +# +################################################################################ + +OPTEE_EXAMPLES_VERSION = 3.4.0 +OPTEE_EXAMPLES_SITE = $(call github,linaro-swg,optee_examples,$(OPTEE_EXAMPLES_VERSION)) +OPTEE_EXAMPLES_LICENSE = BSD-2-Clause +OPTEE_EXAMPLES_LICENSE_FILES = LICENSE + +OPTEE_EXAMPLES_DEPENDENCIES = optee-client optee-os + +ifeq ($(BR2_aarch64),y) +OPTEE_EXAMPLES_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 +else ifeq ($(BR2_arm),y) +OPTEE_EXAMPLES_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 +endif + +# Trusted Application are not built from CMake due to ta_dev_kit dependencies. +# We must build and install them on target. +define OPTEE_EXAMPLES_BUILD_TAS + $(foreach f,$(wildcard $(@D)/*/ta/Makefile), \ + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ + TA_DEV_KIT_DIR=$(OPTEE_EXAMPLES_SDK) \ + O=out -C $(dir $f) all + ) +endef +define OPTEE_EXAMPLES_INSTALL_TAS + @mkdir -p $(TARGET_DIR)/lib/optee_armtz + @$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz $(@D)/*/ta/out/*.ta +endef +OPTEE_EXAMPLES_POST_BUILD_HOOKS += OPTEE_EXAMPLES_BUILD_TAS +OPTEE_EXAMPLES_POST_INSTALL_TARGET_HOOKS += OPTEE_EXAMPLES_INSTALL_TAS + +$(eval $(cmake-package)) From 7d1080a1b4ccd90abc7adeeebebdfeea588b22ce Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 30 Jan 2019 11:47:26 +0100 Subject: [PATCH 0031/7482] package/optee-test: new package OP-TEE test package provide test materials as part of the OP-TEE project helping platforms to verify their OP-TEE components against a set of regression and performance tests. Package is added in the BR package configuration next to the OP-TEE client package. This change references in Buildroot the today's latest OP-TEE revision release tagged 3.4.0 with an added patch to fix an issue reported by recent GCC toolchains. Signed-off-by: Etienne Carriere [Thomas: - drop version selection - propagate !BR2_STATIC_LIBS dependency of optee-client - make sure BR2_TARGET_OPTEE_OS_SDK is selected - use a patch generated by git format-patch - simplify the construct to build the examples] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + ...n-4100-update-string-conversion-loop.patch | 72 +++++++++++++++++++ package/optee-test/Config.in | 27 +++++++ package/optee-test/optee-test.hash | 4 ++ package/optee-test/optee-test.mk | 38 ++++++++++ 6 files changed, 143 insertions(+) create mode 100644 package/optee-test/0001-regression-4100-update-string-conversion-loop.patch create mode 100644 package/optee-test/Config.in create mode 100644 package/optee-test/optee-test.hash create mode 100644 package/optee-test/optee-test.mk diff --git a/DEVELOPERS b/DEVELOPERS index dec6d004f6..ea307ddcbb 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -691,6 +691,7 @@ N: Etienne Carriere F: boot/optee-os/ F: package/optee-client/ F: package/optee-examples/ +F: package/optee-test/ N: Eugene Tarassov F: package/tcf-agent/ diff --git a/package/Config.in b/package/Config.in index 5eb0acfd20..cb81180faa 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2081,6 +2081,7 @@ menu "Security" source "package/checkpolicy/Config.in" source "package/optee-client/Config.in" source "package/optee-examples/Config.in" + source "package/optee-test/Config.in" source "package/paxtest/Config.in" source "package/policycoreutils/Config.in" source "package/refpolicy/Config.in" diff --git a/package/optee-test/0001-regression-4100-update-string-conversion-loop.patch b/package/optee-test/0001-regression-4100-update-string-conversion-loop.patch new file mode 100644 index 0000000000..62862867be --- /dev/null +++ b/package/optee-test/0001-regression-4100-update-string-conversion-loop.patch @@ -0,0 +1,72 @@ +From 88714fc174b91950c9e1c53a9832fc6d4ffa6e2a Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Sun, 17 Feb 2019 22:44:44 +0100 +Subject: [PATCH] regression 4100: update string conversion loop + +Change the loop used to convert string into numerical value. +The original loop was fine but its implementation hits toolchain +unsafe-loop-optimizations feature. The new implementation +proposed here simplifies a bit the loop and prevents toolchain +from complaining when directive -Werror=unsafe-loop-optimizations +is enabled. + +Issue reported by the Buildroot cross toolchain [1] with the +following error traces: + +build/armv7/build/optee-test-3.4.0/host/xtest/regression_4100.c:447:8: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations] + while (spos) { + ^ +build/optee-test-3.4.0/host/xtest/regression_4100.c:454:6: error: missed loop optimization, the loop counter may overflow [-Werror=unsafe-loop-optimizations] + if (!spos) + ^ + +[1] arm-buildroot-linux-uclibcgnueabihf-gcc.br_real (Buildroot 2019.02-git-00933-gb75e93c) 7.4.0 + +Signed-off-by: Etienne Carriere +--- + host/xtest/regression_4100.c | 25 ++++++++++++++----------- + 1 file changed, 14 insertions(+), 11 deletions(-) + +diff --git a/host/xtest/regression_4100.c b/host/xtest/regression_4100.c +index b477f38..88346d4 100644 +--- a/host/xtest/regression_4100.c ++++ b/host/xtest/regression_4100.c +@@ -445,21 +445,24 @@ static TEEC_Result convert_from_string(ADBG_Case_t *c, TEEC_Session *s, + return TEEC_ERROR_OUT_OF_MEMORY; + + while (spos) { +- spos--; +- nibble = digit_value(str[spos]); +- if (nibble == -1) ++ nibble = digit_value(str[spos - 1]); ++ if (nibble == -1) { ++ spos--; + break; ++ } + os[ospos] = nibble; + +- if (!spos) +- break; ++ if (spos > 1) { ++ nibble = digit_value(str[spos - 2]); ++ if (nibble == -1) { ++ spos -= 2; ++ break; ++ } ++ os[ospos] |= nibble << 4; ++ ospos--; ++ spos--; ++ } + spos--; +- nibble = digit_value(str[spos]); +- if (nibble == -1) +- break; +- +- os[ospos] |= nibble << 4; +- ospos--; + } + + if (spos) +-- +2.20.1 + diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in new file mode 100644 index 0000000000..575790b119 --- /dev/null +++ b/package/optee-test/Config.in @@ -0,0 +1,27 @@ +config BR2_PACKAGE_OPTEE_TEST + bool "optee-test" + depends on BR2_TARGET_OPTEE_OS + depends on !BR2_STATIC_LIBS # optee-client + select BR2_PACKAGE_OPTEE_CLIENT + select BR2_TARGET_OPTEE_OS_SDK + help + This build option enables OP-TEE test package from the + OP-TEE project. It helps platforms to verify the OP-TEE + installation against a set of regression and performance + tests. + + The package generates userspace test applications and + data files for the Linux userland. It also generates + OP-TEE trusted applications. + + Trusted application binary files are installed in the target + directory /lib/optee_armtz as other trusted applications. + At runtime OP-TEE OS can load trusted applications from this + non-secure filesystem/directory into the secure world for + execution. + + http://github.com/OP-TEE/optee_test + +comment "optee-test needs a toolchain w/ dynamic library" + depends on BR2_TARGET_OPTEE_OS + depends on BR2_STATIC_LIBS diff --git a/package/optee-test/optee-test.hash b/package/optee-test/optee-test.hash new file mode 100644 index 0000000000..c8ae51b8ee --- /dev/null +++ b/package/optee-test/optee-test.hash @@ -0,0 +1,4 @@ +# From https://github.com/OP-TEE/optee_test/archive/3.4.0.tar.gz +sha256 755904c5b845763a2460c32c21100a57c713009b6b88cc3fc21f0e5be8645e2b optee-test-3.4.0.tar.gz +# Locally computed +sha256 6e6810981f0ddab9e0d44399d0700a15d9f760a3c2843cc866659c2074139ae7 LICENSE.md diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk new file mode 100644 index 0000000000..1ab6bf4fec --- /dev/null +++ b/package/optee-test/optee-test.mk @@ -0,0 +1,38 @@ +################################################################################ +# +# optee-test +# +################################################################################ + +OPTEE_TEST_VERSION = 3.4.0 +OPTEE_TEST_SITE = $(call github,OP-TEE,optee_test,$(OPTEE_TEST_VERSION)) +OPTEE_TEST_LICENSE = GPL-2.0, BSD-2-Clause, +OPTEE_TEST_LICENSE_FILES = LICENSE.md + +OPTEE_TEST_DEPENDENCIES = optee-client optee-os + +ifeq ($(BR2_aarch64),y) +OPTEE_TEST_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 +else ifeq ($(BR2_arm),y) +OPTEE_TEST_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 +endif +OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_TEST_SDK) + +# Trusted Application are not built from CMake due to ta_dev_kit +# dependencies. We must build and install them on target. +define OPTEE_TEST_BUILD_TAS + $(foreach f,$(wildcard $(@D)/ta/*/Makefile), \ + $(TARGET_CONFIGURE_OPTS) \ + $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ + TA_DEV_KIT_DIR=$(OPTEE_TEST_SDK) \ + -C $(dir $f) all + ) +endef +define OPTEE_TEST_INSTALL_TAS + @mkdir -p $(TARGET_DIR)/lib/optee_armtz + @$(INSTALL) -D -m 444 -t $(TARGET_DIR)/lib/optee_armtz $(@D)/ta/*/*.ta +endef +OPTEE_TEST_POST_BUILD_HOOKS += OPTEE_TEST_BUILD_TAS +OPTEE_TEST_POST_INSTALL_TARGET_HOOKS += OPTEE_TEST_INSTALL_TAS + +$(eval $(cmake-package)) From 2fc4790e672f7455c24767791db48584fde88eed Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Wed, 30 Jan 2019 11:47:27 +0100 Subject: [PATCH 0032/7482] package/optee-benchmark: new package OP-TEE performance benchmark tools for the OP-TEE project. This packages generates embedded Linux based OS materials used to retrieve execution timing information on invocation of the OP-TEE secure services. It is added next to the OP-TEE client package in BR configuration. This change references in Buildroot the today's latest OP-TEE revision release tagged 3.4.0. Signed-off-by: Etienne Carriere [Thomas: - drop version selection - propagate the dependency of optee-client] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/optee-benchmark/Config.in | 15 +++++++++++++++ package/optee-benchmark/optee-benchmark.hash | 2 ++ package/optee-benchmark/optee-benchmark.mk | 13 +++++++++++++ 5 files changed, 32 insertions(+) create mode 100644 package/optee-benchmark/Config.in create mode 100644 package/optee-benchmark/optee-benchmark.hash create mode 100644 package/optee-benchmark/optee-benchmark.mk diff --git a/DEVELOPERS b/DEVELOPERS index ea307ddcbb..44de17aba1 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -689,6 +689,7 @@ F: package/szip/ N: Etienne Carriere F: boot/optee-os/ +F: package/optee-benchmark/ F: package/optee-client/ F: package/optee-examples/ F: package/optee-test/ diff --git a/package/Config.in b/package/Config.in index cb81180faa..420e6e95a3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2079,6 +2079,7 @@ endmenu menu "Security" source "package/checkpolicy/Config.in" + source "package/optee-benchmark/Config.in" source "package/optee-client/Config.in" source "package/optee-examples/Config.in" source "package/optee-test/Config.in" diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in new file mode 100644 index 0000000000..0e36549c94 --- /dev/null +++ b/package/optee-benchmark/Config.in @@ -0,0 +1,15 @@ +config BR2_PACKAGE_OPTEE_BENCHMARK + bool "optee-benchmark" + depends on !BR2_STATIC_LIBS # optee-client + select BR2_PACKAGE_OPTEE_CLIENT + select BR2_PACKAGE_LIBYAML + help + Enable the OP-TEE benchmark package that brings facilities + for profiling traversal and execution timings when + invoking OP-TEE. OP-TEE benchmark is a component delivered + by the OP-TEE project. + + http://github.com/linaro-swg/optee_benchmark + +comment "optee-benchmark needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS diff --git a/package/optee-benchmark/optee-benchmark.hash b/package/optee-benchmark/optee-benchmark.hash new file mode 100644 index 0000000000..c3c41b69da --- /dev/null +++ b/package/optee-benchmark/optee-benchmark.hash @@ -0,0 +1,2 @@ +# From https://github.com/linaro-swg/optee_benchmark/archive/3.4.0.tar.gz +sha256 e5e868a06a9dcc8cc444b3e72c65f57670b0811091be62edbe0d03d13c75e716 optee-benchmark-3.4.0.tar.gz diff --git a/package/optee-benchmark/optee-benchmark.mk b/package/optee-benchmark/optee-benchmark.mk new file mode 100644 index 0000000000..4ebab4498e --- /dev/null +++ b/package/optee-benchmark/optee-benchmark.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# optee-benchmark +# +################################################################################ + +OPTEE_BENCHMARK_VERSION = 3.4.0 +OPTEE_BENCHMARK_SITE = $(call github,linaro-swg,optee_benchmark,$(OPTEE_BENCHMARK_VERSION)) +OPTEE_BENCHMARK_LICENSE = BSD-2-Clause + +OPTEE_BENCHMARK_DEPENDENCIES = optee-client libyaml + +$(eval $(cmake-package)) From 634be864d9be9cac302d479bc1d7dd2c5df15d3d Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Mon, 18 Feb 2019 11:12:05 -0800 Subject: [PATCH 0033/7482] package/python-websockets: bump to version 7.0 Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- package/python-websockets/python-websockets.hash | 4 ++-- package/python-websockets/python-websockets.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-websockets/python-websockets.hash b/package/python-websockets/python-websockets.hash index 4939c7834f..024b83d908 100644 --- a/package/python-websockets/python-websockets.hash +++ b/package/python-websockets/python-websockets.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/websockets/json -md5 76cf931a525a3415f5a4f59c133e89c3 websockets-6.0.tar.gz -sha256 8f3b956d11c5b301206382726210dc1d3bee1a9ccf7aadf895aaf31f71c3716c websockets-6.0.tar.gz +md5 e3b5f2e257de0371e7b4d0b6ef7bc29e websockets-7.0.tar.gz +sha256 08e3c3e0535befa4f0c4443824496c03ecc25062debbcf895874f8a0b4c97c9f websockets-7.0.tar.gz # Locally computed sha256 checksums sha256 2cd4d416e432ca7fda2c103b38b852f8d3cb327d70c3db44410b9fe97e6c4d73 LICENSE diff --git a/package/python-websockets/python-websockets.mk b/package/python-websockets/python-websockets.mk index 4d547ada81..30c35d3baa 100644 --- a/package/python-websockets/python-websockets.mk +++ b/package/python-websockets/python-websockets.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WEBSOCKETS_VERSION = 6.0 +PYTHON_WEBSOCKETS_VERSION = 7.0 PYTHON_WEBSOCKETS_SOURCE = websockets-$(PYTHON_WEBSOCKETS_VERSION).tar.gz -PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/4e/2a/56e60bb4c3696bc736998cc13c3fa1a36210609d7e1a3f2519857b420245 +PYTHON_WEBSOCKETS_SITE = https://files.pythonhosted.org/packages/ba/60/59844a5cef2428cb752bd4f446b72095b1edee404a58c27e87cd12a141e2 PYTHON_WEBSOCKETS_SETUP_TYPE = setuptools PYTHON_WEBSOCKETS_LICENSE = BSD-3-Clause PYTHON_WEBSOCKETS_LICENSE_FILES = LICENSE From 2f287be9cfca8bb09c56e7661d861ed1df6283bc Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Mon, 18 Feb 2019 11:16:31 -0800 Subject: [PATCH 0034/7482] package/python-sentry-sdk: bump to version 0.7.3 Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- package/python-sentry-sdk/python-sentry-sdk.hash | 4 ++-- package/python-sentry-sdk/python-sentry-sdk.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-sentry-sdk/python-sentry-sdk.hash b/package/python-sentry-sdk/python-sentry-sdk.hash index 34acf6ec14..44af302ae4 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.hash +++ b/package/python-sentry-sdk/python-sentry-sdk.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/sentry-sdk/json -md5 78642322818c1ce47e80938fe1f40b5f sentry-sdk-0.6.2.tar.gz -sha256 56118f4c3bd3412e47d1969997580df2f27ae951df949d07f0c2120cefe40b00 sentry-sdk-0.6.2.tar.gz +md5 3a5bd3a5d9bd1305d26a702b38134140 sentry-sdk-0.7.3.tar.gz +sha256 6f4e264d0ad6267c40e20431a6a50f815515805ffe8eb9815340adf931279523 sentry-sdk-0.7.3.tar.gz # Locally computed sha256 checksums sha256 59404d4c854e579097d41bfccd5006afde9d6d70e646cf55074cdbfead5ecf1c LICENSE diff --git a/package/python-sentry-sdk/python-sentry-sdk.mk b/package/python-sentry-sdk/python-sentry-sdk.mk index ae218de1cf..c84b999e5c 100644 --- a/package/python-sentry-sdk/python-sentry-sdk.mk +++ b/package/python-sentry-sdk/python-sentry-sdk.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_SENTRY_SDK_VERSION = 0.6.2 +PYTHON_SENTRY_SDK_VERSION = 0.7.3 PYTHON_SENTRY_SDK_SOURCE = sentry-sdk-$(PYTHON_SENTRY_SDK_VERSION).tar.gz -PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/92/6f/b7b74d7635e220660c06897213fc6df894d291900c8e2710d72fb67528a7 +PYTHON_SENTRY_SDK_SITE = https://files.pythonhosted.org/packages/9a/8d/e2af648ebb60cff433cdc80760bb45fe9cb7f32ccdff19c43c0d2e743968 PYTHON_SENTRY_SDK_SETUP_TYPE = setuptools PYTHON_SENTRY_SDK_LICENSE = BSD-2-Clause PYTHON_SENTRY_SDK_LICENSE_FILES = LICENSE From 40d3f6e85cc95fb0e16086b64c14318ed840e859 Mon Sep 17 00:00:00 2001 From: Markus Steinhilber Date: Mon, 18 Feb 2019 14:01:53 +0000 Subject: [PATCH 0035/7482] package/stm32flash: bump to version 0.5 Bump to latest official version. Signed-off-by: Markus Steinhilber Signed-off-by: Thomas Petazzoni --- package/stm32flash/stm32flash.hash | 2 ++ package/stm32flash/stm32flash.mk | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 package/stm32flash/stm32flash.hash diff --git a/package/stm32flash/stm32flash.hash b/package/stm32flash/stm32flash.hash new file mode 100644 index 0000000000..d12b9354b2 --- /dev/null +++ b/package/stm32flash/stm32flash.hash @@ -0,0 +1,2 @@ +# Locally computed: +sha256 73afcbd317ca3eb080c14b6ed1451e5a74a3bbae8f8fb5fe24ea496333f03ead stm32flash-1f934ae86babdeea47afdfae1d856d5fd5da6c53.tar.gz diff --git a/package/stm32flash/stm32flash.mk b/package/stm32flash/stm32flash.mk index c41fc76d01..9bb05ab730 100644 --- a/package/stm32flash/stm32flash.mk +++ b/package/stm32flash/stm32flash.mk @@ -4,7 +4,7 @@ # ################################################################################ -STM32FLASH_VERSION = 4ac0566f188f39eace0223d966d349cd2f2c5895 +STM32FLASH_VERSION = 1f934ae86babdeea47afdfae1d856d5fd5da6c53 STM32FLASH_SITE = git://git.code.sf.net/p/stm32flash/code STM32FLASH_LICENSE = GPL-2.0+ STM32FLASH_LICENSE_FILES = gpl-2.0.txt From 749e599a5b8e9856dc91ea1ec2b55d2731fad036 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Fri, 22 Feb 2019 10:53:21 +0200 Subject: [PATCH 0036/7482] package/python-pip: bump to version 19.0.3 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-pip/python-pip.hash | 4 ++-- package/python-pip/python-pip.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-pip/python-pip.hash b/package/python-pip/python-pip.hash index 96baf04a00..f2a6b25012 100644 --- a/package/python-pip/python-pip.hash +++ b/package/python-pip/python-pip.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pip/json -md5 526fd9ec1e6ea956b3571ebfb42cf83c pip-19.0.2.tar.gz -sha256 f851133f8b58283fa50d8c78675eb88d4ff4cde29b6c41205cd938b06338e0e5 pip-19.0.2.tar.gz +md5 1c5edb0924a0d7d79f3a2e3df05009b4 pip-19.0.3.tar.gz +sha256 6e6f197a1abfb45118dbb878b5c859a0edbdd33fd250100bc015b67fded4b9f2 pip-19.0.3.tar.gz # Locally computed sha256 checksums sha256 5ba21fbb0964f936ad7d15362d1ed6d4931cc8c8f9ff2d4d91190e109be74431 LICENSE.txt diff --git a/package/python-pip/python-pip.mk b/package/python-pip/python-pip.mk index 94926fce09..c7ca45d9d9 100644 --- a/package/python-pip/python-pip.mk +++ b/package/python-pip/python-pip.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PIP_VERSION = 19.0.2 +PYTHON_PIP_VERSION = 19.0.3 PYTHON_PIP_SOURCE = pip-$(PYTHON_PIP_VERSION).tar.gz -PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/4c/4d/88bc9413da11702cbbace3ccc51350ae099bb351febae8acc85fec34f9af +PYTHON_PIP_SITE = https://files.pythonhosted.org/packages/36/fa/51ca4d57392e2f69397cd6e5af23da2a8d37884a605f9e3f2d3bfdc48397 PYTHON_PIP_SETUP_TYPE = setuptools PYTHON_PIP_LICENSE = MIT PYTHON_PIP_LICENSE_FILES = LICENSE.txt From 553bab0a2898fa6497cd73e4d6837dd16bb513dc Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Fri, 22 Feb 2019 10:53:22 +0200 Subject: [PATCH 0037/7482] package/python-psutil: bump to version 5.5.1 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-psutil/python-psutil.hash | 4 ++-- package/python-psutil/python-psutil.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index 12d53f95c7..a6ad618d39 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 0502dad59fcbe047baebe07165b1376a psutil-5.5.0.tar.gz -sha256 1aba93430050270750d046a179c5f3d6e1f5f8b96c20399ba38c596b28fc4d37 psutil-5.5.0.tar.gz +md5 81d6969ba8392cd3b6f5cba6c4e77caa psutil-5.5.1.tar.gz +sha256 72cebfaa422b7978a1d3632b65ff734a34c6b34f4578b68a5c204d633756b810 psutil-5.5.1.tar.gz # Locally computed sha256 checksums sha256 bb073826b0dfb43b631c38ad5d9844cda74cc631d2a5569ad8798be4274a3e17 LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 2a70845483..09d4e95167 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.5.0 +PYTHON_PSUTIL_VERSION = 5.5.1 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/6e/a0/833bcbcede5141cc5615e50c7cc5b960ce93d9c9b885fbe3b7d36e48a2d4 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/c7/01/7c30b247cdc5ba29623faa5c8cf1f1bbf7e041783c340414b0ed7e067c64 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE From ad52e1107810bd7e6b3f2097dd32a3b442fb1745 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Fri, 22 Feb 2019 10:53:23 +0200 Subject: [PATCH 0038/7482] package/python-py: bump to version 1.8.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-py/python-py.hash | 4 ++-- package/python-py/python-py.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-py/python-py.hash b/package/python-py/python-py.hash index 67926527cd..f8e6446338 100644 --- a/package/python-py/python-py.hash +++ b/package/python-py/python-py.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/py/json -md5 e53ac12db4286737837ef3ccb4158301 py-1.7.0.tar.gz -sha256 bf92637198836372b520efcba9e020c330123be8ce527e535d185ed4b6f45694 py-1.7.0.tar.gz +md5 d9e30436ce7e79f30847f9b30b62e149 py-1.8.0.tar.gz +sha256 dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53 py-1.8.0.tar.gz # Locally computed sha256 checksums sha256 2af680c39ef493fb82830356d1d3df1acb5a06033cba2dec7a19e21caa77a866 LICENSE diff --git a/package/python-py/python-py.mk b/package/python-py/python-py.mk index 87e19ac21a..1592b5c6b4 100644 --- a/package/python-py/python-py.mk +++ b/package/python-py/python-py.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PY_VERSION = 1.7.0 +PYTHON_PY_VERSION = 1.8.0 PYTHON_PY_SOURCE = py-$(PYTHON_PY_VERSION).tar.gz -PYTHON_PY_SITE = https://files.pythonhosted.org/packages/c7/fa/eb6dd513d9eb13436e110aaeef9a1703437a8efa466ce6bb2ff1d9217ac7 +PYTHON_PY_SITE = https://files.pythonhosted.org/packages/f1/5a/87ca5909f400a2de1561f1648883af74345fe96349f34f737cdfc94eba8c PYTHON_PY_DEPENDENCIES = host-python-setuptools-scm PYTHON_PY_SETUP_TYPE = setuptools PYTHON_PY_LICENSE = MIT From 0e77e873abba32dadef1898e8f9968b376f526fa Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Fri, 22 Feb 2019 10:53:24 +0200 Subject: [PATCH 0039/7482] package/python-pyzmq: bump to version 18.0.0 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-pyzmq/python-pyzmq.hash | 6 +++--- package/python-pyzmq/python-pyzmq.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/python-pyzmq/python-pyzmq.hash b/package/python-pyzmq/python-pyzmq.hash index eb8cf0923b..58d5fa1f56 100644 --- a/package/python-pyzmq/python-pyzmq.hash +++ b/package/python-pyzmq/python-pyzmq.hash @@ -1,3 +1,3 @@ -# md5 from https://pypi.python.org/pypi/pyzmq/json, sha256 locally computed -md5 6f5d77cb5ec1617ce9b6e5ad7c6174fb pyzmq-17.1.2.tar.gz -sha256 a72b82ac1910f2cf61a49139f4974f994984475f771b0faa730839607eeedddf pyzmq-17.1.2.tar.gz +# md5, sha256 from https://pypi.org/pypi/pyzmq/json +md5 81d643d1e9eb9238960a18b6b0989db2 pyzmq-18.0.0.tar.gz +sha256 b30c339eb58355f51f4f54dd61d785f1ff58c86bca1c3a5916977631d121867b pyzmq-18.0.0.tar.gz diff --git a/package/python-pyzmq/python-pyzmq.mk b/package/python-pyzmq/python-pyzmq.mk index b977cca927..5d772b9fa3 100644 --- a/package/python-pyzmq/python-pyzmq.mk +++ b/package/python-pyzmq/python-pyzmq.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYZMQ_VERSION = 17.1.2 +PYTHON_PYZMQ_VERSION = 18.0.0 PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz -PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/b9/6a/bc9277b78f5c3236e36b8c16f4d2701a7fd4fa2eb697159d3e0a3a991573 +PYTHON_PYZMQ_SITE = https://files.pythonhosted.org/packages/64/8d/78975da77627fd863c08e8ea3c7cebce7e51bed2936be5118de6b0050638 PYTHON_PYZMQ_LICENSE = LGPL-3.0+, BSD-3-Clause, Apache-2.0 # Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD From d76942949dcc7c8c9fc2fdbb3b4ace9ba161e137 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Fri, 22 Feb 2019 10:53:20 +0200 Subject: [PATCH 0040/7482] package/czmq: bump to version 4.2.0 Modified patch to fit the new version. Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- .../0001-configure.ac-remove-Werror.patch | 24 ++++++++++--------- package/czmq/czmq.hash | 6 ++--- package/czmq/czmq.mk | 2 +- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/package/czmq/0001-configure.ac-remove-Werror.patch b/package/czmq/0001-configure.ac-remove-Werror.patch index 7f2dae2c2b..2a9454d95e 100644 --- a/package/czmq/0001-configure.ac-remove-Werror.patch +++ b/package/czmq/0001-configure.ac-remove-Werror.patch @@ -8,23 +8,25 @@ newer versions of the compiler or the C library, when new warnings are introduced. Signed-off-by: Thomas Petazzoni +[Asaf: Modified for version 4.2.0] +Signed-off-by: Asaf Kahlon --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index e92970a..2fd551a 100755 +index 6868a99b..9a941545 100644 --- a/configure.ac +++ b/configure.ac -@@ -344,7 +344,7 @@ AC_C_BIGENDIAN - - # These options are GNU compiler specific. - if test "x$GCC" = "xyes"; then -- CPPFLAGS="-pedantic -Werror -Wall -Wc++-compat ${CPPFLAGS}" -+ CPPFLAGS="-pedantic -Wall -Wc++-compat ${CPPFLAGS}" - fi - - AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes") +@@ -952,7 +952,7 @@ AS_IF([test "x$enable_Werror" = "xyes" || test "x$enable_Werror" = "xauto"], + ])]) + AS_IF([test -n "$CPP"],[AS_IF([$CPP --version 2>&1 | grep 'Free Software Foundation' > /dev/null && test "x$GCC" = "xyes"], + [AC_MSG_NOTICE([Enabling pedantic errors for GNU CPP preprocessor]) +- CPPFLAGS="$CPPFLAGS -pedantic -Werror -Wall -Wc++-compat" ++ CPPFLAGS="$CPPFLAGS -pedantic -Wall -Wc++-compat" + ], + [AC_MSG_NOTICE([Not enabling pedantic errors: preprocessor not supported by this recipe (not GNU CPP)]) + AS_IF([test "x$enable_Werror" = "xyes"], [AC_MSG_ERROR([--enable-Werror=yes was requested and can not be satisfied for CPP: $CPP])]) -- -2.7.4 +2.19.1 diff --git a/package/czmq/czmq.hash b/package/czmq/czmq.hash index c42525c78d..97b6e03b54 100644 --- a/package/czmq/czmq.hash +++ b/package/czmq/czmq.hash @@ -1,6 +1,6 @@ # From https://github.com/zeromq/czmq/releases -md5 6d3a6fdd25c2bb29897c53670dce97bf czmq-4.1.1.tar.gz -sha1 629d34e8b5c1f2dd88689350f71f9917a8d76f23 czmq-4.1.1.tar.gz +md5 7e09997db6ac3b25e8ed104053040722 czmq-4.2.0.tar.gz +sha1 42165b3eede517708814e5a1b6972d8bde417f7a czmq-4.2.0.tar.gz # Locally calculated -sha256 f00ff419881dc2a05d0686c8467cd89b4882677fc56f31c0e2cc81c134cbb0c0 czmq-4.1.1.tar.gz +sha256 cfab29c2b3cc8a845749758a51e1dd5f5160c1ef57e2a41ea96e4c2dcc8feceb czmq-4.2.0.tar.gz sha256 1f256ecad192880510e84ad60474eab7589218784b9a50bc7ceee34c2b91f1d5 LICENCE diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk index 6eb9314200..56dc65f8bc 100644 --- a/package/czmq/czmq.mk +++ b/package/czmq/czmq.mk @@ -4,7 +4,7 @@ # ################################################################################ -CZMQ_VERSION = 4.1.1 +CZMQ_VERSION = 4.2.0 CZMQ_SITE = https://github.com/zeromq/czmq/releases/download/v$(CZMQ_VERSION) # 0001-configure.ac-remove-Werror.patch touches configure.ac From 910bfd57b4d67ae46785a0a2ec8ae7f61a475e35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= Date: Wed, 20 Feb 2019 12:20:16 +0000 Subject: [PATCH 0041/7482] package/glorytun: bump to version 0.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The hash of the license file is only changed due to a year update: -Copyright (c) 2015-2016, angt +Copyright (c) 2015-2019, angt Signed-off-by: Adrien Gallouët Signed-off-by: Thomas Petazzoni --- package/glorytun/glorytun.hash | 4 ++-- package/glorytun/glorytun.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/glorytun/glorytun.hash b/package/glorytun/glorytun.hash index 59a5f09c0e..85ae338c48 100644 --- a/package/glorytun/glorytun.hash +++ b/package/glorytun/glorytun.hash @@ -1,2 +1,2 @@ -sha256 5e23afad4592d6af27ffd2cb3c826cf0ea1b5166a05ef1ae5c77fb4e465bb735 glorytun-0.0.99-mud.tar.gz -sha256 bd418f8ef7d62f2c89e3aa1e5dc41c7d7a6212eb1cdb4d39a26a5bd333e1b4a3 LICENSE +sha256 65adee2945f377ec41c1384745d5676c99768bba8fd4456755ee4c7d73915ede glorytun-0.1.0.tar.gz +sha256 051ef5a4c3c8fe64f8641e0ed50b4cd35c64703d972130f9725c8fee7976f90b LICENSE diff --git a/package/glorytun/glorytun.mk b/package/glorytun/glorytun.mk index f6d87c2605..9fed5d260d 100644 --- a/package/glorytun/glorytun.mk +++ b/package/glorytun/glorytun.mk @@ -4,7 +4,7 @@ # ################################################################################ -GLORYTUN_VERSION = 0.0.99-mud +GLORYTUN_VERSION = 0.1.0 GLORYTUN_SITE = https://github.com/angt/glorytun/releases/download/v$(GLORYTUN_VERSION) GLORYTUN_DEPENDENCIES = libsodium host-pkgconf GLORYTUN_LICENSE = BSD-2-clause From 58a2000be892bb4eb854e9800339fe2a0c43dbec Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Thu, 21 Feb 2019 17:27:25 -0300 Subject: [PATCH 0042/7482] package/snort: bump to version 2.9.12 Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- package/snort/snort.hash | 2 +- package/snort/snort.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/snort/snort.hash b/package/snort/snort.hash index 211e862b7f..abe85920cf 100644 --- a/package/snort/snort.hash +++ b/package/snort/snort.hash @@ -1,5 +1,5 @@ # Locally computed: -sha256 9f6b3aeac5a109f55504bd370564ac431cb1773507929dc461626898f33f46cd snort-2.9.11.1.tar.gz +sha256 7b02e11987c6cb4f6d79d72799ca9ad2b4bd59cc1d96bb7d6c91549f990d99d0 snort-2.9.12.tar.gz # Hash for license files: sha256 f98260a6d3e5ef4ede8a2a6b698e5ac91d64c09243f7171e1c5b17b920a835c7 LICENSE diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 568393468b..30de02b3a8 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -4,7 +4,7 @@ # ################################################################################ -SNORT_VERSION = 2.9.11.1 +SNORT_VERSION = 2.9.12 SNORT_SITE = https://www.snort.org/downloads/snort SNORT_LICENSE = GPL-2.0 SNORT_LICENSE_FILES = LICENSE COPYING From 0d9a2defb64e10e8167888d5758a45a58dba18cd Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Thu, 21 Feb 2019 17:27:26 -0300 Subject: [PATCH 0043/7482] package/snort: build with OpenAppID support if luajit/openssl is enabled Since version 2.9.12, OpenAppID [1] is enabled by default. OpenAppID depends on luajit and openssl. If we leave it enabled by default, snort would require luajit. Since luajit is not available on all architectures, that would limit the usage of the snort package. Since not all users will need/use OpenAppID, let's leave it disabled by default. To build with OpenAppID support, the user will need to enable luajit and libssl. Also, it is necessary to apply a patch to fix a compile error when building OpenAppID with uclibc and musl. The build fails when dereferencing the rpcent structure because rpc.h is not been included. [1] https://www.snort.org/downloads/openappid/9553 Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- ...r-when-building-against-uclibc-or-mu.patch | 34 +++++++++++++++++++ package/snort/snort.mk | 9 +++++ 2 files changed, 43 insertions(+) create mode 100644 package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch diff --git a/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch b/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch new file mode 100644 index 0000000000..ce9d5526c8 --- /dev/null +++ b/package/snort/0006-Fix-compile-error-when-building-against-uclibc-or-mu.patch @@ -0,0 +1,34 @@ +From dc2f54097da3cd493b8f4d06a14ef40be484d24f Mon Sep 17 00:00:00 2001 +From: Sergio Prado +Date: Thu, 21 Feb 2019 15:02:08 -0300 +Subject: [PATCH] Fix compile error when building against uclibc or musl + +The build fails when dereferencing the rpcent structure with uclibc or musl C libraries. + +../../../src/dynamic-preprocessors/appid/service_plugins/service_rpc.c:241:20: +error: dereferencing pointer to incomplete type ‘struct rpcent’ + if (rpc->r_name) + +That's because rpc.h should be included when using these C libraries. + +Signed-off-by: Sergio Prado +--- + src/dynamic-preprocessors/appid/service_plugins/service_rpc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c b/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c +index 81bc8a5db8ab..2e45246083a8 100644 +--- a/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c ++++ b/src/dynamic-preprocessors/appid/service_plugins/service_rpc.c +@@ -32,7 +32,7 @@ + #include "flow.h" + #include "service_api.h" + +-#if defined(FREEBSD) || defined(OPENBSD) ++#if defined(FREEBSD) || defined(OPENBSD) || (defined(LINUX) && defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__)) + #include "rpc/rpc.h" + #endif + +-- +2.7.4 + diff --git a/package/snort/snort.mk b/package/snort/snort.mk index 30de02b3a8..c767d7c545 100644 --- a/package/snort/snort.mk +++ b/package/snort/snort.mk @@ -26,6 +26,15 @@ SNORT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` SNORT_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` endif +# luajit and openssl should be enabled to build with +# OpenAppID support +ifeq ($(BR2_PACKAGE_LUAJIT)$(BR2_PACKAGE_OPENSSL),yy) +SNORT_DEPENDENCIES += luajit openssl +SNORT_CONF_OPTS += --enable-open-appid +else +SNORT_CONF_OPTS += --disable-open-appid +endif + SNORT_CONF_ENV = \ CFLAGS="$(TARGET_CFLAGS) $(SNORT_CFLAGS)" \ LIBS="$(SNORT_LIBS)" \ From 59d186454b1ca7a57343da442a1708a80a499355 Mon Sep 17 00:00:00 2001 From: Bartosz Bilas Date: Thu, 21 Feb 2019 21:41:19 +0100 Subject: [PATCH 0044/7482] boot/barebox: bump version to 2019.02.0 Signed-off-by: Bartosz Bilas Signed-off-by: Thomas Petazzoni --- boot/barebox/Config.in | 4 ++-- boot/barebox/barebox.hash | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 6a8d251548..4c33a77c61 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -12,7 +12,7 @@ choice Select the specific Barebox version you want to use config BR2_TARGET_BAREBOX_LATEST_VERSION - bool "2018.12.0" + bool "2019.02.0" config BR2_TARGET_BAREBOX_CUSTOM_VERSION bool "Custom version" @@ -40,7 +40,7 @@ endif config BR2_TARGET_BAREBOX_VERSION string - default "2018.12.0" if BR2_TARGET_BAREBOX_LATEST_VERSION + default "2019.02.0" if BR2_TARGET_BAREBOX_LATEST_VERSION default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT diff --git a/boot/barebox/barebox.hash b/boot/barebox/barebox.hash index ec4e404b10..aa80908e67 100644 --- a/boot/barebox/barebox.hash +++ b/boot/barebox/barebox.hash @@ -1,5 +1,5 @@ -# From https://www.barebox.org/download/barebox-2018.12.0.tar.bz2.md5 -md5 f84d7d3562055c80c3eedce0b14d4a0d barebox-2018.12.0.tar.bz2 +# From https://www.barebox.org/download/barebox-2019.02.0.tar.bz2.md5 +md5 b3c55967878c1e332c33502f39483ceb barebox-2019.02.0.tar.bz2 # Locally calculated -sha256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 barebox-2018.12.0.tar.bz2 +sha256 f4fc67d5a2410c9d568e5fc1279ac8999e80d3d91c26631df8f3af8636c04212 barebox-2019.02.0.tar.bz2 From 0cf6c82fc6a3319720ae0ae7e38f7d67a72fac39 Mon Sep 17 00:00:00 2001 From: Joseph Kogut Date: Tue, 19 Feb 2019 11:46:37 -0800 Subject: [PATCH 0045/7482] package/python-xlib: bump to version 0.25 LICENSE file changed due to line ending difference, updated checksum. Signed-off-by: Joseph Kogut Signed-off-by: Thomas Petazzoni --- package/python-xlib/python-xlib.hash | 9 +++++---- package/python-xlib/python-xlib.mk | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-xlib/python-xlib.hash b/package/python-xlib/python-xlib.hash index 2c4861af5c..e51461fc2b 100644 --- a/package/python-xlib/python-xlib.hash +++ b/package/python-xlib/python-xlib.hash @@ -1,4 +1,5 @@ -# md5 from https://pypi.python.org/pypi/python-xlib/json, sha256 locally computed -md5 cdf342aa145c2be0ccae46cfb7b62551 python-xlib-0.21.tar.bz2 -sha256 25aad0056172920552c01a163e979b02336abaf47b0792dae9c93ecb29500431 python-xlib-0.21.tar.bz2 -sha256 9b872a8a070b8ad329c4bd380fb1bf0000f564c75023ec8e1e6803f15364b9e9 LICENSE +# md5, sha256 from https://pypi.org/pypi/python-xlib/json +md5 ded820dc8e943106bd660801ed7a82f7 python-xlib-0.25.tar.bz2 +sha256 204f280b549352af6cbdaff43405186822ae05749518dd9be209bd88a0088f99 python-xlib-0.25.tar.bz2 +# Locally computed sha256 checksums +sha256 06eb1c441443cf15ac84f309003f4c43c62246939d37c75fc3e056c2d34cd300 LICENSE diff --git a/package/python-xlib/python-xlib.mk b/package/python-xlib/python-xlib.mk index 0ce6e43422..3ffc4e2ee1 100644 --- a/package/python-xlib/python-xlib.mk +++ b/package/python-xlib/python-xlib.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_XLIB_VERSION = 0.21 +PYTHON_XLIB_VERSION = 0.25 PYTHON_XLIB_SOURCE = python-xlib-$(PYTHON_XLIB_VERSION).tar.bz2 -PYTHON_XLIB_SITE = https://pypi.python.org/packages/eb/de/b0eaaea7b8512dc41504db071824eef30293ff55c58d83081ebaebe85a38 +PYTHON_XLIB_SITE = https://files.pythonhosted.org/packages/3c/d9/51fc07ae57f6a44e62e2ee04bd501d763ac169ff05c838403ec7ae556992 PYTHON_XLIB_SETUP_TYPE = setuptools PYTHON_XLIB_LICENSE = LGPL-2.1+ PYTHON_XLIB_LICENSE_FILES = LICENSE From c3568d58f8eac983572bccf39b7a4d3e0e4e1f8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 18 Feb 2019 21:48:02 +0100 Subject: [PATCH 0046/7482] package/freescale-imx: add option for i.MX8X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel [Thomas: split up from the firmware-imx patch] Signed-off-by: Thomas Petazzoni --- package/freescale-imx/Config.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 95c0aab08c..9001764437 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -42,6 +42,9 @@ config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX7 config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M bool "imx8m" + +config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + bool "imx8x" endchoice config BR2_PACKAGE_FREESCALE_IMX_PLATFORM From ba3d44891f588450904b48e0a80b3f2be6f1a15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 18 Feb 2019 21:48:02 +0100 Subject: [PATCH 0047/7482] package/freescale-imx/firmware-imx: add support for i.MX8X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/freescale-imx/firmware-imx/firmware-imx.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/freescale-imx/firmware-imx/firmware-imx.mk b/package/freescale-imx/firmware-imx/firmware-imx.mk index f9db09dae8..0e2ff7bba2 100644 --- a/package/freescale-imx/firmware-imx/firmware-imx.mk +++ b/package/freescale-imx/firmware-imx/firmware-imx.mk @@ -45,6 +45,14 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \ $(BINARIES_DIR)/signed_hdmi_imx8m.bin endef +else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y) +FIRMWARE_IMX_INSTALL_IMAGES = YES +define FIRMWARE_IMX_INSTALL_IMAGES_CMDS + # SECO firmware is needed when generating imx8-boot-sd.bin which + # is done in post-image script. + cp $(@D)/firmware/seco/ahab-container.img \ + $(BINARIES_DIR)/ahab-container.img +endef else define FIRMWARE_IMX_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/lib/firmware/imx From 0366a0ec71ff187d38d726dd99e9e121994a88ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 18 Feb 2019 21:48:03 +0100 Subject: [PATCH 0048/7482] package/freescale-imx/imx-sc-firmware: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/freescale-imx/Config.in | 1 + .../freescale-imx/imx-sc-firmware/Config.in | 8 ++++++ .../imx-sc-firmware/imx-sc-firmware.mk | 27 +++++++++++++++++++ 4 files changed, 37 insertions(+) create mode 100644 package/freescale-imx/imx-sc-firmware/Config.in create mode 100644 package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk diff --git a/DEVELOPERS b/DEVELOPERS index 44de17aba1..65051db72c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -129,6 +129,7 @@ F: package/ktap/ N: André Hentschel F: package/azure-iot-sdk-c/ +F: package/freescale-imx/imx-sc-firmware/ F: package/libkrb5/ F: package/openal/ F: package/p7zip/ diff --git a/package/freescale-imx/Config.in b/package/freescale-imx/Config.in index 9001764437..fcceacdc9e 100644 --- a/package/freescale-imx/Config.in +++ b/package/freescale-imx/Config.in @@ -90,6 +90,7 @@ source "package/freescale-imx/imx-vpu/Config.in" source "package/freescale-imx/imx-vpu-hantro/Config.in" source "package/freescale-imx/imx-vpuwrap/Config.in" source "package/freescale-imx/firmware-imx/Config.in" +source "package/freescale-imx/imx-sc-firmware/Config.in" if (BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53) source "package/freescale-imx/gpu-amd-bin-mx51/Config.in" source "package/freescale-imx/libz160/Config.in" diff --git a/package/freescale-imx/imx-sc-firmware/Config.in b/package/freescale-imx/imx-sc-firmware/Config.in new file mode 100644 index 0000000000..5c71618ce0 --- /dev/null +++ b/package/freescale-imx/imx-sc-firmware/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_IMX_SC_FIRMWARE + bool "imx-sc-firmware" + depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X + help + System Control Unit Firmware blobs for the Freescale i.MX8 SoCs. + + This library is provided by Freescale as-is and doesn't have + an upstream. diff --git a/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk new file mode 100644 index 0000000000..fac20d0c6f --- /dev/null +++ b/package/freescale-imx/imx-sc-firmware/imx-sc-firmware.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# imx-sc-firmware +# +################################################################################ + +IMX_SC_FIRMWARE_VERSION = 1.0 +IMX_SC_FIRMWARE_SITE = $(FREESCALE_IMX_SITE) +IMX_SC_FIRMWARE_SOURCE = imx-sc-firmware-$(IMX_SC_FIRMWARE_VERSION).bin + +IMX_SC_FIRMWARE_LICENSE = NXP Semiconductor Software License Agreement +IMX_SC_FIRMWARE_LICENSE_FILES = EULA COPYING +IMX_SC_FIRMWARE_REDISTRIBUTE = NO + +define IMX_SC_FIRMWARE_EXTRACT_CMDS + $(call FREESCALE_IMX_EXTRACT_HELPER,$(IMX_SC_FIRMWARE_DL_DIR)/$(IMX_SC_FIRMWARE_SOURCE)) +endef + +IMX_SC_FIRMWARE_INSTALL_IMAGES = YES +define IMX_SC_FIRMWARE_INSTALL_IMAGES_CMDS + # SCFW firmware is needed when generating imx8-boot-sd.bin which + # is done in post-image script. + cp $(@D)/mx8qx-mek-scfw-tcm.bin $(BINARIES_DIR)/mx8qx-mek-scfw-tcm.bin + cp $(@D)/mx8qx-val-scfw-tcm.bin $(BINARIES_DIR)/mx8qx-val-scfw-tcm.bin +endef + +$(eval $(generic-package)) From c14d92d439062caa6c94c4a93b20ab18aa20554c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 18 Feb 2019 21:48:04 +0100 Subject: [PATCH 0049/7482] package/imx-mkimage: bump to rel_imx_4.14.78_1.0.0_ga MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/imx-mkimage/imx-mkimage.hash | 2 +- package/imx-mkimage/imx-mkimage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index e1cbdd973c..c9dcd0fa1d 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 bc79e11cfbde303e200287fa6624028c8ce5344f8a35ed179b3fe217d74155da imx-mkimage-rel_imx_4.9.51_8mq_ga.tar.gz +sha256 d5d7afca6abef4fc6653a2f8b99545d62921a5ab8c44ff3481120232e2162dde imx-mkimage-rel_imx_4.14.78_1.0.0_ga.tar.gz sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c iMX8dv/COPYING diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index 6fd6aa39b0..ac22c974ac 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_MKIMAGE_VERSION = rel_imx_4.9.51_8mq_ga +IMX_MKIMAGE_VERSION = rel_imx_4.14.78_1.0.0_ga IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage IMX_MKIMAGE_SITE_METHOD = git IMX_MKIMAGE_LICENSE = GPL-2.0+ From 57c67fed0e92248b9ba8e98d76ec6ef9ff2738ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 18 Feb 2019 21:48:05 +0100 Subject: [PATCH 0050/7482] package/imx-mkimage: add support for i.MX8 and i.MX8X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- package/imx-mkimage/imx-mkimage.mk | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index ac22c974ac..06d3157dc1 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -11,15 +11,23 @@ IMX_MKIMAGE_LICENSE = GPL-2.0+ IMX_MKIMAGE_LICENSE_FILES = iMX8dv/COPYING HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib +ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M),y) +# i.MX8M needs a different binary define HOST_IMX_MKIMAGE_BUILD_CMDS - # Currently this only supports iMX8M. When more hardware is available - # this needs to be selectable based on iMX8-version (iMX8M,iMXQ etc). $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/iMX8M -f soc.mak mkimage_imx8 endef - define HOST_IMX_MKIMAGE_INSTALL_CMDS $(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8 $(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_fit_atf.sh $(HOST_DIR)/bin/mkimage_fit_atf.sh endef +else +# i.MX8 and i.MX8X +define HOST_IMX_MKIMAGE_BUILD_CMDS + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) MKIMG=mkimage_imx8 mkimage_imx8 +endef +define HOST_IMX_MKIMAGE_INSTALL_CMDS + $(INSTALL) -D -m 755 $(@D)/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8 +endef +endif $(eval $(host-generic-package)) From 7aaf176aea7eb824e1edca10ac079567ad6bc412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 18 Feb 2019 21:48:06 +0100 Subject: [PATCH 0051/7482] board/freescale/common/imx: add support for i.MX8X MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- .../common/imx/genimage.cfg.template_imx8 | 2 +- .../common/imx/imx8-bootloader-prepare.sh | 20 ++++++++++++++----- board/freescale/common/imx/post-image.sh | 13 ++++++++++++ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/board/freescale/common/imx/genimage.cfg.template_imx8 b/board/freescale/common/imx/genimage.cfg.template_imx8 index 2f8842f8e0..bd5f6cdc73 100644 --- a/board/freescale/common/imx/genimage.cfg.template_imx8 +++ b/board/freescale/common/imx/genimage.cfg.template_imx8 @@ -23,7 +23,7 @@ image sdcard.img { partition imx-boot { in-partition-table = "no" image = "imx8-boot-sd.bin" - offset = 33K + offset = %IMXOFFSET% } partition boot { diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index cc12666ae6..e98e93a857 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -7,12 +7,22 @@ main () echo "ERROR: couldn't find dtb: $UBOOT_DTB" exit 1 fi - cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin - BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its - ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb - rm -f ${BINARIES_DIR}/u-boot.its - ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb + rm -f ${BINARIES_DIR}/u-boot.its + + ${HOST_DIR}/bin/mkimage_imx8 -fit -signed_hdmi ${BINARIES_DIR}/signed_hdmi_imx8m.bin -loader ${BINARIES_DIR}/u-boot-spl-ddr.bin 0x7E1000 -second_loader ${BINARIES_DIR}/u-boot.itb 0x40200000 0x60000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + else + ${HOST_DIR}/bin/mkimage_imx8 -commit > ${BINARIES_DIR}/mkimg.commit + cat ${BINARIES_DIR}/u-boot.bin ${BINARIES_DIR}/mkimg.commit > ${BINARIES_DIR}/u-boot-hash.bin + cp ${BINARIES_DIR}/bl31.bin ${BINARIES_DIR}/u-boot-atf.bin + dd if=${BINARIES_DIR}/u-boot-hash.bin of=${BINARIES_DIR}/u-boot-atf.bin bs=1K seek=128 + + ${HOST_DIR}/bin/mkimage_imx8 -soc QX -rev B0 -append ${BINARIES_DIR}/ahab-container.img -c -scfw ${BINARIES_DIR}/mx8qx-mek-scfw-tcm.bin -ap ${BINARIES_DIR}/u-boot-atf.bin a35 0x80000000 -out ${BINARIES_DIR}/imx8-boot-sd.bin + fi exit $? } diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index 6590beda3e..12a5bea73b 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -34,6 +34,8 @@ genimage_type() { if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_imx8" + elif grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y$" ${BR2_CONFIG}; then + echo "genimage.cfg.template_imx8" elif grep -Eq "^BR2_TARGET_UBOOT_SPL=y$" ${BR2_CONFIG}; then echo "genimage.cfg.template_spl" else @@ -41,6 +43,15 @@ genimage_type() fi } +imx_offset() +{ + if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then + echo "33K" + else + echo "32K" + fi +} + uboot_image() { if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then @@ -53,11 +64,13 @@ uboot_image() main() { local FILES="$(dtb_list) $(linux_image)" + local IMXOFFSET="$(imx_offset)" local UBOOTBIN="$(uboot_image)" local GENIMAGE_CFG="$(mktemp --suffix genimage.cfg)" local GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp" sed -e "s/%FILES%/${FILES}/" \ + -e "s/%IMXOFFSET%/${IMXOFFSET}/" \ -e "s/%UBOOTBIN%/${UBOOTBIN}/" \ board/freescale/common/imx/$(genimage_type) > ${GENIMAGE_CFG} From fdc21cddc391b75d04d1bd1377ba115432733605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 18 Feb 2019 21:48:07 +0100 Subject: [PATCH 0052/7482] configs/freescale_imx8qxpmek: new defconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: André Hentschel [Thomas: update DEVELOPERS file] Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 + board/freescale/imx8qxpmek/readme.txt | 67 ++++++++++++++++++++++++++ configs/freescale_imx8qxpmek_defconfig | 40 +++++++++++++++ 4 files changed, 110 insertions(+) create mode 100644 board/freescale/imx8qxpmek/readme.txt create mode 100644 configs/freescale_imx8qxpmek_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f0ebaa25c..3f7d2e2d7d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -144,6 +144,7 @@ freescale_imx6qsabresd_defconfig: { extends: .defconfig } freescale_imx6sxsabresd_defconfig: { extends: .defconfig } freescale_imx7dsabresd_defconfig: { extends: .defconfig } freescale_imx8mqevk_defconfig: { extends: .defconfig } +freescale_imx8qxpmek_defconfig: { extends: .defconfig } freescale_p1025twr_defconfig: { extends: .defconfig } freescale_t1040d4rdb_defconfig: { extends: .defconfig } friendlyarm_nanopi_a64_defconfig: { extends: .defconfig } diff --git a/DEVELOPERS b/DEVELOPERS index 65051db72c..f192927225 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -128,6 +128,8 @@ N: Anders Darander F: package/ktap/ N: André Hentschel +F: board/freescale/imx8qxpmek/ +F: configs/freescale_imx8qxpmek_defconfig F: package/azure-iot-sdk-c/ F: package/freescale-imx/imx-sc-firmware/ F: package/libkrb5/ diff --git a/board/freescale/imx8qxpmek/readme.txt b/board/freescale/imx8qxpmek/readme.txt new file mode 100644 index 0000000000..45f7915fe4 --- /dev/null +++ b/board/freescale/imx8qxpmek/readme.txt @@ -0,0 +1,67 @@ +*************************** +Freescale i.MX8QXP MEK board +*************************** + +This file documents the Buildroot support for the Freescale i.MX8QXP +MEK board. + +Build +===== + +First, configure Buildroot for the i.MX8QXP MEK board: + + make freescale_imx8qxpmek_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - ahab-container.img + - bl31.bin + - boot.vfat + - fsl-imx8qxp-mek.dtb + - Image + - imx8-boot-sd.bin + - mkimg.commit + - mx8qx-mek-scfw-tcm.bin + - mx8qx-val-scfw-tcm.bin + - rootfs.ext2 + - rootfs.ext4 + - rootfs.tar + - sdcard.img + - u-boot-atf.bin + - u-boot.bin + - u-boot-hash.bin + +Create a bootable SD card +========================= + +To determine the device associated to the SD card have a look in the +/proc/partitions file: + + cat /proc/partitions + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on a SD card. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the card content. Use with care! *** + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template_imx8. + +Boot the i.MX8QXP MEK board +========================== + +To boot your newly created system: +- insert the SD card in the SD slot of the board; +- Configure the boot switch as follows: +SW2: ON ON OFF OFF +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board. + +Enjoy! diff --git a/configs/freescale_imx8qxpmek_defconfig b/configs/freescale_imx8qxpmek_defconfig new file mode 100644 index 0000000000..33e2a50dd7 --- /dev/null +++ b/configs/freescale_imx8qxpmek_defconfig @@ -0,0 +1,40 @@ +BR2_aarch64=y +BR2_cortex_a35=y +BR2_ARM_FPU_VFPV3=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyLP0" +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qxp-mek.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.78_1.0.0_ga" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qxp-mek" +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_PACKAGE_IMX_SC_FIRMWARE=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.78_1.0.0_ga" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qxp" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_GIT=y +BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx" +BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.78_1.0.0_ga" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qxp_mek" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From 8c879ccb69a6ccfc3da4be93030f5921b269ae5e Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 17 Feb 2019 15:12:05 +0100 Subject: [PATCH 0053/7482] package/qt5/qt5webengine: sort chromium-{latest, lts}.inc files Having the contents of those files sorted will more easily allow to generate them automatically and verify the differences when bumping qt5webengine. Signed-off-by: Thomas Petazzoni Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/chromium-latest.inc | 812 +++++++++---------- package/qt5/qt5webengine/chromium-lts.inc | 440 +++++----- 2 files changed, 626 insertions(+), 626 deletions(-) diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc index 671b2383a3..4fc1ae5ecf 100644 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ b/package/qt5/qt5webengine/chromium-latest.inc @@ -1,431 +1,431 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ - src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ - src/3rdparty/chromium/tools/gyp/LICENSE \ - src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ - src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ - src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.fdlibm \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ src/3rdparty/chromium/base/third_party/icu/LICENSE \ src/3rdparty/chromium/base/third_party/libevent/LICENSE \ + src/3rdparty/chromium/base/third_party/nspr/LICENSE \ + src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ + src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ + src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ + src/3rdparty/chromium/LICENSE \ + src/3rdparty/chromium/LICENSE.chromium_os \ + src/3rdparty/chromium/mojo/public/LICENSE \ + src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ + src/3rdparty/chromium/net/third_party/nss/LICENSE \ src/3rdparty/chromium/ppapi/LICENSE \ - src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ - src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/fips181/COPYING \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ - src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/pdfium/LICENSE \ - src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ - src/3rdparty/chromium/third_party/libevdev/LICENSE \ - src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \ - src/3rdparty/chromium/third_party/s2cellid/LICENSE \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/leakcanary/LICENSE \ - src/3rdparty/chromium/third_party/errorprone/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/bazel/LICENSE \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ - src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/LICENSE \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ - src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ - src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ - src/3rdparty/chromium/third_party/openvr/src/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ - src/3rdparty/chromium/third_party/axe-core/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/mach_override/LICENSE \ - src/3rdparty/chromium/third_party/mesa/LICENSE \ - src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ - src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ - src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/guava/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/license_template.txt \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ - src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ - src/3rdparty/chromium/third_party/yara/src/COPYING \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/flot/LICENSE.txt \ - src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/LICENSE \ - src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ - src/3rdparty/chromium/third_party/protobuf/LICENSE \ - src/3rdparty/chromium/third_party/typ/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/expat/files/COPYING \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ - src/3rdparty/chromium/third_party/intellij/LICENSE \ - src/3rdparty/chromium/third_party/glslang/LICENSE \ - src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/NonCopyingSort.h \ - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2_worker/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/terminal/xterm.js/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ - src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/icu4j/LICENSE \ - src/3rdparty/chromium/third_party/molokocacao/LICENSE \ - src/3rdparty/chromium/third_party/wayland/LICENSE \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ - src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \ - src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT \ - src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT \ - src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ - src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ - src/3rdparty/chromium/third_party/breakpad/LICENSE \ - src/3rdparty/chromium/third_party/espresso/LICENSE \ - src/3rdparty/chromium/third_party/pystache/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT \ - src/3rdparty/chromium/third_party/haha/LICENSE \ - src/3rdparty/chromium/third_party/wds/LICENSE \ - src/3rdparty/chromium/third_party/wds/src/COPYING \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE \ - src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ - src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ - src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/jmake/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ - src/3rdparty/chromium/third_party/ced/LICENSE \ - src/3rdparty/chromium/third_party/ced/src/LICENSE \ - src/3rdparty/chromium/third_party/gestures/gestures/LICENSE \ - src/3rdparty/chromium/third_party/gestures/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ - src/3rdparty/chromium/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/minizip/src/LICENSE \ - src/3rdparty/chromium/third_party/javax_inject/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \ - src/3rdparty/chromium/third_party/gson/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ - src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ - src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ - src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ - src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ - src/3rdparty/chromium/third_party/netty4/LICENSE \ - src/3rdparty/chromium/third_party/objenesis/LICENSE \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/xstream/LICENSE \ - src/3rdparty/chromium/third_party/libsrtp/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/LICENSE \ - src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \ src/3rdparty/chromium/third_party/angle/LICENSE \ src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ - src/3rdparty/chromium/third_party/content_shell_fonts/LICENSE \ - src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ + src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \ + src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE \ + src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/axe-core/LICENSE \ + src/3rdparty/chromium/third_party/bazel/LICENSE \ + src/3rdparty/chromium/third_party/blanketjs/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ + src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ + src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ + src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE \ + src/3rdparty/chromium/third_party/breakpad/LICENSE \ + src/3rdparty/chromium/third_party/brotli/LICENSE \ + src/3rdparty/chromium/third_party/bspatch/LICENSE \ + src/3rdparty/chromium/third_party/byte_buddy/LICENSE \ + src/3rdparty/chromium/third_party/ced/LICENSE \ + src/3rdparty/chromium/third_party/ced/src/LICENSE \ + src/3rdparty/chromium/third_party/chaijs/LICENSE \ src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ + src/3rdparty/chromium/third_party/cld_3/LICENSE \ + src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ + src/3rdparty/chromium/third_party/content_shell_fonts/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ + src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ + src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ + src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ + src/3rdparty/chromium/third_party/d3/src/LICENSE \ + src/3rdparty/chromium/third_party/decklink/LICENSE \ + src/3rdparty/chromium/third_party/devscripts/COPYING \ + src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE \ + src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE \ + src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ + src/3rdparty/chromium/third_party/errorprone/LICENSE \ + src/3rdparty/chromium/third_party/espresso/LICENSE \ + src/3rdparty/chromium/third_party/expat/files/COPYING \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/fips181/COPYING \ + src/3rdparty/chromium/third_party/flac/COPYING.FDL \ src/3rdparty/chromium/third_party/flac/COPYING.GPL \ src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/sqlite/sqlite-src-3210000/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/libovr/LICENSE \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ - src/3rdparty/chromium/third_party/libudev/LICENSE \ - src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \ - src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ + src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/flatbuffers/LICENSE \ + src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt \ + src/3rdparty/chromium/third_party/flot/LICENSE.txt \ + src/3rdparty/chromium/third_party/fontconfig/LICENSE \ + src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ + src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ + src/3rdparty/chromium/third_party/gestures/gestures/LICENSE \ + src/3rdparty/chromium/third_party/gestures/LICENSE \ + src/3rdparty/chromium/third_party/gif_player/LICENSE \ + src/3rdparty/chromium/third_party/glslang/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ + src/3rdparty/chromium/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/gson/LICENSE \ + src/3rdparty/chromium/third_party/guava/LICENSE \ + src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ + src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ + src/3rdparty/chromium/third_party/haha/LICENSE \ + src/3rdparty/chromium/third_party/hamcrest/LICENSE \ + src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ + src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ + src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ + src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ + src/3rdparty/chromium/third_party/icu4j/LICENSE \ + src/3rdparty/chromium/third_party/icu/LICENSE \ + src/3rdparty/chromium/third_party/icu/license.html \ + src/3rdparty/chromium/third_party/icu/scripts/LICENSE \ + src/3rdparty/chromium/third_party/ijar/LICENSE \ + src/3rdparty/chromium/third_party/inspector_protocol/LICENSE \ + src/3rdparty/chromium/third_party/intellij/LICENSE \ + src/3rdparty/chromium/third_party/isimpledom/LICENSE \ + src/3rdparty/chromium/third_party/javax_inject/LICENSE \ + src/3rdparty/chromium/third_party/jinja2/LICENSE \ + src/3rdparty/chromium/third_party/jmake/LICENSE \ + src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ + src/3rdparty/chromium/third_party/jstemplate/COPYING \ + src/3rdparty/chromium/third_party/khronos/LICENSE \ + src/3rdparty/chromium/third_party/leakcanary/LICENSE \ src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/node/LICENSE \ - src/3rdparty/chromium/third_party/libxml/src/COPYING \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ + src/3rdparty/chromium/third_party/libaddressinput/LICENSE \ + src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium \ + src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE \ + src/3rdparty/chromium/third_party/libevdev/LICENSE \ + src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md \ + src/3rdparty/chromium/third_party/libovr/LICENSE \ + src/3rdparty/chromium/third_party/libpng/LICENSE \ + src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE \ + src/3rdparty/chromium/third_party/libsecret/LICENSE \ + src/3rdparty/chromium/third_party/libsrtp/LICENSE \ src/3rdparty/chromium/third_party/libsync/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/libudev/LICENSE \ + src/3rdparty/chromium/third_party/libusb/src/COPYING \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libwebp/LICENSE \ + src/3rdparty/chromium/third_party/libxml/src/COPYING \ + src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ + src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ + src/3rdparty/chromium/third_party/libyuv/LICENSE \ + src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ + src/3rdparty/chromium/third_party/mach_override/LICENSE \ + src/3rdparty/chromium/third_party/markupsafe/LICENSE \ + src/3rdparty/chromium/third_party/material_design_icons/LICENSE \ + src/3rdparty/chromium/third_party/mesa/LICENSE \ + src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ + src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ + src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ + src/3rdparty/chromium/third_party/metrics_proto/LICENSE \ + src/3rdparty/chromium/third_party/minigbm/LICENSE \ + src/3rdparty/chromium/third_party/minigbm/src/LICENSE \ + src/3rdparty/chromium/third_party/minizip/src/LICENSE \ + src/3rdparty/chromium/third_party/mocha/LICENSE \ + src/3rdparty/chromium/third_party/mockito/LICENSE \ + src/3rdparty/chromium/third_party/modp_b64/LICENSE \ + src/3rdparty/chromium/third_party/molokocacao/LICENSE \ + src/3rdparty/chromium/third_party/motemplate/LICENSE \ src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ + src/3rdparty/chromium/third_party/netty4/LICENSE \ + src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ + src/3rdparty/chromium/third_party/node/LICENSE \ + src/3rdparty/chromium/third_party/objenesis/LICENSE \ + src/3rdparty/chromium/third_party/ocmock/License.txt \ + src/3rdparty/chromium/third_party/openh264/src/LICENSE \ + src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ + src/3rdparty/chromium/third_party/openvr/src/LICENSE \ + src/3rdparty/chromium/third_party/opus/src/COPYING \ + src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + src/3rdparty/chromium/third_party/ots/LICENSE \ + src/3rdparty/chromium/third_party/ow2_asm/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE \ + src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/pexpect/LICENSE \ + src/3rdparty/chromium/third_party/ply/LICENSE \ + src/3rdparty/chromium/third_party/ply/license.patch \ + src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/proguard/LICENSE \ + src/3rdparty/chromium/third_party/protobuf/LICENSE \ + src/3rdparty/chromium/third_party/pycoverage/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/LICENSE \ + src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ + src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/pystache/LICENSE \ + src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ + src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ + src/3rdparty/chromium/third_party/qcms/src/COPYING \ + src/3rdparty/chromium/third_party/qunit/LICENSE \ + src/3rdparty/chromium/third_party/re2/LICENSE \ + src/3rdparty/chromium/third_party/re2/src/LICENSE \ + src/3rdparty/chromium/third_party/requests/LICENSE \ + src/3rdparty/chromium/third_party/robolectric/LICENSE \ + src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + src/3rdparty/chromium/third_party/s2cellid/LICENSE \ + src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ + src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ + src/3rdparty/chromium/third_party/shaderc/LICENSE \ + src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ + src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ + src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ + src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ + src/3rdparty/chromium/third_party/sinonjs/LICENSE \ + src/3rdparty/chromium/third_party/skia/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \ + src/3rdparty/chromium/third_party/smhasher/LICENSE \ + src/3rdparty/chromium/third_party/snappy/src/COPYING \ + src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ + src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ + src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ + src/3rdparty/chromium/third_party/sqlite/LICENSE \ + src/3rdparty/chromium/third_party/sqlite/sqlite-src-3210000/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ + src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \ + src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \ + src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT \ + src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ + src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ + src/3rdparty/chromium/third_party/tlslite/LICENSE \ + src/3rdparty/chromium/third_party/typ/LICENSE \ + src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ + src/3rdparty/chromium/third_party/usb_ids/LICENSE \ + src/3rdparty/chromium/third_party/usrsctp/LICENSE \ + src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ + src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \ + src/3rdparty/chromium/third_party/vulkan/LICENSE \ + src/3rdparty/chromium/third_party/wayland/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ + src/3rdparty/chromium/third_party/wds/LICENSE \ + src/3rdparty/chromium/third_party/wds/src/COPYING \ + src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ + src/3rdparty/chromium/third_party/webdriver/COPYING \ + src/3rdparty/chromium/third_party/webdriver/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ + src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2_worker/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/formatter_worker/acorn/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/terminal/xterm.js/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/NonCopyingSort.h \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE.md \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/html5lib/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/license_template.txt \ + src/3rdparty/chromium/third_party/woff2/LICENSE \ + src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ + src/3rdparty/chromium/third_party/xstream/LICENSE \ + src/3rdparty/chromium/third_party/yara/src/COPYING \ + src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ + src/3rdparty/chromium/third_party/zlib/LICENSE \ + src/3rdparty/chromium/tools/gyp/LICENSE \ + src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE \ + src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE \ + src/3rdparty/chromium/tools/symsrc/COPYING-pefile \ + src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE \ + src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ + src/3rdparty/chromium/v8/LICENSE \ + src/3rdparty/chromium/v8/LICENSE.fdlibm \ + src/3rdparty/chromium/v8/LICENSE.strongtalk \ + src/3rdparty/chromium/v8/LICENSE.v8 \ + src/3rdparty/chromium/v8/LICENSE.valgrind \ + src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ + src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ + src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/chromium-lts.inc b/package/qt5/qt5webengine/chromium-lts.inc index d45e9692de..6d27f1a827 100644 --- a/package/qt5/qt5webengine/chromium-lts.inc +++ b/package/qt5/qt5webengine/chromium-lts.inc @@ -1,248 +1,248 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ - src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ - src/3rdparty/chromium/sdch/open-vcdiff/COPYING \ - src/3rdparty/chromium/tools/gyp/LICENSE \ - src/3rdparty/chromium/v8/LICENSE.v8 \ - src/3rdparty/chromium/v8/LICENSE.strongtalk \ - src/3rdparty/chromium/v8/LICENSE.valgrind \ - src/3rdparty/chromium/v8/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ - src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ - src/3rdparty/chromium/base/third_party/nspr/LICENSE \ - src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ - src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ - src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ - src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ src/3rdparty/chromium/base/third_party/icu/LICENSE \ src/3rdparty/chromium/base/third_party/libevent/LICENSE \ + src/3rdparty/chromium/base/third_party/nspr/LICENSE \ + src/3rdparty/chromium/base/third_party/superfasthash/LICENSE \ src/3rdparty/chromium/base/third_party/symbolize/LICENSE \ - src/3rdparty/chromium/testing/gtest/LICENSE \ - src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \ - src/3rdparty/chromium/testing/gmock/LICENSE \ + src/3rdparty/chromium/base/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ + src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ + src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ + src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ + src/3rdparty/chromium/crypto/third_party/nss/LICENSE \ + src/3rdparty/chromium/LICENSE \ + src/3rdparty/chromium/LICENSE.chromium_os \ + src/3rdparty/chromium/mojo/public/LICENSE \ + src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ + src/3rdparty/chromium/net/third_party/nss/LICENSE \ src/3rdparty/chromium/ppapi/LICENSE \ + src/3rdparty/chromium/sdch/open-vcdiff/COPYING \ + src/3rdparty/chromium/testing/gmock/LICENSE \ + src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE \ + src/3rdparty/chromium/testing/gtest/LICENSE \ + src/3rdparty/chromium/third_party/angle/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ + src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \ + src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/appurify-python/LICENSE \ + src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \ + src/3rdparty/chromium/third_party/blanketjs/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ + src/3rdparty/chromium/third_party/brotli/LICENSE \ + src/3rdparty/chromium/third_party/bspatch/LICENSE \ + src/3rdparty/chromium/third_party/cardboard-java/LICENSE \ + src/3rdparty/chromium/third_party/chaijs/LICENSE \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE \ + src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ src/3rdparty/chromium/third_party/class-dump/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ - src/3rdparty/chromium/third_party/proguard/LICENSE \ - src/3rdparty/chromium/third_party/pexpect/LICENSE \ - src/3rdparty/chromium/third_party/webtreemap/src/COPYING \ - src/3rdparty/chromium/third_party/usb_ids/LICENSE \ + src/3rdparty/chromium/third_party/cld/LICENSE \ + src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ + src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ + src/3rdparty/chromium/third_party/closure_linter/LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ - src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ - src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ - src/3rdparty/chromium/third_party/fips181/COPYING \ - src/3rdparty/chromium/third_party/talloc/LICENSE \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE \ - src/3rdparty/chromium/third_party/devscripts/COPYING \ - src/3rdparty/chromium/third_party/webdriver/COPYING \ - src/3rdparty/chromium/third_party/webdriver/LICENSE \ - src/3rdparty/chromium/third_party/cld/LICENSE \ - src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ - src/3rdparty/chromium/third_party/bintrees/LICENSE.txt \ - src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ - src/3rdparty/chromium/third_party/libva/COPYING \ - src/3rdparty/chromium/third_party/bspatch/LICENSE \ - src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ - src/3rdparty/chromium/third_party/v4l2capture/LICENSE \ - src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ - src/3rdparty/chromium/third_party/cardboard-java/LICENSE \ - src/3rdparty/chromium/third_party/errorprone/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/LICENSE \ - src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ - src/3rdparty/chromium/third_party/python_gflags/COPYING \ - src/3rdparty/chromium/third_party/gif_player/LICENSE \ - src/3rdparty/chromium/third_party/libexif/sources/COPYING \ - src/3rdparty/chromium/third_party/sinonjs/LICENSE \ - src/3rdparty/chromium/third_party/lcov/COPYING \ - src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ - src/3rdparty/chromium/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/speech-dispatcher/COPYING \ - src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ - src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \ - src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/drmemory/LICENSE \ - src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ - src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ - src/3rdparty/chromium/third_party/qunit/LICENSE \ - src/3rdparty/chromium/third_party/zlib/LICENSE \ - src/3rdparty/chromium/third_party/minigbm/LICENSE \ - src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/qcms/src/COPYING \ - src/3rdparty/chromium/third_party/mach_override/LICENSE \ - src/3rdparty/chromium/third_party/mesa/LICENSE \ - src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ - src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ - src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ - src/3rdparty/chromium/third_party/mesa/src/src/mapi/glapi/gen/license.py \ - src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ - src/3rdparty/chromium/third_party/usrsctp/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ - src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ - src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/webrtc/LICENSE \ - src/3rdparty/chromium/third_party/libwebp/LICENSE \ - src/3rdparty/chromium/third_party/snappy/src/COPYING \ - src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ - src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ - src/3rdparty/chromium/third_party/robolectric/LICENSE \ - src/3rdparty/chromium/third_party/flot/LICENSE.txt \ - src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ - src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ - src/3rdparty/chromium/third_party/protobuf/COPYING.txt \ - src/3rdparty/chromium/third_party/typ/LICENSE \ - src/3rdparty/chromium/third_party/d3/src/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt \ - src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ - src/3rdparty/chromium/third_party/expat/files/COPYING \ - src/3rdparty/chromium/third_party/smhasher/LICENSE \ - src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ - src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING \ - src/3rdparty/chromium/third_party/closure_compiler/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ - src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/WebKit/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ - src/3rdparty/chromium/third_party/modp_b64/LICENSE \ - src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/molokocacao/LICENSE \ - src/3rdparty/chromium/third_party/wayland/LICENSE \ - src/3rdparty/chromium/third_party/wayland/src/COPYING \ - src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ - src/3rdparty/chromium/third_party/ocmock/License.txt \ - src/3rdparty/chromium/third_party/swiftshader/LICENSE \ - src/3rdparty/chromium/third_party/hwcplus/LICENSE \ - src/3rdparty/chromium/third_party/libsecret/LICENSE \ - src/3rdparty/chromium/third_party/nss/nspr/LICENSE \ - src/3rdparty/chromium/third_party/nss/nss/COPYING \ - src/3rdparty/chromium/third_party/jinja2/LICENSE \ - src/3rdparty/chromium/third_party/decklink/LICENSE \ - src/3rdparty/chromium/third_party/hunspell/COPYING \ - src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \ - src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ - src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \ - src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \ - src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ - src/3rdparty/chromium/third_party/pyelftools/LICENSE \ - src/3rdparty/chromium/third_party/jmake/LICENSE \ - src/3rdparty/chromium/third_party/requests/LICENSE \ - src/3rdparty/chromium/third_party/ijar/LICENSE \ - src/3rdparty/chromium/third_party/pycoverage/LICENSE \ - src/3rdparty/chromium/third_party/re2/LICENSE \ - src/3rdparty/chromium/third_party/re2/src/LICENSE \ - src/3rdparty/chromium/third_party/blanketjs/LICENSE \ - src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ - src/3rdparty/chromium/third_party/closure_linter/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/COPYING \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \ - src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \ - src/3rdparty/chromium/third_party/libusb/src/COPYING \ - src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE \ - src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ - src/3rdparty/chromium/third_party/opus/src/COPYING \ - src/3rdparty/chromium/third_party/isimpledom/LICENSE \ - src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ - src/3rdparty/chromium/third_party/openh264/src/LICENSE \ - src/3rdparty/chromium/third_party/markupsafe/LICENSE \ - src/3rdparty/chromium/third_party/ply/license.patch \ - src/3rdparty/chromium/third_party/ply/LICENSE \ - src/3rdparty/chromium/third_party/khronos/LICENSE \ - src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ - src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \ - src/3rdparty/chromium/third_party/ots/LICENSE \ - src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/brotli/LICENSE \ - src/3rdparty/chromium/third_party/icu/license.html \ - src/3rdparty/chromium/third_party/icu/LICENSE \ src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE \ - src/3rdparty/chromium/third_party/motemplate/LICENSE \ - src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ - src/3rdparty/chromium/third_party/angle/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE \ - src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE \ - src/3rdparty/chromium/third_party/npapi/LICENSE \ - src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ - src/3rdparty/chromium/third_party/libjpeg/LICENSE \ - src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ - src/3rdparty/chromium/third_party/woff2/LICENSE \ - src/3rdparty/chromium/third_party/appurify-python/LICENSE \ - src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ - src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ - src/3rdparty/chromium/third_party/jstemplate/COPYING \ + src/3rdparty/chromium/third_party/d3/src/LICENSE \ + src/3rdparty/chromium/third_party/decklink/LICENSE \ + src/3rdparty/chromium/third_party/devscripts/COPYING \ src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE \ - src/3rdparty/chromium/third_party/mocha/LICENSE \ - src/3rdparty/chromium/third_party/x86inc/LICENSE \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ - src/3rdparty/chromium/third_party/checkstyle/LICENSE \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ - src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ + src/3rdparty/chromium/third_party/drmemory/LICENSE \ + src/3rdparty/chromium/third_party/errorprone/LICENSE \ + src/3rdparty/chromium/third_party/expat/files/COPYING \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 \ + src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 \ src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md \ - src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/fips181/COPYING \ + src/3rdparty/chromium/third_party/flac/COPYING.FDL \ src/3rdparty/chromium/third_party/flac/COPYING.GPL \ src/3rdparty/chromium/third_party/flac/COPYING.LGPL \ - src/3rdparty/chromium/third_party/flac/COPYING.FDL \ - src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ - src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ - src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ - src/3rdparty/chromium/third_party/mockito/LICENSE \ - src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ - src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \ - src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ + src/3rdparty/chromium/third_party/flac/COPYING.Xiph \ + src/3rdparty/chromium/third_party/flot/LICENSE.txt \ + src/3rdparty/chromium/third_party/fontconfig/LICENSE \ + src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ + src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT \ + src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ + src/3rdparty/chromium/third_party/gif_player/LICENSE \ + src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING \ + src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL \ + src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ + src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell \ + src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell \ + src/3rdparty/chromium/third_party/hwcplus/LICENSE \ + src/3rdparty/chromium/third_party/iaccessible2/LICENSE \ + src/3rdparty/chromium/third_party/iccjpeg/LICENSE \ + src/3rdparty/chromium/third_party/icu/LICENSE \ + src/3rdparty/chromium/third_party/icu/license.html \ + src/3rdparty/chromium/third_party/ijar/LICENSE \ + src/3rdparty/chromium/third_party/isimpledom/LICENSE \ + src/3rdparty/chromium/third_party/jinja2/LICENSE \ + src/3rdparty/chromium/third_party/jmake/LICENSE \ + src/3rdparty/chromium/third_party/jsoncpp/LICENSE \ + src/3rdparty/chromium/third_party/jstemplate/COPYING \ + src/3rdparty/chromium/third_party/khronos/LICENSE \ + src/3rdparty/chromium/third_party/lcov/COPYING \ + src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ + src/3rdparty/chromium/third_party/libexif/sources/COPYING \ + src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING \ + src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/libjpeg/LICENSE \ + src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt \ + src/3rdparty/chromium/third_party/libpng/LICENSE \ + src/3rdparty/chromium/third_party/libsecret/LICENSE \ + src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE \ src/3rdparty/chromium/third_party/libudev/LICENSE \ + src/3rdparty/chromium/third_party/libusb/src/COPYING \ + src/3rdparty/chromium/third_party/libva/COPYING \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libwebp/LICENSE \ + src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ + src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ + src/3rdparty/chromium/third_party/libyuv/LICENSE \ src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE \ - src/3rdparty/chromium/third_party/libyuv/LICENSE \ + src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ + src/3rdparty/chromium/third_party/mach_override/LICENSE \ + src/3rdparty/chromium/third_party/markupsafe/LICENSE \ + src/3rdparty/chromium/third_party/mesa/LICENSE \ + src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ + src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ + src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ + src/3rdparty/chromium/third_party/mesa/src/src/mapi/glapi/gen/license.py \ + src/3rdparty/chromium/third_party/minigbm/LICENSE \ + src/3rdparty/chromium/third_party/mocha/LICENSE \ + src/3rdparty/chromium/third_party/mockito/LICENSE \ + src/3rdparty/chromium/third_party/modp_b64/LICENSE \ src/3rdparty/chromium/third_party/mojo/LICENSE \ - src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE \ - src/3rdparty/chromium/third_party/chaijs/LICENSE \ - src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ - src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/molokocacao/LICENSE \ + src/3rdparty/chromium/third_party/motemplate/LICENSE \ src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY \ - src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING \ - src/3rdparty/chromium/LICENSE.chromium_os \ - src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ - src/3rdparty/chromium/net/third_party/nss/LICENSE \ - src/3rdparty/chromium/crypto/third_party/nss/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ - src/3rdparty/chromium/LICENSE \ - src/3rdparty/chromium/mojo/public/LICENSE \ - src/3rdparty/chromium/buildtools/LICENSE \ + src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ + src/3rdparty/chromium/third_party/npapi/LICENSE \ + src/3rdparty/chromium/third_party/nss/nspr/LICENSE \ + src/3rdparty/chromium/third_party/nss/nss/COPYING \ + src/3rdparty/chromium/third_party/ocmock/License.txt \ + src/3rdparty/chromium/third_party/openh264/src/LICENSE \ + src/3rdparty/chromium/third_party/openmax_dl/LICENSE \ + src/3rdparty/chromium/third_party/opus/src/COPYING \ + src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt \ + src/3rdparty/chromium/third_party/ots/LICENSE \ + src/3rdparty/chromium/third_party/pexpect/LICENSE \ + src/3rdparty/chromium/third_party/ply/LICENSE \ + src/3rdparty/chromium/third_party/ply/license.patch \ + src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ + src/3rdparty/chromium/third_party/proguard/LICENSE \ + src/3rdparty/chromium/third_party/protobuf/COPYING.txt \ + src/3rdparty/chromium/third_party/pycoverage/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ + src/3rdparty/chromium/third_party/pyelftools/LICENSE \ + src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ + src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ + src/3rdparty/chromium/third_party/python_gflags/COPYING \ + src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ + src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE \ + src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ + src/3rdparty/chromium/third_party/qcms/src/COPYING \ + src/3rdparty/chromium/third_party/qunit/LICENSE \ + src/3rdparty/chromium/third_party/re2/LICENSE \ + src/3rdparty/chromium/third_party/re2/src/LICENSE \ + src/3rdparty/chromium/third_party/requests/LICENSE \ + src/3rdparty/chromium/third_party/robolectric/LICENSE \ + src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ + src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt \ + src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE \ + src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ + src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ + src/3rdparty/chromium/third_party/sfntly/src/java/COPYING \ + src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ + src/3rdparty/chromium/third_party/sinonjs/LICENSE \ + src/3rdparty/chromium/third_party/skia/LICENSE \ + src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE \ + src/3rdparty/chromium/third_party/smhasher/LICENSE \ + src/3rdparty/chromium/third_party/snappy/src/COPYING \ + src/3rdparty/chromium/third_party/speech-dispatcher/COPYING \ + src/3rdparty/chromium/third_party/sqlite/LICENSE \ + src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ + src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ + src/3rdparty/chromium/third_party/swiftshader/LICENSE \ + src/3rdparty/chromium/third_party/talloc/LICENSE \ + src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ + src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ + src/3rdparty/chromium/third_party/tlslite/LICENSE \ + src/3rdparty/chromium/third_party/typ/LICENSE \ + src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ + src/3rdparty/chromium/third_party/usb_ids/LICENSE \ + src/3rdparty/chromium/third_party/usrsctp/LICENSE \ + src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ + src/3rdparty/chromium/third_party/v4l2capture/LICENSE \ + src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ + src/3rdparty/chromium/third_party/wayland/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ + src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ + src/3rdparty/chromium/third_party/wayland/src/COPYING \ + src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ + src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING \ + src/3rdparty/chromium/third_party/webdriver/COPYING \ + src/3rdparty/chromium/third_party/webdriver/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ + src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ + src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE \ + src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ + src/3rdparty/chromium/third_party/webpagereplay/COPYING \ + src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE \ + src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING \ + src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ + src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/LICENSE \ + src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ + src/3rdparty/chromium/third_party/webtreemap/src/COPYING \ + src/3rdparty/chromium/third_party/woff2/LICENSE \ + src/3rdparty/chromium/third_party/x86inc/LICENSE \ + src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ + src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING \ + src/3rdparty/chromium/third_party/zlib/LICENSE \ + src/3rdparty/chromium/tools/gyp/LICENSE \ + src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt \ + src/3rdparty/chromium/v8/LICENSE \ + src/3rdparty/chromium/v8/LICENSE.strongtalk \ + src/3rdparty/chromium/v8/LICENSE.v8 \ + src/3rdparty/chromium/v8/LICENSE.valgrind \ + src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ + src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ src/3rdparty/ninja/COPYING From b8db62915a4a73cff2422a009df007e595312805 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 17 Feb 2019 15:12:06 +0100 Subject: [PATCH 0054/7482] package/qt5/qt5webengine: generate chromium-latest.inc automatically As a preparation to the bump of qt5webengine, this commit changes to a mechanism where it is generated automatically. We use a fairly convoluted 'find' expression to retrieve almost the same list of files as the exist ones. Two files are removed that are not really license files: - src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/NonCopyingSort.h Three files are added, which are license files: - src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY - src/3rdparty/chromium/third_party/libxml/src/Copyright - src/3rdparty/chromium/third_party/libxslt/src/Copyright Signed-off-by: Thomas Petazzoni Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/chromium-latest.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc index 4fc1ae5ecf..9e4b7d6356 100644 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ b/package/qt5/qt5webengine/chromium-latest.inc @@ -1,3 +1,8 @@ +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find src/3rdparty/ -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) \ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-latest.inc QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ @@ -268,8 +273,10 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ src/3rdparty/chromium/third_party/libwebp/LICENSE \ src/3rdparty/chromium/third_party/libxml/src/COPYING \ + src/3rdparty/chromium/third_party/libxml/src/Copyright \ src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ + src/3rdparty/chromium/third_party/libxslt/src/Copyright \ src/3rdparty/chromium/third_party/libyuv/LICENSE \ src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ @@ -380,7 +387,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/webdriver/COPYING \ src/3rdparty/chromium/third_party/webdriver/LICENSE \ src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ @@ -395,7 +401,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/COPYING \ src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/NonCopyingSort.h \ src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE.md \ src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/html5lib/LICENSE \ @@ -406,6 +411,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ src/3rdparty/chromium/third_party/webrtc/LICENSE \ src/3rdparty/chromium/third_party/webrtc/license_template.txt \ + src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY \ src/3rdparty/chromium/third_party/woff2/LICENSE \ src/3rdparty/chromium/third_party/xdg-utils/LICENSE \ src/3rdparty/chromium/third_party/xstream/LICENSE \ From d5d49e556b5989e85be171ec45fd10bd3f41aa1f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 17 Feb 2019 15:12:07 +0100 Subject: [PATCH 0055/7482] package/qt5/qt5webengine: generate chromium-lts.inc automatically As a preparation to the bump of qt5webengine, this commit changes to a mechanism where it is generated automatically. We use a fairly convoluted 'find' expression to retrieve almost the same list of files as the exist ones. The following files are added: - src/3rdparty/chromium/third_party/libxml/src/Copyright. This is the file that was pointed to by the src/3rdparty/chromium/third_party/libxslt/linux/COPYING symlink. - src/3rdparty/chromium/third_party/libxml/src/Copyright Two license.py scripts that are not license files are removed. Signed-off-by: Thomas Petazzoni Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/chromium-lts.inc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/package/qt5/qt5webengine/chromium-lts.inc b/package/qt5/qt5webengine/chromium-lts.inc index 6d27f1a827..fbc1f9b639 100644 --- a/package/qt5/qt5webengine/chromium-lts.inc +++ b/package/qt5/qt5webengine/chromium-lts.inc @@ -1,3 +1,9 @@ +# Generated with: +# (echo "QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \\" ; \ +# find src/3rdparty/ -type f \ +# \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \)\ +# -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before' | \ +# sort | sed 's%^\(.*\)$%\t\1 \\%') > package/qt5/qt5webengine/chromium-lts.inc QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE \ src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE \ @@ -112,8 +118,9 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE \ src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ src/3rdparty/chromium/third_party/libwebp/LICENSE \ + src/3rdparty/chromium/third_party/libxml/src/Copyright \ src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE \ - src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ + src/3rdparty/chromium/third_party/libxslt/Copyright \ src/3rdparty/chromium/third_party/libyuv/LICENSE \ src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE \ @@ -124,7 +131,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/mesa/src/docs/COPYING \ src/3rdparty/chromium/third_party/mesa/src/docs/license.html \ src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT \ - src/3rdparty/chromium/third_party/mesa/src/src/mapi/glapi/gen/license.py \ src/3rdparty/chromium/third_party/minigbm/LICENSE \ src/3rdparty/chromium/third_party/mocha/LICENSE \ src/3rdparty/chromium/third_party/mockito/LICENSE \ @@ -206,7 +212,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/webdriver/LICENSE \ src/3rdparty/chromium/third_party/WebKit/LICENSE \ src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/WebKit/Source/build/scripts/license.py \ src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ From 145e157b98055dd5b06495933ea6ca6b3cdcc396 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sun, 17 Feb 2019 15:12:08 +0100 Subject: [PATCH 0056/7482] package/qt5: bump latest version to 5.12.1 qt5base: - removed 0002-double-conversion-enable-for-aarch64_be.patch (superseded by upstream commits [1] and [2]) - removed 0003-double-conversion-enable-for-or1k.patch (superseded by upstream commits [1] and [2]) - rebased 0004-double-conversion-enable-for-microblaze.patch qt5location: - removed 0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch (superseded by upstream commit [3]) [1] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6a39e49a6cdeb28a04a3657bb6a22f848d5dfa9d [2] https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4d40f09a45202dff901d4f970a6a7e939797138b [3] https://code.qt.io/cgit/qt/qtlocation.git/commit/?id=7bafbdc91f83165710ed74639b76b48b4494937a Signed-off-by: Peter Seiderer [Thomas: - update chromium-latest.inc with the list of license files that match qt5webengine 5.12.1 - drop patch in qt5location that has been upstreamed and therefore no longer applies to 5.12.1] Signed-off-by: Thomas Petazzoni Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/Config.in | 4 +- package/qt5/qt5.mk | 4 +- package/qt5/qt53d/qt53d.hash | 4 +- ...ble-conversion-enable-for-aarch64_be.patch | 26 ------ ...03-double-conversion-enable-for-or1k.patch | 27 ------- ...tbase-Fix-build-error-when-using-EGL.patch | 0 ...ble-conversion-enable-for-microblaze.patch | 20 ++--- .../qt5base/{5.11.3 => 5.12.1}/qt5base.hash | 4 +- package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 +- package/qt5/qt5charts/qt5charts.hash | 4 +- .../{5.11.3 => 5.12.1}/qt5connectivity.hash | 4 +- ...gtexture-fix-debug-build-with-uclibc.patch | 0 .../qt5/qt5declarative/qt5declarative.hash | 4 +- .../qt5graphicaleffects.hash | 4 +- .../qt5/qt5imageformats/qt5imageformats.hash | 4 +- ...tivegeomap-fix-building-with-GCC-5.x.patch | 48 ----------- package/qt5/qt5location/qt5location.hash | 4 +- package/qt5/qt5multimedia/qt5multimedia.hash | 4 +- .../qt5quickcontrols/qt5quickcontrols.hash | 4 +- .../{5.11.3 => 5.12.1}/qt5quickcontrols2.hash | 4 +- package/qt5/qt5script/qt5script.hash | 4 +- package/qt5/qt5scxml/qt5scxml.hash | 4 +- package/qt5/qt5sensors/qt5sensors.hash | 4 +- .../{5.11.3 => 5.12.1}/qt5serialbus.hash | 4 +- .../{5.11.3 => 5.12.1}/qt5serialport.hash | 4 +- package/qt5/qt5svg/qt5svg.hash | 4 +- package/qt5/qt5tools/qt5tools.hash | 4 +- .../qt5virtualkeyboard.hash | 4 +- package/qt5/qt5wayland/qt5wayland.hash | 4 +- package/qt5/qt5webchannel/qt5webchannel.hash | 4 +- package/qt5/qt5webengine/chromium-latest.inc | 80 +++++++++++-------- package/qt5/qt5webengine/qt5webengine.hash | 4 +- package/qt5/qt5websockets/qt5websockets.hash | 4 +- .../{5.11.3 => 5.12.1}/qt5x11extras.hash | 4 +- .../qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 +- 35 files changed, 113 insertions(+), 200 deletions(-) delete mode 100644 package/qt5/qt5base/5.11.3/0002-double-conversion-enable-for-aarch64_be.patch delete mode 100644 package/qt5/qt5base/5.11.3/0003-double-conversion-enable-for-or1k.patch rename package/qt5/qt5base/{5.11.3 => 5.12.1}/0001-qtbase-Fix-build-error-when-using-EGL.patch (100%) rename package/qt5/qt5base/{5.11.3 => 5.12.1}/0004-double-conversion-enable-for-microblaze.patch (60%) rename package/qt5/qt5base/{5.11.3 => 5.12.1}/qt5base.hash (73%) rename package/qt5/qt5connectivity/{5.11.3 => 5.12.1}/qt5connectivity.hash (65%) rename package/qt5/qt5declarative/{5.11.3 => 5.12.1}/0001-qsgtexture-fix-debug-build-with-uclibc.patch (100%) delete mode 100644 package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch rename package/qt5/qt5quickcontrols2/{5.11.3 => 5.12.1}/qt5quickcontrols2.hash (54%) rename package/qt5/qt5serialbus/{5.11.3 => 5.12.1}/qt5serialbus.hash (60%) rename package/qt5/qt5serialport/{5.11.3 => 5.12.1}/qt5serialport.hash (65%) rename package/qt5/qt5virtualkeyboard/{5.11.3 => 5.12.1}/qt5virtualkeyboard.hash (70%) rename package/qt5/qt5x11extras/{5.11.3 => 5.12.1}/qt5x11extras.hash (65%) diff --git a/package/qt5/Config.in b/package/qt5/Config.in index a50b57a821..b9598b2be7 100644 --- a/package/qt5/Config.in +++ b/package/qt5/Config.in @@ -33,14 +33,14 @@ choice prompt "Qt5 version" config BR2_PACKAGE_QT5_VERSION_LATEST - bool "Latest (5.11)" + bool "Latest (5.12)" depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ # no built-in double-conversion support depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa help - This option builds Qt 5.11, which is licensed under + This option builds Qt 5.12, which is licensed under (L)GPL-3.0+. comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8" diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index 88ba1958dd..d8012a913d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -5,8 +5,8 @@ ################################################################################ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5_VERSION_MAJOR = 5.11 -QT5_VERSION = $(QT5_VERSION_MAJOR).3 +QT5_VERSION_MAJOR = 5.12 +QT5_VERSION = $(QT5_VERSION_MAJOR).1 QT5_SOURCE_TARBALL_PREFIX = everywhere-src else QT5_VERSION_MAJOR = 5.6 diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index 2da5500505..f135173bb7 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qt3d-everywhere-src-5.11.3.tar.xz.sha256 -sha256 04a55c21f365d897ec75042ee83f9ad59a847992c6f55fae0763ad2701d99eab qt3d-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qt3d-everywhere-src-5.12.1.tar.xz.sha256 +sha256 ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1 qt3d-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt5base/5.11.3/0002-double-conversion-enable-for-aarch64_be.patch b/package/qt5/qt5base/5.11.3/0002-double-conversion-enable-for-aarch64_be.patch deleted file mode 100644 index 838f4dd7ad..0000000000 --- a/package/qt5/qt5base/5.11.3/0002-double-conversion-enable-for-aarch64_be.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e81ba4e0de16ff741417ae7ed7dfe7b5a83d66e2 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 13 Aug 2018 20:15:05 +0200 -Subject: [PATCH] double-conversion: enable for aarch64_be - -Signed-off-by: Peter Seiderer ---- - .../double-conversion/include/double-conversion/utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 20bfd36c84..77baa2861a 100644 ---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h -+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -65,7 +65,7 @@ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) -+ defined(__AARCH64EL__) || defined(__AARCH64EB__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) --- -2.18.0 - diff --git a/package/qt5/qt5base/5.11.3/0003-double-conversion-enable-for-or1k.patch b/package/qt5/qt5base/5.11.3/0003-double-conversion-enable-for-or1k.patch deleted file mode 100644 index 53c5a31832..0000000000 --- a/package/qt5/qt5base/5.11.3/0003-double-conversion-enable-for-or1k.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f9920819e6600a68829fb4600f11b70ebc2a33e7 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 18 Aug 2018 23:44:20 +0200 -Subject: [PATCH] double-conversion: enable for or1k - -Signed-off-by: Peter Seiderer ---- - .../double-conversion/include/double-conversion/utils.h | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index 77baa2861a..b0a7d5d4f4 100644 ---- a/src/3rdparty/double-conversion/include/double-conversion/utils.h -+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -65,7 +65,8 @@ - defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ - defined(__SH4__) || defined(__alpha__) || \ - defined(_MIPS_ARCH_MIPS32R2) || \ -- defined(__AARCH64EL__) || defined(__AARCH64EB__) -+ defined(__AARCH64EL__) || defined(__AARCH64EB__) || \ -+ defined(__or1k__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) --- -2.18.0 - diff --git a/package/qt5/qt5base/5.11.3/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.12.1/0001-qtbase-Fix-build-error-when-using-EGL.patch similarity index 100% rename from package/qt5/qt5base/5.11.3/0001-qtbase-Fix-build-error-when-using-EGL.patch rename to package/qt5/qt5base/5.12.1/0001-qtbase-Fix-build-error-when-using-EGL.patch diff --git a/package/qt5/qt5base/5.11.3/0004-double-conversion-enable-for-microblaze.patch b/package/qt5/qt5base/5.12.1/0004-double-conversion-enable-for-microblaze.patch similarity index 60% rename from package/qt5/qt5base/5.11.3/0004-double-conversion-enable-for-microblaze.patch rename to package/qt5/qt5base/5.12.1/0004-double-conversion-enable-for-microblaze.patch index 2d7164b67c..c91d812695 100644 --- a/package/qt5/qt5base/5.11.3/0004-double-conversion-enable-for-microblaze.patch +++ b/package/qt5/qt5base/5.12.1/0004-double-conversion-enable-for-microblaze.patch @@ -1,27 +1,29 @@ -From 372d33fbe549ea73318c187505716ac99fbf3054 Mon Sep 17 00:00:00 2001 +From 014958d2d17045dd63d93cb3061d1e40b15725b7 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Tue, 21 Aug 2018 21:11:40 +0200 Subject: [PATCH] double-conversion: enable for microblaze +Signed-off-by: Peter Seiderer +[Rebased for Qt5.12.0] Signed-off-by: Peter Seiderer --- .../double-conversion/include/double-conversion/utils.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h -index b0a7d5d4f4..485f680180 100644 +index 7622fe6162..d29de95094 100644 --- a/src/3rdparty/double-conversion/include/double-conversion/utils.h +++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h -@@ -66,7 +66,8 @@ - defined(__SH4__) || defined(__alpha__) || \ +@@ -94,7 +94,8 @@ int main(int argc, char** argv) { defined(_MIPS_ARCH_MIPS32R2) || \ - defined(__AARCH64EL__) || defined(__AARCH64EB__) || \ + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || defined(__EMSCRIPTEN__) || \ - defined(__or1k__) -+ defined(__or1k__) || \ ++ defined(__or1k__) || \ + defined(__microblaze__) #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) + #elif defined(__mc68000__) || \ + defined(__pnacl__) || defined(__native_client__) -- -2.18.0 +2.19.2 diff --git a/package/qt5/qt5base/5.11.3/qt5base.hash b/package/qt5/qt5base/5.12.1/qt5base.hash similarity index 73% rename from package/qt5/qt5base/5.11.3/qt5base.hash rename to package/qt5/qt5base/5.12.1/qt5base.hash index 964bcf1ab9..29148fa080 100644 --- a/package/qt5/qt5base/5.11.3/qt5base.hash +++ b/package/qt5/qt5base/5.12.1/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtbase-everywhere-src-5.11.3.tar.xz.sha256 -sha256 c6bf887732b83ce072eb72eddb7497bedcdf9ca794e7ed91261a93f063623e1c qtbase-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz.sha256 +sha256 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049 qtbase-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index 4fc7c613b0..fe31ba3867 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtcanvas3d-everywhere-src-5.11.3.tar.xz.sha256 -sha256 d5a004848588c1c53ea7ed9d36bb5bfe3a813ffc45290066d2f6cfcace072138 qtcanvas3d-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtcanvas3d-everywhere-src-5.12.1.tar.xz.sha256 +sha256 c7c940a06062b1e5078fd697e1da0cdaeaa315b6fcea81de15308a9d3f8ac254 qtcanvas3d-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index 2519b8f13c..02e01cac2a 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f qtcharts-opensource-src-2.1.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtcharts-everywhere-src-5.11.3.tar.xz.sha256 -sha256 4798f3ebc4d937d1c190db7ff718ad5affa907caa56b5557e593f6b5a60d95dc qtcharts-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtcharts-everywhere-src-5.12.1.tar.xz.sha256 +sha256 142eb2b87a0bc2220a9f12e56bf390b846968c201d135b1a2a2338545692fdc0 qtcharts-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5connectivity/5.11.3/qt5connectivity.hash b/package/qt5/qt5connectivity/5.12.1/qt5connectivity.hash similarity index 65% rename from package/qt5/qt5connectivity/5.11.3/qt5connectivity.hash rename to package/qt5/qt5connectivity/5.12.1/qt5connectivity.hash index 54fda648cd..a46de7f3c6 100644 --- a/package/qt5/qt5connectivity/5.11.3/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/5.12.1/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtconnectivity-everywhere-src-5.11.3.tar.xz.sha256 -sha256 148cfcbceb3d0a70059f4d92fa069baf56babb627b16a4203b318ca6f0d0b32a qtconnectivity-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtconnectivity-everywhere-src-5.12.1.tar.xz.sha256 +sha256 0edd0bd784a71809540dc23d24a842bd88dee2cdb5394b69c9e704f7e1ac8d6c qtconnectivity-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/5.11.3/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/package/qt5/qt5declarative/5.12.1/0001-qsgtexture-fix-debug-build-with-uclibc.patch similarity index 100% rename from package/qt5/qt5declarative/5.11.3/0001-qsgtexture-fix-debug-build-with-uclibc.patch rename to package/qt5/qt5declarative/5.12.1/0001-qsgtexture-fix-debug-build-with-uclibc.patch diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index 3ce4e50250..d583ab15d5 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtdeclarative-everywhere-src-5.11.3.tar.xz.sha256 -sha256 8e263621d706f1c4def5d71212a6ae37b0d3c378da89d9e3e5fc0b5557721ae6 qtdeclarative-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtdeclarative-everywhere-src-5.12.1.tar.xz.sha256 +sha256 a384a734d94f28a98aa74e076d50fa6b9724af83526feb6c371945545d8cb409 qtdeclarative-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index 36dd345268..e570531629 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtgraphicaleffects-everywhere-src-5.11.3.tar.xz.sha256 -sha256 14d86983fcdd119daefad235ffee7d8ca691e6074ef360cb6347b8aae66f57e2 qtgraphicaleffects-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtgraphicaleffects-everywhere-src-5.12.1.tar.xz.sha256 +sha256 2e63abf6b02b86461b73b317eba00b6721601a9469c22da28e3f4ea1d5df68d7 qtgraphicaleffects-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 1c1f81bbed..3fd6ba46e5 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtimageformats-everywhere-src-5.11.3.tar.xz.sha256 -sha256 04b261bc3d7a277fbe9ac8619ecd037d7089b356eaee41b2d41d7a2ff58b087f qtimageformats-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtimageformats-everywhere-src-5.12.1.tar.xz.sha256 +sha256 0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421 qtimageformats-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch b/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch deleted file mode 100644 index f893c33d50..0000000000 --- a/package/qt5/qt5location/5.11.3/0001-qdeclarativegeomap-fix-building-with-GCC-5.x.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ad78b1a671edac369ede86bff376ec8af2cafbf2 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Wed, 5 Sep 2018 12:51:41 +0200 -Subject: [PATCH] qdeclarativegeomap: fix building with GCC < 5.x - -With GCC < 5.x implicit casts don't work as expected, in particular -QPointer in m_map QDeclarativeGeoMap class when passed to -connect(m_map, ...) should directly cast to m_map.data(). - -Workaround this using connect(m_map.data(), ...). - -Signed-off-by: Giulio Benetti ---- - src/location/declarativemaps/qdeclarativegeomap.cpp | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/location/declarativemaps/qdeclarativegeomap.cpp b/src/location/declarativemaps/qdeclarativegeomap.cpp -index 09f9d01c..dc5a32ed 100644 ---- a/src/location/declarativemaps/qdeclarativegeomap.cpp -+++ b/src/location/declarativemaps/qdeclarativegeomap.cpp -@@ -694,11 +694,11 @@ void QDeclarativeGeoMap::mappingManagerInitialized() - QImage copyrightImage; - if (!m_initialized && width() > 0 && height() > 0) { - QMetaObject::Connection copyrightStringCatcherConnection = -- connect(m_map, -+ connect(m_map.data(), - QOverload::of(&QGeoMap::copyrightsChanged), - [©rightString](const QString ©){ copyrightString = copy; }); - QMetaObject::Connection copyrightImageCatcherConnection = -- connect(m_map, -+ connect(m_map.data(), - QOverload::of(&QGeoMap::copyrightsChanged), - [©rightImage](const QImage ©){ copyrightImage = copy; }); - m_map->setViewportSize(QSize(width(), height())); -@@ -719,8 +719,8 @@ void QDeclarativeGeoMap::mappingManagerInitialized() - emit m_map->copyrightsChanged(copyrightImage); - - -- connect(m_map, &QGeoMap::sgNodeChanged, this, &QQuickItem::update); -- connect(m_map, &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged); -+ connect(m_map.data(), &QGeoMap::sgNodeChanged, this, &QQuickItem::update); -+ connect(m_map.data(), &QGeoMap::cameraCapabilitiesChanged, this, &QDeclarativeGeoMap::onCameraCapabilitiesChanged); - - // This prefetches a buffer around the map - m_map->prefetchData(); --- -2.17.1 - diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index be0ac7c31f..e79eb611b4 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtlocation-everywhere-src-5.11.3.tar.xz.sha256 -sha256 58e498a5b496e3a38925398b244bbd57ba68cbb482f2a0d2ae51572e037100eb qtlocation-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtlocation-everywhere-src-5.12.1.tar.xz.sha256 +sha256 8b922373e6eefd1b0e2a993dbf3d0b3f3df777bc720d40cad3ccb46e1936bc50 qtlocation-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 851cbc3539..5911c24c3d 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtmultimedia-everywhere-src-5.11.3.tar.xz.sha256 -sha256 728078eff7dc21495d704a7cd17c604d74604604b45a3c58271608f90dea3c41 qtmultimedia-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtmultimedia-everywhere-src-5.12.1.tar.xz.sha256 +sha256 9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18 qtmultimedia-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 25c41c6e34..240f4b4c8c 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols-everywhere-src-5.11.3.tar.xz.sha256 -sha256 4e4e5da02ab0b06d35b09356170013cfe36a773d15f92281f7e6d085c3f07537 qtquickcontrols-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtquickcontrols-everywhere-src-5.12.1.tar.xz.sha256 +sha256 15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c qtquickcontrols-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5quickcontrols2/5.11.3/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/5.12.1/qt5quickcontrols2.hash similarity index 54% rename from package/qt5/qt5quickcontrols2/5.11.3/qt5quickcontrols2.hash rename to package/qt5/qt5quickcontrols2/5.12.1/qt5quickcontrols2.hash index b1caf464a1..73cb76b53f 100644 --- a/package/qt5/qt5quickcontrols2/5.11.3/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/5.12.1/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtquickcontrols2-everywhere-src-5.11.3.tar.xz.sha256 -sha256 f45630b652585b62204405b28432977e67c148ca5f1789a794654fd6c1bad086 qtquickcontrols2-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtquickcontrols2-everywhere-src-5.12.1.tar.xz.sha256 +sha256 caa47b6d771b11c65d595fdd0f0942c3d78cda2884d318e3b1da8ec67155a8e7 qtquickcontrols2-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index 245d66be63..c5458b5517 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscript-everywhere-src-5.11.3.tar.xz.sha256 -sha256 bb84f3cc581078df4ff76705c5623cd88287f70f7405cbccf99e6fb6dedbec08 qtscript-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtscript-everywhere-src-5.12.1.tar.xz.sha256 +sha256 e5c158fb85799404d20d1ec5dd33a25d5f5736807e1008ce626f666a52c80624 qtscript-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index d2184c94e6..bd37c9ee8b 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtscxml-everywhere-src-5.11.3.tar.xz.sha256 -sha256 13172767eda404f1b71ab35998a95af6633d700d2417fff3648d8c6dc6af68d7 qtscxml-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtscxml-everywhere-src-5.12.1.tar.xz.sha256 +sha256 59a2aa1000fe03b0a3eff6fddd21f782e305408fcdd7af1f564a382331cb20b7 qtscxml-everywhere-src-5.12.1.tar.xz # Hashes for license files: diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index a8d325d32a..6f5d02033f 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsensors-everywhere-src-5.11.3.tar.xz.sha256 -sha256 a75753d1d5607d4cb27b1849ea9612a65bb3a5271bb31bf0817edd143b620859 qtsensors-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtsensors-everywhere-src-5.12.1.tar.xz.sha256 +sha256 ebc8b4bcfacf10c3bea3f400da7bf3fc7f44f90fa9eb0320c3b87f17307a63e4 qtsensors-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialbus/5.11.3/qt5serialbus.hash b/package/qt5/qt5serialbus/5.12.1/qt5serialbus.hash similarity index 60% rename from package/qt5/qt5serialbus/5.11.3/qt5serialbus.hash rename to package/qt5/qt5serialbus/5.12.1/qt5serialbus.hash index 7d8d9b3419..429232c45e 100644 --- a/package/qt5/qt5serialbus/5.11.3/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/5.12.1/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialbus-everywhere-src-5.11.3.tar.xz.sha256 -sha256 5664def35d4ad4aedef14bc529679851450262ea81477a69031ba81aa614c16d qtserialbus-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtserialbus-everywhere-src-5.12.1.tar.xz.sha256 +sha256 97f0c690c77b0e19a8c90e376ecc94d59b21adb20a90179700d1c514a4c50d74 qtserialbus-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialport/5.11.3/qt5serialport.hash b/package/qt5/qt5serialport/5.12.1/qt5serialport.hash similarity index 65% rename from package/qt5/qt5serialport/5.11.3/qt5serialport.hash rename to package/qt5/qt5serialport/5.12.1/qt5serialport.hash index 63e0cb61c1..6adcaaff61 100644 --- a/package/qt5/qt5serialport/5.11.3/qt5serialport.hash +++ b/package/qt5/qt5serialport/5.12.1/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtserialport-everywhere-src-5.11.3.tar.xz.mirrorlist -sha256 96c45e6d0d470626815f82b38ee48bf941e1bbfc10863087b69cc5f7bb766bda qtserialport-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtserialport-everywhere-src-5.12.1.tar.xz.mirrorlist +sha256 243b2502283c45f5163d68c3f23c787d46eb0e3ba58f3d9a0560dc7968a6ce19 qtserialport-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index 3c2f0fe474..ddc059aa99 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtsvg-everywhere-src-5.11.3.tar.xz.sha256 -sha256 21ea2c9c4e78101e98163bc19e463b8d8cdffa20e1ccd523ccc925b9f2cd4491 qtsvg-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtsvg-everywhere-src-5.12.1.tar.xz.sha256 +sha256 5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8 qtsvg-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index 94f1254b03..06e2127dba 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qttools-everywhere-src-5.11.3.tar.xz.sha256 -sha256 c205e81bba9b87c6186604a05ab48e4e6cac0cd511525749dfd00b107b6f9f8e qttools-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qttools-everywhere-src-5.12.1.tar.xz.sha256 +sha256 ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3 qttools-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5virtualkeyboard/5.11.3/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/5.12.1/qt5virtualkeyboard.hash similarity index 70% rename from package/qt5/qt5virtualkeyboard/5.11.3/qt5virtualkeyboard.hash rename to package/qt5/qt5virtualkeyboard/5.12.1/qt5virtualkeyboard.hash index c7d27870b2..0e6860f3d6 100644 --- a/package/qt5/qt5virtualkeyboard/5.11.3/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/5.12.1/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz.sha256 -sha256 8c5c40245a9dd2e9e504ce2d47d45079d8280436146797b24b8115ef163b4b9e qtvirtualkeyboard-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz.sha256 +sha256 a9e3ed4786d603314144c7ad29a9fdeb6e5c3f2ea5a27f6545cc9777244cd683 qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 40d1bb0b26..5b898bd3da 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,8 @@ # hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwayland-everywhere-src-5.11.3.tar.xz.sha256 -sha256 62c94f29e461c849e479f39d21577b0c72f0f084250e126021edcf0719271fb2 qtwayland-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwayland-everywhere-src-5.12.1.tar.xz.sha256 +sha256 88f0507628b3697b0d59349d27b5e60a313a3138927722d6cf981089fff02553 qtwayland-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 7c87683ba8..1bbb8fbf20 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebchannel-everywhere-src-5.11.3.tar.xz.sha256 -sha256 3c254fa41b1af09c1e951131f3a1336dee70a15cbb8a82112488b38d29572df3 qtwebchannel-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwebchannel-everywhere-src-5.12.1.tar.xz.sha256 +sha256 40c3e74347c67a9864d0d54f14120555860e4ce529746407325b3cd6e9aeb5bf qtwebchannel-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webengine/chromium-latest.inc b/package/qt5/qt5webengine/chromium-latest.inc index 9e4b7d6356..7c5aca81d4 100644 --- a/package/qt5/qt5webengine/chromium-latest.inc +++ b/package/qt5/qt5webengine/chromium-latest.inc @@ -15,14 +15,13 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE \ src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE \ src/3rdparty/chromium/buildtools/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE \ - src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE \ src/3rdparty/chromium/LICENSE \ src/3rdparty/chromium/LICENSE.chromium_os \ src/3rdparty/chromium/mojo/public/LICENSE \ src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE \ src/3rdparty/chromium/net/third_party/nss/LICENSE \ src/3rdparty/chromium/ppapi/LICENSE \ + src/3rdparty/chromium/third_party/abseil-cpp/LICENSE \ src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE \ src/3rdparty/chromium/third_party/angle/LICENSE \ src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE \ @@ -31,13 +30,34 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE \ src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE \ src/3rdparty/chromium/third_party/apple_apsl/LICENSE \ + src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE \ src/3rdparty/chromium/third_party/axe-core/LICENSE \ src/3rdparty/chromium/third_party/bazel/LICENSE \ src/3rdparty/chromium/third_party/blanketjs/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE \ + src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 \ + src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2_worker/lighthouse/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE_python \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm_modes/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/LICENSE \ + src/3rdparty/chromium/third_party/blink/renderer/devtools/scripts/closure/COPYING \ + src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt \ + src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/COPYING \ + src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE \ + src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE \ src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE \ + src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE \ src/3rdparty/chromium/third_party/bouncycastle/LICENSE \ src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE \ src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING \ @@ -51,11 +71,14 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/chaijs/LICENSE \ src/3rdparty/chromium/third_party/checkstyle/LICENSE \ src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 \ + src/3rdparty/chromium/third_party/chromevox/LICENSE \ + src/3rdparty/chromium/third_party/chromevox/third_party/closure-library/LICENSE \ + src/3rdparty/chromium/third_party/chromevox/third_party/sre/LICENSE \ src/3rdparty/chromium/third_party/cld_3/LICENSE \ src/3rdparty/chromium/third_party/cld_3/src/LICENSE \ - src/3rdparty/chromium/third_party/content_shell_fonts/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE \ + src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE \ src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE \ src/3rdparty/chromium/third_party/crc32c/src/LICENSE \ src/3rdparty/chromium/third_party/cros_system_api/LICENSE \ @@ -193,6 +216,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/errorprone/LICENSE \ src/3rdparty/chromium/third_party/espresso/LICENSE \ src/3rdparty/chromium/third_party/expat/files/COPYING \ + src/3rdparty/chromium/third_party/feed/LICENSE \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt \ src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt \ @@ -213,7 +237,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/fontconfig/LICENSE \ src/3rdparty/chromium/third_party/fontconfig/src/COPYING \ src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT \ - src/3rdparty/chromium/third_party/gardiner_mod/LICENSE \ src/3rdparty/chromium/third_party/gestures/gestures/LICENSE \ src/3rdparty/chromium/third_party/gestures/LICENSE \ src/3rdparty/chromium/third_party/gif_player/LICENSE \ @@ -222,13 +245,15 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE \ src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE \ src/3rdparty/chromium/third_party/googletest/src/LICENSE \ + src/3rdparty/chromium/third_party/google-truth/LICENSE \ src/3rdparty/chromium/third_party/gson/LICENSE \ src/3rdparty/chromium/third_party/guava/LICENSE \ src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE \ src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE \ src/3rdparty/chromium/third_party/haha/LICENSE \ src/3rdparty/chromium/third_party/hamcrest/LICENSE \ - src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING \ + src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING \ + src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ucdn/COPYING \ src/3rdparty/chromium/third_party/hunspell/COPYING \ src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER \ src/3rdparty/chromium/third_party/hunspell/COPYING.MPL \ @@ -269,6 +294,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE \ src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE \ src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT \ + src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE \ src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE \ src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT \ src/3rdparty/chromium/third_party/libwebp/LICENSE \ @@ -278,7 +304,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/libxslt/linux/COPYING \ src/3rdparty/chromium/third_party/libxslt/src/Copyright \ src/3rdparty/chromium/third_party/libyuv/LICENSE \ - src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY \ src/3rdparty/chromium/third_party/lzma_sdk/LICENSE \ src/3rdparty/chromium/third_party/mach_override/LICENSE \ src/3rdparty/chromium/third_party/markupsafe/LICENSE \ @@ -297,7 +322,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/molokocacao/LICENSE \ src/3rdparty/chromium/third_party/motemplate/LICENSE \ src/3rdparty/chromium/third_party/mozilla/LICENSE \ - src/3rdparty/chromium/third_party/mt19937ar/LICENSE \ src/3rdparty/chromium/third_party/netty4/LICENSE \ src/3rdparty/chromium/third_party/netty-tcnative/LICENSE \ src/3rdparty/chromium/third_party/node/LICENSE \ @@ -316,6 +340,7 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/pexpect/LICENSE \ src/3rdparty/chromium/third_party/ply/LICENSE \ src/3rdparty/chromium/third_party/ply/license.patch \ + src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt \ src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt \ src/3rdparty/chromium/third_party/proguard/LICENSE \ src/3rdparty/chromium/third_party/protobuf/LICENSE \ @@ -323,15 +348,19 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE \ src/3rdparty/chromium/third_party/pyelftools/LICENSE \ src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE \ + src/3rdparty/chromium/third_party/pyjson5/src/LICENSE \ src/3rdparty/chromium/third_party/pymock/LICENSE.txt \ src/3rdparty/chromium/third_party/pystache/LICENSE \ src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md \ src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE \ src/3rdparty/chromium/third_party/qcms/src/COPYING \ + src/3rdparty/chromium/third_party/quic_trace/src/LICENSE \ src/3rdparty/chromium/third_party/qunit/LICENSE \ + src/3rdparty/chromium/third_party/r8/LICENSE \ src/3rdparty/chromium/third_party/re2/LICENSE \ src/3rdparty/chromium/third_party/re2/src/LICENSE \ src/3rdparty/chromium/third_party/requests/LICENSE \ + src/3rdparty/chromium/third_party/rnnoise/COPYING \ src/3rdparty/chromium/third_party/robolectric/LICENSE \ src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt \ src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt \ @@ -339,22 +368,22 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/s2cellid/LICENSE \ src/3rdparty/chromium/third_party/sfntly/COPYING.txt \ src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt \ - src/3rdparty/chromium/third_party/shaderc/LICENSE \ src/3rdparty/chromium/third_party/shaderc/src/LICENSE \ src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang \ src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools \ src/3rdparty/chromium/third_party/simplejson/LICENSE.txt \ src/3rdparty/chromium/third_party/sinonjs/LICENSE \ src/3rdparty/chromium/third_party/skia/LICENSE \ - src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE \ src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE \ + src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt \ + src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE \ src/3rdparty/chromium/third_party/smhasher/LICENSE \ src/3rdparty/chromium/third_party/snappy/src/COPYING \ src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE \ src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE \ src/3rdparty/chromium/third_party/sqlite4java/LICENSE \ src/3rdparty/chromium/third_party/sqlite/LICENSE \ - src/3rdparty/chromium/third_party/sqlite/sqlite-src-3210000/autoconf/tea/license.terms \ src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms \ src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE \ src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt \ @@ -366,20 +395,19 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT \ src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt \ src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT \ + src/3rdparty/chromium/third_party/tcmalloc/gperftools-2.0/vendor/COPYING \ src/3rdparty/chromium/third_party/tcmalloc/LICENSE \ src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING \ + src/3rdparty/chromium/third_party/test_fonts/LICENSE \ src/3rdparty/chromium/third_party/tlslite/LICENSE \ - src/3rdparty/chromium/third_party/typ/LICENSE \ src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE \ + src/3rdparty/chromium/third_party/unrar/LICENSE \ + src/3rdparty/chromium/third_party/unrar/src/license.txt \ src/3rdparty/chromium/third_party/usb_ids/LICENSE \ src/3rdparty/chromium/third_party/usrsctp/LICENSE \ src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md \ src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l \ src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE \ - src/3rdparty/chromium/third_party/vulkan/LICENSE \ - src/3rdparty/chromium/third_party/wayland/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/LICENSE \ - src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING \ src/3rdparty/chromium/third_party/wds/LICENSE \ src/3rdparty/chromium/third_party/wds/src/COPYING \ src/3rdparty/chromium/third_party/web-animations-js/LICENSE \ @@ -387,25 +415,6 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/third_party/webdriver/COPYING \ src/3rdparty/chromium/third_party/webdriver/LICENSE \ src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 \ - src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/audits2_worker/lighthouse/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/formatter_worker/acorn/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/terminal/xterm.js/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Source/platform/wtf/dtoa/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE.md \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/html5lib/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE \ - src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE \ src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE \ src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md \ src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE \ @@ -432,6 +441,9 @@ QT5WEBENGINE_CHROMIUM_LICENSE_FILES = \ src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE \ src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE \ src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE \ + src/3rdparty/chromium/v8/third_party/antlr4/LICENSE.txt \ src/3rdparty/chromium/v8/third_party/colorama/LICENSE \ src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE \ + src/3rdparty/gn/base/third_party/icu/LICENSE \ + src/3rdparty/gn/LICENSE \ src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash index 730352611a..4cbc1ce4fb 100644 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ b/package/qt5/qt5webengine/qt5webengine.hash @@ -1,5 +1,5 @@ # Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebengine-everywhere-src-5.11.3.tar.xz.sha256 -sha256 5bb49ead71b851db4dc56f8fd97e0db72a268b22104129a06bac201d55d3b8fe qtwebengine-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwebengine-everywhere-src-5.12.1.tar.xz.sha256 +sha256 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0 qtwebengine-everywhere-src-5.12.1.tar.xz diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 0df4ac98fa..3b2f4fa3c3 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtwebsockets-everywhere-src-5.11.3.tar.xz.sha256 -sha256 021090c1a92f11fcf2914168741c1364235896793685b7fae2bc23e3dd55d5b9 qtwebsockets-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwebsockets-everywhere-src-5.12.1.tar.xz.sha256 +sha256 2fd0627916d817599c5f855a97156113ed3625b90b350603be6f668762abfc79 qtwebsockets-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash b/package/qt5/qt5x11extras/5.12.1/qt5x11extras.hash similarity index 65% rename from package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash rename to package/qt5/qt5x11extras/5.12.1/qt5x11extras.hash index 9a0e85d8fd..b065234f4c 100644 --- a/package/qt5/qt5x11extras/5.11.3/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/5.12.1/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtx11extras-everywhere-src-5.11.3.tar.xz.mirrorlist -sha256 f99eebe685f7cdbb71cd62903c2b2511548345535841bcc3f6b662205815cd85 qtx11extras-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtx11extras-everywhere-src-5.12.1.tar.xz.mirrorlist +sha256 08fb1c40e1562d43087368a5efa39569fa1ad52b72d2360f9fc1fe18b00da366 qtx11extras-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index 5c66a54eeb..f22e4e54ff 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.11/5.11.3/submodules/qtxmlpatterns-everywhere-src-5.11.3.tar.xz.sha256 -sha256 8bd00be30722570d22382b99679d07787a2d62d4891d1c47d738d634e2db0eee qtxmlpatterns-everywhere-src-5.11.3.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtxmlpatterns-everywhere-src-5.12.1.tar.xz.sha256 +sha256 76988ca9a7a184b9013b8a5864dad150e4603890c7eb7aecad4baad071802ecb qtxmlpatterns-everywhere-src-5.12.1.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 From 53bf706aefdd2b62623f1e881565b3e223351937 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 17 Feb 2019 15:12:09 +0100 Subject: [PATCH 0057/7482] package/qt5/qt5webengine: add hashes for license files This commit adds hashes for all licenses files found in qt5webengine. In order to do this, it moves the hash file into a per-version folder. Signed-off-by: Thomas Petazzoni Reviewed-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- .../qt5/qt5webengine/5.12.1/qt5webengine.hash | 456 ++++++++++++++++++ .../qt5/qt5webengine/5.6.3/qt5webengine.hash | 258 ++++++++++ package/qt5/qt5webengine/qt5webengine.hash | 5 - 3 files changed, 714 insertions(+), 5 deletions(-) create mode 100644 package/qt5/qt5webengine/5.12.1/qt5webengine.hash create mode 100644 package/qt5/qt5webengine/5.6.3/qt5webengine.hash delete mode 100644 package/qt5/qt5webengine/qt5webengine.hash diff --git a/package/qt5/qt5webengine/5.12.1/qt5webengine.hash b/package/qt5/qt5webengine/5.12.1/qt5webengine.hash new file mode 100644 index 0000000000..cf0152b06e --- /dev/null +++ b/package/qt5/qt5webengine/5.12.1/qt5webengine.hash @@ -0,0 +1,456 @@ +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwebengine-everywhere-src-5.12.1.tar.xz.sha256 +sha256 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0 qtwebengine-everywhere-src-5.12.1.tar.xz + +# Locally calculated +sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 + +# Locally calculated with: +# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE +sha256 d04360743ae3338bb08ab2106b51e24309e3ca4b1c6b1186139531ade351b7e3 src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/chromium/base/third_party/icu/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE +sha256 63f0c0039b477857e54708d9501ed91b7a46e828ac3c623bedbc318129ceb174 src/3rdparty/chromium/tools/origin_trials/third_party/ed25519/LICENSE +sha256 4fde1ca31ffe4e16a76098f56170166c61a5493d3bafcc6a5903d3cb60aa7560 src/3rdparty/chromium/tools/symsrc/COPYING-pefile +sha256 70eb89e4cb460d1b27173348c9f9fca5cf67c09d722ddaa07c5d0fcd6262a97e src/3rdparty/chromium/tools/gyp/LICENSE +sha256 7389900fb68d920c6cb21b70702a2bc240523472a3fd091023d6135cf01d1c5c src/3rdparty/chromium/tools/win/ChromeDebug/ChromeDebug/LICENSE +sha256 f5b244982699ca9fe5cc8fa8a7c08cf5dee5d3a0c8896892899e5df13316e1b7 src/3rdparty/chromium/tools/page_cycler/acid3/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu4j/LICENSE +sha256 55172044f7e241207117448a4d9d6ba1d0925c8ad66b5d4c08c70adfa9cc3de6 src/3rdparty/chromium/third_party/snappy/src/COPYING +sha256 bf4da21bd20bcfb5b60b7ecc67fa864a79be049e21d6178076887f178dd6c71a src/3rdparty/chromium/third_party/angle/LICENSE +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/angle/src/common/third_party/smhasher/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/angle/src/third_party/libXNVCtrl/LICENSE +sha256 923e74e5ae41345038da0a56dfdc983356917fbbb139176e654d1b33100b723f src/3rdparty/chromium/third_party/jmake/LICENSE +sha256 0d74de3c3cd3196a9ed1bc612cfd5f81d7509d66c4be34a50f99d61bd1ad00d4 src/3rdparty/chromium/third_party/ots/LICENSE +sha256 795f8d76eade6130129b680ac72ea81cb3e143467a65ea1f5f64946151d7fa20 src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING +sha256 d600ff20c150a675461dde76752e35f4cc3be6e7d8e70b8da3e775ea7e5ec4aa src/3rdparty/chromium/third_party/test_fonts/LICENSE +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE +sha256 685b3b09870f1361f8db2d3f37acdb765d5da1722a18b182765da4b79a8f63ff src/3rdparty/chromium/third_party/ply/license.patch +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libprotobuf-mutator/src/LICENSE +sha256 f56ff606104d4ef18e617921a75c73ad73b5a1a1d70c69590c29de16919e04ad src/3rdparty/chromium/third_party/openvr/src/LICENSE +sha256 cb5e8e7e5f4a3988e1063c142c60dc2df75605f4c46515e776e3aca6df976e14 src/3rdparty/chromium/third_party/pyjson5/src/LICENSE +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE +sha256 a412a53925efc6b50800bf8519a2e033949243d5a5a8c5422bae8a5007ad09c8 src/3rdparty/chromium/third_party/iccjpeg/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/feed/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/guava/LICENSE +sha256 60bd7c54856bf9387221bde5ab55d516d7cea15870d0fed69406bcd1c8ec7c9d src/3rdparty/chromium/third_party/boringssl/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/boringssl/src/third_party/wycheproof_testvectors/LICENSE +sha256 201d494a3f42450a28df2f0919a147e9a5296e841df5d415172a0ca8b558d0a8 src/3rdparty/chromium/third_party/boringssl/src/third_party/android-cmake/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/boringssl/src/third_party/googletest/LICENSE +sha256 0c125a4dab5ab869473e6491db22f6c0a7f8a4de58588d03bb2b16c0c8ebd7de src/3rdparty/chromium/third_party/boringssl/src/third_party/fiat/LICENSE +sha256 942755efa272dbfbcd7afea7a38556801e36c16dcad002d572378367094a2593 src/3rdparty/chromium/third_party/zlib/LICENSE +sha256 8e19d42a1eec9561f3f347253ddf2e385c55f392f025bb0fd41b88dbf38db5ae src/3rdparty/chromium/third_party/libsrtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/errorprone/LICENSE +sha256 29028ec63522121b5545046e0c4d3ccc1e01fc8d9aaa3272554f74829cdacf84 src/3rdparty/chromium/third_party/apache-portable-runtime/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/shaderc/src/LICENSE +sha256 19096ed2f05a693b92433405a6bf1018044b31ed5fa8883ab865cf2cd166f6e9 src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.spirv-tools +sha256 b5a00e94f058edc87e05978329b55730d8689abe61205d9018443d03de4f07da src/3rdparty/chromium/third_party/shaderc/src/third_party/LICENSE.glslang +sha256 af67c58de2e18677a0b8cb5fffbe2232aabb8eb2930e8cd684769cef3d74a262 src/3rdparty/chromium/third_party/protobuf/LICENSE +sha256 e2f59ff41d9d03adc3dcf3deff170f8c8cf4a6eb4a9b174762a7656d23200ffa src/3rdparty/chromium/third_party/rnnoise/COPYING +sha256 721cb11de618fcf9bbb7d25a389207bf2227357e6694bc326ab32a6699f9b951 src/3rdparty/chromium/third_party/libFuzzer/LICENSE.TXT +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE +sha256 e075583a46bca13a3f25af4181e2a0064f442c1f55c4312275cbcf05b892d3f4 src/3rdparty/chromium/third_party/mocha/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/sqlite4java/LICENSE +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/chromium/third_party/harfbuzz-ng/src/COPYING +sha256 ec20cbe051200fc846caf4dc253cf660e874a2d9e4f3a682e08354b567fae409 src/3rdparty/chromium/third_party/harfbuzz-ng/src/src/hb-ucdn/COPYING +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/ced/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ced/src/LICENSE +sha256 fd056de4196903a676208ef58cfddafc7d583d1f28fa2e44c309cf84a59e62fb src/3rdparty/chromium/third_party/freetype/src/docs/LICENSE.TXT +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/LICENSE +sha256 3e3a91ec5c3fa243ad1f5a25cedee0abafd9824d061378cd3c81c541b044bf09 src/3rdparty/chromium/third_party/skia/third_party/gif/LICENSE +sha256 e59bb5c5c6ba426a9ac4ba9fe667ad14c5166b12aa25be8af1d122b14fbe2e36 src/3rdparty/chromium/third_party/skia/third_party/skcms/LICENSE +sha256 d27678cba0d529e77201e2d2a053628143e986aad8f1e77f7039ad4366c8f978 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/LICENSE +sha256 e21477eed484b07902a861a1b18d1e4ecd3e6f22fa81e2410f0770cfb67290e8 src/3rdparty/chromium/third_party/skia/third_party/vulkanmemoryallocator/include/LICENSE.txt +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/objenesis/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/LICENSE +sha256 c2d13ec3b431617beb314705c0f42d17ca579eed00032ed8a13dbcd23fc9bdd5 src/3rdparty/chromium/third_party/cld_3/src/LICENSE +sha256 a1f30b77c01e0995fa32a00119e00749e8731ee8a3c4c3549bce74083c72b0b6 src/3rdparty/chromium/third_party/crc32c/src/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE +sha256 9f45b3cf29b76b5bf4ad467938b0e61a720eec6ef6c219c566f7c262b0cc7854 src/3rdparty/chromium/third_party/haha/LICENSE +sha256 87642305968765a4030fd202ff7006afa67274da7f9bde84506e51ae58ecc2b4 src/3rdparty/chromium/third_party/minizip/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty-tcnative/LICENSE +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/google-truth/LICENSE +sha256 c93465d6a75e6ade8785edb4ec125ece083ab0910ed0417b4ff346792ba0f851 src/3rdparty/chromium/third_party/mesa/LICENSE +sha256 e8800bd573e8f844a5b87cf43cc4d55767314b4e95a6092cf26ce9c6ed00b877 src/3rdparty/chromium/third_party/mesa/src/docs/COPYING +sha256 1efd6dec259877be94db3dbd005c93a5c94a73a492bd85eede6e14885e480e0e src/3rdparty/chromium/third_party/mesa/src/docs/license.html +sha256 704179825bb7c4600acbff3d1fcd95f1eb61b2c4a11b66bb150d7cefea8f6371 src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt +sha256 0a90947436dc17f047f8c95b64593e2cc9a2b6d4ff6618f2f0beba5a9b568c14 src/3rdparty/chromium/third_party/unrar/LICENSE +sha256 6ecc1687808b7d66b24f874755abfed7464d9751ed0001cd4e8e5d9bf397ff8a src/3rdparty/chromium/third_party/unrar/src/license.txt +sha256 846f295f64194ebcf615d6e35e445990645583764b52295177fc09a69051df1f src/3rdparty/chromium/third_party/visualmetrics/src/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libaddressinput/src/LICENSE +sha256 c9a5bd7c8cc1267ddacdc5228c68ecd811cf6d74286e9141bc80d8af2eb1a025 src/3rdparty/chromium/third_party/libaddressinput/src/cpp/LICENSE.chromium +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE +sha256 8610954adbca6c6b85d8b1ae5613b44b0014e437d32fcad6683bb27541411686 src/3rdparty/chromium/third_party/minigbm/src/LICENSE +sha256 10054db83ace18e5a455749d0d247857ec50508cecda79a5abe66fe4778d7721 src/3rdparty/chromium/third_party/d3/src/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS +sha256 9f5db2544e04e3e0fb39ea277b9bb6f8efcc8bb84f6264630978ce4708495535 src/3rdparty/chromium/third_party/gestures/gestures/LICENSE +sha256 4bd9e329f9b268bd0dec2df0560a03382fe426adf83daa7b314d2f46b9b22c9a src/3rdparty/chromium/third_party/gestures/LICENSE +sha256 46336ab2fec900803e2f1a4253e325ac01d998efb09bc6906651f7259e636f76 src/3rdparty/chromium/third_party/expat/files/COPYING +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE +sha256 0cd1bd4b934ffdc5e7f1bcfa9d08bd17295e5414bdca99c06b1036278b01f0b1 src/3rdparty/chromium/third_party/node/LICENSE +sha256 f9752a0a4ac5215eaa3a4f0ec29cd52563c883de5d7870525cc0bc3a21cb8e15 src/3rdparty/chromium/third_party/breakpad/breakpad/LICENSE +sha256 4d03f91b94e0db3bdc9ddaf0060dd41cc94a2096094fbc1417713a2f059658c7 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/curl/COPYING +sha256 d8eaba95b8d03c5912da9b5823de2c920e84a993133039a22fc8100f9edb33a1 src/3rdparty/chromium/third_party/breakpad/breakpad/src/third_party/libdisasm/LICENSE +sha256 015b2d5cedb3024339446a63963d073fa831544cf253c5ddd713fccc8d83e939 src/3rdparty/chromium/third_party/breakpad/LICENSE +sha256 946b733afbaa20a192c8dc022b4e43090e78f28fd293494d1b307f7301552c9b src/3rdparty/chromium/third_party/flac/COPYING.Xiph +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/flac/COPYING.GPL +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/netty4/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/libsync/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/material_design_icons/LICENSE +sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE +sha256 68834f116f8ff545f05d14753357b620748156d60ee36b26beab4cb3f317efe4 src/3rdparty/chromium/third_party/r8/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/javax_inject/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE +sha256 913b3eb6f19defc77c00e2bebbbce464326331b0b59eb6d1d1b23d68a8c27f6b src/3rdparty/chromium/third_party/libpng/LICENSE +sha256 4eac19453ddf356478db3be6b101a6d872d0046cdc8222df1ff5c997dd4b9fbe src/3rdparty/chromium/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/icu/scripts/LICENSE +sha256 c62d7697c03979f5056d28b338fafc7a1152820f7b379adf4a9d88cd37160f96 src/3rdparty/chromium/third_party/icu/license.html +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 73d99bc83313fff665b426d6672b4e0479102bc402fe22314ac9ce94a38aa5ff src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt +sha256 a5adc2955c0dd848c97aa6afb14e0047a610f0fcfa6ce0011efad01a0e051406 src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer2/LICENSE.txt +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt +sha256 5a12a0c01bfcdbc90b550c9cd8bfc3e90e6be9c9bbfdb58bfb5daaf6817eb78f src/3rdparty/chromium/third_party/chromevox/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/third_party/chromevox/third_party/closure-library/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/chromevox/third_party/sre/LICENSE +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE +sha256 d3e2f59e1d71176dfdb555ece6a41f7a5aa0f52ff21211010ace314f57695f6b src/3rdparty/chromium/third_party/abseil-cpp/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/third_party/metrics_proto/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/quic_trace/src/LICENSE +sha256 5740985669353ef52e0f320413ff68dc62b6c23a596cd78b6d6b80764f1c50ab src/3rdparty/chromium/third_party/bouncycastle/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE +sha256 f54c49d3ff865458c5d3c68c3367a1f6e0d7b3f686f8c88a6a563ef90f84ad9e src/3rdparty/chromium/third_party/gvr-android-sdk/LICENSE +sha256 5d0c892ea452c3828f1e311637cde4e3a04eb6431554308b3fcdac8c1b330168 src/3rdparty/chromium/third_party/fips181/COPYING +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/gperftools-2.0/vendor/COPYING +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/third_party/inspector_protocol/LICENSE +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE +sha256 e88ae39d2e7c9ae8f5470bb23fdd7ce55fe58aca06f3d4399182f5bb0ffcf1dd src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/gson/LICENSE +sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE +sha256 b578cdd2345840ada550bd12519533812320d5f1d21cf4c1c7e1b1b0a31c98b7 src/3rdparty/chromium/third_party/pdfium/LICENSE +sha256 32759d1397d8f7b9e15ece146e4038b22b90e93b4935b5a840bcef4d2ba5ea55 src/3rdparty/chromium/third_party/pdfium/third_party/bigint/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pdfium/third_party/pymock/LICENSE.txt +sha256 584e795ba5833279c327245594d6dc216fc664144fa3626a0bdf136bc00af76c src/3rdparty/chromium/third_party/arcore-android-sdk/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/src/Copyright +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/linux/COPYING +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE +sha256 3d180008e36922a4e8daec11c34c7af264fed5962d07924aea928c38e8663c94 src/3rdparty/chromium/third_party/brotli/LICENSE +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/hunspell/COPYING +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/hunspell/COPYING.LESSER +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE +sha256 1f7a086c17fa2bdbe27d3eb6424a64b9bea9d7db89a4e220fef52ca24addb9e9 src/3rdparty/chromium/third_party/webrtc/license_template.txt +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCMobile/third_party/SocketRocket/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 3ee0b54b13060355b0f5d0d1476536d25ad10552211098cc4086a46fb8c61f42 src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE +sha256 fb3ab1e1621c6c469499a6ba1e926c027f32af3063c0456282f89382591cc46a src/3rdparty/chromium/third_party/libevdev/LICENSE +sha256 b5730da9a26472a405b0b1c61d3d166714d9d654ab3282e54e4a01a5f66316c3 src/3rdparty/chromium/third_party/byte_buddy/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/LICENSE +sha256 376b54d4c5f4aa99421823fa4da93e3ab73096fce2400e89858632aa7da24a14 src/3rdparty/chromium/third_party/wds/src/COPYING +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/ocmock/License.txt +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googlemock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/third_party/googletest/src/googlemock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/googletest/src/googletest/LICENSE +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE +sha256 1599cc232dbd003e6691c7f4e360f2068f84ebaef6510a26ab919c3a7fec27fd src/3rdparty/chromium/third_party/openmax_dl/LICENSE +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/libjingle_xmpp/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/glslang/LICENSE +sha256 c55ce1e876843853a8a2e5c936df6dc8dd3d185f83d85e6d113143b8c24f542e src/3rdparty/chromium/third_party/swiftshader/third_party/subzero/LICENSE.TXT +sha256 0a731c5e376f4b604b9fd099d4797d64a5c0bc6e3770baf17b55988cb7737e2e src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/LICENSE.TXT +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/utils/unittest/googletest/LICENSE.TXT +sha256 a63ee63574ed21e930765c4418a4fa2fa571b72c47cd023ee588dbf8b21fb4ee src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/projects/sample/autoconf/LICENSE.TXT +sha256 a63ee63574ed21e930765c4418a4fa2fa571b72c47cd023ee588dbf8b21fb4ee src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/autoconf/LICENSE.TXT +sha256 a012d664e4e01df52a65b2eeafdfb8aeb856fec0e6c372265d01b0109c3f5e2a src/3rdparty/chromium/third_party/swiftshader/third_party/LLVM/include/llvm/Support/LICENSE.TXT +sha256 b2d24d77041fbf66b93519758cd80671425c55614b2f65262046fdbe8c3247a8 src/3rdparty/chromium/third_party/swiftshader/third_party/PowerVR_SDK/License.txt +sha256 9c9a05118ed1b6d96781a2e52335f7d4ec3dd6e7139340a8aa95fbf7eb4f199a src/3rdparty/chromium/third_party/swiftshader/third_party/llvm-subzero/LICENSE.TXT +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/swiftshader/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING +sha256 9021fdb5341ebbb2eb5c771ac5cfac527790673179d3b21a42de1ab2798ec30f src/3rdparty/chromium/third_party/espresso/LICENSE +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/leakcanary/LICENSE +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE +sha256 fffd497be5f4ae0a10b8258e191125fb58b90250ecbf3c79398d79604dd00b7d src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.md +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 4b45cbe16d7b71b89ae6127e26e0d90a029198ca5e958ad8e3d0b8bbed364d8b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/cpp-httplib/cpp-httplib/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/accessibility_test_framework/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/apk-patch-size-estimator/LICENSE +sha256 9dd8d2fb95ba862a5d166a167682c1c67a209acd3bf09b6fd03f76d3579729bc src/3rdparty/chromium/third_party/ow2_asm/LICENSE +sha256 98f8746a39f9a42da35df7046a15b56d0e2f4f76eefc352d67f1bf76e85360b4 src/3rdparty/chromium/third_party/bspatch/LICENSE +sha256 5f593432ef4e7ecefa6326042babb8a03d8d6ce502b4f0b78b105e18d19f8052 src/3rdparty/chromium/third_party/molokocacao/LICENSE +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE +sha256 7973776647df23457a9910075547e3f345fbc5e0e41147b4586d714582dfdd76 src/3rdparty/chromium/third_party/mach_override/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/s2cellid/LICENSE +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 ca382aa537f8923d6c0991fb976d184a2009eb76080313bf10dcecdc9311f0dd src/3rdparty/chromium/third_party/gvr-android-keyboard/LICENSE +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT +sha256 af175b9d96ee93c21a036152e1b905b0b95304d4ae8c2c921c7609100ba8df7e src/3rdparty/chromium/third_party/axe-core/LICENSE +sha256 1cf71700f3403ca26f002e2dc1d1861dcb3d2af9bb9d98d529a903be9d7f06fc src/3rdparty/chromium/third_party/xstream/LICENSE +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE +sha256 58d1e17ffe5109a7ae296caafcadfdbe6a7d176f0bc4ab01e12a689b0499d8bd src/3rdparty/chromium/third_party/intellij/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/flatbuffers/src/LICENSE.txt +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/bazel/LICENSE +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx/source/libvpx/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/x86inc/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libvpx/source/libvpx/third_party/libyuv/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-node-modules/LICENSE +sha256 f2042f3634c4136d06b5139c9c6aefb81a3a462b514548bc1845953233dfba98 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/deep-is/LICENSE +sha256 162413c61e0982abe89a06bf7a02ec760dc49a7364d838bd9f01daebb5b95954 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/tmp/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimatch/LICENSE +sha256 11f2aafb37d06b3ee5bdaf06e9811141d0da05263c316f3d627f45c20d43261b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string_decoder/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/onetime/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-escapes/LICENSE +sha256 33b734d60042d0fe0c92dd1fc1e874193a1c899ec3e276a2eb935d2d0bf5b710 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/core-util-is/LICENSE +sha256 a4cdda44b5adea4731d53dcae78fb5124f8fd853e994f01e25d8c33a7daf818b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/sprintf-js/LICENSE +sha256 2fc5460f1526810979054ecd18cd01349b57f38ea56d1e920afdea34d104540c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/graceful-fs/LICENSE +sha256 6273faa0d14a54972c0341a724010eb8cd928ee486745a9eea8cf80680ba5098 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/espree/LICENSE +sha256 05dc4d785ac3a488676d3ed10e901b75ad89dafcc63f8e66610fd4a39cc5c7e8 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inflight/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-regex/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/resolve-from/LICENSE +sha256 a1bd5deadb6a06dd74efa852c1b8b23f63b67f2214fbe9c8bd591da51da69268 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/balanced-match/LICENSE +sha256 942a98cb8846a6354266193f173c1354615827fbb7d67f68399599dff12c4d6a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-levenshtein/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-absolute/LICENSE +sha256 96b29c9aaa611a05349b362d48c2ffce0966fe408401a2d1a157be312c035b5f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-stream/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-union/LICENSE +sha256 94bcb9959136723aa4fb36e1a6c4d5c662a2369978cfae344dabfb83ae619e79 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esprima/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/del/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globby/LICENSE +sha256 e159c6d48c989185448658f276375bfb2300362ec6d4ae5525a2d49c4bcb947d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lodash/LICENSE +sha256 ecdccbcf39024f624ded480c01c0b25458e1eca8f26ecf040933865ce56d9a4f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/process-nextick-args/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mimic-fn/LICENSE +sha256 b1344bd78ebcbf8a359225ec444d038a653c6a5f9ecf405a50d4a5c11fbf27d1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cross-spawn/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/escape-string-regexp/LICENSE +sha256 693866fc419c6f61c8570438ec00659d156ec2b4d4a4d04091711f5f11a365d4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-convert/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-fullwidth-code-point/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/semver/LICENSE +sha256 ef088ddea300fe4ea038bc47db929e320033b66981cf12a20b517d6b66a2fa3e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/table/LICENSE +sha256 aa7c48d39d3bb837efa4fce39f971fa6ae8e5cb148724af8867a7a4a7121ad6a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/circular-json/LICENSE +sha256 44191656d296391e0ec97e32f5385f0d02b6f2992694082d22ea04ba0f66f9e4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-promise/LICENSE +sha256 5822e0d816e53e3537b306a4132cb7a70881897cf51bf483282148a602979076 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pluralize/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-deep-equal/LICENSE +sha256 db83f2ede67f36cfab1ea0721ea2ee97515863e9a65346881f305e430451cc91 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/optionator/LICENSE +sha256 4969b0ff94c4f2ad3f1613d95b3966cb4c3147d8b893654aced81029241de176 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv/LICENSE +sha256 7bf9b2de73a6b356761c948d0e9eeb4be6c1270bd04c79cd489c1e400ffdfc1a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-schema-traverse/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/rimraf/LICENSE +sha256 e6fdf7ac2af533b4436d99aa75df32aa78690510f7d68a3e73e8576967298d2f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-command/LICENSE +sha256 7d043a9e52b7e1e3acab9ca3377e30ca72d25d39ad6e6c5a22b407fe39c6d703 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chardet/LICENSE +sha256 e2ddad70d6b6bcfec887c32d7143a77ccbdb58e38d9c43f5b7f30f715b874b80 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wrappy/LICENSE +sha256 e33b7bc13a0e5ea9ed6718e12e99a5b0b60276162f0195aa7f342397f4b0155d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/external-editor/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/shebang-regex/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/estraverse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/restore-cursor/LICENSE +sha256 a25dce9c94c3ad622574cffbefd4b8845b418aa65df966d97e3204ad276ed240 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ajv-keywords/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-ansi/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/require-uncached/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/node_modules/ansi-regex/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-ansi/LICENSE +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/flat-cache/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/supports-color/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/which/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/text-table/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esutils/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/type-check/LICENSE +sha256 c7cc929b57080f4b9d0c6cf57669f0463fc5b39906344dfc8d3bc43426b30eac src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/safe-buffer/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/yallist/LICENSE +sha256 c8442419dc614089ea022b3da6bfc089b41a58fb7b9030d1e651f2f36189dce2 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/argparse/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-path-inside/LICENSE +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie-promise/LICENSE +sha256 6ee0feb1f6ef996ff5a68600f8cf98909cf412d39ef3cdceaefd87d636fa1b7f src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pinkie/LICENSE +sha256 e5c1364118b39fa98b959138ce4aa4d0e68cfbee12d115e69730579fecb1dc1b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/run-async/LICENSE +sha256 c8c8324aff32c44f9e501aac5b3b97540c26af7d6dd6af8bce5e34300596e27d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/file-entry-cache/LICENSE +sha256 33fa5470b2195e410b075a32516b6ad27784b8a8ff74ae90cfd60c14b76e6644 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-width/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/strip-json-comments/LICENSE +sha256 e05b1eaf5b5f99b7ad75cd1f38858ff9a311780b97715ead67936d60bf96aa7e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/signal-exit/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/arrify/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/concat-map/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pseudomap/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/has-flag/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ansi-styles/LICENSE +sha256 5ffe28e7ade7d8f10d85d5337a73fd793dac5c462fb9a28fbf8c5046c7fbca3b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/inherits/LICENSE +sha256 8be44da6cc59e890c406d6d05c3ce1850f29bb2e0da2a2d686d593e5ad3ecf59 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/eslint-scope/LICENSE +sha256 e8734448285a2dd773d40136ed5d5e8163a70701dd540cdc796cfca232f67d55 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE +sha256 d72dea1a8cdf3f4dfa2f594253d0c5b37baefc76e806f5ecb0e426393edcd505 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/through/LICENSE.MIT +sha256 4ceea53e36c7ff67a946e9905e50b41f350ef7b107c59afec9b91cbe97fbcaea src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/is-resolvable/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/cli-cursor/LICENSE +sha256 e8d64ff1e54883c69759db53d10adfaa8e09b6ef628788885fe8068bc1fdb1b7 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-tokens/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/array-uniq/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/wordwrap/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/prelude-ls/LICENSE +sha256 491b4012bfc95982e66859c59641be20f4fd2c9b3bc2b6a7f26b6166e462dda1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/node_modules/acorn/LICENSE +sha256 a19859c623cc60b717560cafb5fe64244735022c1200b65a649a3c2eef912fb4 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/acorn-jsx/LICENSE +sha256 8465b04b67f473341171b5c9c8b2c741a4a395b3f6ed58339b3a4f4db3db7472 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fs.realpath/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/lru-cache/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/supports-color/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/node_modules/ansi-styles/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/chalk/LICENSE +sha256 29f4d474804f60aae177d7fed67d0d613d00006640cc9cf80077eef03fb9a2cc src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/co/LICENSE +sha256 d7d2a7786de7c7cfd96f920c6f12927d74e1d2a861ca4498bf465c3bc3f4c21c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/progress/LICENSE +sha256 a07bc24468b9654ce76a547d47a2db282d07733b715db4c73a98bd63961f9550 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/js-yaml/LICENSE +sha256 e67aed7df22dc8031e4fcf5338fe91cb33e3817e5c58a99a2a2802eea9069791 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/functional-red-black-tree/LICENSE +sha256 daca23d50b0f54d36d6da1b16c82dfea6461e2ae20de0e869957e44cc6d34781 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/write/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE +sha256 0e74697a68cebdcd61502c30fe80ab7f9e341d995dcd452023654d57133534b1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/doctrine/LICENSE.esprima +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/string-width/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/minimist/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mute-stream/LICENSE +sha256 ec62dc96da0099b87f4511736c87309335527fb7031639493e06c95728dc8c54 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/readable-stream/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/glob/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/pify/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/figures/LICENSE +sha256 26181ebee1063f3dc6766a3b6d05999a0da058f172eadf2ca5d15105ffd9735a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/typedarray/LICENSE +sha256 05991c2e8f070b69ec5b656c2c12fd07cd0153dd157d39b050b82af59b319a01 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/mkdirp/LICENSE +sha256 0154425673db15cdfa80ecba2c9b1f1a867f7197a006764712849bfc3a93cbb7 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/util-deprecate/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/os-tmpdir/LICENSE +sha256 b9eb082c39fe245e38793699074c394c43a722c51fce031c3c165cb92a31035c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/levn/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/strip-ansi/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/babel-code-frame/node_modules/chalk/LICENSE +sha256 0e356f8c0a756758ce04a143b1871585402b6bcf8f8e6a26873beb9992242e7a src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/path-is-inside/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/json-stable-stringify-without-jsonify/LICENSE +sha256 6fb9754611c20f6649f68805e8c990e83261f29316e29de9e6cedae607b8634c src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/object-assign/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/isexe/LICENSE +sha256 ac779f7314c74f232ef847ea86e714abe25cf6eeb5cc97b69451b74e2af6492d src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/iconv-lite/LICENSE +sha256 48da2f39e100d4085767e94966b43f4fa95ff6a0698fba57ed460914e35f94a0 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/globals/LICENSE +sha256 435a6722c786b0a56fbe7387028f1d9d3f3a2d0fb615bb8fee118727c3f59b7b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/fast-json-stable-stringify/LICENSE +sha256 7357445bac398c76c0aef75a587009fe406d40de6a79789eb5b7ecbbad317ef2 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/color-name/LICENSE +sha256 3dc3b3d3a284d871f7f307655c90fb101d73abbf87bbddeefd2f67883353bdbc src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/slice-ansi/LICENSE +sha256 6652830c2607c722b66f1b57de15877ab8fc5dca406cc5b335afeb365d0f32c1 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/ms/LICENSE +sha256 4ec3d4c66cd87f5c8d8ad911b10f99bf27cb00cdfcff82621956e379186b016b src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/once/LICENSE +sha256 ac68116ae73740de4190892f334992e449a124600924ec761e64319d3aac9e6e src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/esquery/LICENSE +sha256 98c970de440dcfc77471610aec2377c9d9b0db2b3be6d1add524a586e1d7f422 src/3rdparty/chromium/third_party/devtools-node-modules/third_party/node_modules/debug/LICENSE +sha256 318cea263a2fb726d767e2777771a431a3220008e6940dd5138a235a1fc498fc src/3rdparty/chromium/third_party/pystache/LICENSE +sha256 96e5bbd81970983d666e702fa56f67dfd2fdaa363b8a4266e8d98847374cd7c8 src/3rdparty/chromium/third_party/hamcrest/LICENSE +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/SPIRV-Tools/LICENSE +sha256 23353f4505b1c8ce4f8f72fc3b11dc74b4a8a7bf95921d93ff77f227c171a710 src/3rdparty/chromium/third_party/SPIRV-Tools/src/LICENSE +sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c src/3rdparty/chromium/third_party/flot/LICENSE.txt +sha256 7cdb44aabddbdd78998119d68a39c87424119b663945c79891fc1b022301824c src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/formatter_worker/acorn/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2/lighthouse/LICENSE +sha256 13110d66c514a7890c4b388a353bc08fa094fe13d5ed7f3a222cc0a0caa3fd17 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm_modes/LICENSE +sha256 a3f2fe2ac6b471aa80c737c5d283dd049bdc903a73835ee6d4d2cac02fdd53bf src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE +sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/cm/LICENSE_python +sha256 1490793b8913f0fa78af7bf2e70076f54272748e278f065c50794529eaed8e74 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/terminal/xterm.js/LICENSE +sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 src/3rdparty/chromium/third_party/blink/renderer/devtools/front_end/audits2_worker/lighthouse/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/blink/renderer/devtools/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/devtools/scripts/closure/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/dtoa/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/blink/renderer/platform/testing/data/third_party/Roboto/LICENSE.txt +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2 +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-APPLE +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/blink/renderer/core/LICENSE-LGPL-2.1 +sha256 63478682e84e8c98f4c46308995f1f521a6886976e25421827d2a2be03581328 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/six/LICENSE +sha256 16a39991619e92f18680932da2a9199fdf7d95df3ecaedc52ea06218aabafd6f src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/third_party/html5lib/LICENSE +sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/tools/wptserve/LICENSE +sha256 4165ae4c9c71da3e655a9acee8ee3368bba20f0702f4dcc994da315132ab90de src/3rdparty/chromium/third_party/blink/tools/blinkpy/third_party/wpt/wpt/LICENSE.md +sha256 3bf128851aff9f392953276ea8ade3e41da0f40b853fde58ec21034aa91ccc31 src/3rdparty/chromium/third_party/libovr/LICENSE +sha256 efdabc1c1f655528b8c3a59b03668d446746d87273fab76f8af800b6e8891bd2 src/3rdparty/chromium/third_party/yara/src/COPYING +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE +sha256 5426333ff30d2ba9127bfe11ba51ca98be02d704ddac48afd19de47dc7748ee6 src/3rdparty/chromium/v8/LICENSE +sha256 b1b379fcaf3219593a4c433feb1b35c780bed23fafaae440b1ae2771a9521e3a src/3rdparty/chromium/v8/third_party/antlr4/LICENSE.txt +sha256 b9be92f13356083392d97da13cab8ae543c7911f44eff5289b693da8b17b9e08 src/3rdparty/chromium/v8/third_party/inspector_protocol/LICENSE +sha256 15137d6c822e3ab097093a33c3a39a9df699f373f6438867ad534ff60762a947 src/3rdparty/chromium/v8/third_party/colorama/LICENSE +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/LICENSE.fdlibm +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk +sha256 3f712e5fbdfdbd5ee7d9b8c8152580220df55de47f4eba2f26c95c4de19ad096 src/3rdparty/chromium/v8/src/third_party/utf8-decoder/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE +sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt +sha256 5d85142a5609ad177a2d7a2e7cae060b886b8b42f25c5b9803cf0cb5ee04ad2f src/3rdparty/gn/base/third_party/icu/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/gn/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/5.6.3/qt5webengine.hash b/package/qt5/qt5webengine/5.6.3/qt5webengine.hash new file mode 100644 index 0000000000..e59d8c57cc --- /dev/null +++ b/package/qt5/qt5webengine/5.6.3/qt5webengine.hash @@ -0,0 +1,258 @@ +# Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist +sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz + +# Locally calculated +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 +sha256 0dbe024961f6ab5c52689cbd036c977975d0d0f6a67ff97762d96cb819dd5652 LICENSE.GPL3-EXCEPT +sha256 245248009fd0af1725d183248380e476c1283383909358a13686606352bf2a17 LICENSE.GPLv3 +sha256 9ae1959e86bd49b9680f78e0b49d4e52ae88a3f234d497e175e42a7e8ed59216 LICENSE.LGPL3 + +# Locally calculated with: +# for i in $(find src/3rdparty/ -type f \( -iname 'license*' -o -iname 'copying*' -o -name 'APPLE_LICENSE' -o -name 'Copyright' -o -path '*/license_texts/*' -o -path '*/licenses/*' \) -a -not -name '*.cc' -not -name '*.py' -not -name '*.h' -not -name 'LICENSE.sha1' -not -name 'licensecheck.pl*' -not -name 'license.after' -not -name 'license.before') ; do echo -n "sha256 " ; sha256sum $i ; done +sha256 5a12a0c01bfcdbc90b550c9cd8bfc3e90e6be9c9bbfdb58bfb5daaf6817eb78f src/3rdparty/chromium/chrome/third_party/chromevox/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/chrome/third_party/chromevox/third_party/closure-library/LICENSE +sha256 891970cf216f708de2bfd77184b3e32d5cdba8dc4c3a75e60628c0375f5657e4 src/3rdparty/chromium/sdch/open-vcdiff/COPYING +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/mojo/public/LICENSE +sha256 18351de3d7e2dc469cc83e77d38a3e25d010251e34eb348bbd1a76275e313997 src/3rdparty/chromium/base/third_party/xdg_user_dirs/LICENSE +sha256 d55a403514532af12dc2fbfb2e41900090a5dd6c7c76c8e4d9b20bcc737eac35 src/3rdparty/chromium/base/third_party/nspr/LICENSE +sha256 538edc6f52c563cf06eca1bac8dd785ff60ef5a371a950265700d5d40386db6e src/3rdparty/chromium/base/third_party/symbolize/LICENSE +sha256 d04360743ae3338bb08ab2106b51e24309e3ca4b1c6b1186139531ade351b7e3 src/3rdparty/chromium/base/third_party/dmg_fp/LICENSE +sha256 4074881f47972aedda83940935bb1d03fa74a56f94445945ce80fe952eed6834 src/3rdparty/chromium/base/third_party/icu/LICENSE +sha256 c45766baef552c59eeb1fdfbbc690e52e4cd5b135dfd325f21bdfe8ddfe28ce6 src/3rdparty/chromium/base/third_party/xdg_mime/LICENSE +sha256 9ad1d4223b80349f3d3ab9cec92f93431b9da14a1b5d41de468ce054a28cf8aa src/3rdparty/chromium/base/third_party/libevent/LICENSE +sha256 79955cd80438f041387eb080f2675394e36a806b8b17eca63a4bc568d839509e src/3rdparty/chromium/base/third_party/valgrind/LICENSE +sha256 90b2201c340cee36b40a443f949d9eb416f0a0d204c32d350aff87fedeb67ae8 src/3rdparty/chromium/base/third_party/superfasthash/LICENSE +sha256 96e7ccbf8d17e319dd77c4ebd4965b64a820bbcc3142a2478fbf95af77417b6a src/3rdparty/chromium/base/third_party/dynamic_annotations/LICENSE +sha256 70eb89e4cb460d1b27173348c9f9fca5cf67c09d722ddaa07c5d0fcd6262a97e src/3rdparty/chromium/tools/gyp/LICENSE +sha256 845022e0c1db1abb41a6ba4cd3c4b674ec290f3359d9d3c78ae558d4c0ed9308 src/3rdparty/chromium/LICENSE +sha256 8338ce8d922bb4416ce3dd1e5680173332435e3f0755007ac7801ccd674fe682 src/3rdparty/chromium/third_party/opus/src/COPYING +sha256 7efb4989e0cd1b256229bdf2f09300c5d14e35db0e7476bfb87fac243498273d src/3rdparty/chromium/third_party/opus/src/LICENSE_PLEASE_READ.txt +sha256 5221a36a801b981fbdfda7b87db64cff231a3b88223a066c325411b539df796f src/3rdparty/chromium/third_party/snappy/src/COPYING +sha256 1df4adc57d45b1639d3edb2127ee9e33e54b5a4b0809e9dc83ddaff5a62d9ae1 src/3rdparty/chromium/third_party/x86inc/LICENSE +sha256 77af9c9fc2710ee66b8282291a9392a9a61f1d5b3ad6e478d0b6c544de5f9aca src/3rdparty/chromium/third_party/angle/LICENSE +sha256 a08ba10adec47027ef8078848729837b1c5a42f140718d7afd65c23f1eeec392 src/3rdparty/chromium/third_party/angle/src/third_party/compiler/LICENSE +sha256 d8a0f4dab052ff6f56e9d6fa68efb66de8ff3956a805110930f8ee297376047f src/3rdparty/chromium/third_party/angle/src/third_party/murmurhash/LICENSE +sha256 923e74e5ae41345038da0a56dfdc983356917fbbb139176e654d1b33100b723f src/3rdparty/chromium/third_party/jmake/LICENSE +sha256 984523ee987f4e8b72d61df37d8f1189a7077cd4b77e41a397e35593b297a29d src/3rdparty/chromium/third_party/ots/LICENSE +sha256 9dc0f229412e40d7f1fc4d94de07fcc812a6f31e27718b4dae315305408160fa src/3rdparty/chromium/third_party/yasm/source/patched-yasm/COPYING +sha256 294f58267c6f473c4ce7270bf5c8d34b2003cb43804552459654c36553431276 src/3rdparty/chromium/third_party/proguard/LICENSE +sha256 dd4930c619afd8527591353c7d3d1c1d7f4bf62ed1cb411f4f507dbdee7738a2 src/3rdparty/chromium/third_party/ply/LICENSE +sha256 685b3b09870f1361f8db2d3f37acdb765d5da1722a18b182765da4b79a8f63ff src/3rdparty/chromium/third_party/ply/license.patch +sha256 d51b39e7ed0391e75e0add75d1a162fdf4a0d6b49fba7635ed0ac4e16f324773 src/3rdparty/chromium/third_party/webdriver/COPYING +sha256 6d83e980b9b843cf6fe24cb94714d00f9b0cf69cb00d0e3b0bed018d49d6f24f src/3rdparty/chromium/third_party/webdriver/LICENSE +sha256 71a19392a0eb3255ab2055ed978bb0f93865cea84d31a3510eaffb74d8981e7f src/3rdparty/chromium/third_party/khronos/LICENSE +sha256 28d1d994f6f85ce2f605e214609a3a7925278039aa7a870b5cd089ef95b82445 src/3rdparty/chromium/third_party/iccjpeg/LICENSE +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/isimpledom/LICENSE +sha256 def7352915ac84bea5e2ed16f6fff712d35de519799777bf927e2a567ab53b7e src/3rdparty/chromium/third_party/boringssl/src/LICENSE +sha256 282644c64aa8c4f0a4a589fd38d2213e41f37b4e0e4f639e01149d09b67117db src/3rdparty/chromium/third_party/zlib/LICENSE +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/mojo/LICENSE +sha256 8defed37d52096ae14b60adc499c33d43975109bc265552ee67e9a888c634b93 src/3rdparty/chromium/third_party/libsrtp/srtp/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/errorprone/LICENSE +sha256 31c7505c31a1ea8557a5362cd69946dc9f5ee80fac8fa1d1b1531c08530497b0 src/3rdparty/chromium/third_party/protobuf/COPYING.txt +sha256 43452b94e6aa0c2d076ad25b87f580c11571689d52f3aa1a1f7bdcab31a0bd15 src/3rdparty/chromium/third_party/decklink/LICENSE +sha256 f8c8ccecdbb044fd6fa1a586c596a055fb2b14fb3e335d8ed282db58d80b7410 src/3rdparty/chromium/third_party/pyelftools/LICENSE +sha256 f8d0c347a0dcc6ebe1671640dfae8d2411b6ded892e06a6764f8208b218b2af4 src/3rdparty/chromium/third_party/pyelftools/elftools/construct/LICENSE +sha256 3d1d2669d0ba87069b5e202f106193c4eb0e140a2aead31dca9670a0581dd979 src/3rdparty/chromium/third_party/chaijs/LICENSE +sha256 1f194a987fa1dc60e4bcf5e04e0fc03fff8f2ee587c52136adb2cebb397250b8 src/3rdparty/chromium/third_party/mocha/LICENSE +sha256 2a886915de4f296cdae5ed67064f86dba01d0c55286d86e8487f2a5caaf40216 src/3rdparty/chromium/third_party/harfbuzz-ng/COPYING +sha256 1f04103e3a61b91343b3f9d2ed2cc8543062917e2cc7d52a739ffe6429ccaf61 src/3rdparty/chromium/third_party/skia/LICENSE +sha256 5366e97b4478f15a1e2fd7e6094337426597df28de50cd9fed3f2e7e87f1229e src/3rdparty/chromium/third_party/skia/third_party/etc1/LICENSE +sha256 99750e3fa5e132e1b93a56538ab9c585f8fc62b9e11ab62adec0cd3803315c70 src/3rdparty/chromium/third_party/skia/third_party/libpng/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/skia/platform_tools/android/third_party/ashmem/LICENSE +sha256 0eff14f27fd948e2382ef5751b9b6ed596fc59369260510bd9230d08f9404f3e src/3rdparty/chromium/third_party/talloc/LICENSE +sha256 6e3e0a978f1e136cb3efb89702f4314671581a0c70c9a52447669e00f7b129e8 src/3rdparty/chromium/third_party/lzma_sdk/LICENSE +sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 src/3rdparty/chromium/third_party/libexif/sources/COPYING +sha256 fa53711b25af4b9a9b8dadfea3cb38166ec4b96760c8d62b284055554537d9ef src/3rdparty/chromium/third_party/usrsctp/usrsctplib/LICENSE.md +sha256 7a4a31e05391919c05a996f09fc20ffc80c69af72cb3e69ac71b70c825fbdd1d src/3rdparty/chromium/third_party/usrsctp/LICENSE +sha256 6629d6edceffa9c68f4245b817137d2265fdab1e98068893420edb6689ccce9e src/3rdparty/chromium/third_party/usb_ids/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/woff2/LICENSE +sha256 c93465d6a75e6ade8785edb4ec125ece083ab0910ed0417b4ff346792ba0f851 src/3rdparty/chromium/third_party/mesa/LICENSE +sha256 e8800bd573e8f844a5b87cf43cc4d55767314b4e95a6092cf26ce9c6ed00b877 src/3rdparty/chromium/third_party/mesa/src/docs/COPYING +sha256 1efd6dec259877be94db3dbd005c93a5c94a73a492bd85eede6e14885e480e0e src/3rdparty/chromium/third_party/mesa/src/docs/license.html +sha256 704179825bb7c4600acbff3d1fcd95f1eb61b2c4a11b66bb150d7cefea8f6371 src/3rdparty/chromium/third_party/mesa/src/src/gallium/drivers/radeon/LICENSE.TXT +sha256 8c6db340475136df3c1201d458fa5755698eace76e510471ecc9d857d6083dac src/3rdparty/chromium/third_party/ijar/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/sfntly/src/java/COPYING +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/src/cpp/COPYING.txt +sha256 e320e0b6915c2a93dc7f6db28c014f223ae32de61f5033300db2b75d506daa1f src/3rdparty/chromium/third_party/sfntly/COPYING.txt +sha256 778a9c936b9fa24f3842b6071e3cc5c794d3f7cc6d6fddbf356b6f2202afb6a0 src/3rdparty/chromium/third_party/wayland/LICENSE +sha256 6eefcb023622a463168a5c20add95fd24a38c7482622a9254a23b99b7c153061 src/3rdparty/chromium/third_party/wayland/src/COPYING +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/chromium/third_party/webtreemap/src/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/webpagereplay/COPYING +sha256 ac611349a262c2ceab06cd7c4fa104b794986486d3898c4d234a0fbc49e9bf07 src/3rdparty/chromium/third_party/webpagereplay/third_party/dns/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/webpagereplay/third_party/ipaddr/COPYING +sha256 b3055a036e3bc37a1b9ff2b8316723d06df3997273aa9cb79223a85a48ad6dee src/3rdparty/chromium/third_party/webpagereplay/third_party/ipfw_win32/LICENSE +sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 src/3rdparty/chromium/third_party/v4l-utils/COPYING.libv4l +sha256 83bb6bd9ccd2cf5230cb1807ed16258289768dc4d9cb80069a814e04415a1275 src/3rdparty/chromium/third_party/minigbm/LICENSE +sha256 10054db83ace18e5a455749d0d247857ec50508cecda79a5abe66fe4778d7721 src/3rdparty/chromium/third_party/d3/src/LICENSE +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/libusb/src/COPYING +sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/LICENSE +sha256 df336397e09e764416fc33b555703b1cdddd3a0cfea8a013ad1cad565c8be2f5 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/wptserve/LICENSE +sha256 32b824d99c7e31f7035b6a9b39eac8e8205bfc54cf8573cfe830a367a8735161 src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/LICENSE +sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/mod_pywebsocket/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/COPYING +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/third_party/WebKit/Source/wtf/dtoa/LICENSE +sha256 c7bae4ff453a099c61e5906014d3644319181834a47db839696dca0a85a76378 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm_modes/LICENSE +sha256 2e97627cb278aa7556fb9e8817368302301a595b6c7582512b8d74c57b773652 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/acorn/LICENSE +sha256 c7bae4ff453a099c61e5906014d3644319181834a47db839696dca0a85a76378 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE +sha256 c6daa4e8737d15aa7140b4f7eb82b9d4829bd2fd27132c43e282203b9c67dfc4 src/3rdparty/chromium/third_party/WebKit/Source/devtools/front_end/cm/LICENSE_python +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/WebKit/Source/devtools/scripts/closure/COPYING +sha256 7555fa34bc131a75ca56d65c40cc1ea8f9515d23e353d4c15d58573a042f7805 src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2 +sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-APPLE +sha256 f2b3bd09663381deb99721109d22b47af1213bb43007a8b56a06c6375c8050ce src/3rdparty/chromium/third_party/WebKit/Source/core/LICENSE-LGPL-2.1 +sha256 7de3660b411bdcb1c690c0e0a907ed94626792a1b5139f1cedd3d919b968ecc8 src/3rdparty/chromium/third_party/WebKit/LICENSE +sha256 a661d10f8f194b1963a75bb4d308f17b078cc064624313a556902d89705f6876 src/3rdparty/chromium/third_party/WebKit/LICENSE_FOR_ABOUT_CREDITS +sha256 650cb519e09f781bf4fbd65fa6fc64449ea0d86d62d95172acdf5da74ca0eaf6 src/3rdparty/chromium/third_party/v4l2capture/LICENSE +sha256 e2fa3a3e38af6d7d0cb374883a89b3507fe3b053faef16485f37ff3c9d93a5d2 src/3rdparty/chromium/third_party/expat/files/COPYING +sha256 0518cf49c09398259d54fcfff0b5fd36456162c6439886660e53627b3073ef22 src/3rdparty/chromium/third_party/blanketjs/LICENSE +sha256 e9427cf6abc4eaeda0bcd094fca46af4067970079f426b65d5cbacb87bff6366 src/3rdparty/chromium/third_party/cros_system_api/LICENSE +sha256 7975c0027cfa5d08253fbb6ff4676acc38248bd5e046d0dbab3d810971e97970 src/3rdparty/chromium/third_party/jinja2/LICENSE +sha256 6dc0e068dcf3a5bc8e054205b85b7720e1d49265bbc64bf515d2cf79197df69a src/3rdparty/chromium/third_party/typ/LICENSE +sha256 eafd0d3fac93964d4274a2f99be928d41c167a925a9ddb8621ab9aee065f8fee src/3rdparty/chromium/third_party/flac/COPYING.Xiph +sha256 f45cc81b400a048b56c9edbd4c3317f7a8958463dfd55aa96f268ecfd6baa12c src/3rdparty/chromium/third_party/flac/COPYING.FDL +sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a src/3rdparty/chromium/third_party/flac/COPYING.LGPL +sha256 0b1975de0a048180c5ea7179be1a3e751e05f79d225ac4be6481141970527e69 src/3rdparty/chromium/third_party/flac/COPYING.GPL +sha256 3f6f1b520bc53e878ccbb698ad0bacef3752a5f4e4b50a26552bd70f60b40748 src/3rdparty/chromium/third_party/smhasher/LICENSE +sha256 0382f4433a2b1b0b5c0af8cc769de0c7302c1b663ea569e67c0b5452e374e142 src/3rdparty/chromium/third_party/libjingle/source/talk/COPYING +sha256 dea8cf0d3604b861d3a89dd1d193b02404414957b6ee7ab6ebeacf47daece976 src/3rdparty/chromium/third_party/libjingle/source/talk/LICENSE_THIRD_PARTY +sha256 09e8a9bcec8067104652c168685ab0931e7868f9c8284b66f5ae6edae5f1130b src/3rdparty/chromium/third_party/custom_tabs_client/LICENSE +sha256 8267348d5af1262c11d1a08de2f5afc77457755f1ac658627dd9acf71011d615 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/LICENSE +sha256 719d8fa235f2068e0ae6d6a7dceb0a7720d7840f0f0ebed29957989e6ded3cd8 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/x86inc/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/googletest/src/LICENSE +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libvpx_new/source/libvpx/third_party/libwebm/LICENSE.TXT +sha256 0acbdae3346bc7593c57471aaf47fb45326a26b3c29cfbbf8ce729d99a7e458a src/3rdparty/chromium/third_party/class-dump/LICENSE +sha256 9b17bd282aac6d5729c700c823ddaaa6fa0e048d88e321f46252646f28791752 src/3rdparty/chromium/third_party/py_trace_event/src/LICENSE +sha256 1af74cc402d50be09edd134ed5c31ade063fc0e7546670bc23ceeecc0004c142 src/3rdparty/chromium/third_party/safe_browsing/testing/LICENSE +sha256 fddff1da5115ebb2f735b31fd17bac3166bf0c67d941287dfd490a111bca1c52 src/3rdparty/chromium/third_party/appurify-python/LICENSE +sha256 19c9b910bec5a4f2c420747d1bf81e975ffdb1377ad91c5d9b1e8dd3e38f4c17 src/3rdparty/chromium/third_party/robolectric/licenses/extreme.indiana.edu.license.txt +sha256 5b6ac717e37db4f6d17bda7791f4ce3f99947aeb21e6e72b705aa3d1ee2de480 src/3rdparty/chromium/third_party/robolectric/licenses/pivotal.labs.license.txt +sha256 a7436c952fa2dc0701860cf4187d1e8e8e6de6720dec0ae9e0b641bc50eebced src/3rdparty/chromium/third_party/robolectric/licenses/javolution.license.txt +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/robolectric/LICENSE +sha256 246491bb21ec320b0396d218339305d8b7073c7cb94fa5adb77ebb9c84a87a0b src/3rdparty/chromium/third_party/freetype2/src/docs/LICENSE.TXT +sha256 19af539b1ec692ea9ccf71b6ea97d602bcf7187eab27b0ea806aea1cd10b0b13 src/3rdparty/chromium/third_party/libjpeg/LICENSE +sha256 dd5c1c9668512530fa5a96e4c29ac4033d70a7eeb0eed7a42fddb6dd794ebdbb src/3rdparty/chromium/third_party/openh264/src/LICENSE +sha256 d47e8390fb0d7ad4a18f26aedd6283c7ab6b5b4fabab536ccb4db7f9f6d90c08 src/3rdparty/chromium/third_party/modp_b64/LICENSE +sha256 8545f6c8d9497acf953ca93b9264032616e6430eb536e21142a381455c8085df src/3rdparty/chromium/third_party/drmemory/LICENSE +sha256 4f5753ce8acf3feafc758599058746d30bda07bc0d4cc3a6a1eb8e039fdba1dc src/3rdparty/chromium/third_party/dom_distiller_js/LICENSE +sha256 c71d239df91726fc519c6eb72d318ec65820627232b2f796219e87dcf35d0ab4 src/3rdparty/chromium/third_party/gif_player/LICENSE +sha256 bd2368428b63facfc9586d4be1bd6efb6abce76a9339ba058dd9f399f3efb3b4 src/3rdparty/chromium/third_party/speech-dispatcher/COPYING +sha256 0bbe88228fd63d20ec097f64e58d5a0a465123ae139140a18d406c60b48824b5 src/3rdparty/chromium/third_party/markupsafe/LICENSE +sha256 5fe714f37f27dcc5d59dee2601ac3e7fe1cf2e497e5fcdba00ddb9b1297f61cb src/3rdparty/chromium/third_party/libpng/LICENSE +sha256 d18e75f216f177d41304f5e94c2cba7d1bf9f8f8583a0777cceb5cca0c5ad137 src/3rdparty/chromium/third_party/icu/LICENSE +sha256 7d149647f825d89af1268d9a53ebb414af1354a1815e26f8e44ef99820ba21db src/3rdparty/chromium/third_party/icu/license.html +sha256 da7eabb7bafdf7d3ae5e9f223aa5bdc1eece45ac569dc21b3b037520b4464768 src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv3 +sha256 b634ab5640e258563c536e658cad87080553df6f34f62269a21d554844e58bfe src/3rdparty/chromium/third_party/ffmpeg/COPYING.LGPLv2.1 +sha256 b4c85cce2b772f27d83f4562c20787057dc6949fcecc820a82c1d2e7047e89c3 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/oggparse_ahlberg_rullgayrd_2005.txt +sha256 857d5f537af3aa164e7a27eda60147d34195e5781abe7b1d358d9fb01e222ae0 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/mips.txt +sha256 d9c904abd0ead61b3fbaef0a609285548076ff9c3f814cc1cf019c5d7150736d src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/full_lgpl.txt +sha256 a8579e3fc40c11ab147bc299257733eb749cd455010385f7c117f70d7aef24e4 src/3rdparty/chromium/third_party/ffmpeg/chromium/scripts/license_texts/jpeg.txt +sha256 cb77a08f3ee3deb5240a8b3d197436710621ee87f4f0fed03947f825e082fb28 src/3rdparty/chromium/third_party/ffmpeg/LICENSE.md +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 src/3rdparty/chromium/third_party/ffmpeg/COPYING.GPLv3 +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/checkstyle/LICENSE.apache20 +sha256 a190dc9c8043755d90f8b0a75fa66b9e42d4af4c980bf5ddc633f0124db3cee7 src/3rdparty/chromium/third_party/checkstyle/LICENSE +sha256 ef5b39dfcafe08323262e3f51a3a9de649978a55ed8ef8eef3c451f2c1e78a53 src/3rdparty/chromium/third_party/cld/LICENSE +sha256 984fb04a16a9f1e0145ffd891125dc366a01cd921f58c9b0369be400c720790d src/3rdparty/chromium/third_party/polymer/v1_0/components-chromium/polymer/LICENSE.txt +sha256 33c9a2fe619e1200937629f318895898ffcd1bf7d0ddd39adc382c030925e61e src/3rdparty/chromium/third_party/simplejson/LICENSE.txt +sha256 fab3dd6bdab226f1c08630b1dd917e11fcb4ec5e1e020e2c16f83a0a13863e85 src/3rdparty/chromium/third_party/nss/nspr/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/third_party/nss/nss/COPYING +sha256 e479bcdfa777738226b4282bf8536cc5416a25cec3100cbe210b8be4d1e2ed84 src/3rdparty/chromium/third_party/requests/LICENSE +sha256 5a2ed53cc5975569e9fa146c4245eaf53377dc1a88bdcb923da6487e53cba55e src/3rdparty/chromium/third_party/devscripts/COPYING +sha256 7a92c5e7a83b5ddcc693bb84ea8bdb842308509c1758cffdfe24717609154c75 src/3rdparty/chromium/third_party/mozilla/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/LICENSE +sha256 6040cda75d90b1738292a631d89934c411ef7ffd543c4d6a1b7edfc8edf29449 src/3rdparty/chromium/third_party/re2/src/LICENSE +sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 src/3rdparty/chromium/third_party/wayland-protocols/LICENSE +sha256 f1a2b233e8a9a71c40f4aa885be08a0842ac85bb8588703c1dd7e6e6502e3124 src/3rdparty/chromium/third_party/wayland-protocols/src/COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 src/3rdparty/chromium/third_party/libudev/LICENSE +sha256 a6cba85bc92e0cff7a450b1d873c0eaa2e9fc96bf472df0247a26bec77bf3ff9 src/3rdparty/chromium/third_party/closure_linter/LICENSE +sha256 5d0c892ea452c3828f1e311637cde4e3a04eb6431554308b3fcdac8c1b330168 src/3rdparty/chromium/third_party/fips181/COPYING +sha256 ad4672b403488876635d2b455918f74b829d478da868ffc0c621a00fc99195f5 src/3rdparty/chromium/third_party/tcmalloc/LICENSE +sha256 81ebf38708899097aacaac9723679b3ffa17640c14cd3193c46b75197de18b2c src/3rdparty/chromium/third_party/tcmalloc/vendor/COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/closure_compiler/compiler/COPYING +sha256 b23e682fda7310afe43505ed6041919ccff8f9e0c6799ebd7542cbcef11102e3 src/3rdparty/chromium/third_party/apple_apsl/LICENSE +sha256 e88ae39d2e7c9ae8f5470bb23fdd7ce55fe58aca06f3d4399182f5bb0ffcf1dd src/3rdparty/chromium/third_party/pyftpdlib/src/LICENSE +sha256 7c7f6dc97beb9eac776c285bee22a58b83aba1d26e1d4e949e509717b5124540 src/3rdparty/chromium/third_party/npapi/LICENSE +sha256 23681c6986fb33d57957660543f6e9dcbbcf6d2ae2f9fa2dbdb5efec5aa0d95f src/3rdparty/chromium/third_party/pywebsocket/src/LICENSE +sha256 7e48e290b6bfccc2ec1b297023a1d77f2fd87417f71fbb9f50aabef40a851819 src/3rdparty/chromium/third_party/libxslt/Copyright +sha256 2ab28b982a7f3150e1597befaa87e1636b9973c80aef3752597945d270c4c4e4 src/3rdparty/chromium/third_party/pycoverage/LICENSE +sha256 c5b14f5a3814d2e57b9bb9520dcf57a2c3817b65c4f989e5c82e332c82af1038 src/3rdparty/chromium/third_party/pymock/LICENSE.txt +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/motemplate/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/brotli/LICENSE +sha256 1e33ef99129bb6e84b6bb84e8c9edb4c6dba9f876bc16bc143cb9a136627cdeb src/3rdparty/chromium/third_party/hunspell/COPYING +sha256 93720ce4be6cca7dbfdd55f9cc9e1614865a4578b474612713fdbe06c3d34002 src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.hunspell +sha256 dcda061adeed22b26f276c01ec374f930789ae0d684e5aa8f8be309dd680ff20 src/3rdparty/chromium/third_party/hunspell/src/hunspell/license.myspell +sha256 5bbcbb737e60fe9deba08ecbd00920cfcc3403ba2e534c64fdeea49d6bb87509 src/3rdparty/chromium/third_party/hunspell/COPYING.LGPL +sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f src/3rdparty/chromium/third_party/hunspell/COPYING.MPL +sha256 ab00a482b6a3902e40211b43c5d0441962ea99b6cc7c25c0f243fa270b78d482 src/3rdparty/chromium/third_party/webrtc/LICENSE +sha256 21a742dd8cceebb1d5df7c6f945c75ccf1ad4f0d4c17e404517500c1a7de86a4 src/3rdparty/chromium/third_party/webrtc/examples/objc/AppRTCDemo/third_party/SocketRocket/LICENSE +sha256 0d542e0c8804e39aa7f37eb00da5a762149dc682d7829451287e11b938e94594 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE +sha256 26d2d16d48825edf1194cb3907c5c0b7d01f9c5527eb0fefb949c51f304635e9 src/3rdparty/chromium/third_party/webrtc/examples/androidapp/third_party/autobanh/LICENSE.md +sha256 2feb814384635271a0a43dec65955439a8b659ddf0a5adae5b5333264dc6518a src/3rdparty/chromium/third_party/webrtc/LICENSE_THIRD_PARTY +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/ub-uiautomator/LICENSE +sha256 31346421254a3e6e12687cf17f19f6357ee73a617fa7b3d3ccefdcbabe49bdd3 src/3rdparty/chromium/third_party/libXNVCtrl/LICENSE +sha256 610809f1586ee4d22468f1e97c256153cea8be7a662193db70d6ca424e0f17c8 src/3rdparty/chromium/third_party/iaccessible2/LICENSE +sha256 c903100da706172066fa1b6f02eba60f202fea63036492d2c4a01267e32aa7a8 src/3rdparty/chromium/third_party/qcms/src/COPYING +sha256 d415cefbadc3a8083475e30d8690a1103a2601226f725abf43a263c516345190 src/3rdparty/chromium/third_party/cardboard-java/LICENSE +sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 src/3rdparty/chromium/third_party/lcov/COPYING +sha256 9f98bab33648b77578d85ac0f1d1c3941a72aa6d7e65015ba181f2fe804bb85d src/3rdparty/chromium/third_party/pexpect/LICENSE +sha256 74ab31565472f8347d36849b6b330e5f741f6e2dff5d9147b93ba0a900a4a577 src/3rdparty/chromium/third_party/ocmock/License.txt +sha256 76c45ece83a26117f86f4e349e7df118708e061e87225328fb478ce1e8b3eb86 src/3rdparty/chromium/third_party/jsoncpp/LICENSE +sha256 a1a33180d02960ab1c5de36cf20b1a2f0fe9888d83826ad263da5db52f1b183b src/3rdparty/chromium/third_party/libsecret/LICENSE +sha256 1599cc232dbd003e6691c7f4e360f2068f84ebaef6510a26ab919c3a7fec27fd src/3rdparty/chromium/third_party/openmax_dl/LICENSE +sha256 956c3b678228a216142df38d039bba56ee6509d3298e7a4b8dd5bc3eaa80fe33 src/3rdparty/chromium/third_party/Python-Markdown/LICENSE.md +sha256 0cd682f22d04b97de1a6ce05c27c4ae5fddec1e330babc46f5f4f6c586c19f17 src/3rdparty/chromium/third_party/swiftshader/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/web-animations-js/sources/COPYING +sha256 ccc19f1da0798ed666609b65a5b44dd8b3abe6fc08b9c0592eb76e82e174db19 src/3rdparty/chromium/third_party/leveldatabase/src/LICENSE +sha256 f98f3db81b4dd3873d8672117e409286142cfae9b7673ab6d7aab4bae1527d20 src/3rdparty/chromium/third_party/qunit/LICENSE +sha256 0570fc4ebfee96ed20720ed8f2cd5b928930bdd7340dfdfa96bb00e8c4f89677 src/3rdparty/chromium/third_party/libjpeg_turbo/LICENSE.txt +sha256 b25948e48c44312d04ffc626a9d52cae7c04539a1a8e0c1be47b7bfa0da03e1d src/3rdparty/chromium/third_party/sinonjs/LICENSE +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/crashpad/crashpad/LICENSE +sha256 f40ee07401827b6ac9cf0aee1aaffb00e42a3f2c729f9c83f96a3daafef5d944 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/getopt/LICENSE +sha256 212846e0145aa50fb3a5aef254a370311a93acf6c1e792e47e0068d64c8c3885 src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cf/APPLE_LICENSE +sha256 e5881019d8766c1e88a5fe1dbca4ba40c78011d41fcb18f6e9f50df60182685b src/3rdparty/chromium/third_party/crashpad/crashpad/third_party/apple_cctools/cctools/APPLE_LICENSE +sha256 c69a473064e2246a3123066eaec702b454422b2701934187f0e433f773c57305 src/3rdparty/chromium/third_party/mt19937ar/LICENSE +sha256 f53f4201f4bd4b7a07b5e5830d89d75219211fa76214b761bcb181e5c95a56ce src/3rdparty/chromium/third_party/bintrees/LICENSE.txt +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/third_party/hwcplus/LICENSE +sha256 0af2a39b2cb31f540a1178f176367761751454779431be92a73a62f87df91440 src/3rdparty/chromium/third_party/bspatch/LICENSE +sha256 5f593432ef4e7ecefa6326042babb8a03d8d6ce502b4f0b78b105e18d19f8052 src/3rdparty/chromium/third_party/molokocacao/LICENSE +sha256 b244f73c3d21edaf44ec253b9a7c389ec43313c417f52f8b71914b0c40d87325 src/3rdparty/chromium/third_party/xdg-utils/LICENSE +sha256 7973776647df23457a9910075547e3f345fbc5e0e41147b4586d714582dfdd76 src/3rdparty/chromium/third_party/mach_override/LICENSE +sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 src/3rdparty/chromium/third_party/python_gflags/COPYING +sha256 06545a6ec25fbbff6c62f205f94a35be49e38f33bea827a8cfb07d7b82e4b083 src/3rdparty/chromium/third_party/sqlite/LICENSE +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/src/autoconf/tea/license.terms +sha256 66e056b6e8687f32af30d5187611b98b12a8f46f07aaf62f43585f276e8f0ac9 src/3rdparty/chromium/third_party/sqlite/sqlite-src-3080704/autoconf/tea/license.terms +sha256 c5c63674f8a83c4d2e385d96d1c670a03cb871ba2927755467017317878574bd src/3rdparty/chromium/third_party/libxml/src/Copyright +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 src/3rdparty/chromium/third_party/jstemplate/COPYING +sha256 5aec868f669e384a22372a4e8a1a6cd7d44c64cd451f960ca69cc170d1e13acf src/3rdparty/chromium/third_party/libwebm/source/LICENSE.TXT +sha256 380893a2f01aea5c3328b1a8b08cdc488bf236916abac3af0d1f1a5d2634c31a src/3rdparty/chromium/third_party/mockito/LICENSE +sha256 bb04dd22ee55fe3c24ee2a3c82bd1efdebbd965f7c178224a2977edc2457bb2f src/3rdparty/chromium/third_party/tlslite/LICENSE +sha256 6de6fe48ff7b249a51ec5522d1af618dd50effc6f030fd24e17878566ad2ca5d src/3rdparty/chromium/third_party/libwebp/LICENSE +sha256 c86a782ee845b52472dae9b9d79fb915d333628ac0efe49cdce63644814931de src/3rdparty/chromium/third_party/libva/COPYING +sha256 32ce83e370dc31db74f20d8bb0febbb5f61b099f0e0212587e81fdc11ae7fcbc src/3rdparty/chromium/third_party/gardiner_mod/LICENSE +sha256 e09d954054165670b6a669e6da59673d9e85f343b9983e92a220623ff0198f8c src/3rdparty/chromium/third_party/flot/LICENSE.txt +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/LICENSE +sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 src/3rdparty/chromium/third_party/fontconfig/src/COPYING +sha256 28113a6e9e2fd7584187c738a7c5484452a1c383307a1741bec50a73262fac08 src/3rdparty/chromium/third_party/sudden_motion_sensor/LICENSE +sha256 2b2cc1180c7e6988328ad2033b04b80117419db9c4c584918bbb3cfec7e9364f src/3rdparty/chromium/third_party/libyuv/LICENSE +sha256 90d1f3701813c3cd65eee2dc736746fe46b465918f3f7d6d31463a2018b33fa5 src/3rdparty/chromium/third_party/libyuv/third_party/gflags/LICENSE +sha256 d62df95ee2ada2637151bc125cadbe2703ef07ed5d9cbe163eaa53bda3949af4 src/3rdparty/chromium/third_party/libyuv/LICENSE_THIRD_PARTY +sha256 bed70fc84f1bea2b4b144564b9a0f9a5a3bc7b0d78f6e62092aeb689cac56bdd src/3rdparty/chromium/net/third_party/mozilla_security_manager/LICENSE +sha256 a20c1a32d1f8102432360b42e932869f7c11c7cdbacf9cac554c422132af47f4 src/3rdparty/chromium/net/third_party/nss/LICENSE +sha256 212c5a071f61512786b5e5840b3d70c85e017f3f82939ad4d4a870fc48b33477 src/3rdparty/chromium/LICENSE.chromium_os +sha256 7a209dd1b94cabdb5ea9c6f9164b9546ffa5daaa671e7767d49510db055f5c51 src/3rdparty/chromium/buildtools/LICENSE +sha256 dd6019aa7edc5b25a220306cd480da21c206964f86b30d08b8db8e4659b65c58 src/3rdparty/chromium/crypto/third_party/nss/LICENSE +sha256 834ee20e8fc3235722ed801bae30cc539c2775be656ff9cc2810fe674e53d5ec src/3rdparty/chromium/ppapi/LICENSE +sha256 2337a9caeb13854242af8d0022f8e57389e5eae56fa3bf7887f5f38492b57199 src/3rdparty/chromium/v8/LICENSE +sha256 6a585a9f466654abc8fc0829d56b1bc987e3a073d31faa03bba37d33640a23cd src/3rdparty/chromium/v8/LICENSE.strongtalk +sha256 e7115e18444dae09d17f361ddc365fb1d342640fe500796209c63f7c80dfae10 src/3rdparty/chromium/v8/src/third_party/fdlibm/LICENSE +sha256 ebf25b8ce59c9e8883acd1ca75b6fc121937ca034f666c4077d2be739d2e1622 src/3rdparty/chromium/v8/src/third_party/valgrind/LICENSE +sha256 cfe7599e45f340a35b4635090382897ca1526bc49b5e1889047f0168d131c415 src/3rdparty/chromium/v8/src/third_party/vtune/LICENSE +sha256 cae8c00ca6e90a682c321ec11e7a5a345d0d317aa0b8f038e03ef03a18095b2f src/3rdparty/chromium/v8/LICENSE.valgrind +sha256 4af93c12062c58058378de2397dc1c92bbff9ddfb1d583a01c84127557ce97ca src/3rdparty/chromium/v8/LICENSE.v8 +sha256 284545e873c704952e5b1b39d457dd83a3b115a51d9f1eb5175137bd69b8fa1b src/3rdparty/chromium/url/third_party/mozilla/LICENSE.txt +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/testing/gmock/LICENSE +sha256 5e0df8c845c742e76f2f64d2d9ce1b7e74a2422fddbc577ae6a56319083de0bf src/3rdparty/chromium/testing/gmock/scripts/generator/LICENSE +sha256 9702de7e4117a8e2b20dafab11ffda58c198aede066406496bef670d40a22138 src/3rdparty/chromium/testing/gtest/LICENSE +sha256 eb7e9ab9690124c5c9f42bdc81383d886a3dede26345b6ed15bbad7caf81f7ea src/3rdparty/ninja/COPYING diff --git a/package/qt5/qt5webengine/qt5webengine.hash b/package/qt5/qt5webengine/qt5webengine.hash deleted file mode 100644 index 4cbc1ce4fb..0000000000 --- a/package/qt5/qt5webengine/qt5webengine.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebengine-opensource-src-5.6.3.tar.xz.mirrorlist -sha256 009d69fb39f6c0e2b0cd89a7e9302cd0ae1872d02c787d3a37f2cacca5ddb7a7 qtwebengine-opensource-src-5.6.3.tar.xz - -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwebengine-everywhere-src-5.12.1.tar.xz.sha256 -sha256 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0 qtwebengine-everywhere-src-5.12.1.tar.xz From aea834155589464a118a426212d81c6c34504769 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Feb 2019 17:29:15 +0100 Subject: [PATCH 0058/7482] package/ipmiutil: bump to version 3.1.3 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ipmiutil/ipmiutil.hash | 6 +++--- package/ipmiutil/ipmiutil.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/ipmiutil/ipmiutil.hash b/package/ipmiutil/ipmiutil.hash index e09511f96f..3f89b9049c 100644 --- a/package/ipmiutil/ipmiutil.hash +++ b/package/ipmiutil/ipmiutil.hash @@ -1,6 +1,6 @@ # From https://sourceforge.net/projects/ipmiutil/files/ -md5 ee90387f8a14dea3f867167865c7c968 ipmiutil-3.1.2.tar.gz -sha1 9453db110bffab3111d6ff4047243a34084e5878 ipmiutil-3.1.2.tar.gz +md5 0d448d14726e2fda0eb9451fb2866a5c ipmiutil-3.1.3.tar.gz +sha1 d20cb3194f4c5cb8c9fd64b3693d5b53dc9510d4 ipmiutil-3.1.3.tar.gz # Locally computed -sha256 768053b3e3adfe1bf656e2848b2805ede87e429c10d282929a7c4ceeebc24703 ipmiutil-3.1.2.tar.gz +sha256 b80303b6f05cbe48e728dd925fef201e9604a90cd3fc9c8af113367e8d6dbe57 ipmiutil-3.1.3.tar.gz sha256 7e0ec8238aa1431e95a4950032a4483fe33fec3fac348eaade5856cdc5ae3e39 COPYING diff --git a/package/ipmiutil/ipmiutil.mk b/package/ipmiutil/ipmiutil.mk index 5d8c45665d..50c90638a6 100644 --- a/package/ipmiutil/ipmiutil.mk +++ b/package/ipmiutil/ipmiutil.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPMIUTIL_VERSION = 3.1.2 +IPMIUTIL_VERSION = 3.1.3 IPMIUTIL_SITE = https://sourceforge.net/projects/ipmiutil/files IPMIUTIL_LICENSE = BSD-3-Clause IPMIUTIL_LICENSE_FILES = COPYING From db710397afd052e3aebbd00ba11e777475c15d83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Blanc?= Date: Sat, 16 Feb 2019 01:15:59 +0100 Subject: [PATCH 0059/7482] package/flatbuffers: bump to version 1.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michaël Blanc Signed-off-by: Thomas Petazzoni --- package/flatbuffers/flatbuffers.hash | 2 +- package/flatbuffers/flatbuffers.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/flatbuffers/flatbuffers.hash b/package/flatbuffers/flatbuffers.hash index a8f23f4ef9..7afe849cd7 100644 --- a/package/flatbuffers/flatbuffers.hash +++ b/package/flatbuffers/flatbuffers.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 5ca5491e4260cacae30f1a5786d109230db3f3a6e5a0eb45d0d0608293d247e3 flatbuffers-v1.9.0.tar.gz +sha256 3714e3db8c51e43028e10ad7adffb9a36fc4aa5b1a363c2d0c4303dd1be59a7c flatbuffers-v1.10.0.tar.gz sha256 7ec9661a8afafab1eee3523d6f1a193eff76314a5ab10b4ce96aefd87621b0c3 LICENSE.txt diff --git a/package/flatbuffers/flatbuffers.mk b/package/flatbuffers/flatbuffers.mk index 26d9307892..69054885ea 100644 --- a/package/flatbuffers/flatbuffers.mk +++ b/package/flatbuffers/flatbuffers.mk @@ -4,7 +4,7 @@ # ################################################################################ -FLATBUFFERS_VERSION = v1.9.0 +FLATBUFFERS_VERSION = v1.10.0 FLATBUFFERS_SITE = $(call github,google,flatbuffers,$(FLATBUFFERS_VERSION)) FLATBUFFERS_LICENSE = Apache-2.0 FLATBUFFERS_LICENSE_FILES = LICENSE.txt From 109e5c83dc9c05412cfc6139f2846268f73d76e5 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Mon, 25 Feb 2019 12:10:22 +0100 Subject: [PATCH 0060/7482] package/imagemagick: bump to version 7.0.8-27 This patch bumps imagemagick to version 7.0.8-27 Hash for license file is changed becasue the updated the copyright year for 2019: https://github.com/ImageMagick/ImageMagick/commit/252dd2c52bcc591ccd673abdbb70113b42388150 Signed-off-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/imagemagick/imagemagick.hash | 4 ++-- package/imagemagick/imagemagick.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/imagemagick/imagemagick.hash b/package/imagemagick/imagemagick.hash index 9d5a39567e..09bfb2a2e9 100644 --- a/package/imagemagick/imagemagick.hash +++ b/package/imagemagick/imagemagick.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 e7c1b19923bb97ed456c78b63b3259b809ebc8e3967c6d086450370c67eedf06 7.0.7-39.tar.gz -sha256 2318cc05bbd2c25c1b2d13af1aadccc45b9cf6f94757421ae59a3c8ea9064f1c LICENSE +sha256 94866968a447f8f92a969bf5342d612d05a64c71fc75e63bb2d8ecf887dc7fa2 7.0.8-27.tar.gz +sha256 5b47db932754743460eba7a226aea85b63e3408d3c7affb4d0117f70c9594ded LICENSE diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 7678980582..b5d0d56284 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMAGEMAGICK_VERSION = 7.0.7-39 +IMAGEMAGICK_VERSION = 7.0.8-27 IMAGEMAGICK_SOURCE = $(IMAGEMAGICK_VERSION).tar.gz IMAGEMAGICK_SITE = https://github.com/ImageMagick/ImageMagick/archive IMAGEMAGICK_LICENSE = Apache-2.0 From 3095ba1a2b9660ec629634797d27a330468bbc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= Date: Mon, 25 Feb 2019 22:23:59 +0100 Subject: [PATCH 0061/7482] package/imx-mkimage: add patch to satisfy unused version generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: http://autobuild.buildroot.net/results/1973d39b113c37e65c35f1f0a56354f192ae02d7 Signed-off-by: André Hentschel Signed-off-by: Thomas Petazzoni --- .../0003-Add-unused-fake-version.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/imx-mkimage/0003-Add-unused-fake-version.patch diff --git a/package/imx-mkimage/0003-Add-unused-fake-version.patch b/package/imx-mkimage/0003-Add-unused-fake-version.patch new file mode 100644 index 0000000000..9652a817ba --- /dev/null +++ b/package/imx-mkimage/0003-Add-unused-fake-version.patch @@ -0,0 +1,33 @@ +From e75feef80b51c9060e3702390040495312648ad2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Hentschel?= +Date: Mon, 25 Feb 2019 22:15:55 +0100 +Subject: [PATCH] Add unused fake version + +The Makefile makes the assumption that the build process runs +from a Git clone of the source code. +We can safely add a fake version here, because the code to +print it is broken anyway. + +Signed-off-by: André Hentschel +--- + Makefile | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/Makefile b/Makefile +index ccf42e8..6041574 100644 +--- a/Makefile ++++ b/Makefile +@@ -37,9 +37,7 @@ $(MKIMG): src/build_info.h $(SRCS) + bin: $(MKIMG) + + src/build_info.h: +- @echo -n '#define MKIMAGE_COMMIT 0x' > src/build_info.h +- @git rev-parse --short=8 HEAD >> src/build_info.h +- @echo '' >> src/build_info.h ++ @echo '#define MKIMAGE_COMMIT 0xdeadbeef' > src/build_info.h + + help: + @echo $(CURR_DIR) +-- +2.17.1 + From 48b38a2cda7b33e746a5d1c8d6c7b5a5b795ff85 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 27 Feb 2019 18:43:09 +0100 Subject: [PATCH 0062/7482] package/qemu: add riscv emulation on host variant RISC-V support was added in qemu 2.12. This target emulation in host qemu can now be enabled. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- package/qemu/Config.in.host | 1 + 1 file changed, 1 insertion(+) diff --git a/package/qemu/Config.in.host b/package/qemu/Config.in.host index f99f3e05cf..8a0df38fb8 100644 --- a/package/qemu/Config.in.host +++ b/package/qemu/Config.in.host @@ -12,6 +12,7 @@ config BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS default y if BR2_powerpc default y if BR2_powerpc64 default y if BR2_powerpc64le + default y if BR2_riscv default y if BR2_sh default y if BR2_sparc default y if BR2_x86_64 From 2e02e59a74148109643b5f7f2f66b4a0bb8d3d15 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Fri, 1 Mar 2019 20:44:33 +0200 Subject: [PATCH 0063/7482] package/python-lxml: bump to version 4.3.2 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-lxml/python-lxml.hash | 2 +- package/python-lxml/python-lxml.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/python-lxml/python-lxml.hash b/package/python-lxml/python-lxml.hash index 19c30f3ac6..46fd8d43b5 100644 --- a/package/python-lxml/python-lxml.hash +++ b/package/python-lxml/python-lxml.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 da5e7e941d6e71c9c9a717c93725cda0708c2474f532e3680ac5e39ec57d224d lxml-4.3.1.tar.gz +sha256 3a9d8521c89bf6f2a929c3d12ad3ad7392c774c327ea809fd08a13be6b3bc05f lxml-4.3.2.tar.gz sha256 41d49dd406aa0e1548a6d5f21a30d6bf638b3cd96eb7289dd348d83ed2e40392 LICENSES.txt sha256 69edb445c1335a8312d4c09271847e9956d84f0d9f724d125340cc3fad767b2a doc/licenses/BSD.txt sha256 0497ae8138811ef4466ede653bab7a59feb3d3c14f9ed50fc33a00aeb5bec32e doc/licenses/elementtree.txt diff --git a/package/python-lxml/python-lxml.mk b/package/python-lxml/python-lxml.mk index 29c77dd351..56da41b761 100644 --- a/package/python-lxml/python-lxml.mk +++ b/package/python-lxml/python-lxml.mk @@ -4,8 +4,8 @@ # ################################################################################ -PYTHON_LXML_VERSION = 4.3.1 -PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/0f/bd/bb1464d1f363dbd805862c8a1ea258b9a4f4d2049c376d1c4790b6545691 +PYTHON_LXML_VERSION = 4.3.2 +PYTHON_LXML_SITE = https://files.pythonhosted.org/packages/65/6f/d070609b415f4a24bf36b7deb94bfd791e8d023c0dbf4233659af53fe0ab PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tar.gz # Not including the GPL, because it is used only for the test scripts. From e675e9a0473f39b60ab66d94a61ac9c077ed438f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?DUPONCHEEL=20S=C3=A9bastien?= Date: Fri, 1 Mar 2019 12:30:23 +0100 Subject: [PATCH 0064/7482] package/shadowsocks-libev: bump to version 3.2.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch can be removed, as it has been applied upstream: https://github.com/shadowsocks/shadowsocks-libev/commit/9b4aebc840f444e5aa83633838e3890cec523017 And because the patch is removed, we can drop AUTORECONF = YES. Signed-off-by: DUPONCHEEL Sébastien [Thomas: extend commit log] Signed-off-by: Thomas Petazzoni --- ...-static-build-with-netfilter_conntra.patch | 31 ------------------- .../shadowsocks-libev/shadowsocks-libev.hash | 2 +- .../shadowsocks-libev/shadowsocks-libev.mk | 4 +-- 3 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch diff --git a/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch b/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch deleted file mode 100644 index 7ddb140e8d..0000000000 --- a/package/shadowsocks-libev/0001-configure.ac-fix-static-build-with-netfilter_conntra.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9b4aebc840f444e5aa83633838e3890cec523017 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 18 Jan 2019 21:05:34 +0100 -Subject: [PATCH] configure.ac: fix static build with netfilter_conntrack - -Fixes: - - http://autobuild.buildroot.org/results/22a28e8fd8182e1c908541dbc5b0ee087c3803e6 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://github.com/shadowsocks/shadowsocks-libev/pull/2270] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a706591..c6dab8b 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -256,7 +256,7 @@ if test x"$enable_connmarktos" = "xyes" ; then - if test x"$enable_connmarktos" = "xyes"; then - AC_MSG_ERROR([--enable-connmarktos specified but libnetfilter-conntrack library not found]) - fi -- with_netfilter_conntrack=no]) -+ with_netfilter_conntrack=no], [-lnfnetlink]) - AC_CHECK_HEADERS([libnetfilter_conntrack/libnetfilter_conntrack.h \ - libnetfilter_conntrack/libnetfilter_conntrack_tcp.h],,[ - if test x"$enable_connmarktos" = "xyes"; then --- -2.14.1 - diff --git a/package/shadowsocks-libev/shadowsocks-libev.hash b/package/shadowsocks-libev/shadowsocks-libev.hash index a7c0dc0710..b8bc4379a9 100644 --- a/package/shadowsocks-libev/shadowsocks-libev.hash +++ b/package/shadowsocks-libev/shadowsocks-libev.hash @@ -1,5 +1,5 @@ # Locally computed -sha256 2befc27b1cc62af0450702343d17e347936f0d4e3d4b04ba9246c4f9b409b742 shadowsocks-libev-3.2.3.tar.gz +sha256 65a67c355df1794dc0ef94d80d2d596fd590b13fdcd0a21bda28859c88924ce5 shadowsocks-libev-3.2.4.tar.gz # License files, locally calculated sha256 736883f97d44dbec288bb82819f18f4f86d02ae3192f6a9abefa00db76bace41 COPYING diff --git a/package/shadowsocks-libev/shadowsocks-libev.mk b/package/shadowsocks-libev/shadowsocks-libev.mk index c2c33b7aa5..fcebe34a4b 100644 --- a/package/shadowsocks-libev/shadowsocks-libev.mk +++ b/package/shadowsocks-libev/shadowsocks-libev.mk @@ -4,14 +4,12 @@ # ################################################################################ -SHADOWSOCKS_LIBEV_VERSION = 3.2.3 +SHADOWSOCKS_LIBEV_VERSION = 3.2.4 SHADOWSOCKS_LIBEV_SITE = https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(SHADOWSOCKS_LIBEV_VERSION) SHADOWSOCKS_LIBEV_LICENSE = GPL-3.0+, BSD-2-Clause (libbloom), BSD-3-Clause (libcork, libipset) SHADOWSOCKS_LIBEV_LICENSE_FILES = COPYING libbloom/LICENSE libcork/COPYING SHADOWSOCKS_LIBEV_DEPENDENCIES = host-pkgconf c-ares libev libsodium mbedtls pcre SHADOWSOCKS_LIBEV_INSTALL_STAGING = YES -# We're patching configure.ac -SHADOWSOCKS_LIBEV_AUTORECONF = YES SHADOWSOCKS_LIBEV_CONF_OPTS = \ --with-pcre=$(STAGING_DIR)/usr \ --disable-ssp From caa1359da5676bd45e758467d474864934eb4904 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Mon, 4 Mar 2019 23:35:43 +0100 Subject: [PATCH 0065/7482] docs/website/news.html: add 2019.02 announcement lin Signed-off-by: Peter Korsgaard --- docs/website/news.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/website/news.html b/docs/website/news.html index 6fe12c708a..20be2e77bd 100644 --- a/docs/website/news.html +++ b/docs/website/news.html @@ -20,7 +20,8 @@

The stable 2019.02 release is out - Thanks to everyone contributing and testing the release candidates. See the CHANGES - file for more details + file for more details, read the + announcement and go to the downloads page to pick up the 2019.02 release.

From d29ec62899ed7fafefd0a3fddee61683648421fa Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 5 Mar 2019 10:03:32 +0100 Subject: [PATCH 0066/7482] Kickoff 2019.05 cycle Signed-off-by: Peter Korsgaard --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2b91d40919..a64196f9c3 100644 --- a/Makefile +++ b/Makefile @@ -92,7 +92,7 @@ all: .PHONY: all # Set and export the version string -export BR2_VERSION := 2019.02 +export BR2_VERSION := 2019.05-git # Actual time the release is cut (for reproducible builds) BR2_VERSION_EPOCH = 1551735000 From 7edb1e1c29a86df017586ca31952ffb9386014c5 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Feb 2019 20:26:08 +0100 Subject: [PATCH 0067/7482] package/flashrom: remove dmidecode dependency flashrom uses its own internal DMI decoder since version 0.9.8 and https://github.com/flashrom/flashrom/commit/4c6d3a4b732732eb20bfb0fc9d857abaa4c41c88 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/flashrom/Config.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index e7844a0a62..8f26a634e6 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -6,8 +6,6 @@ config BR2_PACKAGE_FLASHROM select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT select BR2_PACKAGE_LIBFTDI - # dmidecode is only a runtime dependency - select BR2_PACKAGE_DMIDECODE help flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash From f317411f3391451f0815c8d4f2f95ed1b14770a6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Feb 2019 20:26:09 +0100 Subject: [PATCH 0068/7482] package/flashrom: pciutils is optional, not mandatory Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/flashrom/Config.in | 1 - package/flashrom/flashrom.mk | 12 ++++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index 8f26a634e6..66fe359724 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_FLASHROM bool "flashrom" depends on BR2_i386 || BR2_x86_64 depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_PCIUTILS select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT select BR2_PACKAGE_LIBFTDI diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 70f47b5a04..73d56f7f80 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -7,13 +7,21 @@ FLASHROM_VERSION = 1.0 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases -FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf +FLASHROM_DEPENDENCIES = libusb libusb-compat libftdi host-pkgconf FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_PCIUTILS),y) +FLASHROM_DEPENDENCIES += pciutils +FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes +else +FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no +endif + define FLASHROM_BUILD_CMDS $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" -C $(@D) + CFLAGS="$(TARGET_CFLAGS) -DHAVE_STRNLEN" \ + $(FLASHROM_MAKE_OPTS) -C $(@D) endef define FLASHROM_INSTALL_TARGET_CMDS From 13121a1daa0de24934c2e53adeab919d60e317f3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Feb 2019 20:26:10 +0100 Subject: [PATCH 0069/7482] package/flashrom: libftdi is optional, not mandatory Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/flashrom/Config.in | 1 - package/flashrom/flashrom.mk | 13 ++++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index 66fe359724..0a5a7248e1 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -4,7 +4,6 @@ config BR2_PACKAGE_FLASHROM depends on BR2_TOOLCHAIN_HAS_THREADS # libusb select BR2_PACKAGE_LIBUSB select BR2_PACKAGE_LIBUSB_COMPAT - select BR2_PACKAGE_LIBFTDI help flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 73d56f7f80..40198bac60 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -7,10 +7,21 @@ FLASHROM_VERSION = 1.0 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases -FLASHROM_DEPENDENCIES = libusb libusb-compat libftdi host-pkgconf +FLASHROM_DEPENDENCIES = libusb libusb-compat host-pkgconf FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING +ifeq ($(BR2_PACKAGE_LIBFTDI),y) +FLASHROM_DEPENDENCIES += host-pkgconf libftdi +FLASHROM_MAKE_OPTS += \ + CONFIG_FT2232_SPI=yes \ + CONFIG_USBBLASTER_SPI=yes +else +FLASHROM_MAKE_OPTS += \ + CONFIG_FT2232_SPI=no \ + CONFIG_USBBLASTER_SPI=no +endif + ifeq ($(BR2_PACKAGE_PCIUTILS),y) FLASHROM_DEPENDENCIES += pciutils FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes From b36054fc7ca55b73fa09d68b239b45d0e30364e9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Feb 2019 20:26:11 +0100 Subject: [PATCH 0070/7482] package/flashrom: libusb-compat is optional, not mandatory Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/flashrom/Config.in | 1 - package/flashrom/flashrom.mk | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index 0a5a7248e1..1edf162d31 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_FLASHROM depends on BR2_i386 || BR2_x86_64 depends on BR2_TOOLCHAIN_HAS_THREADS # libusb select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT help flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 40198bac60..69a0cbfe5c 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -7,7 +7,7 @@ FLASHROM_VERSION = 1.0 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases -FLASHROM_DEPENDENCIES = libusb libusb-compat host-pkgconf +FLASHROM_DEPENDENCIES = libusb host-pkgconf FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING @@ -22,6 +22,13 @@ FLASHROM_MAKE_OPTS += \ CONFIG_USBBLASTER_SPI=no endif +ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) +FLASHROM_DEPENDENCIES += host-pkgconf libusb-compat +FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=yes +else +FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=no +endif + ifeq ($(BR2_PACKAGE_PCIUTILS),y) FLASHROM_DEPENDENCIES += pciutils FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBPCI_PROGRAMMERS=yes From 276ddad9f4efe275af3887cd30ac1432f7e96a68 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Feb 2019 20:26:12 +0100 Subject: [PATCH 0071/7482] package/flashrom: libusb is optional, not mandatory Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/flashrom/Config.in | 6 ------ package/flashrom/flashrom.mk | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index 1edf162d31..f787bb3b62 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -1,8 +1,6 @@ config BR2_PACKAGE_FLASHROM bool "flashrom" depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB help flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash @@ -11,7 +9,3 @@ config BR2_PACKAGE_FLASHROM programmer devices. http://flashrom.org/ - -comment "flashrom needs a toolchain w/ threads" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/flashrom/flashrom.mk b/package/flashrom/flashrom.mk index 69a0cbfe5c..733ad7318d 100644 --- a/package/flashrom/flashrom.mk +++ b/package/flashrom/flashrom.mk @@ -7,7 +7,6 @@ FLASHROM_VERSION = 1.0 FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 FLASHROM_SITE = https://download.flashrom.org/releases -FLASHROM_DEPENDENCIES = libusb host-pkgconf FLASHROM_LICENSE = GPL-2.0+ FLASHROM_LICENSE_FILES = COPYING @@ -22,6 +21,13 @@ FLASHROM_MAKE_OPTS += \ CONFIG_USBBLASTER_SPI=no endif +ifeq ($(BR2_PACKAGE_LIBUSB),y) +FLASHROM_DEPENDENCIES += host-pkgconf libusb +FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=yes +else +FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB1_PROGRAMMERS=no +endif + ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) FLASHROM_DEPENDENCIES += host-pkgconf libusb-compat FLASHROM_MAKE_OPTS += CONFIG_ENABLE_LIBUSB0_PROGRAMMERS=yes From c125d445b018cca576c8ab1c20244116f434ee30 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 28 Feb 2019 20:26:13 +0100 Subject: [PATCH 0072/7482] package/flashrom: remove x86 dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/flashrom/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index f787bb3b62..948c774133 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_FLASHROM bool "flashrom" - depends on BR2_i386 || BR2_x86_64 help flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash From ca34a3ed25a3e215de1cc268d08cfecfa1dee096 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Fri, 1 Mar 2019 17:47:05 +0100 Subject: [PATCH 0073/7482] boot/optee-os: define a new variable OPTEE_OS_SDK This commit adds a new variable OPTEE_OS_SDK, define by the optee-os package, which points to the OPTEE SDK installed in STAGING_DIR. This will allow other pakage to find this SDK more easily. Signed-off-by: Etienne Carriere [Thomas: improve commit log, rename variable to just OPTEE_OS_SDK] Signed-off-by: Thomas Petazzoni --- boot/optee-os/optee-os.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/boot/optee-os/optee-os.mk b/boot/optee-os/optee-os.mk index aeac067309..6da20a9f3e 100644 --- a/boot/optee-os/optee-os.mk +++ b/boot/optee-os/optee-os.mk @@ -55,9 +55,11 @@ OPTEE_OS_MAKE_OPTS += $(call qstrip,$(BR2_TARGET_OPTEE_OS_ADDITIONAL_VARIABLES)) OPTEE_OS_BUILDDIR_OUT = out ifeq ($(BR2_aarch64),y) OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm64 +OPTEE_OS_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 endif ifeq ($(BR2_arm),y) OPTEE_OS_LOCAL_SDK = $(OPTEE_OS_BUILDDIR_OUT)/export-ta_arm32 +OPTEE_OS_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 endif ifeq ($(BR2_TARGET_OPTEE_OS_CORE),y) @@ -86,8 +88,8 @@ define OPTEE_OS_BUILD_SDK $(TARGET_CONFIGURE_OPTS) $(OPTEE_OS_MAKE_OPTS) ta_dev_kit endef define OPTEE_OS_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/lib/optee - cp -ardpf $(@D)/$(OPTEE_OS_LOCAL_SDK) $(STAGING_DIR)/lib/optee + mkdir -p $(OPTEE_OS_SDK) + cp -ardpf $(@D)/$(OPTEE_OS_LOCAL_SDK)/* $(OPTEE_OS_SDK) endef endif # BR2_TARGET_OPTEE_OS_SDK From 259ba88cadf43d3c7a1d9ece6d64ef7407721903 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Fri, 1 Mar 2019 17:47:06 +0100 Subject: [PATCH 0074/7482] package/optee-test: use the OPTEE_OS_SDK variable The optee-os package was recently changed to provide the OPTEE_OS_SDK to allow other packages to locate the OP-TEE Trusted Application SDK, so let's use this new variable in the optee-test package. Signed-off-by: Etienne Carriere [Thomas: use the new variable name, rework commit log] Signed-off-by: Thomas Petazzoni --- package/optee-test/optee-test.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 1ab6bf4fec..73accf3d1e 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -11,12 +11,7 @@ OPTEE_TEST_LICENSE_FILES = LICENSE.md OPTEE_TEST_DEPENDENCIES = optee-client optee-os -ifeq ($(BR2_aarch64),y) -OPTEE_TEST_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 -else ifeq ($(BR2_arm),y) -OPTEE_TEST_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 -endif -OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_TEST_SDK) +OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK) # Trusted Application are not built from CMake due to ta_dev_kit # dependencies. We must build and install them on target. @@ -24,7 +19,7 @@ define OPTEE_TEST_BUILD_TAS $(foreach f,$(wildcard $(@D)/ta/*/Makefile), \ $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ - TA_DEV_KIT_DIR=$(OPTEE_TEST_SDK) \ + TA_DEV_KIT_DIR=$(OPTEE_OS_SDK) \ -C $(dir $f) all ) endef From 24ac0fef4a7379475025616bc98dea6063a93dc2 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Fri, 1 Mar 2019 17:47:07 +0100 Subject: [PATCH 0075/7482] package/optee-examples: use the OPTEE_OS_SDK variable The optee-os package was recently changed to provide the OPTEE_OS_SDK to allow other packages to locate the OP-TEE Trusted Application SDK, so let's use this new variable in the optee-examples package. Signed-off-by: Etienne Carriere [Thomas: use the new variable name, rework commit log] Signed-off-by: Thomas Petazzoni --- package/optee-examples/optee-examples.mk | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/package/optee-examples/optee-examples.mk b/package/optee-examples/optee-examples.mk index 10fe62b72a..f2163b8643 100644 --- a/package/optee-examples/optee-examples.mk +++ b/package/optee-examples/optee-examples.mk @@ -11,19 +11,13 @@ OPTEE_EXAMPLES_LICENSE_FILES = LICENSE OPTEE_EXAMPLES_DEPENDENCIES = optee-client optee-os -ifeq ($(BR2_aarch64),y) -OPTEE_EXAMPLES_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm64 -else ifeq ($(BR2_arm),y) -OPTEE_EXAMPLES_SDK = $(STAGING_DIR)/lib/optee/export-ta_arm32 -endif - # Trusted Application are not built from CMake due to ta_dev_kit dependencies. # We must build and install them on target. define OPTEE_EXAMPLES_BUILD_TAS $(foreach f,$(wildcard $(@D)/*/ta/Makefile), \ $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ - TA_DEV_KIT_DIR=$(OPTEE_EXAMPLES_SDK) \ + TA_DEV_KIT_DIR=$(OPTEE_OS_SDK) \ O=out -C $(dir $f) all ) endef From 9550765adbbfeb2a3ca67a7963d5bf872a60c37b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2019 22:19:22 +0100 Subject: [PATCH 0076/7482] package/imx-mkimage: fix license file COPYING file is now at the top level, see: https://source.codeaurora.org/external/imx/imx-mkimage/commit/?id=4a7e6873dc9de70f61dcbdb9c15a945a2e31d272 Fixes: - http://autobuild.buildroot.org/results/03cffcf6959d5a6efa05b6e3c71d95d096cc942a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/imx-mkimage/imx-mkimage.hash | 2 +- package/imx-mkimage/imx-mkimage.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/imx-mkimage/imx-mkimage.hash b/package/imx-mkimage/imx-mkimage.hash index c9dcd0fa1d..1c00a78904 100644 --- a/package/imx-mkimage/imx-mkimage.hash +++ b/package/imx-mkimage/imx-mkimage.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 d5d7afca6abef4fc6653a2f8b99545d62921a5ab8c44ff3481120232e2162dde imx-mkimage-rel_imx_4.14.78_1.0.0_ga.tar.gz -sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c iMX8dv/COPYING +sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index 06d3157dc1..9f8e7d2d01 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -8,7 +8,7 @@ IMX_MKIMAGE_VERSION = rel_imx_4.14.78_1.0.0_ga IMX_MKIMAGE_SITE = https://source.codeaurora.org/external/imx/imx-mkimage IMX_MKIMAGE_SITE_METHOD = git IMX_MKIMAGE_LICENSE = GPL-2.0+ -IMX_MKIMAGE_LICENSE_FILES = iMX8dv/COPYING +IMX_MKIMAGE_LICENSE_FILES = COPYING HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M),y) From 964d525970e8d6dfd7807dc965d07e0d2bcc49f7 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 7 Mar 2019 10:25:55 +0100 Subject: [PATCH 0077/7482] docs/website: download.html: correct version number in title Fixes #11716 Latest release is 2019.02. Signed-off-by: Peter Korsgaard --- docs/website/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/website/download.html b/docs/website/download.html index 3fc6c2897f..a3d69cdcd8 100644 --- a/docs/website/download.html +++ b/docs/website/download.html @@ -8,7 +8,7 @@
Download
-

Latest stable / long term support release: 2018.02.11

+

Latest stable / long term support release: 2019.02

From fec83ccc11629d68a4cfc1562e611d89476db553 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Thu, 7 Mar 2019 12:45:53 +0100 Subject: [PATCH 0078/7482] package/freescale-imx/imx-sc-firmware: properly wrap help text Fixes: package/freescale-imx/imx-sc-firmware/Config.in:5: help text: <2 spaces><62 chars> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/freescale-imx/imx-sc-firmware/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/freescale-imx/imx-sc-firmware/Config.in b/package/freescale-imx/imx-sc-firmware/Config.in index 5c71618ce0..4a22f72b1f 100644 --- a/package/freescale-imx/imx-sc-firmware/Config.in +++ b/package/freescale-imx/imx-sc-firmware/Config.in @@ -2,7 +2,8 @@ config BR2_PACKAGE_IMX_SC_FIRMWARE bool "imx-sc-firmware" depends on BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X help - System Control Unit Firmware blobs for the Freescale i.MX8 SoCs. + System Control Unit Firmware blobs for the Freescale i.MX8 + SoCs. This library is provided by Freescale as-is and doesn't have an upstream. From 582448032d97b9dc6b196d838f57ec7f695048ba Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2019 19:02:16 +0100 Subject: [PATCH 0079/7482] package/flashrom: disable on microblaze and xtensa Fixes: - http://autobuild.buildroot.org/results/cdf0fb462eec143ea881d43cdd0c69c86122f66b - http://autobuild.buildroot.org/results/df4d9702959b610762e87cf21fac9de62365dae6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/flashrom/Config.in | 1 + 1 file changed, 1 insertion(+) diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index 948c774133..cf1f53c1a3 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_FLASHROM bool "flashrom" + depends on !BR2_microblaze && !BR2_xtensa # platform.h help flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash From cc366832f2b4268d77e2f367d4d059c318ba4e3c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Mar 2019 19:10:26 +0100 Subject: [PATCH 0080/7482] package/flashrom: fix build on riscv Fixes: - http://autobuild.buildroot.org/results/fb95c22cbe1d19e73f0089103ed6da2f4b3081c8 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...latform-Add-riscv-to-known-platforms.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch diff --git a/package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch b/package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch new file mode 100644 index 0000000000..06eb9256e4 --- /dev/null +++ b/package/flashrom/0001-platform-Add-riscv-to-known-platforms.patch @@ -0,0 +1,41 @@ +From a9a03cc6ba71825bfae0d64e1888f33c77345bc3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 17 Mar 2018 23:08:29 -0700 +Subject: [PATCH] platform: Add riscv to known platforms + +Change-Id: I724a99e2493fcbf71c2fc2d9f6a1ad607c737087 +Signed-off-by: Khem Raj +Reviewed-on: https://review.coreboot.org/25260 +Tested-by: build bot (Jenkins) +Reviewed-by: Paul Menzel +Reviewed-by: David Hendricks +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/flashrom/flashrom/commit/a9a03cc6ba71825bfae0d64e1888f33c77345bc3] +--- + platform.h | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/platform.h b/platform.h +index e3b7674ae..65fe85881 100644 +--- a/platform.h ++++ b/platform.h +@@ -69,6 +69,9 @@ + #elif defined (__m68k__) + #define __FLASHROM_ARCH__ "m68k" + #define IS_M68K 1 ++#elif defined (__riscv) ++ #define __FLASHROM_ARCH__ "riscv" ++ #define IS_RISCV 1 + #elif defined (__sh__) + #define __FLASHROM_ARCH__ "sh" + #define IS_SH 1 +@@ -77,7 +80,7 @@ + #define IS_S390 1 + #endif + +-#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_SH || IS_S390) ++#if !(IS_X86 || IS_MIPS || IS_PPC || IS_ARM || IS_SPARC || IS_ALPHA || IS_HPPA || IS_M68K || IS_RISCV || IS_SH || IS_S390) + #error Unknown architecture + #endif + From 579dfd94990449be719529f8b4c0589ddd060498 Mon Sep 17 00:00:00 2001 From: Vadim Kochan Date: Thu, 7 Mar 2019 01:14:29 +0200 Subject: [PATCH 0081/7482] package/efl: fix build with mesa efl does not compile with mesa without OpenGL ES because it checks for GL_ES_VERSION_2_0 and declares own GLintptr and GLsizeiptr types if such version is not defined, but mesa declares them too for OpenGL version 1.5, so fix it by add check also for OpenGL 1.5 where these types are defined. Use patch from: https://git.enlightenment.org/core/efl.git/commit/?id=0d2b624f1e24240a1c4e651aa1cfe9a8dd10a573 Fixes: http://autobuild.buildroot.net/results/62ca120f1e54e8c3ae445f98b2624b526569f007 Signed-off-by: Vadim Kochan Signed-off-by: Thomas Petazzoni --- ...ntptr-etc.-also-ndefed-for-GL_VERSIO.patch | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch diff --git a/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch b/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch new file mode 100644 index 0000000000..b64a200ffb --- /dev/null +++ b/package/efl/0001-evas-gl-make-GLintptr-etc.-also-ndefed-for-GL_VERSIO.patch @@ -0,0 +1,34 @@ +From d045dd99acdd47be238642d4f9384dccacde2b42 Mon Sep 17 00:00:00 2001 +From: "Carsten Haitzler (Rasterman)" +Date: Sat, 15 Dec 2018 16:19:01 +0000 +Subject: [PATCH] evas gl - make GLintptr etc. also ndefed for GL_VERSION_1_5 + fix typedef + +It seems that GL_VERSION_1_5 define == these provided by gl already. At +least reading the mesa headers I do, so this should fix T7502 + +Signed-off-by: Vadim Kochan +--- + src/lib/evas/Evas_GL.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/lib/evas/Evas_GL.h b/src/lib/evas/Evas_GL.h +index fa3e6f4..5524d82 100644 +--- a/src/lib/evas/Evas_GL.h ++++ b/src/lib/evas/Evas_GL.h +@@ -4272,9 +4272,11 @@ typedef signed int GLfixed; // Changed khronos_int32_t + + #ifndef GL_ES_VERSION_2_0 + /* GL types for handling large vertex buffer objects */ +-#include ++# ifndef GL_VERSION_1_5 ++# include + typedef ptrdiff_t GLintptr; // Changed khronos_intptr_t + typedef ptrdiff_t GLsizeiptr; // Changed khronos_ssize_t ++# endif + #endif + + /* Some definitions from GLES 3.0. +-- +2.14.1 + From 7ad4cb3a5e712a8caa8b102aca2c200b80601dc1 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 6 Mar 2019 18:49:18 +0100 Subject: [PATCH 0082/7482] package/imx-mkimage: add -std=c99 to CFLAGS Fixes: - http://autobuild.buildroot.org/results/4c31d97a9aaf9ef887e68d64efe468c81f8cf7bc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/imx-mkimage/imx-mkimage.mk | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package/imx-mkimage/imx-mkimage.mk b/package/imx-mkimage/imx-mkimage.mk index 9f8e7d2d01..d8d8b10b32 100644 --- a/package/imx-mkimage/imx-mkimage.mk +++ b/package/imx-mkimage/imx-mkimage.mk @@ -14,7 +14,9 @@ HOST_IMX_MKIMAGE_DEPENDENCIES = host-zlib ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M),y) # i.MX8M needs a different binary define HOST_IMX_MKIMAGE_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D)/iMX8M -f soc.mak mkimage_imx8 + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS) -std=c99" \ + -C $(@D)/iMX8M -f soc.mak mkimage_imx8 endef define HOST_IMX_MKIMAGE_INSTALL_CMDS $(INSTALL) -D -m 755 $(@D)/iMX8M/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8 @@ -23,7 +25,9 @@ endef else # i.MX8 and i.MX8X define HOST_IMX_MKIMAGE_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) MKIMG=mkimage_imx8 mkimage_imx8 + $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) \ + CFLAGS="$(HOST_CFLAGS) -std=c99" \ + -C $(@D) MKIMG=mkimage_imx8 mkimage_imx8 endef define HOST_IMX_MKIMAGE_INSTALL_CMDS $(INSTALL) -D -m 755 $(@D)/mkimage_imx8 $(HOST_DIR)/bin/mkimage_imx8 From 93321e5f166d08426e38a14bce318e9807d7d45d Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 6 Mar 2019 10:49:53 -0500 Subject: [PATCH 0083/7482] package/mender: add missing double quote in service file There was a missing double quotes that would prevent the service from starting. Signed-off-by: Adam Duskett Tested-by: Angelo Compagnucci Acked-by: Angelo Compagnucci Signed-off-by: Thomas Petazzoni --- package/mender/mender.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mender/mender.service b/package/mender/mender.service index 8b60a4f1aa..2a5f476ee5 100644 --- a/package/mender/mender.service +++ b/package/mender/mender.service @@ -12,7 +12,7 @@ if [ -L /var/lib/mender \ if rm -f /var/lib/mender >/dev/null 2>&1; then \ mkdir -p /var/lib/mender; \ else \ - echo "No persistent location to store mender data. Data will be lost\ + echo "No persistent location to store mender data. Data will be lost" \ echo "at reboot. Are you sure this is what you want to do?"; \ mkdir -p "$(readlink /var/lib/mender)"; \ fi; \ From b404245d6f09a45c53c0d81b57a84376f72ef770 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 6 Mar 2019 18:24:21 +0100 Subject: [PATCH 0084/7482] package/dovecot: bump version to 2.3.5 Release notes: https://www.dovecot.org/list/dovecot-news/2019-March/000399.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot/dovecot.hash | 2 +- package/dovecot/dovecot.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot/dovecot.hash b/package/dovecot/dovecot.hash index e4a07ba4e4..a37cc68cf6 100644 --- a/package/dovecot/dovecot.hash +++ b/package/dovecot/dovecot.hash @@ -1,5 +1,5 @@ # Locally computed after checking signature -sha256 b8873e2ce5c33e58963bb7a8d2ff8427c09dbfdd63e13a0b0f4502864043aa07 dovecot-2.3.4.1.tar.gz +sha256 bfe112ec6d11f7d6c6f7f0440e3b6e2c840c15cec1e99466b5495765d54aaaff dovecot-2.3.5.tar.gz sha256 a363b132e494f662d98c820d1481297e6ae72f194c2c91b6c39e1518b86240a8 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LGPL sha256 52b8c95fabb19575281874b661ef7968ea47e8f5d74ba0dd40ce512e52b3fc97 COPYING.MIT diff --git a/package/dovecot/dovecot.mk b/package/dovecot/dovecot.mk index bffc8ac54f..0960d20da7 100644 --- a/package/dovecot/dovecot.mk +++ b/package/dovecot/dovecot.mk @@ -5,7 +5,7 @@ ################################################################################ DOVECOT_VERSION_MAJOR = 2.3 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).4.1 +DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).5 DOVECOT_SITE = https://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) DOVECOT_INSTALL_STAGING = YES DOVECOT_LICENSE = LGPL-2.1, MIT, Public Domain, BSD-3-Clause, Unicode-DFS-2015 From 7cb7e663a8c77818a37757390622a0c82f7d018d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 6 Mar 2019 18:24:22 +0100 Subject: [PATCH 0085/7482] package/dovecot-pigeonhole: bump version to 0.5.5 Release notes: https://www.dovecot.org/list/dovecot-news/2019-March/000400.html Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/dovecot-pigeonhole/dovecot-pigeonhole.hash | 2 +- package/dovecot-pigeonhole/dovecot-pigeonhole.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash index 5ad9406ad2..a1d88d49e2 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.hash @@ -1,3 +1,3 @@ # Locally computed after checking signature -sha256 547999e67a001abc5e654c7e35653d3fe057fa9a47a24257e39a79c41ef08516 dovecot-2.3-pigeonhole-0.5.4.tar.gz +sha256 cbaa106e1c2b23824420efdd6a9f8572c64c8dccf75a3101a899b6ddb25149a5 dovecot-2.3-pigeonhole-0.5.5.tar.gz sha256 fc9e9522216f2a9a28b31300e3c73c1df56acc27dfae951bf516e7995366b51a COPYING diff --git a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk index 184204673b..2a7626733f 100644 --- a/package/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ b/package/dovecot-pigeonhole/dovecot-pigeonhole.mk @@ -4,7 +4,7 @@ # ################################################################################ -DOVECOT_PIGEONHOLE_VERSION = 0.5.4 +DOVECOT_PIGEONHOLE_VERSION = 0.5.5 DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.3-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz DOVECOT_PIGEONHOLE_SITE = https://pigeonhole.dovecot.org/releases/2.3 DOVECOT_PIGEONHOLE_LICENSE = LGPL-2.1 From d65d1d066ba895f3ccb277d24199019663801721 Mon Sep 17 00:00:00 2001 From: Jared Bents Date: Wed, 6 Mar 2019 08:22:30 -0600 Subject: [PATCH 0086/7482] package/busybox: udhcp CVE-2018-20679 patch Patch to resolve CVE-2018-20679 which affects versions prior to 1.30.0 More information can be found at: https://nvd.nist.gov/vuln/detail/CVE-2018-20679 This applies to both master and 2019.02 Signed-off-by: Jared Bents Signed-off-by: Thomas Petazzoni --- ...tions-are-indeed-4-byte-closes-11506.patch | 136 ++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch diff --git a/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch b/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch new file mode 100644 index 0000000000..bc1a48bf4b --- /dev/null +++ b/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch @@ -0,0 +1,136 @@ +From 6d3b4bb24da9a07c263f3c1acf8df85382ff562c Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Mon, 17 Dec 2018 18:07:18 +0100 +Subject: udhcpc: check that 4-byte options are indeed 4-byte, closes 11506 + +function old new delta +udhcp_get_option32 - 27 +27 +udhcp_get_option 231 248 +17 +------------------------------------------------------------------------------ +(add/remove: 1/0 grow/shrink: 1/0 up/down: 44/0) Total: 44 bytes + +Signed-off-by: Denys Vlasenko +--- + networking/udhcp/common.c | 19 +++++++++++++++++++ + networking/udhcp/common.h | 4 ++++ + networking/udhcp/dhcpc.c | 6 +++--- + networking/udhcp/dhcpd.c | 6 +++--- + 4 files changed, 29 insertions(+), 6 deletions(-) + +diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c +index e5fd74f91..41b05b855 100644 +--- a/networking/udhcp/common.c ++++ b/networking/udhcp/common.c +@@ -272,6 +272,15 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code) + goto complain; /* complain and return NULL */ + + if (optionptr[OPT_CODE] == code) { ++ if (optionptr[OPT_LEN] == 0) { ++ /* So far no valid option with length 0 known. ++ * Having this check means that searching ++ * for DHCP_MESSAGE_TYPE need not worry ++ * that returned pointer might be unsafe ++ * to dereference. ++ */ ++ goto complain; /* complain and return NULL */ ++ } + log_option("option found", optionptr); + return optionptr + OPT_DATA; + } +@@ -289,6 +298,16 @@ uint8_t* FAST_FUNC udhcp_get_option(struct dhcp_packet *packet, int code) + return NULL; + } + ++uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code) ++{ ++ uint8_t *r = udhcp_get_option(packet, code); ++ if (r) { ++ if (r[-1] != 4) ++ r = NULL; ++ } ++ return r; ++} ++ + /* Return the position of the 'end' option (no bounds checking) */ + int FAST_FUNC udhcp_end_option(uint8_t *optionptr) + { +diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h +index 7ad603d33..9511152ff 100644 +--- a/networking/udhcp/common.h ++++ b/networking/udhcp/common.h +@@ -205,6 +205,10 @@ extern const uint8_t dhcp_option_lengths[] ALIGN1; + unsigned FAST_FUNC udhcp_option_idx(const char *name, const char *option_strings); + + uint8_t *udhcp_get_option(struct dhcp_packet *packet, int code) FAST_FUNC; ++/* Same as above + ensures that option length is 4 bytes ++ * (returns NULL if size is different) ++ */ ++uint8_t *udhcp_get_option32(struct dhcp_packet *packet, int code) FAST_FUNC; + int udhcp_end_option(uint8_t *optionptr) FAST_FUNC; + void udhcp_add_binary_option(struct dhcp_packet *packet, uint8_t *addopt) FAST_FUNC; + #if ENABLE_UDHCPC || ENABLE_UDHCPD +diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c +index 4b23e4d39..5b3fd531c 100644 +--- a/networking/udhcp/dhcpc.c ++++ b/networking/udhcp/dhcpc.c +@@ -1691,7 +1691,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) + * They say ISC DHCP client supports this case. + */ + server_addr = 0; +- temp = udhcp_get_option(&packet, DHCP_SERVER_ID); ++ temp = udhcp_get_option32(&packet, DHCP_SERVER_ID); + if (!temp) { + bb_error_msg("no server ID, using 0.0.0.0"); + } else { +@@ -1718,7 +1718,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) + struct in_addr temp_addr; + uint8_t *temp; + +- temp = udhcp_get_option(&packet, DHCP_LEASE_TIME); ++ temp = udhcp_get_option32(&packet, DHCP_LEASE_TIME); + if (!temp) { + bb_error_msg("no lease time with ACK, using 1 hour lease"); + lease_seconds = 60 * 60; +@@ -1813,7 +1813,7 @@ int udhcpc_main(int argc UNUSED_PARAM, char **argv) + uint32_t svid; + uint8_t *temp; + +- temp = udhcp_get_option(&packet, DHCP_SERVER_ID); ++ temp = udhcp_get_option32(&packet, DHCP_SERVER_ID); + if (!temp) { + non_matching_svid: + log1("received DHCP NAK with wrong" +diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c +index a8cd3f03b..477856d11 100644 +--- a/networking/udhcp/dhcpd.c ++++ b/networking/udhcp/dhcpd.c +@@ -640,7 +640,7 @@ static void add_server_options(struct dhcp_packet *packet) + static uint32_t select_lease_time(struct dhcp_packet *packet) + { + uint32_t lease_time_sec = server_config.max_lease_sec; +- uint8_t *lease_time_opt = udhcp_get_option(packet, DHCP_LEASE_TIME); ++ uint8_t *lease_time_opt = udhcp_get_option32(packet, DHCP_LEASE_TIME); + if (lease_time_opt) { + move_from_unaligned32(lease_time_sec, lease_time_opt); + lease_time_sec = ntohl(lease_time_sec); +@@ -987,7 +987,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) + } + + /* Get SERVER_ID if present */ +- server_id_opt = udhcp_get_option(&packet, DHCP_SERVER_ID); ++ server_id_opt = udhcp_get_option32(&packet, DHCP_SERVER_ID); + if (server_id_opt) { + uint32_t server_id_network_order; + move_from_unaligned32(server_id_network_order, server_id_opt); +@@ -1011,7 +1011,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv) + } + + /* Get REQUESTED_IP if present */ +- requested_ip_opt = udhcp_get_option(&packet, DHCP_REQUESTED_IP); ++ requested_ip_opt = udhcp_get_option32(&packet, DHCP_REQUESTED_IP); + if (requested_ip_opt) { + move_from_unaligned32(requested_nip, requested_ip_opt); + } +-- +cgit v1.2.1 + From a49e8f34fffffaa7839861049add77fe6f4d7967 Mon Sep 17 00:00:00 2001 From: Jared Bents Date: Wed, 6 Mar 2019 08:22:31 -0600 Subject: [PATCH 0087/7482] package/busybox: udhcp CVE-2019-5747 patch Patch to resolve CVE-2019-5747 which affects versions prior to 1.30.0 More information can be found at: https://nvd.nist.gov/vuln/detail/CVE-2019-5747 This applies to both master and 2019.02 Signed-off-by: Jared Bents Signed-off-by: Thomas Petazzoni --- ...tions-are-indeed-4-byte-closes-11506.patch | 1 + ...HCP_SUBNET-ensure-it-is-4-bytes-long.patch | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch diff --git a/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch b/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch index bc1a48bf4b..b40979e359 100644 --- a/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch +++ b/package/busybox/0004-udhcpc-check-that-4-byte-options-are-indeed-4-byte-closes-11506.patch @@ -10,6 +10,7 @@ udhcp_get_option 231 248 +17 (add/remove: 1/0 grow/shrink: 1/0 up/down: 44/0) Total: 44 bytes Signed-off-by: Denys Vlasenko +Signed-off-by: Jared Bents --- networking/udhcp/common.c | 19 +++++++++++++++++++ networking/udhcp/common.h | 4 ++++ diff --git a/package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch b/package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch new file mode 100644 index 0000000000..05939db4ab --- /dev/null +++ b/package/busybox/0005-udhcpc-when-decoding-DHCP_SUBNET-ensure-it-is-4-bytes-long.patch @@ -0,0 +1,58 @@ +From 74d9f1ba37010face4bd1449df4d60dd84450b06 Mon Sep 17 00:00:00 2001 +From: Denys Vlasenko +Date: Mon, 7 Jan 2019 15:33:42 +0100 +Subject: udhcpc: when decoding DHCP_SUBNET, ensure it is 4 bytes long + +function old new delta +udhcp_run_script 795 801 +6 + +Signed-off-by: Denys Vlasenko +Signed-off-by: Jared Bents +--- + networking/udhcp/common.c | 2 +- + networking/udhcp/common.h | 2 +- + networking/udhcp/dhcpc.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c +index 4c2221b77..fc4de5716 100644 +--- a/networking/udhcp/common.c ++++ b/networking/udhcp/common.c +@@ -302,7 +302,7 @@ uint8_t* FAST_FUNC udhcp_get_option32(struct dhcp_packet *packet, int code) + { + uint8_t *r = udhcp_get_option(packet, code); + if (r) { +- if (r[-1] != 4) ++ if (r[-OPT_DATA + OPT_LEN] != 4) + r = NULL; + } + return r; +diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h +index 9511152ff..62f9a2a4a 100644 +--- a/networking/udhcp/common.h ++++ b/networking/udhcp/common.h +@@ -119,7 +119,7 @@ enum { + //#define DHCP_TIME_SERVER 0x04 /* RFC 868 time server (32-bit, 0 = 1.1.1900) */ + //#define DHCP_NAME_SERVER 0x05 /* IEN 116 _really_ ancient kind of NS */ + //#define DHCP_DNS_SERVER 0x06 +-//#define DHCP_LOG_SERVER 0x07 /* port 704 UDP log (not syslog) ++//#define DHCP_LOG_SERVER 0x07 /* port 704 UDP log (not syslog) */ + //#define DHCP_COOKIE_SERVER 0x08 /* "quote of the day" server */ + //#define DHCP_LPR_SERVER 0x09 + #define DHCP_HOST_NAME 0x0c /* 12: either client informs server or server gives name to client */ +diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c +index 5b3fd531c..dcec8cdfd 100644 +--- a/networking/udhcp/dhcpc.c ++++ b/networking/udhcp/dhcpc.c +@@ -531,7 +531,7 @@ static char **fill_envp(struct dhcp_packet *packet) + temp = udhcp_get_option(packet, code); + *curr = xmalloc_optname_optval(temp, &dhcp_optflags[i], opt_name); + putenv(*curr++); +- if (code == DHCP_SUBNET) { ++ if (code == DHCP_SUBNET && temp[-OPT_DATA + OPT_LEN] == 4) { + /* Subnet option: make things like "$ip/$mask" possible */ + uint32_t subnet; + move_from_unaligned32(subnet, temp); +-- +cgit v1.2.1 + From ec9b3aec53f55fd1aca99c42f737afafdf912a7f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2019 23:28:07 +0100 Subject: [PATCH 0088/7482] package/gst-plugins-bad: allow static build of zbar plugin zbar can be built statically since commit fc4a6abfa6bbffeabefb9967dbf378c410fb6318 so remove the dynamic library dependency from BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gstreamer/gst-plugins-bad/Config.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in index f45981f6c8..fe8457f6d2 100644 --- a/package/gstreamer/gst-plugins-bad/Config.in +++ b/package/gstreamer/gst-plugins-bad/Config.in @@ -324,14 +324,13 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR bool "zbar" depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l depends on BR2_USE_MMU # zbar-> libv4l - depends on !BR2_STATIC_LIBS # zbar-> libv4l depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # zbar select BR2_PACKAGE_ZBAR -comment "zbar plugin needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.17" +comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.17" depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ + depends on !BR2_TOOLCHAIN_HAS_THREADS \ || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 endif From 1de1fcb4d810cc9443c3fe4c1c108e649be83726 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2019 22:05:46 +0100 Subject: [PATCH 0089/7482] package/wireshark: security bump to version 2.6.7 Fixes CVE-2019-9208, CVE-2019-9209 and CVE-2019-9214 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.hash | 4 ++-- package/wireshark/wireshark.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/wireshark/wireshark.hash b/package/wireshark/wireshark.hash index bad0a0fd45..071940e1c1 100644 --- a/package/wireshark/wireshark.hash +++ b/package/wireshark/wireshark.hash @@ -1,4 +1,4 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.6.txt -sha256 487933ea075bdbb25d8df06017d9c4f49fc20eb7f6ec80af086718ed5550e863 wireshark-2.6.6.tar.xz +# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.6.7.txt +sha256 747b3e7a37414942959f76f198be49dcbcca936bda538c4408942ce71bfd2b71 wireshark-2.6.7.tar.xz # Locally calculated sha256 7cdbed2b697efaa45576a033f1ac0e73cd045644a91c79bbf41d4a7d81dac7bf COPYING diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index c01238826b..5f04af1f29 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -4,7 +4,7 @@ # ################################################################################ -WIRESHARK_VERSION = 2.6.6 +WIRESHARK_VERSION = 2.6.7 WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.xz WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions WIRESHARK_LICENSE = wireshark license From 498dff7ea1ef7d975f09fd3d7f1cce8d40b47a8b Mon Sep 17 00:00:00 2001 From: Abdelmalek Benelouezzane Date: Tue, 5 Mar 2019 14:54:40 -0500 Subject: [PATCH 0090/7482] package/vsftpd: add patch to fix hang This fixes a hang due to SIGCHLD not being handled correctly by vsftpd. The patch comes from fedora and didn't make its way to upstream yet. More information about the bug can be found in: - https://bugzilla.redhat.com/show_bug.cgi?id=1198259 Signed-off-by: Abdelmalek Benelouezzane Signed-off-by: Thomas Petazzoni --- ...0004-Prevent-hang-in-SIGCHLD-handler.patch | 87 +++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch diff --git a/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch b/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch new file mode 100644 index 0000000000..0732c5f632 --- /dev/null +++ b/package/vsftpd/0004-Prevent-hang-in-SIGCHLD-handler.patch @@ -0,0 +1,87 @@ +From 1e65a0a15f819b8bf1b551bd84f71d0da1f5a00c Mon Sep 17 00:00:00 2001 +From: Martin Sehnoutka +Date: Thu, 17 Nov 2016 13:02:27 +0100 +Subject: [PATCH] Prevent hanging in SIGCHLD handler. + +vsftpd can now handle pam_exec.so in pam.d config without hanging +in SIGCHLD handler. + +[Abdelmalek: +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1198259 +Fetched from: +https://src.fedoraproject.org/cgit/rpms/vsftpd.git/plain/0026-Prevent-hanging-in-SIGCHLD-handler.patch] +Signed-off-by: Abdelmalek Benelouezzane +--- + sysutil.c | 4 ++-- + sysutil.h | 2 +- + twoprocess.c | 13 +++++++++++-- + 3 files changed, 14 insertions(+), 5 deletions(-) + +diff --git a/sysutil.c b/sysutil.c +index 6d7cb3f..099748f 100644 +--- a/sysutil.c ++++ b/sysutil.c +@@ -608,13 +608,13 @@ vsf_sysutil_exit(int exit_code) + } + + struct vsf_sysutil_wait_retval +-vsf_sysutil_wait(void) ++vsf_sysutil_wait(int hang) + { + struct vsf_sysutil_wait_retval retval; + vsf_sysutil_memclr(&retval, sizeof(retval)); + while (1) + { +- int sys_ret = wait(&retval.exit_status); ++ int sys_ret = waitpid(-1, &retval.exit_status, hang ? 0 : WNOHANG); + if (sys_ret < 0 && errno == EINTR) + { + vsf_sysutil_check_pending_actions(kVSFSysUtilUnknown, 0, 0); +diff --git a/sysutil.h b/sysutil.h +index c145bdf..13153cd 100644 +--- a/sysutil.h ++++ b/sysutil.h +@@ -177,7 +177,7 @@ struct vsf_sysutil_wait_retval + int PRIVATE_HANDS_OFF_syscall_retval; + int PRIVATE_HANDS_OFF_exit_status; + }; +-struct vsf_sysutil_wait_retval vsf_sysutil_wait(void); ++struct vsf_sysutil_wait_retval vsf_sysutil_wait(int hang); + int vsf_sysutil_wait_reap_one(void); + int vsf_sysutil_wait_get_retval( + const struct vsf_sysutil_wait_retval* p_waitret); +diff --git a/twoprocess.c b/twoprocess.c +index 33d84dc..b1891e7 100644 +--- a/twoprocess.c ++++ b/twoprocess.c +@@ -47,8 +47,17 @@ static void + handle_sigchld(void* duff) + { + +- struct vsf_sysutil_wait_retval wait_retval = vsf_sysutil_wait(); ++ struct vsf_sysutil_wait_retval wait_retval = vsf_sysutil_wait(0); + (void) duff; ++ if (!vsf_sysutil_wait_get_exitcode(&wait_retval) && ++ !vsf_sysutil_wait_get_retval(&wait_retval)) ++ /* There was nobody to wait for, possibly caused by underlying library ++ * which created a new process through fork()/vfork() and already picked ++ * it up, e.g. by pam_exec.so or integrity check routines for libraries ++ * when FIPS mode is on (nss freebl), which can lead to calling prelink ++ * if the prelink package is installed. ++ */ ++ return; + /* Child died, so we'll do the same! Report it as an error unless the child + * exited normally with zero exit code + */ +@@ -390,7 +399,7 @@ common_do_login(struct vsf_session* p_sess, const struct mystr* p_user_str, + priv_sock_send_result(p_sess->parent_fd, PRIV_SOCK_RESULT_OK); + if (!p_sess->control_use_ssl) + { +- (void) vsf_sysutil_wait(); ++ (void) vsf_sysutil_wait(1); + } + else + { +-- +2.14.4 + From aa02c6553ce6528ad0513f3e92264a28bcfa844d Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Thu, 7 Mar 2019 16:45:28 +0100 Subject: [PATCH 0091/7482] package/optee-*: packages depend on thread support BR2_PACKAGE_OPTEE_CLIENT depends on BR2_TOOLCHAIN_HAS_THREADS. Library teec uses pthread support to protect clients state management. This change declares this dependency in package optee-client and updates dependent packages accordingly: optee-benchmark, optee-client, optee-examples and optee-test. Fixes [1] and [2] where config selected an toolchain without thread support and build failed with trace like: CMake Error at /home/buildroot/autobuild/run/instance-1/output/host/share/cmake-3.8/Modules/FindPackageHandleStandardArgs.cmake:137 (message): Could NOT find Threads (missing: Threads_FOUND) Call Stack (most recent call first): /home/buildroot/autobuild/run/instance-1/output/host/share/cmake-3.8/Modules/FindPackageHandleStandardArgs.cmake:377 (_FPHSA_FAILURE_MESSAGE) /home/buildroot/autobuild/run/instance-1/output/host/share/cmake-3.8/Modules/FindThreads.cmake:212 (FIND_PACKAGE_HANDLE_STANDARD_ARGS) libteec/CMakeLists.txt:8 (find_package) [1] http://autobuild.buildroot.net/results/ed6ffe2197da4f3a970bd3c5522291236396cc8e [2] http://autobuild.buildroot.net/results/406f90048db097580b626ef889823132f8676ba1 Signed-off-by: Etienne Carriere [Thomas: fix dependencies of Config.in comment, as noticed by Baruch.] Signed-off-by: Thomas Petazzoni --- package/optee-benchmark/Config.in | 5 +++-- package/optee-client/Config.in | 5 +++-- package/optee-examples/Config.in | 5 +++-- package/optee-test/Config.in | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in index 0e36549c94..b9326e0432 100644 --- a/package/optee-benchmark/Config.in +++ b/package/optee-benchmark/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_OPTEE_BENCHMARK bool "optee-benchmark" depends on !BR2_STATIC_LIBS # optee-client + depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_PACKAGE_LIBYAML help @@ -11,5 +12,5 @@ config BR2_PACKAGE_OPTEE_BENCHMARK http://github.com/linaro-swg/optee_benchmark -comment "optee-benchmark needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "optee-benchmark needs a toolchain w/ dynamic library and threads" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index db0b7b7f9f..833a6226a6 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_OPTEE_CLIENT bool "optee-client" depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS help Enable the OP-TEE client package that brings non-secure client application resources for OP-TEE support. OP-TEE @@ -13,5 +14,5 @@ config BR2_PACKAGE_OPTEE_CLIENT https://github.com/OP-TEE/optee_client -comment "optee-client needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS +comment "optee-client needs a toolchain w/ dynamic library and threads" + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in index 479f9204bb..62d0bf4b2a 100644 --- a/package/optee-examples/Config.in +++ b/package/optee-examples/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_OPTEE_EXAMPLES bool "optee-examples" depends on BR2_TARGET_OPTEE_OS depends on !BR2_STATIC_LIBS # optee-client + depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help @@ -18,6 +19,6 @@ config BR2_PACKAGE_OPTEE_EXAMPLES https://github.com/linaro-swg/optee_examples -comment "optee-examples needs a toolchain w/ dynamic library" +comment "optee-examples needs a toolchain w/ dynamic library and threads" depends on BR2_TARGET_OPTEE_OS - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in index 575790b119..77c38c47fd 100644 --- a/package/optee-test/Config.in +++ b/package/optee-test/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_OPTEE_TEST bool "optee-test" depends on BR2_TARGET_OPTEE_OS depends on !BR2_STATIC_LIBS # optee-client + depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK help @@ -22,6 +23,6 @@ config BR2_PACKAGE_OPTEE_TEST http://github.com/OP-TEE/optee_test -comment "optee-test needs a toolchain w/ dynamic library" +comment "optee-test needs a toolchain w/ dynamic library and threads" depends on BR2_TARGET_OPTEE_OS - depends on BR2_STATIC_LIBS + depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS From c8421565b1c4c5edd94d0c65e4fad5cbcfd46e10 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 5 Mar 2019 23:01:04 +0100 Subject: [PATCH 0092/7482] package/gst-plugins-bad: remove apexsink support apexsink does not build with OpenSSL 1.1.x so remove this option especially because there is no more apexsink option in gstreamer1 (since version 1.12) Fixes: - http://autobuild.buildroot.org/results/a29e8a8509190fc4b3c419dae2301cf72a601f62 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 ++++++++ package/gstreamer/gst-plugins-bad/Config.in | 4 ---- package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk | 8 +------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 25b48fba82..93e50f3f60 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -144,6 +144,14 @@ endif ############################################################################### +comment "Legacy options removed in 2019.05" + +config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK + bool "gst-plugins-bad apexsink option removed" + select BR2_LEGACY + help + The gst-plugins-bad apexsink option was removed. + comment "Legacy options removed in 2019.02" config BR2_PACKAGE_QT diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in index fe8457f6d2..411e4b6174 100644 --- a/package/gstreamer/gst-plugins-bad/Config.in +++ b/package/gstreamer/gst-plugins-bad/Config.in @@ -242,10 +242,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M comment "plugins with external dependencies (there may be more available)" -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK - bool "apexsink" - select BR2_PACKAGE_OPENSSL - config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2 bool "bz2" select BR2_PACKAGE_BZIP2 diff --git a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk index 856ff9665d..a98eac4235 100644 --- a/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk +++ b/package/gstreamer/gst-plugins-bad/gst-plugins-bad.mk @@ -12,6 +12,7 @@ GST_PLUGINS_BAD_LICENSE = LGPL-2.1+, GPL-2.0+ GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING GST_PLUGINS_BAD_CONF_OPTS = \ + --disable-apexsink \ --disable-examples \ --disable-spandsp @@ -472,13 +473,6 @@ GST_PLUGINS_BAD_CONF_OPTS += --disable-y4m endif # plugins with deps -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-apexsink -GST_PLUGINS_BAD_DEPENDENCIES += openssl -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-apexsink -endif - ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y) GST_PLUGINS_BAD_CONF_OPTS += --enable-bz2 GST_PLUGINS_BAD_DEPENDENCIES += bzip2 From 16f847340d07dce620e4c3fc0a099aa79898d86a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 2 Jan 2019 15:56:28 -0500 Subject: [PATCH 0093/7482] leveldb: install memenv static library and header MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The project builds a tiny static library that consists of a single symbol which creates an in-memory LevelDB database. That library is not installed by default and may be used by other projects. This commit installs in the staging directory the libmemenv.a static library and the memenv.h header file. Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/leveldb/leveldb.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/leveldb/leveldb.mk b/package/leveldb/leveldb.mk index af9e879828..6078cd496c 100644 --- a/package/leveldb/leveldb.mk +++ b/package/leveldb/leveldb.mk @@ -25,6 +25,8 @@ define LEVELDB_INSTALL_STAGING_CMDS $(TARGET_MAKE_ENV) $(MAKE1) \ INSTALL_ROOT=$(STAGING_DIR) INSTALL_PREFIX=/usr \ $(LEVELDB_MAKE_ARGS) -C $(@D) install + $(INSTALL) -D -m 0644 $(@D)/out-static/libmemenv.a $(STAGING_DIR)/usr/lib/libmemenv.a + $(INSTALL) -D -m 0644 $(@D)/helpers/memenv/memenv.h $(STAGING_DIR)/usr/include/helpers/memenv/memenv.h endef define LEVELDB_INSTALL_TARGET_CMDS From 088f261dbb89bb48a918a3153f293b86708c8a58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 2 Jan 2019 15:56:29 -0500 Subject: [PATCH 0094/7482] leveldb: generate pic for static libraries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The project's static libraries are not compiled with the -fPIC compiler flag. This prevents dynamic libraries to link against those libraries. This commit adds a patch that sets the -fPIC compiler flag to the list of CFLAGS/CXXFLAGS. The project now generates position independant code for all of its outputs (i.e. not limited anymore to its shared libraries). Fixes: /home/gportay/src/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-amd-linux-gnu/6.2.0/../../../../x86_64-amd-linux-gnu/bin/ld: /home/gportay/src/buildroot/output/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libmemenv.a(memenv.o): relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC /home/gportay/src/buildroot/output/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libmemenv.a: error adding symbols: Bad value collect2: error: ld returned 1 exit status Signed-off-by: Gaël PORTAY [Arnout: renumber patch] Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...n-independant-code-for-static-librar.patch | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch diff --git a/package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch b/package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch new file mode 100644 index 0000000000..dce06ec725 --- /dev/null +++ b/package/leveldb/0003-Generate-position-independant-code-for-static-librar.patch @@ -0,0 +1,52 @@ +From 6ed1b57ef6bcee0d497c181730710b2b0fafbfb3 Mon Sep 17 00:00:00 2001 +From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= +Date: Fri, 31 Aug 2018 12:23:46 -0400 +Subject: [PATCH] Generate position independant code for static library +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Transfer-Encoding: 8bit + +Currently, only shared libraries are using the PIC flag. + +Generalize this flag for static libraries in order to let them linkable +by dynamic libraries. + +Fixes: + + /home/gportay/src/buildroot/output/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-amd-linux-gnu/6.2.0/../../../../x86_64-amd-linux-gnu/bin/ld: /home/gportay/src/buildroot/output/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libmemenv.a(memenv.o): relocation R_X86_64_32S against `.rodata' can not be used when making a shared object; recompile with -fPIC + /home/gportay/src/buildroot/output/host/x86_64-buildroot-linux-gnu/sysroot/usr/lib/libmemenv.a: error adding symbols: Bad value + collect2: error: ld returned 1 exit status + +Upstream-Status: Inappropriate [upstream has migrated to cmake] +Signed-off-by: Gaël PORTAY +--- + build_detect_platform | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/build_detect_platform b/build_detect_platform +index d2a20ce..4839444 100755 +--- a/build_detect_platform ++++ b/build_detect_platform +@@ -55,8 +55,8 @@ fi + + COMMON_FLAGS= + CROSS_COMPILE= +-PLATFORM_CCFLAGS= +-PLATFORM_CXXFLAGS= ++PLATFORM_CCFLAGS="-fPIC" ++PLATFORM_CXXFLAGS="-fPIC" + PLATFORM_LDFLAGS= + PLATFORM_LIBS= + PLATFORM_SHARED_EXT="so" +@@ -197,7 +197,7 @@ else + EOF + if [ "$?" = 0 ]; then + COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX -DLEVELDB_ATOMIC_PRESENT" +- PLATFORM_CXXFLAGS="-std=c++0x" ++ PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS -std=c++0x" + else + COMMON_FLAGS="$COMMON_FLAGS -DLEVELDB_PLATFORM_POSIX" + fi +-- +2.18.0 + From 2d7c746ed8c89ad262ef0c6db5460ade1fc35973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Wed, 2 Jan 2019 15:56:30 -0500 Subject: [PATCH 0095/7482] qt5webkit: select leveldb package and memenv MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch fixes the build issue reported by autobuilder [0]. /home/naourr/work/instance-2/output/build/qt5webkit-5.9.1/Source/WebCore//.obj/platform/leveldb/LevelDBDatabase.o: In function `WebCore::LevelDBDatabase::openInMemory(WebCore::LevelDBComparator const*)': LevelDBDatabase.cpp.text._ZN7WebCore15LevelDBDatabase12openInMemoryEPKNS_17LevelDBComparatorE+0x34): undefined reference to `leveldb::NewMemEnv(leveldb::Env*)' collect2: error: ld returned 1 exit status make[3]: *** [Makefile.api:97: ../lib/libQt5WebKit.so.5.9.1] Error 1 The issue happens when both packages leveldb and qt5webkit are enabled. QtWebKit builds its own copy of leveldb [1] (as a third-party) if the system does not provided it (i.e. buildroot). It builds it differently and this is the origin of that issue. Instead of using the Makefile provided by leveldb [2], QtWebKit uses qmake to build that library [3]. The missing symbol issue happens because the symbol leveldb::NewMemEnv is bundled in the static library libmemenv.a (aside libleveldb.so). This static library consists of this single symbol which is like an extra that is built but *NOT* shipped by default at installation in the staging directory. Unfortunatly, that symbol is required later by WebCore [4]. The copy built by QtWebKit is an all-in-one library including both libleveldb and libmemenv; thus QtWebKit links against libleveldb only. Also, the linker finds the buildroot's copy first (not the third-party): that explains why it is complaining about a missing symbol. That copy does not have the symbol leveldb::NewMemEnv. Fortunatly, QtWebKit provides a facility to link against the system leveldb package. The qmake flag WEBKIT_CONFIG+=use_system_leveldb tells Qt5WebKit to link against libleveldb *AND* libmemenv [5]. To fix that issue, this commit selects the package leveldb that now installs the libmemenv static library and its header. It ensures that QtWebKit has everything it needs to be built. It also sets the appropriate qmake configure flags to tell QtWebKit to use the leveldb copy built by buildroot instead of the bundled one. [0]: http://autobuild.buildroot.net/results/46033e82adf592c3b92c6d50cfaf45bd58beeaa4 [1]: https://github.com/qt/qtwebkit/tree/5.9/Source/ThirdParty/leveldb [2]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Makefile#L167-L169 [3]: https://github.com/qt/qtwebkit/blob/5.9/Source/ThirdParty/leveldb/Target.pri#L80 [4]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/platform/leveldb/LevelDBDatabase.cpp#L185 [5]: https://github.com/qt/qtwebkit/blob/5.9/Source/WebCore/WebCore.pri#L254 [6]: https://github.com/google/leveldb/commit/739c25100e46576cdcdfff2d6f43f9f7008103c7 Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/qt5/qt5webkit/Config.in | 3 +++ package/qt5/qt5webkit/qt5webkit.mk | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 72c641b9f7..e8008f7bab 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -3,10 +3,13 @@ config BR2_PACKAGE_QT5WEBKIT depends on !BR2_STATIC_LIBS depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE depends on BR2_HOST_GCC_AT_LEAST_4_8 # icu + depends on BR2_INSTALL_LIBSTDCPP # leveldb depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # icu + depends on BR2_TOOLCHAIN_HAS_THREADS # leveldb depends on !BR2_BINFMT_FLAT # icu # assumes a FPU is available on MIPS depends on !BR2_MIPS_SOFT_FLOAT + select BR2_PACKAGE_LEVELDB select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_ICU select BR2_PACKAGE_QT5BASE_GUI diff --git a/package/qt5/qt5webkit/qt5webkit.mk b/package/qt5/qt5webkit/qt5webkit.mk index e8d368fb01..a0a0998d12 100644 --- a/package/qt5/qt5webkit/qt5webkit.mk +++ b/package/qt5/qt5webkit/qt5webkit.mk @@ -16,7 +16,7 @@ endif QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz QT5WEBKIT_DEPENDENCIES = \ host-bison host-flex host-gperf host-python host-ruby \ - qt5base sqlite + leveldb qt5base sqlite QT5WEBKIT_INSTALL_STAGING = YES QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 @@ -45,7 +45,7 @@ endef QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK define QT5WEBKIT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake) + (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/bin/qmake WEBKIT_CONFIG+=use_system_leveldb) endef define QT5WEBKIT_BUILD_CMDS From d12d3969d1d7501a1ebd8e642aa0f0a1098715de Mon Sep 17 00:00:00 2001 From: Vadim Kochan Date: Mon, 4 Mar 2019 01:23:40 +0200 Subject: [PATCH 0096/7482] package/sunxi-tools: fix build meminfo with musl musl does not provide inx/outx API for ARM arch, so use io memory access via pointers which is actually done this way in glibc/ulibc. Fixes: http://autobuild.buildroot.net/results/bf10cbe40c0f672c34db72e4eea4c168d5932bd4/ Signed-off-by: Vadim Kochan Signed-off-by: Thomas Petazzoni --- ...nfo-Access-to-io-memory-via-pointers.patch | 59 +++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch diff --git a/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch b/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch new file mode 100644 index 0000000000..997c413f23 --- /dev/null +++ b/package/sunxi-tools/0001-meminfo-Access-to-io-memory-via-pointers.patch @@ -0,0 +1,59 @@ +From 5c0a443ba336f10a8db6a99c769aa84ad37ed4d2 Mon Sep 17 00:00:00 2001 +From: Vadim Kochan +Date: Wed, 20 Feb 2019 02:48:43 +0200 +Subject: [PATCH] meminfo: Access to io memory via pointers + +The main reason for this is to be able compile with musl library, +because there is no support of inx/outx functions for ARM platform. + +Signed-off-by: Vadim Kochan +--- + meminfo.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/meminfo.c b/meminfo.c +index 0b0ff23..7d9f10f 100644 +--- a/meminfo.c ++++ b/meminfo.c +@@ -22,7 +22,6 @@ + #include + #include + #include +-#include + #include + + #include "common.h" +@@ -74,24 +73,26 @@ static enum sunxi_soc_version soc_version; + unsigned int + sunxi_io_read(void *base, int offset) + { +- return inl((unsigned long) (base + offset)); ++ unsigned long port = (unsigned long) (base + offset); ++ return *((volatile unsigned long *) port); + } + + void + sunxi_io_write(void *base, int offset, unsigned int value) + { +- outl(value, (unsigned long) (base + offset)); ++ unsigned long port = (unsigned long) (base + offset); ++ *((volatile unsigned long *) port) = value; + } + + void + sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask) + { +- unsigned int tmp = inl((unsigned long) (base + offset)); ++ unsigned int tmp = sunxi_io_read(base, offset); + + tmp &= ~mask; + tmp |= value & mask; + +- outl(tmp, (unsigned long) (base + offset)); ++ sunxi_io_write(base, offset, tmp); + } + + +-- +2.14.1 + From 140cfe30d294c0eed871b62cb9d3bb1c3ca7de27 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2019 11:18:54 +0100 Subject: [PATCH 0097/7482] package/ccid: bump to version 1.4.30 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ccid/ccid.hash | 2 +- package/ccid/ccid.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ccid/ccid.hash b/package/ccid/ccid.hash index eb2219393b..6938eb5f18 100644 --- a/package/ccid/ccid.hash +++ b/package/ccid/ccid.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a5432ae845730493c04e59304b5c0c6103cd0e2c8827df57d69469a3eaaab84d ccid-1.4.29.tar.bz2 +sha256 ac17087be08880a0cdf99a8a2799a4ef004dc6ffa08b4d9b0ad995f39a53ff7c ccid-1.4.30.tar.bz2 sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING diff --git a/package/ccid/ccid.mk b/package/ccid/ccid.mk index 73da9c4b8f..b4cc0f5881 100644 --- a/package/ccid/ccid.mk +++ b/package/ccid/ccid.mk @@ -4,7 +4,7 @@ # ################################################################################ -CCID_VERSION = 1.4.29 +CCID_VERSION = 1.4.30 CCID_SOURCE = ccid-$(CCID_VERSION).tar.bz2 CCID_SITE = https://ccid.apdu.fr/files CCID_LICENSE = LGPL-2.1+ From 7407ec0382059e49e762ca0ff17cad3b7e71f3e7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2019 12:07:32 +0100 Subject: [PATCH 0098/7482] package/unixodbc: bump to version 2.3.7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/unixodbc/unixodbc.hash | 6 +++--- package/unixodbc/unixodbc.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/unixodbc/unixodbc.hash b/package/unixodbc/unixodbc.hash index 9d21a66e8d..4d0ad191d1 100644 --- a/package/unixodbc/unixodbc.hash +++ b/package/unixodbc/unixodbc.hash @@ -1,6 +1,6 @@ -# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.6.tar.gz.md5 -md5 a8629fd2953b04b4639d0a9d8a5cf9d1 unixODBC-2.3.6.tar.gz +# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.7.tar.gz.md5 +md5 274a711b0c77394e052db6493840c6f9 unixODBC-2.3.7.tar.gz # Locally computed -sha256 88b637f647c052ecc3861a3baa275c3b503b193b6a49ff8c28b2568656d14d69 unixODBC-2.3.6.tar.gz +sha256 45f169ba1f454a72b8fcbb82abd832630a3bf93baa84731cf2949f449e1e3e77 unixODBC-2.3.7.tar.gz sha256 a6b9aa1e9bfade121164c06fd975e9b913a8e38bf33d25ff967dfa3ed07d12f8 COPYING sha256 1e594f4c7fd6d099eca4bd1340b39d871ce0298331d8ebd4b68935548ee45cf4 exe/COPYING diff --git a/package/unixodbc/unixodbc.mk b/package/unixodbc/unixodbc.mk index 423f395212..2c936fe9d5 100644 --- a/package/unixodbc/unixodbc.mk +++ b/package/unixodbc/unixodbc.mk @@ -4,7 +4,7 @@ # ################################################################################ -UNIXODBC_VERSION = 2.3.6 +UNIXODBC_VERSION = 2.3.7 UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC UNIXODBC_INSTALL_STAGING = YES From 98bda7a194b8eaf6f183af7043f1b343e4f2a635 Mon Sep 17 00:00:00 2001 From: Sergio Prado Date: Sat, 2 Mar 2019 06:50:05 -0300 Subject: [PATCH 0099/7482] package/stella: bump version to 6.0 - add hashes for license files - remove patch with changes already upstream [1] [1] https://github.com/stella-emu/stella/commit/483013baa7b357fdf0daa2e510c537d460132584 Signed-off-by: Sergio Prado Signed-off-by: Thomas Petazzoni --- ...x-error-when-building-with-uClibc-ng.patch | 54 ------------------- package/stella/stella.hash | 4 +- package/stella/stella.mk | 2 +- 3 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch diff --git a/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch b/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch deleted file mode 100644 index ffbc83187b..0000000000 --- a/package/stella/0003-Fix-error-when-building-with-uClibc-ng.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 36d5c8bc3592b4dffbec222a179c3956787a0694 Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Sat, 9 Sep 2017 15:04:58 -0300 -Subject: [PATCH] Fix error when building with uClibc-ng -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The uClibc-ng C library defines a type called R0 that conflits with a -global variable called R0 from PaddleReader.cxx. - -src/emucore/tia/PaddleReader.cxx:25:3: error: ‘constexpr const double R0’ redeclared as different kind of symbol - R0 = 1.5e3, - ^ -/home/sprado/workspace/build/buildroot/build/stella_uclibc/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/sys/ucontext.h:42:3: note: previous declaration ‘ R0’ - R0 = 0, - ^~ - -So let's redefine R0 as a private member of the PaddleReader class. - -Signed-off-by: Sergio Prado ---- - src/emucore/tia/PaddleReader.cxx | 1 - - src/emucore/tia/PaddleReader.hxx | 2 ++ - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/emucore/tia/PaddleReader.cxx b/src/emucore/tia/PaddleReader.cxx -index 69c828ea6c5c..27ff828200ee 100644 ---- a/src/emucore/tia/PaddleReader.cxx -+++ b/src/emucore/tia/PaddleReader.cxx -@@ -22,7 +22,6 @@ - static constexpr double - C = 68e-9, - RPOT = 1e6, -- R0 = 1.5e3, - USUPP = 5; - - static constexpr double TRIPPOINT_LINES = 379; -diff --git a/src/emucore/tia/PaddleReader.hxx b/src/emucore/tia/PaddleReader.hxx -index 00238a4fe5b5..0032e6efd015 100644 ---- a/src/emucore/tia/PaddleReader.hxx -+++ b/src/emucore/tia/PaddleReader.hxx -@@ -65,6 +65,8 @@ class PaddleReader : public Serializable - - bool myIsDumped; - -+ static constexpr double R0 = 1.5e3; -+ - private: - PaddleReader(const PaddleReader&) = delete; - PaddleReader(PaddleReader&&) = delete; --- -1.9.1 - diff --git a/package/stella/stella.hash b/package/stella/stella.hash index ef17ff75a0..72a28f70a4 100644 --- a/package/stella/stella.hash +++ b/package/stella/stella.hash @@ -1,2 +1,4 @@ # Locally computed: -sha256 74ee708b68340b65519a04a22c61921cdcf69a1d308600c212414b28e9e689ac stella-5.0.2-src.tar.xz +sha256 17aa8c5f08e09c51dd7dd933f93b0a1929d2832bd66f3bd994fa50ebb2b9a2b1 stella-6.0-src.tar.xz +sha256 c946a9ee632ee40111bad6e81c84b3e0bc1e49183b7a809f05d4d371f5f587bb Copyright.txt +sha256 58530d09b6fcb91ae27071be0081af90e6c2d7fdf991d34a29e234a2a5e75455 License.txt diff --git a/package/stella/stella.mk b/package/stella/stella.mk index 158a51109b..a4df6ea659 100644 --- a/package/stella/stella.mk +++ b/package/stella/stella.mk @@ -4,7 +4,7 @@ # ################################################################################ -STELLA_VERSION = 5.0.2 +STELLA_VERSION = 6.0 STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz STELLA_SITE = https://github.com/stella-emu/stella/releases/download/$(STELLA_VERSION) STELLA_LICENSE = GPL-2.0+ From d04b12d19e834c0e7aba52e78c46ff820b93ad69 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2019 11:12:52 +0100 Subject: [PATCH 0100/7482] package/log4cplus: add optional qt5 dependency Signed-off-by: Fabrice Fontaine [Thomas: test BR2_PACKAGE_QT5BASE instead of BR2_PACKAGE_QT5, just for consistency with the package we add to the DEPENDENCIES variable.] Signed-off-by: Thomas Petazzoni --- package/log4cplus/log4cplus.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/log4cplus/log4cplus.mk b/package/log4cplus/log4cplus.mk index 0bc4fc9aa6..82fc7135f4 100644 --- a/package/log4cplus/log4cplus.mk +++ b/package/log4cplus/log4cplus.mk @@ -11,6 +11,13 @@ LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool) LOG4CPLUS_LICENSE_FILES = LICENSE LOG4CPLUS_INSTALL_STAGING = YES +ifeq ($(BR2_PACKAGE_QT5BASE),y) +LOG4CPLUS_DEPENDENCIES += host-pkgconf qt5base +LOG4CPLUS_CONF_OPTS += --with-qt5 +else +LOG4CPLUS_CONF_OPTS += --without-qt5 +endif + ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) LOG4CPLUS_CONF_ENV += LIBS='-latomic' endif From 57a7ed973a20bc021c66aff84a511dc6c460800a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2019 21:42:24 +0100 Subject: [PATCH 0101/7482] package/dmidecode: bump to version 3.2 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/dmidecode/dmidecode.hash | 3 ++- package/dmidecode/dmidecode.mk | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/dmidecode/dmidecode.hash b/package/dmidecode/dmidecode.hash index 1e8154b37d..c6edf4bcac 100644 --- a/package/dmidecode/dmidecode.hash +++ b/package/dmidecode/dmidecode.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d766ce9b25548c59b1e7e930505b4cad9a7bb0b904a1a391fbb604d529781ac0 dmidecode-3.1.tar.xz +sha256 077006fa2da0d06d6383728112f2edef9684e9c8da56752e97cd45a11f838edd dmidecode-3.2.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE diff --git a/package/dmidecode/dmidecode.mk b/package/dmidecode/dmidecode.mk index b6f96b6df8..811565d8e4 100644 --- a/package/dmidecode/dmidecode.mk +++ b/package/dmidecode/dmidecode.mk @@ -4,7 +4,7 @@ # ################################################################################ -DMIDECODE_VERSION = 3.1 +DMIDECODE_VERSION = 3.2 DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode DMIDECODE_LICENSE = GPL-2.0+ From 10a95d545a9fb6cc00f076bd323cbc9ee352590f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Mar 2019 23:08:24 +0100 Subject: [PATCH 0102/7482] package/flashrom: add BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS Fixes: - http://autobuild.buildroot.org/results/22c72369cd5b7a8200bb03564bdc342ed026ccac - http://autobuild.buildroot.org/results/ef6869bc40382145fad1079b79107275c4973494 - http://autobuild.buildroot.org/results/09d857102c469ede1db0bff8aa0dcd82a4001eaf Signed-off-by: Fabrice Fontaine [Thomas: change formatting of new option.] Signed-off-by: Thomas Petazzoni --- package/flashrom/Config.in | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/package/flashrom/Config.in b/package/flashrom/Config.in index cf1f53c1a3..c333c29730 100644 --- a/package/flashrom/Config.in +++ b/package/flashrom/Config.in @@ -1,6 +1,18 @@ +config BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS + bool + default y if BR2_aarch64 || BR2_aarch64_be + default y if BR2_arm || BR2_armeb + default y if BR2_i386 || BR2_x86_64 + default y if BR2_m68k + default y if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el + default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le + default y if BR2_riscv + default y if BR2_sh + default y if BR2_sparc || BR2_sparc64 + config BR2_PACKAGE_FLASHROM bool "flashrom" - depends on !BR2_microblaze && !BR2_xtensa # platform.h + depends on BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS help flashrom is a utility for identifying, reading, writing, verifying and erasing flash chips. It is designed to flash From e68fdaf4146000c5bf331171c719e353e3385aa9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 7 Mar 2019 22:39:17 +0100 Subject: [PATCH 0103/7482] package/wireshark: fix build with uclibc Fixes: - http://autobuild.buildroot.org/results/c41d42fe3489bc63c42e7ce7a9eccb1b4ca7b9b2 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...p-c-remove-unneeded-named-structures.patch | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch diff --git a/package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch b/package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch new file mode 100644 index 0000000000..0a894a282e --- /dev/null +++ b/package/wireshark/0001-packet-gtp-c-remove-unneeded-named-structures.patch @@ -0,0 +1,75 @@ +From 020e25b660250c97c8085e64cf85074ccfcdd06b Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Tue, 5 Mar 2019 20:59:49 +0100 +Subject: [PATCH] packet-gtp.c: remove unneeded named structures + +In uclibc, _header is already in sigcontext.h: + +packet-gtp.c:2361:16: error: redefinition of 'struct _header' + typedef struct _header { + ^~~~~~~ +In file included from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/bits/sigcontext.h:30:0, + from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/signal.h:311, + from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib/gbacktrace.h:36, + from /home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/glib-2.0/glib.h:34, + from ../../epan/proto.h:28, + from ../../epan/packet.h:14, + from packet-gtp.c:43: +/home/dawncrow/buildroot-test/scripts/instance-0/output/host/i686-buildroot-linux-uclibc/sysroot/usr/include/asm/sigcontext.h:173:8: note: originally defined here + struct _header { + +To fix this issue, transform _header and other named structures (with +the exception of gtp_conv_info_t) into unnamed structures + +Fixes: + - http://autobuild.buildroot.org/results/c41d42fe3489bc63c42e7ce7a9eccb1b4ca7b9b2 + +Change-Id: I78116233c2a8dd7c54723b7cb558254bd5143bd2 +Signed-off-by: Fabrice Fontaine +Reviewed-on: https://code.wireshark.org/review/32335 +Petri-Dish: Guy Harris +Tested-by: Petri Dish Buildbot +Reviewed-by: Guy Harris +[Retrieved from: +https://github.com/wireshark/wireshark/commit/020e25b660250c97c8085e64cf85074ccfcdd06b] +--- + epan/dissectors/packet-gtp.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/epan/dissectors/packet-gtp.c b/epan/dissectors/packet-gtp.c +index 4c40e7aa54..971197e4ae 100644 +--- a/epan/dissectors/packet-gtp.c ++++ b/epan/dissectors/packet-gtp.c +@@ -2170,7 +2170,7 @@ GHashTable* session_table; + /* Relation between -> frame */ + wmem_tree_t* frame_tree; + +-typedef struct gtp_info { ++typedef struct { + guint32 teid; + guint32 frame; + } gtp_info_t; +@@ -2482,7 +2482,7 @@ static int decode_gtp_node_addr(tvbuff_t * tvb, int offset, packet_info * pinfo, + static int decode_gtp_priv_ext(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_); + static int decode_gtp_unknown(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree * tree, session_args_t * args _U_); + +-typedef struct _gtp_opt { ++typedef struct { + int optcode; + int (*decode) (tvbuff_t *, int, packet_info *, proto_tree *, session_args_t *); + } gtp_opt_t; +@@ -2661,12 +2661,12 @@ id_to_str(tvbuff_t *tvb, gint offset) + /* Next definitions and function check_field_presence checks if given field + * in GTP packet is compliant with ETSI + */ +-typedef struct _header { ++typedef struct { + guint8 code; + guint8 presence; + } ext_header; + +-typedef struct _message { ++typedef struct { + guint8 code; + ext_header fields[32]; + } _gtp_mess_items; From 332421c683cad932c7cf9a16ed77cef9ac055479 Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Wed, 6 Mar 2019 22:47:21 +0100 Subject: [PATCH 0104/7482] board/freescale/common/imx: fix imx8-bootloader-prepare for i.MX8M The update of imx-mkimage in commit c14d92d439062caa6c94c4a93b20ab18aa20554c broke the imx8-bootloader-prepare.sh script for i.MX8M, used in freescale_imx8mqevk_defconfig The updated mkimage_fit_atf.sh script in imx-mkimage now needs a ATF_LOAD_ADDR variable, which was set to 0x00910000 for i.MX8M. Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- board/freescale/common/imx/imx8-bootloader-prepare.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/common/imx/imx8-bootloader-prepare.sh b/board/freescale/common/imx/imx8-bootloader-prepare.sh index e98e93a857..3b319693ea 100755 --- a/board/freescale/common/imx/imx8-bootloader-prepare.sh +++ b/board/freescale/common/imx/imx8-bootloader-prepare.sh @@ -10,7 +10,7 @@ main () if grep -Eq "^BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y$" ${BR2_CONFIG}; then cat ${BINARIES_DIR}/u-boot-spl.bin ${BINARIES_DIR}/lpddr4_pmu_train_fw.bin > ${BINARIES_DIR}/u-boot-spl-ddr.bin - BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its + BL31=${BINARIES_DIR}/bl31.bin BL33=${BINARIES_DIR}/u-boot.bin ATF_LOAD_ADDR=0x00910000 ${HOST_DIR}/bin/mkimage_fit_atf.sh ${UBOOT_DTB} > ${BINARIES_DIR}/u-boot.its ${HOST_DIR}/bin/mkimage -E -p 0x3000 -f ${BINARIES_DIR}/u-boot.its ${BINARIES_DIR}/u-boot.itb rm -f ${BINARIES_DIR}/u-boot.its From 0843cd1b46c6498cc581eeb2159cb416dbad0e12 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 3 Mar 2019 10:30:00 +0100 Subject: [PATCH 0105/7482] package/sqlcipher: bump to version 4.0.1 Remove three patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...0001-Support-OpenSSL-1.1.0-and-prior.patch | 97 ------------------- ...it-and-cleanup-routines-on-versions-.patch | 42 -------- ...rect-compliation-under-openssl-1.1.x.patch | 48 --------- package/sqlcipher/sqlcipher.hash | 2 +- package/sqlcipher/sqlcipher.mk | 2 +- 5 files changed, 2 insertions(+), 189 deletions(-) delete mode 100644 package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch delete mode 100644 package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch delete mode 100644 package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch diff --git a/package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch b/package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch deleted file mode 100644 index 4fa3e3c768..0000000000 --- a/package/sqlcipher/0001-Support-OpenSSL-1.1.0-and-prior.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 43f71fa7b4c6a20f4078b9098369abb8d38a5617 Mon Sep 17 00:00:00 2001 -From: Nick Parker -Date: Fri, 9 Dec 2016 11:47:39 -0600 -Subject: [PATCH] Support OpenSSL 1.1.0 and prior - -(cherry picked from commit 939c83a007e4724436c3955ae2afd8b11b92d867) -Signed-off-by: Matt Weber ---- - src/crypto_openssl.c | 53 +++++++++++++++++++++++++++++++++++++--------------- - 1 file changed, 38 insertions(+), 15 deletions(-) - -diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c -index 150ab92..6822325 100644 ---- a/src/crypto_openssl.c -+++ b/src/crypto_openssl.c -@@ -47,6 +47,29 @@ static unsigned int openssl_external_init = 0; - static unsigned int openssl_init_count = 0; - static sqlite3_mutex* openssl_rand_mutex = NULL; - -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+static HMAC_CTX *HMAC_CTX_new(void) -+{ -+ HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); -+ if (ctx != NULL) { -+ HMAC_CTX_init(ctx); -+ } -+ return ctx; -+} -+ -+// Per 1.1.0 (https://wiki.openssl.org/index.php/1.1_API_Changes) -+// HMAC_CTX_free should call HMAC_CTX_cleanup, then EVP_MD_CTX_Cleanup. -+// HMAC_CTX_cleanup internally calls EVP_MD_CTX_cleanup so these -+// calls are not needed. -+static void HMAC_CTX_free(HMAC_CTX *ctx) -+{ -+ if (ctx != NULL) { -+ HMAC_CTX_cleanup(ctx); -+ OPENSSL_free(ctx); -+ } -+} -+#endif -+ - static int sqlcipher_openssl_add_random(void *ctx, void *buffer, int length) { - #ifndef SQLCIPHER_OPENSSL_NO_MUTEX_RAND - sqlite3_mutex_enter(openssl_rand_mutex); -@@ -143,14 +166,14 @@ static int sqlcipher_openssl_random (void *ctx, void *buffer, int length) { - } - - static int sqlcipher_openssl_hmac(void *ctx, unsigned char *hmac_key, int key_sz, unsigned char *in, int in_sz, unsigned char *in2, int in2_sz, unsigned char *out) { -- HMAC_CTX hctx; - unsigned int outlen; -- HMAC_CTX_init(&hctx); -- HMAC_Init_ex(&hctx, hmac_key, key_sz, EVP_sha1(), NULL); -- HMAC_Update(&hctx, in, in_sz); -- HMAC_Update(&hctx, in2, in2_sz); -- HMAC_Final(&hctx, out, &outlen); -- HMAC_CTX_cleanup(&hctx); -+ HMAC_CTX* hctx = HMAC_CTX_new(); -+ if(hctx == NULL) return SQLITE_ERROR; -+ HMAC_Init_ex(hctx, hmac_key, key_sz, EVP_sha1(), NULL); -+ HMAC_Update(hctx, in, in_sz); -+ HMAC_Update(hctx, in2, in2_sz); -+ HMAC_Final(hctx, out, &outlen); -+ HMAC_CTX_free(hctx); - return SQLITE_OK; - } - -@@ -160,18 +183,18 @@ static int sqlcipher_openssl_kdf(void *ctx, const unsigned char *pass, int pass_ - } - - static int sqlcipher_openssl_cipher(void *ctx, int mode, unsigned char *key, int key_sz, unsigned char *iv, unsigned char *in, int in_sz, unsigned char *out) { -- EVP_CIPHER_CTX ectx; - int tmp_csz, csz; -- -- EVP_CipherInit(&ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, mode); -- EVP_CIPHER_CTX_set_padding(&ectx, 0); // no padding -- EVP_CipherInit(&ectx, NULL, key, iv, mode); -- EVP_CipherUpdate(&ectx, out, &tmp_csz, in, in_sz); -+ EVP_CIPHER_CTX* ectx = EVP_CIPHER_CTX_new(); -+ if(ectx == NULL) return SQLITE_ERROR; -+ EVP_CipherInit_ex(ectx, ((openssl_ctx *)ctx)->evp_cipher, NULL, NULL, NULL, mode); -+ EVP_CIPHER_CTX_set_padding(ectx, 0); // no padding -+ EVP_CipherInit_ex(ectx, NULL, NULL, key, iv, mode); -+ EVP_CipherUpdate(ectx, out, &tmp_csz, in, in_sz); - csz = tmp_csz; - out += tmp_csz; -- EVP_CipherFinal(&ectx, out, &tmp_csz); -+ EVP_CipherFinal_ex(ectx, out, &tmp_csz); - csz += tmp_csz; -- EVP_CIPHER_CTX_cleanup(&ectx); -+ EVP_CIPHER_CTX_free(ectx); - assert(in_sz == csz); - return SQLITE_OK; - } --- -1.9.1 - diff --git a/package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch b/package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch deleted file mode 100644 index 1585b8d450..0000000000 --- a/package/sqlcipher/0002-Guard-OpenSSL-init-and-cleanup-routines-on-versions-.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 6b4dbecbcfe35d36fea264c04c41b338852d4e88 Mon Sep 17 00:00:00 2001 -From: Nick Parker -Date: Wed, 1 Mar 2017 15:35:43 -0600 -Subject: [PATCH] Guard OpenSSL init and cleanup routines on versions less - than 1.1.0 - -(cherry picked from commit 1c495b933cee3381f1ea6a70edcbcda1754d7409) -Signed-off-by: Matt Weber - -Conflicts: - src/crypto_openssl.c ---- - src/crypto_openssl.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c -index 6822325..09bc2a2 100644 ---- a/src/crypto_openssl.c -+++ b/src/crypto_openssl.c -@@ -102,7 +102,9 @@ static int sqlcipher_openssl_activate(void *ctx) { - - if(openssl_init_count == 0 && openssl_external_init == 0) { - /* if the library was not externally initialized, then should be now */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - OpenSSL_add_all_algorithms(); -+#endif - } - - #ifndef SQLCIPHER_OPENSSL_NO_MUTEX_RAND -@@ -131,7 +133,9 @@ static int sqlcipher_openssl_deactivate(void *ctx) { - Note: this code will only be reached if OpensSSL_add_all_algorithms() - is called by SQLCipher internally. This should prevent SQLCipher from - "cleaning up" openssl when it was initialized externally by the program */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L - EVP_cleanup(); -+#endif - } - #ifndef SQLCIPHER_OPENSSL_NO_MUTEX_RAND - sqlite3_mutex_free(openssl_rand_mutex); --- -1.9.1 - diff --git a/package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch b/package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch deleted file mode 100644 index b15fabcbec..0000000000 --- a/package/sqlcipher/0003-correct-compliation-under-openssl-1.1.x.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3da532754fb2bb7d379d4386a8c3339742edfb0b Mon Sep 17 00:00:00 2001 -From: Stephen Lombardo -Date: Wed, 10 Oct 2018 15:55:49 -0400 -Subject: [PATCH] correct compliation under openssl 1.1.x - -(cherry picked from commit 57ea35296ce7f2c1c93ce79194eea19a008b69ae) -Signed-off-by: Matt Weber - -Conflicts: - src/crypto_openssl.c ---- - src/crypto_openssl.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/crypto_openssl.c b/src/crypto_openssl.c -index 09bc2a2..57a1104 100644 ---- a/src/crypto_openssl.c -+++ b/src/crypto_openssl.c -@@ -47,7 +47,7 @@ static unsigned int openssl_external_init = 0; - static unsigned int openssl_init_count = 0; - static sqlite3_mutex* openssl_rand_mutex = NULL; - --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - static HMAC_CTX *HMAC_CTX_new(void) - { - HMAC_CTX *ctx = OPENSSL_malloc(sizeof(*ctx)); -@@ -102,7 +102,7 @@ static int sqlcipher_openssl_activate(void *ctx) { - - if(openssl_init_count == 0 && openssl_external_init == 0) { - /* if the library was not externally initialized, then should be now */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - OpenSSL_add_all_algorithms(); - #endif - } -@@ -133,7 +133,7 @@ static int sqlcipher_openssl_deactivate(void *ctx) { - Note: this code will only be reached if OpensSSL_add_all_algorithms() - is called by SQLCipher internally. This should prevent SQLCipher from - "cleaning up" openssl when it was initialized externally by the program */ --#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if (defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10100000L) || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000L) - EVP_cleanup(); - #endif - } --- -1.9.1 - diff --git a/package/sqlcipher/sqlcipher.hash b/package/sqlcipher/sqlcipher.hash index 8632cd7a50..9216668536 100644 --- a/package/sqlcipher/sqlcipher.hash +++ b/package/sqlcipher/sqlcipher.hash @@ -1,3 +1,3 @@ # locally computed -sha256 25fa4f4cb38dcf9e52e4d1f46be8fee9c7aaef35b6df96912a216b289e22c2af sqlcipher-v3.2.0.tar.gz +sha256 2f803017378c7479cb791be59b7bad8392a15acddbcc094e4433581fe421f4ca sqlcipher-v4.0.1.tar.gz sha256 3eee3c7964a9becc94d747bd36703d31fc86eb994680b06a61bfd4f2661eaac8 LICENSE diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk index 812ae7fa47..fcca3b7254 100644 --- a/package/sqlcipher/sqlcipher.mk +++ b/package/sqlcipher/sqlcipher.mk @@ -4,7 +4,7 @@ # ################################################################################ -SQLCIPHER_VERSION = v3.2.0 +SQLCIPHER_VERSION = v4.0.1 SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,$(SQLCIPHER_VERSION)) SQLCIPHER_LICENSE = BSD-3-Clause SQLCIPHER_LICENSE_FILES = LICENSE From 24ff9d2c194774cc2114eca8e505af57052e71f8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Mar 2019 23:15:34 +0100 Subject: [PATCH 0106/7482] package/cryptopp: bump to version 8.1.0 - Remove patch (already in version) - Add BSD-3-Clause (CRYPTOGAMS) and Public domain (ChaCha SSE2 and AVX) to LICENSE, see: https://github.com/weidai11/cryptopp/commit/64a89bf352c7eb8ec905b4bf6d1177a56fed0121 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...001-config.h-avx2-depends-on-gcc-4.9.patch | 40 ------------------- package/cryptopp/cryptopp.hash | 6 +-- package/cryptopp/cryptopp.mk | 4 +- 3 files changed, 5 insertions(+), 45 deletions(-) delete mode 100644 package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch diff --git a/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch b/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch deleted file mode 100644 index 7f93bceacf..0000000000 --- a/package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c484938fb4a57430a2e47334f753b1d771aa0f1b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 21 Feb 2019 20:26:24 +0100 -Subject: [PATCH] config.h: avx2 depends on gcc 4.9 - -Build of cryptopp on x86 with gcc 4.8 fails on: -chacha_avx.cpp: In function 'void CryptoPP::ChaCha_OperateKeystream_AVX2(const word32*, const byte*, CryptoPP::byte*, unsigned int)': -chacha_avx.cpp:98:85: error: '_mm256_broadcastsi128_si256' was not declared in this scope - -This is due to the fact that _mm256_broadcastsi128_si256 has been added -only in gcc 4.9: -https://github.com/gcc-mirror/gcc/commit/78e8d5ffbf0ba5031b736d2c6fc6a44605047cbc - -So bump CRYPTOPP_GCC_VERSION from 4.7 to 4.9 for AVX2 support - -Fixes: - - http://autobuild.buildroot.org/results/195e40b34344f773da51a3fbff9d8e76c517eed1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/weidai11/cryptopp/pull/809] ---- - config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.h b/config.h -index eccba009..4516d2b3 100644 ---- a/config.h -+++ b/config.h -@@ -591,7 +591,7 @@ NAMESPACE_END - // Requires Binutils 2.24 - #if !defined(CRYPTOPP_DISABLE_AVX2) && defined(CRYPTOPP_AVX_AVAILABLE) && \ - (defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \ -- (CRYPTOPP_GCC_VERSION >= 40700) || (__INTEL_COMPILER >= 1400) || \ -+ (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1400) || \ - (CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600)) - #define CRYPTOPP_AVX2_AVAILABLE 1 - #endif --- -2.14.1 - diff --git a/package/cryptopp/cryptopp.hash b/package/cryptopp/cryptopp.hash index 8d12a98dab..5d6d8520c2 100644 --- a/package/cryptopp/cryptopp.hash +++ b/package/cryptopp/cryptopp.hash @@ -1,5 +1,5 @@ -# Hash from: https://www.cryptopp.com/release800.html: -sha256 bbfd89b348846b920d97a1d32b88c85caf0d7bb423d4fcfab7c44349aaceb82c cryptopp800.zip +# Hash from: https://www.cryptopp.com/release810.html: +sha256 f609b453e42abbab7163191dfe060964121f04da212e2e4f2f0ebe94b7e806ae cryptopp810.zip # Hash for license file: -sha256 fe5f5f187e6e38ac2f833956fc5c4cab2df08797cff07f540e4ee74f12f7ee5b License.txt +sha256 f29d65ae3f0c8e327284f193524643ffb4d682fcca3e1740a5c6cbab0e720583 License.txt diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index 8e3277a941..dd41b0ec47 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -4,10 +4,10 @@ # ################################################################################ -CRYPTOPP_VERSION = 8.0.0 +CRYPTOPP_VERSION = 8.1.0 CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip CRYPTOPP_SITE = https://cryptopp.com -CRYPTOPP_LICENSE = BSL-1.0 +CRYPTOPP_LICENSE = BSL-1.0, BSD-3-Clause (CRYPTOGAMS), Public domain (ChaCha SSE2 and AVX) CRYPTOPP_LICENSE_FILES = License.txt CRYPTOPP_INSTALL_STAGING = YES From 2dbfe50f4f0943fef53abc9581152f95d3318f95 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 12:31:26 +0100 Subject: [PATCH 0107/7482] package/ncmpc: remove first patch This patch has been rejected by upstream however the issue has been fixed by a different approach since version 0.31 and https://github.com/MusicPlayerDaemon/ncmpc/commit/029523c8a2472e45213e50c1e3eb414245dd9d57 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...e_ptr-error-with-some-old-toolchains.patch | 54 ------------------- ...ild-add-atomic-dependency-for-sparc.patch} | 0 2 files changed, 54 deletions(-) delete mode 100644 package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch rename package/ncmpc/{0002-meson.build-add-atomic-dependency-for-sparc.patch => 0001-meson.build-add-atomic-dependency-for-sparc.patch} (100%) diff --git a/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch b/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch deleted file mode 100644 index 47905d71d7..0000000000 --- a/package/ncmpc/0001-Fix-unique_ptr-error-with-some-old-toolchains.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 63c0c47106007f7b2a791e3e4b062a5424d3dfe8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 12 Aug 2018 09:02:50 +0200 -Subject: [PATCH] Fix unique_ptr error with some old toolchains - -With some "old" toolchains (glibc, uclibc in version 4.9.4, 5.3, 5.4, -5.5 ...), the following error is raised by the compiler: - -../src/screen.cxx:60:29: required from here -/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/ext/new_allocator.h:120:4: -error: no matching function for call to 'std::pair >::pair(const screen_functions*, Page*)' - -[...] - -/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26: -note: candidate: constexpr std::pair<_T1, _T2>::pair(const _T1&, const _T2&) [with _T1 = const screen_functions* const; _T2 = std::unique_ptr] - _GLIBCXX_CONSTEXPR pair(const _T1& __a, const _T2& __b) - ^ -/usr/lfs/v0/rc-buildroot-test/scripts/instance-1/output/host/opt/ext-toolchain/mips-linux-gnu/include/c++/5.3.0/bits/stl_pair.h:112:26: -note: no known conversion for argument 2 from 'Page*' to 'const -std::unique_ptr&' - -This is due to the fact that init function of screen_functions -structure returns Page* but PageMap wants a std::unique_ptr - -To fix this, cast raw pointer into a unique_ptr with an explicit cast - -Fixes: - - http://autobuild.buildroot.net/results/d8a7339d8bdd5cdc6bd1716585d4bcf15a2e8015 - -Signed-off-by: Fabrice Fontaine ---- - src/screen.cxx | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/screen.cxx b/src/screen.cxx -index dd42b25..56afd11 100644 ---- a/src/screen.cxx -+++ b/src/screen.cxx -@@ -56,8 +56,9 @@ ScreenManager::MakePage(const struct screen_functions &sf) - return i; - - auto j = pages.emplace(&sf, -- sf.init(*this, main_window.w, -- main_window.size)); -+ std::unique_ptr(sf.init(*this, -+ main_window.w, -+ main_window.size))); - assert(j.second); - return j.first; - } --- -2.14.1 - diff --git a/package/ncmpc/0002-meson.build-add-atomic-dependency-for-sparc.patch b/package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch similarity index 100% rename from package/ncmpc/0002-meson.build-add-atomic-dependency-for-sparc.patch rename to package/ncmpc/0001-meson.build-add-atomic-dependency-for-sparc.patch From 56c476db99b764c6a1f64a64e0295e96f8a4612f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 12:31:27 +0100 Subject: [PATCH 0108/7482] package/ncmpc: fix build with gcc 5 Fixes: - http://autobuild.buildroot.org/results/655eb4905c6e308d34293658acee4fc4e1fe0bbc Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...TagListPage.cxx-fix-build-with-gcc-5.patch | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch diff --git a/package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch b/package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch new file mode 100644 index 0000000000..fc166a67f4 --- /dev/null +++ b/package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch @@ -0,0 +1,39 @@ +From fc6120f20e3482525ffa70230b8c3d72d979178f Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 9 Mar 2019 12:26:12 +0100 +Subject: [PATCH] src/TagListPage.cxx: fix build with gcc 5 + +Build with gcc 5 fails on: + +FAILED: ncmpc@exe/src_TagListPage.cxx.o +/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/bin/mips-linux-gnu-g++ -Incmpc@exe -I. -I.. -I../src -I../ -I/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/usr/bin/../mips64el-buildroot-linux-gnu/sysroot/usr/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++14 -O3 -DBOOST_NO_IOSTREAM -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED -Wall -Wextra -Wno-deprecated-declarations -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-declarations -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wundef -Wno-non-virtual-dtor -fvisibility=hidden -ffunction-sections -fdata-sections -D_GNU_SOURCE -D_DEFAULT_SOURCE -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -MD -MQ 'ncmpc@exe/src_TagListPage.cxx.o' -MF 'ncmpc@exe/src_TagListPage.cxx.o.d' -o 'ncmpc@exe/src_TagListPage.cxx.o' -c ../src/TagListPage.cxx +../src/TagListPage.cxx: In member function 'TagFilter TagListPage::MakeCursorFilter() const': +../src/TagListPage.cxx:41:12: error: converting to 'TagFilter {aka std::forward_list > >}' from initializer list would use explicit constructor 'std::forward_list<_Tp, _Alloc>::forward_list(const _Alloc&) [with _Tp = std::pair >; _Alloc = std::allocator > >]' + return {}; + +Fix this error by returning {{}} (a list with one empty element) instead +of {}, see: +https://stackoverflow.com/questions/26947704/implicit-conversion-failure-from-initializer-list + +Fixes: + - http://autobuild.buildroot.org/results/655eb4905c6e308d34293658acee4fc4e1fe0bbc + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/47] +--- + src/TagListPage.cxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/TagListPage.cxx b/src/TagListPage.cxx +index e197bae..c7379b4 100644 +--- a/src/TagListPage.cxx ++++ b/src/TagListPage.cxx +@@ -38,7 +38,7 @@ TagListPage::MakeCursorFilter() const noexcept + unsigned i = lw.selected; + if (parent != nullptr) { + if (i == 0) +- return {}; ++ return {{}}; + + --i; + } From bf57446a0b7fbaa75f92d8c05357225846eebafe Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Mar 2019 20:44:11 +0100 Subject: [PATCH 0109/7482] package/mongodb: needs host-python2 mongodb (like gnuradio) needs host-python2 however there is no way to enforce this so add a dependency on !BR2_PACKAGE_PYTHON3. Indeed, if BR2_PACKAGE_PYTHON3 is selected, then buildroot will only build and install host-python-typing for host-python3. This issue was not raised in the previous version of mongodb as host-scons was the only dependency however we now have host-python-typing and host-python-pyyaml dependencies and it does not seem right to enforce python2 on those packages Fixes: - http://autobuild.buildroot.org/results/693bdba2c01a1b69f56d6ee75094a6a0fc3f40b4 Signed-off-by: Fabrice Fontaine [Thomas: propagate dependency to Config.in comment] Signed-off-by: Thomas Petazzoni --- package/mongodb/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/mongodb/Config.in b/package/mongodb/Config.in index 969b8e062f..4696eb7660 100644 --- a/package/mongodb/Config.in +++ b/package/mongodb/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS config BR2_PACKAGE_MONGODB bool "mongodb" depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS + depends on !BR2_PACKAGE_PYTHON3 depends on BR2_TOOLCHAIN_USES_GLIBC # needs glibc malloc_usable_size depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS @@ -38,3 +39,4 @@ comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 6" !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC || \ !BR2_TOOLCHAIN_GCC_AT_LEAST_6 depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS + depends on !BR2_PACKAGE_PYTHON3 From c8c2954649fc55fbc41b2ed5bb74ab7c0cdcb044 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Mar 2019 20:59:52 +0100 Subject: [PATCH 0110/7482] package/reaver: bump to version 1.6.5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/reaver/reaver.hash | 2 +- package/reaver/reaver.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/reaver/reaver.hash b/package/reaver/reaver.hash index 6d2baccdce..9a75215282 100644 --- a/package/reaver/reaver.hash +++ b/package/reaver/reaver.hash @@ -1,3 +1,3 @@ # locally computed -sha256 350a89b068f8b461e6459b739d4f5f301db01f115d75f4d698a1f2830149c412 reaver-9bae55bd30b6d46b42da3a09dc23c8b0f9341996.tar.gz +sha256 e6761d2d4ef9cb2b45fe0a60d6b94048ce4442e4ac209904fe89506ff1e94c44 reaver-v1.6.5.tar.gz sha256 bb40cfd5e9ca6e8465ea3c236f3f2293e8300af1bfe87e72fabe482ae6cc995a docs/LICENSE diff --git a/package/reaver/reaver.mk b/package/reaver/reaver.mk index d9a621a847..328a5c76a3 100644 --- a/package/reaver/reaver.mk +++ b/package/reaver/reaver.mk @@ -6,7 +6,7 @@ # Older repos for this project will not cross-compile easily # while this one works right away -REAVER_VERSION = 9bae55bd30b6d46b42da3a09dc23c8b0f9341996 +REAVER_VERSION = v1.6.5 REAVER_SITE = $(call github,t6x,reaver-wps-fork-t6x,$(REAVER_VERSION)) REAVER_LICENSE = GPL-2.0+ REAVER_LICENSE_FILES = docs/LICENSE From 3102d7d87cd9d8a378bdc1bdadca3ae368311bf4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Mar 2019 21:19:02 +0100 Subject: [PATCH 0111/7482] package/openldap: bump to version 2.4.47 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/openldap/openldap.hash | 10 +++++----- package/openldap/openldap.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/openldap/openldap.hash b/package/openldap/openldap.hash index 37e2673c4b..0b33b8d724 100644 --- a/package/openldap/openldap.hash +++ b/package/openldap/openldap.hash @@ -1,7 +1,7 @@ -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.46.md5 -md5 829016c5a9f45c51adc50073ac6f9fd7 openldap-2.4.46.tgz -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.46.sha1 -sha1 a9ae2273eb9bdd70090dafe0d018a3132606bef6 openldap-2.4.46.tgz +# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.47.md5 +md5 e508f97bfd778fec7799f286e5c07176 openldap-2.4.47.tgz +# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.47.sha1 +sha1 c59d52dd75f7d1c7b02f83725da36c322d439674 openldap-2.4.47.tgz # Locally computed -sha256 9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d openldap-2.4.46.tgz +sha256 f54c5877865233d9ada77c60c0f69b3e0bfd8b1b55889504c650047cc305520b openldap-2.4.47.tgz sha256 310fe25c858a9515fc8c8d7d1f24a67c9496f84a91e0a0e41ea9975b1371e569 LICENSE diff --git a/package/openldap/openldap.mk b/package/openldap/openldap.mk index 3f00f2b7df..9dbab731c3 100644 --- a/package/openldap/openldap.mk +++ b/package/openldap/openldap.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENLDAP_VERSION = 2.4.46 +OPENLDAP_VERSION = 2.4.47 OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release OPENLDAP_LICENSE = OpenLDAP Public License From 50e1d12e073d2f042730fe6cf0b1915df5afb8af Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Mar 2019 22:39:56 +0100 Subject: [PATCH 0112/7482] package/gnuradio: add optional log4cpp dependency Currently, logger component is enabled if log4cpp is found Moreover, it should be noted that log4cpp is now mandatory in latest upstream: https://github.com/gnuradio/gnuradio/commit/d2428961205bf62e6b39966f040f98435e5cc2ed Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/gnuradio/Config.in | 6 ++++++ package/gnuradio/gnuradio.mk | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/package/gnuradio/Config.in b/package/gnuradio/Config.in index 3fdaea850e..6d0669779f 100644 --- a/package/gnuradio/Config.in +++ b/package/gnuradio/Config.in @@ -56,6 +56,12 @@ config BR2_PACKAGE_GNURADIO_FEC help FEC signal processing blocks +config BR2_PACKAGE_GNURADIO_LOG + bool "gr-log support" + select BR2_PACKAGE_LOG4CPP + help + Enable logger component + config BR2_PACKAGE_GNURADIO_PYTHON bool "python support" depends on BR2_PACKAGE_PYTHON diff --git a/package/gnuradio/gnuradio.mk b/package/gnuradio/gnuradio.mk index 202c2213a7..ef9723cb01 100644 --- a/package/gnuradio/gnuradio.mk +++ b/package/gnuradio/gnuradio.mk @@ -115,6 +115,13 @@ else GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF endif +ifeq ($(BR2_PACKAGE_GNURADIO_LOG),y) +GNURADIO_DEPENDENCIES += log4cpp +GNURADIO_CONF_OPTS += -DENABLE_GR_LOG=ON +else +GNURADIO_CONF_OPTS += -DENABLE_GR_LOG=OFF +endif + ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) GNURADIO_DEPENDENCIES += python GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON From 9b2bf1b7458891ae652e3493ae87d1f7c4776a8b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 09:18:32 +0100 Subject: [PATCH 0113/7482] package/xen: fix build with gcc 8.1 Fixes: - http://autobuild.buildroot.org/results/df5abe6ca8b4c8935f3d5c257aef816190771200 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-32-bit-gcc-8-1-non-debug-build-work.patch | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch diff --git a/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch b/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch new file mode 100644 index 0000000000..9c51c554cd --- /dev/null +++ b/package/xen/0004-xenpmd-make-32-bit-gcc-8-1-non-debug-build-work.patch @@ -0,0 +1,79 @@ +From e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8 Mon Sep 17 00:00:00 2001 +From: Wei Liu +Date: Thu, 26 Jul 2018 15:58:54 +0100 +Subject: [PATCH] xenpmd: make 32 bit gcc 8.1 non-debug build work + +32 bit gcc 8.1 non-debug build yields: + +xenpmd.c:354:23: error: '%02x' directive output may be truncated writing between 2 and 8 bytes into a region of size 3 [-Werror=format-truncation=] + snprintf(val, 3, "%02x", + ^~~~ +xenpmd.c:354:22: note: directive argument in the range [40, 2147483778] + snprintf(val, 3, "%02x", + ^~~~~~ +xenpmd.c:354:5: note: 'snprintf' output between 3 and 9 bytes into a destination of size 3 + snprintf(val, 3, "%02x", + ^~~~~~~~~~~~~~~~~~~~~~~~ + (unsigned int)(9*4 + + ~~~~~~~~~~~~~~~~~~~~ + strlen(info->model_number) + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + strlen(info->serial_number) + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + strlen(info->battery_type) + + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + strlen(info->oem_info) + 4)); + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +All info->* used in calculation are 32 bytes long, and the parsing +code makes sure they are null-terminated, so the end result of the +expression won't exceed 255, which should be able to be fit into 3 +bytes in hexadecimal format. + +Add an assertion to make gcc happy. + +Signed-off-by: Wei Liu +Acked-by: Ian Jackson +Signed-off-by: Fabrice Fontaine +[Retrieved from: +https://github.com/xen-project/xen/commit/e75c9dc85fdeeeda0b98d8cd8d784e0508c3ffb8] +--- + tools/xenpmd/xenpmd.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/tools/xenpmd/xenpmd.c b/tools/xenpmd/xenpmd.c +index 56412a9a81c..1c801caa712 100644 +--- a/tools/xenpmd/xenpmd.c ++++ b/tools/xenpmd/xenpmd.c +@@ -40,6 +40,7 @@ + #include + #include + #include ++#include + + /* #define RUN_STANDALONE */ + #define RUN_IN_SIMULATE_MODE +@@ -345,18 +346,17 @@ void write_ulong_lsb_first(char *temp_val, unsigned long val) + void write_battery_info_to_xenstore(struct battery_info *info) + { + char val[1024], string_info[256]; ++ unsigned int len; + + xs_mkdir(xs, XBT_NULL, "/pm"); + + memset(val, 0, 1024); + memset(string_info, 0, 256); + /* write 9 dwords (so 9*4) + length of 4 strings + 4 null terminators */ +- snprintf(val, 3, "%02x", +- (unsigned int)(9*4 + +- strlen(info->model_number) + +- strlen(info->serial_number) + +- strlen(info->battery_type) + +- strlen(info->oem_info) + 4)); ++ len = 9 * 4 + strlen(info->model_number) + strlen(info->serial_number) + ++ strlen(info->battery_type) + strlen(info->oem_info) + 4; ++ assert(len < 255); ++ snprintf(val, 3, "%02x", len); + write_ulong_lsb_first(val+2, info->present); + write_ulong_lsb_first(val+10, info->design_capacity); + write_ulong_lsb_first(val+18, info->last_full_capacity); From fb9c137660aaa8751d67862b3dd8ef14d80b7b08 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 8 Mar 2019 14:27:09 +0100 Subject: [PATCH 0114/7482] package/tpm2-tss: rename tpm2-tss libraries in the help text Since tpm2-tss version 2.0.0, tpm2 libraries have been renamed. libsapi renamed to libtss2-sys https://github.com/tpm2-software/tpm2-tss/commit/5f0ab55d4e46077cb8f0c53a76c5ebd15a088d26 libtcti-device renamed to libtss2-tcti-device libtcti-socket renamed to libtss2-tcti-mssim https://github.com/tpm2-software/tpm2-tss/commit/b8584accbd96e38eaea250e31ed3ea580d2bca27 Signed-off-by: Romain Naour Cc: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/tpm2-tss/Config.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/tpm2-tss/Config.in b/package/tpm2-tss/Config.in index 2fb5b0f213..2d619750f8 100644 --- a/package/tpm2-tss/Config.in +++ b/package/tpm2-tss/Config.in @@ -17,7 +17,7 @@ config BR2_PACKAGE_TPM2_TSS variants may be useful for integration into event-driven programming environments. Both the synchronous and asynchronous API are exposed through a single library: - libsapi. + libtss2-sys. * TPM Command Transmission Interface (TCTI) that is described in the same specification. This API provides a standard @@ -26,10 +26,10 @@ config BR2_PACKAGE_TPM2_TSS implementing the TCTI API will be implemented as a way to abstract various platform specific IPC mechanisms. Currently this repository provides two TCTI implementations: - libtcti-device and libtcti-socket. The prior should be used - for direct access to the TPM through the Linux kernel - driver. The later implements the protocol exposed by the - Microsoft software TPM2 simulator. + libtss2-tcti-device and libtss2-tcti-mssim. The prior should + be used for direct access to the TPM through the Linux + kernel driver. The later implements the protocol exposed by + the Microsoft software TPM2 simulator. https://github.com/tpm2-software/tpm2-tss From 8f297cc033c4a9a9d9f4b9b7b4872a73ab2b684e Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Fri, 8 Mar 2019 14:27:10 +0100 Subject: [PATCH 0115/7482] package/tpm2-abrmd: rename libsapi to libtss2-sys in the help text libsapi was renamed to libtss2-sys in tpm2-tss library: https://github.com/tpm2-software/tpm2-tss/commit/5f0ab55d4e46077cb8f0c53a76c5ebd15a088d26 Signed-off-by: Romain Naour Cc: Carlos Santos Signed-off-by: Thomas Petazzoni --- package/tpm2-abrmd/Config.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/tpm2-abrmd/Config.in b/package/tpm2-abrmd/Config.in index d18f736182..db0ea66112 100644 --- a/package/tpm2-abrmd/Config.in +++ b/package/tpm2-abrmd/Config.in @@ -16,8 +16,8 @@ config BR2_PACKAGE_TPM2_ABRMD The package also provides a client library for interacting with the daemon via TPM Command Transmission Interface (TCTI). - It is intended for use with the SAPI library (libsapi) like - any other TCTI. + It is intended for use with the SAPI library (libtss2-sys) + like any other TCTI. https://github.com/tpm2-software/tpm2-abrmd From bd1ba229bea3cbb55025a69b7a1348a1a5af6ad6 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 15:30:19 +0100 Subject: [PATCH 0116/7482] package/cryptopp: don't build cryptest.exe Replace install target by install-lib target to avoid building and installing cryptest.exe Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/cryptopp/cryptopp.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/cryptopp/cryptopp.mk b/package/cryptopp/cryptopp.mk index dd41b0ec47..59ced7654c 100644 --- a/package/cryptopp/cryptopp.mk +++ b/package/cryptopp/cryptopp.mk @@ -24,7 +24,7 @@ define HOST_CRYPTOPP_BUILD_CMDS endef define HOST_CRYPTOPP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install + $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install-lib endef $(eval $(host-generic-package)) From 4ca3f20347ad98eef9cf862538df058f8f03df88 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 15:42:41 +0100 Subject: [PATCH 0117/7482] Revert "package/ncmpc: fix build with gcc 5" This reverts commit 56c476db99b764c6a1f64a64e0295e96f8a4612f. Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...TagListPage.cxx-fix-build-with-gcc-5.patch | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch diff --git a/package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch b/package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch deleted file mode 100644 index fc166a67f4..0000000000 --- a/package/ncmpc/0002-src-TagListPage.cxx-fix-build-with-gcc-5.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fc6120f20e3482525ffa70230b8c3d72d979178f Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 9 Mar 2019 12:26:12 +0100 -Subject: [PATCH] src/TagListPage.cxx: fix build with gcc 5 - -Build with gcc 5 fails on: - -FAILED: ncmpc@exe/src_TagListPage.cxx.o -/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/bin/mips-linux-gnu-g++ -Incmpc@exe -I. -I.. -I../src -I../ -I/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/usr/bin/../mips64el-buildroot-linux-gnu/sysroot/usr/include -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wnon-virtual-dtor -std=c++14 -O3 -DBOOST_NO_IOSTREAM -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED -Wall -Wextra -Wno-deprecated-declarations -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wmissing-declarations -Wmissing-noreturn -Wmissing-format-attribute -Wredundant-decls -Wundef -Wno-non-virtual-dtor -fvisibility=hidden -ffunction-sections -fdata-sections -D_GNU_SOURCE -D_DEFAULT_SOURCE -pthread -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -MD -MQ 'ncmpc@exe/src_TagListPage.cxx.o' -MF 'ncmpc@exe/src_TagListPage.cxx.o.d' -o 'ncmpc@exe/src_TagListPage.cxx.o' -c ../src/TagListPage.cxx -../src/TagListPage.cxx: In member function 'TagFilter TagListPage::MakeCursorFilter() const': -../src/TagListPage.cxx:41:12: error: converting to 'TagFilter {aka std::forward_list > >}' from initializer list would use explicit constructor 'std::forward_list<_Tp, _Alloc>::forward_list(const _Alloc&) [with _Tp = std::pair >; _Alloc = std::allocator > >]' - return {}; - -Fix this error by returning {{}} (a list with one empty element) instead -of {}, see: -https://stackoverflow.com/questions/26947704/implicit-conversion-failure-from-initializer-list - -Fixes: - - http://autobuild.buildroot.org/results/655eb4905c6e308d34293658acee4fc4e1fe0bbc - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/MusicPlayerDaemon/ncmpc/pull/47] ---- - src/TagListPage.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/TagListPage.cxx b/src/TagListPage.cxx -index e197bae..c7379b4 100644 ---- a/src/TagListPage.cxx -+++ b/src/TagListPage.cxx -@@ -38,7 +38,7 @@ TagListPage::MakeCursorFilter() const noexcept - unsigned i = lw.selected; - if (parent != nullptr) { - if (i == 0) -- return {}; -+ return {{}}; - - --i; - } From 70e0b0565d62dd66755140f5789595c86f81d029 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 15:42:42 +0100 Subject: [PATCH 0118/7482] package/ncmpc: requires gcc >= 6 Following reply from upstream on build failure with gcc 5 (https://github.com/MusicPlayerDaemon/ncmpc/pull/47), enforce gcc >= 6 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ncmpc/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/ncmpc/Config.in b/package/ncmpc/Config.in index 00639b924a..2122bf3543 100644 --- a/package/ncmpc/Config.in +++ b/package/ncmpc/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_NCMPC depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR # boost depends on BR2_TOOLCHAIN_HAS_THREADS # boost - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14 select BR2_PACKAGE_BOOST select BR2_PACKAGE_BOOST_SYSTEM select BR2_PACKAGE_LIBMPDCLIENT @@ -16,7 +16,7 @@ config BR2_PACKAGE_NCMPC http://www.musicpd.org/clients/ncmpc/ -comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 4.9" +comment "ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 6" depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_6 From 7144c8169755b58ffbad27e0e5ff0963df2fda2d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 17:28:15 +0100 Subject: [PATCH 0119/7482] package/sqlcipher: fix static build Fixes: - http://autobuild.buildroot.org/results/ebd8678a56a7dd8679fd4ec3ca1385c04866cc88 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/sqlcipher/sqlcipher.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/sqlcipher/sqlcipher.mk b/package/sqlcipher/sqlcipher.mk index fcca3b7254..4427344120 100644 --- a/package/sqlcipher/sqlcipher.mk +++ b/package/sqlcipher/sqlcipher.mk @@ -33,4 +33,10 @@ else SQLCIPHER_CONF_OPTS += --disable-readline endif +ifeq ($(BR2_STATIC_LIBS),y) +SQLCIPHER_CONF_OPTS += --disable-load-extension +else +SQLCIPHER_CONF_OPTS += --enable-load-extension +endif + $(eval $(autotools-package)) From 1427ec7f4ef907a1bfe5ac9346964f28e434cdde Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 11 Mar 2019 18:32:57 +0100 Subject: [PATCH 0120/7482] package/czmq: remove uneeded werror patch Remove patch and use --disable-Werror to disable -Werror Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-configure.ac-remove-Werror.patch | 32 ------------------- package/czmq/czmq.mk | 4 +-- 2 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 package/czmq/0001-configure.ac-remove-Werror.patch diff --git a/package/czmq/0001-configure.ac-remove-Werror.patch b/package/czmq/0001-configure.ac-remove-Werror.patch deleted file mode 100644 index 2a9454d95e..0000000000 --- a/package/czmq/0001-configure.ac-remove-Werror.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9a195dc573f4eed130773e6ef67efd5f71693e97 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 5 Nov 2016 15:33:57 +0100 -Subject: [PATCH] configure.ac: remove -Werror - --Werror shouldn't be used in releases, as it can break the build with -newer versions of the compiler or the C library, when new warnings -are introduced. - -Signed-off-by: Thomas Petazzoni -[Asaf: Modified for version 4.2.0] -Signed-off-by: Asaf Kahlon ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 6868a99b..9a941545 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -952,7 +952,7 @@ AS_IF([test "x$enable_Werror" = "xyes" || test "x$enable_Werror" = "xauto"], - ])]) - AS_IF([test -n "$CPP"],[AS_IF([$CPP --version 2>&1 | grep 'Free Software Foundation' > /dev/null && test "x$GCC" = "xyes"], - [AC_MSG_NOTICE([Enabling pedantic errors for GNU CPP preprocessor]) -- CPPFLAGS="$CPPFLAGS -pedantic -Werror -Wall -Wc++-compat" -+ CPPFLAGS="$CPPFLAGS -pedantic -Wall -Wc++-compat" - ], - [AC_MSG_NOTICE([Not enabling pedantic errors: preprocessor not supported by this recipe (not GNU CPP)]) - AS_IF([test "x$enable_Werror" = "xyes"], [AC_MSG_ERROR([--enable-Werror=yes was requested and can not be satisfied for CPP: $CPP])]) --- -2.19.1 - diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk index 56dc65f8bc..e6445be42e 100644 --- a/package/czmq/czmq.mk +++ b/package/czmq/czmq.mk @@ -7,8 +7,6 @@ CZMQ_VERSION = 4.2.0 CZMQ_SITE = https://github.com/zeromq/czmq/releases/download/v$(CZMQ_VERSION) -# 0001-configure.ac-remove-Werror.patch touches configure.ac -CZMQ_AUTORECONF = YES CZMQ_INSTALL_STAGING = YES CZMQ_DEPENDENCIES = zeromq host-pkgconf CZMQ_LICENSE = MPL-2.0 @@ -18,4 +16,6 @@ CZMQ_LICENSE_FILES = LICENSE # host-python, so disable asciidoc entirely. CZMQ_CONF_ENV = ac_cv_prog_czmq_have_asciidoc=no +CZMQ_CONF_OPTS = --disable-Werror + $(eval $(autotools-package)) From 82adf608cd19787c9c57fbb8ac15b07ff5164067 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 11 Mar 2019 18:32:58 +0100 Subject: [PATCH 0121/7482] package/czmq: use --without-docs Use --without-docs option instead of setting ac_cv_prog_czmq_have_asciidoc=no Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/czmq/czmq.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/package/czmq/czmq.mk b/package/czmq/czmq.mk index e6445be42e..1c9493cb76 100644 --- a/package/czmq/czmq.mk +++ b/package/czmq/czmq.mk @@ -12,10 +12,6 @@ CZMQ_DEPENDENCIES = zeromq host-pkgconf CZMQ_LICENSE = MPL-2.0 CZMQ_LICENSE_FILES = LICENSE -# asciidoc is a python script that imports unicodedata, which is not in -# host-python, so disable asciidoc entirely. -CZMQ_CONF_ENV = ac_cv_prog_czmq_have_asciidoc=no - -CZMQ_CONF_OPTS = --disable-Werror +CZMQ_CONF_OPTS = --disable-Werror --without-docs $(eval $(autotools-package)) From 428a5029c7ab31bcb85d65f50f0a8b8189fc35e4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 11 Mar 2019 19:42:35 +0100 Subject: [PATCH 0122/7482] package/cracklib: bump to version 2.9.7 - Remove first two patches (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...001-Apply-patch-to-fix-CVE-2016-6318.patch | 106 ------------------ ...at-the-input-as-text-when-formattin.patch} | 0 ...uffer-overflow-processing-long-words.patch | 40 ------- package/cracklib/cracklib.hash | 5 +- package/cracklib/cracklib.mk | 4 +- 5 files changed, 5 insertions(+), 150 deletions(-) delete mode 100644 package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch rename package/cracklib/{0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch => 0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch} (100%) delete mode 100644 package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch diff --git a/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch b/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch deleted file mode 100644 index 6180c4ba55..0000000000 --- a/package/cracklib/0001-Apply-patch-to-fix-CVE-2016-6318.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 47e5dec521ab6243c9b249dd65b93d232d90d6b1 Mon Sep 17 00:00:00 2001 -From: Jan Dittberner -Date: Thu, 25 Aug 2016 17:13:49 +0200 -Subject: [PATCH] Apply patch to fix CVE-2016-6318 - -This patch fixes an issue with a stack-based buffer overflow whne -parsing large GECOS field. See -https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2016-6318 and -https://security-tracker.debian.org/tracker/CVE-2016-6318 for more -information. - -Signed-off-by: Stefan Sørensen ---- - -Status: upstream, not yet released. - - lib/fascist.c | 57 ++++++++++++++++++++++++++++++++----------------------- - 2 files changed, 34 insertions(+), 24 deletions(-) - -diff --git a/lib/fascist.c b/lib/fascist.c -index a996509..d4deb15 100644 ---- a/lib/fascist.c -+++ b/lib/fascist.c -@@ -502,7 +502,7 @@ FascistGecosUser(char *password, const char *user, const char *gecos) - char gbuffer[STRINGSIZE]; - char tbuffer[STRINGSIZE]; - char *uwords[STRINGSIZE]; -- char longbuffer[STRINGSIZE * 2]; -+ char longbuffer[STRINGSIZE]; - - if (gecos == NULL) - gecos = ""; -@@ -583,38 +583,47 @@ FascistGecosUser(char *password, const char *user, const char *gecos) - { - for (i = 0; i < j; i++) - { -- strcpy(longbuffer, uwords[i]); -- strcat(longbuffer, uwords[j]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) + strlen(uwords[j]) < STRINGSIZE) - { -- return _("it is derived from your password entry"); -- } -+ strcpy(longbuffer, uwords[i]); -+ strcat(longbuffer, uwords[j]); - -- strcpy(longbuffer, uwords[j]); -- strcat(longbuffer, uwords[i]); -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derived from your password entry"); -+ } - -- if (GTry(longbuffer, password)) -- { -- return _("it's derived from your password entry"); -- } -+ strcpy(longbuffer, uwords[j]); -+ strcat(longbuffer, uwords[i]); - -- longbuffer[0] = uwords[i][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[j]); -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derived from your password entry"); -+ } -+ } - -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[j]) < STRINGSIZE - 1) - { -- return _("it is derivable from your password entry"); -+ longbuffer[0] = uwords[i][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[j]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it is derivable from your password entry"); -+ } - } - -- longbuffer[0] = uwords[j][0]; -- longbuffer[1] = '\0'; -- strcat(longbuffer, uwords[i]); -- -- if (GTry(longbuffer, password)) -+ if (strlen(uwords[i]) < STRINGSIZE - 1) - { -- return _("it's derivable from your password entry"); -+ longbuffer[0] = uwords[j][0]; -+ longbuffer[1] = '\0'; -+ strcat(longbuffer, uwords[i]); -+ -+ if (GTry(longbuffer, password)) -+ { -+ return _("it's derivable from your password entry"); -+ } - } - } - } --- -2.9.3 - diff --git a/package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch b/package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch similarity index 100% rename from package/cracklib/0003-Force-grep-to-treat-the-input-as-text-when-formattin.patch rename to package/cracklib/0001-Force-grep-to-treat-the-input-as-text-when-formattin.patch diff --git a/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch b/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch deleted file mode 100644 index 63525cc73d..0000000000 --- a/package/cracklib/0002-Fix-a-buffer-overflow-processing-long-words.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 33d7fa4585247cd2247a1ffa032ad245836c6edb Mon Sep 17 00:00:00 2001 -From: Jan Dittberner -Date: Thu, 25 Aug 2016 17:17:53 +0200 -Subject: [PATCH] Fix a buffer overflow processing long words - -A buffer overflow processing long words has been discovered. This commit -applies the patch from -https://build.opensuse.org/package/view_file/Base:System/cracklib/0004-overflow-processing-long-words.patch -by Howard Guo. - -See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835386 and -http://www.openwall.com/lists/oss-security/2016/08/23/8 - -Signed-off-by: Stefan Sørensen ---- - -Status: upstream, not yet released. - - lib/rules.c | 5 ++--- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/lib/rules.c b/lib/rules.c -index d193cc0..3a2aa46 100644 ---- a/lib/rules.c -+++ b/lib/rules.c -@@ -434,9 +434,8 @@ Mangle(input, control) /* returns a pointer to a controlled Mangle */ - { - int limit; - register char *ptr; -- static char area[STRINGSIZE]; -- char area2[STRINGSIZE]; -- area[0] = '\0'; -+ static char area[STRINGSIZE * 2] = {0}; -+ char area2[STRINGSIZE * 2] = {0}; - strcpy(area, input); - - for (ptr = control; *ptr; ptr++) --- -2.9.3 - diff --git a/package/cracklib/cracklib.hash b/package/cracklib/cracklib.hash index 3038a47a36..9bc8e3d28a 100644 --- a/package/cracklib/cracklib.hash +++ b/package/cracklib/cracklib.hash @@ -1,3 +1,4 @@ # Locally calculated -sha256 17cf76943de272fd579ed831a1fd85339b393f8d00bf9e0d17c91e972f583343 cracklib-2.9.6.tar.gz -sha256 27973245225eeb9d0090e97f3dea4197dec99b64d9d3a791a60298f3b021824c cracklib-words-2.9.6.gz +sha256 8b6fd202f3f1d8fa395d3b7a5d821227cfd8bb4a9a584a7ae30cf62cea6287dd cracklib-2.9.7.tar.gz +sha256 7f0c45faf84a2494f15d1e2720394aca4a379163a70c4acad948186c0047d389 cracklib-words-2.9.7.gz +sha256 f18a0811fa0e220ccbc42f661545e77f0388631e209585ed582a1c693029c6aa COPYING.LIB diff --git a/package/cracklib/cracklib.mk b/package/cracklib/cracklib.mk index aeee60d1e7..b9e3dc0d75 100644 --- a/package/cracklib/cracklib.mk +++ b/package/cracklib/cracklib.mk @@ -4,8 +4,8 @@ # ################################################################################ -CRACKLIB_VERSION = 2.9.6 -CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/cracklib-$(CRACKLIB_VERSION) +CRACKLIB_VERSION = 2.9.7 +CRACKLIB_SITE = https://github.com/cracklib/cracklib/releases/download/v$(CRACKLIB_VERSION) CRACKLIB_LICENSE = LGPL-2.1 CRACKLIB_LICENSE_FILES = COPYING.LIB CRACKLIB_INSTALL_STAGING = YES From ee772dad7b76dcc49bc86b5a232ccdcedec60904 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 10 Mar 2019 12:31:53 +0100 Subject: [PATCH 0123/7482] package/wireshark: add optional spandsp dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 5f04af1f29..a917efb5f6 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -145,6 +145,13 @@ else WIRESHARK_CONF_OPTS += --without-snappy endif +ifeq ($(BR2_PACKAGE_SPANDSP),y) +WIRESHARK_CONF_OPTS += --with-spandsp +WIRESHARK_DEPENDENCIES += spandsp +else +WIRESHARK_CONF_OPTS += --without-spandsp +endif + define WIRESHARK_REMOVE_DOCS find $(TARGET_DIR)/usr/share/wireshark -name '*.txt' -print0 \ -o -name '*.html' -print0 | xargs -0 rm -f From f9fd1931410ec7f68e0f310efb9c5f616bb73ea8 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 22:12:36 +0100 Subject: [PATCH 0124/7482] package/mongodb: disable on powerpc64 As stated in SConstruct, the altivec runtime test breaks cross-compilation: "This checks for an altivec optimization we use in full text search. Different versions of gcc appear to put output bytes in different parts of the output vector produced by vec_vbpermq. This configure check looks to see which format the compiler produces. NOTE: This breaks cross compiles, as it relies on checking runtime functionality for the environment we're in." Fixes: - http://autobuild.buildroot.org/results/162198617979a83b66f70ed6013251942ed04d67 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/mongodb/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/mongodb/Config.in b/package/mongodb/Config.in index 4696eb7660..7df502add6 100644 --- a/package/mongodb/Config.in +++ b/package/mongodb/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS bool # ARM needs LDREX/STREX, so ARMv6+ default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 - default y if BR2_aarch64 || BR2_powerpc64 || BR2_x86_64 + default y if BR2_aarch64 || BR2_x86_64 config BR2_PACKAGE_MONGODB bool "mongodb" From 14d6e6df7bcfd7d46811a812610ec87b0b249088 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Mar 2019 14:12:30 +0200 Subject: [PATCH 0125/7482] package/file: security bump to version 5.36 CVE-2019-8906: do_core_note in readelf.c in libmagic.a in file 5.35 has an out-of-bounds read because memcpy is misused. CVE-2019-8904: do_bid_note in readelf.c in libmagic.a in file 5.35 has a stack-based buffer over-read, related to file_printf and file_vprintf. Update license files hashes; removal of trailing white spaces. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/file/file.hash | 12 +++++++----- package/file/file.mk | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/file/file.hash b/package/file/file.hash index c279dff6e1..7948e856ee 100644 --- a/package/file/file.hash +++ b/package/file/file.hash @@ -1,5 +1,7 @@ -# Locally calculated -sha256 f15a50dbbfa83fec0bd1161e8e191b092ec832720e30cd14536e044ac623b20a file-5.34.tar.gz -sha256 3c0ad13c36f891a9b4f951e59eb2fc108065a46f849697cc6fd3cdb41cc23a3d COPYING -sha256 d98ee4d8d95e7d021a5dfc41f137ecc3b624a7b98e8bd793130202d12a21ed57 src/mygetopt.h -sha256 85e358d575ad4ac5b38b623a25b24246ccff3c7e680d930c0a9ff5228fe434b6 src/vasprintf.c +# Locally calculated after verifying signature +# ftp://ftp.astron.com/pub/file/file-5.36.tar.gz.asc +# using key BE04995BA8F90ED0C0C176C471112AB16CB33B3A +sha256 fb608290c0fd2405a8f63e5717abf6d03e22e183fb21884413d1edd918184379 file-5.36.tar.gz +sha256 0bfa856a9930bddadbef95d1be1cf4e163c0be618e76ea3275caaf255283e274 COPYING +sha256 4ccb60d623884ef637af4a5bc16b2cb350163e2135e967655837336019a64462 src/mygetopt.h +sha256 7ac061e1a1c840c4dfa0573aec6f3497676c9295b5ec4190d3576646eb1646bf src/vasprintf.c diff --git a/package/file/file.mk b/package/file/file.mk index b5b12978bc..1a835015a7 100644 --- a/package/file/file.mk +++ b/package/file/file.mk @@ -4,7 +4,7 @@ # ################################################################################ -FILE_VERSION = 5.34 +FILE_VERSION = 5.36 FILE_SITE = ftp://ftp.astron.com/pub/file FILE_DEPENDENCIES = host-file zlib HOST_FILE_DEPENDENCIES = host-zlib From 7ffdc08f04a87b0dd6f2bba250627389ce79a776 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Mar 2019 13:56:27 +0200 Subject: [PATCH 0126/7482] ntp: security bump to version 4.2.8p13 Fixes CVE-2019-8936: Crafted null dereference attack in authenticated mode 6 packet. Drop upstream patches. Update COPYRIGHT file hash; text formatting (line width) changes. Signed-off-by: Baruch Siach Signed-off-by: Peter Korsgaard --- package/ntp/0003-fix-nommu.patch | 29 ------------------- .../0004-fix-work-fork-without-droproot.patch | 26 ----------------- package/ntp/ntp.hash | 8 ++--- package/ntp/ntp.mk | 2 +- 4 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 package/ntp/0003-fix-nommu.patch delete mode 100644 package/ntp/0004-fix-work-fork-without-droproot.patch diff --git a/package/ntp/0003-fix-nommu.patch b/package/ntp/0003-fix-nommu.patch deleted file mode 100644 index 0959fa0ba5..0000000000 --- a/package/ntp/0003-fix-nommu.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix no-MMU build - -The detach_from_terminal() is unused for no-MMU, but it depends on symbols -that are not defined for no-MMU. Don't define detach_from_terminal() when -HAVE_WORKING_FORK is not defined. - -Signed-off-by: Baruch Siach ---- -Upstream status: http://bugs.ntp.org/show_bug.cgi?id=3538 - -diff -Nuar ntp-4.2.8p12.orig/ntpd/ntpd.c ntp-4.2.8p12/ntpd/ntpd.c ---- ntp-4.2.8p12.orig/ntpd/ntpd.c 2018-08-14 14:51:30.000000000 +0300 -+++ ntp-4.2.8p12/ntpd/ntpd.c 2018-10-13 21:25:25.858261249 +0300 -@@ -534,6 +534,7 @@ - * Detach from terminal (much like daemon()) - * Nothe that this function calls exit() - */ -+# ifdef HAVE_WORKING_FORK - static void - detach_from_terminal( - int pipe_fds[2], -@@ -617,6 +618,7 @@ - - return; - } -+# endif /* HAVE_WORKING_FORK */ - - #ifdef HAVE_DROPROOT - /* diff --git a/package/ntp/0004-fix-work-fork-without-droproot.patch b/package/ntp/0004-fix-work-fork-without-droproot.patch deleted file mode 100644 index cb6fec0125..0000000000 --- a/package/ntp/0004-fix-work-fork-without-droproot.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix work_fork build when droproot is disabled - -The set_user_group_ids() depends on HAVE_DROPROOT. When HAVE_DROPROOT is not -enabled, work_fork.c code causes a link failure: - -../libntp/libntp.a(work_fork.o): In function `send_blocking_req_internal': -work_fork.c:(.text+0x498): undefined reference to `set_user_group_ids' - -Make the set_user_group_ids() call depend on HAVE_DROPROOT. - -Signed-off-by: Baruch Siach ---- -Upstream status: http://bugs.ntp.org/show_bug.cgi?id=3539 - ---- ntp-4.2.8p12.orig/libntp/work_fork.c 2018-08-14 14:51:06.000000000 +0300 -+++ ntp-4.2.8p12/libntp/work_fork.c 2018-10-15 21:10:54.580917962 +0300 -@@ -594,7 +594,9 @@ - init_logging("ntp_intres", 0, FALSE); - setup_logfile(NULL); - -+#if defined(HAVE_DROPROOT) - (void) set_user_group_ids(); -+#endif - - /* - * And now back to the portable code diff --git a/package/ntp/ntp.hash b/package/ntp/ntp.hash index 2fd8a8322b..4014936e61 100644 --- a/package/ntp/ntp.hash +++ b/package/ntp/ntp.hash @@ -1,5 +1,5 @@ -# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p12.tar.gz.md5 -md5 1522d66574bae14abb2622746dad2bdc ntp-4.2.8p12.tar.gz +# From https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p13.tar.gz.md5 +md5 ea040ab9b4ca656b5229b89d6b822f13 ntp-4.2.8p13.tar.gz # Calculated based on the hash above -sha256 709b222b5013d77d26bfff532b5ea470a8039497ef29d09363931c036cb30454 ntp-4.2.8p12.tar.gz -sha256 62c87b269365b38b55359b16dfde7ec28c683c722ef489db90afd0f2e478e4a1 COPYRIGHT +sha256 288772cecfcd9a53694ffab108d1825a31ba77f3a8466b0401baeca3bc232a38 ntp-4.2.8p13.tar.gz +sha256 3828da5fc8126889d6a64432288ace08526c490bf5427d799931689069968d91 COPYRIGHT diff --git a/package/ntp/ntp.mk b/package/ntp/ntp.mk index c62d59e81a..d53fcc5d0b 100644 --- a/package/ntp/ntp.mk +++ b/package/ntp/ntp.mk @@ -5,7 +5,7 @@ ################################################################################ NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p12 +NTP_VERSION = $(NTP_VERSION_MAJOR).8p13 NTP_SITE = https://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) NTP_DEPENDENCIES = host-pkgconf libevent NTP_LICENSE = NTP From b821ae3d63440258808e413b1ace53639066046a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 12 Mar 2019 16:10:29 +0100 Subject: [PATCH 0127/7482] package/php: security bump to version 7.3.3 php-7.3.3 fixes a number of security issues (no CVE known, bugtracker issues not yet public): https://secure.php.net/ChangeLog-7.php#7.3.3 Drop 0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch as the flock detection has been removed since commit 9222702633 (Avoid dependency on "struct flock" fields order.) Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- ... 0004-Call-apxs-with-correct-prefix.patch} | 0 ...chanism-is-obviously-linux-so-force-.patch | 82 ------------------- package/php/php.hash | 2 +- package/php/php.mk | 2 +- 4 files changed, 2 insertions(+), 84 deletions(-) rename package/php/{0005-Call-apxs-with-correct-prefix.patch => 0004-Call-apxs-with-correct-prefix.patch} (100%) delete mode 100644 package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch diff --git a/package/php/0005-Call-apxs-with-correct-prefix.patch b/package/php/0004-Call-apxs-with-correct-prefix.patch similarity index 100% rename from package/php/0005-Call-apxs-with-correct-prefix.patch rename to package/php/0004-Call-apxs-with-correct-prefix.patch diff --git a/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch b/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch deleted file mode 100644 index 5c3814f619..0000000000 --- a/package/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch +++ /dev/null @@ -1,82 +0,0 @@ -From bedbd41ef0a5ce80b83a6f6eaebd7c90f0bc5615 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 9 Aug 2016 11:52:19 +0200 -Subject: [PATCH] OPcache: flock mechanism is obviously linux so force it. - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Bernd Kuhls -[Bernd: update for 7.2.12 & 7.3.2] -Signed-off-by: Adam Duskett -[aduskett@gmail.com: Update for 7.3.0] ---- - ext/opcache/config.m4 | 34 ++-------------------------------- - 1 file changed, 2 insertions(+), 32 deletions(-) - -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index fbb9b21..ffddc8e 100644 ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -334,58 +334,8 @@ int main() { - msg=yes],[msg=no],[msg=no]) - AC_MSG_RESULT([$msg]) - --flock_type=unknown --AC_MSG_CHECKING(for struct flock layout) -- --if test "$flock_type" = "unknown"; then --AC_RUN_IFELSE([AC_LANG_SOURCE([[ -- #include -- struct flock lock = { 1, 2, 3, 4, 5, 6, 7 }; -- int main() { -- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 6 && lock.l_len== 7) { -- return 0; -- } -- return 1; -- } --]])], [ -- flock_type=aix64 -- AC_DEFINE([HAVE_FLOCK_AIX64], [], [Struct flock is 64-bit AIX-type]) --], []) --fi -- --if test "$flock_type" = "unknown"; then --AC_RUN_IFELSE([AC_LANG_SOURCE([[ -- #include -- struct flock lock = { 1, 2, 3, 4, 5 }; -- int main() { -- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { -- return 0; -- } -- return 1; -- } --]])], [ -- flock_type=linux -- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) --], []) --fi -- --if test "$flock_type" = "unknown"; then --AC_RUN_IFELSE([AC_LANG_SOURCE([[ -- #include -- struct flock lock = { 1, 2, 3, 4, 5 }; -- int main() { -- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) { -- return 0; -- } -- return 1; -- } --]])], [ -- flock_type=bsd -- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) --], []) --fi -- --AC_MSG_RESULT([$flock_type]) -+flock_type=linux -+AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) - - if test "$flock_type" = "unknown"; then - AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) --- -2.7.4 - diff --git a/package/php/php.hash b/package/php/php.hash index 5d74a28bc7..8a9814d10e 100644 --- a/package/php/php.hash +++ b/package/php/php.hash @@ -1,5 +1,5 @@ # From http://php.net/downloads.php -sha256 010b868b4456644ae227d05ad236c8b0a1f57dc6320e7e5ad75e86c5baf0a9a8 php-7.3.2.tar.xz +sha256 6bb03e79a183d0cb059a6d117bbb2e0679cab667fb713a13c6a16f56bebab9b3 php-7.3.3.tar.xz # License file sha256 f689b8fa63bea7950ce6a21bf52ed88ea0d77673ee76e6de12f51191174d91b8 LICENSE diff --git a/package/php/php.mk b/package/php/php.mk index 061b2f2609..ea6deca7c1 100644 --- a/package/php/php.mk +++ b/package/php/php.mk @@ -4,7 +4,7 @@ # ################################################################################ -PHP_VERSION = 7.3.2 +PHP_VERSION = 7.3.3 PHP_SITE = http://www.php.net/distributions PHP_SOURCE = php-$(PHP_VERSION).tar.xz PHP_INSTALL_STAGING = YES From 7aa057f2f1c78f15e5120fbb0ef177cb5fd94c9f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Mar 2019 17:55:22 +0200 Subject: [PATCH 0128/7482] package/iproute2: bump to version 4.20.0 Drop upstream patch. Renumber the remaining patch. Add upstream patch fixing build with musl libc. Cc: Petr Vorel Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- ...ss-fix-compilation-under-glibc-2.18.patch} | 0 ...rovide-fallback-CLOCK_TAI-definition.patch | 32 ------------------- ...02-f_flower-fix-build-with-musl-libc.patch | 31 ++++++++++++++++++ package/iproute2/iproute2.hash | 2 +- package/iproute2/iproute2.mk | 2 +- 5 files changed, 33 insertions(+), 34 deletions(-) rename package/iproute2/{0002-ss-fix-compilation-under-glibc-2.18.patch => 0001-ss-fix-compilation-under-glibc-2.18.patch} (100%) delete mode 100644 package/iproute2/0001-utils.h-provide-fallback-CLOCK_TAI-definition.patch create mode 100644 package/iproute2/0002-f_flower-fix-build-with-musl-libc.patch diff --git a/package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch b/package/iproute2/0001-ss-fix-compilation-under-glibc-2.18.patch similarity index 100% rename from package/iproute2/0002-ss-fix-compilation-under-glibc-2.18.patch rename to package/iproute2/0001-ss-fix-compilation-under-glibc-2.18.patch diff --git a/package/iproute2/0001-utils.h-provide-fallback-CLOCK_TAI-definition.patch b/package/iproute2/0001-utils.h-provide-fallback-CLOCK_TAI-definition.patch deleted file mode 100644 index c89db2b2eb..0000000000 --- a/package/iproute2/0001-utils.h-provide-fallback-CLOCK_TAI-definition.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 950bf78adc9a3290ed383eaeef01dee6543cfb97 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 27 Oct 2018 17:25:31 +0200 -Subject: [PATCH] utils.h: provide fallback CLOCK_TAI definition - -q_{etf,taprio}.c uses CLOCK_TAI, which isn't exposed by glibc < 2.21 or -uClibc, breaking the build. Provide a fallback definition like it is done -for IPPROTO_MPLS and others. - -Signed-off-by: Peter Korsgaard ---- - include/utils.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/utils.h b/include/utils.h -index 258d630e..685d2c1d 100644 ---- a/include/utils.h -+++ b/include/utils.h -@@ -126,6 +126,10 @@ struct ipx_addr { - #define IPPROTO_MPLS 137 - #endif - -+#ifndef CLOCK_TAI -+# define CLOCK_TAI 11 -+#endif -+ - __u32 get_addr32(const char *name); - int get_addr_1(inet_prefix *dst, const char *arg, int family); - int get_prefix_1(inet_prefix *dst, char *arg, int family); --- -2.11.0 - diff --git a/package/iproute2/0002-f_flower-fix-build-with-musl-libc.patch b/package/iproute2/0002-f_flower-fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..71b652d9d4 --- /dev/null +++ b/package/iproute2/0002-f_flower-fix-build-with-musl-libc.patch @@ -0,0 +1,31 @@ +From 28747146622a49c3e7b5c5b36dc02c6a64124770 Mon Sep 17 00:00:00 2001 +From: Hans Dedecker +Date: Wed, 23 Jan 2019 22:02:31 +0100 +Subject: [PATCH] f_flower: fix build with musl libc + +XATTR_SIZE_MAX requires the usage of linux/limits.h; let's include it + +Signed-off-by: Hans Dedecker +Signed-off-by: Stephen Hemminger +Signed-off-by: Baruch Siach +--- +Upstream status: commit 2874714662 + + tc/f_flower.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tc/f_flower.c b/tc/f_flower.c +index c563666702b5..9659e894dd1f 100644 +--- a/tc/f_flower.c ++++ b/tc/f_flower.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include +-- +2.20.1 + diff --git a/package/iproute2/iproute2.hash b/package/iproute2/iproute2.hash index 00bd1c646a..28862ce19c 100644 --- a/package/iproute2/iproute2.hash +++ b/package/iproute2/iproute2.hash @@ -1,3 +1,3 @@ # From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 d9ec5ca1f47d8a85416fa26e7dc1cbf5d067640eb60e90bdc1c7e5bdc6a29984 iproute2-4.19.0.tar.xz +sha256 c8adaa6a40f888476b23acb283cfa30c0dd55f07b5aa20663ed5ba2ef1f6fda8 iproute2-4.20.0.tar.xz sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 41d0b2c3d9..13b1f90f37 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -4,7 +4,7 @@ # ################################################################################ -IPROUTE2_VERSION = 4.19.0 +IPROUTE2_VERSION = 4.20.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ From 800df729a4ca0bc194dff2f3bec4776008442f85 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Tue, 12 Mar 2019 18:18:25 +0100 Subject: [PATCH 0129/7482] package/lpeg: bump to version 1.0.2 Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- package/lpeg/lpeg.hash | 2 +- package/lpeg/lpeg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/lpeg/lpeg.hash b/package/lpeg/lpeg.hash index da38cc8756..7a20f063f3 100644 --- a/package/lpeg/lpeg.hash +++ b/package/lpeg/lpeg.hash @@ -1,2 +1,2 @@ # computed by luarocks/buildroot -sha256 149be31e0155c4694f77ea7264d9b398dd134eca0d00ff03358d91a6cfb2ea9d lpeg-1.0.1-1.src.rock +sha256 e0d0d687897f06588558168eeb1902ac41a11edd1b58f1aa61b99d0ea0abbfbc lpeg-1.0.2-1.src.rock diff --git a/package/lpeg/lpeg.mk b/package/lpeg/lpeg.mk index 1541f33cc0..cdb2e81a5f 100644 --- a/package/lpeg/lpeg.mk +++ b/package/lpeg/lpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -LPEG_VERSION = 1.0.1-1 +LPEG_VERSION = 1.0.2-1 LPEG_LICENSE = MIT $(eval $(luarocks-package)) From 24cc2eaa335a34633b71a7db7c972ab64b5e7739 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 12 Mar 2019 16:32:14 +0100 Subject: [PATCH 0130/7482] package/mosquitto: bump version to 1.5.8 Bugfix release, fixing a number of issues discovered post-1.5.7 https://mosquitto.org/blog/2019/02/version-1-5-8-released/ Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/mosquitto/mosquitto.hash | 2 +- package/mosquitto/mosquitto.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/mosquitto/mosquitto.hash b/package/mosquitto/mosquitto.hash index 17a467a721..25b9910138 100644 --- a/package/mosquitto/mosquitto.hash +++ b/package/mosquitto/mosquitto.hash @@ -1,5 +1,5 @@ # Locally calculated after checking gpg signature -sha256 d4024c3388502d50be4192991e90d66dfb344376104df3f63846c9f201779955 mosquitto-1.5.7.tar.gz +sha256 78d7e70c3794dc3a1d484b4f2f8d3addebe9c2da3f5a1cebe557f7d13beb0da4 mosquitto-1.5.8.tar.gz # License files sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt diff --git a/package/mosquitto/mosquitto.mk b/package/mosquitto/mosquitto.mk index d17fae5df6..51c0abd0ba 100644 --- a/package/mosquitto/mosquitto.mk +++ b/package/mosquitto/mosquitto.mk @@ -4,7 +4,7 @@ # ################################################################################ -MOSQUITTO_VERSION = 1.5.7 +MOSQUITTO_VERSION = 1.5.8 MOSQUITTO_SITE = https://mosquitto.org/files/source MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 From 55c388d9d4e910f505219dd9868c29370973391a Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Mar 2019 20:48:54 +0200 Subject: [PATCH 0131/7482] package/libgpg-error: bump to version 1.35 Release 1.34 added riscv32 support. Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libgpg-error/Config.in | 8 +++++--- package/libgpg-error/libgpg-error.hash | 4 ++-- package/libgpg-error/libgpg-error.mk | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/libgpg-error/Config.in b/package/libgpg-error/Config.in index dbb554989e..415cd015cf 100644 --- a/package/libgpg-error/Config.in +++ b/package/libgpg-error/Config.in @@ -7,9 +7,9 @@ config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS BR2_mipsel || BR2_mips64 || BR2_mips64el || \ BR2_m68k || BR2_nios2 || BR2_powerpc || \ BR2_powerpc64 || BR2_powerpc64le || BR2_RISCV_64 || \ - BR2_sh4 || BR2_sh4eb || BR2_sh4a || \ - BR2_sh4aeb || BR2_sparc || BR2_sparc64 || \ - BR2_x86_64 + BR2_RISCV_32 || BR2_sh4 || BR2_sh4eb || \ + BR2_sh4a || BR2_sh4aeb || BR2_sparc || \ + BR2_sparc64 || BR2_x86_64 config BR2_PACKAGE_LIBGPG_ERROR bool "libgpg-error" @@ -40,6 +40,8 @@ config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG if BR2_powerpc default "powerpc64-unknown-linux-gnu" \ if BR2_powerpc64 || BR2_powerpc64le + default "riscv32-unknown-linux-gnu" \ + if BR2_RISCV_32 default "riscv64-unknown-linux-gnu" \ if BR2_RISCV_64 default "sh4-unknown-linux-gnu" \ diff --git a/package/libgpg-error/libgpg-error.hash b/package/libgpg-error/libgpg-error.hash index b18ab7e6b6..1b1ea4e7ef 100644 --- a/package/libgpg-error/libgpg-error.hash +++ b/package/libgpg-error/libgpg-error.hash @@ -1,7 +1,7 @@ # Locally calculated after checking pgp signature -# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.33.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/libgpg-error/libgpg-error-1.35.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 5d38826656e746c936e7742d9cde072b50baa3c4c49daa168a56813612bf03ff libgpg-error-1.33.tar.bz2 +sha256 cbd5ee62a8a8c88d48c158fff4fc9ead4132aacd1b4a56eb791f9f997d07e067 libgpg-error-1.35.tar.bz2 # Locally calculated sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 COPYING.LIB diff --git a/package/libgpg-error/libgpg-error.mk b/package/libgpg-error/libgpg-error.mk index d26d92fb05..f081ee4813 100644 --- a/package/libgpg-error/libgpg-error.mk +++ b/package/libgpg-error/libgpg-error.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGPG_ERROR_VERSION = 1.33 +LIBGPG_ERROR_VERSION = 1.35 LIBGPG_ERROR_SITE = https://www.gnupg.org/ftp/gcrypt/libgpg-error LIBGPG_ERROR_SOURCE = libgpg-error-$(LIBGPG_ERROR_VERSION).tar.bz2 LIBGPG_ERROR_LICENSE = GPL-2.0+, LGPL-2.1+ From 32ef40a9d9e359223056aa214386d516010f3991 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Mar 2019 20:48:55 +0200 Subject: [PATCH 0132/7482] package/gnupg2: bump to version 2.2.13 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/gnupg2/gnupg2.hash | 8 ++++---- package/gnupg2/gnupg2.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/gnupg2/gnupg2.hash b/package/gnupg2/gnupg2.hash index f985e11ad3..a9b7d10f67 100644 --- a/package/gnupg2/gnupg2.hash +++ b/package/gnupg2/gnupg2.hash @@ -1,7 +1,7 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2018q4/000433.html -sha1 2aeccc35ea8034306ff7a1072b84abbaa79619c3 gnupg-2.2.12.tar.bz2 +# From https://lists.gnupg.org/pipermail/gnupg-announce/2019q1/000434.html +sha1 66ebc053e2d22f743673d3fbe54453774e4fac58 gnupg-2.2.13.tar.bz2 # Calculated based on the hash above and signature -# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.12.tar.bz2.sig +# https://gnupg.org/ftp/gcrypt/gnupg/gnupg-2.2.13.tar.bz2.sig # using key D8692123C4065DEA5E0F3AB5249B39D24F25E3B6 -sha256 db030f8b4c98640e91300d36d516f1f4f8fe09514a94ea9fc7411ee1a34082cb gnupg-2.2.12.tar.bz2 +sha256 76c787a955f9e6e0ead47c9be700bfb9d454f955a7b7c7e697aa719bac7b11d8 gnupg-2.2.13.tar.bz2 sha256 bc2d6664f6276fa0a72d57633b3ae68dc7dcb677b71018bf08c8e93e509f1357 COPYING diff --git a/package/gnupg2/gnupg2.mk b/package/gnupg2/gnupg2.mk index 9365e960f2..ca6b6293e7 100644 --- a/package/gnupg2/gnupg2.mk +++ b/package/gnupg2/gnupg2.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG2_VERSION = 2.2.12 +GNUPG2_VERSION = 2.2.13 GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 GNUPG2_SITE = https://gnupg.org/ftp/gcrypt/gnupg GNUPG2_LICENSE = GPL-3.0+ From 70fb634c8d71bc70547db3086401a6e545a4ecb0 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 12 Mar 2019 20:12:26 +0100 Subject: [PATCH 0133/7482] package/minetest: bump to version 5.0.0 "5.0.0 is a breaking release and not compatible to the 0.4 series", so update minetest-game package in the same commit. Update GCC dependency to 4.9+. Use LICENSE.txt as license file instead of the README.md. Update license files hash for minetest-game after checking what's changed. Add new license files for minetest-game. https://forum.minetest.net/viewtopic.php?t=22278 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/minetest-game/minetest-game.hash | 21 ++++++++++++++------- package/minetest-game/minetest-game.mk | 9 ++++++++- package/minetest/Config.in | 8 ++++---- package/minetest/minetest.hash | 4 ++-- package/minetest/minetest.mk | 4 ++-- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/package/minetest-game/minetest-game.hash b/package/minetest-game/minetest-game.hash index 52aa10d58f..4299df26c2 100644 --- a/package/minetest-game/minetest-game.hash +++ b/package/minetest-game/minetest-game.hash @@ -1,24 +1,31 @@ # Locally calculated -sha256 f0ab07cb47c1540b2016bf76a36e2eec28b0ea7827bf66fc5447e0c5e5d4495d minetest-game-0.4.17.tar.gz +sha256 83688d802f9d8308acf6f95e6845cdbe1ee1bc088a963a30f94cf72ec7265cf8 minetest-game-5.0.0.tar.gz sha256 f8a254e8d5f6b3ca3873f990986e86c864f943aa5dc9bf56808c5f4bfa509db0 LICENSE.txt -sha256 3382f3bf99566089543621ee3256f7f98bf9364d3b852c5ed08202d435215d7d mods/beds/license.txt +sha256 ed2afed388c470e08edc1104e4ff6d12b68a32a76b8c52d760a99d4d2d7716f3 mods/beds/license.txt +sha256 559749ba0d269b768e1b85bdac0f8b7a0cf100ecb3edd0df8529fe57cd4bfc0d mods/binoculars/license.txt sha256 9e9dbe5236ba70d0337f9879b988c19c6a7b0c902eed202f775200b8bee6980d mods/boats/license.txt sha256 e642798b595fb41901ae695326da9a167b0bd6b4055edec2396672f5f01bb16c mods/bones/license.txt sha256 baf438bc48b7da1b8fc03d37d134473e1c1f33ffe2e926fa650e6d0c64872785 mods/bucket/license.txt +sha256 01370a00e7b2157a07ee21fa4dac9cc108c7449442f612a3e55cfe18b5b03c2b mods/butterflies/license.txt sha256 6196d390ee0b6331766219aa82f31613fffb62476c03cf960190ab8c232b8822 mods/carts/license.txt -sha256 c0eca35bf446b1b9c8a0d1eefa0613bf2996187cd1f9382e7424b3d0b0dd7851 mods/creative/license.txt -sha256 6972a14d2cea9362cda1293284c5a472b1912056e2da215ce43e9c54c80da334 mods/default/license.txt +sha256 b6c3aca8da2f6c272fe431740dda0a349cff419f1f72e55c6de677379fc04169 mods/creative/license.txt +sha256 66f93a58a7418b86f2ca54e8de931f5c38d9f3e07d407c2c095b632fcda72956 mods/default/license.txt sha256 c0c652890fc80af8eefedbcfe1cd0d16b13b14cd1c7105c9c2bc9abe8cf1620c mods/doors/license.txt +sha256 33d0b8726dd27c8f0c96d6dfd611e0e980bbdbb8075fac7476d055518319ec1c mods/dungeon_loot/license.txt sha256 011ebc82e96df3b825777e7531cb5d34cfce1f6ca27b7d3c80793c033d7c4f4e mods/dye/license.txt sha256 163ad77a427a21a900a8fe2333dfc82d115e8e799b7e13ca71f6bd47dcf0ec13 mods/farming/license.txt sha256 61f826be9adee70ef0e37f3bf4891fecc4b027a21637b32981b98220723d6f37 mods/fire/license.txt -sha256 a8647ac7609fdaea96bd0ec58ac5837fd17d049fd450008fd7922162979a292e mods/flowers/license.txt +sha256 d92ac36a0235f4c02f8cfe2137d7d632bd53374c44ead97f20c152dddf475837 mods/flowers/license.txt +sha256 ffbac006d197fcb8e36e9cdda638053ac80eef4e6446bbe36cb94bd28f54ba0b mods/game_commands/license.txt sha256 857f64cd62c13e27f25363584342fe049885b16c6b2392f1ebd7c3a7fb6ca436 mods/give_initial_stuff/license.txt +sha256 dcbab8d7dc4137789958d19471807b37447fd303bced310d7d76d901eefca8ff mods/map/license.txt +sha256 8acd4a18781a508f641b9364a0b491fccb0affd4c638b74b215238d0b0ee7b76 mods/player_api/license.txt sha256 0066e63d682d54a014ad3359794365a1abb87562d2b1e5e32093976d88c295b4 mods/screwdriver/license.txt sha256 b903866d052774e4127952690ce62ca26aa5bc4c2ddd48fceae501fa0d24ed74 mods/sethome/license.txt -sha256 a82dfda1c9feb704997ea42116eb6a15a1f3f99ee8c49215fbbd32d519e8ad74 mods/stairs/license.txt -sha256 1d42ffae6bad0da2e76966532f5f759bbeb5adb395ee4bf7bacca1fdfef745a6 mods/tnt/license.txt +sha256 d74d3e98885a807a1922e3ed2d0af1708b60465a49937f456059e7b9efd4a428 mods/sfinv/license.txt +sha256 eab4c0cb318bb83c13362047a5a0fc5cb650a4e561ceb5a9124e5a1253cbc21a mods/stairs/license.txt +sha256 e0c007cf51c9e77e7ec8b1c65400748c45676e5ed05aecdc4a5bc447e7f2820c mods/tnt/license.txt sha256 a0814bccd28157a160049efeac03864ff4c4dd6a34bc9cfcd3cc62de66fb156a mods/vessels/license.txt sha256 e9ebf1b4b170e64a0ea6e246edd03689aeb859d6560b8372a8081c004b30cb65 mods/walls/license.txt sha256 551b19e2c8b18c143301e090a1ceb5dc5d4ca243cad846de179d693439910816 mods/wool/license.txt diff --git a/package/minetest-game/minetest-game.mk b/package/minetest-game/minetest-game.mk index bef7a63bb1..05471e6738 100644 --- a/package/minetest-game/minetest-game.mk +++ b/package/minetest-game/minetest-game.mk @@ -4,26 +4,33 @@ # ################################################################################ -MINETEST_GAME_VERSION = 0.4.17 +MINETEST_GAME_VERSION = 5.0.0 MINETEST_GAME_SITE = $(call github,minetest,minetest_game,$(MINETEST_GAME_VERSION)) MINETEST_GAME_LICENSE = LGPL-2.1+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, \ CC-BY-SA-4.0, MIT, CC0 1.0, CC-BY-2.0 (mods) MINETEST_GAME_LICENSE_FILES = LICENSE.txt \ mods/beds/license.txt \ + mods/binoculars/license.txt \ mods/boats/license.txt \ mods/bones/license.txt \ mods/bucket/license.txt \ + mods/butterflies/license.txt \ mods/carts/license.txt \ mods/creative/license.txt \ mods/default/license.txt \ mods/doors/license.txt \ + mods/dungeon_loot/license.txt \ mods/dye/license.txt \ mods/farming/license.txt \ mods/fire/license.txt \ mods/flowers/license.txt \ + mods/game_commands/license.txt \ mods/give_initial_stuff/license.txt \ + mods/map/license.txt \ + mods/player_api/license.txt \ mods/screwdriver/license.txt \ mods/sethome/license.txt \ + mods/sfinv/license.txt \ mods/stairs/license.txt \ mods/tnt/license.txt \ mods/vessels/license.txt \ diff --git a/package/minetest/Config.in b/package/minetest/Config.in index 4e8b1d0eef..085525534d 100644 --- a/package/minetest/Config.in +++ b/package/minetest/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_MINETEST bool "minetest" depends on BR2_INSTALL_LIBSTDCPP # irrlicht - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++11 depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_PACKAGE_XORG7 # irrlicht depends on BR2_PACKAGE_HAS_LIBGL # irrlicht @@ -52,15 +52,15 @@ comment "sound support needs a toolchain w/ threads NPTL" endif -comment "minetest needs a toolchain w/ C++, gcc >= 4.7, threads" +comment "minetest needs a toolchain w/ C++, gcc >= 4.9, threads" depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ || !BR2_TOOLCHAIN_HAS_THREADS comment "minetest needs X11 and an OpenGL provider" depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS depends on (BR2_INSTALL_LIBSTDCPP \ - && BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ + && BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 \ && BR2_TOOLCHAIN_HAS_THREADS) depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 diff --git a/package/minetest/minetest.hash b/package/minetest/minetest.hash index e8b8bf2fce..f9f92fbb6c 100644 --- a/package/minetest/minetest.hash +++ b/package/minetest/minetest.hash @@ -1,4 +1,4 @@ # Locally calculated -sha256 cd25d40c53f492325edabd2f6397250f40a61cb9fe4a1d4dd6eb030e0d1ceb59 minetest-0.4.17.1.tar.gz +sha256 1ba816f77dc9dbd5a4995f0c1d482f8f22b9aa75b6d6999dbfd1f3d698363d0a minetest-5.0.0.tar.gz -sha256 e48121374512b8f2fada00ac1c8e100a767e2a2edd2853557ccf1995e35a4be0 README.txt +sha256 03ec12b2ba71d5e31c37bcf2700af2f278141df62e5a2ac0ce056c53bf266e44 LICENSE.txt diff --git a/package/minetest/minetest.mk b/package/minetest/minetest.mk index 8b573a0f4f..69bca691e2 100644 --- a/package/minetest/minetest.mk +++ b/package/minetest/minetest.mk @@ -4,10 +4,10 @@ # ################################################################################ -MINETEST_VERSION = 0.4.17.1 +MINETEST_VERSION = 5.0.0 MINETEST_SITE = $(call github,minetest,minetest,$(MINETEST_VERSION)) MINETEST_LICENSE = LGPL-2.1+ (code), CC-BY-SA-3.0 (textures and sounds) -MINETEST_LICENSE_FILES = README.txt +MINETEST_LICENSE_FILES = LICENSE.txt MINETEST_DEPENDENCIES = gmp irrlicht jsoncpp luajit sqlite zlib From 514de70539de3614a59850bb1ff31b32a22c825f Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Tue, 12 Mar 2019 21:15:36 +0200 Subject: [PATCH 0134/7482] package/btrfs-progs: bump to version 4.20.2 Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/btrfs-progs/btrfs-progs.hash | 2 +- package/btrfs-progs/btrfs-progs.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index 07d55ec332..e7277ddea1 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,5 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 bf0b34f1538c0b6e88f959937b0419678cadbf2ba7044336dcbfb2bcdc28cd74 btrfs-progs-v4.17.1.tar.xz +sha256 890f8b7e162f2bbfaa5c7b23e8b6f791fd3f325239a0510871fa4b45e4a80e7c btrfs-progs-v4.20.2.tar.xz # Locally computed sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 585dcf364c..f3b671914b 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,7 +4,7 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 4.17.1 +BTRFS_PROGS_VERSION = 4.20.2 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib From a5e8c81875a26551e780e409a0647916e626c969 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Tue, 12 Mar 2019 21:20:00 +0100 Subject: [PATCH 0135/7482] package/openjpeg: security bump to latest git version Current git contains fixes for a number of post-2.3.0 security issues: git shortlog --no-merges -i --grep cve --grep overflow --grep zero v2.3.0.. Even Rouault (2): Avoid out-of-bounds write overflow due to uint32 overflow computation on images with huge dimensions. color_apply_icc_profile: avoid potential heap buffer overflow Hugo Lefeuvre (4): convertbmp: fix issues with zero bitmasks jp3d/jpwl convert: fix write stack buffer overflow jp2: convert: fix null pointer dereference convertbmp: detect invalid file dimensions early Karol Babioch (2): jp3d: Replace sprintf() by snprintf() in volumetobin() opj_mj2_extract: Check provided output prefix for length Stefan Weil (1): Fix some potential overflow issues (#1161) Young_X (5): [MJ2] To avoid divisions by zero / undefined behaviour on shift [JPWL] fix CVE-2018-16375 [JPWL] imagetotga(): fix read heap buffer overflow if numcomps < 3 (#987) [JPWL] opj_compress: reorder checks related to code block dimensions to avoid potential int overflow [JP3D] To avoid divisions by zero / undefined behaviour on shift (CVE-2018-14423 ichlubna (1): openjp3d: Int overflow fixed (#1159) setharnold (1): fix unchecked integer multiplication overflow Drop now upstreamed 0004-install-static-lib.patch. Add a hash for the LICENSE file. Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- .../openjpeg/0004-install-static-lib.patch | 27 ------------------- package/openjpeg/openjpeg.hash | 3 ++- package/openjpeg/openjpeg.mk | 4 +-- 3 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 package/openjpeg/0004-install-static-lib.patch diff --git a/package/openjpeg/0004-install-static-lib.patch b/package/openjpeg/0004-install-static-lib.patch deleted file mode 100644 index 4a3bbfa28a..0000000000 --- a/package/openjpeg/0004-install-static-lib.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 66297f07a43d2770a97c8456d20202f3d051d980 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Mon, 9 Oct 2017 11:40:43 +0200 -Subject: [PATCH] Unix build: fix regression of 2.3.0 where a shared-only or - static-only build lacks the installation target for the library (#1019, fixes - regression introduced by 3dfc6ca2bcf06fd1adb6b6b4cecc6c092f08ba0b) - -Downloaded from upstream commit -https://github.com/uclouvain/openjpeg/commit/66297f07a43d2770a97c8456d20202f3d051d980 - -Signed-off-by: Bernd Kuhls ---- - src/lib/openjp2/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt -index 0b4520384..f8990ccf0 100644 ---- a/src/lib/openjp2/CMakeLists.txt -+++ b/src/lib/openjp2/CMakeLists.txt -@@ -99,6 +99,7 @@ else() - set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME} openjp2_static) - else() - add_library(${OPENJPEG_LIBRARY_NAME} ${OPENJPEG_SRCS}) -+ set(INSTALL_LIBS ${OPENJPEG_LIBRARY_NAME}) - endif() - endif() - diff --git a/package/openjpeg/openjpeg.hash b/package/openjpeg/openjpeg.hash index dd3cf26cf0..8a6fda48c4 100644 --- a/package/openjpeg/openjpeg.hash +++ b/package/openjpeg/openjpeg.hash @@ -1,2 +1,3 @@ # Locally computed: -sha256 3dc787c1bb6023ba846c2a0d9b1f6e179f1cd255172bde9eb75b01f1e6c7d71a openjpeg-2.3.0.tar.gz +sha256 3389a1aa908c2b577863da213db3a170df3edbb1432e99ae5fd3f2ac721d69d3 openjpeg-51f097e6d5754ddae93e716276fe8176b44ec548.tar.gz +sha256 a6af136f3e15038a666b61f376612a07d9a4e48cb7c01adbf3e33b3f14ab49b6 LICENSE diff --git a/package/openjpeg/openjpeg.mk b/package/openjpeg/openjpeg.mk index 9a8fdab7a4..6036ab95a3 100644 --- a/package/openjpeg/openjpeg.mk +++ b/package/openjpeg/openjpeg.mk @@ -4,8 +4,8 @@ # ################################################################################ -OPENJPEG_VERSION = 2.3.0 -OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) +OPENJPEG_VERSION = 51f097e6d5754ddae93e716276fe8176b44ec548 +OPENJPEG_SITE = $(call github,uclouvain,openjpeg,$(OPENJPEG_VERSION)) OPENJPEG_LICENSE = BSD-2-Clause OPENJPEG_LICENSE_FILES = LICENSE OPENJPEG_INSTALL_STAGING = YES From fd5bd12379dcacc9ca359a40624148e8c3fea3c3 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 12 Mar 2019 18:55:34 +0100 Subject: [PATCH 0136/7482] Makefile: printvars: don't print anything when VARS is not set Using 'make printvars' for printing all variables is not very useful. E.g. all macros will output some bogus value. In addition, the same can be achieved with 'make -p'. We can simply remove the condition on $(VARS). If VARS is not set, the filter expression will be empty which matches nothing, so nothing is printed. Note that the old behaviour can still be achieved with: make printvars VARS=% Update the 'make help' text to match the new behaviour. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Yann E. MORIN Tested-by: "Yann E. MORIN" Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a64196f9c3..6af8923892 100644 --- a/Makefile +++ b/Makefile @@ -1031,7 +1031,7 @@ $(BUILD_DIR)/.br2-external.in: $(BUILD_DIR) printvars: @: $(foreach V, \ - $(sort $(if $(VARS),$(filter $(VARS),$(.VARIABLES)),$(.VARIABLES))), \ + $(sort $(filter $(VARS),$(.VARIABLES))), \ $(if $(filter-out environment% default automatic, \ $(origin $V)), \ $(if $(QUOTED_VARS),\ @@ -1124,7 +1124,7 @@ help: @echo ' source - download all sources needed for offline-build' @echo ' external-deps - list external packages used' @echo ' legal-info - generate info about license compliance' - @echo ' printvars - dump all the internal variables' + @echo ' printvars - dump internal variables selected with VARS=...' @echo @echo ' make V=0|1 - 0 => quiet build (default), 1 => verbose build' @echo ' make O=dir - Locate all output files in "dir", including .config' From 71d0cddeacc1c626780c9e47345a322b39eaf0c7 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Tue, 12 Mar 2019 18:55:35 +0100 Subject: [PATCH 0137/7482] docs/manual: document new behaviour of 'make printvars' Add a 'VARS=...' setting to the example. To make it clear that several variables can be specified, use two variables in the first example. Only 2 variables are printed, so the ... is removed. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Cc: Yann E. MORIN Acked-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- docs/manual/make-tips.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index ea1d825bef..869b6807dd 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -80,18 +80,18 @@ to xref:ccache[]. .Dumping the internal make variables: -One can dump all the variables known to make, along with their values: +One can dump the variables known to make, along with their values: ---- - $ make -s printvars - VARIABLE=value_of_variable - ... + $ make -s printvars VARS='VARIABLE1 VARIABLE2' + VARIABLE1=value_of_variable + VARIABLE2=value_of_variable ---- It is possible to tweak the output using some variables: - +VARS+ will limit the listing to variables which names match the - specified make-pattern + specified make-patterns - this must be set else nothing is printed - +QUOTED_VARS+, if set to +YES+, will single-quote the value - +RAW_VARS+, if set to +YES+, will print the unexpanded value From 3909423f1ccf186bd064e225ecb064ca1ece0310 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Mon, 11 Mar 2019 22:41:14 -0700 Subject: [PATCH 0138/7482] package/go: set GOCACHE to a host path Set the GOCACHE environment variable properly. It was previously unset, and defaults to $HOME/.cache/go-build. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/go/go.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/package/go/go.mk b/package/go/go.mk index 1558b55e21..4daa2fe093 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -37,13 +37,16 @@ GO_GOARCH = mips64le endif HOST_GO_DEPENDENCIES = host-go-bootstrap +HOST_GO_HOST_CACHE = $(HOST_DIR)/usr/share/host-go-cache HOST_GO_ROOT = $(HOST_DIR)/lib/go +HOST_GO_TARGET_CACHE = $(HOST_DIR)/usr/share/go-cache # For the convienience of target packages. HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) HOST_GO_TARGET_ENV = \ GO111MODULE=off \ GOARCH=$(GO_GOARCH) \ + GOCACHE="$(HOST_GO_TARGET_CACHE)" \ GOROOT="$(HOST_GO_ROOT)" \ CC="$(TARGET_CC)" \ CXX="$(TARGET_CXX)" \ @@ -63,6 +66,7 @@ endif # HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. HOST_GO_MAKE_ENV = \ GO111MODULE=off \ + GOCACHE=$(HOST_GO_HOST_CACHE) \ GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ GOROOT_FINAL=$(HOST_GO_ROOT) \ GOROOT="$(@D)" \ From d0cfe6c8d09dca98770e43ac939153ea0f561bf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= Date: Tue, 12 Mar 2019 11:00:44 +0000 Subject: [PATCH 0139/7482] package/bird: bump to version 2.0.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Adrien Gallouët Signed-off-by: Thomas Petazzoni --- package/bird/bird.hash | 2 +- package/bird/bird.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/bird/bird.hash b/package/bird/bird.hash index 3f3a93b964..5e7296c0ab 100644 --- a/package/bird/bird.hash +++ b/package/bird/bird.hash @@ -1,2 +1,2 @@ -sha256 0f49b38327d3109553acfa662ac0cf0377719226a03c124cd2e0ea2265ecb1de bird-2.0.3.tar.gz +sha256 676010b7517d4159b9af37401c26185f561ffcffeba73690a2ef2fad984714de bird-2.0.4.tar.gz sha256 94c53c84320078920ac1f0d49c81a4e9004512f534521a58bdf145acbcbc2cd2 README diff --git a/package/bird/bird.mk b/package/bird/bird.mk index da2f868070..e165be61c0 100644 --- a/package/bird/bird.mk +++ b/package/bird/bird.mk @@ -4,7 +4,7 @@ # ################################################################################ -BIRD_VERSION = 2.0.3 +BIRD_VERSION = 2.0.4 BIRD_SITE = ftp://bird.network.cz/pub/bird BIRD_LICENSE = GPL-2.0+ BIRD_LICENSE_FILES = README From 9972dc2e8295bbd0dba694bf970133ba99ad25f3 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 11 Mar 2019 23:26:30 +0100 Subject: [PATCH 0140/7482] package/libdrm: amdgpu needs MMU amdgpu test uses fork() so disable amdgpu without MMU Fixes: - http://autobuild.buildroot.org/results/8d6194982c1080e173fcef8212fb06e6dc275d58 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libdrm/Config.in | 1 + package/mesa3d/Config.in | 2 ++ package/x11r7/xdriver_xf86-video-amdgpu/Config.in | 2 ++ 3 files changed, 5 insertions(+) diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in index 581f921968..3cb0e02a41 100644 --- a/package/libdrm/Config.in +++ b/package/libdrm/Config.in @@ -36,6 +36,7 @@ config BR2_PACKAGE_LIBDRM_RADEON config BR2_PACKAGE_LIBDRM_AMDGPU bool "amdgpu" + depends on BR2_USE_MMU # fork() depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC help diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index 5019f2683b..fdd64b0337 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -125,6 +125,7 @@ comment "R600 driver needs a uClibc or glibc toolchain when llvm is enabled" config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI bool "Gallium Radeon SI driver" + depends on BR2_USE_MMU # libdrm depends on BR2_i386 || BR2_x86_64 depends on BR2_PACKAGE_MESA3D_LLVM depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils @@ -141,6 +142,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI # Radeon SI needs libelf # musl is not currently compatible with elfutils comment "Radeon SI driver needs a uClibc or glibc toolchain" + depends on BR2_USE_MMU depends on BR2_PACKAGE_MESA3D_LLVM depends on !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in index 43090c7559..c42255f55c 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in +++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU bool "xf86-video-amdgpu" + depends on BR2_USE_MMU # libdrm depends on BR2_PACKAGE_MESA3D_DRI_DRIVER depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm select BR2_PACKAGE_LIBDRM @@ -11,5 +12,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU AMD GPU video driver comment "xf86-video-amdgpu needs egl/opengl support from mesa3d" + depends on BR2_USE_MMU depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ !BR2_PACKAGE_MESA3D_DRI_DRIVER From f7aafaadc4247144af21f2e035ef72e3d8b001ac Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 10 Mar 2019 11:14:07 +0800 Subject: [PATCH 0141/7482] package/wpewebkit: fix host gcc >= 4.8 check We need host gcc >= 4.8 not host gcc < 4.8. Signed-off-by: James Hilliard Acked-by: Francois Perrad Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

Acked-by: Francois Perrad <francois.perrad@gadz.org>

Reviewed-by: Adrian Perez de Castro Signed-off-by: Thomas Petazzoni --- package/wpewebkit/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/wpewebkit/Config.in b/package/wpewebkit/Config.in index 64e81a95f9..04ebe5452b 100644 --- a/package/wpewebkit/Config.in +++ b/package/wpewebkit/Config.in @@ -33,7 +33,7 @@ comment "wpewebkit needs a toolchain w/ C++, wchar, threads, dynamic library, gc depends on !BR2_BINFMT_FLAT depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || BR2_HOST_GCC_AT_LEAST_4_8 + || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 comment "wpewebkit needs an OpenGL ES w/ EGL backend" depends on BR2_PACKAGE_WPEWEBKIT_ARCH_SUPPORTS From 7ced8fdd2d133e579cd99dda2f4e44badd65009b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 10 Mar 2019 00:03:18 +0100 Subject: [PATCH 0142/7482] package/libcdio-paranoia: bump to version 10.2+2.0.0 Add LIBCDIO_PARANOIA_SOURCE to download a tar.bz2 (tar.gz is not available for this version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/libcdio-paranoia/libcdio-paranoia.hash | 2 +- package/libcdio-paranoia/libcdio-paranoia.mk | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/package/libcdio-paranoia/libcdio-paranoia.hash b/package/libcdio-paranoia/libcdio-paranoia.hash index 33e59ba704..a62620dfd6 100644 --- a/package/libcdio-paranoia/libcdio-paranoia.hash +++ b/package/libcdio-paranoia/libcdio-paranoia.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 d60f82ece97eeb92407a9ee03f3499c8983206672c28ae5e4e22179063c81941 libcdio-paranoia-10.2+0.94+2.tar.gz +sha256 4565c18caf401083c53733e6d2847b6671ba824cff1c7792b9039693d34713c1 libcdio-paranoia-10.2+2.0.0.tar.bz2 sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/libcdio-paranoia/libcdio-paranoia.mk b/package/libcdio-paranoia/libcdio-paranoia.mk index 3281aa0145..32b1f169b4 100644 --- a/package/libcdio-paranoia/libcdio-paranoia.mk +++ b/package/libcdio-paranoia/libcdio-paranoia.mk @@ -4,7 +4,8 @@ # ################################################################################ -LIBCDIO_PARANOIA_VERSION = 10.2+0.94+2 +LIBCDIO_PARANOIA_VERSION = 10.2+2.0.0 +LIBCDIO_PARANOIA_SOURCE = libcdio-paranoia-$(LIBCDIO_PARANOIA_VERSION).tar.bz2 LIBCDIO_PARANOIA_SITE = $(BR2_GNU_MIRROR)/libcdio LIBCDIO_PARANOIA_LICENSE = GPL-3.0+ LIBCDIO_PARANOIA_LICENSE_FILES = COPYING From 7939c4d39bac73ebc5e61f3d0e0a46c11e707021 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 23:38:33 +0100 Subject: [PATCH 0143/7482] package/jpeg-turbo: bump to version 2.0.2 - Remove two patches (already in version) - Update hash of LICENSE.md, clarifications on BSD and zlib were added: https://github.com/libjpeg-turbo/libjpeg-turbo/commit/90e2d7f3fdbfbc00afc2d21c4a5b61eebcd3c849 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...-Fix-int-overflow-segfault-w-big-BMP.patch | 51 ------------------- ...on-t-allow-quantization-w-non-RGB-CS.patch | 39 -------------- package/jpeg-turbo/jpeg-turbo.hash | 10 ++-- package/jpeg-turbo/jpeg-turbo.mk | 2 +- 4 files changed, 6 insertions(+), 96 deletions(-) delete mode 100644 package/jpeg-turbo/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch delete mode 100644 package/jpeg-turbo/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch diff --git a/package/jpeg-turbo/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch b/package/jpeg-turbo/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch deleted file mode 100644 index a10fcf62af..0000000000 --- a/package/jpeg-turbo/0001-tjLoadImage-Fix-int-overflow-segfault-w-big-BMP.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3 Mon Sep 17 00:00:00 2001 -From: DRC -Date: Tue, 1 Jan 2019 18:57:36 -0600 -Subject: [PATCH] tjLoadImage(): Fix int overflow/segfault w/big BMP - -Fixes #304 - -[baruch: drop the ChangeLog.md hunk] -Signed-off-by: Baruch Siach ---- -Upstream status: commit 3d9c64e9f8aa - - ChangeLog.md | 4 ++++ - turbojpeg.c | 9 ++++++--- - 2 files changed, 10 insertions(+), 3 deletions(-) - -diff --git a/turbojpeg.c b/turbojpeg.c -index 90a9ce6a0be8..3f7cd640677f 100644 ---- a/turbojpeg.c -+++ b/turbojpeg.c -@@ -1,5 +1,5 @@ - /* -- * Copyright (C)2009-2018 D. R. Commander. All Rights Reserved. -+ * Copyright (C)2009-2019 D. R. Commander. All Rights Reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: -@@ -1960,7 +1960,8 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width, - int align, int *height, int *pixelFormat, - int flags) - { -- int retval = 0, tempc, pitch; -+ int retval = 0, tempc; -+ size_t pitch; - tjhandle handle = NULL; - tjinstance *this; - j_compress_ptr cinfo = NULL; -@@ -2013,7 +2014,9 @@ DLLEXPORT unsigned char *tjLoadImage(const char *filename, int *width, - *pixelFormat = cs2pf[cinfo->in_color_space]; - - pitch = PAD((*width) * tjPixelSize[*pixelFormat], align); -- if ((dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL) -+ if ((unsigned long long)pitch * (unsigned long long)(*height) > -+ (unsigned long long)((size_t)-1) || -+ (dstBuf = (unsigned char *)malloc(pitch * (*height))) == NULL) - _throwg("tjLoadImage(): Memory allocation failure"); - - if (setjmp(this->jerr.setjmp_buffer)) { --- -2.20.1 - diff --git a/package/jpeg-turbo/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch b/package/jpeg-turbo/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch deleted file mode 100644 index 3e4e5bd082..0000000000 --- a/package/jpeg-turbo/0002-wrbmp.c-Don-t-allow-quantization-w-non-RGB-CS.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f8cca819a4fb42aafa5f70df43c45e8c416d716f Mon Sep 17 00:00:00 2001 -From: DRC -Date: Tue, 1 Jan 2019 20:32:40 -0600 -Subject: [PATCH] wrbmp.c: Don't allow quantization w/ non-RGB CS - -If cinfo->quantize_colors == 1, then jpeg_calc_output_dimensions() will -set cinfo->output_components to 1, and if cinfo->out_color_space is not -RGB (or extended RGB), hilarity will ensue. - -Fixes #305 - -[baruch: drop the ChangeLog.md hunk] -Signed-off-by: Baruch Siach ---- -Upstream status: commit f8cca819a4 - - ChangeLog.md | 4 ++++ - wrbmp.c | 5 +++-- - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/wrbmp.c b/wrbmp.c -index 4bf81426b0ef..239f64eb3c3f 100644 ---- a/wrbmp.c -+++ b/wrbmp.c -@@ -502,8 +502,9 @@ jinit_write_bmp(j_decompress_ptr cinfo, boolean is_os2, - dest->pub.put_pixel_rows = put_gray_rows; - else - dest->pub.put_pixel_rows = put_pixel_rows; -- } else if (cinfo->out_color_space == JCS_RGB565 || -- cinfo->out_color_space == JCS_CMYK) { -+ } else if (!cinfo->quantize_colors && -+ (cinfo->out_color_space == JCS_RGB565 || -+ cinfo->out_color_space == JCS_CMYK)) { - dest->pub.put_pixel_rows = put_pixel_rows; - } else { - ERREXIT(cinfo, JERR_BMP_COLORSPACE); --- -2.20.1 - diff --git a/package/jpeg-turbo/jpeg-turbo.hash b/package/jpeg-turbo/jpeg-turbo.hash index 1779324c51..56b3478ab6 100644 --- a/package/jpeg-turbo/jpeg-turbo.hash +++ b/package/jpeg-turbo/jpeg-turbo.hash @@ -1,7 +1,7 @@ -# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.1/ -sha1 7ea4a288bccbb5a2d5bfad5fb328d4a839853f4e libjpeg-turbo-2.0.1.tar.gz -md5 1b05a66aa9b006fd04ed29f408e68f46 libjpeg-turbo-2.0.1.tar.gz +# From https://sourceforge.net/projects/libjpeg-turbo/files/2.0.2/ +sha1 1cff52d50b81755d0bdcf9055eb22157f39a1695 libjpeg-turbo-2.0.2.tar.gz +md5 79f76fbfb0c6109631332762d10e16d2 libjpeg-turbo-2.0.2.tar.gz # Locally computed -sha256 e5f86cec31df1d39596e0cca619ab1b01f99025a27dafdfc97a30f3a12f866ff libjpeg-turbo-2.0.1.tar.gz -sha256 8412238c5ad95965cf3c3197791e9dea8b5fae505d133449e33ee2fa754fe61e LICENSE.md +sha256 acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed libjpeg-turbo-2.0.2.tar.gz +sha256 69e570a251515ced17d4492256d57c89db77ed949652f88a44c80c1ca9607920 LICENSE.md sha256 82fece2bff2669c476495f0fe70096b154e8bc5b40916a64e99836d9a01c3110 README.ijg diff --git a/package/jpeg-turbo/jpeg-turbo.mk b/package/jpeg-turbo/jpeg-turbo.mk index b848b66899..3735132b2e 100644 --- a/package/jpeg-turbo/jpeg-turbo.mk +++ b/package/jpeg-turbo/jpeg-turbo.mk @@ -4,7 +4,7 @@ # ################################################################################ -JPEG_TURBO_VERSION = 2.0.1 +JPEG_TURBO_VERSION = 2.0.2 JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz JPEG_TURBO_SITE = https://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) JPEG_TURBO_LICENSE = IJG (libjpeg), BSD-3-Clause (TurboJPEG), Zlib (SIMD) From c29385a8132e295d3a743d69ce582068387e7bfa Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 10 Mar 2019 11:44:27 +0100 Subject: [PATCH 0144/7482] package/elf2flt: bump version to fix build with binutils >= 2.32 Binutils added bfd_stdint.h to bfd.h [1], so elf2flt must create a symlink for this header. This issue has been fixed upstream in commit [2]. We keep our local patch 0001-ld-elf2flt-behave-properly-when-called-with-a-name-d.patch as it still hasn't been merged upstream [3]. Fixes (with binutils 2.23): [armv7m-uclibc] https://gitlab.com/kubu93/toolchains-builder/-/jobs/148356410 [m68k-coldfire-uclibc] https://gitlab.com/kubu93/toolchains-builder/-/jobs/148356412 [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=2d5d5a8f0a8b5a03454bf168b7fa7024bb1ebbd8 [2] https://github.com/uclinux-dev/elf2flt/commit/429521f695c6f4212d809a141bfa4417b733f395 [3] https://github.com/uclinux-dev/elf2flt/pull/8 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- ...akefile-fix-build-with-Binutils-2.31.patch | 34 ------------------- package/elf2flt/elf2flt.hash | 2 +- package/elf2flt/elf2flt.mk | 2 +- 3 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch diff --git a/package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch b/package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch deleted file mode 100644 index 825582550b..0000000000 --- a/package/elf2flt/0002-Makefile-fix-build-with-Binutils-2.31.patch +++ /dev/null @@ -1,34 +0,0 @@ -From faf1a1646093fbc5ed279bae1c7250c7dfea56f8 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 17 Jul 2018 16:36:16 +0200 -Subject: [PATCH] Makefile: fix build with Binutils 2.31 - -Binutils added diagnostics.h to bfd.h [1], so elf2flt must create a symlink -for this header. - -Fixes: -https://gitlab.com/free-electrons/toolchains-builder/-/jobs/82284139 - -[1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=95da9854466ada2572b42f5528711a06a2d42db1 - -Signed-off-by: Romain Naour ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index cfad06c..164e306 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -127,7 +127,7 @@ bfd-headers/.stamp: - rm -rf bfd-headers - mkdir bfd-headers - ln -sf $(BFD_INCLUDE_DIR)/bfd.h bfd-headers/bfd.h -- for f in ansidecl filenames hashtab libiberty symcat; do \ -+ for f in ansidecl diagnostics filenames hashtab libiberty symcat; do \ - ln -sf $(BINUTILS_INCLUDE_DIR)/$$f.h bfd-headers/$$f.h || exit 1; \ - done - ln -sf $(BINUTILS_INCLUDE_DIR)/elf bfd-headers/elf --- -2.7.4 - diff --git a/package/elf2flt/elf2flt.hash b/package/elf2flt/elf2flt.hash index 40df62c8c0..773cf35b77 100644 --- a/package/elf2flt/elf2flt.hash +++ b/package/elf2flt/elf2flt.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 7713bd1debd24a94b795b7fc698dc97e306e7cbcc1d0580856c79fe70aac9c45 elf2flt-6d80ab6c93409e796f85da404bde84b841231531.tar.gz +sha256 d63baae6fe0d7fcc50a635be151a6f9e1e83dba30568046a869a395c15bf6284 elf2flt-7e33f28df198c46764021ed14408bd262751e148.tar.gz diff --git a/package/elf2flt/elf2flt.mk b/package/elf2flt/elf2flt.mk index 557f94d338..e7edd8b9de 100644 --- a/package/elf2flt/elf2flt.mk +++ b/package/elf2flt/elf2flt.mk @@ -4,7 +4,7 @@ # ################################################################################ -ELF2FLT_VERSION = 6d80ab6c93409e796f85da404bde84b841231531 +ELF2FLT_VERSION = 7e33f28df198c46764021ed14408bd262751e148 ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,$(ELF2FLT_VERSION)) ELF2FLT_LICENSE = GPL-2.0+ ELF2FLT_LICENSE_FILES = LICENSE.TXT From a4837f29a25e916f12ce472760d41b92ae8ce3d4 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sun, 10 Mar 2019 11:44:28 +0100 Subject: [PATCH 0145/7482] package/binutils: add support for binutils 2.32 Remove upstream ARC and Xtensa patches. Keep all other patches from binutils 2.31.1. See the release note: https://sourceware.org/ml/binutils/2019-02/msg00010.html While testing the Binutils 2.32 version bump, the Qemu xtensa defconfig (that was using a kernel 4.16) needed to be updated with a patch [1] from kernel 4.19 otherwise the kernel doesn't boot with binutils 2.32 [2]. Since then, all Qemu defconfig has been updated by commit [3] to use a 4.19 kernel, so the issue no longer exists. All other architectures has been tested using toolchain-builder [4]. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4119ba211bc4f1bf638f41e50b7a0f329f58aa16 [2] https://www.sourceware.org/ml/binutils/2019-02/msg00015.html [3] fd8a02fd75d652b85f64c1cd7e9adf1ee2329261 [4] https://gitlab.com/kubu93/toolchains-builder/pipelines/45896638 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/binutils/2.32/0001-sh-conf.patch | 48 +++ .../2.32/0002-poison-system-directories.patch | 306 ++++++++++++++++++ package/binutils/Config.in.host | 4 + package/binutils/binutils.hash | 1 + 4 files changed, 359 insertions(+) create mode 100644 package/binutils/2.32/0001-sh-conf.patch create mode 100644 package/binutils/2.32/0002-poison-system-directories.patch diff --git a/package/binutils/2.32/0001-sh-conf.patch b/package/binutils/2.32/0001-sh-conf.patch new file mode 100644 index 0000000000..fff91ae35c --- /dev/null +++ b/package/binutils/2.32/0001-sh-conf.patch @@ -0,0 +1,48 @@ +From 98b2acf2bd3a527d114a9f8931083c2617a2daa9 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:38:13 +0100 +Subject: [PATCH] sh-conf + +Likewise, binutils has no idea about any of these new targets either, so we +fix that up too.. now we're able to actually build a real toolchain for +sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more +inept targets than that one, really. Go look, I promise). + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Thomas: rebase on top of 2.29, in which sh64 support was removed.] +Signed-off-by: Thomas Petazzoni +--- + configure | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 37476459612..66fbc19f9ff 100755 +--- a/configure ++++ b/configure +@@ -3861,7 +3861,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +diff --git a/configure.ac b/configure.ac +index 46501c28826..6c731930884 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1158,7 +1158,7 @@ case "${target}" in + nvptx*-*-*) + noconfigdirs="$noconfigdirs target-libssp target-libstdc++-v3 target-libobjc" + ;; +- sh-*-*) ++ sh*-*-*) + case "${target}" in + sh*-*-elf) + ;; +-- +2.14.5 + diff --git a/package/binutils/2.32/0002-poison-system-directories.patch b/package/binutils/2.32/0002-poison-system-directories.patch new file mode 100644 index 0000000000..98f41e87f3 --- /dev/null +++ b/package/binutils/2.32/0002-poison-system-directories.patch @@ -0,0 +1,306 @@ +From f559402ea868d370ddf25089c68cda2600db3bfa Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Fri, 25 Dec 2015 11:45:38 +0100 +Subject: [PATCH] poison-system-directories + +Patch adapted to binutils 2.23.2 and extended to use +BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. + +[Romain: rebase on top of 2.32] +Signed-off-by: Romain Naour +[Gustavo: adapt to binutils 2.25] +Signed-off-by: Thomas Petazzoni +Signed-off-by: Gustavo Zacarias + +Upstream-Status: Inappropriate [distribution: codesourcery] + +Patch originally created by Mark Hatle, forward-ported to +binutils 2.21 by Scott Garman. + +purpose: warn for uses of system directories when cross linking + +Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 + +2008-07-02 Joseph Myers + + ld/ + * ld.h (args_type): Add error_poison_system_directories. + * ld.texinfo (--error-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.error_poison_system_directories. + * ldmain.c (main): Initialize + command_line.error_poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --error-poison-system-directories. + (parse_args): Handle new option. + +2007-06-13 Joseph Myers + + ld/ + * config.in: Regenerate. + * ld.h (args_type): Add poison_system_directories. + * ld.texinfo (--no-poison-system-directories): Document. + * ldfile.c (ldfile_add_library_path): Check + command_line.poison_system_directories. + * ldmain.c (main): Initialize + command_line.poison_system_directories. + * lexsup.c (enum option_values): Add + OPTION_NO_POISON_SYSTEM_DIRECTORIES. + (ld_options): Add --no-poison-system-directories. + (parse_args): Handle new option. + +2007-04-20 Joseph Myers + + Merge from Sourcery G++ binutils 2.17: + + 2007-03-20 Joseph Myers + Based on patch by Mark Hatle . + ld/ + * configure.ac (--enable-poison-system-directories): New option. + * configure, config.in: Regenerate. + * ldfile.c (ldfile_add_library_path): If + ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, + /usr/lib, /usr/local/lib or /usr/X11R6/lib. + +Signed-off-by: Mark Hatle +Signed-off-by: Scott Garman +--- + ld/config.in | 3 +++ + ld/configure | 14 ++++++++++++++ + ld/configure.ac | 10 ++++++++++ + ld/ld.h | 8 ++++++++ + ld/ld.texi | 12 ++++++++++++ + ld/ldfile.c | 17 +++++++++++++++++ + ld/ldlex.h | 2 ++ + ld/ldmain.c | 2 ++ + ld/lexsup.c | 21 +++++++++++++++++++++ + 9 files changed, 89 insertions(+) + +diff --git a/ld/config.in b/ld/config.in +index d93c9b08300..5da2742beac 100644 +--- a/ld/config.in ++++ b/ld/config.in +@@ -31,6 +31,9 @@ + language is requested. */ + #undef ENABLE_NLS + ++/* Define to warn for use of native system library directories */ ++#undef ENABLE_POISON_SYSTEM_DIRECTORIES ++ + /* Additional extension a shared object might have. */ + #undef EXTRA_SHLIB_EXTENSION + +diff --git a/ld/configure b/ld/configure +index 18ada7808f5..7e7d2f97809 100755 +--- a/ld/configure ++++ b/ld/configure +@@ -822,6 +822,7 @@ with_lib_path + enable_targets + enable_64_bit_bfd + with_sysroot ++enable_poison_system_directories + enable_gold + enable_got + enable_compressed_debug_sections +@@ -1486,6 +1487,8 @@ Optional Features: + --disable-largefile omit support for large files + --enable-targets alternative target configurations + --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) ++ --enable-poison-system-directories ++ warn for use of native system library directories + --enable-gold[=ARG] build gold [ARG={default,yes,no}] + --enable-got= GOT handling scheme (target, single, negative, + multigot) +@@ -15803,7 +15806,18 @@ else + fi + + ++# Check whether --enable-poison-system-directories was given. ++if test "${enable_poison_system_directories+set}" = set; then : ++ enableval=$enable_poison_system_directories; ++else ++ enable_poison_system_directories=no ++fi ++ ++if test "x${enable_poison_system_directories}" = "xyes"; then + ++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h ++ ++fi + + # Check whether --enable-got was given. + if test "${enable_got+set}" = set; then : +diff --git a/ld/configure.ac b/ld/configure.ac +index d335f210917..7f692d93873 100644 +--- a/ld/configure.ac ++++ b/ld/configure.ac +@@ -94,6 +94,16 @@ AC_SUBST(use_sysroot) + AC_SUBST(TARGET_SYSTEM_ROOT) + AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) + ++AC_ARG_ENABLE([poison-system-directories], ++ AS_HELP_STRING([--enable-poison-system-directories], ++ [warn for use of native system library directories]),, ++ [enable_poison_system_directories=no]) ++if test "x${enable_poison_system_directories}" = "xyes"; then ++ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], ++ [1], ++ [Define to warn for use of native system library directories]) ++fi ++ + dnl Use --enable-gold to decide if this linker should be the default. + dnl "install_as_default" is set to false if gold is the default linker. + dnl "installed_linker" is the installed BFD linker name. +diff --git a/ld/ld.h b/ld/ld.h +index b97d977f37b..f3bbd2d55d4 100644 +--- a/ld/ld.h ++++ b/ld/ld.h +@@ -180,6 +180,14 @@ typedef struct + in the linker script. */ + bfd_boolean force_group_allocation; + ++ /* If TRUE (the default) warn for uses of system directories when ++ cross linking. */ ++ bfd_boolean poison_system_directories; ++ ++ /* If TRUE (default FALSE) give an error for uses of system ++ directories when cross linking instead of a warning. */ ++ bfd_boolean error_poison_system_directories; ++ + /* Big or little endian as set on command line. */ + enum endian_enum endian; + +diff --git a/ld/ld.texi b/ld/ld.texi +index 5179af3e0e1..f78bf746822 100644 +--- a/ld/ld.texi ++++ b/ld/ld.texi +@@ -2524,6 +2524,18 @@ string identifying the original linked file does not change. + + Passing @code{none} for @var{style} disables the setting from any + @code{--build-id} options earlier on the command line. ++ ++@kindex --no-poison-system-directories ++@item --no-poison-system-directories ++Do not warn for @option{-L} options using system directories such as ++@file{/usr/lib} when cross linking. This option is intended for use ++in chroot environments when such directories contain the correct ++libraries for the target system rather than the host. ++ ++@kindex --error-poison-system-directories ++@item --error-poison-system-directories ++Give an error instead of a warning for @option{-L} options using ++system directories when cross linking. + @end table + + @c man end +diff --git a/ld/ldfile.c b/ld/ldfile.c +index fcadc08c73f..63e295ce8ae 100644 +--- a/ld/ldfile.c ++++ b/ld/ldfile.c +@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) + new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); + else + new_dirs->name = xstrdup (name); ++ ++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES ++ if (command_line.poison_system_directories ++ && ((!strncmp (name, "/lib", 4)) ++ || (!strncmp (name, "/usr/lib", 8)) ++ || (!strncmp (name, "/usr/local/lib", 14)) ++ || (!strncmp (name, "/usr/X11R6/lib", 14)))) ++ { ++ if (command_line.error_poison_system_directories) ++ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ else ++ einfo (_("%P: warning: library search path \"%s\" is unsafe for " ++ "cross-compilation\n"), name); ++ } ++#endif ++ + } + + /* Try to open a BFD for a lang_input_statement. */ +diff --git a/ld/ldlex.h b/ld/ldlex.h +index 32853debe45..8135361c498 100644 +--- a/ld/ldlex.h ++++ b/ld/ldlex.h +@@ -148,6 +148,8 @@ enum option_values + OPTION_REQUIRE_DEFINED_SYMBOL, + OPTION_ORPHAN_HANDLING, + OPTION_FORCE_GROUP_ALLOCATION, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, + }; + + /* The initial parser states. */ +diff --git a/ld/ldmain.c b/ld/ldmain.c +index 77cdbd0dd29..725512f1260 100644 +--- a/ld/ldmain.c ++++ b/ld/ldmain.c +@@ -269,6 +269,8 @@ main (int argc, char **argv) + command_line.warn_mismatch = TRUE; + command_line.warn_search_mismatch = TRUE; + command_line.check_section_addresses = -1; ++ command_line.poison_system_directories = TRUE; ++ command_line.error_poison_system_directories = FALSE; + + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the +diff --git a/ld/lexsup.c b/ld/lexsup.c +index 88e85c73f49..be4cd492d14 100644 +--- a/ld/lexsup.c ++++ b/ld/lexsup.c +@@ -543,6 +543,14 @@ static const struct ld_option ld_options[] = + { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, + '\0', N_("=MODE"), N_("Control how orphan sections are handled."), + TWO_DASHES }, ++ { {"no-poison-system-directories", no_argument, NULL, ++ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Do not warn for -L options using system directories"), ++ TWO_DASHES }, ++ { {"error-poison-system-directories", no_argument, NULL, ++ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, ++ '\0', NULL, N_("Give an error for -L options using system directories"), ++ TWO_DASHES }, + }; + + #define OPTION_COUNT ARRAY_SIZE (ld_options) +@@ -555,6 +563,7 @@ parse_args (unsigned argc, char **argv) + int ingroup = 0; + char *default_dirlist = NULL; + char *shortopts; ++ char *BR_paranoid_env; + struct option *longopts; + struct option *really_longopts; + int last_optind; +@@ -1543,6 +1552,14 @@ parse_args (unsigned argc, char **argv) + } + break; + ++ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: ++ command_line.poison_system_directories = FALSE; ++ break; ++ ++ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: ++ command_line.error_poison_system_directories = TRUE; ++ break; ++ + case OPTION_PUSH_STATE: + input_flags.pushed = xmemdup (&input_flags, + sizeof (input_flags), +@@ -1586,6 +1603,10 @@ parse_args (unsigned argc, char **argv) + command_line.soname = NULL; + } + ++ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); ++ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) ++ command_line.error_poison_system_directories = TRUE; ++ + while (ingroup) + { + lang_leave_group (); +-- +2.14.5 + diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 924d1749cd..9a2b27c55e 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -30,6 +30,9 @@ config BR2_BINUTILS_VERSION_2_30_X config BR2_BINUTILS_VERSION_2_31_X bool "binutils 2.31.1" +config BR2_BINUTILS_VERSION_2_32_X + bool "binutils 2.32" + config BR2_BINUTILS_VERSION_ARC bool "binutils arc (2.31)" depends on BR2_arc @@ -42,6 +45,7 @@ config BR2_BINUTILS_VERSION default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X default "2.30" if BR2_BINUTILS_VERSION_2_30_X default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X + default "2.32" if BR2_BINUTILS_VERSION_2_32_X config BR2_BINUTILS_ENABLE_LTO bool diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index ac0831ca27..873e0dada4 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -3,6 +3,7 @@ sha512 dc5b6872ae01c07c12d38f3bb7ead06effc6da3265ac872e2d9c6104304f89f85f2645b02 sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e82624ae37fb0bbd03af3b17088a94f60dfe1a86a7ff82e18ece3c24f0fd0 binutils-2.29.1.tar.xz sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz +sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz # Locally calculated (fetched from Github) sha512 a96dfcea6064fcd1aac1333ac0d631491bed8b0be9bdcf62f1447909c8f30d2cb8d9323ffeb7c9ad6b326ecddb72e3d28281684e73343189d0a4a37a11aef62f binutils-gdb-arc-2018.09-release.tar.gz From 9524384192ea42dbfcc3ff84c63b574d91870510 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 21:24:32 +0100 Subject: [PATCH 0146/7482] package/stress-ng: bump to version 0.09.55 Drop three patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ress-ng.h-fix-include-on-semaphore.h.patch | 34 ------------------- ...2-stress-stackmmap-needs-swapcontext.patch | 29 ---------------- ...bsd-wchar-Explicitly-include-stdio.h.patch | 29 ---------------- package/stress-ng/stress-ng.hash | 2 +- package/stress-ng/stress-ng.mk | 2 +- 5 files changed, 2 insertions(+), 94 deletions(-) delete mode 100644 package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch delete mode 100644 package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch delete mode 100644 package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch diff --git a/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch b/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch deleted file mode 100644 index 3d656f3159..0000000000 --- a/package/stress-ng/0001-stress-ng.h-fix-include-on-semaphore.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 818ed67f67c487d519bb55ed5656cff2dd58375e Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 4 Dec 2018 21:41:12 +0100 -Subject: [PATCH] stress-ng.h: fix include on semaphore.h - -semaphore.h is available only if HAVE_LIB_PTHREAD and -HAVE_SEM_POSIX are defined - -Fixes: - - http://autobuild.buildroot.org/results/1c95898b2833683a22bbe2ff8471fa08d94210e1 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/ColinIanKing/stress-ng/commit/9b861e679f9de32e4c68437453756f93e13c01fb] ---- - stress-ng.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/stress-ng.h b/stress-ng.h -index 0485dc1c..1bf2e207 100644 ---- a/stress-ng.h -+++ b/stress-ng.h -@@ -53,7 +53,9 @@ - #include - #include - #include -+#if defined(HAVE_LIB_PTHREAD) && (HAVE_SEM_POSIX) - #include -+#endif - #include - - #if defined(__GNUC__) && defined(__linux__) --- -2.14.1 - diff --git a/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch b/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch deleted file mode 100644 index 8c1bf6025b..0000000000 --- a/package/stress-ng/0002-stress-stackmmap-needs-swapcontext.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 748ac7e88833472211ccce82563beb5050528e00 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 4 Dec 2018 21:52:49 +0100 -Subject: [PATCH] stress-stackmmap: needs swapcontext - -Fixes: - - http://autobuild.buildroot.org/results/f2d3b06afa6e31527a71c03671c8f08eb3f46c36 - -Signed-off-by: Fabrice Fontaine ---- - stress-stackmmap.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/stress-stackmmap.c b/stress-stackmmap.c -index c2f4c31d..eb31d084 100644 ---- a/stress-stackmmap.c -+++ b/stress-stackmmap.c -@@ -24,7 +24,7 @@ - */ - #include "stress-ng.h" - --#if defined(__linux__) -+#if defined(HAVE_SWAPCONTEXT) - - #include - --- -2.14.1 - diff --git a/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch b/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch deleted file mode 100644 index 931aaff2bd..0000000000 --- a/package/stress-ng/0003-test-test-bsd-wchar-Explicitly-include-stdio.h.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 291070801245da26e4841c321910b55016ca23c0 Mon Sep 17 00:00:00 2001 -From: Vadim Kochan -Date: Tue, 1 Jan 2019 17:24:54 +0200 -Subject: [PATCH] test/test-bsd-wchar: Explicitly include stdio.h - -libbsd's wchar requires FILE for some it's functions, for some -reason it is not included by wchar automatically and the test fails. So -include it explicitly. - -Signed-off-by: Vadim Kochan ---- - test/test-bsd-wchar.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/test/test-bsd-wchar.c b/test/test-bsd-wchar.c -index 4f7c7ca..6125968 100644 ---- a/test/test-bsd-wchar.c -+++ b/test/test-bsd-wchar.c -@@ -22,6 +22,7 @@ - * functionality. - * - */ -+#include - #include - - int main(void) --- -2.14.1 - diff --git a/package/stress-ng/stress-ng.hash b/package/stress-ng/stress-ng.hash index c7c6ec0fe8..fd7ab42224 100644 --- a/package/stress-ng/stress-ng.hash +++ b/package/stress-ng/stress-ng.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ed888f5192297855f3ce39b4591b1decc9c580c9753f2cc9c86449f50d23aeb0 stress-ng-0.09.47.tar.xz +sha256 3430e007c4d27c5d79ff177a209d81acc7d3242dbf28effb05ecb92b32a8a03f stress-ng-0.09.55.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/stress-ng/stress-ng.mk b/package/stress-ng/stress-ng.mk index 42b27e3cd9..767af79f25 100644 --- a/package/stress-ng/stress-ng.mk +++ b/package/stress-ng/stress-ng.mk @@ -4,7 +4,7 @@ # ################################################################################ -STRESS_NG_VERSION = 0.09.47 +STRESS_NG_VERSION = 0.09.55 STRESS_NG_SOURCE = stress-ng-$(STRESS_NG_VERSION).tar.xz STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng STRESS_NG_LICENSE = GPL-2.0+ From 8729c4ef881b02ff85b7645b0ad309d6ae44fccf Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 9 Mar 2019 22:32:35 +0100 Subject: [PATCH 0147/7482] package/zbar: bump version to 0.22 - change from git download to official release and download site (drop need for autoreconf) - drop dependency on kernel headers >= 3.17 (should be fixed with commit 'v4l2: make ZBar build and run on Kernels < 3.16' (see [1]), fall back to original kernel headers >= 3.0 dependency propagated from libv4l [1] https://git.linuxtv.org/zbar.git/commit/?id=fa5c48127ec1e3670e28540c2e6a03431ebac5b8 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer/gst-plugins-bad/Config.in | 6 +++--- package/zbar/Config.in | 6 +++--- package/zbar/zbar.hash | 2 +- package/zbar/zbar.mk | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package/gstreamer/gst-plugins-bad/Config.in b/package/gstreamer/gst-plugins-bad/Config.in index 411e4b6174..982edc2e4c 100644 --- a/package/gstreamer/gst-plugins-bad/Config.in +++ b/package/gstreamer/gst-plugins-bad/Config.in @@ -321,12 +321,12 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l depends on BR2_USE_MMU # zbar-> libv4l depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # zbar + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # zbar -> libv4l select BR2_PACKAGE_ZBAR -comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.17" +comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 endif diff --git a/package/zbar/Config.in b/package/zbar/Config.in index e850c1f02b..0f4d115745 100644 --- a/package/zbar/Config.in +++ b/package/zbar/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_ZBAR depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l depends on BR2_USE_MMU # libv4l depends on BR2_INSTALL_LIBSTDCPP # libv4l - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # v4l2_query_ext_ctrl + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l select BR2_PACKAGE_JPEG select BR2_PACKAGE_LIBV4L help @@ -11,7 +11,7 @@ config BR2_PACKAGE_ZBAR https://git.linuxtv.org/zbar.git/about/ -comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.17" +comment "zbar needs a toolchain w/ threads, C++ and headers >= 3.0" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package/zbar/zbar.hash b/package/zbar/zbar.hash index 47a080af12..0f44d0f5c0 100644 --- a/package/zbar/zbar.hash +++ b/package/zbar/zbar.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 7eb73c180c787184ede0f98806c52b23eb9c24609673e1ed51210504ea2937f5 zbar-681b0f305fb5c5bb0df8437f7d740b29a93a7889.tar.gz +sha256 1ba9e94c7217a8bd3800f9f3abddf3ed393a62cdf141a709765aad2788744eb7 zbar-0.22.tar.bz2 sha256 36b6d3fa47916943fd5fec313c584784946047ec1337a78b440e5992cb595f89 LICENSE diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk index 2146aee85b..63220774b9 100644 --- a/package/zbar/zbar.mk +++ b/package/zbar/zbar.mk @@ -4,12 +4,12 @@ # ################################################################################ -ZBAR_VERSION = 681b0f305fb5c5bb0df8437f7d740b29a93a7889 -ZBAR_SITE = git://linuxtv.org/zbar.git +ZBAR_VERSION = 0.22 +ZBAR_SOURCE = zbar-$(ZBAR_VERSION).tar.bz2 +ZBAR_SITE = https://www.linuxtv.org/downloads/zbar ZBAR_LICENSE = LGPL-2.1+ ZBAR_LICENSE_FILES = LICENSE ZBAR_INSTALL_STAGING = YES -ZBAR_AUTORECONF = YES ZBAR_DEPENDENCIES = libv4l jpeg # add host-gettext for AM_ICONV macro ZBAR_DEPENDENCIES += host-gettext From 031a033eb267d1db98c88c87177ebb743e57f839 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 9 Mar 2019 22:50:36 +0100 Subject: [PATCH 0148/7482] package/gst1-plugins-bad: add zbar plugin option Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/gstreamer1/gst1-plugins-bad/Config.in | 13 +++++++++++++ .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index a2ceeb9035..869f0a9d45 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -587,4 +587,17 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 comment "x265 needs a toolchain w/ C++, dynamic library" depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS +config BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR + bool "zbar" + depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l + depends on BR2_USE_MMU # zbar-> libv4l + depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # zbar -> libv4l + select BR2_PACKAGE_ZBAR + +comment "zbar plugin needs a toolchain w/ threads, C++ and headers >= 3.0" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 + endif diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index ac39f1e5ce..f5b081f972 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -57,7 +57,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \ --disable-gme \ --disable-vdpau \ --disable-schro \ - --disable-zbar \ --disable-spandsp \ --disable-gtk3 @@ -719,6 +718,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-x265 endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_ZBAR),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-zbar +GST1_PLUGINS_BAD_DEPENDENCIES += zbar +else +GST1_PLUGINS_BAD_CONF_OPTS += --disable-zbar +endif + # Add GPL license if GPL licensed plugins enabled. ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), GPL-2.0+ From 15892d5656c6da7f8f58066df013a6ff428897bf Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 12 Mar 2019 13:09:32 +0100 Subject: [PATCH 0149/7482] toolchain: prepare to pass more additional CFLAGS via the wrapper Currently, we pass the user-supplied so-called target optimisation flags to the wrapper. We're going to have additional such CFLAGS to pass, so push-back the formatting loop to quote the options at the last moment. Reported-by: Arnout Vandecappelle Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- toolchain/toolchain-wrapper.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index 613f5f6c56..c9e6fd3f3d 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -16,11 +16,13 @@ endif TOOLCHAIN_WRAPPER_ARGS = $($(PKG)_TOOLCHAIN_WRAPPER_ARGS) TOOLCHAIN_WRAPPER_ARGS += -DBR_SYSROOT='"$(STAGING_SUBDIR)"' +TOOLCHAIN_WRAPPER_OPTS = \ + $(call qstrip,$(BR2_TARGET_OPTIMIZATION)) + # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a # separate argument when used in execv() by the toolchain wrapper. -TOOLCHAIN_WRAPPER_OPTS = \ - $(foreach f,$(call qstrip,$(BR2_TARGET_OPTIMIZATION)),"$(f)"$(comma)) -TOOLCHAIN_WRAPPER_ARGS += -DBR_ADDITIONAL_CFLAGS='$(TOOLCHAIN_WRAPPER_OPTS)' +TOOLCHAIN_WRAPPER_ARGS += \ + -DBR_ADDITIONAL_CFLAGS='$(foreach f,$(TOOLCHAIN_WRAPPER_OPTS),"$(f)"$(comma))' ifeq ($(BR2_CCACHE),y) TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE From b8ec113eb18b3699369e1c08e05baaac36383e42 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 12 Mar 2019 13:09:33 +0100 Subject: [PATCH 0150/7482] toolchain: set the ssp gcc option in kconfig Currently, we repeat all the SSP level selection deep down to the toolchain wrapper itself, where we eventually translate it to the actual SSP option to use. This is a bit redundant. Additionally, we will want to check that the toolchain actually supports that option (for those toolchain where it was backported). So, move the translation into kconfig, and add the qstrip'ed value to the additional flags passed to the wrapper. Add it before user-supplied opitons, to keep the previous behaviour (and allow anyone crazy-enough to override it with BR2_TARGET_OPTIMIZATION). Signed-off-by: "Yann E. MORIN" Cc: Matt Weber Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Reviewed-by: Matthew Weber Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- Config.in | 6 ++++++ toolchain/toolchain-wrapper.c | 9 --------- toolchain/toolchain-wrapper.mk | 9 +-------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/Config.in b/Config.in index d58d8dc04a..757ad1ca40 100644 --- a/Config.in +++ b/Config.in @@ -764,6 +764,12 @@ config BR2_SSP_ALL endchoice +config BR2_SSP_OPTION + string + default "-fstack-protector" if BR2_SSP_REGULAR + default "-fstack-protector-strong" if BR2_SSP_STRONG + default "-fstack-protector-all" if BR2_SSP_ALL + comment "Stack Smashing Protection needs a toolchain w/ SSP" depends on !BR2_TOOLCHAIN_HAS_SSP diff --git a/toolchain/toolchain-wrapper.c b/toolchain/toolchain-wrapper.c index e9c5cd9d32..c73a0cc079 100644 --- a/toolchain/toolchain-wrapper.c +++ b/toolchain/toolchain-wrapper.c @@ -98,15 +98,6 @@ static char *predef_args[] = { #if defined(BR_MIPS_TARGET_BIG_ENDIAN) || defined(BR_ARC_TARGET_BIG_ENDIAN) "-EB", #endif -#ifdef BR_SSP_REGULAR - "-fstack-protector", -#endif -#ifdef BR_SSP_STRONG - "-fstack-protector-strong", -#endif -#ifdef BR_SSP_ALL - "-fstack-protector-all", -#endif #ifdef BR_ADDITIONAL_CFLAGS BR_ADDITIONAL_CFLAGS #endif diff --git a/toolchain/toolchain-wrapper.mk b/toolchain/toolchain-wrapper.mk index c9e6fd3f3d..ca66fa7ba4 100644 --- a/toolchain/toolchain-wrapper.mk +++ b/toolchain/toolchain-wrapper.mk @@ -17,6 +17,7 @@ TOOLCHAIN_WRAPPER_ARGS = $($(PKG)_TOOLCHAIN_WRAPPER_ARGS) TOOLCHAIN_WRAPPER_ARGS += -DBR_SYSROOT='"$(STAGING_SUBDIR)"' TOOLCHAIN_WRAPPER_OPTS = \ + $(call qstrip,$(BR2_SSP_OPTION)) \ $(call qstrip,$(BR2_TARGET_OPTIMIZATION)) # We create a list like '"-mfoo", "-mbar", "-mbarfoo"' so that each flag is a @@ -53,14 +54,6 @@ else ifeq ($(BR2_RELRO_FULL),y) TOOLCHAIN_WRAPPER_ARGS += -DBR2_RELRO_FULL endif -ifeq ($(BR2_SSP_REGULAR),y) -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_REGULAR -else ifeq ($(BR2_SSP_STRONG),y) -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_STRONG -else ifeq ($(BR2_SSP_ALL),y) -TOOLCHAIN_WRAPPER_ARGS += -DBR_SSP_ALL -endif - define TOOLCHAIN_WRAPPER_BUILD $(HOSTCC) $(HOST_CFLAGS) $(TOOLCHAIN_WRAPPER_ARGS) \ -s -Wl,--hash-style=$(TOOLCHAIN_WRAPPER_HASH_STYLE) \ From 6fb4c14ecb1e8f001449830b65ec2a4606b87682 Mon Sep 17 00:00:00 2001 From: Martin Kepplinger Date: Wed, 13 Mar 2019 09:50:45 +0100 Subject: [PATCH 0151/7482] package/qt5/qt5webengine: fix comment on GL dependencies qt5declarative can be built/used without opengl support so fix the dependency comment in qt5webengine. Signed-off-by: Martin Kepplinger Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index 744d659567..bfc0a02c12 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -34,7 +34,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs + depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV # v8 (a chromium 3rd-party) compiles its internal host-tools with the From 7a25c9ef4b122aac2a42458fc5648dcb293c2d59 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 14 Mar 2019 21:13:11 +0100 Subject: [PATCH 0152/7482] Revert "package/qt5/qt5webengine: fix comment on GL dependencies" This reverts commit 6fb4c14ecb1e8f001449830b65ec2a4606b87682. Indeed, as Peter Seiderer pointed out, the comment is in fact partially correct: with Qt 5.6, QT5DECLARATIVE_QUICK does require OpenGL support. Signed-off-by: Thomas Petazzoni --- package/qt5/qt5webengine/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/qt5/qt5webengine/Config.in b/package/qt5/qt5webengine/Config.in index bfc0a02c12..744d659567 100644 --- a/package/qt5/qt5webengine/Config.in +++ b/package/qt5/qt5webengine/Config.in @@ -34,7 +34,7 @@ config BR2_PACKAGE_QT5WEBENGINE depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_85862 || BR2_PACKAGE_QT5_VERSION_5_6 # libnss depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, libvpx, qt5base-dbus depends on BR2_USE_WCHAR # libglib2 - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5base-eglfs + depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative, qt5base-eglfs depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs depends on BR2_PACKAGE_HAS_UDEV # v8 (a chromium 3rd-party) compiles its internal host-tools with the From 167e5cdce2b38e2a2fec186520c528b6891bca04 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 13 Mar 2019 19:15:11 +0100 Subject: [PATCH 0153/7482] package/ulogd: add postgresql optional dependency Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ulogd/ulogd.mk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 5b0e558930..5ea127f630 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -7,7 +7,7 @@ ULOGD_VERSION = 2.0.5 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --with-dbi=no --with-pgsql=no +ULOGD_CONF_OPTS = --with-dbi=no ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink @@ -22,11 +22,17 @@ ULOGD_DEPENDENCIES += mysql else ULOGD_CONF_OPTS += --with-mysql=no endif +ifeq ($(BR2_PACKAGE_POSTGRESQL),y) +ULOGD_CONF_OPTS += --with-pgsql +ULOGD_DEPENDENCIES += postgresql +else +ULOGD_CONF_OPTS += --without-pgsql +endif ifeq ($(BR2_PACKAGE_SQLITE),y) ULOGD_DEPENDENCIES += sqlite endif else -ULOGD_CONF_OPTS += --with-mysql=no --without-sqlite +ULOGD_CONF_OPTS += --with-mysql=no --without-pgsql --without-sqlite endif ifeq ($(BR2_PACKAGE_LIBPCAP),y) From f9932f90e75a9e2c1861f36f09a6f5fbd309cc0c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 13 Mar 2019 19:15:12 +0100 Subject: [PATCH 0154/7482] package/ulogd: bump to version 2.0.7 - Remove three patches (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ll-as-dummy-logfile-when-logging-to-.patch | 70 -- ..._GNU_SOURCE-to-get-members-of-tcphdr.patch | 44 - .../0003-Use-stdint-types-everywhere.patch | 792 ------------------ package/ulogd/ulogd.hash | 10 +- package/ulogd/ulogd.mk | 2 +- 5 files changed, 8 insertions(+), 910 deletions(-) delete mode 100644 package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch delete mode 100644 package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch delete mode 100644 package/ulogd/0003-Use-stdint-types-everywhere.patch diff --git a/package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch b/package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch deleted file mode 100644 index c7b284a0af..0000000000 --- a/package/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 17:43:23 +0200 -Subject: [PATCH] ulogd: Use /dev/null as dummy logfile when logging to - syslog - -Fixes compilation error with musl libc: - -ulogd.c:86:13: error: storage size of 'syslog_dummy' isn't known - static FILE syslog_dummy; - -Signed-off-by: Felix Janda -[Rahul Bedarkar: Backported from https://git.netfilter.org/ulogd2/commit/?id=8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8] -Signed-off-by: Rahul Bedarkar ---- - src/ulogd.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/ulogd.c b/src/ulogd.c -index e7cde39..958c30a 100644 ---- a/src/ulogd.c -+++ b/src/ulogd.c -@@ -83,7 +83,7 @@ static char *ulogd_logfile = NULL; - static const char *ulogd_configfile = ULOGD_CONFIGFILE; - static const char *ulogd_pidfile = NULL; - static int ulogd_pidfile_fd = -1; --static FILE syslog_dummy; -+static FILE *syslog_dummy; - - static int info_mode = 0; - -@@ -427,7 +427,7 @@ void __ulogd_log(int level, char *file, int line, const char *format, ...) - if (level < loglevel_ce.u.value) - return; - -- if (logfile == &syslog_dummy) { -+ if (logfile == syslog_dummy) { - /* FIXME: this omits the 'file' string */ - va_start(ap, format); - vsyslog(ulogd2syslog_level(level), format, ap); -@@ -950,7 +950,7 @@ static int logfile_open(const char *name) - logfile = stdout; - } else if (!strcmp(name, "syslog")) { - openlog("ulogd", LOG_PID, LOG_DAEMON); -- logfile = &syslog_dummy; -+ logfile = syslog_dummy = fopen("/dev/null", "w"); - } else { - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { -@@ -1240,7 +1240,7 @@ static void sigterm_handler(int signal) - unload_plugins(); - #endif - -- if (logfile != NULL && logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != NULL && logfile != stdout) { - fclose(logfile); - logfile = NULL; - } -@@ -1262,7 +1262,7 @@ static void signal_handler(int signal) - switch (signal) { - case SIGHUP: - /* reopen logfile */ -- if (logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != stdout && logfile != syslog_dummy) { - fclose(logfile); - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { --- -2.6.2 - diff --git a/package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch b/package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch deleted file mode 100644 index 0fbef834e4..0000000000 --- a/package/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 89263555143e3c0125320ca565b41805f27460c9 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 15:44:32 +0200 -Subject: [PATCH] Define _GNU_SOURCE to get members of tcphdr - -The source uses linux names for members of tcphdr. For example -"source" instead of "th_sport", ... musl libc's headers need -_GNU_SOURCE defined in order to expose these. - -Signed-off-by: Felix Janda -[Rahul Bedarkar: Backported from https://git.netfilter.org/ulogd2/commit/?id=89263555143e3c0125320ca565b41805f27460c9] -Signed-off-by: Rahul Bedarkar ---- - filter/raw2packet/ulogd_raw2packet_BASE.c | 1 + - filter/ulogd_filter_PWSNIFF.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c -index c9d5227..ad894fc 100644 ---- a/filter/raw2packet/ulogd_raw2packet_BASE.c -+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - #include - #include -diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c -index 5169eee..a3e2b42 100644 ---- a/filter/ulogd_filter_PWSNIFF.c -+++ b/filter/ulogd_filter_PWSNIFF.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - #include - --- -2.6.2 - diff --git a/package/ulogd/0003-Use-stdint-types-everywhere.patch b/package/ulogd/0003-Use-stdint-types-everywhere.patch deleted file mode 100644 index 66408d6d0f..0000000000 --- a/package/ulogd/0003-Use-stdint-types-everywhere.patch +++ /dev/null @@ -1,792 +0,0 @@ -From c9337b31f756cae85299c8275b21088ce02885e2 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Wed, 24 Jun 2015 19:53:34 +0200 -Subject: [PATCH] Use stdint types everywhere - -Signed-off-by: Felix Janda -[Rahul Bedarkar: - - backported from https://git.netfilter.org/ulogd2/commit/?id=c9337b31f756cae85299c8275b21088ce02885e2 - - remove hunk for output/ulogd_output_IPFIX.c as file doesn't exist in version we use] -Signed-off-by: Rahul Bedarkar ---- - filter/raw2packet/ulogd_raw2packet_BASE.c | 35 +++++++++++++------------- - filter/ulogd_filter_HWHDR.c | 6 ++--- - filter/ulogd_filter_IP2HBIN.c | 4 +-- - filter/ulogd_filter_IP2STR.c | 2 +- - filter/ulogd_filter_MARK.c | 4 +-- - filter/ulogd_filter_PWSNIFF.c | 4 +-- - include/libipulog/libipulog.h | 7 +++--- - include/ulogd/addr.h | 4 ++- - include/ulogd/conffile.h | 10 ++++---- - include/ulogd/ipfix_protocol.h | 38 +++++++++++++++------------- - include/ulogd/ulogd.h | 42 +++++++++++++++---------------- - input/packet/ulogd_inppkt_NFLOG.c | 16 ++++++------ - input/packet/ulogd_inppkt_UNIXSOCK.c | 34 ++++++++++++------------- - libipulog/libipulog.c | 8 +++--- - output/mysql/ulogd_output_MYSQL.c | 2 +- - output/ulogd_output_IPFIX.c | 20 +++++++-------- - src/addr.c | 4 +-- - util/db.c | 2 +- - util/printpkt.c | 6 ++--- - 19 files changed, 126 insertions(+), 122 deletions(-) - -diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c -index ad894fc..8a6180c 100644 ---- a/filter/raw2packet/ulogd_raw2packet_BASE.c -+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - enum input_keys { - INKEY_RAW_PCKT, -@@ -538,7 +539,7 @@ static struct ulogd_key iphdr_rets[] = { - ***********************************************************************/ - - static int _interp_tcp(struct ulogd_pluginstance *pi, struct tcphdr *tcph, -- u_int32_t len) -+ uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - -@@ -573,7 +574,7 @@ static int _interp_tcp(struct ulogd_pluginstance *pi, struct tcphdr *tcph, - ***********************************************************************/ - - static int _interp_udp(struct ulogd_pluginstance *pi, struct udphdr *udph, -- u_int32_t len) -+ uint32_t len) - - { - struct ulogd_key *ret = pi->output.keys; -@@ -602,7 +603,7 @@ typedef struct sctphdr { - } __attribute__((packed)) sctp_sctphdr_t; - - static int _interp_sctp(struct ulogd_pluginstance *pi, struct sctphdr *sctph, -- u_int32_t len) -+ uint32_t len) - - { - struct ulogd_key *ret = pi->output.keys; -@@ -625,7 +626,7 @@ static int _interp_sctp(struct ulogd_pluginstance *pi, struct sctphdr *sctph, - ***********************************************************************/ - - static int _interp_icmp(struct ulogd_pluginstance *pi, struct icmphdr *icmph, -- u_int32_t len) -+ uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - -@@ -663,7 +664,7 @@ static int _interp_icmp(struct ulogd_pluginstance *pi, struct icmphdr *icmph, - ***********************************************************************/ - - static int _interp_icmpv6(struct ulogd_pluginstance *pi, struct icmp6_hdr *icmph, -- u_int32_t len) -+ uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - -@@ -691,7 +692,7 @@ static int _interp_icmpv6(struct ulogd_pluginstance *pi, struct icmp6_hdr *icmph - * IPSEC HEADER - ***********************************************************************/ - static int _interp_ahesp(struct ulogd_pluginstance *pi, void *protoh, -- u_int32_t len) -+ uint32_t len) - { - #if 0 - struct ulogd_key *ret = pi->output.keys; -@@ -711,14 +712,14 @@ static int _interp_ahesp(struct ulogd_pluginstance *pi, void *protoh, - * IP HEADER - ***********************************************************************/ - --static int _interp_iphdr(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_iphdr(struct ulogd_pluginstance *pi, uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - struct iphdr *iph = - ikey_get_ptr(&pi->input.keys[INKEY_RAW_PCKT]); -- void *nexthdr = (u_int32_t *)iph + iph->ihl; -+ void *nexthdr = (uint32_t *)iph + iph->ihl; - -- if (len < sizeof(struct iphdr) || len <= (u_int32_t)(iph->ihl * 4)) -+ if (len < sizeof(struct iphdr) || len <= (uint32_t)(iph->ihl * 4)) - return ULOGD_IRET_OK; - len -= iph->ihl * 4; - -@@ -759,7 +760,7 @@ static int _interp_iphdr(struct ulogd_pluginstance *pi, u_int32_t len) - * IPv6 HEADER - ***********************************************************************/ - --static int ip6_ext_hdr(u_int8_t nexthdr) -+static int ip6_ext_hdr(uint8_t nexthdr) - { - switch (nexthdr) { - case IPPROTO_HOPOPTS: -@@ -774,12 +775,12 @@ static int ip6_ext_hdr(u_int8_t nexthdr) - } - } - --static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - struct ip6_hdr *ipv6h = ikey_get_ptr(&pi->input.keys[INKEY_RAW_PCKT]); - unsigned int ptr, hdrlen = 0; -- u_int8_t curhdr; -+ uint8_t curhdr; - int fragment = 0; - - if (len < sizeof(struct ip6_hdr)) -@@ -889,7 +890,7 @@ out: - /*********************************************************************** - * ARP HEADER - ***********************************************************************/ --static int _interp_arp(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_arp(struct ulogd_pluginstance *pi, uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - const struct ether_arp *arph = -@@ -914,9 +915,9 @@ static int _interp_arp(struct ulogd_pluginstance *pi, u_int32_t len) - * ETHER HEADER - ***********************************************************************/ - --static int _interp_bridge(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_bridge(struct ulogd_pluginstance *pi, uint32_t len) - { -- const u_int16_t proto = -+ const uint16_t proto = - ikey_get_u16(&pi->input.keys[INKEY_OOB_PROTOCOL]); - - switch (proto) { -@@ -938,8 +939,8 @@ static int _interp_bridge(struct ulogd_pluginstance *pi, u_int32_t len) - - static int _interp_pkt(struct ulogd_pluginstance *pi) - { -- u_int32_t len = ikey_get_u32(&pi->input.keys[INKEY_RAW_PCKTLEN]); -- u_int8_t family = ikey_get_u8(&pi->input.keys[INKEY_OOB_FAMILY]); -+ uint32_t len = ikey_get_u32(&pi->input.keys[INKEY_RAW_PCKTLEN]); -+ uint8_t family = ikey_get_u8(&pi->input.keys[INKEY_OOB_FAMILY]); - struct ulogd_key *ret = pi->output.keys; - - okey_set_u16(&ret[KEY_OOB_PROTOCOL], -diff --git a/filter/ulogd_filter_HWHDR.c b/filter/ulogd_filter_HWHDR.c -index 3b095c9..10c95c4 100644 ---- a/filter/ulogd_filter_HWHDR.c -+++ b/filter/ulogd_filter_HWHDR.c -@@ -143,10 +143,10 @@ static void *hwhdr_get_daddr(struct ulogd_key *inp) - return ikey_get_ptr(&inp[KEY_RAW_MAC]); - } - --static u_int16_t hwhdr_get_len(struct ulogd_key *inp) -+static uint16_t hwhdr_get_len(struct ulogd_key *inp) - { - void *len = ikey_get_ptr(&inp[KEY_RAW_MAC]) + 2 * ETH_ALEN; -- return ntohs(*(u_int16_t *) len); -+ return ntohs(*(uint16_t *) len); - } - static int parse_ethernet(struct ulogd_key *ret, struct ulogd_key *inp) - { -@@ -171,7 +171,7 @@ static int interp_mac2str(struct ulogd_pluginstance *pi) - { - struct ulogd_key *ret = pi->output.keys; - struct ulogd_key *inp = pi->input.keys; -- u_int16_t type = 0; -+ uint16_t type = 0; - - if (pp_is_valid(inp, KEY_OOB_PROTOCOL)) - okey_set_u16(&ret[KEY_MAC_PROTOCOL], -diff --git a/filter/ulogd_filter_IP2HBIN.c b/filter/ulogd_filter_IP2HBIN.c -index 4fd3ff1..087e824 100644 ---- a/filter/ulogd_filter_IP2HBIN.c -+++ b/filter/ulogd_filter_IP2HBIN.c -@@ -116,8 +116,8 @@ static int interp_ip2hbin(struct ulogd_pluginstance *pi) - { - struct ulogd_key *ret = pi->output.keys; - struct ulogd_key *inp = pi->input.keys; -- u_int8_t family = ikey_get_u8(&inp[KEY_OOB_FAMILY]); -- u_int8_t convfamily = family; -+ uint8_t family = ikey_get_u8(&inp[KEY_OOB_FAMILY]); -+ uint8_t convfamily = family; - int i; - - switch (family) { -diff --git a/filter/ulogd_filter_IP2STR.c b/filter/ulogd_filter_IP2STR.c -index 732e1ef..66324b0 100644 ---- a/filter/ulogd_filter_IP2STR.c -+++ b/filter/ulogd_filter_IP2STR.c -@@ -168,7 +168,7 @@ static int ip2str(struct ulogd_key *inp, int index, int oindex) - } - - switch (convfamily) { -- u_int32_t ip; -+ uint32_t ip; - case AF_INET6: - inet_ntop(AF_INET6, - ikey_get_u128(&inp[index]), -diff --git a/filter/ulogd_filter_MARK.c b/filter/ulogd_filter_MARK.c -index 7807f63..149725d 100644 ---- a/filter/ulogd_filter_MARK.c -+++ b/filter/ulogd_filter_MARK.c -@@ -73,14 +73,14 @@ static int interp_mark(struct ulogd_pluginstance *pi) - if (pp_is_valid(inp, KEY_CT_MARK)) { - if ((ikey_get_u32(&inp[KEY_CT_MARK]) & - pi->config_kset->ces[MARK_MASK].u.value) != -- (u_int32_t) pi->config_kset->ces[MARK_MARK].u.value -+ (uint32_t) pi->config_kset->ces[MARK_MARK].u.value - ) { - return ULOGD_IRET_STOP; - } - } else if (pp_is_valid(inp, KEY_OOB_MARK)) { - if ((ikey_get_u32(&inp[KEY_OOB_MARK]) & - pi->config_kset->ces[MARK_MASK].u.value) != -- (u_int32_t) pi->config_kset->ces[MARK_MARK].u.value -+ (uint32_t) pi->config_kset->ces[MARK_MARK].u.value - ) { - return ULOGD_IRET_STOP; - } -diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c -index a3e2b42..934ff0e 100644 ---- a/filter/ulogd_filter_PWSNIFF.c -+++ b/filter/ulogd_filter_PWSNIFF.c -@@ -39,7 +39,7 @@ - #define PORT_POP3 110 - #define PORT_FTP 21 - --static u_int16_t pwsniff_ports[] = { -+static uint16_t pwsniff_ports[] = { - PORT_POP3, - PORT_FTP, - /* feel free to include any other ports here, provided that their -@@ -72,7 +72,7 @@ static int interp_pwsniff(struct ulogd_pluginstance *pi) - return ULOGD_IRET_STOP; - - iph = (struct iphdr *) pi->input.keys[0].u.value.ptr; -- protoh = (u_int32_t *)iph + iph->ihl; -+ protoh = (uint32_t *)iph + iph->ihl; - tcph = protoh; - tcplen = ntohs(iph->tot_len) - iph->ihl * 4; - -diff --git a/include/libipulog/libipulog.h b/include/libipulog/libipulog.h -index b3c9616..21b4315 100644 ---- a/include/libipulog/libipulog.h -+++ b/include/libipulog/libipulog.h -@@ -4,10 +4,9 @@ - #include - #include - #include --#include - #include - #include --#include -+#include - #include - #include - #include -@@ -20,9 +19,9 @@ - struct ipulog_handle; - extern int ipulog_errno; - --u_int32_t ipulog_group2gmask(u_int32_t group); -+uint32_t ipulog_group2gmask(uint32_t group); - --struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem); -+struct ipulog_handle *ipulog_create_handle(uint32_t gmask, uint32_t rmem); - - void ipulog_destroy_handle(struct ipulog_handle *h); - -diff --git a/include/ulogd/addr.h b/include/ulogd/addr.h -index b4432e3..2259b6c 100644 ---- a/include/ulogd/addr.h -+++ b/include/ulogd/addr.h -@@ -8,7 +8,9 @@ - #ifndef _ADDR_H - #define _ADDR_H - --u_int32_t ulogd_bits2netmask(int bits); -+#include -+ -+uint32_t ulogd_bits2netmask(int bits); - void ulogd_ipv6_cidr2mask_host(uint8_t cidr, uint32_t *res); - void ulogd_ipv6_addr2addr_host(uint32_t *addr, uint32_t *res); - -diff --git a/include/ulogd/conffile.h b/include/ulogd/conffile.h -index 69a6f70..1f3d563 100644 ---- a/include/ulogd/conffile.h -+++ b/include/ulogd/conffile.h -@@ -7,7 +7,7 @@ - #ifndef _CONFFILE_H - #define _CONFFILE_H - --#include -+#include - - /* errors returned by config functions */ - enum { -@@ -45,10 +45,10 @@ enum { - - struct config_entry { - char key[CONFIG_KEY_LEN]; /* name of config directive */ -- u_int8_t type; /* type; see above */ -- u_int8_t options; /* options; see above */ -- u_int8_t hit; /* found? */ -- u_int8_t flag; /* tune setup of option */ -+ uint8_t type; /* type; see above */ -+ uint8_t options; /* options; see above */ -+ uint8_t hit; /* found? */ -+ uint8_t flag; /* tune setup of option */ - union { - char string[CONFIG_VAL_STRING_LEN]; - int value; -diff --git a/include/ulogd/ipfix_protocol.h b/include/ulogd/ipfix_protocol.h -index 5d7e46a..aef47f0 100644 ---- a/include/ulogd/ipfix_protocol.h -+++ b/include/ulogd/ipfix_protocol.h -@@ -1,6 +1,8 @@ - #ifndef _IPFIX_PROTOCOL_H - #define _IPFIX_PROTOCOL_H - -+#include -+ - /* This header file defines structures for the IPFIX protocol in accordance with - * draft-ietf-ipfix-protocol-19.txt */ - -@@ -11,29 +13,29 @@ - - /* Section 3.1 */ - struct ipfix_msg_hdr { -- u_int16_t version; -- u_int16_t length; -- u_int32_t export_time; -- u_int32_t seq; -- u_int32_t source_id; -+ uint16_t version; -+ uint16_t length; -+ uint32_t export_time; -+ uint32_t seq; -+ uint32_t source_id; - }; - - /* Section 3.4.1 */ - struct ipfix_templ_rec_hdr { -- u_int16_t templ_id; -- u_int16_t field_count; -+ uint16_t templ_id; -+ uint16_t field_count; - }; - - /* Section 3.2 */ - struct ipfix_ietf_field { -- u_int16_t type; -- u_int16_t length; -+ uint16_t type; -+ uint16_t length; - }; - - struct ipfix_vendor_field { -- u_int16_t type; -- u_int16_t length; -- u_int32_t enterprise_num; -+ uint16_t type; -+ uint16_t length; -+ uint32_t enterprise_num; - }; - - /* Information Element Identifiers as of draft-ietf-ipfix-info-11.txt */ -@@ -219,13 +221,13 @@ enum { - /* Information elements of the netfilter vendor id */ - enum { - IPFIX_NF_rawpacket = 1, /* pointer */ -- IPFIX_NF_rawpacket_length = 2, /* u_int32_t */ -+ IPFIX_NF_rawpacket_length = 2, /* uint32_t */ - IPFIX_NF_prefix = 3, /* string */ -- IPFIX_NF_mark = 4, /* u_int32_t */ -- IPFIX_NF_hook = 5, /* u_int8_t */ -- IPFIX_NF_conntrack_id = 6, /* u_int32_t */ -- IPFIX_NF_seq_local = 7, /* u_int32_t */ -- IPFIX_NF_seq_global = 8, /* u_int32_t */ -+ IPFIX_NF_mark = 4, /* uint32_t */ -+ IPFIX_NF_hook = 5, /* uint8_t */ -+ IPFIX_NF_conntrack_id = 6, /* uint32_t */ -+ IPFIX_NF_seq_local = 7, /* uint32_t */ -+ IPFIX_NF_seq_global = 8, /* uint32_t */ - }; - - #endif -diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h -index cf26a15..2e38195 100644 ---- a/include/ulogd/ulogd.h -+++ b/include/ulogd/ulogd.h -@@ -85,17 +85,17 @@ enum ulogd_dtype { - /* structure describing an input / output parameter of a plugin */ - struct ulogd_key { - /* length of the returned value (only for lengthed types */ -- u_int32_t len; -+ uint32_t len; - /* type of the returned value (ULOGD_DTYPE_...) */ -- u_int16_t type; -+ uint16_t type; - /* flags (i.e. free, ...) */ -- u_int16_t flags; -+ uint16_t flags; - /* name of this key */ - char name[ULOGD_MAX_KEYLEN+1]; - /* IETF IPFIX attribute ID */ - struct { -- u_int32_t vendor; -- u_int16_t field_id; -+ uint32_t vendor; -+ uint16_t field_id; - } ipfix; - - /* Store field name for Common Information Model */ -@@ -104,12 +104,12 @@ struct ulogd_key { - union { - /* and finally the returned value */ - union { -- u_int8_t b; -- u_int8_t ui8; -- u_int16_t ui16; -- u_int32_t ui32; -- u_int64_t ui64; -- u_int32_t ui128[4]; -+ uint8_t b; -+ uint8_t ui8; -+ uint16_t ui16; -+ uint32_t ui32; -+ uint64_t ui64; -+ uint32_t ui128[4]; - int8_t i8; - int16_t i16; - int32_t i32; -@@ -130,31 +130,31 @@ struct ulogd_keyset { - unsigned int type; - }; - --static inline void okey_set_b(struct ulogd_key *key, u_int8_t value) -+static inline void okey_set_b(struct ulogd_key *key, uint8_t value) - { - key->u.value.b = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u8(struct ulogd_key *key, u_int8_t value) -+static inline void okey_set_u8(struct ulogd_key *key, uint8_t value) - { - key->u.value.ui8 = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u16(struct ulogd_key *key, u_int16_t value) -+static inline void okey_set_u16(struct ulogd_key *key, uint16_t value) - { - key->u.value.ui16 = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u32(struct ulogd_key *key, u_int32_t value) -+static inline void okey_set_u32(struct ulogd_key *key, uint32_t value) - { - key->u.value.ui32 = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u64(struct ulogd_key *key, u_int64_t value) -+static inline void okey_set_u64(struct ulogd_key *key, uint64_t value) - { - key->u.value.ui64 = value; - key->flags |= ULOGD_RETF_VALID; -@@ -172,22 +172,22 @@ static inline void okey_set_ptr(struct ulogd_key *key, void *value) - key->flags |= ULOGD_RETF_VALID; - } - --static inline u_int8_t ikey_get_u8(struct ulogd_key *key) -+static inline uint8_t ikey_get_u8(struct ulogd_key *key) - { - return key->u.source->u.value.ui8; - } - --static inline u_int16_t ikey_get_u16(struct ulogd_key *key) -+static inline uint16_t ikey_get_u16(struct ulogd_key *key) - { - return key->u.source->u.value.ui16; - } - --static inline u_int32_t ikey_get_u32(struct ulogd_key *key) -+static inline uint32_t ikey_get_u32(struct ulogd_key *key) - { - return key->u.source->u.value.ui32; - } - --static inline u_int64_t ikey_get_u64(struct ulogd_key *key) -+static inline uint64_t ikey_get_u64(struct ulogd_key *key) - { - return key->u.source->u.value.ui64; - } -@@ -292,7 +292,7 @@ void ulogd_propagate_results(struct ulogd_pluginstance *pi); - void ulogd_register_plugin(struct ulogd_plugin *me); - - /* allocate a new ulogd_key */ --struct ulogd_key *alloc_ret(const u_int16_t type, const char*); -+struct ulogd_key *alloc_ret(const uint16_t type, const char*); - - /* write a message to the daemons' logfile */ - void __ulogd_log(int level, char *file, int line, const char *message, ...); -diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c -index 6196626..a367959 100644 ---- a/input/packet/ulogd_inppkt_NFLOG.c -+++ b/input/packet/ulogd_inppkt_NFLOG.c -@@ -315,7 +315,7 @@ static struct ulogd_key output_keys[] = { - }; - - static inline int --interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family, -+interp_packet(struct ulogd_pluginstance *upi, uint8_t pf_family, - struct nflog_data *ldata) - { - struct ulogd_key *ret = upi->output.keys; -@@ -326,12 +326,12 @@ interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family, - int payload_len = nflog_get_payload(ldata, &payload); - char *prefix = nflog_get_prefix(ldata); - struct timeval ts; -- u_int32_t mark = nflog_get_nfmark(ldata); -- u_int32_t indev = nflog_get_indev(ldata); -- u_int32_t outdev = nflog_get_outdev(ldata); -- u_int32_t seq; -- u_int32_t uid; -- u_int32_t gid; -+ uint32_t mark = nflog_get_nfmark(ldata); -+ uint32_t indev = nflog_get_indev(ldata); -+ uint32_t outdev = nflog_get_outdev(ldata); -+ uint32_t seq; -+ uint32_t uid; -+ uint32_t gid; - - okey_set_u8(&ret[NFLOG_KEY_OOB_FAMILY], - pf_family); -@@ -493,7 +493,7 @@ static int configure(struct ulogd_pluginstance *upi, - return 0; - } - --static int become_system_logging(struct ulogd_pluginstance *upi, u_int8_t pf) -+static int become_system_logging(struct ulogd_pluginstance *upi, uint8_t pf) - { - struct nflog_input *ui = (struct nflog_input *) upi->private; - -diff --git a/input/packet/ulogd_inppkt_UNIXSOCK.c b/input/packet/ulogd_inppkt_UNIXSOCK.c -index e4009f3..39944bf 100644 ---- a/input/packet/ulogd_inppkt_UNIXSOCK.c -+++ b/input/packet/ulogd_inppkt_UNIXSOCK.c -@@ -336,10 +336,10 @@ enum ulogd2_option_type { - ULOGD2_OPT_PREFIX, /* log prefix (string) */ - ULOGD2_OPT_OOB_IN, /* input device (string) */ - ULOGD2_OPT_OOB_OUT, /* output device (string) */ -- ULOGD2_OPT_OOB_TIME_SEC, /* packet arrival time (u_int32_t) */ -+ ULOGD2_OPT_OOB_TIME_SEC, /* packet arrival time (uint32_t) */ - - ULOGD2_OPT_USER=200, /* user name (string) */ -- ULOGD2_OPT_USERID, /* user id (u_int32_t) */ -+ ULOGD2_OPT_USERID, /* user id (uint32_t) */ - ULOGD2_OPT_OSNAME, /* OS name (string) */ - ULOGD2_OPT_OSREL, /* OS release (string) */ - ULOGD2_OPT_OSVERS, /* OS version (string) */ -@@ -367,15 +367,15 @@ struct ulogd_unixsock_option_t { - #define USOCK_ALIGNTO 8 - #define USOCK_ALIGN(len) ( ((len)+USOCK_ALIGNTO-1) & ~(USOCK_ALIGNTO-1) ) - --static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_packet_t *pkt, u_int16_t total_len) -+static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_packet_t *pkt, uint16_t total_len) - { - char *data = NULL; - struct iphdr *ip; - struct ulogd_key *ret = upi->output.keys; -- u_int8_t oob_family; -- u_int16_t payload_len; -- u_int32_t option_number; -- u_int32_t option_length; -+ uint8_t oob_family; -+ uint16_t payload_len; -+ uint32_t option_number; -+ uint32_t option_length; - char *buf; - struct ulogd_unixsock_option_t *option; - int new_offset; -@@ -398,7 +398,7 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p - okey_set_u32(&ret[UNIXSOCK_KEY_RAW_PCKTLEN], payload_len); - - /* options */ -- if (total_len > payload_len + sizeof(u_int16_t)) { -+ if (total_len > payload_len + sizeof(uint16_t)) { - /* option starts at the next aligned address after the payload */ - new_offset = USOCK_ALIGN(payload_len); - options_start = (void*)ip + new_offset; -@@ -431,13 +431,13 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p - okey_set_ptr(&ret[UNIXSOCK_KEY_OOB_OUT], buf); - break; - case ULOGD2_OPT_OOB_TIME_SEC: -- okey_set_u32(&ret[UNIXSOCK_KEY_OOB_TIME_SEC], *(u_int32_t*)buf); -+ okey_set_u32(&ret[UNIXSOCK_KEY_OOB_TIME_SEC], *(uint32_t*)buf); - break; - case ULOGD2_OPT_USER: - okey_set_ptr(&ret[UNIXSOCK_KEY_NUFW_USER_NAME], buf); - break; - case ULOGD2_OPT_USERID: -- okey_set_u32(&ret[UNIXSOCK_KEY_NUFW_USER_ID], *(u_int32_t*)buf); -+ okey_set_u32(&ret[UNIXSOCK_KEY_NUFW_USER_ID], *(uint32_t*)buf); - break; - case ULOGD2_OPT_OSNAME: - okey_set_ptr(&ret[UNIXSOCK_KEY_NUFW_OS_NAME], buf); -@@ -452,7 +452,7 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p - okey_set_ptr(&ret[UNIXSOCK_KEY_NUFW_APP_NAME], buf); - break; - case ULOGD2_OPT_STATE: -- okey_set_u8(&ret[UNIXSOCK_KEY_RAW_LABEL], *(u_int8_t*)buf); -+ okey_set_u8(&ret[UNIXSOCK_KEY_RAW_LABEL], *(uint8_t*)buf); - break; - default: - ulogd_log(ULOGD_NOTICE, -@@ -595,8 +595,8 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - struct ulogd_pluginstance *upi = param; - struct unixsock_input *ui = (struct unixsock_input*)upi->private; - int len; -- u_int16_t needed_len; -- u_int32_t packet_sig; -+ uint16_t needed_len; -+ uint32_t packet_sig; - struct ulogd_unixsock_packet_t *unixsock_packet; - - char buf[4096]; -@@ -642,7 +642,7 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - - needed_len = ntohs(unixsock_packet->total_size); - -- if (ui->unixsock_buf_avail >= needed_len + sizeof(u_int32_t)) { -+ if (ui->unixsock_buf_avail >= needed_len + sizeof(uint32_t)) { - ulogd_log(ULOGD_DEBUG, - " We have enough data (%d bytes required), handling packet\n", - needed_len); -@@ -651,11 +651,11 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - return -1; - } - /* consume data */ -- ui->unixsock_buf_avail -= (sizeof(u_int32_t) + needed_len); -+ ui->unixsock_buf_avail -= (sizeof(uint32_t) + needed_len); - if (ui->unixsock_buf_avail > 0) { - /* we need to shift data .. */ - memmove(ui->unixsock_buf, -- ui->unixsock_buf + (sizeof(u_int32_t) + needed_len) , -+ ui->unixsock_buf + (sizeof(uint32_t) + needed_len) , - ui->unixsock_buf_avail); - } else { - /* input buffer is empty, do not loop */ -@@ -664,7 +664,7 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - - } else { - ulogd_log(ULOGD_DEBUG, " We have %d bytes, but need %d. Requesting more\n", -- ui->unixsock_buf_avail, needed_len + sizeof(u_int32_t)); -+ ui->unixsock_buf_avail, needed_len + sizeof(uint32_t)); - return 0; - } - -diff --git a/libipulog/libipulog.c b/libipulog/libipulog.c -index ab28bb4..b49f7f2 100644 ---- a/libipulog/libipulog.c -+++ b/libipulog/libipulog.c -@@ -33,7 +33,7 @@ - struct ipulog_handle - { - int fd; -- u_int8_t blocking; -+ uint8_t blocking; - struct sockaddr_nl local; - struct sockaddr_nl peer; - struct nlmsghdr* last_nlhdr; -@@ -112,7 +112,7 @@ char *ipulog_strerror(int errcode) - } - - /* convert a netlink group (1-32) to a group_mask suitable for create_handle */ --u_int32_t ipulog_group2gmask(u_int32_t group) -+uint32_t ipulog_group2gmask(uint32_t group) - { - if (group < 1 || group > 32) - { -@@ -123,8 +123,8 @@ u_int32_t ipulog_group2gmask(u_int32_t group) - } - - /* create a ipulog handle for the reception of packets sent to gmask */ --struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, -- u_int32_t rcvbufsize) -+struct ipulog_handle *ipulog_create_handle(uint32_t gmask, -+ uint32_t rcvbufsize) - { - struct ipulog_handle *h; - int status; -diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c -index 0a1ebfc..643320c 100644 ---- a/output/mysql/ulogd_output_MYSQL.c -+++ b/output/mysql/ulogd_output_MYSQL.c -@@ -174,7 +174,7 @@ static int open_db_mysql(struct ulogd_pluginstance *upi) - struct mysql_instance *mi = (struct mysql_instance *) upi->private; - unsigned int connect_timeout = timeout_ce(upi->config_kset).u.value; - char *server = host_ce(upi->config_kset).u.string; -- u_int16_t port = port_ce(upi->config_kset).u.value; -+ uint16_t port = port_ce(upi->config_kset).u.value; - char *user = user_ce(upi->config_kset).u.string; - char *pass = pass_ce(upi->config_kset).u.string; - char *db = db_ce(upi->config_kset).u.string; -diff --git a/src/addr.c b/src/addr.c -index 2672fab..41435dc 100644 ---- a/src/addr.c -+++ b/src/addr.c -@@ -22,9 +22,9 @@ - #include - #include - --u_int32_t ulogd_bits2netmask(int bits) -+uint32_t ulogd_bits2netmask(int bits) - { -- u_int32_t netmask, bm; -+ uint32_t netmask, bm; - - if (bits >= 32 || bits < 0) - return(~0); -diff --git a/util/db.c b/util/db.c -index 24966a5..c9aec41 100644 ---- a/util/db.c -+++ b/util/db.c -@@ -362,7 +362,7 @@ static void __format_query_db(struct ulogd_pluginstance *upi, char *start) - sprintf(stmt_ins, "%u,", res->u.value.ui16); - break; - case ULOGD_RET_IPADDR: -- /* fallthrough when logging IP as u_int32_t */ -+ /* fallthrough when logging IP as uint32_t */ - case ULOGD_RET_UINT32: - sprintf(stmt_ins, "%u,", res->u.value.ui32); - break; -diff --git a/util/printpkt.c b/util/printpkt.c -index eb6cfbf..69a47ca 100644 ---- a/util/printpkt.c -+++ b/util/printpkt.c -@@ -199,7 +199,7 @@ static int printpkt_ipv4(struct ulogd_key *res, char *buf) - { - char *buf_cur = buf; - char tmp[INET_ADDRSTRLEN]; -- u_int32_t paddr; -+ uint32_t paddr; - - if (pp_is_valid(res, KEY_IP_SADDR)) - buf_cur += sprintf(buf_cur, "SRC=%s ", -@@ -363,8 +363,8 @@ static int printpkt_ipv6(struct ulogd_key *res, char *buf) - int printpkt_arp(struct ulogd_key *res, char *buf) - { - char *buf_cur = buf; -- u_int16_t code = 0; -- u_int8_t *mac; -+ uint16_t code = 0; -+ uint8_t *mac; - - if (pp_is_valid(res, KEY_ARP_SPA)) - buf_cur += sprintf(buf_cur, "SRC=%s ", --- -2.6.2 - diff --git a/package/ulogd/ulogd.hash b/package/ulogd/ulogd.hash index 16186c18c0..aef69262f7 100644 --- a/package/ulogd/ulogd.hash +++ b/package/ulogd/ulogd.hash @@ -1,3 +1,7 @@ -# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.5.tar.bz2.{md5sum,sha1sum} -md5 f0f8fe1371fa28b5e06cb16aaa0111dd ulogd-2.0.5.tar.bz2 -sha1 828db7849d6788674ecf36b178f107c20e9ac1f0 ulogd-2.0.5.tar.bz2 +# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.7.tar.bz2.{md5sum,sha1sum} +md5 2bb2868cf51acbb90c35763c9f995f31 ulogd-2.0.7.tar.bz2 +sha1 f2d90469e2842e2bfbe19c55cf6d56ac107aa4b9 ulogd-2.0.7.tar.bz2 + +# Locally calculated +sha256 990a05494d9c16029ba0a83f3b7294fc05c756546b8d60d1c1572dc25249a92b ulogd-2.0.7.tar.bz2 +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 5ea127f630..55bbec489d 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -4,7 +4,7 @@ # ################################################################################ -ULOGD_VERSION = 2.0.5 +ULOGD_VERSION = 2.0.7 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files ULOGD_CONF_OPTS = --with-dbi=no From 8478bd526f2369addf98579804bbbee01334a024 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 13 Mar 2019 10:29:32 +0200 Subject: [PATCH 0155/7482] package/libiio: bump to version 0.15 This change bumps libiio, to version 0.15. This version is currently the most stable version in the series. It contains several fixes over 0.14. 0.16 & 0.17 have been released but they have some issues with backwards compatibility, so they are not yet recommended. Changelog for version 0.15 (over 0.14). Link: https://github.com/analogdevicesinc/libiio/releases/tag/v0.15 Signed-off-by: Alexandru Ardelean Signed-off-by: Thomas Petazzoni --- package/libiio/libiio.hash | 2 +- package/libiio/libiio.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash index fbb4bccb90..800b2ee8f4 100644 --- a/package/libiio/libiio.hash +++ b/package/libiio/libiio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 12063db7a9366aa00bfd789db30afaddb29686bc29b3ce1e5d4adfe1c3b42527 libiio-0.14.tar.gz +sha256 a729f8ff48137ad271a3e2951f322b35c1bf2ec075b488d75c8bd071c693fd19 libiio-0.15.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index d2376bca34..2371a71063 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIIO_VERSION = 0.14 +LIBIIO_VERSION = 0.15 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPL-2.1+ From 254384e7699d5c7a84b2b029099107046e3a6a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrien=20Gallou=C3=ABt?= Date: Wed, 13 Mar 2019 08:35:58 +0000 Subject: [PATCH 0156/7482] package/kexec: update to 2.0.18 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This release fixes the following issue with new kernels: kexec --load bzImage --reuse-cmdline Unhandled rela relocation: R_X86_64_PLT32 Signed-off-by: Adrien Gallouët Signed-off-by: Thomas Petazzoni --- package/kexec/kexec.hash | 2 +- package/kexec/kexec.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kexec/kexec.hash b/package/kexec/kexec.hash index 24294909ee..f87692b689 100644 --- a/package/kexec/kexec.hash +++ b/package/kexec/kexec.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 504c816b769da573167b63f3b6d4fce3740f231c98d8db0c4fda47a4b90482a9 kexec-tools-2.0.17.tar.xz +sha256 f020f07341977eb512663e301c2de60c6589e141467c16a8efd58243c0b2b238 kexec-tools-2.0.18.tar.xz # locally calculated sha256 fa5fc1d1eec39532ea517518eeefd7b6e3c14341a55e5880a0e2a49eee47a5b7 COPYING diff --git a/package/kexec/kexec.mk b/package/kexec/kexec.mk index b0f4367ddd..b011c0b4e5 100644 --- a/package/kexec/kexec.mk +++ b/package/kexec/kexec.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEXEC_VERSION = 2.0.17 +KEXEC_VERSION = 2.0.18 KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec KEXEC_LICENSE = GPL-2.0 From 87a8f5f51c63fb9c9ff2cb907fd86f5ad0525617 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 13 Mar 2019 10:39:55 +0100 Subject: [PATCH 0157/7482] package/bash: add upstream patches up to patch level 23 We unfortunately cannot easily download these because of the file names (not ending in patch) and patch format (p0), so convert to p1 format and include in package/bash with the following script: j=1; for i in 19 20 21 22 23; do file=$(printf '%04d-patch44-0%d.patch' $j $i) cat > $file << EOF >From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-0$i Signed-off-by: Peter Korsgaard EOF curl https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-0$i | \ sed -e 's|^\*\*\* \.\./|*** |' -e 's|^--- |--- b/|' >> $file j=$(( j + 1 )) done Signed-off-by: Peter Korsgaard Signed-off-by: Thomas Petazzoni --- package/bash/0001-bash44-019.patch | 54 +++++++++ package/bash/0002-bash44-020.patch | 181 +++++++++++++++++++++++++++++ package/bash/0003-bash44-021.patch | 61 ++++++++++ package/bash/0004-bash44-022.patch | 65 +++++++++++ package/bash/0005-bash44-023.patch | 56 +++++++++ 5 files changed, 417 insertions(+) create mode 100644 package/bash/0001-bash44-019.patch create mode 100644 package/bash/0002-bash44-020.patch create mode 100644 package/bash/0003-bash44-021.patch create mode 100644 package/bash/0004-bash44-022.patch create mode 100644 package/bash/0005-bash44-023.patch diff --git a/package/bash/0001-bash44-019.patch b/package/bash/0001-bash44-019.patch new file mode 100644 index 0000000000..b3d2f331b6 --- /dev/null +++ b/package/bash/0001-bash44-019.patch @@ -0,0 +1,54 @@ +From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-019 + +Signed-off-by: Peter Korsgaard + + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-019 + +Bug-Reported-by: Kieran Grant +Bug-Reference-ID: +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2018-02/msg00002.html + +Bug-Description: + +With certain values for PS1, especially those that wrap onto three or more +lines, readline will miscalculate the number of invisible characters, +leading to crashes and core dumps. + +Patch (apply with `patch -p0'): + +*** bash-4.4.18/lib/readline/display.c 2016-07-28 14:49:33.000000000 -0400 +--- b/lib/readline/display.c 2018-02-03 19:19:35.000000000 -0500 +*************** +*** 772,776 **** + wadjust = (newlines == 0) + ? prompt_invis_chars_first_line +! : ((newlines == prompt_lines_estimate) ? wrap_offset : prompt_invis_chars_first_line); + + /* fix from Darin Johnson for prompt string with +--- b/788,794 ---- + wadjust = (newlines == 0) + ? prompt_invis_chars_first_line +! : ((newlines == prompt_lines_estimate) +! ? (wrap_offset - prompt_invis_chars_first_line) +! : 0); + + /* fix from Darin Johnson for prompt string with +*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 18 + + #endif /* _PATCHLEVEL_H_ */ +--- b/26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0002-bash44-020.patch b/package/bash/0002-bash44-020.patch new file mode 100644 index 0000000000..20f3abb586 --- /dev/null +++ b/package/bash/0002-bash44-020.patch @@ -0,0 +1,181 @@ +From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-020 + +Signed-off-by: Peter Korsgaard + + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-020 + +Bug-Reported-by: Graham Northup +Bug-Reference-ID: <537530c3-61f0-349b-9de6-fa4e2487f428@clarkson.edu> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2017-02/msg00025.html + +Bug-Description: + +In circumstances involving long-running scripts that create and reap many +processes, it is possible for the hash table bash uses to store exit +statuses from asynchronous processes to develop loops. This patch fixes +the loop causes and adds code to detect any future loops. + +Patch (apply with `patch -p0'): + +*** bash-4.4-patched/jobs.c 2016-11-11 13:42:55.000000000 -0500 +--- b/jobs.c 2017-02-22 15:16:28.000000000 -0500 +*************** +*** 813,818 **** + struct pidstat *ps; + +! bucket = pshash_getbucket (pid); +! psi = bgp_getindex (); + ps = &bgpids.storage[psi]; + +--- b/796,815 ---- + struct pidstat *ps; + +! /* bucket == existing chain of pids hashing to same value +! psi = where were going to put this pid/status */ +! +! bucket = pshash_getbucket (pid); /* index into pidstat_table */ +! psi = bgp_getindex (); /* bgpids.head, index into storage */ +! +! /* XXX - what if psi == *bucket? */ +! if (psi == *bucket) +! { +! #ifdef DEBUG +! internal_warning ("hashed pid %d (pid %d) collides with bgpids.head, skipping", psi, pid); +! #endif +! bgpids.storage[psi].pid = NO_PID; /* make sure */ +! psi = bgp_getindex (); /* skip to next one */ +! } +! + ps = &bgpids.storage[psi]; + +*************** +*** 842,845 **** +--- b/839,843 ---- + { + struct pidstat *ps; ++ ps_index_t *bucket; + + ps = &bgpids.storage[psi]; +*************** +*** 847,856 **** + return; + +! if (ps->bucket_next != NO_PID) + bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev; +! if (ps->bucket_prev != NO_PID) + bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next; + else +! *(pshash_getbucket (ps->pid)) = ps->bucket_next; + } + +--- b/845,861 ---- + return; + +! if (ps->bucket_next != NO_PIDSTAT) + bgpids.storage[ps->bucket_next].bucket_prev = ps->bucket_prev; +! if (ps->bucket_prev != NO_PIDSTAT) + bgpids.storage[ps->bucket_prev].bucket_next = ps->bucket_next; + else +! { +! bucket = pshash_getbucket (ps->pid); +! *bucket = ps->bucket_next; /* deleting chain head in hash table */ +! } +! +! /* clear out this cell, just in case */ +! ps->pid = NO_PID; +! ps->bucket_next = ps->bucket_prev = NO_PIDSTAT; + } + +*************** +*** 859,863 **** + pid_t pid; + { +! ps_index_t psi; + + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) +--- b/864,868 ---- + pid_t pid; + { +! ps_index_t psi, orig_psi; + + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) +*************** +*** 865,871 **** + + /* Search chain using hash to find bucket in pidstat_table */ +! for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) +! if (bgpids.storage[psi].pid == pid) +! break; + + if (psi == NO_PIDSTAT) +--- b/870,883 ---- + + /* Search chain using hash to find bucket in pidstat_table */ +! for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) +! { +! if (bgpids.storage[psi].pid == pid) +! break; +! if (orig_psi == bgpids.storage[psi].bucket_next) /* catch reported bug */ +! { +! internal_warning ("bgp_delete: LOOP: psi (%d) == storage[psi].bucket_next", psi); +! return 0; +! } +! } + + if (psi == NO_PIDSTAT) +*************** +*** 905,909 **** + pid_t pid; + { +! ps_index_t psi; + + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) +--- b/917,921 ---- + pid_t pid; + { +! ps_index_t psi, orig_psi; + + if (bgpids.storage == 0 || bgpids.nalloc == 0 || bgpids.npid == 0) +*************** +*** 911,917 **** + + /* Search chain using hash to find bucket in pidstat_table */ +! for (psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) +! if (bgpids.storage[psi].pid == pid) +! return (bgpids.storage[psi].status); + + return -1; +--- b/923,936 ---- + + /* Search chain using hash to find bucket in pidstat_table */ +! for (orig_psi = psi = *(pshash_getbucket (pid)); psi != NO_PIDSTAT; psi = bgpids.storage[psi].bucket_next) +! { +! if (bgpids.storage[psi].pid == pid) +! return (bgpids.storage[psi].status); +! if (orig_psi == bgpids.storage[psi].bucket_next) /* catch reported bug */ +! { +! internal_warning ("bgp_search: LOOP: psi (%d) == storage[psi].bucket_next", psi); +! return -1; +! } +! } + + return -1; +*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 19 + + #endif /* _PATCHLEVEL_H_ */ +--- b/26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0003-bash44-021.patch b/package/bash/0003-bash44-021.patch new file mode 100644 index 0000000000..52f3b75eac --- /dev/null +++ b/package/bash/0003-bash44-021.patch @@ -0,0 +1,61 @@ +From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-021 + +Signed-off-by: Peter Korsgaard + + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-021 + +Bug-Reported-by: werner@suse.de +Bug-Reference-ID: <201803281402.w2SE2VOa000476@noether.suse.de> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2018-03/msg00196.html + +Bug-Description: + +A SIGINT received inside a SIGINT trap handler can possibly cause the +shell to loop. + +Patch (apply with `patch -p0'): + +*** bash-20180329/jobs.c 2018-02-11 18:07:22.000000000 -0500 +--- b/jobs.c 2018-04-02 14:24:21.000000000 -0400 +*************** +*** 2690,2694 **** + if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB)) + { +! old_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); + waiting_for_child = 0; + if (old_sigint_handler == SIG_IGN) +--- b/2690,2704 ---- + if (job_control == 0 || (subshell_environment&SUBSHELL_COMSUB)) + { +! SigHandler *temp_sigint_handler; +! +! temp_sigint_handler = set_signal_handler (SIGINT, wait_sigint_handler); +! if (temp_sigint_handler == wait_sigint_handler) +! { +! #if defined (DEBUG) +! internal_warning ("wait_for: recursively setting old_sigint_handler to wait_sigint_handler: running_trap = %d", running_trap); +! #endif +! } +! else +! old_sigint_handler = temp_sigint_handler; + waiting_for_child = 0; + if (old_sigint_handler == SIG_IGN) +*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 20 + + #endif /* _PATCHLEVEL_H_ */ +--- b/26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0004-bash44-022.patch b/package/bash/0004-bash44-022.patch new file mode 100644 index 0000000000..0db270a17e --- /dev/null +++ b/package/bash/0004-bash44-022.patch @@ -0,0 +1,65 @@ +From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-022 + +Signed-off-by: Peter Korsgaard + + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-022 + +Bug-Reported-by: Nuzhna Pomoshch +Bug-Reference-ID: <1317167476.1492079.1495999776464@mail.yahoo.com> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2017-05/msg00005.html + +Bug-Description: + +There are cases where a failing readline command (e.g., delete-char at the end +of a line) can cause a multi-character key sequence to `back up' and attempt +to re-read some of the characters in the sequence. + +Patch (apply with `patch -p0'): + +*** bash-4.4-patched/lib/readline/readline.c 2016-04-20 15:53:52.000000000 -0400 +--- b/lib/readline/readline.c 2018-05-26 17:19:00.000000000 -0400 +*************** +*** 1058,1062 **** + r = _rl_dispatch (ANYOTHERKEY, m); + } +! else if (r && map[ANYOTHERKEY].function) + { + /* We didn't match (r is probably -1), so return something to +--- b/1056,1060 ---- + r = _rl_dispatch (ANYOTHERKEY, m); + } +! else if (r < 0 && map[ANYOTHERKEY].function) + { + /* We didn't match (r is probably -1), so return something to +*************** +*** 1070,1074 **** + return -2; + } +! else if (r && got_subseq) + { + /* OK, back up the chain. */ +--- b/1068,1072 ---- + return -2; + } +! else if (r < 0 && got_subseq) /* XXX */ + { + /* OK, back up the chain. */ +*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 21 + + #endif /* _PATCHLEVEL_H_ */ +--- b/26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ diff --git a/package/bash/0005-bash44-023.patch b/package/bash/0005-bash44-023.patch new file mode 100644 index 0000000000..05b18902a5 --- /dev/null +++ b/package/bash/0005-bash44-023.patch @@ -0,0 +1,56 @@ +From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-023 + +Signed-off-by: Peter Korsgaard + + BASH PATCH REPORT + ================= + +Bash-Release: 4.4 +Patch-ID: bash44-023 + +Bug-Reported-by: Martijn Dekker +Bug-Reference-ID: <5326d6b9-2625-1d32-3e6e-ad1d15462c09@inlv.org> +Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00041.html + +Bug-Description: + +When sourcing a file from an interactive shell, setting the SIGINT handler +to the default and typing ^C will cause the shell to exit. + +Patch (apply with `patch -p0'): + +*** bash-4.4-patched/builtins/trap.def 2016-01-25 13:32:38.000000000 -0500 +--- b/builtins/trap.def 2016-11-06 12:04:35.000000000 -0500 +*************** +*** 99,102 **** +--- b/99,103 ---- + + extern int posixly_correct, subshell_environment; ++ extern int sourcelevel, running_trap; + + int +*************** +*** 213,216 **** +--- b/214,220 ---- + if (interactive) + set_signal_handler (SIGINT, sigint_sighandler); ++ /* special cases for interactive == 0 */ ++ else if (interactive_shell && (sourcelevel||running_trap)) ++ set_signal_handler (SIGINT, sigint_sighandler); + else + set_signal_handler (SIGINT, termsig_sighandler); +*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 +--- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 +*************** +*** 26,30 **** + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 22 + + #endif /* _PATCHLEVEL_H_ */ +--- b/26,30 ---- + looks for to find the patch level (for the sccs version string). */ + +! #define PATCHLEVEL 23 + + #endif /* _PATCHLEVEL_H_ */ From d649ede5dd25e2ef9808a70799ed6fdd293c1342 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 13 Mar 2019 19:11:34 +0100 Subject: [PATCH 0158/7482] package/ngircd: bump to version 25 - Remove patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ngircd/0001-Fix-Get_error-usage.patch | 44 ------------------- package/ngircd/ngircd.hash | 3 +- package/ngircd/ngircd.mk | 2 +- 3 files changed, 3 insertions(+), 46 deletions(-) delete mode 100644 package/ngircd/0001-Fix-Get_error-usage.patch diff --git a/package/ngircd/0001-Fix-Get_error-usage.patch b/package/ngircd/0001-Fix-Get_error-usage.patch deleted file mode 100644 index 3724e46d89..0000000000 --- a/package/ngircd/0001-Fix-Get_error-usage.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 543f44bff8d56785dc13a74a14d4eaa96465bf05 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Wed, 13 Sep 2017 14:07:11 +0200 -Subject: [PATCH] Fix Get_error usage - -The usage of Get_Error is guarded by "ifdef h_errno" in this file, the -definition of this function should follow the same rules. - -Fixes a build error when cross-compiling: -https://github.com/ngircd/ngircd/issues/223 - -Patch sent upstream: https://github.com/ngircd/ngircd/pull/240 - -Signed-off-by: Bernd Kuhls ---- - src/ngircd/resolve.c | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/src/ngircd/resolve.c b/src/ngircd/resolve.c -index 32791901..e1903254 100644 ---- a/src/ngircd/resolve.c -+++ b/src/ngircd/resolve.c -@@ -108,9 +108,7 @@ Resolve_Name( PROC_STAT *s, const char *Host, void (*cbfunc)(int, short)) - return false; - } /* Resolve_Name */ - -- --#if !defined(HAVE_GETADDRINFO) || !defined(HAVE_GETNAMEINFO) --#if !defined(WANT_IPV6) && defined(h_errno) -+#ifdef h_errno - static char * - Get_Error( int H_Error ) - { -@@ -128,7 +126,6 @@ Get_Error( int H_Error ) - return "unknown error"; - } - #endif --#endif - - - /* Do "IDENT" (aka "AUTH") lookup and append result to resolved_addr array */ --- -2.11.0 - diff --git a/package/ngircd/ngircd.hash b/package/ngircd/ngircd.hash index 128867bfd8..3772bd6c16 100644 --- a/package/ngircd/ngircd.hash +++ b/package/ngircd/ngircd.hash @@ -1,2 +1,3 @@ # Locally calculated after checking pgp signature -sha256 173fa0ea10788a8ba08ef2f7e64ea8951d7c88862e744128c8b87bae424b1008 ngircd-24.tar.xz +sha256 c4997cae3e3dd6ff6a605ca274268f2b8c9ba0b1a96792c7402e5594222eee4e ngircd-25.tar.xz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/ngircd/ngircd.mk b/package/ngircd/ngircd.mk index 9b330fab53..5fa86afdd5 100644 --- a/package/ngircd/ngircd.mk +++ b/package/ngircd/ngircd.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGIRCD_VERSION = 24 +NGIRCD_VERSION = 25 NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz NGIRCD_SITE = https://arthur.barton.de/pub/ngircd NGIRCD_LICENSE = GPL-2.0+ From 1e61048ee149f423d768581cf3c90171d1fb9f99 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 13 Mar 2019 19:23:43 +0100 Subject: [PATCH 0159/7482] package/liblo: bump to version 0.30 - Remove both patches (already in version) - Add sha256 hash Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...001-server-use-correct-poll.h-header.patch | 32 ------------------- ...rver.c-fix-stringop-truncation-error.patch | 30 ----------------- package/liblo/liblo.hash | 7 ++-- package/liblo/liblo.mk | 2 +- 4 files changed, 5 insertions(+), 66 deletions(-) delete mode 100644 package/liblo/0001-server-use-correct-poll.h-header.patch delete mode 100644 package/liblo/0002-src-server.c-fix-stringop-truncation-error.patch diff --git a/package/liblo/0001-server-use-correct-poll.h-header.patch b/package/liblo/0001-server-use-correct-poll.h-header.patch deleted file mode 100644 index 04c0445534..0000000000 --- a/package/liblo/0001-server-use-correct-poll.h-header.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d59f2e6f42a9e4f8a9184d7ed75546f47dc50123 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 8 Apr 2018 11:09:02 +0200 -Subject: [PATCH] server: use correct poll.h header - -Fixes build with the musl C library: - http://autobuild.buildroot.net/results/000a46954d0c6d3dbc4b4634a0d3a3c955fac679 - -Signed-off-by: "Yann E. MORIN" ---- -Upstream status: - PR sent: https://github.com/radarsat1/liblo/pull/66 ---- - src/server.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/server.c b/src/server.c -index 01fa08f..11c62d2 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -51,7 +51,7 @@ - #include - #include - #ifdef HAVE_POLL --#include -+#include - #endif - #include - #include --- -2.14.1 - diff --git a/package/liblo/0002-src-server.c-fix-stringop-truncation-error.patch b/package/liblo/0002-src-server.c-fix-stringop-truncation-error.patch deleted file mode 100644 index 3f3bf86cc3..0000000000 --- a/package/liblo/0002-src-server.c-fix-stringop-truncation-error.patch +++ /dev/null @@ -1,30 +0,0 @@ -From c1b2fbd8d96d9b668a0b5e3c49c75c13cfe7d4ba Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 15 Dec 2018 21:55:08 +0100 -Subject: [PATCH] src/server.c: fix stringop-truncation error - -Fixes: - - http://autobuild.buildroot.org/results/62896bd6a1a30facaffd07a7a763831996dc8ea0 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/radarsat1/liblo/pull/70] ---- - src/server.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/server.c b/src/server.c -index 6d1a9de..72aecc9 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -377,7 +377,7 @@ void lo_server_resolve_hostname(lo_server s) - gethostname(hostname, sizeof(hostname)); - he = gethostbyname(hostname); - if (he) { -- strncpy(hostname, he->h_name, sizeof(hostname)); -+ strncpy(hostname, he->h_name, sizeof(hostname) - 1); - } - } - --- -2.14.1 - diff --git a/package/liblo/liblo.hash b/package/liblo/liblo.hash index fe61f82e67..049ab80747 100644 --- a/package/liblo/liblo.hash +++ b/package/liblo/liblo.hash @@ -1,6 +1,7 @@ -# From http://sourceforge.net/projects/liblo/files/liblo/0.29/ -sha1 6aa69456787d3d6ef915281b4a0f8f2c79548ce3 liblo-0.29.tar.gz -md5 b0e70bc0fb2254addf94adddf85cffd3 liblo-0.29.tar.gz +# From http://sourceforge.net/projects/liblo/files/liblo/0.30/ +sha1 152a3260d186f111a71508dc0ed709984960f130 liblo-0.30.tar.gz +md5 fa1a9d45f86fc18fb54019f670ff2262 liblo-0.30.tar.gz # Locally computed +sha256 30a7c9de49a25ed7f2425a7a7415f5b14739def62431423d3419ea26fb978d1b liblo-0.30.tar.gz sha256 5df07007198989c622f5d41de8d703e7bef3d0e79d62e24332ee739a452af62a COPYING diff --git a/package/liblo/liblo.mk b/package/liblo/liblo.mk index e28e52803a..69918186db 100644 --- a/package/liblo/liblo.mk +++ b/package/liblo/liblo.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBLO_VERSION = 0.29 +LIBLO_VERSION = 0.30 LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION) LIBLO_LICENSE = LGPL-2.1+ From 74a43e251791336729ac901a0a8a2a130573ded2 Mon Sep 17 00:00:00 2001 From: Grzegorz Blach Date: Wed, 13 Mar 2019 23:02:52 +0100 Subject: [PATCH 0160/7482] package/python-aioblescan: new package Python library to scan and decode advertised BLE info. Uses asyncio. https://github.com/frawau/aioblescan Signed-off-by: Grzegorz Blach Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-aioblescan/Config.in | 7 +++++++ package/python-aioblescan/python-aioblescan.hash | 5 +++++ package/python-aioblescan/python-aioblescan.mk | 14 ++++++++++++++ 5 files changed, 28 insertions(+) create mode 100644 package/python-aioblescan/Config.in create mode 100644 package/python-aioblescan/python-aioblescan.hash create mode 100644 package/python-aioblescan/python-aioblescan.mk diff --git a/DEVELOPERS b/DEVELOPERS index bff5a58a5b..10ba19b647 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -933,6 +933,7 @@ F: fs/f2fs/ F: package/bluez5_utils-headers/ F: package/f2fs-tools/ F: package/pigpio/ +F: package/python-aioblescan/ F: package/python-falcon/ F: package/python-mimeparse/ F: package/python-pigpio/ diff --git a/package/Config.in b/package/Config.in index 420e6e95a3..f0ddfb76e9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -799,6 +799,7 @@ endif source "package/python3/Config.in" if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 menu "External python modules" + source "package/python-aioblescan/Config.in" source "package/python-aiocoap/Config.in" source "package/python-aiodns/Config.in" source "package/python-aiohttp/Config.in" diff --git a/package/python-aioblescan/Config.in b/package/python-aioblescan/Config.in new file mode 100644 index 0000000000..dd1acfa095 --- /dev/null +++ b/package/python-aioblescan/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_AIOBLESCAN + bool "python-aioblescan" + depends on BR2_PACKAGE_PYTHON3 + help + Scanning Bluetooth for advertised info with asyncio. + + https://github.com/frawau/aioblescan diff --git a/package/python-aioblescan/python-aioblescan.hash b/package/python-aioblescan/python-aioblescan.hash new file mode 100644 index 0000000000..d33162850a --- /dev/null +++ b/package/python-aioblescan/python-aioblescan.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aioblescan/json +md5 b662f44828a99430d4ed42c843ddb89c aioblescan-0.2.4.tar.gz +sha256 d613f24ffdb3dae48d6157443f76708f0c791034036330d00272af6b408b2c6c aioblescan-0.2.4.tar.gz +# Locally computed sha256 checksums +sha256 c2066cd44079e0c706234001af18cb6ad4b62fc68d0d08d29fdc7319916647e0 LICENSE.txt diff --git a/package/python-aioblescan/python-aioblescan.mk b/package/python-aioblescan/python-aioblescan.mk new file mode 100644 index 0000000000..8a6bda3a65 --- /dev/null +++ b/package/python-aioblescan/python-aioblescan.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aioblescan +# +################################################################################ + +PYTHON_AIOBLESCAN_VERSION = 0.2.4 +PYTHON_AIOBLESCAN_SOURCE = aioblescan-$(PYTHON_AIOBLESCAN_VERSION).tar.gz +PYTHON_AIOBLESCAN_SITE = https://files.pythonhosted.org/packages/a9/ad/1e2f41b2036bd76079f88cd94ce35b5a996d937dccaf432ea6b8092d3e11 +PYTHON_AIOBLESCAN_SETUP_TYPE = distutils +PYTHON_AIOBLESCAN_LICENSE = MIT +PYTHON_AIOBLESCAN_LICENSE_FILES = LICENSE.txt + +$(eval $(python-package)) From 1e17adf1c5ee1cecd747f84fff8f6261c1e8a476 Mon Sep 17 00:00:00 2001 From: Artem Panfilov Date: Wed, 13 Mar 2019 02:46:51 +0300 Subject: [PATCH 0161/7482] package/avahi: add upstream security fix Fixes CVE-2017-6519: avahi-daemon in Avahi through 0.6.32 and 0.7 inadvertently responds to IPv6 unicast queries with source addresses that are not on-link, which allows remote attackers to cause a denial of service (traffic amplification) and may cause information leakage by obtaining potentially sensitive information from the responding device via port-5353 UDP packets. Signed-off-by: Artem Panfilov Signed-off-by: Thomas Petazzoni --- ...ast-queries-from-address-not-on-loca.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch diff --git a/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch b/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch new file mode 100644 index 0000000000..0e8408c830 --- /dev/null +++ b/package/avahi/0001-Drop-legacy-unicast-queries-from-address-not-on-loca.patch @@ -0,0 +1,48 @@ +From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001 +From: Trent Lloyd +Date: Sat, 22 Dec 2018 09:06:07 +0800 +Subject: [PATCH] Drop legacy unicast queries from address not on local link + +When handling legacy unicast queries, ensure that the source IP is +inside a subnet on the local link, otherwise drop the packet. + +Fixes #145 +Fixes #203 +CVE-2017-6519 +CVE-2018-100084 + +Backported from: e111def44a7df4624a4aa3f85fe98054bffb6b4f +Signed-off-by: Artem Panfilov +--- + avahi-core/server.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/avahi-core/server.c b/avahi-core/server.c +index a2cb19a8..a2580e38 100644 +--- a/avahi-core/server.c ++++ b/avahi-core/server.c +@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres + + if (avahi_dns_packet_is_query(p)) { + int legacy_unicast = 0; ++ char t[AVAHI_ADDRESS_STR_MAX]; + + /* For queries EDNS0 might allow ARCOUNT != 0. We ignore the + * AR section completely here, so far. Until the day we add +@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres + legacy_unicast = 1; + } + ++ if (!is_mdns_mcast_address(dst_address) && ++ !avahi_interface_address_on_link(i, src_address)) { ++ ++ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol); ++ return; ++ } ++ + if (legacy_unicast) + reflect_legacy_unicast_query_packet(s, p, i, src_address, port); + +-- +2.19.1 + From 2776484107b8f8640e0771c3ffe45b62a78920fb Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Thu, 14 Mar 2019 21:26:15 +0100 Subject: [PATCH 0162/7482] package/x11r7/xapp_xdm: security bump to version 1.1.12 Fixes CVE-2013-2179. Release notes: https://lists.x.org/archives/xorg-announce/2019-March/002959.html Added all license hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xdm/xapp_xdm.hash | 9 +++++++-- package/x11r7/xapp_xdm/xapp_xdm.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xdm/xapp_xdm.hash b/package/x11r7/xapp_xdm/xapp_xdm.hash index 207d769fbf..605be9debc 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.hash +++ b/package/x11r7/xapp_xdm/xapp_xdm.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2011-September/001737.html -sha256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 xdm-1.1.11.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002959.html +md5 47c4c3bf8d59b64b64d134df8b5e5ec5 xdm-1.1.12.tar.bz2 +sha1 5cc5590e40837949b1a63cb030878f8ceebd4d85 xdm-1.1.12.tar.bz2 +sha256 0dd283f72dda098d09e2925b9278c95e21551e693a5802ab442d1b577d8327f4 xdm-1.1.12.tar.bz2 +sha512 1a4be0a070ced5db8fda6fc74794c9f9ed0cb37fa440fda6a3a7652aff62dfc3d7ba68b9facf054671ebf0f4db2a0eec29d0aa3716e3407ccd5529bac3553bdb xdm-1.1.12.tar.bz2 +# Locally computed +sha256 b33b4bebbd6511b3e15315e8e29d67f25334ee45da8b7da6e6e97c53a70c6923 COPYING diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk index 422ee53b10..3c91e21579 100644 --- a/package/x11r7/xapp_xdm/xapp_xdm.mk +++ b/package/x11r7/xapp_xdm/xapp_xdm.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XDM_VERSION = 1.1.11 +XAPP_XDM_VERSION = 1.1.12 XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2 XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XDM_LICENSE = MIT From b01d463c14060318743ce5d0a2da01a5b3a5e0e2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sat, 9 Mar 2019 20:28:14 +0200 Subject: [PATCH 0163/7482] package/libpcap: disable dbus to break circular dependency The optional dbus dependency of libpcap creates a circular dependency chain: $ make libpcap-show-recursive-depends Recursion detected for : systemd which is a dependency of: dbus which is a dependency of: libpcap which is a dependency of: iptables which is a dependency of: systemd make: *** [package/libpcap/libpcap.mk:55: libpcap-show-recursive-depends] Error 1 Of all these dependencies the one of libpcap on dbus seems to be less useful. Drop it. Fixes: http://autobuild.buildroot.net/results/0b5d18bff816cbcee11e8645449701722d956de5/ Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libpcap/libpcap.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 126087220b..83188c8c48 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -16,6 +16,8 @@ LIBPCAP_CONF_ENV = \ CFLAGS="$(LIBPCAP_CFLAGS)" LIBPCAP_CFLAGS = $(TARGET_CFLAGS) LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux --without-dag +# Disable dbus to break recursive dependencies +LIBPCAP_CONF_OPTS += --disable-dbus LIBPCAP_CONFIG_SCRIPTS = pcap-config # Omit -rpath from pcap-config output @@ -32,13 +34,6 @@ else LIBPCAP_CONF_OPTS += --disable-bluetooth endif -ifeq ($(BR2_PACKAGE_DBUS),y) -LIBPCAP_CONF_OPTS += --enable-dbus -LIBPCAP_DEPENDENCIES += dbus -else -LIBPCAP_CONF_OPTS += --disable-dbus -endif - ifeq ($(BR2_PACKAGE_LIBNL),y) LIBPCAP_DEPENDENCIES += libnl LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3" From fbe8d0b24a4f4023a09d90442eaa12ef85b49e64 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 26 Feb 2019 15:28:12 -0500 Subject: [PATCH 0164/7482] package/systemd: bump version to 241 In addition: - Remove patches that have been committed upstream. - Update hash for the README file. (Meson and Dbus dependency version updates) ./support/testing/run-tests -d dl -o output -k tests.init.test_systemd 14:18:20 TestInitSystemSystemdRwNetworkd Starting 14:18:21 TestInitSystemSystemdRwNetworkd Building 14:26:20 TestInitSystemSystemdRwNetworkd Building done 14:27:01 TestInitSystemSystemdRwNetworkd Cleaning up .14:27:01 TestInitSystemSystemdRwIfupdown Starting 14:27:01 TestInitSystemSystemdRwIfupdown Building 14:28:35 TestInitSystemSystemdRwIfupdown Building done 14:29:03 TestInitSystemSystemdRwIfupdown Cleaning up .14:29:03 TestInitSystemSystemdRwFull Starting 14:29:04 TestInitSystemSystemdRwFull Building 14:44:35 TestInitSystemSystemdRwFull Building done 14:45:18 TestInitSystemSystemdRwFull Cleaning up .14:45:18 TestInitSystemSystemdRoNetworkd Starting 14:45:19 TestInitSystemSystemdRoNetworkd Building 14:55:59 TestInitSystemSystemdRoNetworkd Building done 14:56:23 TestInitSystemSystemdRoNetworkd Cleaning up .14:56:23 TestInitSystemSystemdRoIfupdown Starting 14:56:24 TestInitSystemSystemdRoIfupdown Building 15:06:42 TestInitSystemSystemdRoIfupdown Building done 15:07:09 TestInitSystemSystemdRoIfupdown Cleaning up .15:07:09 TestInitSystemSystemdRoFull Starting 15:07:10 TestInitSystemSystemdRoFull Building 15:21:17 TestInitSystemSystemdRoFull Building done 15:21:46 TestInitSystemSystemdRoFull Cleaning up . ---------------------------------------------------------------------- Ran 6 tests in 3806.472s OK Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- ...cross-compilation-compatible-c-check.patch | 60 ----- ...ity-fix-build-without-PR_CAP_AMBIENT.patch | 61 ------ ...e-util.c-fix-build-without-O_TMPFILE.patch | 34 --- ...missing_if_link.h-add-IFLA_BOND_MODE.patch | 49 ----- ...07-missing_syscall.h-include-errno.h.patch | 28 --- ...util.c-fix-build-without-F_OFD_SETLK.patch | 34 --- ...store-the-iovec-entry-for-process-co.patch | 205 ------------------ ...t-a-limit-on-the-number-of-fields-1k.patch | 57 ----- ...mote-verify-entry-length-from-header.patch | 112 ---------- ...et-a-limit-on-the-number-of-fields-i.patch | 81 ------- ...var-to-device_path_parse_major_minor.patch | 116 ---------- ...c-fix-build-without-BRIDGE_VLAN_INFO.patch | 34 --- ...-fix-build-without-IFA_F_NOPREFIXROU.patch | 33 --- ....c-fix-build-without-IFA_F_NOPREFIXR.patch | 33 --- ...-fix-build-without-IFA_F_NOPREFIXROU.patch | 33 --- package/systemd/systemd.hash | 4 +- package/systemd/systemd.mk | 2 +- 17 files changed, 3 insertions(+), 973 deletions(-) delete mode 100644 package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch delete mode 100644 package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch delete mode 100644 package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch delete mode 100644 package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch delete mode 100644 package/systemd/0007-missing_syscall.h-include-errno.h.patch delete mode 100644 package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch delete mode 100644 package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch delete mode 100644 package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch delete mode 100644 package/systemd/0011-journal-remote-verify-entry-length-from-header.patch delete mode 100644 package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch delete mode 100644 package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch delete mode 100644 package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch delete mode 100644 package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch delete mode 100644 package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch delete mode 100644 package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch diff --git a/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch b/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch deleted file mode 100644 index 70d816fae2..0000000000 --- a/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 180a940333c84495015bd5b24d41c1dbfff509f2 Mon Sep 17 00:00:00 2001 -From: James Hilliard -Date: Thu, 27 Dec 2018 09:16:20 +0800 -Subject: [PATCH] meson: use cross compilation compatible c++ check - -[james.hilliard1@gmail.com: backport from upstream commit -46e63a2a3ed46ce97430ce38e4cc0798c57900eb] -Signed-off-by: James Hilliard ---- - meson.build | 4 +--- - src/systemd/meson.build | 3 +-- - src/test/meson.build | 2 +- - 3 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index b338886..1964b1a 100644 ---- a/meson.build -+++ b/meson.build -@@ -287,10 +287,8 @@ want_tests = get_option('tests') - slow_tests = want_tests != 'false' and get_option('slow-tests') - install_tests = get_option('install-tests') - --cxx = find_program('c++', required : fuzzer_build) --if cxx.found() -+if add_languages('cpp', required : fuzzer_build) - # Used only for tests -- add_languages('cpp') - cxx_cmd = ' '.join(meson.get_compiler('cpp').cmd_array()) - else - cxx_cmd = '' -diff --git a/src/systemd/meson.build b/src/systemd/meson.build -index e0c967e..75c48b0 100644 ---- a/src/systemd/meson.build -+++ b/src/systemd/meson.build -@@ -52,8 +52,7 @@ if cc.has_argument('-std=iso9899:2017') - opts += [['c', '-std=iso9899:2017']] - endif - --cxx = find_program('c++', required : false) --if cxx.found() -+if add_languages('cpp', required : false) - opts += [['c++'], - ['c++', '-std=c++98'], - ['c++', '-std=c++11']] -diff --git a/src/test/meson.build b/src/test/meson.build -index ea049a6..d9d87e0 100644 ---- a/src/test/meson.build -+++ b/src/test/meson.build -@@ -957,7 +957,7 @@ tests += [ - - ] - --if cxx.found() -+if cxx_cmd != '' - tests += [ - [['src/libsystemd/sd-bus/test-bus-vtable-cc.cc'], - [], --- -2.7.4 - diff --git a/package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch b/package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch deleted file mode 100644 index 7b240d1b1a..0000000000 --- a/package/systemd/0004-capability-fix-build-without-PR_CAP_AMBIENT.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 822809d0afd0f984750a61b2391059411afa4333 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 16:07:00 +0100 -Subject: [PATCH] capability: fix build without PR_CAP_AMBIENT - -systemd fails to build on kernel without PR_CAP_AMBIENT (< 4.3) since -https://github.com/systemd/systemd/commit/2a03bb3e65327c73008f1db485ffc75c432dc6b2 - -To fix this error, include missing_prctl.h in all files using -PR_CAP_AMBIENT - -Fixes: - - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - src/basic/capability-util.c | 1 + - src/test/test-capability.c | 1 + - src/test/test-execute.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/src/basic/capability-util.c b/src/basic/capability-util.c -index a3f3ca9f5..b944ee6ea 100644 ---- a/src/basic/capability-util.c -+++ b/src/basic/capability-util.c -@@ -13,6 +13,7 @@ - #include "fileio.h" - #include "log.h" - #include "macro.h" -+#include "missing_prctl.h" - #include "parse-util.h" - #include "user-util.h" - #include "util.h" -diff --git a/src/test/test-capability.c b/src/test/test-capability.c -index dae85f2f9..3db05878a 100644 ---- a/src/test/test-capability.c -+++ b/src/test/test-capability.c -@@ -13,6 +13,7 @@ - #include "fd-util.h" - #include "fileio.h" - #include "macro.h" -+#include "missing_prctl.h" - #include "parse-util.h" - #include "tests.h" - #include "util.h" -diff --git a/src/test/test-execute.c b/src/test/test-execute.c -index 2115061ad..cea68b8cf 100644 ---- a/src/test/test-execute.c -+++ b/src/test/test-execute.c -@@ -13,6 +13,7 @@ - #include "fs-util.h" - #include "macro.h" - #include "manager.h" -+#include "missing_prctl.h" - #include "mkdir.h" - #include "path-util.h" - #include "rm-rf.h" --- -2.14.1 - diff --git a/package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch b/package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch deleted file mode 100644 index 300fc544fd..0000000000 --- a/package/systemd/0005-basic-tmpfile-util.c-fix-build-without-O_TMPFILE.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b1ca50178b97b3b827b0420ec7bdf9cb1d6fec56 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 16:36:06 +0100 -Subject: [PATCH] basic/tmpfile-util.c: fix build without O_TMPFILE - -systemd fails to build on kernel without O_TMPFILE (< 3.11) since -https://github.com/systemd/systemd/commit/dea72eda9cdbfeedd24cbe8c734ad0639bf96cde - -To fix this error, include missing_fcntl.h - -Fixes: - - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - src/basic/tmpfile-util.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/basic/tmpfile-util.c b/src/basic/tmpfile-util.c -index 669eb2666..bc92d6a6d 100644 ---- a/src/basic/tmpfile-util.c -+++ b/src/basic/tmpfile-util.c -@@ -8,6 +8,7 @@ - #include "hexdecoct.h" - #include "macro.h" - #include "memfd-util.h" -+#include "missing_fcntl.h" - #include "missing_syscall.h" - #include "path-util.h" - #include "process-util.h" --- -2.14.1 - diff --git a/package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch b/package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch deleted file mode 100644 index ace29be6a5..0000000000 --- a/package/systemd/0006-missing_if_link.h-add-IFLA_BOND_MODE.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 9ab48a9b3bfadca4fbe055ddb4f6fc677ee4ae85 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 17:08:48 +0100 -Subject: [PATCH] missing_if_link.h: add IFLA_BOND_MODE - -systemd fails to build on kernel without IFLA_BOND_MODE (< 3.13) since -https://github.com/systemd/systemd/commit/9714c020fc4cda1823c2a77e3fd08aefa7d78b25 - -So put back IFLA_BOND_MODE definition - -Fixes: - - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - meson.build | 1 + - src/basic/missing_if_link.h | 3 +++ - 2 files changed, 4 insertions(+) - -diff --git a/meson.build b/meson.build -index 623c1ad6b..011e44980 100644 ---- a/meson.build -+++ b/meson.build -@@ -476,6 +476,7 @@ foreach decl : [['ETHTOOL_LINK_MODE_10baseT_Half_BIT', 'linux/ethtool.h'], - ['IFLA_TARGET_NETNSID', 'linux/if_link.h'], - ['IFLA_NEW_IFINDEX', 'linux/if_link.h'], - ['IFLA_MAX_MTU', 'linux/if_link.h'], -+ ['IFLA_BOND_MODE', 'linux/if_link.h'], - ['IFLA_BOND_ACTIVE_SLAVE', 'linux/if_link.h'], - ['IFLA_BOND_AD_INFO', 'linux/if_link.h'], - ['IFLA_BOND_AD_ACTOR_SYSTEM', 'linux/if_link.h'], -diff --git a/src/basic/missing_if_link.h b/src/basic/missing_if_link.h -index 07675426b..761797f56 100644 ---- a/src/basic/missing_if_link.h -+++ b/src/basic/missing_if_link.h -@@ -110,6 +110,9 @@ enum ipvlan_mode { - #define IFLA_MAX 51 - #endif - -+#if !HAVE_IFLA_BOND_MODE /* linux@90af231106c0b8d223c27d35464af95cb3d9cacf (3.13) */ -+#define IFLA_BOND_MODE 1 -+#endif - #if !HAVE_IFLA_BOND_ACTIVE_SLAVE /* linux@ec76aa49855f6d6fea5e01de179fb57dd47c619d (3.13) */ - #define IFLA_BOND_ACTIVE_SLAVE 2 - #endif --- -2.14.1 - diff --git a/package/systemd/0007-missing_syscall.h-include-errno.h.patch b/package/systemd/0007-missing_syscall.h-include-errno.h.patch deleted file mode 100644 index eb5d9eacb7..0000000000 --- a/package/systemd/0007-missing_syscall.h-include-errno.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 985d15d636b4d2c7086dbd305369c02756cdbe19 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 17:24:21 +0100 -Subject: [PATCH] missing_syscall.h: include errno.h - -This include is needed for errno and ENOSYS - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - src/basic/missing_syscall.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/basic/missing_syscall.h b/src/basic/missing_syscall.h -index d5d4b26ac..d1aa32218 100644 ---- a/src/basic/missing_syscall.h -+++ b/src/basic/missing_syscall.h -@@ -3,6 +3,7 @@ - - /* Missing glibc definitions to access certain kernel APIs */ - -+#include - #include - #include - #include --- -2.14.1 - diff --git a/package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch b/package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch deleted file mode 100644 index 1a1542c706..0000000000 --- a/package/systemd/0008-lockfile-util.c-fix-build-without-F_OFD_SETLK.patch +++ /dev/null @@ -1,34 +0,0 @@ -From badb5dafa9efc89384d9d2bea5648f7b017204d7 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 11 Jan 2019 17:30:32 +0100 -Subject: [PATCH] lockfile-util.c: fix build without F_OFD_SETLK - -systemd fails to build on kernel without F_OFD_SETLK since -https://github.com/systemd/systemd/commit/9714c020fc4cda1823c2a77e3fd08aefa7d78b25 - -So put include missing_fcntl.h - -Fixes: - - http://autobuild.buildroot.org/results/699c078aa078240c6741da4dbd0871450ceeca92 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://github.com/systemd/systemd/pull/11400] ---- - src/shared/lockfile-util.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/shared/lockfile-util.c b/src/shared/lockfile-util.c -index 4bae23b24..260c2088d 100644 ---- a/src/shared/lockfile-util.c -+++ b/src/shared/lockfile-util.c -@@ -12,6 +12,7 @@ - #include "fs-util.h" - #include "lockfile-util.h" - #include "macro.h" -+#include "missing_fcntl.h" - #include "path-util.h" - - int make_lock_file(const char *p, int operation, LockFile *ret) { --- -2.14.1 - diff --git a/package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch b/package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch deleted file mode 100644 index dbf9bb51c3..0000000000 --- a/package/systemd/0009-journald-do-not-store-the-iovec-entry-for-process-co.patch +++ /dev/null @@ -1,205 +0,0 @@ -From 084eeb865ca63887098e0945fb4e93c852b91b0f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 5 Dec 2018 18:38:39 +0100 -Subject: [PATCH] journald: do not store the iovec entry for process - commandline on stack - -This fixes a crash where we would read the commandline, whose length is under -control of the sending program, and then crash when trying to create a stack -allocation for it. - -CVE-2018-16864 -https://bugzilla.redhat.com/show_bug.cgi?id=1653855 - -The message actually doesn't get written to disk, because -journal_file_append_entry() returns -E2BIG. - -[james.hilliard1@gmail.com: backport from upstream commit -084eeb865ca63887098e0945fb4e93c852b91b0f] -Signed-off-by: James Hilliard ---- - src/basic/io-util.c | 10 ++++++++++ - src/basic/io-util.h | 2 ++ - src/coredump/coredump.c | 31 +++++++++++-------------------- - src/journal/journald-server.c | 25 +++++++++++++++---------- - 4 files changed, 38 insertions(+), 30 deletions(-) - -diff --git a/src/basic/io-util.c b/src/basic/io-util.c -index 1f64cc9..575398f 100644 ---- a/src/basic/io-util.c -+++ b/src/basic/io-util.c -@@ -8,6 +8,7 @@ - #include - - #include "io-util.h" -+#include "string-util.h" - #include "time-util.h" - - int flush_fd(int fd) { -@@ -252,3 +253,12 @@ ssize_t sparse_write(int fd, const void *p, size_t sz, size_t run_length) { - - return q - (const uint8_t*) p; - } -+ -+char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value) { -+ char *x; -+ -+ x = strappend(field, value); -+ if (x) -+ iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x); -+ return x; -+} -diff --git a/src/basic/io-util.h b/src/basic/io-util.h -index ed189b5..792a64a 100644 ---- a/src/basic/io-util.h -+++ b/src/basic/io-util.h -@@ -71,3 +71,5 @@ static inline bool FILE_SIZE_VALID_OR_INFINITY(uint64_t l) { - #define IOVEC_MAKE(base, len) (struct iovec) IOVEC_INIT(base, len) - #define IOVEC_INIT_STRING(string) IOVEC_INIT((char*) string, strlen(string)) - #define IOVEC_MAKE_STRING(string) (struct iovec) IOVEC_INIT_STRING(string) -+ -+char* set_iovec_string_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value); -diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c -index 20c1fb0..db2cf64 100644 ---- a/src/coredump/coredump.c -+++ b/src/coredump/coredump.c -@@ -1063,19 +1063,10 @@ static int send_iovec(const struct iovec iovec[], size_t n_iovec, int input_fd) - return 0; - } - --static char* set_iovec_field(struct iovec *iovec, size_t *n_iovec, const char *field, const char *value) { -- char *x; -- -- x = strappend(field, value); -- if (x) -- iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(x); -- return x; --} -- - static char* set_iovec_field_free(struct iovec *iovec, size_t *n_iovec, const char *field, char *value) { - char *x; - -- x = set_iovec_field(iovec, n_iovec, field, value); -+ x = set_iovec_string_field(iovec, n_iovec, field, value); - free(value); - return x; - } -@@ -1125,36 +1116,36 @@ static int gather_pid_metadata( - disable_coredumps(); - } - -- set_iovec_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]); -+ set_iovec_string_field(iovec, n_iovec, "COREDUMP_UNIT=", context[CONTEXT_UNIT]); - } - - if (cg_pid_get_user_unit(pid, &t) >= 0) - set_iovec_field_free(iovec, n_iovec, "COREDUMP_USER_UNIT=", t); - - /* The next few are mandatory */ -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_PID=", context[CONTEXT_PID])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_UID=", context[CONTEXT_UID])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_GID=", context[CONTEXT_GID])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL=", context[CONTEXT_SIGNAL])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_RLIMIT=", context[CONTEXT_RLIMIT])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_HOSTNAME=", context[CONTEXT_HOSTNAME])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_HOSTNAME=", context[CONTEXT_HOSTNAME])) - return log_oom(); - -- if (!set_iovec_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM])) -+ if (!set_iovec_string_field(iovec, n_iovec, "COREDUMP_COMM=", context[CONTEXT_COMM])) - return log_oom(); - - if (context[CONTEXT_EXE] && -- !set_iovec_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE])) -+ !set_iovec_string_field(iovec, n_iovec, "COREDUMP_EXE=", context[CONTEXT_EXE])) - return log_oom(); - - if (sd_pid_get_session(pid, &t) >= 0) -@@ -1222,7 +1213,7 @@ static int gather_pid_metadata( - iovec[(*n_iovec)++] = IOVEC_MAKE_STRING(t); - - if (safe_atoi(context[CONTEXT_SIGNAL], &signo) >= 0 && SIGNAL_VALID(signo)) -- set_iovec_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo)); -+ set_iovec_string_field(iovec, n_iovec, "COREDUMP_SIGNAL_NAME=SIG", signal_to_string(signo)); - - return 0; /* we successfully acquired all metadata */ - } -diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c -index f096725..2a960eb 100644 ---- a/src/journal/journald-server.c -+++ b/src/journal/journald-server.c -@@ -905,6 +905,7 @@ static void dispatch_message_real( - pid_t object_pid) { - - char source_time[sizeof("_SOURCE_REALTIME_TIMESTAMP=") + DECIMAL_STR_MAX(usec_t)]; -+ _cleanup_free_ char *cmdline1 = NULL, *cmdline2 = NULL; - uid_t journal_uid; - ClientContext *o; - -@@ -921,20 +922,23 @@ static void dispatch_message_real( - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->uid, uid_t, uid_is_valid, UID_FMT, "_UID"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->gid, gid_t, gid_is_valid, GID_FMT, "_GID"); - -- IOVEC_ADD_STRING_FIELD(iovec, n, c->comm, "_COMM"); -- IOVEC_ADD_STRING_FIELD(iovec, n, c->exe, "_EXE"); -- IOVEC_ADD_STRING_FIELD(iovec, n, c->cmdline, "_CMDLINE"); -- IOVEC_ADD_STRING_FIELD(iovec, n, c->capeff, "_CAP_EFFECTIVE"); -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->comm, "_COMM"); /* At most TASK_COMM_LENGTH (16 bytes) */ -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->exe, "_EXE"); /* A path, so at most PATH_MAX (4096 bytes) */ - -- IOVEC_ADD_SIZED_FIELD(iovec, n, c->label, c->label_size, "_SELINUX_CONTEXT"); -+ if (c->cmdline) -+ /* At most _SC_ARG_MAX (2MB usually), which is too much to put on stack. -+ * Let's use a heap allocation for this one. */ -+ cmdline1 = set_iovec_string_field(iovec, &n, "_CMDLINE=", c->cmdline); - -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->capeff, "_CAP_EFFECTIVE"); /* Read from /proc/.../status */ -+ IOVEC_ADD_SIZED_FIELD(iovec, n, c->label, c->label_size, "_SELINUX_CONTEXT"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->auditid, uint32_t, audit_session_is_valid, "%" PRIu32, "_AUDIT_SESSION"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->loginuid, uid_t, uid_is_valid, UID_FMT, "_AUDIT_LOGINUID"); - -- IOVEC_ADD_STRING_FIELD(iovec, n, c->cgroup, "_SYSTEMD_CGROUP"); -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->cgroup, "_SYSTEMD_CGROUP"); /* A path */ - IOVEC_ADD_STRING_FIELD(iovec, n, c->session, "_SYSTEMD_SESSION"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, c->owner_uid, uid_t, uid_is_valid, UID_FMT, "_SYSTEMD_OWNER_UID"); -- IOVEC_ADD_STRING_FIELD(iovec, n, c->unit, "_SYSTEMD_UNIT"); -+ IOVEC_ADD_STRING_FIELD(iovec, n, c->unit, "_SYSTEMD_UNIT"); /* Unit names are bounded by UNIT_NAME_MAX */ - IOVEC_ADD_STRING_FIELD(iovec, n, c->user_unit, "_SYSTEMD_USER_UNIT"); - IOVEC_ADD_STRING_FIELD(iovec, n, c->slice, "_SYSTEMD_SLICE"); - IOVEC_ADD_STRING_FIELD(iovec, n, c->user_slice, "_SYSTEMD_USER_SLICE"); -@@ -955,13 +959,14 @@ static void dispatch_message_real( - IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->uid, uid_t, uid_is_valid, UID_FMT, "OBJECT_UID"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->gid, gid_t, gid_is_valid, GID_FMT, "OBJECT_GID"); - -+ /* See above for size limits, only ->cmdline may be large, so use a heap allocation for it. */ - IOVEC_ADD_STRING_FIELD(iovec, n, o->comm, "OBJECT_COMM"); - IOVEC_ADD_STRING_FIELD(iovec, n, o->exe, "OBJECT_EXE"); -- IOVEC_ADD_STRING_FIELD(iovec, n, o->cmdline, "OBJECT_CMDLINE"); -- IOVEC_ADD_STRING_FIELD(iovec, n, o->capeff, "OBJECT_CAP_EFFECTIVE"); -+ if (o->cmdline) -+ cmdline2 = set_iovec_string_field(iovec, &n, "OBJECT_CMDLINE=", o->cmdline); - -+ IOVEC_ADD_STRING_FIELD(iovec, n, o->capeff, "OBJECT_CAP_EFFECTIVE"); - IOVEC_ADD_SIZED_FIELD(iovec, n, o->label, o->label_size, "OBJECT_SELINUX_CONTEXT"); -- - IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->auditid, uint32_t, audit_session_is_valid, "%" PRIu32, "OBJECT_AUDIT_SESSION"); - IOVEC_ADD_NUMERIC_FIELD(iovec, n, o->loginuid, uid_t, uid_is_valid, UID_FMT, "OBJECT_AUDIT_LOGINUID"); - --- -2.7.4 - diff --git a/package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch b/package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch deleted file mode 100644 index df1ed806a4..0000000000 --- a/package/systemd/0010-journald-set-a-limit-on-the-number-of-fields-1k.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 052c57f132f04a3cf4148f87561618da1a6908b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 5 Dec 2018 22:45:02 +0100 -Subject: [PATCH] journald: set a limit on the number of fields (1k) - -We allocate a iovec entry for each field, so with many short entries, -our memory usage and processing time can be large, even with a relatively -small message size. Let's refuse overly long entries. - -CVE-2018-16865 -https://bugzilla.redhat.com/show_bug.cgi?id=1653861 - -What from I can see, the problem is not from an alloca, despite what the CVE -description says, but from the attack multiplication that comes from creating -many very small iovecs: (void* + size_t) for each three bytes of input message. - -[james.hilliard1@gmail.com: backport from upstream commit -052c57f132f04a3cf4148f87561618da1a6908b4] -Signed-off-by: James Hilliard ---- - src/journal/journald-native.c | 5 +++++ - src/shared/journal-importer.h | 3 +++ - 2 files changed, 8 insertions(+) - -diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c -index e86178e..d0fee2a 100644 ---- a/src/journal/journald-native.c -+++ b/src/journal/journald-native.c -@@ -141,6 +141,11 @@ static int server_process_entry( - } - - /* A property follows */ -+ if (n > ENTRY_FIELD_COUNT_MAX) { -+ log_debug("Received an entry that has more than " STRINGIFY(ENTRY_FIELD_COUNT_MAX) " fields, ignoring entry."); -+ r = 1; -+ goto finish; -+ } - - /* n existing properties, 1 new, +1 for _TRANSPORT */ - if (!GREEDY_REALLOC(iovec, m, -diff --git a/src/shared/journal-importer.h b/src/shared/journal-importer.h -index 53354b7..7914c0c 100644 ---- a/src/shared/journal-importer.h -+++ b/src/shared/journal-importer.h -@@ -21,6 +21,9 @@ - #endif - #define LINE_CHUNK 8*1024u - -+/* The maximum number of fields in an entry */ -+#define ENTRY_FIELD_COUNT_MAX 1024 -+ - struct iovec_wrapper { - struct iovec *iovec; - size_t size_bytes; --- -2.7.4 - diff --git a/package/systemd/0011-journal-remote-verify-entry-length-from-header.patch b/package/systemd/0011-journal-remote-verify-entry-length-from-header.patch deleted file mode 100644 index 7b74a31d35..0000000000 --- a/package/systemd/0011-journal-remote-verify-entry-length-from-header.patch +++ /dev/null @@ -1,112 +0,0 @@ -From 7fdb237f5473cb8fc2129e57e8a0039526dcb4fd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 7 Dec 2018 12:47:14 +0100 -Subject: [PATCH] journal-remote: verify entry length from header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Calling mhd_respond(), which ulimately calls MHD_queue_response() is -ineffective at point, becuase MHD_queue_response() immediately returns -MHD_NO signifying an error, because the connection is in state -MHD_CONNECTION_CONTINUE_SENT. - -As Christian Grothoff kindly explained: -> You are likely calling MHD_queue_repsonse() too late: once you are -> receiving upload_data, HTTP forces you to process it all. At this time, -> MHD has already sent "100 continue" and cannot take it back (hence you -> get MHD_NO!). -> -> In your request handler, the first time when you are called for a -> connection (and when hence *upload_data_size == 0 and upload_data == -> NULL) you must check the content-length header and react (with -> MHD_queue_response) based on this (to prevent MHD from automatically -> generating 100 continue). - -If we ever encounter this kind of error, print a warning and immediately -abort the connection. (The alternative would be to keep reading the data, -but ignore it, and return an error after we get to the end of data. -That is possible, but of course puts additional load on both the -sender and reciever, and doesn't seem important enough just to return -a good error message.) - -Note that sending of the error does not work (the connection is always aborted -when MHD_queue_response is used with MHD_RESPMEM_MUST_FREE, as in this case) -with libµhttpd 0.59, but works with 0.61: -https://src.fedoraproject.org/rpms/libmicrohttpd/pull-request/1 - -[james.hilliard1@gmail.com: backport from upstream commit -7fdb237f5473cb8fc2129e57e8a0039526dcb4fd] -Signed-off-by: James Hilliard ---- - src/journal-remote/journal-remote-main.c | 34 ++++++++++++++++++++++---------- - 1 file changed, 24 insertions(+), 10 deletions(-) - -diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c -index e1748cb..8543dba 100644 ---- a/src/journal-remote/journal-remote-main.c -+++ b/src/journal-remote/journal-remote-main.c -@@ -221,16 +221,14 @@ static int process_http_upload( - journal_remote_server_global->seal); - if (r == -EAGAIN) - break; -- else if (r < 0) { -- log_warning("Failed to process data for connection %p", connection); -+ if (r < 0) { - if (r == -E2BIG) -- return mhd_respondf(connection, -- r, MHD_HTTP_PAYLOAD_TOO_LARGE, -- "Entry is too large, maximum is " STRINGIFY(DATA_SIZE_MAX) " bytes."); -+ log_warning_errno(r, "Entry is too above maximum of %u, aborting connection %p.", -+ DATA_SIZE_MAX, connection); - else -- return mhd_respondf(connection, -- r, MHD_HTTP_UNPROCESSABLE_ENTITY, -- "Processing failed: %m."); -+ log_warning_errno(r, "Failed to process data, aborting connection %p: %m", -+ connection); -+ return MHD_NO; - } - } - -@@ -264,6 +262,7 @@ static int request_handler( - const char *header; - int r, code, fd; - _cleanup_free_ char *hostname = NULL; -+ size_t len; - - assert(connection); - assert(connection_cls); -@@ -283,12 +282,27 @@ static int request_handler( - if (!streq(url, "/upload")) - return mhd_respond(connection, MHD_HTTP_NOT_FOUND, "Not found."); - -- header = MHD_lookup_connection_value(connection, -- MHD_HEADER_KIND, "Content-Type"); -+ header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Content-Type"); - if (!header || !streq(header, "application/vnd.fdo.journal")) - return mhd_respond(connection, MHD_HTTP_UNSUPPORTED_MEDIA_TYPE, - "Content-Type: application/vnd.fdo.journal is required."); - -+ header = MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Content-Length"); -+ if (!header) -+ return mhd_respond(connection, MHD_HTTP_LENGTH_REQUIRED, -+ "Content-Length header is required."); -+ r = safe_atozu(header, &len); -+ if (r < 0) -+ return mhd_respondf(connection, r, MHD_HTTP_LENGTH_REQUIRED, -+ "Content-Length: %s cannot be parsed: %m", header); -+ -+ if (len > ENTRY_SIZE_MAX) -+ /* When serialized, an entry of maximum size might be slightly larger, -+ * so this does not correspond exactly to the limit in journald. Oh well. -+ */ -+ return mhd_respondf(connection, 0, MHD_HTTP_PAYLOAD_TOO_LARGE, -+ "Payload larger than maximum size of %u bytes", ENTRY_SIZE_MAX); -+ - { - const union MHD_ConnectionInfo *ci; - --- -2.7.4 - diff --git a/package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch b/package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch deleted file mode 100644 index e0aae98d90..0000000000 --- a/package/systemd/0012-journal-remote-set-a-limit-on-the-number-of-fields-i.patch +++ /dev/null @@ -1,81 +0,0 @@ -From ef4d6abe7c7fab6cbff975b32e76b09feee56074 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 7 Dec 2018 10:48:10 +0100 -Subject: [PATCH] journal-remote: set a limit on the number of fields in a - message - -Existing use of E2BIG is replaced with ENOBUFS (entry too long), and E2BIG is -reused for the new error condition (too many fields). - -This matches the change done for systemd-journald, hence forming the second -part of the fix for CVE-2018-16865 -(https://bugzilla.redhat.com/show_bug.cgi?id=1653861). - -[james.hilliard1@gmail.com: backport from upstream commit -ef4d6abe7c7fab6cbff975b32e76b09feee56074] -Signed-off-by: James Hilliard ---- - src/journal-remote/journal-remote-main.c | 7 +++++-- - src/journal-remote/journal-remote.c | 3 +++ - src/shared/journal-importer.c | 5 ++++- - 3 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c -index 8543dba..802c3ea 100644 ---- a/src/journal-remote/journal-remote-main.c -+++ b/src/journal-remote/journal-remote-main.c -@@ -222,9 +222,12 @@ static int process_http_upload( - if (r == -EAGAIN) - break; - if (r < 0) { -- if (r == -E2BIG) -- log_warning_errno(r, "Entry is too above maximum of %u, aborting connection %p.", -+ if (r == -ENOBUFS) -+ log_warning_errno(r, "Entry is above the maximum of %u, aborting connection %p.", - DATA_SIZE_MAX, connection); -+ else if (r == -E2BIG) -+ log_warning_errno(r, "Entry with more fields than the maximum of %u, aborting connection %p.", -+ ENTRY_FIELD_COUNT_MAX, connection); - else - log_warning_errno(r, "Failed to process data, aborting connection %p: %m", - connection); -diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c -index 3c0916c..1da32c5 100644 ---- a/src/journal-remote/journal-remote.c -+++ b/src/journal-remote/journal-remote.c -@@ -407,6 +407,9 @@ int journal_remote_handle_raw_source( - log_debug("%zu active sources remaining", s->active); - return 0; - } else if (r == -E2BIG) { -+ log_notice("Entry with too many fields, skipped"); -+ return 1; -+ } else if (r == -ENOBUFS) { - log_notice("Entry too big, skipped"); - return 1; - } else if (r == -EAGAIN) { -diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c -index b0e6192..8638cd3 100644 ---- a/src/shared/journal-importer.c -+++ b/src/shared/journal-importer.c -@@ -23,6 +23,9 @@ enum { - }; - - static int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) { -+ if (iovw->count >= ENTRY_FIELD_COUNT_MAX) -+ return -E2BIG; -+ - if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1)) - return log_oom(); - -@@ -97,7 +100,7 @@ static int get_line(JournalImporter *imp, char **line, size_t *size) { - - imp->scanned = imp->filled; - if (imp->scanned >= DATA_SIZE_MAX) -- return log_error_errno(SYNTHETIC_ERRNO(E2BIG), -+ return log_error_errno(SYNTHETIC_ERRNO(ENOBUFS), - "Entry is bigger than %u bytes.", - DATA_SIZE_MAX); - --- -2.7.4 - diff --git a/package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch b/package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch deleted file mode 100644 index eb7e0a2705..0000000000 --- a/package/systemd/0013-Pass-separate-dev_t-var-to-device_path_parse_major_minor.patch +++ /dev/null @@ -1,116 +0,0 @@ -From f5855697aa19fb92637e72ab02e4623abe77f288 Mon Sep 17 00:00:00 2001 -From: YunQiang Su -Date: Tue, 25 Dec 2018 19:01:17 +0800 -Subject: [PATCH] Pass separate dev_t var to device_path_parse_major_minor - -MIPS/O32's st_rdev member of struct stat is unsigned long, which -is 32bit, while dev_t is defined as 64bit, which make some problems -in device_path_parse_major_minor. - -Don't pass st.st_rdev, st_mode to device_path_parse_major_minor, -while pass 2 seperate variables. The result of stat is alos copied -out into these 2 variables. Fixes: #11247 - -[Retrieved from: -https://github.com/systemd/systemd/commit/f5855697aa19fb92637e72ab02e4623abe77f288] -Signed-off-by: Fabrice Fontaine ---- - src/core/cgroup.c | 35 ++++++++++++++++++++++------------- - 1 file changed, 22 insertions(+), 13 deletions(-) - -diff --git a/src/core/cgroup.c b/src/core/cgroup.c -index 7b817dc225e..ed2f331b33e 100644 ---- a/src/core/cgroup.c -+++ b/src/core/cgroup.c -@@ -396,26 +396,31 @@ static void cgroup_xattr_apply(Unit *u) { - } - - static int lookup_block_device(const char *p, dev_t *ret) { -- struct stat st = {}; -+ dev_t rdev, dev = 0; -+ mode_t mode; - int r; - - assert(p); - assert(ret); - -- r = device_path_parse_major_minor(p, &st.st_mode, &st.st_rdev); -+ r = device_path_parse_major_minor(p, &mode, &rdev); - if (r == -ENODEV) { /* not a parsable device node, need to go to disk */ -+ struct stat st; - if (stat(p, &st) < 0) - return log_warning_errno(errno, "Couldn't stat device '%s': %m", p); -+ rdev = (dev_t)st.st_rdev; -+ dev = (dev_t)st.st_dev; -+ mode = st.st_mode; - } else if (r < 0) - return log_warning_errno(r, "Failed to parse major/minor from path '%s': %m", p); - -- if (S_ISCHR(st.st_mode)) { -+ if (S_ISCHR(mode)) { - log_warning("Device node '%s' is a character device, but block device needed.", p); - return -ENOTBLK; -- } else if (S_ISBLK(st.st_mode)) -- *ret = st.st_rdev; -- else if (major(st.st_dev) != 0) -- *ret = st.st_dev; /* If this is not a device node then use the block device this file is stored on */ -+ } else if (S_ISBLK(mode)) -+ *ret = rdev; -+ else if (major(dev) != 0) -+ *ret = dev; /* If this is not a device node then use the block device this file is stored on */ - else { - /* If this is btrfs, getting the backing block device is a bit harder */ - r = btrfs_get_block_device(p, ret); -@@ -436,7 +441,8 @@ static int lookup_block_device(const char *p, dev_t *ret) { - } - - static int whitelist_device(BPFProgram *prog, const char *path, const char *node, const char *acc) { -- struct stat st = {}; -+ dev_t rdev; -+ mode_t mode; - int r; - - assert(path); -@@ -445,11 +451,12 @@ static int whitelist_device(BPFProgram *prog, const char *path, const char *node - /* Some special handling for /dev/block/%u:%u, /dev/char/%u:%u, /run/systemd/inaccessible/chr and - * /run/systemd/inaccessible/blk paths. Instead of stat()ing these we parse out the major/minor directly. This - * means clients can use these path without the device node actually around */ -- r = device_path_parse_major_minor(node, &st.st_mode, &st.st_rdev); -+ r = device_path_parse_major_minor(node, &mode, &rdev); - if (r < 0) { - if (r != -ENODEV) - return log_warning_errno(r, "Couldn't parse major/minor from device path '%s': %m", node); - -+ struct stat st; - if (stat(node, &st) < 0) - return log_warning_errno(errno, "Couldn't stat device %s: %m", node); - -@@ -457,22 +464,24 @@ static int whitelist_device(BPFProgram *prog, const char *path, const char *node - log_warning("%s is not a device.", node); - return -ENODEV; - } -+ rdev = (dev_t) st.st_rdev; -+ mode = st.st_mode; - } - - if (cg_all_unified() > 0) { - if (!prog) - return 0; - -- return cgroup_bpf_whitelist_device(prog, S_ISCHR(st.st_mode) ? BPF_DEVCG_DEV_CHAR : BPF_DEVCG_DEV_BLOCK, -- major(st.st_rdev), minor(st.st_rdev), acc); -+ return cgroup_bpf_whitelist_device(prog, S_ISCHR(mode) ? BPF_DEVCG_DEV_CHAR : BPF_DEVCG_DEV_BLOCK, -+ major(rdev), minor(rdev), acc); - - } else { - char buf[2+DECIMAL_STR_MAX(dev_t)*2+2+4]; - - sprintf(buf, - "%c %u:%u %s", -- S_ISCHR(st.st_mode) ? 'c' : 'b', -- major(st.st_rdev), minor(st.st_rdev), -+ S_ISCHR(mode) ? 'c' : 'b', -+ major(rdev), minor(rdev), - acc); - - /* Changing the devices list of a populated cgroup might result in EINVAL, hence ignore EINVAL here. */ diff --git a/package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch b/package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch deleted file mode 100644 index 7a91aac519..0000000000 --- a/package/systemd/0014-networkd-brvlan.c-fix-build-without-BRIDGE_VLAN_INFO.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7bd188b1e628d11011cc6c98456e2e4ed72c645b Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 Feb 2019 17:32:46 +0100 -Subject: [PATCH] networkd-brvlan.c: fix build without - BRIDGE_VLAN_INFO_RANGE_END - -systemd fails to build on kernel without BRIDGE_VLAN_INFO_RANGE_END -since 9714c02 - -So put include missing_if_bridge.h - -Fixes: - - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69 - -Signed-off-by: Fabrice Fontaine ---- - src/network/networkd-brvlan.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c -index 8f9103f14..8377623da 100644 ---- a/src/network/networkd-brvlan.c -+++ b/src/network/networkd-brvlan.c -@@ -9,6 +9,7 @@ - - #include "alloc-util.h" - #include "conf-parser.h" -+#include "missing_if_bridge.h" - #include "netlink-util.h" - #include "networkd-brvlan.h" - #include "networkd-link.h" --- -2.14.1 - diff --git a/package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch b/package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch deleted file mode 100644 index 6351f05eb3..0000000000 --- a/package/systemd/0015-networkd-ndisc.c-fix-build-without-IFA_F_NOPREFIXROU.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d909e4af6ac61f6777d429a0c84ab5b3d1907c6d Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 Feb 2019 18:28:16 +0100 -Subject: [PATCH] networkd-ndisc.c: fix build without IFA_F_NOPREFIXROUTE - -systemd fails to build on kernel without IFA_F_NOPREFIXROUTE -since 9714c02 - -So put include missing_network.h - -Fixes: - - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69 - -Signed-off-by: Fabrice Fontaine ---- - src/network/networkd-ndisc.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c -index 80bfd2cba..e5b8d1155 100644 ---- a/src/network/networkd-ndisc.c -+++ b/src/network/networkd-ndisc.c -@@ -8,6 +8,7 @@ - - #include "sd-ndisc.h" - -+#include "missing_network.h" - #include "networkd-ndisc.h" - #include "networkd-route.h" - #include "strv.h" --- -2.14.1 - diff --git a/package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch b/package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch deleted file mode 100644 index 33d3328a89..0000000000 --- a/package/systemd/0016-networkd-address.c-fix-build-without-IFA_F_NOPREFIXR.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 081aea25022a987d349394ada2d6a959bf3ce4cd Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 Feb 2019 18:33:39 +0100 -Subject: [PATCH] networkd-address.c: fix build without IFA_F_NOPREFIXROUTE - -systemd fails to build on kernel without IFA_F_NOPREFIXROUTE -since 9714c02 - -So put include missing_network.h - -Fixes: - - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69 - -Signed-off-by: Fabrice Fontaine ---- - src/network/networkd-address.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c -index fa7f9b8d7..3cdbd9e37 100644 ---- a/src/network/networkd-address.c -+++ b/src/network/networkd-address.c -@@ -5,6 +5,7 @@ - #include "alloc-util.h" - #include "conf-parser.h" - #include "firewall-util.h" -+#include "missing_network.h" - #include "netlink-util.h" - #include "networkd-address.h" - #include "networkd-manager.h" --- -2.14.1 - diff --git a/package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch b/package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch deleted file mode 100644 index 2b7ae1898a..0000000000 --- a/package/systemd/0017-networkd-dhcp6.c-fix-build-without-IFA_F_NOPREFIXROU.patch +++ /dev/null @@ -1,33 +0,0 @@ -From aeed8332afa88728ed914b2917ce758d9c2218a4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 3 Feb 2019 18:38:10 +0100 -Subject: [PATCH] networkd-dhcp6.c: fix build without IFA_F_NOPREFIXROUTE - -systemd fails to build on kernel without IFA_F_NOPREFIXROUTE -since 9714c02 - -So put include missing_network.h - -Fixes: - - http://autobuild.buildroot.org/results/970b09e1d49b53dff12a07ca4ad424ef9dd29a69 - -Signed-off-by: Fabrice Fontaine ---- - src/network/networkd-dhcp6.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c -index f9df26d75..c1fba03f9 100644 ---- a/src/network/networkd-dhcp6.c -+++ b/src/network/networkd-dhcp6.c -@@ -11,6 +11,7 @@ - - #include "hashmap.h" - #include "hostname-util.h" -+#include "missing_network.h" - #include "network-internal.h" - #include "networkd-link.h" - #include "networkd-manager.h" --- -2.14.1 - diff --git a/package/systemd/systemd.hash b/package/systemd/systemd.hash index 9c1a512ce7..c769d48959 100644 --- a/package/systemd/systemd.hash +++ b/package/systemd/systemd.hash @@ -1,5 +1,5 @@ # sha256 locally computed -sha256 8f15aec1ac926e13a21a04d0ca3fe371f7004951448142a6f8952075c5b5f0b5 systemd-240.tar.gz +sha256 b2561a8e1d10a2c248253f0dda31a85dd6d69f2b54177de55e02cd1d2778316e systemd-241.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 LICENSE.GPL2 sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 LICENSE.LGPL2.1 -sha256 a693f8f654fdf016e2aefe6b30aa6e1211728b8269ab325408a152c6c9b6ebe8 README +sha256 d9356b277440f21730426592c27170d034a39954ab5154dfba1cc3cbf7b22935 README diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 6f0e451b5b..928e2dc1b6 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -4,7 +4,7 @@ # ################################################################################ -SYSTEMD_VERSION = 240 +SYSTEMD_VERSION = 241 SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) SYSTEMD_LICENSE = LGPL-2.1+, GPL-2.0+ (udev), Public Domain (few source files, see README) SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README From 1b94e8dcb368cd71d8002427bf4a150a2f082aa2 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Wed, 6 Mar 2019 22:28:14 +0100 Subject: [PATCH 0165/7482] package/linux-headers: fix support for -rc kernels -rc kernels after v3.x are no longer available in the testing subdirectory. Instead they should be fetched from cgit. Commit ff4cccbdcf5417a5a8c251ff302791a306023cc1 did this for linux itself, now we also do it for linux-headers. When fetched from cgit, .tar.xz can't be used. Adding this to the existing condition is not so simple, so refactor how _SOURCE is set: simply set it explicitly in each branch of the condition. While more verbose (it is repeated 4 times), it's easier to understand and to maintain. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/linux-headers/linux-headers.mk | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk index 45e17688c5..4b5ebf8d97 100644 --- a/package/linux-headers/linux-headers.mk +++ b/package/linux-headers/linux-headers.mk @@ -27,28 +27,29 @@ LINUX_HEADERS_CUSTOM_TARBALL_LOCATION = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTO LINUX_HEADERS_REPO_URL = $(call qstrip,$(BR2_KERNEL_HEADERS_CUSTOM_REPO_URL)) endif # BR2_KERNEL_HEADERS_AS_KERNEL -# Configure tarball filenames. +# Compute LINUX_HEADERS_SOURCE and LINUX_HEADERS_SITE from the configuration ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y) LINUX_HEADERS_SOURCE = $(notdir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION)) -else ifeq ($(LINUX_HEADERS_CUSTOM_GIT)$(LINUX_HEADERS_CUSTOM_HG)$(LINUX_HEADERS_CUSTOM_SVN),y) -LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz -else -LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz -endif - -# Configure the various kernel source locations. -ifeq ($(LINUX_HEADERS_CUSTOM_TARBALL),y) LINUX_HEADERS_SITE = $(patsubst %/,%,$(dir $(LINUX_HEADERS_CUSTOM_TARBALL_LOCATION))) else ifeq ($(LINUX_HEADERS_CUSTOM_GIT),y) +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = git else ifeq ($(LINUX_HEADERS_CUSTOM_HG),y) +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = hg else ifeq ($(LINUX_HEADERS_CUSTOM_SVN),y) +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz LINUX_HEADERS_SITE = $(LINUX_HEADERS_REPO_URL) LINUX_HEADERS_SITE_METHOD = svn +else ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),) +# Since 4.12-rc1, -rc kernels are generated from cgit. This also works for +# older -rc kernels. +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz +LINUX_HEADERS_SITE = https://git.kernel.org/torvalds/t else +LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz # In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order # to use the $(word) function. We support versions such as 4.0, 3.1, # 2.6.32, 2.6.32-rc1, 3.0-rc6, etc. @@ -59,10 +60,6 @@ LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x else ifeq ($(findstring x4.,x$(LINUX_HEADERS_VERSION)),x4.) LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x endif # x2.6 -# release candidates are in testing/ subdir -ifneq ($(findstring -rc,$(LINUX_HEADERS_VERSION)),) -LINUX_HEADERS_SITE := $(LINUX_HEADERS_SITE)/testing -endif # -rc endif # LINUX_HEADERS_CUSTOM_TARBALL # Apply any necessary patches if we are using the headers from a kernel From 4ed7246a597325cea2c5b4624b7c94c67ca8662d Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Wed, 6 Mar 2019 22:28:15 +0100 Subject: [PATCH 0166/7482] linux{, -headers}: support downloads of v5+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With the arrival of linux v5.0, we need yet another condition to set _SITE correctly. Instead of continuing this madness, solve the problem generically: use v2.6 for 2.6.*, and use the number before the first dot in the other cases. While we're at it, remove the comment which has been incorrect since 80d7b68167a5c8893e906ace6b5f0b0166336406 (7 years ago). Signed-off-by: Arnout Vandecappelle (Essensium/Mind) Tested-by: Jan Kundrát Tested-by: Adam Duskett Reviewed-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 9 ++------- package/linux-headers/linux-headers.mk | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 2b5d096e14..c7081db88f 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -37,15 +37,10 @@ else ifneq ($(findstring -rc,$(LINUX_VERSION)),) LINUX_SITE = https://git.kernel.org/torvalds/t else LINUX_SOURCE = linux-$(LINUX_VERSION).tar.xz -# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order -# to use the $(word) function. We support versions such as 4.0, 3.1, -# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc. ifeq ($(findstring x2.6.,x$(LINUX_VERSION)),x2.6.) LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6 -else ifeq ($(findstring x3.,x$(LINUX_VERSION)),x3.) -LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x -else ifeq ($(findstring x4.,x$(LINUX_VERSION)),x4.) -LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x +else +LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_VERSION))).x endif endif diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk index 4b5ebf8d97..95432ade83 100644 --- a/package/linux-headers/linux-headers.mk +++ b/package/linux-headers/linux-headers.mk @@ -50,15 +50,10 @@ LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.gz LINUX_HEADERS_SITE = https://git.kernel.org/torvalds/t else LINUX_HEADERS_SOURCE = linux-$(LINUX_HEADERS_VERSION).tar.xz -# In X.Y.Z, get X and Y. We replace dots and dashes by spaces in order -# to use the $(word) function. We support versions such as 4.0, 3.1, -# 2.6.32, 2.6.32-rc1, 3.0-rc6, etc. ifeq ($(findstring x2.6.,x$(LINUX_HEADERS_VERSION)),x2.6.) LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v2.6 -else ifeq ($(findstring x3.,x$(LINUX_HEADERS_VERSION)),x3.) -LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v3.x -else ifeq ($(findstring x4.,x$(LINUX_HEADERS_VERSION)),x4.) -LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v4.x +else +LINUX_HEADERS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/v$(firstword $(subst ., ,$(LINUX_HEADERS_VERSION))).x endif # x2.6 endif # LINUX_HEADERS_CUSTOM_TARBALL From af839d25cb369c01c414eac750ab740c49b2236b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 12 Mar 2019 22:48:46 +0100 Subject: [PATCH 0167/7482] package/systemd: use util-linux' agetty, drop patch We currently have a patch that replaces the use of (hard-coded) agetty in systemd, to use just plain getty. That patch dates back to commit f4a5eed474c (Add the systemd package), when util-linux was not a dependency, and we relied on busybox to actually provide getty. But nowadays, util-linux is a mandatory dependency of systemd anyway. agetty is about 42KiB, while busybox' getty is around 5KiB (give or take). That's an extra ~40KiB, but it has to be balanced against the rest of the system: systemd only runs on a glibc system, needs dbus and thus expat, and kmod, that a ~40KiB overhead is barely noticeable (a miminal systemd setup with nothing enabled, on ARM, is already ~20MiB) So, drop our agetty-dropping patch, and forcibly enable agetty in util-linux. Signed-off-by: "Yann E. MORIN" Cc: Adam Duskett Cc: Maxime Hadjinlian Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/systemd/0001-fix-getty-unit.patch | 81 ----------------------- package/systemd/Config.in | 1 + 2 files changed, 1 insertion(+), 81 deletions(-) delete mode 100644 package/systemd/0001-fix-getty-unit.patch diff --git a/package/systemd/0001-fix-getty-unit.patch b/package/systemd/0001-fix-getty-unit.patch deleted file mode 100644 index a12569f493..0000000000 --- a/package/systemd/0001-fix-getty-unit.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 69e440f9b7a0e9a43ef582d4bb521722b448a7c2 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard -Date: Mon, 31 Jul 2017 10:08:46 -0400 -Subject: [PATCH] fix-getty-unit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Prefer getty to agetty in console setup systemd units - -Signed-off-by: Maxime Ripard -Signed-off-by: Eric Le Bihan -[aduskett@gmail.com: Update for systemd v237] -Signed-off-by: Adam Duskett -[Jérémy: replace additional usage of agetty by getty.] -Signed-off-by: Jérémy Rosen ---- - units/console-getty.service.m4 | 2 +- - units/container-getty@.service.m4 | 2 +- - units/getty@.service.m4 | 5 +---- - units/serial-getty@.service.m4 | 2 +- - 4 files changed, 4 insertions(+), 7 deletions(-) - -diff --git a/units/console-getty.service.m4 b/units/console-getty.service.m4 -index 3c553240a..fd5ad9456 100644 ---- a/units/console-getty.service.m4 -+++ b/units/console-getty.service.m4 -@@ -23,7 +23,7 @@ ConditionPathExists=/dev/console - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM -+ExecStart=-/sbin/getty -L console 115200 vt100 - Type=idle - Restart=always - UtmpIdentifier=cons -diff --git a/units/container-getty@.service.m4 b/units/container-getty@.service.m4 -index 087ab7f9b..30f7b66fe 100644 ---- a/units/container-getty@.service.m4 -+++ b/units/container-getty@.service.m4 -@@ -28,7 +28,7 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - RestartSec=0 -diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 -index 80e793bb7..385758c61 100644 ---- a/units/getty@.service.m4 -+++ b/units/getty@.service.m4 -@@ -35,10 +35,7 @@ ConditionPathExists=/dev/tty0 - - [Service] - # the VT is cleared by TTYVTDisallocate --# The '-o' option value tells agetty to replace 'login' arguments with an --# option to preserve environment (-p), followed by '--' for safety, and then --# the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - RestartSec=0 -diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 -index 757b86ab2..3d60efdb6 100644 ---- a/units/serial-getty@.service.m4 -+++ b/units/serial-getty@.service.m4 -@@ -33,7 +33,7 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,38400,9600 %I $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - UtmpIdentifier=%I --- -2.14.4 - diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 920b65db44..490222f376 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -20,6 +20,7 @@ menuconfig BR2_PACKAGE_SYSTEMD select BR2_PACKAGE_UTIL_LINUX_LIBBLKID select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT select BR2_PACKAGE_UTIL_LINUX_BINARIES + select BR2_PACKAGE_UTIL_LINUX_AGETTY select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_UTIL_LINUX_NOLOGIN select BR2_PACKAGE_UTIL_LINUX_FSCK From f786c8a6ec2772c073b9c548acaa5c8bd874fb4a Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 13 Mar 2019 00:08:35 +0100 Subject: [PATCH 0168/7482] package/binutils: switch to use 2.31.x as the default version Now that binutils 2.32 has been released, it is time to move to binutils 2.31.x as the default binutils version, instead of 2.29.1. Signed-off-by: Romain Naour Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 2 +- package/binutils/binutils.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 9a2b27c55e..8485568170 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -10,7 +10,7 @@ choice prompt "Binutils Version" default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB2 - default BR2_BINUTILS_VERSION_2_29_X if !BR2_arc + default BR2_BINUTILS_VERSION_2_31_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help Select the version of binutils you wish to use. diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 4531b8d9c8..6798356ff2 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -11,7 +11,7 @@ ifeq ($(BINUTILS_VERSION),) ifeq ($(BR2_arc),y) BINUTILS_VERSION = arc-2018.09-release else -BINUTILS_VERSION = 2.29.1 +BINUTILS_VERSION = 2.31.1 endif endif # BINUTILS_VERSION From b4ba1be944674272872089cbad2d8d755db1b914 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 13 Mar 2019 00:08:36 +0100 Subject: [PATCH 0169/7482] linux: update the comment about thumb issue with Binutils 2.29 and 2.30 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- linux/Config.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/linux/Config.in b/linux/Config.in index f17334ae7c..856b53eec0 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -8,9 +8,10 @@ config BR2_LINUX_KERNEL if BR2_LINUX_KERNEL -comment "Linux kernel in thumb mode may be broken with binutils >= 2.29" +# https://sourceware.org/bugzilla/show_bug.cgi?id=21458 +comment "Linux kernel in thumb mode may be broken with binutils 2.29 and 2.30" depends on BR2_arm || BR2_armeb - depends on !BR2_BINUTILS_VERSION_2_28_X + depends on BR2_BINUTILS_VERSION_2_29_X || BR2_BINUTILS_VERSION_2_30_X # Packages that need to have a kernel with support for loadable modules, # but do not use the kernel-modules infrastructure, should select that From b11a7fbea79accb1853dd6c15b63e76675e31794 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 13 Mar 2019 00:08:37 +0100 Subject: [PATCH 0170/7482] package/binutils: remove special case version selection for ARM Thumb Binutils 2.29 and 2.30 are affected by a bug in ADR and ADRL pseudo-instruction [1] that was fixed in Binutils 2.31 [2]. * The ADR and ADRL pseudo-instructions supported by the ARM assembler now only set the bottom bit of the address of thumb function symbols if the -mthumb-interwork command line option is active. Due to this issue, we were default to binutils 2.28 for ARM Thumb. But now that the issue has been fixed in binutils 2.31 and that this version is the default, the special casing to use 2.28 is no longer needed. [1] https://sourceware.org/bugzilla/show_bug.cgi?id=21458 [2] https://sourceware.org/ml/binutils/2018-07/msg00213.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/binutils/Config.in.host | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 8485568170..ec1e0d8dd7 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -8,8 +8,6 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI choice prompt "Binutils Version" - default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB - default BR2_BINUTILS_VERSION_2_28_X if BR2_ARM_INSTRUCTIONS_THUMB2 default BR2_BINUTILS_VERSION_2_31_X if !BR2_arc default BR2_BINUTILS_VERSION_ARC if BR2_arc help From dc5d95154e030becb8a5ada0f0876aa4ec4f0295 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 13 Mar 2019 00:08:38 +0100 Subject: [PATCH 0171/7482] package/binutils: remove version 2.28 Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 + package/binutils/2.28.1/0120-sh-conf.patch | 46 --- ...-memory-corruption-by-broken-sysregs.patch | 42 --- .../binutils/2.28.1/0300-ld-makefile.patch | 41 --- .../2.28.1/0301-check-ldrunpath-length.patch | 36 --- .../0500-add-sysroot-fix-from-bug-3049.patch | 48 --- .../0600-poison-system-directories.patch | 306 ------------------ .../2.28.1/0906-microblaze-pr21180.patch | 33 -- package/binutils/Config.in.host | 6 - package/binutils/binutils.hash | 1 - 10 files changed, 8 insertions(+), 559 deletions(-) delete mode 100644 package/binutils/2.28.1/0120-sh-conf.patch delete mode 100644 package/binutils/2.28.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch delete mode 100644 package/binutils/2.28.1/0300-ld-makefile.patch delete mode 100644 package/binutils/2.28.1/0301-check-ldrunpath-length.patch delete mode 100644 package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch delete mode 100644 package/binutils/2.28.1/0600-poison-system-directories.patch delete mode 100644 package/binutils/2.28.1/0906-microblaze-pr21180.patch diff --git a/Config.in.legacy b/Config.in.legacy index 93e50f3f60..089fc9539a 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2019.05" +config BR2_BINUTILS_VERSION_2_28_X + bool "binutils version 2.28 support removed" + select BR2_LEGACY + help + Support for binutils version 2.28 has been removed. The + current default version (2.31 or later) has been selected + instead. + config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK bool "gst-plugins-bad apexsink option removed" select BR2_LEGACY diff --git a/package/binutils/2.28.1/0120-sh-conf.patch b/package/binutils/2.28.1/0120-sh-conf.patch deleted file mode 100644 index f77599835f..0000000000 --- a/package/binutils/2.28.1/0120-sh-conf.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ceee199e9a32034c6def7700fdbb26335ca76a3 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 34b66f7..905bc7b 100755 ---- a/configure -+++ b/configure -@@ -3943,7 +3943,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 4977d97..1e69ee2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1279,7 +1279,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.4.3 - diff --git a/package/binutils/2.28.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch b/package/binutils/2.28.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch deleted file mode 100644 index 30103ee05e..0000000000 --- a/package/binutils/2.28.1/0131-xtensa-fix-memory-corruption-by-broken-sysregs.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3c8788dbb70b40e737d4b8e30cab81406e5c5091 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 2 Aug 2017 00:36:05 -0700 -Subject: [PATCH] xtensa: fix memory corruption by broken sysregs - -In some xtensa configurations there may be system/user registers in -xtensa-modules with negative index. ISA initialization for such config -may clobber heap and result in program termination. -Don't update lookup table entries for register with negative indices. -They are not directly accessible via RSR/WSR/XSR or RUR/WUR, so this -change should not affect processing of valid assembly/binary code. - -bfd/ -2017-08-02 Max Filippov - - * xtensa-isa.c (xtensa_isa_init): Don't update lookup table - entries for sysregs with negative indices. - -Signed-off-by: Max Filippov ---- -Backported from: d84ed528d4817b0ff854006b65a9f6ec75f0407a - - bfd/xtensa-isa.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bfd/xtensa-isa.c b/bfd/xtensa-isa.c -index 8da75bea8109..8c6ee88fdeae 100644 ---- a/bfd/xtensa-isa.c -+++ b/bfd/xtensa-isa.c -@@ -292,7 +292,8 @@ xtensa_isa_init (xtensa_isa_status *errno_p, char **error_msg_p) - xtensa_sysreg_internal *sreg = &isa->sysregs[n]; - is_user = sreg->is_user; - -- isa->sysreg_table[is_user][sreg->number] = n; -+ if (sreg->number >= 0) -+ isa->sysreg_table[is_user][sreg->number] = n; - } - - /* Set up the interface lookup table. */ --- -2.1.4 - diff --git a/package/binutils/2.28.1/0300-ld-makefile.patch b/package/binutils/2.28.1/0300-ld-makefile.patch deleted file mode 100644 index 6710195798..0000000000 --- a/package/binutils/2.28.1/0300-ld-makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:40:53 +0100 -Subject: [PATCH] ld-makefile - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ld/Makefile.am b/ld/Makefile.am -index 0b3b049..3871c74 100644 ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff --git a/ld/Makefile.in b/ld/Makefile.in -index ed98f87..530e4c9 100644 ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -452,7 +452,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include --- -2.4.3 - diff --git a/package/binutils/2.28.1/0301-check-ldrunpath-length.patch b/package/binutils/2.28.1/0301-check-ldrunpath-length.patch deleted file mode 100644 index 8d673dcfc5..0000000000 --- a/package/binutils/2.28.1/0301-check-ldrunpath-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:41:47 +0100 -Subject: [PATCH] check-ldrunpath-length - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index 0405d4f..efd3300 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1411,6 +1411,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.4.3 - diff --git a/package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch b/package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch deleted file mode 100644 index 0331088666..0000000000 --- a/package/binutils/2.28.1/0500-add-sysroot-fix-from-bug-3049.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:42:48 +0100 -Subject: [PATCH] add sysroot fix from bug #3049 - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - -Signed-off-by: Sven Rebhan -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/ldfile.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/ld/ldfile.c diff --git b/ld/ldfile.c ---- a/ld/ldfile.c 2017-03-02 03:23:54.000000000 -0500 -+++ b/ld/ldfile.c 2017-03-20 09:52:27.687415942 -0400 -@@ -336,18 +336,24 @@ - directory first. */ - if (!entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) - diff --git a/package/binutils/2.28.1/0600-poison-system-directories.patch b/package/binutils/2.28.1/0600-poison-system-directories.patch deleted file mode 100644 index bb1a7b438c..0000000000 --- a/package/binutils/2.28.1/0600-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 276fb77..35c58eb 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -17,6 +17,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index a446283..d1f9504 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -789,6 +789,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1446,6 +1447,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15499,7 +15502,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 188172d..2cd8443 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index d84ec4e..3476b26 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -172,6 +172,14 @@ typedef struct { - /* If set, display the target memory usage (per memory region). */ - bfd_boolean print_memory_usage; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index 1dd7492..fb1438e 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2403,6 +2403,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 1439309..086b354 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 6f11e7b..0ca3110 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -146,6 +146,8 @@ enum option_values - OPTION_PRINT_MEMORY_USAGE, - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index bb0b9cc..a23c56c 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 4cad209..be7d584 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -535,6 +535,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -547,6 +555,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1528,6 +1537,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1571,6 +1588,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.4.3 - diff --git a/package/binutils/2.28.1/0906-microblaze-pr21180.patch b/package/binutils/2.28.1/0906-microblaze-pr21180.patch deleted file mode 100644 index 52ac4fdd13..0000000000 --- a/package/binutils/2.28.1/0906-microblaze-pr21180.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix ld segfault for microblaze when --gc-sections is used -Upstream: pending -https://sourceware.org/bugzilla/show_bug.cgi?id=21180 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c ---- a/bfd/elf32-microblaze.c 2016-08-03 09:36:50.000000000 +0200 -+++ b/bfd/elf32-microblaze.c 2017-02-23 19:43:12.612313590 +0100 -@@ -3233,13 +3233,20 @@ - || h->dynindx == -1)) - { - asection *sec = h->root.u.def.section; -+ bfd_vma value; -+ -+ value = h->root.u.def.value; -+ if (sec->output_section != NULL) -+ /* PR 21180: If the output section is NULL, then the symbol is no -+ longer needed, and in theory the GOT entry is redundant. But -+ it is too late to change our minds now... */ -+ value += sec->output_section->vma + sec->output_offset; -+ - microblaze_elf_output_dynamic_relocation (output_bfd, - srela, srela->reloc_count++, - /* symindex= */ 0, - R_MICROBLAZE_REL, offset, -- h->root.u.def.value -- + sec->output_section->vma -- + sec->output_offset); -+ value); - } - else - { diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index ec1e0d8dd7..9fb8857c3c 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -13,11 +13,6 @@ choice help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_28_X - bool "binutils 2.28.1" - depends on !BR2_arc - depends on !BR2_riscv - config BR2_BINUTILS_VERSION_2_29_X bool "binutils 2.29.1" depends on !BR2_riscv @@ -39,7 +34,6 @@ endchoice config BR2_BINUTILS_VERSION string default "arc-2018.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.28.1" if BR2_BINUTILS_VERSION_2_28_X default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X default "2.30" if BR2_BINUTILS_VERSION_2_30_X default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 873e0dada4..756fa9bd89 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,5 +1,4 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 dc5b6872ae01c07c12d38f3bb7ead06effc6da3265ac872e2d9c6104304f89f85f2645b029a43f308a7938a7299b1928d385205d0a2245674a621649032a138d binutils-2.28.1.tar.xz sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e82624ae37fb0bbd03af3b17088a94f60dfe1a86a7ff82e18ece3c24f0fd0 binutils-2.29.1.tar.xz sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz From 9a05759bf8060e58cdfcae9074208a702d1b0de7 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Wed, 13 Mar 2019 00:08:39 +0100 Subject: [PATCH 0172/7482] package/binutils: remove version 2.29 We are back with 3 binutils version in Buildroot. Now CFI support is always present for NIOSII. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 8 + linux/Config.in | 4 +- package/binutils/2.29.1/0001-sh-conf.patch | 48 --- .../binutils/2.29.1/0002-ld-makefile.patch | 41 --- .../2.29.1/0003-check-ldrunpath-length.patch | 36 --- .../0004-add-sysroot-fix-from-bug-3049.patch | 51 --- .../0005-poison-system-directories.patch | 306 ------------------ package/binutils/Config.in.host | 6 - package/binutils/binutils.hash | 1 - 9 files changed, 10 insertions(+), 491 deletions(-) delete mode 100644 package/binutils/2.29.1/0001-sh-conf.patch delete mode 100644 package/binutils/2.29.1/0002-ld-makefile.patch delete mode 100644 package/binutils/2.29.1/0003-check-ldrunpath-length.patch delete mode 100644 package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch delete mode 100644 package/binutils/2.29.1/0005-poison-system-directories.patch diff --git a/Config.in.legacy b/Config.in.legacy index 089fc9539a..2f99dc8ad2 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,14 @@ endif comment "Legacy options removed in 2019.05" +config BR2_BINUTILS_VERSION_2_29_X + bool "binutils version 2.29 support removed" + select BR2_LEGACY + help + Support for binutils version 2.29 has been removed. The + current default version (2.31 or later) has been selected + instead. + config BR2_BINUTILS_VERSION_2_28_X bool "binutils version 2.28 support removed" select BR2_LEGACY diff --git a/linux/Config.in b/linux/Config.in index 856b53eec0..818b94e1c0 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -9,9 +9,9 @@ config BR2_LINUX_KERNEL if BR2_LINUX_KERNEL # https://sourceware.org/bugzilla/show_bug.cgi?id=21458 -comment "Linux kernel in thumb mode may be broken with binutils 2.29 and 2.30" +comment "Linux kernel in thumb mode may be broken with binutils 2.30" depends on BR2_arm || BR2_armeb - depends on BR2_BINUTILS_VERSION_2_29_X || BR2_BINUTILS_VERSION_2_30_X + depends on BR2_BINUTILS_VERSION_2_30_X # Packages that need to have a kernel with support for loadable modules, # but do not use the kernel-modules infrastructure, should select that diff --git a/package/binutils/2.29.1/0001-sh-conf.patch b/package/binutils/2.29.1/0001-sh-conf.patch deleted file mode 100644 index 3c9ef62e2f..0000000000 --- a/package/binutils/2.29.1/0001-sh-conf.patch +++ /dev/null @@ -1,48 +0,0 @@ -From fdb0d1d63d8dc30b319db174f2a90e681d8cd2ed Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Thomas: rebase on top of 2.29, in which sh64 support was removed.] -Signed-off-by: Thomas Petazzoni ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index be9dd89..3c0f4c6 100755 ---- a/configure -+++ b/configure -@@ -3844,7 +3844,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 532c5c2..4f40318 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1178,7 +1178,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-*) -+ sh*-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.9.4 - diff --git a/package/binutils/2.29.1/0002-ld-makefile.patch b/package/binutils/2.29.1/0002-ld-makefile.patch deleted file mode 100644 index a7cd71e63c..0000000000 --- a/package/binutils/2.29.1/0002-ld-makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d4e18ebc6ad810167a2de84b185a5f0d65b9ec2d Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:40:53 +0100 -Subject: [PATCH] ld-makefile - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ld/Makefile.am b/ld/Makefile.am -index 625347f..d5334d2 100644 ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff --git a/ld/Makefile.in b/ld/Makefile.in -index ba25177..a2cf228 100644 ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include --- -2.9.4 - diff --git a/package/binutils/2.29.1/0003-check-ldrunpath-length.patch b/package/binutils/2.29.1/0003-check-ldrunpath-length.patch deleted file mode 100644 index 3fbc5031d1..0000000000 --- a/package/binutils/2.29.1/0003-check-ldrunpath-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 3bd211025c890ef2971958915d500a9bb2913a2a Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:41:47 +0100 -Subject: [PATCH] check-ldrunpath-length - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index d2551b6..70fcb56 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1463,6 +1463,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.9.4 - diff --git a/package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch b/package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch deleted file mode 100644 index 9e11840cee..0000000000 --- a/package/binutils/2.29.1/0004-add-sysroot-fix-from-bug-3049.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 378bda0e19d279535b3f4a0e448a658a534a5d67 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:42:48 +0100 -Subject: [PATCH] add sysroot fix from bug #3049 - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - -Signed-off-by: Sven Rebhan -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/ldfile.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 3b37a0a..f7e5473 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -338,18 +338,24 @@ ldfile_open_file_search (const char *arch, - directory first. */ - if (!entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) --- -2.9.4 - diff --git a/package/binutils/2.29.1/0005-poison-system-directories.patch b/package/binutils/2.29.1/0005-poison-system-directories.patch deleted file mode 100644 index a7c2761a9d..0000000000 --- a/package/binutils/2.29.1/0005-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From b100e9d16bfe6725b2624902af457ecfa490b150 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 5d91380..ffe84a7 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -21,6 +21,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index da20ab5..63e3da7 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -785,6 +785,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1443,6 +1444,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15497,7 +15500,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 34315e6..5ade9a0 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index 162e156..7d6d7ef 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -177,6 +177,14 @@ typedef struct - in the linker script. */ - bfd_boolean force_group_allocation; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index bb5f719..78501e4 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2480,6 +2480,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index f7e5473..2cd84d3 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -116,6 +116,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + strlen ("$SYSROOT"), (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 5aa7f6b..cb655e0 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -147,6 +147,8 @@ enum option_values - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, - OPTION_FORCE_GROUP_ALLOCATION, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index ee5ab11..5f6effd 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -270,6 +270,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 08106bc..d619d50 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -538,6 +538,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -550,6 +558,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1534,6 +1543,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1577,6 +1594,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.9.4 - diff --git a/package/binutils/Config.in.host b/package/binutils/Config.in.host index 9fb8857c3c..c3c3beb420 100644 --- a/package/binutils/Config.in.host +++ b/package/binutils/Config.in.host @@ -4,7 +4,6 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI bool default y depends on !BR2_microblaze - depends on !(BR2_nios2 && (BR2_BINUTILS_VERSION_2_28_X || BR2_BINUTILS_VERSION_2_29_X)) choice prompt "Binutils Version" @@ -13,10 +12,6 @@ choice help Select the version of binutils you wish to use. -config BR2_BINUTILS_VERSION_2_29_X - bool "binutils 2.29.1" - depends on !BR2_riscv - config BR2_BINUTILS_VERSION_2_30_X bool "binutils 2.30" @@ -34,7 +29,6 @@ endchoice config BR2_BINUTILS_VERSION string default "arc-2018.09-release" if BR2_BINUTILS_VERSION_ARC - default "2.29.1" if BR2_BINUTILS_VERSION_2_29_X default "2.30" if BR2_BINUTILS_VERSION_2_30_X default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X default "2.32" if BR2_BINUTILS_VERSION_2_32_X diff --git a/package/binutils/binutils.hash b/package/binutils/binutils.hash index 756fa9bd89..039e3682f6 100644 --- a/package/binutils/binutils.hash +++ b/package/binutils/binutils.hash @@ -1,5 +1,4 @@ # From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 d748d22306477d60d921078804d21943248c23fca0707aac9b016a352c01c75ca69e82624ae37fb0bbd03af3b17088a94f60dfe1a86a7ff82e18ece3c24f0fd0 binutils-2.29.1.tar.xz sha512 e747ea20d8d79fcd21b9d9f6695059caa7189d60f19256da398e34b789fea9a133c32b192e9693b5828d27683739b0198431bf8b3e39fb3b04884cf89d9aa839 binutils-2.30.tar.xz sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe1314b1b8f8a29c0aa9d88162849ee1c1a3e70c2f7407d88339b17edb30 binutils-2.31.1.tar.xz sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz From 9ecadf14d65b84b9a5b4a37bd17c2c65e4906cbc Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Fri, 8 Mar 2019 18:33:39 +0000 Subject: [PATCH 0173/7482] package/qt5/qt5virtualkeyboard: install shared library Between Qt 5.11 and 5.12 the virtual keyboard package gained a new top-level library, libQt5VirtualKeyboard.so, which is then used by all of the plugins it installs. This change makes Buildroot aware of the new library so that we install it to the target filesystem. Signed-off-by: Mark Thompson [Thomas: move the definition of QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS into a separate condition] Signed-off-by: Thomas Petazzoni --- package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk index 8ce3169774..3f1ebdbaa4 100644 --- a/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk +++ b/package/qt5/qt5virtualkeyboard/qt5virtualkeyboard.mk @@ -93,10 +93,17 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES endef endif +ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST):$(BR2_STATIC_LIBS),y:) +define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS + cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib +endef +endif + define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \ $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts + $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS) $(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES) From 6da59bc29ec5f233151b88f138f6937b95f6e0c0 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 14 Mar 2019 17:29:30 -0400 Subject: [PATCH 0174/7482] package/systemd: fix patch 0019 This patch was backported to work with systemd v240. Now that systemd is at v241, we must update the patch. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- ...ary-strings-to-hold-dbus-paths-on-the.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch b/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch index bd09e60207..007b806c09 100644 --- a/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch +++ b/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch @@ -10,14 +10,14 @@ clear way to understand if the allocation fails. (cherry picked from commit f519a19bcd5afe674a9b8fc462cd77d8bad403c1) [baruch: backport to v240] Signed-off-by: Baruch Siach +[Adam: Update for v241] +Signed-off-by: Adam Duskett --- -Upstream status: commit f519a19bcd5 - src/libsystemd/sd-bus/bus-objects.c | 68 +++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 14 deletions(-) diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c -index d0538104ae25..54b977418e03 100644 +index 58329f3fe78..54b977418e0 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -1133,7 +1133,8 @@ static int object_manager_serialize_path_and_fallbacks( @@ -34,7 +34,7 @@ index d0538104ae25..54b977418e03 100644 return 0; /* Second, add fallback vtables registered for any of the prefixes */ -- prefix = alloca(strlen(path) + 1); +- prefix = newa(char, strlen(path) + 1); + pl = strlen(path); + assert(pl <= BUS_PATH_SIZE_MAX); + prefix = new(char, pl + 1); @@ -81,7 +81,7 @@ index d0538104ae25..54b977418e03 100644 + if (!prefix) + return -ENOMEM; -- prefix = alloca(strlen(path) + 1); +- prefix = newa(char, strlen(path) + 1); OBJECT_PATH_FOREACH_PREFIX(prefix, path) { n = hashmap_get(bus->nodes, prefix); if (n) @@ -113,7 +113,7 @@ index d0538104ae25..54b977418e03 100644 if (bus->nodes_modified) continue; -- prefix = alloca(strlen(path) + 1); +- prefix = newa(char, strlen(path) + 1); OBJECT_PATH_FOREACH_PREFIX(prefix, path) { r = emit_properties_changed_on_interface(bus, prefix, path, interface, true, &found_interface, names); if (r != 0) @@ -131,7 +131,7 @@ index d0538104ae25..54b977418e03 100644 if (bus->nodes_modified) return 0; -- prefix = alloca(strlen(path) + 1); +- prefix = newa(char, strlen(path) + 1); + pl = strlen(path); + assert(pl <= BUS_PATH_SIZE_MAX); + prefix = new(char, pl + 1); @@ -155,7 +155,7 @@ index d0538104ae25..54b977418e03 100644 if (bus->nodes_modified) return 0; -- prefix = alloca(strlen(path) + 1); +- prefix = newa(char, strlen(path) + 1); + pl = strlen(path); + assert(pl <= BUS_PATH_SIZE_MAX); + prefix = new(char, pl + 1); @@ -179,7 +179,7 @@ index d0538104ae25..54b977418e03 100644 if (bus->nodes_modified) return 0; -- prefix = alloca(strlen(path) + 1); +- prefix = newa(char, strlen(path) + 1); + pl = strlen(path); + assert(pl <= BUS_PATH_SIZE_MAX); + prefix = new(char, pl + 1); From 3f2b71b1205294d304a682a3eca55e7ff63d2d72 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2019 22:20:58 +0100 Subject: [PATCH 0175/7482] package/ulogd: use --without-mysql Replace --with-mysql=no by --without-mysql Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ulogd/ulogd.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 55bbec489d..8fecc0ed38 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -20,7 +20,7 @@ ifeq ($(BR2_PACKAGE_MYSQL),y) ULOGD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr ULOGD_DEPENDENCIES += mysql else -ULOGD_CONF_OPTS += --with-mysql=no +ULOGD_CONF_OPTS += --without-mysql endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) ULOGD_CONF_OPTS += --with-pgsql @@ -32,7 +32,7 @@ ifeq ($(BR2_PACKAGE_SQLITE),y) ULOGD_DEPENDENCIES += sqlite endif else -ULOGD_CONF_OPTS += --with-mysql=no --without-pgsql --without-sqlite +ULOGD_CONF_OPTS += --without-mysql --without-pgsql --without-sqlite endif ifeq ($(BR2_PACKAGE_LIBPCAP),y) From 724cc1f0505cc732910fe8ad767ca4ff1e66c6be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Thu, 14 Mar 2019 22:20:59 +0100 Subject: [PATCH 0176/7482] package/ulogd: use --without-dbi Use --without-dbi instead of --with-dbi=off Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ulogd/ulogd.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index 8fecc0ed38..a2cad40677 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -7,7 +7,7 @@ ULOGD_VERSION = 2.0.7 ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --with-dbi=no +ULOGD_CONF_OPTS = --without-dbi ULOGD_DEPENDENCIES = host-pkgconf \ libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ libnfnetlink From 8085b9eaa4ad172f1a8de0696b917bd8b2c1b9be Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Thu, 14 Mar 2019 17:31:31 -0400 Subject: [PATCH 0177/7482] package/systemd: fix patch series order With the removal of old patches, 0018 should be 0002 and 0019 should be 0003. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- ...02-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch} | 0 ...03-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename package/systemd/{0018-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch => 0002-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch} (100%) rename package/systemd/{0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch => 0003-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch} (100%) diff --git a/package/systemd/0018-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch b/package/systemd/0002-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch similarity index 100% rename from package/systemd/0018-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch rename to package/systemd/0002-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch diff --git a/package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch b/package/systemd/0003-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch similarity index 100% rename from package/systemd/0019-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch rename to package/systemd/0003-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch From b8f7fe53c75fafb32553294c7526e4b3734cdda4 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 20:59:00 +0100 Subject: [PATCH 0178/7482] package/stella: fix build with PAGE_SIZE Fixes: - http://autobuild.buildroot.org/results/22a9b009749af2a0862750a1fb2b2dc7167cd589 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/stella/0003-undef-PAGE_SIZE.patch | 53 +++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/stella/0003-undef-PAGE_SIZE.patch diff --git a/package/stella/0003-undef-PAGE_SIZE.patch b/package/stella/0003-undef-PAGE_SIZE.patch new file mode 100644 index 0000000000..f5c60fa3b3 --- /dev/null +++ b/package/stella/0003-undef-PAGE_SIZE.patch @@ -0,0 +1,53 @@ +From d14065257b24a9e4a722d1fa1125f26f6599006d Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 9 Mar 2019 20:47:27 +0100 +Subject: [PATCH] undef PAGE_SIZE + +PAGE_SIZE is sometimes already defined by the toolchain so undef it: + +/home/naourr/work/instance-3/output/host/bin/x86_64-linux-g++ -MMD -MF "src/debugger/.deps/CpuDebug.d" -MQ "src/debugger/CpuDebug.o" -MP -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -x c++ -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++14 -fomit-frame-pointer -D_GLIBCXX_USE_CXX11_ABI=1 -DUNIX -DBSPF_UNIX -DWINDOWED_SUPPORT -DSOUND_SUPPORT -DDEBUGGER_SUPPORT -DJOYSTICK_SUPPORT -DCHEATCODE_SUPPORT -Isrc/emucore -Isrc/common -Isrc/common/tv_filters -Isrc/gui -Isrc/emucore/tia -Isrc/emucore/tia/frame-manager -I/home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/bin/../../usr/include/SDL2 -D_REENTRANT -Isrc/unix -Isrc/debugger -Isrc/debugger/gui -Isrc/yacc -Isrc/cheat -c src/debugger/CpuDebug.cxx -o src/debugger/CpuDebug.o +In file included from /home/naourr/work/instance-3/output/host/x86_64-buildroot-linux-musl/sysroot/usr/include/limits.h:8:0, + from /home/naourr/work/instance-3/output/host/opt/ext-toolchain/x86_64-buildroot-linux-musl/include/c++/7.4.0/climits:42, + from src/common/bspf.hxx:28, + from src/debugger/CartDebug.cxx:18: +src/emucore/System.hxx:64:29: error: expected unqualified-id before numeric constant + static constexpr uInt16 PAGE_SIZE = (1 << PAGE_SHIFT); + +Fixes: + - http://autobuild.buildroot.org/results/22a9b009749af2a0862750a1fb2b2dc7167cd589 + +Signed-off-by: Fabrice Fontaine +--- + src/emucore/MT24LC256.hxx | 2 ++ + src/emucore/System.hxx | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/src/emucore/MT24LC256.hxx b/src/emucore/MT24LC256.hxx +index fc5d6a49..bb7468b4 100644 +--- a/src/emucore/MT24LC256.hxx ++++ b/src/emucore/MT24LC256.hxx +@@ -23,6 +23,8 @@ class System; + #include "Control.hxx" + #include "bspf.hxx" + ++#undef PAGE_SIZE ++ + /** + Emulates a Microchip Technology Inc. 24LC256, a 32KB Serial Electrically + Erasable PROM accessed using the I2C protocol. Thanks to J. Payson +diff --git a/src/emucore/System.hxx b/src/emucore/System.hxx +index e31202df..85a54f28 100644 +--- a/src/emucore/System.hxx ++++ b/src/emucore/System.hxx +@@ -30,6 +30,8 @@ class NullDevice; + #include "Random.hxx" + #include "Serializable.hxx" + ++#undef PAGE_SIZE ++ + /** + This class represents a system consisting of a 6502 microprocessor + and a set of devices. The devices are mapped into an addressing +-- +2.20.1 + From 2d242e0e566c3b92e185b0709762125441b506f7 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Fri, 8 Mar 2019 10:55:09 +0100 Subject: [PATCH 0179/7482] package/optee-*: support BR2_STATIC_LIBS=y Patch current optee-client 3.4.0 to support building resources with static linkage of executable binaries with the user libraries. The optee-client patch is under review in the OP-TEE project [1] and should be merged in the next OP-TEE release 3.5.0. This change drops !BR2_STATIC_LIBS constraint on package optee-client and its dependent packages that are optee-benchmark, optee-examples, and optee-test. [1] https://github.com/OP-TEE/optee_client/pull/147 Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- package/optee-benchmark/Config.in | 5 +- ...-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch | 51 +++++++++++++++++++ package/optee-client/Config.in | 5 +- package/optee-examples/Config.in | 5 +- package/optee-test/Config.in | 5 +- 5 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in index b9326e0432..0bc4af4d3a 100644 --- a/package/optee-benchmark/Config.in +++ b/package/optee-benchmark/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_OPTEE_BENCHMARK bool "optee-benchmark" - depends on !BR2_STATIC_LIBS # optee-client depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_PACKAGE_LIBYAML @@ -12,5 +11,5 @@ config BR2_PACKAGE_OPTEE_BENCHMARK http://github.com/linaro-swg/optee_benchmark -comment "optee-benchmark needs a toolchain w/ dynamic library and threads" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "optee-benchmark needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch b/package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch new file mode 100644 index 0000000000..9aea801fc7 --- /dev/null +++ b/package/optee-client/0002-cmake-support-BUILD_STATIC_LIBS-BUILD_SHARED_LIBS.patch @@ -0,0 +1,51 @@ +From 857ed6a900e2f16035a88e73e47d79e9251f6544 Mon Sep 17 00:00:00 2001 +From: Etienne Carriere +Date: Fri, 1 Mar 2019 12:31:48 +0100 +Subject: [PATCH] cmake: support BUILD_STATIC_LIBS/BUILD_SHARED_LIBS + +CMake variables BUILD_STATIC_LIBS and BUILD_SHARED_LIBS +set constraints on libraries and executable linkage. + +With this change OP-TEE client CMake script builds and installs the +embedded files with the expected linkage configuration. + +Reported-by: Thomas Petazzoni +Signed-off-by: Etienne Carriere +--- + libteec/CMakeLists.txt | 5 +++-- + tee-supplicant/CMakeLists.txt | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/libteec/CMakeLists.txt b/libteec/CMakeLists.txt +index 3ec8f66..e3495fb 100644 +--- a/libteec/CMakeLists.txt ++++ b/libteec/CMakeLists.txt +@@ -33,7 +33,7 @@ endif() + ################################################################################ + # Built library + ################################################################################ +-add_library (teec SHARED ${SRC}) ++add_library (teec ${SRC}) + + set_target_properties (teec PROPERTIES + VERSION ${PROJECT_VERSION} +@@ -71,4 +71,5 @@ target_link_libraries (teec + ################################################################################ + # FIXME: This should in someway harmonize with CFG_TEE_CLIENT_LOAD_PATH + # FIXME: Should we change this to /usr/local/lib? +-install (TARGETS teec DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++install (TARGETS teec LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}") +diff --git a/tee-supplicant/CMakeLists.txt b/tee-supplicant/CMakeLists.txt +index d2d3afd..e663be9 100644 +--- a/tee-supplicant/CMakeLists.txt ++++ b/tee-supplicant/CMakeLists.txt +@@ -85,4 +85,4 @@ target_link_libraries (${PROJECT_NAME} + ################################################################################ + # Install targets + ################################################################################ +-install (TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_SBINDIR}) ++install (TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CMAKE_INSTALL_SBINDIR}) +-- +1.9.1 + diff --git a/package/optee-client/Config.in b/package/optee-client/Config.in index 833a6226a6..e519a13456 100644 --- a/package/optee-client/Config.in +++ b/package/optee-client/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_OPTEE_CLIENT bool "optee-client" - depends on !BR2_STATIC_LIBS depends on BR2_TOOLCHAIN_HAS_THREADS help Enable the OP-TEE client package that brings non-secure @@ -14,5 +13,5 @@ config BR2_PACKAGE_OPTEE_CLIENT https://github.com/OP-TEE/optee_client -comment "optee-client needs a toolchain w/ dynamic library and threads" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS +comment "optee-client needs a toolchain w/ threads" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/optee-examples/Config.in b/package/optee-examples/Config.in index 62d0bf4b2a..c0fecfdf50 100644 --- a/package/optee-examples/Config.in +++ b/package/optee-examples/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPTEE_EXAMPLES bool "optee-examples" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_STATIC_LIBS # optee-client depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK @@ -19,6 +18,6 @@ config BR2_PACKAGE_OPTEE_EXAMPLES https://github.com/linaro-swg/optee_examples -comment "optee-examples needs a toolchain w/ dynamic library and threads" +comment "optee-examples needs a toolchain w/ threads" depends on BR2_TARGET_OPTEE_OS - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/optee-test/Config.in b/package/optee-test/Config.in index 77c38c47fd..a40f1e9069 100644 --- a/package/optee-test/Config.in +++ b/package/optee-test/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_OPTEE_TEST bool "optee-test" depends on BR2_TARGET_OPTEE_OS - depends on !BR2_STATIC_LIBS # optee-client depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_TARGET_OPTEE_OS_SDK @@ -23,6 +22,6 @@ config BR2_PACKAGE_OPTEE_TEST http://github.com/OP-TEE/optee_test -comment "optee-test needs a toolchain w/ dynamic library and threads" +comment "optee-test needs a toolchain w/ threads" depends on BR2_TARGET_OPTEE_OS - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS From de5fef8c0482889743fb27542ccb013c10f1db8a Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Wed, 6 Mar 2019 17:33:16 +0100 Subject: [PATCH 0180/7482] package/musl: remove rcrt1.o from target installation Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- package/musl/musl.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/musl/musl.mk b/package/musl/musl.mk index 90c753926e..ff807c0cba 100644 --- a/package/musl/musl.mk +++ b/package/musl/musl.mk @@ -58,7 +58,7 @@ endef define MUSL_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ DESTDIR=$(TARGET_DIR) install-libs - $(RM) $(addprefix $(TARGET_DIR)/lib/,crt1.o crtn.o crti.o Scrt1.o) + $(RM) $(addprefix $(TARGET_DIR)/lib/,crt1.o crtn.o crti.o rcrt1.o Scrt1.o) endef $(eval $(generic-package)) From 6255c816232468b2e92cffcfa835aa79d8fcae04 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 1 Mar 2019 21:18:18 +0100 Subject: [PATCH 0181/7482] package/beecrypt: fix build without C++ Do not check for C++ compiler as C++ support has been disabled since commit dd4d3c18d6753e1224fbe59d91a4b44f39bc38c0 otherwise build will fail on toolchains without a working C++ compiler: checking how to run the C++ preprocessor... /lib/cpp configure: error: in `/data/buildroot/buildroot-test/instance-1/output/build/beecrypt-4.2.1': configure: error: C++ preprocessor "/lib/cpp" fails sanity check Fixes: - http://autobuild.buildroot.org/results/3c79cc68f1b088ad24daf7f9bd70718d702be577 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...3-don-t-check-for-cplusplus-compiler.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch diff --git a/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch b/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch new file mode 100644 index 0000000000..32f167996f --- /dev/null +++ b/package/beecrypt/0003-don-t-check-for-cplusplus-compiler.patch @@ -0,0 +1,27 @@ +configure.ac: don't check for C++ compiler + +Signed-off-by: Fabrice Fontaine + +diff -durN beecrypt-4.2.1-orig/configure.ac beecrypt-4.2.1/configure.ac +--- beecrypt-4.2.1-orig/configure.ac 2019-03-01 19:58:16.516117640 +0100 ++++ beecrypt-4.2.1/configure.ac 2019-03-01 21:10:17.707391803 +0100 +@@ -119,9 +119,6 @@ + + # Checks for C compiler and preprocessor + AC_PROG_CC +-AC_PROG_CPP +-AC_PROG_CXX +-AC_PROG_CXXCPP + AM_PROG_AS + AC_PROG_LD + AC_PROG_LN_S +@@ -133,9 +130,6 @@ + AC_LANG_PUSH(C) + AC_OPENMP + AC_LANG_POP(C) +-AC_LANG_PUSH(C++) +-AC_OPENMP +-AC_LANG_POP(C++) + + # Checks for compiler characteristics and flags + if test "$ac_enable_expert_mode" = no; then From a5bc6eea187bdff82731b44d105aa934e0b93f38 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sun, 24 Feb 2019 11:35:22 +0800 Subject: [PATCH 0182/7482] package/python-aiohttp-cors: new package CORS support for aiohttp. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-aiohttp-cors/Config.in | 8 ++++++++ .../python-aiohttp-cors/python-aiohttp-cors.hash | 5 +++++ package/python-aiohttp-cors/python-aiohttp-cors.mk | 14 ++++++++++++++ 5 files changed, 29 insertions(+) create mode 100644 package/python-aiohttp-cors/Config.in create mode 100644 package/python-aiohttp-cors/python-aiohttp-cors.hash create mode 100644 package/python-aiohttp-cors/python-aiohttp-cors.mk diff --git a/DEVELOPERS b/DEVELOPERS index 10ba19b647..8a57cb2e23 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1033,6 +1033,7 @@ F: package/lua-std-debug/ F: package/lua-std-normalize/ F: package/python-aiodns/ F: package/python-aiohttp/ +F: package/python-aiohttp-cors/ F: package/python-aiohttp-jinja2/ F: package/python-aiohttp-remotes/ F: package/python-aiohttp-security/ diff --git a/package/Config.in b/package/Config.in index f0ddfb76e9..ba961a22b3 100644 --- a/package/Config.in +++ b/package/Config.in @@ -803,6 +803,7 @@ menu "External python modules" source "package/python-aiocoap/Config.in" source "package/python-aiodns/Config.in" source "package/python-aiohttp/Config.in" + source "package/python-aiohttp-cors/Config.in" source "package/python-aiohttp-jinja2/Config.in" source "package/python-aiohttp-remotes/Config.in" source "package/python-aiohttp-security/Config.in" diff --git a/package/python-aiohttp-cors/Config.in b/package/python-aiohttp-cors/Config.in new file mode 100644 index 0000000000..1c97cf3f87 --- /dev/null +++ b/package/python-aiohttp-cors/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_PYTHON_AIOHTTP_CORS + bool "python-aiohttp-cors" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_AIOHTTP # runtime + help + CORS support for aiohttp. + + https://github.com/aio-libs/aiohttp-cors diff --git a/package/python-aiohttp-cors/python-aiohttp-cors.hash b/package/python-aiohttp-cors/python-aiohttp-cors.hash new file mode 100644 index 0000000000..b91e5fa8c0 --- /dev/null +++ b/package/python-aiohttp-cors/python-aiohttp-cors.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiohttp_cors/json +md5 de3940a901b269be82c8bd9f28d53ff0 aiohttp-cors-0.7.0.tar.gz +sha256 4d39c6d7100fd9764ed1caf8cebf0eb01bf5e3f24e2e073fda6234bc48b19f5d aiohttp-cors-0.7.0.tar.gz +# Locally computed sha256 checksums +sha256 86cb2262ff825ce1c8b8fb9ea9f5174318badc3912639b9275fc25d0e305c556 LICENSE diff --git a/package/python-aiohttp-cors/python-aiohttp-cors.mk b/package/python-aiohttp-cors/python-aiohttp-cors.mk new file mode 100644 index 0000000000..27443540d0 --- /dev/null +++ b/package/python-aiohttp-cors/python-aiohttp-cors.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiohttp-cors +# +################################################################################ + +PYTHON_AIOHTTP_CORS_VERSION = 0.7.0 +PYTHON_AIOHTTP_CORS_SOURCE = aiohttp-cors-$(PYTHON_AIOHTTP_CORS_VERSION).tar.gz +PYTHON_AIOHTTP_CORS_SITE = https://files.pythonhosted.org/packages/44/9e/6cdce7c3f346d8fd487adf68761728ad8cd5fbc296a7b07b92518350d31f +PYTHON_AIOHTTP_CORS_SETUP_TYPE = setuptools +PYTHON_AIOHTTP_CORS_LICENSE = Apache-2.0 +PYTHON_AIOHTTP_CORS_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 7553b6ad23961be3f91798328fa8e955658dbd72 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 8 Mar 2019 22:52:00 +0100 Subject: [PATCH 0183/7482] package/gerbera: fix static build with curl and libidn2 Fixes: - http://autobuild.buildroot.org/results/be5893b507d22a23951efeea20c18642742cef5a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...ix-static-build-with-curl-and-libidn.patch | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch diff --git a/package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch b/package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch new file mode 100644 index 0000000000..94f742c3f8 --- /dev/null +++ b/package/gerbera/0001-CMakeLists.txt-fix-static-build-with-curl-and-libidn.patch @@ -0,0 +1,41 @@ +From de0e7fe3b56cff79c11aedc89448814fab8d1877 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Fri, 8 Mar 2019 19:11:11 +0100 +Subject: [PATCH] MakeLists.txt: fix static build with curl and libidn2 + +curl can be statically linked with libidn2, in this case, build fails: +/accts/mlweber1/rclinux/rc-buildroot-test/scripts/instance-0/output/host/m68k-buildroot-linux-uclibc/sysroot/usr/lib/libcurl.a(libcurl_la-url.o): In function `free_idnconverted_hostname.isra.1': +url.c:(.text+0xf4): undefined reference to `idn2_free' + +To fix this issue, add a call to pkg_check_modules to retrieve any +needed dependencies + +Fixes: + - http://autobuild.buildroot.org/results/be5893b507d22a23951efeea20c18642742cef5a + +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/gerbera/gerbera/pull/429] +--- + CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d0eed230..e6b62c96 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -443,7 +443,11 @@ if(WITH_MYSQL) + endif() + + if(WITH_CURL) +- find_package (CURL REQUIRED) ++ find_package(PkgConfig QUIET) ++ pkg_check_modules (CURL QUIET libcurl) ++ if (NOT CURL_FOUND) ++ find_package (CURL REQUIRED) ++ endif() + if (CURL_FOUND) + include_directories(${CURL_INCLUDE_DIRS}) + target_link_libraries (gerbera ${CURL_LIBRARIES}) +-- +2.20.1 + From 88e0f214dcb7c2a99a4425a70673d2aa5f48d720 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:27 +0100 Subject: [PATCH 0184/7482] package/x11r7/xserver_xorg-server: bump version to 1.20.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-modesettings-needs-dri2.patch | 0 ...02-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0 .../0003-Remove-check-for-useSIGIO-option.patch | 0 .../0004-include-misc.h-fix-uClibc-build.patch | 0 package/x11r7/xserver_xorg-server/Config.in | 4 ++-- .../x11r7/xserver_xorg-server/xserver_xorg-server.hash | 10 +++++----- 6 files changed, 7 insertions(+), 7 deletions(-) rename package/x11r7/xserver_xorg-server/{1.20.3 => 1.20.4}/0001-modesettings-needs-dri2.patch (100%) rename package/x11r7/xserver_xorg-server/{1.20.3 => 1.20.4}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%) rename package/x11r7/xserver_xorg-server/{1.20.3 => 1.20.4}/0003-Remove-check-for-useSIGIO-option.patch (100%) rename package/x11r7/xserver_xorg-server/{1.20.3 => 1.20.4}/0004-include-misc.h-fix-uClibc-build.patch (100%) diff --git a/package/x11r7/xserver_xorg-server/1.20.3/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.20.4/0001-modesettings-needs-dri2.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.20.3/0001-modesettings-needs-dri2.patch rename to package/x11r7/xserver_xorg-server/1.20.4/0001-modesettings-needs-dri2.patch diff --git a/package/x11r7/xserver_xorg-server/1.20.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/package/x11r7/xserver_xorg-server/1.20.4/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.20.3/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch rename to package/x11r7/xserver_xorg-server/1.20.4/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch diff --git a/package/x11r7/xserver_xorg-server/1.20.3/0003-Remove-check-for-useSIGIO-option.patch b/package/x11r7/xserver_xorg-server/1.20.4/0003-Remove-check-for-useSIGIO-option.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.20.3/0003-Remove-check-for-useSIGIO-option.patch rename to package/x11r7/xserver_xorg-server/1.20.4/0003-Remove-check-for-useSIGIO-option.patch diff --git a/package/x11r7/xserver_xorg-server/1.20.3/0004-include-misc.h-fix-uClibc-build.patch b/package/x11r7/xserver_xorg-server/1.20.4/0004-include-misc.h-fix-uClibc-build.patch similarity index 100% rename from package/x11r7/xserver_xorg-server/1.20.3/0004-include-misc.h-fix-uClibc-build.patch rename to package/x11r7/xserver_xorg-server/1.20.4/0004-include-misc.h-fix-uClibc-build.patch diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 7ccb2bd9cf..ed238d570b 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -61,7 +61,7 @@ choice bool "X Window System server version" config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 - bool "1.20.3" + bool "1.20.4" select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24 select BR2_PACKAGE_XLIB_LIBXFONT2 @@ -79,7 +79,7 @@ endchoice config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION string - default "1.20.3" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 + default "1.20.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20 default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 4cde15e5d4..5c1beb1379 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -3,8 +3,8 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 # From https://lists.x.org/archives/xorg-announce/2015-October/002650.html sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2018-October/002928.html -md5 8ee29e8b24cef6b3cfa747ec01b9155a xorg-server-1.20.3.tar.bz2 -sha1 a522cd543606b4d0509d821b8061904951171c50 xorg-server-1.20.3.tar.bz2 -sha256 1b3ce466c12cacbe2252b3ad5b0ed561972eef9d09e75900d65fb1e21f9201de xorg-server-1.20.3.tar.bz2 -sha512 ee44554f86df4297f54c5871fe7a18954eeef4338775a25f36d6577b279c4775f61128da71b86cfaeadcc080838d6749dede138d4db178866579da2056543fba xorg-server-1.20.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002957.html +md5 c4841cc24b79420205d082fe82e0a650 xorg-server-1.20.4.tar.bz2 +sha1 1a79da92122124cb782a4eebfd83fd33d5c0d7d4 xorg-server-1.20.4.tar.bz2 +sha256 fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee xorg-server-1.20.4.tar.bz2 +sha512 f1c92ef6d7613e0636973d3395b48dfdad42230847ab1c8b1cea84647a968f649f9aba97bdb01c10ee8351cbe954d4e6ca4a0fc84bb8fa662d49c8ba2aee00a8 xorg-server-1.20.4.tar.bz2 From bd476bb179bc4cb2277b654cc599dda45c3e9c76 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:28 +0100 Subject: [PATCH 0185/7482] package/x11r7/xapp_bitmap: bump version to 1.0.9 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_bitmap/xapp_bitmap.hash | 9 +++++++-- package/x11r7/xapp_bitmap/xapp_bitmap.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.hash b/package/x11r7/xapp_bitmap/xapp_bitmap.hash index cd64362084..f632bce3c5 100644 --- a/package/x11r7/xapp_bitmap/xapp_bitmap.hash +++ b/package/x11r7/xapp_bitmap/xapp_bitmap.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002518.html -sha256 806cdeb80f5466ba9121e8cc6c6af82d3e4b32ef1a57bc5a76c15887640ec35d bitmap-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002941.html +md5 b94172053ffa282bd88274f1e6a677f1 bitmap-1.0.9.tar.bz2 +sha1 26ba3130b14a2db81b427f2353ac21301c5d2527 bitmap-1.0.9.tar.bz2 +sha256 e0f3afad5272d796f54c33fa1b5bd1fb3f62843a54b28c87196d06a35123e5f5 bitmap-1.0.9.tar.bz2 +sha512 873c626c72a0f4025fe8c8aeedbf3fe4ee5657fb487ad7410406a20da518c0358041dc45c2549926cc10e1d031977073b9d1ddb32830fdce95b716a52fe44456 bitmap-1.0.9.tar.bz2 +# Locally computed +sha256 03be44611edac06827bd13c0815a67ecd37ffe8fb1b9e210d6545d79bec89a3a COPYING diff --git a/package/x11r7/xapp_bitmap/xapp_bitmap.mk b/package/x11r7/xapp_bitmap/xapp_bitmap.mk index 1ee2880adc..6bc0dbde0d 100644 --- a/package/x11r7/xapp_bitmap/xapp_bitmap.mk +++ b/package/x11r7/xapp_bitmap/xapp_bitmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_BITMAP_VERSION = 1.0.8 +XAPP_BITMAP_VERSION = 1.0.9 XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2 XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_BITMAP_LICENSE = MIT From e76205d102eba74f22a2d757028b1c6bbeab9bfd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:29 +0100 Subject: [PATCH 0186/7482] package/x11r7/xapp_xcalc: bump version to 1.0.7 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xcalc/xapp_xcalc.hash | 9 +++++++-- package/x11r7/xapp_xcalc/xapp_xcalc.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.hash b/package/x11r7/xapp_xcalc/xapp_xcalc.hash index e7967558f8..283fd7e51e 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.hash +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002523.html -sha256 2f73c7160c09dc32586ea07daa408ac897c0a16eaa98cad9f9e4ee98cd9057d8 xcalc-1.0.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002946.html +md5 c0be45f8c26187474b763d634535d8d8 xcalc-1.0.7.tar.bz2 +sha1 f31c5a9789435b4c5a575d636f1e2ae4f96104c4 xcalc-1.0.7.tar.bz2 +sha256 70d271d1655f90ed0d4011f58022c441e1832f01eb3450c691799b131b557f21 xcalc-1.0.7.tar.bz2 +sha512 890cb9399e3c55816318ab5f0152ddba05ee141cbae6032759a3b762742ab54df8fcf0394dacc539299f93f27cbbb17aee5cbda5dde8b169a7099f20a1a38388 xcalc-1.0.7.tar.bz2 +# Locally computed +sha256 8dd69dbec37866a41d3040c5c478aca46e0b50c30319f178064d5e2ed9d3f912 COPYING diff --git a/package/x11r7/xapp_xcalc/xapp_xcalc.mk b/package/x11r7/xapp_xcalc/xapp_xcalc.mk index 9445af75e7..5cf3ca653b 100644 --- a/package/x11r7/xapp_xcalc/xapp_xcalc.mk +++ b/package/x11r7/xapp_xcalc/xapp_xcalc.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XCALC_VERSION = 1.0.6 +XAPP_XCALC_VERSION = 1.0.7 XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.bz2 XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XCALC_LICENSE = MIT From c133c7bd300b0c1d1e8dc170db9c66686000b80f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:30 +0100 Subject: [PATCH 0187/7482] package/x11r7/xapp_xclock: bump version to 1.0.8 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xclock/xapp_xclock.hash | 9 +++++++-- package/x11r7/xapp_xclock/xapp_xclock.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xclock/xapp_xclock.hash b/package/x11r7/xapp_xclock/xapp_xclock.hash index 1469077c1b..a0712e9a1a 100644 --- a/package/x11r7/xapp_xclock/xapp_xclock.hash +++ b/package/x11r7/xapp_xclock/xapp_xclock.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002310.html -sha256 23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0 xclock-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002947.html +md5 8bd39eb3678ed58a2350794fe13401cc xclock-1.0.8.tar.bz2 +sha1 980df6958286450cfc1fe6daa7ff912885d728ba xclock-1.0.8.tar.bz2 +sha256 930820483a36f1f1ce1bf52b648865629a16082641e12c5cf2b5045815fc2255 xclock-1.0.8.tar.bz2 +sha512 1272221ace3657505bae1b22f181e9ecbf1710900c89a860c8ceae47ae31ca5e75b6557c37dc0a881a0a24c9597b9a07f46200926feb1013f1e2e995111a7646 xclock-1.0.8.tar.bz2 +# Locally computed +sha256 ee1f19f46801ef00e70498603e74df644d0b93fc82f06b55ce64c3a2c9f16e71 COPYING diff --git a/package/x11r7/xapp_xclock/xapp_xclock.mk b/package/x11r7/xapp_xclock/xapp_xclock.mk index 6f8044ef61..b0f74682e0 100644 --- a/package/x11r7/xapp_xclock/xapp_xclock.mk +++ b/package/x11r7/xapp_xclock/xapp_xclock.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XCLOCK_VERSION = 1.0.7 +XAPP_XCLOCK_VERSION = 1.0.8 XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2 XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XCLOCK_LICENSE = MIT From c7abdd9dddbbcbf4551093b5345868491b23def4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:31 +0100 Subject: [PATCH 0188/7482] package/x11r7/xapp_xditview: bump version to 1.0.5 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xditview/xapp_xditview.hash | 7 ++++++- package/x11r7/xapp_xditview/xapp_xditview.mk | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xapp_xditview/xapp_xditview.hash b/package/x11r7/xapp_xditview/xapp_xditview.hash index c8c1a0cb56..0eb3a13ff7 100644 --- a/package/x11r7/xapp_xditview/xapp_xditview.hash +++ b/package/x11r7/xapp_xditview/xapp_xditview.hash @@ -1,2 +1,7 @@ # From http://lists.x.org/archives/xorg-announce/2015-April/002570.html -sha256 307f8df1bc3e90a7fba74dfe16840891c365abc027fbd556027eb057e5d1ff73 xditview-1.0.4.tar.bz2 +md5 3a909116a3b2abe3845215cf49e09fa5 xditview-1.0.5.tar.bz2 +sha1 f06f65bca31168c86bcebd7f92dbbda08817a5cc xditview-1.0.5.tar.bz2 +sha256 eecb1ed51ab4edc7f454476d1248cfb7799a17c5679b3dd834e8b4658331c04b xditview-1.0.5.tar.bz2 +sha512 e20c903f38394b496111267e142d84d11e69a3b89f91869652d1f2ee5c997a13f90bfa2966651b42cd3979a330b348a6e397cc6a74c45b1f3f91643e7c06765d xditview-1.0.5.tar.bz2 +# Locally computed +sha256 023d879308a49249181f78bbb567e93c45138ad847fe969d191e4802e7a1a005 COPYING diff --git a/package/x11r7/xapp_xditview/xapp_xditview.mk b/package/x11r7/xapp_xditview/xapp_xditview.mk index e8d72770ea..388710034c 100644 --- a/package/x11r7/xapp_xditview/xapp_xditview.mk +++ b/package/x11r7/xapp_xditview/xapp_xditview.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XDITVIEW_VERSION = 1.0.4 +XAPP_XDITVIEW_VERSION = 1.0.5 XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2 XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XDITVIEW_LICENSE = MIT From 51da1f79eeb9f9d74295802ff2f88ee26dc21b80 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:32 +0100 Subject: [PATCH 0189/7482] package/x11r7/xapp_xev: bump version to 1.2.3 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xev/xapp_xev.hash | 9 +++++++-- package/x11r7/xapp_xev/xapp_xev.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xev/xapp_xev.hash b/package/x11r7/xapp_xev/xapp_xev.hash index 4008ebafae..160e09e4f3 100644 --- a/package/x11r7/xapp_xev/xapp_xev.hash +++ b/package/x11r7/xapp_xev/xapp_xev.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002572.html -sha256 d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f xev-1.2.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002948.html +md5 eec82a5d4b599736f0fa637e96136746 xev-1.2.3.tar.bz2 +sha1 3a294934b9e150abc3cccc4182a40ed9b5ea9871 xev-1.2.3.tar.bz2 +sha256 66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09 xev-1.2.3.tar.bz2 +sha512 47cc7ac096e77cfa4e687914d767263cf3e1dca5bffd0f68c7ba0fe751b248c8a16525bd2da4d6efa0ea8d637831c893d41c9687cace4aaa9c0909a45ef1943e xev-1.2.3.tar.bz2 +# Locally computed +sha256 9b840f2e1900889124cc999f3158da2b6b07bf6d0d77bdbb01ce65d2e702dc83 COPYING diff --git a/package/x11r7/xapp_xev/xapp_xev.mk b/package/x11r7/xapp_xev/xapp_xev.mk index 2a798db555..137a6f2050 100644 --- a/package/x11r7/xapp_xev/xapp_xev.mk +++ b/package/x11r7/xapp_xev/xapp_xev.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XEV_VERSION = 1.2.2 +XAPP_XEV_VERSION = 1.2.3 XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2 XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XEV_LICENSE = MIT From 19230bbcbcd9e0aaecac55deedf82218783247c5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:33 +0100 Subject: [PATCH 0190/7482] package/x11r7/xapp_xfd: bump version to 1.1.3 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xfd/xapp_xfd.hash | 9 +++++++-- package/x11r7/xapp_xfd/xapp_xfd.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xfd/xapp_xfd.hash b/package/x11r7/xapp_xfd/xapp_xfd.hash index 7b6824bec3..d1f5c45432 100644 --- a/package/x11r7/xapp_xfd/xapp_xfd.hash +++ b/package/x11r7/xapp_xfd/xapp_xfd.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-July/002268.html -sha256 c1a32222fbb891e46f9a82ebab005bc5e54ce006a2586195ec9ea7ab308e2759 xfd-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002968.html +md5 f9c9f2b101a96d4b50c2a4ab9b5ab5b1 xfd-1.1.3.tar.bz2 +sha1 ca6dbe2027b205992a52c6bb717a43508f12a8c4 xfd-1.1.3.tar.bz2 +sha256 192f938ba5830e84cc807d8ead2ad9655b43eaed6500c830f3e083aad10ed958 xfd-1.1.3.tar.bz2 +sha512 68e2d4ce5e24215353b6f3231191d69639c4dd90a703e03ccf152bbfe4012da071c387ba289f918fb0336a3be9ee49dc05cbec7273fa85f5e476ead7e10795f0 xfd-1.1.3.tar.bz2 +# Locally computed +sha256 57ae10f24fc110dafb3b8d7735cf26b1905ff74e716745b2520e4ccd7751095c COPYING diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk index 06c9c83e4a..84b4a77770 100644 --- a/package/x11r7/xapp_xfd/xapp_xfd.mk +++ b/package/x11r7/xapp_xfd/xapp_xfd.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XFD_VERSION = 1.1.2 +XAPP_XFD_VERSION = 1.1.3 XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2 XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XFD_LICENSE = MIT From db6c223f7fdbeb756dd15ed94a2cb50f25e1a6d5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:34 +0100 Subject: [PATCH 0191/7482] package/x11r7/xapp_xfsinfo: bump version to 1.0.6 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash | 9 +++++++-- package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash index b1bcc0bc8a..67480a51aa 100644 --- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash +++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002512.html -sha256 d38f4b6db4038f52ba1a09123ef497993194288454c0c13d16debe246f120d8f xfsinfo-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002949.html +md5 0060d6151427d9e570e54fc52a88e7d7 xfsinfo-1.0.6.tar.bz2 +sha1 cbfe7470179f1ab5eecf992226dc1b28902c6b4c xfsinfo-1.0.6.tar.bz2 +sha256 8a3e8b9b9ae6ed571989d04e1846d39b9043e28f7623b500ebe1d47762c9b1d6 xfsinfo-1.0.6.tar.bz2 +sha512 901fc3817d7c95f2ba75ed0c51de91abd8efa67bbb93ad6b7d66e56a2f721af9db364e92f9ef2e719835fd48e934a5ea7402e5565c0ccd9b6b82633e869dc57b xfsinfo-1.0.6.tar.bz2 +# Locally computed +sha256 bae01fa08f30f21f9cfb75e8339d081b34e5e03d12677177f85a55b0ca41d0db COPYING diff --git a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk index 38d01e4949..bef9787ffe 100644 --- a/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk +++ b/package/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XFSINFO_VERSION = 1.0.5 +XAPP_XFSINFO_VERSION = 1.0.6 XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2 XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XFSINFO_LICENSE = MIT From 417f16a2b0f588dfa5d7ac906530b474a090cab5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:35 +0100 Subject: [PATCH 0192/7482] package/x11r7/xapp_xhost: bump version to 1.0.8 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xhost/xapp_xhost.hash | 9 +++++++-- package/x11r7/xapp_xhost/xapp_xhost.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xhost/xapp_xhost.hash b/package/x11r7/xapp_xhost/xapp_xhost.hash index b714eb65c3..0c3879441b 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.hash +++ b/package/x11r7/xapp_xhost/xapp_xhost.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002576.html -sha256 93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a xhost-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002950.html +md5 a48c72954ae6665e0616f6653636da8c xhost-1.0.8.tar.bz2 +sha1 971670858a464d4f8eeb6f4e182f9fcd94149790 xhost-1.0.8.tar.bz2 +sha256 a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396 xhost-1.0.8.tar.bz2 +sha512 55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b xhost-1.0.8.tar.bz2 +# Locally computed +sha256 7e69bed6fcfff05ecf454d7e4b29cd265172385833f1978f04b638f92f2cfecf COPYING diff --git a/package/x11r7/xapp_xhost/xapp_xhost.mk b/package/x11r7/xapp_xhost/xapp_xhost.mk index a4bb16bae3..e9fb155216 100644 --- a/package/x11r7/xapp_xhost/xapp_xhost.mk +++ b/package/x11r7/xapp_xhost/xapp_xhost.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XHOST_VERSION = 1.0.7 +XAPP_XHOST_VERSION = 1.0.8 XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2 XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XHOST_LICENSE = MIT From fbbadf0e164ef8439cc9b9069c5daa70a42dee6b Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:36 +0100 Subject: [PATCH 0193/7482] package/x11r7/xapp_xinit: bump version to 1.4.1 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xinit/xapp_xinit.hash | 10 +++++----- package/x11r7/xapp_xinit/xapp_xinit.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xinit/xapp_xinit.hash b/package/x11r7/xapp_xinit/xapp_xinit.hash index 58ee1ecb1d..076bd64758 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.hash +++ b/package/x11r7/xapp_xinit/xapp_xinit.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002863.html -md5 2da154b2f80ca9637b1a17b13af0880c xinit-1.4.0.tar.bz2 -sha1 fcdca692b09a45f546016fff78718d1cf7e7852f xinit-1.4.0.tar.bz2 -sha256 230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef xinit-1.4.0.tar.bz2 -sha512 53a29081130c1e195eb441ee77ccaa044b18b4cca3d2d5da3a6d67aa421dfd9718fa18b6be6232a41e40cf260c8190064c4d8d9ab771177bd5cd12e77a8fa79e xinit-1.4.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002962.html +md5 6d506ab2efc17a08e87778654e099d37 xinit-1.4.1.tar.bz2 +sha1 d874a2eecf2c30291e327851b151fdab8183260c xinit-1.4.1.tar.bz2 +sha256 de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9 xinit-1.4.1.tar.bz2 +sha512 6cbc5d025a891c419f3f4493381b2fca57a67d78df866d2f16a83426f86bad6eca7f240fac12b25cbcc63df0fec41f625407184e044898602d66483715315340 xinit-1.4.1.tar.bz2 # Locally computed sha256 c47001aa217d4ae7787121d80634db4bdba564e49a0ecab8d48b1bdc4edee1c7 COPYING diff --git a/package/x11r7/xapp_xinit/xapp_xinit.mk b/package/x11r7/xapp_xinit/xapp_xinit.mk index d911a45953..86a4d92674 100644 --- a/package/x11r7/xapp_xinit/xapp_xinit.mk +++ b/package/x11r7/xapp_xinit/xapp_xinit.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XINIT_VERSION = 1.4.0 +XAPP_XINIT_VERSION = 1.4.1 XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2 XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11 From 811e2b0fc312a1c0b88b480d93112b2e4182f6df Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:37 +0100 Subject: [PATCH 0194/7482] package/x11r7/xapp_xlogo: bump version to 1.0.5 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xlogo/xapp_xlogo.hash | 9 +++++++-- package/x11r7/xapp_xlogo/xapp_xlogo.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.hash b/package/x11r7/xapp_xlogo/xapp_xlogo.hash index 861cd596a4..a4aada48c8 100644 --- a/package/x11r7/xapp_xlogo/xapp_xlogo.hash +++ b/package/x11r7/xapp_xlogo/xapp_xlogo.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2012-March/001905.html -sha256 17af6f4fb73e7310e087fbfe5d773bab2b0d6f37a894ae5ee32de4693af6ba92 xlogo-1.0.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002963.html +md5 e9d21de1dc8c8b9f854509a26a985cd7 xlogo-1.0.5.tar.bz2 +sha1 f025a0ad30c45cbec1c2f3b1610bff94fb4e9f33 xlogo-1.0.5.tar.bz2 +sha256 633d7a3aa5df61e4e643b740e5799664741ab1a0ba40593e54fcd15dc30f378e xlogo-1.0.5.tar.bz2 +sha512 0d78e269b0be3c5de71de7f362b896bfd9934ecd9d0361b3302399b1269e029c4a9f35418d792121a1edc34405d753f9d69c996cc3a69ac717f2b0d1f736406b xlogo-1.0.5.tar.bz2 +# Locally computed +sha256 972b454b6c0da17cec61225ab9dfd4afc69fd8e7e4c629497197c6f79adc6fb0 COPYING diff --git a/package/x11r7/xapp_xlogo/xapp_xlogo.mk b/package/x11r7/xapp_xlogo/xapp_xlogo.mk index 380acfc404..455469e160 100644 --- a/package/x11r7/xapp_xlogo/xapp_xlogo.mk +++ b/package/x11r7/xapp_xlogo/xapp_xlogo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XLOGO_VERSION = 1.0.4 +XAPP_XLOGO_VERSION = 1.0.5 XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2 XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLOGO_LICENSE = MIT From 237eec6ad4b4038af910d5c5a396aa60b1aa2340 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:38 +0100 Subject: [PATCH 0195/7482] package/x11r7/xapp_xlsatoms: bump version to 1.1.3 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash | 9 +++++++-- package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash index 58d0737b9d..de7eabe3be 100644 --- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash +++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002579.html -sha256 47e5dc7c3dbda6db2cf8c00cedac1722835c1550aa21cfdbc9ba83906694dea4 xlsatoms-1.1.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002951.html +md5 61671fee12535347db24ec3a715032a7 xlsatoms-1.1.3.tar.bz2 +sha1 9fdb1e8df6bb08529a812ac90f63d500bf5174cc xlsatoms-1.1.3.tar.bz2 +sha256 57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382 xlsatoms-1.1.3.tar.bz2 +sha512 c267ccfdc5a83e834bfb5c3b144e22642badcadef4eb146eeec2df6fe6f85e9379500ae4219912c70fa2e535036a1a96cf496381f5d814e79af075e03c975f30 xlsatoms-1.1.3.tar.bz2 +# Locally computed +sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk index d6d9338013..a3230fc2dc 100644 --- a/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk +++ b/package/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XLSATOMS_VERSION = 1.1.2 +XAPP_XLSATOMS_VERSION = 1.1.3 XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2 XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XLSATOMS_LICENSE = MIT From 37d960bb6f67e8c89793ee2fdec8e51cab2dbae0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:39 +0100 Subject: [PATCH 0196/7482] package/x11r7/xapp_xmodmap: bump version to 1.0.10 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xmodmap/xapp_xmodmap.hash | 9 +++++++-- package/x11r7/xapp_xmodmap/xapp_xmodmap.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash b/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash index aad981522d..4925ec00a3 100644 --- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash +++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002583.html -sha256 b7b0e5cc5f10d0fb6d2d6ea4f00c77e8ac0e847cc5a73be94cd86139ac4ac478 xmodmap-1.0.9.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002952.html +md5 51f1d30a525e9903280ffeea2744b1f6 xmodmap-1.0.10.tar.bz2 +sha1 69e041f8a8c501bd1feb68805a0880633a685bc8 xmodmap-1.0.10.tar.bz2 +sha256 473f0941d7439d501bb895ff358832b936ec34c749b9704c37a15e11c318487c xmodmap-1.0.10.tar.bz2 +sha512 324c7dcef843186088f16b3bc47485eb3c9b4331e56ce43b692deb4bb3d4f4f27512480e91a379cceac8383df920dc5e37cd825246b50b6343291cec48134c04 xmodmap-1.0.10.tar.bz2 +# Locally computed +sha256 c149563cf2cb0ecfb1148b6eb8f604c62bed43452a0d0fbafb97286a97840f5c COPYING diff --git a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk index 670bf9f41f..f3a458b7b5 100644 --- a/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk +++ b/package/x11r7/xapp_xmodmap/xapp_xmodmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XMODMAP_VERSION = 1.0.9 +XAPP_XMODMAP_VERSION = 1.0.10 XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2 XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XMODMAP_LICENSE = MIT From a7340438ee43621900be7b79551f4c4a40a6818a Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:40 +0100 Subject: [PATCH 0197/7482] package/x11r7/xapp_xmore: bump version to 1.0.3 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xmore/xapp_xmore.hash | 9 +++++++-- package/x11r7/xapp_xmore/xapp_xmore.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xmore/xapp_xmore.hash b/package/x11r7/xapp_xmore/xapp_xmore.hash index f2b7d1a694..cd777831fa 100644 --- a/package/x11r7/xapp_xmore/xapp_xmore.hash +++ b/package/x11r7/xapp_xmore/xapp_xmore.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2010-July/001360.html -sha1 7db4e5feb82d5d05038722d3af00d28e103bed18 xmore-1.0.2.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002964.html +md5 8e1279352192e4142740c21db58f9be9 xmore-1.0.3.tar.bz2 +sha1 b57b92afd783d28c4c505e0c95556939f24c3ec9 xmore-1.0.3.tar.bz2 +sha256 644a1e0d5182d7708d413722d0579a587dc56b9a8cb60640df076d302e09251b xmore-1.0.3.tar.bz2 +sha512 e3e44831cd87a54bb585f80ef0d87f69dc35f6c834a73241aad9f6e2b0999b53c51a0a3f915a94ae4d6dc9bdfb9f60b6576f0bdcec441443abd98efa6c51b1d3 xmore-1.0.3.tar.bz2 +# Locally computed +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xapp_xmore/xapp_xmore.mk b/package/x11r7/xapp_xmore/xapp_xmore.mk index b0b0edf23b..f8a3ba8c1f 100644 --- a/package/x11r7/xapp_xmore/xapp_xmore.mk +++ b/package/x11r7/xapp_xmore/xapp_xmore.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XMORE_VERSION = 1.0.2 +XAPP_XMORE_VERSION = 1.0.3 XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2 XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XMORE_LICENSE = MIT From b922c5071ea50620280a3ae1e5d3754a45bfc1f2 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:41 +0100 Subject: [PATCH 0198/7482] package/x11r7/xapp_xprop: bump version to 1.2.4 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xprop/xapp_xprop.hash | 10 +++++----- package/x11r7/xapp_xprop/xapp_xprop.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xprop/xapp_xprop.hash b/package/x11r7/xapp_xprop/xapp_xprop.hash index a57d375b84..f513e12c24 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.hash +++ b/package/x11r7/xapp_xprop/xapp_xprop.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002870.html -md5 4becb3ddc4674d741487189e4ce3d0b6 xprop-1.2.3.tar.bz2 -sha1 77062c08a23cfca76824b7e8f9860678255d6b1a xprop-1.2.3.tar.bz2 -sha256 d22afb28c86d85fff10a50156a7d0fa930c80ae865d70b26d805fd28a17a521b xprop-1.2.3.tar.bz2 -sha512 ad7987fec11ae19b7adc3b0f683fc393e95155f3b6c753d1d8744aedcfb360452eee5735a4c380152b286905931515f3e1a28676b5531001eb8dd93b7249916a xprop-1.2.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002969.html +md5 cc369c28383a5d7144e7197ee7d30bfa xprop-1.2.4.tar.bz2 +sha1 0549a927d01930218f1d0089d0157eb9538b34a5 xprop-1.2.4.tar.bz2 +sha256 8c77fb096e46c60032b7e2bde9492c3ffcc18734f50b395085a5f10bfd3cf753 xprop-1.2.4.tar.bz2 +sha512 6e770cb89ba87ae057858cc9f0f5498979e78c3ef66ce86361b7c646cc0b70c41a18d76e55ed7225fe715b22b62bc07c56272519a2631b92832e9403ce260da7 xprop-1.2.4.tar.bz2 # Locally computed sha256 f19ff982936cca133b9593a6561c3817512207e0b4c951d0e4eb5956d30d4415 COPYING diff --git a/package/x11r7/xapp_xprop/xapp_xprop.mk b/package/x11r7/xapp_xprop/xapp_xprop.mk index d8063d94c8..a0ad4302cb 100644 --- a/package/x11r7/xapp_xprop/xapp_xprop.mk +++ b/package/x11r7/xapp_xprop/xapp_xprop.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XPROP_VERSION = 1.2.3 +XAPP_XPROP_VERSION = 1.2.4 XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2 XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XPROP_LICENSE = MIT From 7f64039a6cc9e7d9ff09194dd5d93fb2b93d866d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:42 +0100 Subject: [PATCH 0199/7482] package/x11r7/xapp_xrdb: bump version to 1.2.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xrdb/xapp_xrdb.hash | 10 +++++----- package/x11r7/xapp_xrdb/xapp_xrdb.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.hash b/package/x11r7/xapp_xrdb/xapp_xrdb.hash index c729861724..b8a6896ca7 100644 --- a/package/x11r7/xapp_xrdb/xapp_xrdb.hash +++ b/package/x11r7/xapp_xrdb/xapp_xrdb.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002871.html -md5 96f9423eab4d0641c70848d665737d2e xrdb-1.1.1.tar.bz2 -sha1 0d6b1cae357574d565d6e6bc10f6ccf073e1b9dd xrdb-1.1.1.tar.bz2 -sha256 2d23ade7cdbb487996bf77cbb32cbe9bdb34d004748a53de7a4a97660d2217b7 xrdb-1.1.1.tar.bz2 -sha512 20c342004ef911fc4d3ef4ac3ac15d1c30bb946b8156f3a6916c242e470be0cb63261563462fd1e2e07b1a7cc527b8cacf5f913e31b02196629a95043cf8d13f xrdb-1.1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002953.html +md5 34ae801ef994d192c70fcce2bdb2a1b2 xrdb-1.2.0.tar.bz2 +sha1 79596928246288a217abdec0e4a2315ec9b07963 xrdb-1.2.0.tar.bz2 +sha256 f23a65cfa1f7126040d68b6cf1e4567523edac10f8dc06f23d840d330c7c6946 xrdb-1.2.0.tar.bz2 +sha512 14e1cdfb2152fb28f1f4641b177ab236648d7e967a95b952bf4cfce8d3e1ef085e85385354e3381aaf644462e8888a1847f755ab4016ecb4cb4a715b001dd2ef xrdb-1.2.0.tar.bz2 # Locally computed sha256 ca1b3e2f9f37c35876b69a9c1c5a7860fae59b7ba87a1d2dc541b722e29b1ecc COPYING diff --git a/package/x11r7/xapp_xrdb/xapp_xrdb.mk b/package/x11r7/xapp_xrdb/xapp_xrdb.mk index 4b84c64a92..b445805d17 100644 --- a/package/x11r7/xapp_xrdb/xapp_xrdb.mk +++ b/package/x11r7/xapp_xrdb/xapp_xrdb.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XRDB_VERSION = 1.1.1 +XAPP_XRDB_VERSION = 1.2.0 XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2 XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XRDB_LICENSE = MIT From be2593f761fe17b0aabad5fb449c41ec9b8c4bc6 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:43 +0100 Subject: [PATCH 0200/7482] package/x11r7/xapp_xstdcmap: bump version to 1.0.4 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash | 9 +++++++-- package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash index 6d8b35fae1..fc067850b0 100644 --- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash +++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2013-February/002164.html -sha256 f648e2b0cf16aa29856de998e2c7204be39dc1f8daeda9464d32288e0b580fc1 xstdcmap-1.0.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002954.html +md5 da67142c128d18386ff145882e0afc66 xstdcmap-1.0.4.tar.bz2 +sha1 a5eff72ba31625e5b11506add800140019a39636 xstdcmap-1.0.4.tar.bz2 +sha256 06898b3f1eaad0b205ff3c75bdefa3207868b889d4cb37b32b8267b2bbfe6f8b xstdcmap-1.0.4.tar.bz2 +sha512 2adbb0aec1766341e04090efa962241ff6c9e32c612851b7221cec0ee16852107d406a08ec5251070f39df882c13e3c8c9edcd88f278187a9f373e1727643a8f xstdcmap-1.0.4.tar.bz2 +# Locally computed +sha256 f0a362fc1b8e788845b1c0ad7ba9ade58fdfb73da750c3b9780db5d70b947657 COPYING diff --git a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk index a4d6dc34f6..dd5b0ee349 100644 --- a/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk +++ b/package/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XSTDCMAP_VERSION = 1.0.3 +XAPP_XSTDCMAP_VERSION = 1.0.4 XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2 XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XSTDCMAP_LICENSE = MIT From 88665095ee4d081273ea78389dcd32db46258e73 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:44 +0100 Subject: [PATCH 0201/7482] package/x11r7/xapp_xvinfo: bump version to 1.1.4 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xvinfo/xapp_xvinfo.hash | 9 +++++++-- package/x11r7/xapp_xvinfo/xapp_xvinfo.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash b/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash index 2077730fc9..405fc36ea6 100644 --- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash +++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002596.html -sha256 9fba8b68daf53863e66d5004fa9c703fcecf69db4d151ea2d3d885d621e6e5eb xvinfo-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002955.html +md5 b13afec137b9b331814a9824ab03ec80 xvinfo-1.1.4.tar.bz2 +sha1 136a70a72b23c81f4fe8f4c8cb7073316be16b44 xvinfo-1.1.4.tar.bz2 +sha256 0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f xvinfo-1.1.4.tar.bz2 +sha512 85e1f936c5c826f0fdde3670bd77d5cde8641c6e8e7849e42142e91b5aa01d7e0e60d2b064eb6fef4f5666321813ca2dc9f9656756ccbe6dcda37b119ee8a63e xvinfo-1.1.4.tar.bz2 +# Locally computed +sha256 7725b0484faa1832534814ecb577f5a86acc74f1bcce25f92c55dfc1b693717d COPYING diff --git a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk index 5b05a63233..7b3b97f073 100644 --- a/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk +++ b/package/x11r7/xapp_xvinfo/xapp_xvinfo.mk @@ -4,7 +4,7 @@ # ################################################################################ -XAPP_XVINFO_VERSION = 1.1.3 +XAPP_XVINFO_VERSION = 1.1.4 XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2 XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app XAPP_XVINFO_LICENSE = MIT From 4ea923bdd73f4529d004c2612488844eb5a24928 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:45 +0100 Subject: [PATCH 0202/7482] package/x11r7/xdata_xcursor-themes: bump version to 1.0.6 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdata_xcursor-themes/xdata_xcursor-themes.hash | 10 +++++----- .../x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash index 6a8c99599f..dd8d2ad26d 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-March/002882.html -md5 34a93df23e4aa9ee2832a4af33da3ceb xcursor-themes-1.0.5.tar.bz2 -sha1 6caae6cdb441003a42305f964c32bac21c34626f xcursor-themes-1.0.5.tar.bz2 -sha256 ae8381d39096598f7fe93fbd3ab079d93347a989f29e017f399ffcd20c8e1272 xcursor-themes-1.0.5.tar.bz2 -sha512 f41e1de0d5deafba33106dcad81576d1888fca052a962c202f2221104aa2d8236b066d8d8fc3dcfbdc166db63f84e60980dfc54059b20a26c7415de71ed07a5b xcursor-themes-1.0.5.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002945.html +md5 aea14eabf40528ec4db18f1cfcf5c458 xcursor-themes-1.0.6.tar.bz2 +sha1 b56fd5bf5b1ada0532a85c27db0d296e392168c5 xcursor-themes-1.0.6.tar.bz2 +sha256 ee1ec574741293abcf66ac14ce7e74add7ac6be7deb8b38179ef010d22354999 xcursor-themes-1.0.6.tar.bz2 +sha512 2ad3586a5571a5ddc0001187362b54b839644916164834213af98e58698044aec4392dd6e1e42f1794fda85c8fedf259b09214a9636bd0e71a1629c710f198d3 xcursor-themes-1.0.6.tar.bz2 # Locally computed sha256 e437aed89c3440a9fe7e19968a3f2eeb97041ef6c9616837a3fd42d0874fc0e6 COPYING diff --git a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk index 048291008b..c3c5f388e9 100644 --- a/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ b/package/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDATA_XCURSOR_THEMES_VERSION = 1.0.5 +XDATA_XCURSOR_THEMES_VERSION = 1.0.6 XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2 XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data XDATA_XCURSOR_THEMES_LICENSE = MIT From ce49512e4b517181e45322a2ffa91e7d433c8746 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:46 +0100 Subject: [PATCH 0203/7482] package/x11r7/xdriver_xf86-input-libinput: bump version to 0.28.2 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-input-libinput.hash | 10 +++++----- .../xdriver_xf86-input-libinput.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash index c6f2577bd6..dac68422fd 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-October/002923.html -md5 9d2fb3d6b452d568a275908b856de0e2 xf86-input-libinput-0.28.1.tar.bz2 -sha1 f72f298c23fa993857ff1a9a06754f2f5962b376 xf86-input-libinput-0.28.1.tar.bz2 -sha256 9ada448e076c0078a84b48e5298fa8ce317565f9b342b74c20429214a707d98b xf86-input-libinput-0.28.1.tar.bz2 -sha512 2b8cabfbc3490edbe928771ed9d62a0d4a423bc1373fc6cf9d3a6b5937e17ddc48ebb1b70f1191e507024e4b8220c137495cbba825292b51e50709daa7d31623 xf86-input-libinput-0.28.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002938.html +md5 b7548bc1d7e82d189205794ff86307af xf86-input-libinput-0.28.2.tar.bz2 +sha1 e216e81f570a2261a1bc5a79c4782f019b5a3c36 xf86-input-libinput-0.28.2.tar.bz2 +sha256 b8b346962c6b62b8069928c29c0db83b6f544863bf2fc6830f324de841de2820 xf86-input-libinput-0.28.2.tar.bz2 +sha512 da6eb632180649853b3aa2fb88debd6aafe5ede24a5f4a04a21cf18fa97fd414d300b86cdf8a42027c98ac89f1b9f88034fc9e364ac3a02fa38872e57b542a84 xf86-input-libinput-0.28.2.tar.bz2 # Locally computed sha256 b808a8a077995380c6064bec41616f98546b0b2e79bb7f3d0247d290e275b396 COPYING diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk index 83de5c9610..7643659e31 100644 --- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.28.1 +XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.28.2 XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT From 1ef13fd5326955ac83a36deb82787d8d0e6d1712 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:47 +0100 Subject: [PATCH 0204/7482] package/x11r7/xdriver_xf86-video-amdgpu: bump version to 19.0.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-amdgpu.hash | 10 +++++----- .../xdriver_xf86-video-amdgpu.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash index 999f971811..7f1ad29110 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-September/002918.html -md5 5d75f5993cda5e013cd851c5947ec450 xf86-video-amdgpu-18.1.0.tar.bz2 -sha1 d3097af7da3b56396721e214f348e7ceb5f3a358 xf86-video-amdgpu-18.1.0.tar.bz2 -sha256 e11f25bb51d718b8ea938ad2b8095323c0ab16f4ddffd92091d80f9a445a9672 xf86-video-amdgpu-18.1.0.tar.bz2 -sha512 371f1a9f6cd2ce3b7117361222d196950c5efa01d957783c79a37c19a2273ce33d133fa51bb68432b8535aad61cb14fbb61d173a167d318b2533eb2507b7a903 xf86-video-amdgpu-18.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002966.html +md5 a9a1bee983e570614a78ae9070223149 xf86-video-amdgpu-19.0.0.tar.bz2 +sha1 7a9c6f08ec7c0a8cc665079c8f49716febc73729 xf86-video-amdgpu-19.0.0.tar.bz2 +sha256 8836147d4755908ec9e192b7cc485fbc2ce7706de33f7bea515294d3ba4c4f51 xf86-video-amdgpu-19.0.0.tar.bz2 +sha512 6a30fc03185816307f16693cd6b07f13694ca1b6b1327c58a951bccc8082f112bb768ab610229dc1040617eef860fc1ab17a7e6bf635c5a4e454e252f3addca8 xf86-video-amdgpu-19.0.0.tar.bz2 # Locally computed sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index 6a8266d0b0..a2cecae7b4 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 18.1.0 +XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 19.0.0 XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT From 0764f509fc171f4d546df3a9ba7fbc75c545f036 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:48 +0100 Subject: [PATCH 0205/7482] package/x11r7/xdriver_xf86-video-ati: bump version to 19.0.0 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash | 10 +++++----- .../xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash index e9581cb084..4b6cce7af8 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash @@ -1,7 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2018-September/002919.html -md5 7910883fff7f4a462efac0fe059ed7e3 xf86-video-ati-18.1.0.tar.bz2 -sha1 87beb7d09f5b722570adda9a5a1822cbd19e7059 xf86-video-ati-18.1.0.tar.bz2 -sha256 6c335f423c1dc3d904550d41cb871ca4130ba7037dda67d82e3f1555e1bfb9ac xf86-video-ati-18.1.0.tar.bz2 -sha512 7a58c9a6cb4876bd2ff37d837372b4e360e81fec7de6a6c7a48d70a5338d62745f734f5d4207f30aa368ff2d9ef44f5f1ef36afd73802a618998c16fe395ed53 xf86-video-ati-18.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002967.html +md5 0a95c1c8158d658bd0b3ac38a1b31382 xf86-video-ati-19.0.0.tar.bz2 +sha1 c7bb5d25ca725b8fa625a5f1a6948433e51b98a5 xf86-video-ati-19.0.0.tar.bz2 +sha256 dd907d318884bb6e81e7e62da7bb34af26aeeed3a81c21e0b46a4f3cae3ff457 xf86-video-ati-19.0.0.tar.bz2 +sha512 0674c8befa926fd3b431ce80d90f2cd0de17314efe7fd3a5ed0d78018d6cd32625b514bf68436a47eb15e5ad4b50317f3c09fd687b77e69a067d1210ee459827 xf86-video-ati-19.0.0.tar.bz2 # Locally computed sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index e89929d291..45401b7841 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_ATI_VERSION = 18.1.0 +XDRIVER_XF86_VIDEO_ATI_VERSION = 19.0.0 XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT From 8c656c65a9d60f05479148df91e487a1904e581f Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:49 +0100 Subject: [PATCH 0206/7482] package/x11r7/xdriver_xf86-video-intel: bump version Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash | 2 +- .../x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash index 2443dc2880..fead7a35ff 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 685a1b3e1b486f4fb02dd14adc33b8ce215bb96ed8e26787ee8b7bda4c0d6cce xdriver_xf86-video-intel-33ee0c3b21ea279e08d0863fcb2e874f0974b00e.tar.gz +sha256 ed98b13673e7f75918e6c338885e60e305ecb9a3559ef98459c888baedcb2465 xdriver_xf86-video-intel-6afed33b2d673d88674f0c76efe500ae414e8e1b.tar.gz sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index bd315c8d9a..3ae4554d57 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_INTEL_VERSION = 33ee0c3b21ea279e08d0863fcb2e874f0974b00e +XDRIVER_XF86_VIDEO_INTEL_VERSION = 6afed33b2d673d88674f0c76efe500ae414e8e1b XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING From fe359fda9b12005039c8c274672efde23e23419d Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:50 +0100 Subject: [PATCH 0207/7482] package/x11r7/xdriver_xf86-video-tdfx: bump version to 1.5.0 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash | 9 +++++++-- .../xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash index 84885596f6..5e9a88fbde 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash @@ -1,2 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002755.html -sha256 4cf48ee14ead52b23493c3dce5032496fd68bf1d000170bb138730497e212a42 xf86-video-tdfx-1.4.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002944.html +md5 4697f0cc69ff1ff90bc770863c158d29 xf86-video-tdfx-1.5.0.tar.bz2 +sha1 8042dd0c2bc5a396b2cfeb5418b03059a089be25 xf86-video-tdfx-1.5.0.tar.bz2 +sha256 2f4580e1f66901dd578d6e1f73df8150fd4b8480eb0c9653d4c5d8e0f8e78561 xf86-video-tdfx-1.5.0.tar.bz2 +sha512 eca3359c7db56183a1cfcce7295e41ccc349005ee1cbcf75209f1e4e8e04e887ba511712ef35efc11c940713c8327b0b8ab8b6c86facf02062b3e84c0b1af5ff xf86-video-tdfx-1.5.0.tar.bz2 +# Locally computed +sha256 5bb3d3baff0b7bbef885215ca9c12a5be1a42c848c96601b699637557fbb41ec COPYING diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 6511eec7ad..8975334f90 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.7 +XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.5.0 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TDFX_LICENSE = MIT From 03e2392a1fc881e58ace34150bad831f623091ca Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:51 +0100 Subject: [PATCH 0208/7482] package/x11r7/xlib_libFS: bump version to 1.0.8 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libFS/xlib_libFS.hash | 9 +++++++-- package/x11r7/xlib_libFS/xlib_libFS.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libFS/xlib_libFS.hash b/package/x11r7/xlib_libFS/xlib_libFS.hash index 786d147b37..c6f168576a 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.hash +++ b/package/x11r7/xlib_libFS/xlib_libFS.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002588.html -sha256 2e9d4c07026a7401d4fa4ffae86e6ac7fec83f50f3268fa85f52718e479dc4f3 libFS-1.0.7.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002970.html +md5 4e1196275aa743d6ebd3d3d5ec1dff9c libFS-1.0.8.tar.bz2 +sha1 70173cc15a7a55defb7b22b00a9387901acad634 libFS-1.0.8.tar.bz2 +sha256 c8e13727149b2ddfe40912027459b2522042e3844c5cd228c3300fe5eef6bd0f libFS-1.0.8.tar.bz2 +sha512 466198ae5c0b83e3579713d86ddfd0b039f5c5b511cf6d5dc0e9664ee2d40aec9e8929445c8e97394d85faf76a7cf2f81bddb13d23de7ce19919e3b1e36ba56f libFS-1.0.8.tar.bz2 +# Locally computed +sha256 5386724e7475b89394dd836b954a6688f875efab99e43e8eb7e8775f5b99a341 COPYING diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk index 56f2dc3cba..9cc93e0fe1 100644 --- a/package/x11r7/xlib_libFS/xlib_libFS.mk +++ b/package/x11r7/xlib_libFS/xlib_libFS.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBFS_VERSION = 1.0.7 +XLIB_LIBFS_VERSION = 1.0.8 XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2 XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFS_LICENSE = MIT From aa1a1d21562d6d5d967287f2193ad7fe04b1cbd5 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:52 +0100 Subject: [PATCH 0209/7482] package/x11r7/xlib_libXau: bump version to 1.0.9 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXau/xlib_libXau.hash | 9 +++++++-- package/x11r7/xlib_libXau/xlib_libXau.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXau/xlib_libXau.hash b/package/x11r7/xlib_libXau/xlib_libXau.hash index b6c8de73c1..a78d7f0fea 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.hash +++ b/package/x11r7/xlib_libXau/xlib_libXau.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-May/055728.html -sha256 fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2 libXau-1.0.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002942.html +md5 c5f16288f2da9f071b29111d68797480 libXau-1.0.9.tar.bz2 +sha1 ef9b1ad00f958c8b6e30a1bbc11fdfac311c9733 libXau-1.0.9.tar.bz2 +sha256 ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec libXau-1.0.9.tar.bz2 +sha512 3ca454ba466a807ea28b0f715066d73dc76ad312697b121d43e4d5766215052e9b7ffb8fe3ed3e496fa3f2a13f164ac692ff85cc428e26731b679f0f06a1d562 libXau-1.0.9.tar.bz2 +# Locally computed +sha256 56abe29bb1d9806a9e04fa9f80fed2c0f18027594df3f098148d814aef6bddfa COPYING diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk index 0fc78e7068..bac10818f1 100644 --- a/package/x11r7/xlib_libXau/xlib_libXau.mk +++ b/package/x11r7/xlib_libXau/xlib_libXau.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXAU_VERSION = 1.0.8 +XLIB_LIBXAU_VERSION = 1.0.9 XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2 XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXAU_LICENSE = MIT From dbad37fe386048da8158bb924c25cff0811d64d3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:53 +0100 Subject: [PATCH 0210/7482] package/x11r7/xlib_libXcomposite: bump version to 0.4.5 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash | 9 +++++++-- package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash index b0c3211f12..37e9c72117 100644 --- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash +++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-January/055221.html -sha256 ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178 libXcomposite-0.4.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002971.html +md5 3fa0841ea89024719b20cd702a9b54e0 libXcomposite-0.4.5.tar.bz2 +sha1 902631efb55a798c81086e5ff90b60349839db40 libXcomposite-0.4.5.tar.bz2 +sha256 b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f libXcomposite-0.4.5.tar.bz2 +sha512 502fd51fd9097bb3ca72174ac5b25b9d3b1ff240d32c4765199df03d89337d94b4ddea49e90b177b370862430089d966ce9c38988337156352cfeae911c2d3d5 libXcomposite-0.4.5.tar.bz2 +# Locally computed +sha256 efa0219ed8485ac555c1a3fb82daf34539b2e0dcf4dadc99c01f1e39c69a4a68 COPYING diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk index e84b52e3fd..80e94fe37c 100644 --- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk +++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXCOMPOSITE_VERSION = 0.4.4 +XLIB_LIBXCOMPOSITE_VERSION = 0.4.5 XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2 XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCOMPOSITE_LICENSE = MIT From ef184d51d8df8e1308c2a3d25c0a7550c5e60de3 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:54 +0100 Subject: [PATCH 0211/7482] package/x11r7/xlib_libXcursor: bump version to 1.2.0 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXcursor/xlib_libXcursor.hash | 12 +++++++----- package/x11r7/xlib_libXcursor/xlib_libXcursor.mk | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash b/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash index 7da9eb8c4f..3a12253d40 100644 --- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash +++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.hash @@ -1,5 +1,7 @@ -# From https://lists.x.org/archives/xorg-announce/2017-November/002823.html -md5 58fe3514e1e7135cf364101e714d1a14 libXcursor-1.1.15.tar.bz2 -sha1 3e19f991f244b7fa31566adce7ead078424296cf libXcursor-1.1.15.tar.bz2 -sha256 294e670dd37cd23995e69aae626629d4a2dfe5708851bbc13d032401b7a3df6b libXcursor-1.1.15.tar.bz2 -sha512 53ad0fa2afd7b4cf1108b560e44ea71abdf5c55a18df243d7123942513589c927f5c105395f790d8769959e0129db54264e6aac7efd51a5f1aec270379b1f2f5 libXcursor-1.1.15.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002972.html +md5 9b9be0e289130fb820aedf67705fc549 libXcursor-1.2.0.tar.bz2 +sha1 cca0b34955d3c2f657f05a2a2c40f75353ddd912 libXcursor-1.2.0.tar.bz2 +sha256 3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782 libXcursor-1.2.0.tar.bz2 +sha512 2b12d0fd17e311ce269dbba58588698885815eb07aa44d48525ed5cd9e5f379bb90138a792a191e2f74888ab10b3ca9a4f507f21de0984ed79748973ab927a03 libXcursor-1.2.0.tar.bz2 +# Locally computed +sha256 1f1588aff23eec0cb6bb9cfe02f8a75abbe43faf3d9b1eff54b7fbc42774b3ad COPYING diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk index 6ee76039e0..9bbd460c9d 100644 --- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk +++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXCURSOR_VERSION = 1.1.15 +XLIB_LIBXCURSOR_VERSION = 1.2.0 XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2 XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXCURSOR_LICENSE = MIT From 0ecf804cffb4475dab4eae8e9534ad874eb7a1c4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:55 +0100 Subject: [PATCH 0212/7482] package/x11r7/xlib_libXdamage: bump version to 1.1.5 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libXdamage/xlib_libXdamage.hash | 9 +++++++-- package/x11r7/xlib_libXdamage/xlib_libXdamage.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash b/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash index 343cbf4a68..120d3e026a 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.hash @@ -1,2 +1,7 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-January/055220.html -sha256 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad libXdamage-1.1.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-March/002973.html +md5 e3f554267a7a04b042dc1f6352bd6d99 libXdamage-1.1.5.tar.bz2 +sha1 719ae6ab8c1b972c6386b654976c479255af5572 libXdamage-1.1.5.tar.bz2 +sha256 b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45 libXdamage-1.1.5.tar.bz2 +sha512 a3ca6cc33b1727f717a3e2aa5593f660508a81a47918a0aa949e9e8fba105e303fe5071983b48caac92feea0fe6e8e01620805e4d19b41f21f20d837b191c124 libXdamage-1.1.5.tar.bz2 +# Locally computed +sha256 33effe928634be12e668465c3935c5570ff2787b970b15d9243d69df42302c57 COPYING diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk index d52b4e0e24..cc5493ff6c 100644 --- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk +++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBXDAMAGE_VERSION = 1.1.4 +XLIB_LIBXDAMAGE_VERSION = 1.1.5 XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2 XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXDAMAGE_LICENSE = MIT From 47401cfb8e82df8df697a7ca5f0469c4672594c4 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:02:56 +0100 Subject: [PATCH 0213/7482] package/x11r7/xlib_libfontenc: bump version to 1.1.4 Added all hashes provided by upstream and license hash. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/x11r7/xlib_libfontenc/xlib_libfontenc.hash | 9 +++++++-- package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash b/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash index 251a1d686f..de05fd27dd 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.hash @@ -1,2 +1,7 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002589.html -sha256 70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21 libfontenc-1.1.3.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002956.html +md5 6447db6a689fb530c218f0f8328c3abc libfontenc-1.1.4.tar.bz2 +sha1 d4f232b0b07487b984e13422ce4130b61a8b9edb libfontenc-1.1.4.tar.bz2 +sha256 2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079 libfontenc-1.1.4.tar.bz2 +sha512 76fa851d00113241f15fdd5b5bb7e927b8d8b9a82ce3fcb0678b8c7e32cb5e8d898c4bda1d60dafb7748145049d3240627ac34a2360c64e98a7a912ea7c30582 libfontenc-1.1.4.tar.bz2 +# Locally computed +sha256 a4dda7a643b517794bfa23dc9605da030055df38ac8a5b9e1905e690975a59c4 COPYING diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk index cb84ae4ee1..a55b90d680 100644 --- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk +++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk @@ -4,7 +4,7 @@ # ################################################################################ -XLIB_LIBFONTENC_VERSION = 1.1.3 +XLIB_LIBFONTENC_VERSION = 1.1.4 XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2 XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBFONTENC_LICENSE = MIT From faacdbf70a107338de3347c3f18047d347435c37 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:04:12 +0100 Subject: [PATCH 0214/7482] package/libvdpau: bump version to 1.2 Added all hashes provided by upstream and license hash. Removed patch 0001, applied upstream https://gitlab.freedesktop.org/vdpau/libvdpau/commit/1cda354bdfd0c9ca107293b84b52f4464fdbedcc Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .../0001-missing-configh-include.patch | 29 ------------------- package/libvdpau/libvdpau.hash | 9 +++--- package/libvdpau/libvdpau.mk | 2 +- 3 files changed, 6 insertions(+), 34 deletions(-) delete mode 100644 package/libvdpau/0001-missing-configh-include.patch diff --git a/package/libvdpau/0001-missing-configh-include.patch b/package/libvdpau/0001-missing-configh-include.patch deleted file mode 100644 index f96c6fa7bc..0000000000 --- a/package/libvdpau/0001-missing-configh-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Rico Tzschichholz -Date: Tue, 1 Sep 2015 10:45:11 +0200 -Subject: mesa_dri2: Add missing include of config.h to define _GNU_SOURCE - -Fix build with -Wimplicit-function-declaration while secure_getenv() is -guarded by __USE_GNU. - -Reviewed-by: Aaron Plattner -Tested-by: Stefan Dirsch -(cherry picked from commit 1cda354bdfd0c9ca107293b84b52f4464fdbedcc) -Signed-off-by: Damien Lanson ---- - src/mesa_dri2.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/mesa_dri2.c b/src/mesa_dri2.c -index 51e8794..420ccee 100644 ---- a/src/mesa_dri2.c -+++ b/src/mesa_dri2.c -@@ -33,6 +33,9 @@ - * and José Hiram Soltren (jsoltren@nvidia.com) - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #define NEED_REPLIES - #include diff --git a/package/libvdpau/libvdpau.hash b/package/libvdpau/libvdpau.hash index 55dc6a7e84..7cdc08553c 100644 --- a/package/libvdpau/libvdpau.hash +++ b/package/libvdpau/libvdpau.hash @@ -1,4 +1,5 @@ -# From https://lists.freedesktop.org/archives/xorg-announce/2015-August/002630.html -md5 2fa0b05a4f4d06791eec83bc9c854d14 libvdpau-1.1.1.tar.bz2 -sha1 86516e2a962fd34f65d49115d6ddf15fd912f579 libvdpau-1.1.1.tar.bz2 -sha256 857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736 libvdpau-1.1.1.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2019-February/002958.html +sha256 6a499b186f524e1c16b4f5b57a6a2de70dfceb25c4ee546515f26073cd33fa06 libvdpau-1.2.tar.bz2 +sha512 86aa3f2a39cb73a597bf417da2eeef73ff01160ed9f54dff3725785ff5a289f47040496de44e2f5292d59657d4746e369b3fa307c4f83a32f7cc28e4cd8bce6f libvdpau-1.2.tar.bz2 +# Locally computed +sha256 ce4af7294872ff07f6e82ae5f1f5eba926215b1e2fb6d55d64759de082458d61 COPYING diff --git a/package/libvdpau/libvdpau.mk b/package/libvdpau/libvdpau.mk index 93446dbf28..8a0e34cfff 100644 --- a/package/libvdpau/libvdpau.mk +++ b/package/libvdpau/libvdpau.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBVDPAU_VERSION = 1.1.1 +LIBVDPAU_VERSION = 1.2 LIBVDPAU_SOURCE = libvdpau-$(LIBVDPAU_VERSION).tar.bz2 LIBVDPAU_SITE = http://people.freedesktop.org/~aplattner/vdpau LIBVDPAU_LICENSE = MIT From 9ea528f84baa9d834be797d7ccea13967b0fbcd9 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2019 16:46:10 +0100 Subject: [PATCH 0215/7482] package/python-nfc: bump to version 0.13.5 - Switch site to github - Add python-nfc.hash - Add license file and its hash - Remove patch (not needed anymore) - Switch to setuptools (instead of distutils) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-nfc/0001-add-setup-py.patch | 26 ---------------------- package/python-nfc/python-nfc.hash | 3 +++ package/python-nfc/python-nfc.mk | 8 +++---- 3 files changed, 7 insertions(+), 30 deletions(-) delete mode 100644 package/python-nfc/0001-add-setup-py.patch create mode 100644 package/python-nfc/python-nfc.hash diff --git a/package/python-nfc/0001-add-setup-py.patch b/package/python-nfc/0001-add-setup-py.patch deleted file mode 100644 index 5a5145271b..0000000000 --- a/package/python-nfc/0001-add-setup-py.patch +++ /dev/null @@ -1,26 +0,0 @@ -Add simple setup.py - -Having a setup.py allows to easily get the .py files compiled into -.pyc, which is good because by default, Buildroot only keeps .pyc -files on the target. - -Signed-off-by: Thomas Petazzoni - -Index: b/setup.py -=================================================================== ---- /dev/null -+++ b/setup.py -@@ -0,0 +1,13 @@ -+#!/usr/bin/env python -+ -+from distutils.core import setup -+ -+setup(name='NFC', -+ version='1.0', -+ description='Python NFC', -+ author='Stephen Tiedemann', -+ author_email='stephen.tiedemann@googlemail.com', -+ url='https://launchpad.net/nfcpy', -+ packages=['nfc', 'nfc/dev', 'nfc/llcp', 'nfc/ndef', -+ 'nfc/snep'], -+ ) diff --git a/package/python-nfc/python-nfc.hash b/package/python-nfc/python-nfc.hash new file mode 100644 index 0000000000..6514973f53 --- /dev/null +++ b/package/python-nfc/python-nfc.hash @@ -0,0 +1,3 @@ +# Locally computed: +sha256 7ff9265e393e9e70173ecef5a1f9124e67d3b6e481c2dc3a9537b6a769ebe16f python-nfc-0.13.5.tar.gz +sha256 0dc4b0a3362f197e250604567a6b4eb16bbc34c186425401e2201a193a82549f LICENSE diff --git a/package/python-nfc/python-nfc.mk b/package/python-nfc/python-nfc.mk index 574d2e56e2..f5417410c9 100644 --- a/package/python-nfc/python-nfc.mk +++ b/package/python-nfc/python-nfc.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_NFC_VERSION = 212 -PYTHON_NFC_SITE = https://launchpad.net/nfcpy -PYTHON_NFC_SITE_METHOD = bzr +PYTHON_NFC_VERSION = 0.13.5 +PYTHON_NFC_SITE = $(call github,nfcpy,nfcpy,v$(PYTHON_NFC_VERSION)) PYTHON_NFC_DEPENDENCIES = libusb libusb-compat -PYTHON_NFC_SETUP_TYPE = distutils +PYTHON_NFC_SETUP_TYPE = setuptools PYTHON_NFC_LICENSE = EUPL-1.1+ +PYTHON_NFC_LICENSE_FILES = LICENSE $(eval $(python-package)) From ee7d5e54a600a956667ac0ecccb41bd20aa07cdd Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 18:49:12 +0100 Subject: [PATCH 0216/7482] package/openvpn: bump version to 2.4.7 Quoting https://openvpn.net/community-downloads/ "This is primarily a maintenance release with bugfixes and improvements. One of the big things is enhanced TLS 1.3 support." Release notes: https://github.com/OpenVPN/openvpn/commit/2b8aec62d5db2c17d5d4052991bc18272748bf29 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/openvpn/openvpn.hash | 2 +- package/openvpn/openvpn.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/openvpn/openvpn.hash b/package/openvpn/openvpn.hash index b740ea9a86..a4819f8ad2 100644 --- a/package/openvpn/openvpn.hash +++ b/package/openvpn/openvpn.hash @@ -1,3 +1,3 @@ # Locally calculated after checking signature -sha256 4f6434fa541cc9e363434ea71a16a62cf2615fb2f16af5b38f43ab5939998c26 openvpn-2.4.6.tar.xz +sha256 a42f53570f669eaf10af68e98d65b531015ff9e12be7a62d9269ea684652f648 openvpn-2.4.7.tar.xz sha256 1fcb78d7e478bb8a9408010bdc91b36e213b1facfad093df3f7ce7e28af19043 COPYRIGHT.GPL diff --git a/package/openvpn/openvpn.mk b/package/openvpn/openvpn.mk index 858398a321..4c6956fe12 100644 --- a/package/openvpn/openvpn.mk +++ b/package/openvpn/openvpn.mk @@ -4,7 +4,7 @@ # ################################################################################ -OPENVPN_VERSION = 2.4.6 +OPENVPN_VERSION = 2.4.7 OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz OPENVPN_SITE = http://swupdate.openvpn.net/community/releases OPENVPN_DEPENDENCIES = host-pkgconf openssl From e7d67faac5be820b1c8019eb249adf8765d4cf42 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 18:59:58 +0100 Subject: [PATCH 0217/7482] package/samba4: security bump to version 4.9.5 Release notes: https://www.samba.org/samba/history/samba-4.9.5.html Fixes CVE-2019-3824: ldb: Out of bound read in ldb_wildcard_compare Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/samba4/samba4.hash | 4 ++-- package/samba4/samba4.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/samba4/samba4.hash b/package/samba4/samba4.hash index de349c3049..70cea4809b 100644 --- a/package/samba4/samba4.hash +++ b/package/samba4/samba4.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://download.samba.org/pub/samba/stable/samba-4.9.4.tar.asc -sha256 6d98a8d8bcccbe788e4bbb406362e6676311aca711a3f3cc9b3a404bb9ff0b4f samba-4.9.4.tar.gz +# https://download.samba.org/pub/samba/stable/samba-4.9.5.tar.asc +sha256 078956d2d98e22011265afd4b7221efe4861067dcba4a031583b01f34d423700 samba-4.9.5.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/samba4/samba4.mk b/package/samba4/samba4.mk index 9f771cf82f..9b226a0e05 100644 --- a/package/samba4/samba4.mk +++ b/package/samba4/samba4.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA4_VERSION = 4.9.4 +SAMBA4_VERSION = 4.9.5 SAMBA4_SITE = https://download.samba.org/pub/samba/stable SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz SAMBA4_INSTALL_STAGING = YES From 01394b022611decb87c6be492e42d86cd7323511 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Fri, 15 Mar 2019 19:06:59 +0100 Subject: [PATCH 0218/7482] package/mesa3d: bump version to 19.0.0 We keep using autotools and switch to meson in a later patch after upstream deprecated autotools: https://lists.freedesktop.org/archives/mesa-announce/2019-March/000501.html Imx winsys was removed: https://cgit.freedesktop.org/mesa/mesa/commit/?h=19.0&id=41a0acd6a149ec9f47ea527ad08a2b29bf1ee6b2 Patch 0004 removed, applied upstream. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- package/mesa3d-headers/mesa3d-headers.mk | 2 +- ...sing-include-stddef.h-in-egldevice.h.patch | 47 ------------------- package/mesa3d/mesa3d.hash | 10 ++-- package/mesa3d/mesa3d.mk | 7 ++- 4 files changed, 11 insertions(+), 55 deletions(-) delete mode 100644 package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 4730463eac..63bcd8686f 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 18.3.3 +MESA3D_HEADERS_VERSION = 19.0.0 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://mesa.freedesktop.org/archive MESA3D_HEADERS_DL_SUBDIR = mesa3d diff --git a/package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch b/package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch deleted file mode 100644 index 04621eeabd..0000000000 --- a/package/mesa3d/0004-egl-add-missing-include-stddef.h-in-egldevice.h.patch +++ /dev/null @@ -1,47 +0,0 @@ -From eb44c36cf1729e7e200b77cf8ea755dff72d1639 Mon Sep 17 00:00:00 2001 -From: Gurchetan Singh -Date: Wed, 28 Nov 2018 08:39:34 -0800 -Subject: [PATCH] egl: add missing #include in egldevice.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Otherwise, I get this error: - -main/egldevice.h:54:13: error: ‘NULL’ undeclared (first use in this function) - dev = NULL; - ^~~~ -with this config: - -./autogen.sh --enable-gles1 --enable-gles2 --with-platforms='surfaceless' --disable-glx - --with-dri-drivers="i965" --with-gallium-drivers="" --enable-gbm - -v3: Use stddef.h (Matt) -v4: Modify commit message (Eric) - -Reviewed-by: Matt Turner -Reviewed-by: Eric Engestrom -Backported from upstream commit eb44c36cf1729e7e200b77cf8ea755dff72d1639 -Signed-off-by: James Hilliard ---- - src/egl/main/egldevice.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/egl/main/egldevice.h b/src/egl/main/egldevice.h -index ddcdcd1..83a47d5 100644 ---- a/src/egl/main/egldevice.h -+++ b/src/egl/main/egldevice.h -@@ -31,9 +31,9 @@ - - - #include -+#include - #include "egltypedefs.h" - -- - #ifdef __cplusplus - extern "C" { - #endif --- -2.7.4 - diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index b0774ff407..42dde03c27 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,7 +1,7 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2019-February/000492.html -md5 e9d1a24dbd5ca20efa75b9a29eb4566f mesa-18.3.3.tar.xz -sha1 abb067204ae31493dba7710c378b2b90245108ca mesa-18.3.3.tar.xz -sha256 2ab6886a6966c532ccbcc3b240925e681464b658244f0cbed752615af3936299 mesa-18.3.3.tar.xz -sha512 cd6214b8bbeb3e3d187139ae1e949684f32f90152e1d7ba8d81222bd088770e28cff7ff165f2ccc41c068950561fe952420c6e54472f7204532a8d8700ff18bb mesa-18.3.3.tar.xz +# From https://lists.freedesktop.org/archives/mesa-announce/2019-March/000501.html +md5 d0d76cd8b00bc1308e37985d4a45d3c5 mesa-19.0.0.tar.xz +sha1 d6353eab5e8949d14f15138fb726f5e298c70485 mesa-19.0.0.tar.xz +sha256 5a549dfb40ec31e5c36c47aadac04554cb2e2a8d144a046a378fc16da57e38f8 mesa-19.0.0.tar.xz +sha512 5759b85275bcd145513cf14a9ef7505595766fb33b82c53738f74ede462e5850580d48ab4af326b41209e7f4b05aab75539f2bfebf67c3098a4680ea95c37591 mesa-19.0.0.tar.xz # License sha256 630e75b4fdeb75ee2bf9e55db54dd1e3ff7353d52d9314ca8512bfd460f8e24c docs/license.html diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index c3469f7788..6aacb2ea95 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 18.3.3 +MESA3D_VERSION = 19.0.0 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://mesa.freedesktop.org/archive MESA3D_LICENSE = MIT, SGI, Khronos @@ -28,6 +28,9 @@ MESA3D_DEPENDENCIES = \ # Disable assembly usage. MESA3D_CONF_OPTS = --disable-asm +# autotools are deprecated in favour of meson, for now force autotools +MESA3D_CONF_OPTS += --enable-autotools + # Disable static, otherwise configure will fail with: "Cannot enable both static # and shared." ifeq ($(BR2_SHARED_STATIC_LIBS),y) @@ -95,7 +98,7 @@ endif # Drivers #Gallium Drivers -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv imx +MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_ETNAVIV) += etnaviv MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_RADEONSI) += radeonsi From d0dcca4705aaae85ce4ef0dc637b95fd4e81b9b3 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Fri, 15 Mar 2019 13:32:13 +0100 Subject: [PATCH 0219/7482] package/xenomai: bump to version 3.0.8 remove upstream patch. Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- ...ated-destination-buffer-with-strncpy.patch | 91 ------------------- package/xenomai/xenomai.hash | 3 +- package/xenomai/xenomai.mk | 2 +- 3 files changed, 3 insertions(+), 93 deletions(-) delete mode 100644 package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch diff --git a/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch b/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch deleted file mode 100644 index f91a31daaf..0000000000 --- a/package/xenomai/0001-demos-posix-prevent-unterminated-destination-buffer-with-strncpy.patch +++ /dev/null @@ -1,91 +0,0 @@ -From cdc63fe259c70a8a5304aa07087650ebf4ee6b5d Mon Sep 17 00:00:00 2001 -From: Philippe Gerum -Date: Wed, 24 Oct 2018 11:28:49 +0200 -Subject: [PATCH] demos/posix: prevent unterminated destination buffer with - strncpy() - -GCC 8.x introduced -Wstringop-truncation to help detecting likely -unwanted outcomes of strncpy(dst, src, n), such as omitting the NUL -character into the destination buffer whenever n < sizeof(src). - -Fix unsafe strncpy() calls when we do expect a null-terminated -destination buffer. - -Signed-off-by: Philippe Gerum -[Retrieved from -https://gitlab.denx.de/Xenomai/xenomai/commit/cdc63fe259c70a8a5304aa07087650ebf4ee6b5d] -Signed-off-by: Fabrice Fontaine ---- - demo/posix/cobalt/can-rtt.c | 4 ++-- - demo/posix/cobalt/eth_p_all.c | 3 ++- - demo/posix/cyclictest/cyclictest.c | 4 ++-- - 3 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/demo/posix/cobalt/can-rtt.c b/demo/posix/cobalt/can-rtt.c -index 61cad05e5..dd212d804 100644 ---- a/demo/posix/cobalt/can-rtt.c -+++ b/demo/posix/cobalt/can-rtt.c -@@ -248,7 +248,7 @@ int main(int argc, char *argv[]) - return -1; - } - -- strncpy(ifr.ifr_name, rxdev, IFNAMSIZ); -+ namecpy(ifr.ifr_name, rxdev); - printf("RX rxsock=%d, ifr_name=%s\n", rxsock, ifr.ifr_name); - - if (ioctl(rxsock, SIOCGIFINDEX, &ifr) < 0) { -@@ -282,7 +282,7 @@ int main(int argc, char *argv[]) - goto failure1; - } - -- strncpy(ifr.ifr_name, txdev, IFNAMSIZ); -+ namecpy(ifr.ifr_name, txdev); - printf("TX txsock=%d, ifr_name=%s\n", txsock, ifr.ifr_name); - - if (ioctl(txsock, SIOCGIFINDEX, &ifr) < 0) { -diff --git a/demo/posix/cobalt/eth_p_all.c b/demo/posix/cobalt/eth_p_all.c -index 6ac12ab3e..91aef9fbd 100644 ---- a/demo/posix/cobalt/eth_p_all.c -+++ b/demo/posix/cobalt/eth_p_all.c -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - char buffer[10*1024]; - int sock; -@@ -72,7 +73,7 @@ int main(int argc, char *argv[]) - if (argc > 1) { - struct ifreq ifr; - -- strncpy(ifr.ifr_name, argv[1], IFNAMSIZ); -+ namecpy(ifr.ifr_name, argv[1]); - if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0) { - perror("cannot get interface index"); - close(sock); -diff --git a/demo/posix/cyclictest/cyclictest.c b/demo/posix/cyclictest/cyclictest.c -index ebe5461db..76983bd02 100644 ---- a/demo/posix/cyclictest/cyclictest.c -+++ b/demo/posix/cyclictest/cyclictest.c -@@ -1353,7 +1353,7 @@ static void process_options (int argc, char *argv[], int max_cpus) - case 'F': - case OPT_FIFO: - use_fifo = 1; -- strncpy(fifopath, optarg, strlen(optarg)); -+ strncpy(fifopath, optarg, sizeof(fifopath) - 1); - break; - - case 'H': -@@ -1458,7 +1458,7 @@ static void process_options (int argc, char *argv[], int max_cpus) - case 'T': - case OPT_TRACER: - tracetype = CUSTOM; -- strncpy(tracer, optarg, sizeof(tracer)); -+ strncpy(tracer, optarg, sizeof(tracer) - 1); - break; - case 'u': - case OPT_UNBUFFERED: --- -2.18.1 - diff --git a/package/xenomai/xenomai.hash b/package/xenomai/xenomai.hash index c36badb6bf..e275b7424a 100644 --- a/package/xenomai/xenomai.hash +++ b/package/xenomai/xenomai.hash @@ -1,2 +1,3 @@ # Locally computed; -sha256 2c0dd3f0e36e4a10f97e0028989bb873e80f4d1ce212ac55fd3b28857c464f94 xenomai-3.0.6.tar.bz2 +sha256 c373261ddb8280d9d7078cdd9cd9646dfb7d70d8cd3aa9693d9148f03990d711 xenomai-3.0.8.tar.bz2 + diff --git a/package/xenomai/xenomai.mk b/package/xenomai/xenomai.mk index 98f550af60..3cb7dada4b 100644 --- a/package/xenomai/xenomai.mk +++ b/package/xenomai/xenomai.mk @@ -6,7 +6,7 @@ XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) ifeq ($(XENOMAI_VERSION),) -XENOMAI_VERSION = 3.0.6 +XENOMAI_VERSION = 3.0.8 else BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) endif From 0565da17ef6266d2ba8ae096a5a584c2720935a1 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Fri, 15 Mar 2019 12:40:46 +0200 Subject: [PATCH 0220/7482] package/python-psutil: bump to version 5.6.1 Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- package/python-psutil/python-psutil.hash | 4 ++-- package/python-psutil/python-psutil.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-psutil/python-psutil.hash b/package/python-psutil/python-psutil.hash index a6ad618d39..dea94d43fc 100644 --- a/package/python-psutil/python-psutil.hash +++ b/package/python-psutil/python-psutil.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/psutil/json -md5 81d6969ba8392cd3b6f5cba6c4e77caa psutil-5.5.1.tar.gz -sha256 72cebfaa422b7978a1d3632b65ff734a34c6b34f4578b68a5c204d633756b810 psutil-5.5.1.tar.gz +md5 765a4179f02c149794a6e99d890dfa4b psutil-5.6.1.tar.gz +sha256 fa0a570e0a30b9dd618bffbece590ae15726b47f9f1eaf7518dfb35f4d7dcd21 psutil-5.6.1.tar.gz # Locally computed sha256 checksums sha256 bb073826b0dfb43b631c38ad5d9844cda74cc631d2a5569ad8798be4274a3e17 LICENSE diff --git a/package/python-psutil/python-psutil.mk b/package/python-psutil/python-psutil.mk index 09d4e95167..3a6e7961bc 100644 --- a/package/python-psutil/python-psutil.mk +++ b/package/python-psutil/python-psutil.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PSUTIL_VERSION = 5.5.1 +PYTHON_PSUTIL_VERSION = 5.6.1 PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/c7/01/7c30b247cdc5ba29623faa5c8cf1f1bbf7e041783c340414b0ed7e067c64 +PYTHON_PSUTIL_SITE = https://files.pythonhosted.org/packages/2f/b8/11ec5006d2ec2998cb68349b8d1317c24c284cf918ecd6729739388e4c56 PYTHON_PSUTIL_SETUP_TYPE = setuptools PYTHON_PSUTIL_LICENSE = BSD-3-Clause PYTHON_PSUTIL_LICENSE_FILES = LICENSE From df1f0f6612bb9833a7a2338e52c378db4b44d682 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Fri, 15 Mar 2019 11:22:04 +0200 Subject: [PATCH 0221/7482] package/nodejs: requires gcc 4.9 BUILDING.md lists gcc 4.9.4 or newer as build prerequisite. This is needed for full C++11 support. https://github.com/nodejs/node/commit/d13a65ad68c429884434cdcd94c52b79a6d69717 Cc: Daniel Price Reported-by: Boris-Ben Shapiro Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/nodejs/Config.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index d2846f8d57..ed6225b08e 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -7,19 +7,19 @@ config BR2_PACKAGE_NODEJS_ARCH_SUPPORTS # libuv depends on BR2_TOOLCHAIN_HAS_SYNC_4 -comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 4.8, wchar" +comment "nodejs needs a toolchain w/ C++, dynamic library, NPTL, gcc >= 4.9, wchar" depends on BR2_USE_MMU depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR + !BR2_HOST_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_USE_WCHAR config BR2_PACKAGE_NODEJS bool "nodejs" depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv depends on BR2_INSTALL_LIBSTDCPP depends on BR2_PACKAGE_NODEJS_ARCH_SUPPORTS - depends on BR2_HOST_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 + depends on BR2_HOST_GCC_AT_LEAST_4_9 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 depends on BR2_USE_WCHAR # uses fork() depends on BR2_USE_MMU From 040df7714eaedc4b9079293e4437eee7567738d2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2019 08:34:43 +0100 Subject: [PATCH 0222/7482] package/ulogd: fix musl build Fixes: - http://autobuild.buildroot.org/results/26fefd491a8a313c12d62c5f522ddfd48decf6c9 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-ulogd-fix-build-with-musl-libc.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch diff --git a/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch b/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch new file mode 100644 index 0000000000..af6e13648c --- /dev/null +++ b/package/ulogd/0001-ulogd-fix-build-with-musl-libc.patch @@ -0,0 +1,32 @@ +From 675e762091380590f78ff07a94a25caa459b786b Mon Sep 17 00:00:00 2001 +From: Cameron Norman +Date: Sat, 27 Oct 2018 13:05:45 -0700 +Subject: ulogd: fix build with musl libc + +The attached patch fixes building ulogd2 with musl libc. It is being +used on Void Linux right now. + +Closes: https://bugzilla.netfilter.org/show_bug.cgi?id=1278 +Signed-off-by: Pablo Neira Ayuso +Signed-off-by: Fabrice Fontaine +[Retrrieved from: +https://git.netfilter.org/ulogd2/commit/?id=675e762091380590f78ff07a94a25caa459b786b] +--- + src/ulogd.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/ulogd.c b/src/ulogd.c +index b8bc57c..9cd64e8 100644 +--- a/src/ulogd.c ++++ b/src/ulogd.c +@@ -65,6 +65,7 @@ + #include + #include + #include ++#include + #include + #include + #ifdef DEBUG +-- +cgit v1.2.1 + From 15b7e0cfe387fdb11234faf878fddcae3d748146 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2019 08:41:42 +0100 Subject: [PATCH 0223/7482] package/ulogd: add --with-sqlite option Use --with-sqlite and --without-sqlite options Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/ulogd/ulogd.mk | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package/ulogd/ulogd.mk b/package/ulogd/ulogd.mk index a2cad40677..1b86c12773 100644 --- a/package/ulogd/ulogd.mk +++ b/package/ulogd/ulogd.mk @@ -29,7 +29,10 @@ else ULOGD_CONF_OPTS += --without-pgsql endif ifeq ($(BR2_PACKAGE_SQLITE),y) +ULOGD_CONF_OPTS += --with-sqlite ULOGD_DEPENDENCIES += sqlite +else +ULOGD_CONF_OPTS += --without-sqlite endif else ULOGD_CONF_OPTS += --without-mysql --without-pgsql --without-sqlite From ae08209ba1e3c9016c17c24168c65a598561ffdd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2019 08:54:54 +0100 Subject: [PATCH 0224/7482] package/optee-benchmark: needs fork Fixes: - http://autobuild.buildroot.org/results/ea61442275d1790a29e02e2fa27f072e4c12daa7 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/optee-benchmark/Config.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/package/optee-benchmark/Config.in b/package/optee-benchmark/Config.in index 0bc4af4d3a..5fd365a9e3 100644 --- a/package/optee-benchmark/Config.in +++ b/package/optee-benchmark/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_OPTEE_BENCHMARK bool "optee-benchmark" + depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS # optee-client select BR2_PACKAGE_OPTEE_CLIENT select BR2_PACKAGE_LIBYAML @@ -12,4 +13,5 @@ config BR2_PACKAGE_OPTEE_BENCHMARK http://github.com/linaro-swg/optee_benchmark comment "optee-benchmark needs a toolchain w/ threads" + depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS From c5a2b7c241441566edeeaecc6659947c8a5ad760 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2019 21:56:58 +0100 Subject: [PATCH 0225/7482] package/python-watchdog: bump to version 0.9.0 - Remove patch (already in version: https://github.com/gorakhargosh/watchdog/commit/268a46dabc10ff8dcc5a123ca8c8ceb2e9189f2a) - Add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...workaround-to-support-uClibc-library.patch | 43 ------------------- package/python-watchdog/python-watchdog.hash | 11 +++-- package/python-watchdog/python-watchdog.mk | 4 +- 3 files changed, 9 insertions(+), 49 deletions(-) delete mode 100644 package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch diff --git a/package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch b/package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch deleted file mode 100644 index c21e6cd089..0000000000 --- a/package/python-watchdog/0001-Add-a-workaround-to-support-uClibc-library.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c3b3c4581b25d7e62f5c2ce1484133229d5e657a Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Fri, 16 Feb 2018 13:26:23 +0100 -Subject: [PATCH] Add a workaround to support uClibc library - -uClibc based systems provide only libc.so.0 and libc.so.1 -symlinks. - -So try to find libc.so.0 if neither libc.so nor libc.so.6 -could be found. - -Signed-off-by: Yegor Yefremov ---- - src/watchdog/observers/inotify_c.py | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/watchdog/observers/inotify_c.py b/src/watchdog/observers/inotify_c.py -index 5f208b6..0dc7b50 100644 ---- a/src/watchdog/observers/inotify_c.py -+++ b/src/watchdog/observers/inotify_c.py -@@ -45,7 +45,19 @@ def _load_libc(): - try: - return ctypes.CDLL('libc.so') - except (OSError, IOError): -+ pass -+ -+ try: - return ctypes.CDLL('libc.so.6') -+ except (OSError, IOError): -+ pass -+ -+ # uClibc -+ try: -+ return ctypes.CDLL('libc.so.0') -+ except (OSError, IOError) as err: -+ raise err -+ - - libc = _load_libc() - --- -2.1.4 - diff --git a/package/python-watchdog/python-watchdog.hash b/package/python-watchdog/python-watchdog.hash index 9da2b37a7b..701c7991a5 100644 --- a/package/python-watchdog/python-watchdog.hash +++ b/package/python-watchdog/python-watchdog.hash @@ -1,4 +1,7 @@ -# md5 from https://pypi.python.org/pypi/watchdog/json -md5 bb16926bccc98eae2a04535e4512ddf1 watchdog-0.8.3.tar.gz -# sha256 calculated by scanpypi -sha256 7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162 watchdog-0.8.3.tar.gz +# md5, sha256 from https://pypi.python.org/pypi/watchdog/json +md5 7cdc103f607e72fc32c206301a72d1b2 watchdog-0.9.0.tar.gz +sha256 965f658d0732de3188211932aeb0bb457587f04f63ab4c1e33eab878e9de961d watchdog-0.9.0.tar.gz + +# Hash for license files +sha256 14e636faf5889138a1bb7a8498ccbb0266aee31d2dc475201a10448e56ed3d96 COPYING +sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-watchdog/python-watchdog.mk b/package/python-watchdog/python-watchdog.mk index 3dd92e3a3d..44929a65ac 100644 --- a/package/python-watchdog/python-watchdog.mk +++ b/package/python-watchdog/python-watchdog.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_WATCHDOG_VERSION = 0.8.3 +PYTHON_WATCHDOG_VERSION = 0.9.0 PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://pypi.python.org/packages/54/7d/c7c0ad1e32b9f132075967fc353a244eb2b375a3d2f5b0ce612fd96e107e +PYTHON_WATCHDOG_SITE = https://pypi.python.org/packages/bb/e3/5a55d48a29300160779f0a0d2776d17c1b762a2039b36de528b093b87d5b PYTHON_WATCHDOG_SETUP_TYPE = setuptools PYTHON_WATCHDOG_LICENSE = Apache-2.0 PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING From 2ebc2219d5716f81789f29dcbb6b05d0c9d886dd Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 14 Mar 2019 13:38:11 +0000 Subject: [PATCH 0226/7482] package/nodejs: bump version to 10.15.3 See https://nodejs.org/en/blog/release/v10.15.3/ The host tool "torque" is unfortunately not built by complying to our LDFLAGS, so it is not built with the proper RPATH. We fix that using patchelf, and install it to $(HOST_DIR) to make it available during the build of the target nodejs. Signed-off-by: Martin Bark [Thomas: - add explanation in the commit log about torque - install torque in $(HOST_DIR)/bin and not $(HOST_DIR)/usr/bin] Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.hash | 4 ++-- package/nodejs/nodejs.mk | 12 ++++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index 5a06e5328c..e9c174e662 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -1,5 +1,5 @@ -# From https://nodejs.org/dist/v8.15.0/SHASUMS256.txt -sha256 968523333947cc3f769d73dedc6c9c60580826d8714bc0e62ca4589de6a7c633 node-v8.15.0.tar.xz +# From https://nodejs.org/dist/v10.15.3/SHASUMS256.txt +sha256 4e22d926f054150002055474e452ed6cbb85860aa7dc5422213a2002ed9791d5 node-v10.15.3.tar.xz # Hash for license file sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 446cb77dbf..ef34b269f6 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -4,13 +4,13 @@ # ################################################################################ -NODEJS_VERSION = 8.15.0 +NODEJS_VERSION = 10.15.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ libhttpparser libuv zlib \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib +HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib host-patchelf NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) NODEJS_LICENSE_FILES = LICENSE @@ -73,6 +73,8 @@ define HOST_NODEJS_BUILD_CMDS $(HOST_CONFIGURE_OPTS) \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) + + $(HOST_DIR)/bin/patchelf --set-rpath $(HOST_DIR)/lib $(@D)/out/Release/torque endef define HOST_NODEJS_INSTALL_CMDS @@ -81,6 +83,8 @@ define HOST_NODEJS_INSTALL_CMDS $(HOST_CONFIGURE_OPTS) \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) + + $(INSTALL) -m755 -D $(@D)/out/Release/torque $(HOST_DIR)/bin/torque endef ifeq ($(BR2_i386),y) @@ -128,6 +132,10 @@ define NODEJS_CONFIGURE_CMDS $(if $(NODEJS_MIPS_FPU_MODE),--with-mips-fpu-mode=$(NODEJS_MIPS_FPU_MODE)) \ $(NODEJS_CONF_OPTS) \ ) + + # use host version of torque + sed "s#<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)torque<(EXECUTABLE_SUFFIX)#$(HOST_DIR)/bin/torque#" \ + -i $(@D)/deps/v8/gypfiles/v8.gyp endef define NODEJS_BUILD_CMDS From bd52cb76b050ceb4566982c7cb6001358ebf188d Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 14 Mar 2019 13:38:12 +0000 Subject: [PATCH 0227/7482] package/nghttp2: bump version to 1.37.0 Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/nghttp2/nghttp2.hash | 2 +- package/nghttp2/nghttp2.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/nghttp2/nghttp2.hash b/package/nghttp2/nghttp2.hash index d000fd56c5..a56f56f222 100644 --- a/package/nghttp2/nghttp2.hash +++ b/package/nghttp2/nghttp2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 f75e8f228217f23aa5eabfbab140e061cda00b7c21e34c891ecfb248d663303f nghttp2-1.32.0.tar.gz +sha256 760981ab5703d3ed185eccb322321d379453974357a3263971a928c2879a43bf nghttp2-1.37.0.tar.gz sha256 6b94f3abc1aabd0c72a7c7d92a77f79dda7c8a0cb3df839a97890b4116a2de2a COPYING diff --git a/package/nghttp2/nghttp2.mk b/package/nghttp2/nghttp2.mk index 20bfee75a3..7ce28b41fc 100644 --- a/package/nghttp2/nghttp2.mk +++ b/package/nghttp2/nghttp2.mk @@ -4,7 +4,7 @@ # ################################################################################ -NGHTTP2_VERSION = 1.32.0 +NGHTTP2_VERSION = 1.37.0 NGHTTP2_SITE = https://github.com/nghttp2/nghttp2/releases/download/v$(NGHTTP2_VERSION) NGHTTP2_LICENSE = MIT NGHTTP2_LICENSE_FILES = COPYING From 9a52e173b55e0ee2d10f93ea80017174324ca7a2 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Thu, 14 Mar 2019 13:38:13 +0000 Subject: [PATCH 0228/7482] package/nodejs: use shared nghttp2 library Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/nodejs/Config.in | 1 + package/nodejs/nodejs.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package/nodejs/Config.in b/package/nodejs/Config.in index ed6225b08e..ad31f7ec27 100644 --- a/package/nodejs/Config.in +++ b/package/nodejs/Config.in @@ -30,6 +30,7 @@ config BR2_PACKAGE_NODEJS select BR2_PACKAGE_LIBHTTPPARSER select BR2_PACKAGE_LIBUV select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_NGHTTP2 help Event-driven I/O server-side JavaScript environment based on V8. diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index ef34b269f6..5cae449244 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -8,7 +8,7 @@ NODEJS_VERSION = 10.15.3 NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) NODEJS_DEPENDENCIES = host-python host-nodejs c-ares \ - libhttpparser libuv zlib \ + libhttpparser libuv zlib nghttp2 \ $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) HOST_NODEJS_DEPENDENCIES = host-libopenssl host-python host-zlib host-patchelf NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) @@ -20,6 +20,7 @@ NODEJS_CONF_OPTS = \ --shared-cares \ --shared-http-parser \ --shared-libuv \ + --shared-nghttp2 \ --without-dtrace \ --without-etw \ --dest-os=linux From 048b66016e03ebfb43dc6cdc6805bad451bbe51c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Fri, 15 Mar 2019 22:07:09 +0100 Subject: [PATCH 0229/7482] package/python-tornado: bump to version 6.0.1 Remove patch (not needed since: https://github.com/tornadoweb/tornado/commit/fa6a7ff6056fc8b139e51294095050f68076f850) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Disable-SSL-checks.patch | 45 ------------------- package/python-tornado/python-tornado.hash | 4 +- package/python-tornado/python-tornado.mk | 4 +- 3 files changed, 4 insertions(+), 49 deletions(-) delete mode 100644 package/python-tornado/0001-Disable-SSL-checks.patch diff --git a/package/python-tornado/0001-Disable-SSL-checks.patch b/package/python-tornado/0001-Disable-SSL-checks.patch deleted file mode 100644 index 272afd64fe..0000000000 --- a/package/python-tornado/0001-Disable-SSL-checks.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 82a3bbc2ac41b5a1b34a53f97459558efe131f14 Mon Sep 17 00:00:00 2001 -From: Jan Dohl -Date: Sun, 24 Jun 2018 16:00:54 +0200 -Subject: [PATCH] Disable SSL checks - -Checking for SSL support in the Python used on the build system is not -relevant, as we need SSL support in the Python on the target system. - -Signed-off-by: Jan Dohl ---- - setup.py | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/setup.py b/setup.py -index 6fbb10a8..1a9220c7 100644 ---- a/setup.py -+++ b/setup.py -@@ -15,7 +15,6 @@ - - import os - import platform --import ssl - import sys - import warnings - -@@ -137,16 +136,6 @@ if setuptools is not None: - python_requires = '>= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, != 3.3.*' - kwargs['python_requires'] = python_requires - --# Verify that the SSL module has all the modern upgrades. Check for several --# names individually since they were introduced at different versions, --# although they should all be present by Python 3.4 or 2.7.9. --if (not hasattr(ssl, 'SSLContext') or -- not hasattr(ssl, 'create_default_context') or -- not hasattr(ssl, 'match_hostname')): -- raise ImportError("Tornado requires an up-to-date SSL module. This means " -- "Python 2.7.9+ or 3.4+ (although some distributions have " -- "backported the necessary changes to older versions).") -- - setup( - name="tornado", - version=version, --- -2.14.4 - diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash index fbf5efa60a..18560b17ce 100644 --- a/package/python-tornado/python-tornado.hash +++ b/package/python-tornado/python-tornado.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/tornado/json -md5 a1ce4f392d30ff0ebcb255150d89b826 tornado-5.1.1.tar.gz -sha256 4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409 tornado-5.1.1.tar.gz +md5 63a26fdd0bf1154d4a5e9144b7028dd0 tornado-6.0.1.tar.gz +sha256 de274c65f45f6656c375cdf1759dbf0bc52902a1e999d12a35eb13020a641a53 tornado-6.0.1.tar.gz # Locally computed sha256 checksums sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk index 71f536f023..fe65d7516e 100644 --- a/package/python-tornado/python-tornado.mk +++ b/package/python-tornado/python-tornado.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_TORNADO_VERSION = 5.1.1 +PYTHON_TORNADO_VERSION = 6.0.1 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/e6/78/6e7b5af12c12bdf38ca9bfe863fcaf53dc10430a312d0324e76c1e5ca426 +PYTHON_TORNADO_SITE = https://pypi.python.org/packages/b1/7f/8109821ff9df1bf3519169e34646705c32ac13be6a4d51a79ed57f47686e PYTHON_TORNADO_LICENSE = Apache-2.0 PYTHON_TORNADO_LICENSE_FILES = LICENSE PYTHON_TORNADO_SETUP_TYPE = setuptools From b60729784ab1c2f75dca30f924f4dd3176713ae8 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 12 Mar 2019 23:35:24 +0100 Subject: [PATCH 0230/7482] support/dependencies: add a check for python3 Since version 2.29, glibc requires python 3.4 or later to build the GNU C Library [1]. We add a new check to verify the version of python3 interpreter installed on the host. If no suitable python3 interpreter is found, define BR2_PYTHON3_HOST_DEPENDENCY to add host-python3 in package dependencies when needed. [1] https://www.sourceware.org/ml/libc-alpha/2019-01/msg00723.html Signed-off-by: Romain Naour Tested-by: Adam Duskett Reviewed-by: Adam Duskett Reviewed-by: "Yann E. MORIN" [Thomas: drop not so useful comment in the .mk file, as suggested by Yann E. Morin.] Signed-off-by: Thomas Petazzoni --- support/dependencies/check-host-python3.mk | 8 ++++++ support/dependencies/check-host-python3.sh | 31 ++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 support/dependencies/check-host-python3.mk create mode 100755 support/dependencies/check-host-python3.sh diff --git a/support/dependencies/check-host-python3.mk b/support/dependencies/check-host-python3.mk new file mode 100644 index 0000000000..50ed933a4e --- /dev/null +++ b/support/dependencies/check-host-python3.mk @@ -0,0 +1,8 @@ +# Since version 2.29, glibc requires python 3.4 or later to build the GNU C Library. +# https://www.sourceware.org/ml/libc-alpha/2019-01/msg00723.html + +BR2_PYTHON3_VERSION_MIN = 3.4 + +ifeq (,$(call suitable-host-package,python3,$(BR2_PYTHON3_VERSION_MIN) python3 python)) +BR2_PYTHON3_HOST_DEPENDENCY = host-python3 +endif diff --git a/support/dependencies/check-host-python3.sh b/support/dependencies/check-host-python3.sh new file mode 100755 index 0000000000..17cafd2883 --- /dev/null +++ b/support/dependencies/check-host-python3.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +# prevent shift error +[ $# -lt 2 ] && exit 1 + +version_min="$(echo ${1} | awk '{ split($1, v, "."); print v[1] v[2] }')" + +shift + +# The host python interpreter is already checked by dependencies.sh but +# it only check if the version is at least 2.7. +# We want to check the version number of the python3 interpreter even +# if Buildroot is able to use any version but some packages may require +# a more recent version. + +for candidate in "${@}" ; do + python3=`which $candidate 2>/dev/null` + if [ ! -x "$python3" ]; then + continue + fi + version=`$python3 -V 2>&1 | awk '{ split($2, v, "."); print v[1] v[2] }'` + + if [ $version -lt $version_min ]; then + # no suitable python3 found + continue + fi + + # suitable python3 found + echo $python3 + break +done From 57df4792c3d55ad582a3061f091547b1b9650792 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 12 Mar 2019 23:35:25 +0100 Subject: [PATCH 0231/7482] package/glibc: bump to version 2.29 Changes to build and runtime requirements: * Python 3.4 or later is required to build the GNU C Library. * On most architectures, GCC 5 or later is required to build the GNU C Library. (On powerpc64le, GCC 6.2 or later is still required, as before.) While at it, remove the double "glibc-" prefix in the version. https://www.sourceware.org/ml/libc-alpha/2019-01/msg00723.html Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/gcc/Config.in.host | 6 ++---- .../glibc.hash | 2 +- package/glibc/glibc.mk | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) rename package/glibc/{glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1 => 2.29-6-g067fc32968b601493f4b247a3ac00caeea3f3d61}/glibc.hash (69%) diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 8ec406a117..222251f43c 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -30,10 +30,8 @@ config BR2_GCC_VERSION_4_9_X depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe)) depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - # glibc >= 2.26 needs gcc >= 6.2 - depends on !(BR2_TOOLCHAIN_USES_GLIBC && BR2_powerpc64le) - # glibc >= 2.27 needs gcc >= 5 - depends on !(BR2_TOOLCHAIN_USES_GLIBC && (BR2_aarch64 || BR2_aarch64_be)) + # glibc >= 2.29 needs gcc >= 5 on all architectures. + depends on !BR2_TOOLCHAIN_USES_GLIBC select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 config BR2_GCC_VERSION_5_X diff --git a/package/glibc/glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1/glibc.hash b/package/glibc/2.29-6-g067fc32968b601493f4b247a3ac00caeea3f3d61/glibc.hash similarity index 69% rename from package/glibc/glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1/glibc.hash rename to package/glibc/2.29-6-g067fc32968b601493f4b247a3ac00caeea3f3d61/glibc.hash index e83b1caf4c..56e4bf1c18 100644 --- a/package/glibc/glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1/glibc.hash +++ b/package/glibc/2.29-6-g067fc32968b601493f4b247a3ac00caeea3f3d61/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 ebf04c7b00153d6df8beceec0666d4b13e1ac613b40d5774d1b8c6f61c1686e6 glibc-glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1.tar.gz +sha256 fdc2f7966eac7071ac4d66bc38d9236476d670f042645f9566746a1fd42a6a9d glibc-2.29-6-g067fc32968b601493f4b247a3ac00caeea3f3d61.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index ec5b3cedc9..cb867d4d5b 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -12,8 +12,8 @@ GLIBC_VERSION = 4e2943456e690d89f48e6e710757dd09404b0c9a GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION)) else # Generate version string using: -# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master -GLIBC_VERSION = glibc-2.28-69-g1e5c5303a522764d7e9d2302a60e4a32cdb902f1 +# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2- +GLIBC_VERSION = 2.29-6-g067fc32968b601493f4b247a3ac00caeea3f3d61 # Upstream doesn't officially provide an https download link. # There is one (https://sourceware.org/git/glibc.git) but it's not reliable, # sometimes the connection times out. So use an unofficial github mirror. @@ -32,7 +32,7 @@ GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO # Before glibc is configured, we must have the first stage # cross-compiler and the kernel headers GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-bison host-gawk \ - $(BR2_MAKE_HOST_DEPENDENCY) + $(BR2_MAKE_HOST_DEPENDENCY) $(BR2_PYTHON3_HOST_DEPENDENCY) GLIBC_SUBDIR = build From e1b691884b79ee753249b42426a89ebce474192f Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 9 Mar 2019 15:51:25 +0100 Subject: [PATCH 0232/7482] package/imagemagick: disable locale with uclibc Fixes: - http://autobuild.buildroot.org/results/f7be30ffa28b7f367fb5343a7d69dc8bc7c3a170 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/imagemagick/imagemagick.mk | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index b5d0d56284..81e49eb62c 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -40,6 +40,14 @@ IMAGEMAGICK_CONF_OPTS = \ IMAGEMAGICK_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) +# Like postgreSQL, imagemagick does not build against uClibc with +# locales enabled, due to an uClibc bug, see +# http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html +# so overwrite automatic detection and disable locale support +IMAGEMAGICK_CONF_ENV += ac_cv_func_newlocale=no +endif + ifeq ($(BR2_PACKAGE_FONTCONFIG),y) IMAGEMAGICK_CONF_OPTS += --with-fontconfig IMAGEMAGICK_DEPENDENCIES += fontconfig From b8637d1a274faa46af28ae6e478046ef71c6b9cd Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 6 Mar 2019 16:24:24 +0100 Subject: [PATCH 0233/7482] configs/olimex_a20_olinuxino_lime_legacy: remove defconfig The old 3.4 Linux kernel used by this defconfig doesn't build with gcc 7.x. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 - board/olimex/a20_olinuxino/boot-legacy.cmd | 5 -- board/olimex/a20_olinuxino/post-build.sh | 5 -- board/olimex/a20_olinuxino/readme.txt | 7 --- ...olimex_a20_olinuxino_lime_legacy_defconfig | 56 ------------------- 5 files changed, 74 deletions(-) delete mode 100644 board/olimex/a20_olinuxino/boot-legacy.cmd delete mode 100644 configs/olimex_a20_olinuxino_lime_legacy_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bec55c19f..28feeef2ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -186,7 +186,6 @@ olimex_a10_olinuxino_lime_defconfig: { extends: .defconfig } olimex_a13_olinuxino_defconfig: { extends: .defconfig } olimex_a20_olinuxino_lime2_defconfig: { extends: .defconfig } olimex_a20_olinuxino_lime_defconfig: { extends: .defconfig } -olimex_a20_olinuxino_lime_legacy_defconfig: { extends: .defconfig } olimex_a20_olinuxino_micro_defconfig: { extends: .defconfig } olimex_a64_olinuxino_defconfig: { extends: .defconfig } olimex_imx233_olinuxino_defconfig: { extends: .defconfig } diff --git a/board/olimex/a20_olinuxino/boot-legacy.cmd b/board/olimex/a20_olinuxino/boot-legacy.cmd deleted file mode 100644 index 9fa5d65418..0000000000 --- a/board/olimex/a20_olinuxino/boot-legacy.cmd +++ /dev/null @@ -1,5 +0,0 @@ -setenv bootm_boot_mode sec -setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p1 rootwait panic=10 sunxi_ve_mem_reserve=0 sunxi_g2d_mem_reserve=0 sunxi_no_mali_mem_reserve sunxi_fb_mem_reserve=16 consoleblank=0 ${extra} -ext4load mmc 0 0x43000000 /boot/script.bin -ext4load mmc 0 0x48000000 /boot/zImage -bootz 0x48000000 diff --git a/board/olimex/a20_olinuxino/post-build.sh b/board/olimex/a20_olinuxino/post-build.sh index 7a8a427466..d3f612f811 100755 --- a/board/olimex/a20_olinuxino/post-build.sh +++ b/board/olimex/a20_olinuxino/post-build.sh @@ -1,8 +1,3 @@ #!/bin/sh cp $BINARIES_DIR/boot.scr $TARGET_DIR/boot/boot.scr - -if [ -e $BINARIES_DIR/script.bin ]; then - # mali requires a legacy kernel - cp $BINARIES_DIR/script.bin $TARGET_DIR/boot/script.bin -fi diff --git a/board/olimex/a20_olinuxino/readme.txt b/board/olimex/a20_olinuxino/readme.txt index 57ee23d147..504483b513 100644 --- a/board/olimex/a20_olinuxino/readme.txt +++ b/board/olimex/a20_olinuxino/readme.txt @@ -16,15 +16,9 @@ The following defconfigs are available: for the A20-OLinuXino-MICRO board using mainline kernel - olimex_a20_olinuxino_lime_defconfig for the A20-OLinuXino-LIME board using mainline kernel - - olimex_a20_olinuxino_lime_legacy_defconfig - for the A20-OLinuXino-LIME board using legacy linux-sunxi kernel - olimex_a20_olinuxino_lime2_defconfig for the A20-OLinuXino-LIME2 board using mainline kernel -The legacy linux-sunxi kernels are based on the vendor code drops. -They are only useful when accelerated 3D graphics and multimedia support -is strictly necessary. - The Mainline Kernel is already a much better choice for a headless server. And also the mainline kernel works fine even for a basic Linux desktop system running on top of a simple framebuffer, which may be good enough for @@ -51,7 +45,6 @@ After building, you should get a tree like this: output/images/ +-- rootfs.ext2 +-- rootfs.ext4 -> rootfs.ext2 - +-- script.bin (lime_legacy) +-- sdcard.img +-- sun7i-a20-olinuxino-lime.dtb (lime, mainline) +-- sun7i-a20-olinuxino-lime2.dtb (lime2, mainline) diff --git a/configs/olimex_a20_olinuxino_lime_legacy_defconfig b/configs/olimex_a20_olinuxino_lime_legacy_defconfig deleted file mode 100644 index 2c33f05e56..0000000000 --- a/configs/olimex_a20_olinuxino_lime_legacy_defconfig +++ /dev/null @@ -1,56 +0,0 @@ -# Architecture -BR2_arm=y -BR2_cortex_a7=y -BR2_ARM_EABIHF=y - -# The old 3.4 kernel doesn't build with gcc >= 7.x -BR2_GCC_VERSION_6_X=y - -# Linux headers same as kernel, a 3.4 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_4=y - -# System configuration -BR2_TARGET_GENERIC_HOSTNAME="a20-olinuxino" -BR2_TARGET_GENERIC_ISSUE="Welcome to OLinuXino!" -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/olimex/a20_olinuxino/post-build.sh" -BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" -BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olimex/a20_olinuxino/genimage.cfg" - -# Kernel, based on Linux version 3.4.113 -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,dan-and,linux-sunxi,fc385cc6dfa350382ecc94a520a716b57e654410)/linux-fc385cc6dfa350382ecc94a520a716b57e654410.tar.gz" -BR2_LINUX_KERNEL_USE_DEFCONFIG=y -BR2_LINUX_KERNEL_DEFCONFIG="sun7i" -BR2_LINUX_KERNEL_INSTALL_TARGET=y - -# sunxi packages -BR2_PACKAGE_SUNXI_TOOLS=y -BR2_PACKAGE_SUNXI_BOARDS=y -BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/a20-olinuxino_lime.fex" -BR2_PACKAGE_SUNXI_MALI=y -BR2_PACKAGE_SUNXI_MALI_DBG=y - -# Filesystem -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_ROOTFS_EXT2_4=y -# BR2_TARGET_ROOTFS_TAR is not set - -# Bootloaders -BR2_TARGET_UBOOT=y -BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.07" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="A20-OLinuXino-Lime" -BR2_TARGET_UBOOT_NEEDS_DTC=y -BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y -BR2_TARGET_UBOOT_FORMAT_BIN=y -BR2_TARGET_UBOOT_SPL=y -BR2_TARGET_UBOOT_SPL_NAME="u-boot-sunxi-with-spl.bin" -BR2_TARGET_UBOOT_BOOT_SCRIPT=y -BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/olimex/a20_olinuxino/boot-legacy.cmd" - -# Additional tools -BR2_PACKAGE_HOST_GENIMAGE=y From 732066a54ea708501491077e967957d1ebfa01bb Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 6 Mar 2019 16:24:25 +0100 Subject: [PATCH 0234/7482] package/sunxi-mali: remove package The package sunxi-mali-mainline is available for recent kernels. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 9 +++ DEVELOPERS | 1 - package/Config.in | 1 - package/qt5/qt5base/qt5base.mk | 2 +- .../0001-Add-missing-GLchar-definitions.patch | 45 ------------ ...002-linking-of-test-app-needs-libUMP.patch | 18 ----- ...data-types-between-GLES2-gl2.h-and-G.patch | 57 --------------- package/sunxi-mali/Config.in | 59 --------------- package/sunxi-mali/S80mali | 54 -------------- package/sunxi-mali/egl.pc | 12 --- package/sunxi-mali/glesv2.pc | 12 --- package/sunxi-mali/sunxi-mali.hash | 2 - package/sunxi-mali/sunxi-mali.mk | 73 ------------------- 13 files changed, 10 insertions(+), 335 deletions(-) delete mode 100644 package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch delete mode 100644 package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch delete mode 100644 package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch delete mode 100644 package/sunxi-mali/Config.in delete mode 100644 package/sunxi-mali/S80mali delete mode 100644 package/sunxi-mali/egl.pc delete mode 100644 package/sunxi-mali/glesv2.pc delete mode 100644 package/sunxi-mali/sunxi-mali.hash delete mode 100644 package/sunxi-mali/sunxi-mali.mk diff --git a/Config.in.legacy b/Config.in.legacy index 2f99dc8ad2..c094f07584 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,15 @@ endif comment "Legacy options removed in 2019.05" +config BR2_PACKAGE_SUNXI_MALI + bool "sunxi-mali package removed" + select BR2_LEGACY + select BR2_PACKAGE_SUNXI_MALI_MAINLINE + help + The sunxi-mali package was removed, as the + sunxi-mali-mainline package replaces it for mainline + kernels on Allwinner platforms. + config BR2_BINUTILS_VERSION_2_29_X bool "binutils version 2.29 support removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 8a57cb2e23..62ad09950b 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -2029,7 +2029,6 @@ F: package/a10disp/ F: package/glmark2/ F: package/libvpx/ F: package/mesa3d-demos/ -F: package/sunxi-mali/ F: package/ti-gfx/ N: Stefan Sørensen diff --git a/package/Config.in b/package/Config.in index ba961a22b3..b8c57d34eb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -519,7 +519,6 @@ endmenu source "package/statserial/Config.in" source "package/stm32flash/Config.in" source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali/Config.in" source "package/sunxi-mali-mainline/Config.in" source "package/sunxi-mali-mainline-driver/Config.in" source "package/sysstat/Config.in" diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index e7f6e658f1..14536980a8 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -275,7 +275,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) # use vivante backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_viv -else ifeq ($(BR2_PACKAGE_SUNXI_MALI)$(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) +else ifeq ($(BR2_PACKAGE_SUNXI_MALI_MAINLINE),y) # use mali backend QT5BASE_EGLFS_DEVICE = EGLFS_DEVICE_INTEGRATION = eglfs_mali endif diff --git a/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch b/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch deleted file mode 100644 index a9370b009d..0000000000 --- a/package/sunxi-mali/0001-Add-missing-GLchar-definitions.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 058d5e8cd90d117535b5d314fd9e15c70028ff20 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Mon, 21 Apr 2014 19:31:23 +0200 -Subject: [PATCH] Add missing GLchar definitions. - -The GLES and GLES2 header files provided by sunxi-mali do not define the -type "GLchar" and use "char" instead in the prototype of some functions. - -This issue has been reported upstream some time ago, but the pull -request has not been merged yet. (See -https://github.com/linux-sunxi/sunxi-mali/pull/8). - -Signed-off-by: Eric Le Bihan ---- - include/GLES/gl.h | 1 + - include/GLES2/gl2.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/include/GLES/gl.h b/include/GLES/gl.h -index 858f394..a6bb591 100644 ---- a/include/GLES/gl.h -+++ b/include/GLES/gl.h -@@ -29,6 +29,7 @@ typedef float GLfloat; - typedef float GLclampf; - typedef signed int GLfixed; - typedef signed int GLclampx; -+typedef char GLchar; - - typedef int * GLintptr; - typedef int * GLsizeiptr; -diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h -index 59e376c..90d96bb 100644 ---- a/include/GLES2/gl2.h -+++ b/include/GLES2/gl2.h -@@ -32,6 +32,7 @@ typedef unsigned int GLuint; - typedef khronos_float_t GLfloat; - typedef khronos_float_t GLclampf; - typedef khronos_int32_t GLfixed; -+typedef char GLchar; - - /* GL types for handling large vertex buffer objects */ - typedef khronos_intptr_t GLintptr; --- -1.9.0 - diff --git a/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch b/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch deleted file mode 100644 index 1c8f7ee21b..0000000000 --- a/package/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch +++ /dev/null @@ -1,18 +0,0 @@ -linking of test app needs libUMP - -Signed-off-by: Francois Perrad - -diff --git a/test/Makefile b/test/Makefile -index 700416e..92085cb 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -5,7 +5,7 @@ - all: test - - test: ../config.mk test.c -- $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2 -+ $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2 -lUMP - - clean: - rm -f test - diff --git a/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch b/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch deleted file mode 100644 index 62e1b17829..0000000000 --- a/package/sunxi-mali/0003-fix-conflicting-data-types-between-GLES2-gl2.h-and-G.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 5bf4d4f9c759fdb3c0db61a781042223236169c6 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 5 Jun 2017 12:40:16 +0200 -Subject: [PATCH] fix conflicting data types between GLES2/gl2.h and GLES/gl.h - -When OpenGL ES 1.1 and OpenGL ES 2.0 are used at the same time, the -build fail since GLintptr and GLsizeiptr data type are not the same in -GLES2/gl2.h and GLES/gl.h. - -Also sync the data type of GLbyte, GLubyte, GLfloat, GLclampf and -GLfixed. - -Fixes: -http://autobuild.buildroot.net/results/258/25898b45cefde9661d8ac87dd84bc883bb5283d1 - -Signed-off-by: Romain Naour ---- - include/GLES/gl.h | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/include/GLES/gl.h b/include/GLES/gl.h -index a6bb591..799408b 100644 ---- a/include/GLES/gl.h -+++ b/include/GLES/gl.h -@@ -18,22 +18,21 @@ typedef void GLvoid; - typedef unsigned int GLenum; - typedef unsigned char GLboolean; - typedef unsigned int GLbitfield; --typedef signed char GLbyte; -+typedef khronos_int8_t GLbyte; - typedef short GLshort; - typedef int GLint; - typedef int GLsizei; --typedef unsigned char GLubyte; -+typedef khronos_uint8_t GLubyte; - typedef unsigned short GLushort; - typedef unsigned int GLuint; --typedef float GLfloat; --typedef float GLclampf; --typedef signed int GLfixed; -+typedef khronos_float_t GLfloat; -+typedef khronos_float_t GLclampf; -+typedef khronos_int32_t GLfixed; - typedef signed int GLclampx; - typedef char GLchar; - --typedef int * GLintptr; --typedef int * GLsizeiptr; -- -+typedef khronos_intptr_t GLintptr; -+typedef khronos_ssize_t GLsizeiptr; - - /*************************************************************/ - --- -2.9.4 - diff --git a/package/sunxi-mali/Config.in b/package/sunxi-mali/Config.in deleted file mode 100644 index 554ee6845c..0000000000 --- a/package/sunxi-mali/Config.in +++ /dev/null @@ -1,59 +0,0 @@ -config BR2_PACKAGE_SUNXI_MALI - bool "sunxi-mali" - depends on BR2_arm - # libump package only provide libUMP.so.3 which is used by - # libMali for r3p0 and r3p1 Mali kernel module. This version - # is only available for ARM EABIhf. - # libMali for r2p4 Mali kernel module (available for ARM EABI) - # requires libUMP.so.2. - depends on BR2_ARM_EABIHF # libUMP.so.3 only - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_LIBUMP - help - Install the ARM Mali drivers for sunxi based systems (i.e - systems based on ARM Allwinner SoCs). This driver requires - either the sunxi-kernel with the ARM Mali driver enabled or - the installation of the ARM Mali drivers as an external - module. - - http://github.com/linux-sunxi/sunxi-mali - -if BR2_PACKAGE_SUNXI_MALI - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "sunxi-mali" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "sunxi-mali" - -config BR2_PACKAGE_SUNXI_MALI_DBG - bool "install malitest and maliver tools" - help - Install 3D triangle demo malitest application and the - maliver application which describes the kernel module - version. - -choice - prompt "Version" - default BR2_PACKAGE_SUNXI_MALI_R3P0 - help - Select the version of the kernel module. For the - sunxi-kernel, the appropriate version number is r3p0. For - other kernels, use the maliver application to determine the - appropriate version. - -config BR2_PACKAGE_SUNXI_MALI_R3P0 - bool "r3p0" - -config BR2_PACKAGE_SUNXI_MALI_R3P1 - bool "r3p1" - -endchoice - -endif - -comment "sunxi-mali needs an EABIhf glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package/sunxi-mali/S80mali b/package/sunxi-mali/S80mali deleted file mode 100644 index ecfbab97b4..0000000000 --- a/package/sunxi-mali/S80mali +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -e - -install_driver() { - DRIVER=$1 - OPTS=$2 - - modprobe $DRIVER $OPTS - maj=$(awk "\$2==\"${DRIVER}\" { print \$1; }" /proc/devices) - - rm -f /dev/${DRIVER} - - mknod /dev/${DRIVER} c $maj 0 - chmod 600 /dev/${DRIVER} -} - -start() { - echo "mali: starting driver" - - BITSPERPIXEL="$(fbset | awk '/geom/ {print $6}')" - YRES="$(fbset | awk '/geom/ {print $3}')" - # Set RGBA ordering to something the drivers like - if [ "$BITSPERPIXEL" = "32" ] ; then - fbset -rgba 8/16,8/8,8/0,8/24 - fi - # Try to enable triple buffering when there's enough VRAM - fbset -vyres $(( YRES*3 )) - - install_driver mali - install_driver ump -} - -stop() { - echo "mali: stopping driver" - - rmmod ump - rmmod mali -} - -case "$1" in -start) - start -;; -stop) - stop -;; -restart) - stop - start -;; -*) - echo "mali: Please use start, stop, or restart." - exit 1 -;; -esac diff --git a/package/sunxi-mali/egl.pc b/package/sunxi-mali/egl.pc deleted file mode 100644 index 2823209a72..0000000000 --- a/package/sunxi-mali/egl.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr/ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: egl -Description: ARM Mali implementation of EGL -Version: 1.4 -Requires: -Libs: -L${libdir} -lEGL -lGLESv2 -lUMP -Cflags: -I${includedir} - diff --git a/package/sunxi-mali/glesv2.pc b/package/sunxi-mali/glesv2.pc deleted file mode 100644 index 4702d1394c..0000000000 --- a/package/sunxi-mali/glesv2.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: glesv2 -Description: ARM Mali implementation of OpenGL ESv2 -Version: 2.0 -Requires: -Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP -Cflags: -I${includedir} - diff --git a/package/sunxi-mali/sunxi-mali.hash b/package/sunxi-mali/sunxi-mali.hash deleted file mode 100644 index 31b5990de3..0000000000 --- a/package/sunxi-mali/sunxi-mali.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 c5f58b2c0533a74f491634ddbd80d888781f4ea29ecc5c24bd7300c02bef1145 sunxi-mali-d343311efc8db166d8371b28494f0f27b6a5872.tar.gz diff --git a/package/sunxi-mali/sunxi-mali.mk b/package/sunxi-mali/sunxi-mali.mk deleted file mode 100644 index 90b580f5f6..0000000000 --- a/package/sunxi-mali/sunxi-mali.mk +++ /dev/null @@ -1,73 +0,0 @@ -################################################################################ -# -# sunxi-mali -# -################################################################################ - -# last sha1 character dropped to ensure unique filename -SUNXI_MALI_VERSION = d343311efc8db166d8371b28494f0f27b6a5872 -SUNXI_MALI_SITE = https://github.com/linux-sunxi/sunxi-mali -SUNXI_MALI_SITE_METHOD = git - -# Get the sunxi-mali-proprietary libraries -SUNXI_MALI_GIT_SUBMODULES = YES - -SUNXI_MALI_INSTALL_STAGING = YES -SUNXI_MALI_DEPENDENCIES = libump -SUNXI_MALI_PROVIDES = libegl libgles - -# The options below must be provided in the environment. Providing these -# through options overrides the value and prevents the makefiles from -# appending to these variables. This is used throughout the sunxi-mali build -# system. -# -# Furthermore, the -lm -dl -lpthread options are included due to a possible bug -# in the way the linaro 2013.06 toolchain handles shared libraries. -SUNXI_MALI_MAKE_ENV = \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \ - $(TARGET_MAKE_ENV) - -SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer \ - ABI=armhf - -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r3p0 -endif -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P1),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r3p1 -endif - -define SUNXI_MALI_BUILD_CMDS - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) all - $(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/version/version \ - $(@D)/version/version.c -endef - -define SUNXI_MALI_INSTALL_STAGING_CMDS - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) \ - $(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install - # test must be built after install because it depends on headers that are - # generated during the install above. - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) test - $(INSTALL) -D -m 0644 package/sunxi-mali/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/sunxi-mali/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define SUNXI_MALI_INSTALL_TARGET_CMDS - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D)/lib \ - $(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install - $(if $(BR2_PACKAGE_SUNXI_MALI_DBG), - $(INSTALL) -m 755 $(@D)/version/version $(TARGET_DIR)/usr/bin/maliver; \ - $(INSTALL) -m 755 $(@D)/test/test $(TARGET_DIR)/usr/bin/malitest - ) -endef - -define SUNXI_MALI_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/sunxi-mali/S80mali \ - $(TARGET_DIR)/etc/init.d/S80mali -endef - -$(eval $(generic-package)) From b643a75b90d314085e9969e8d6f7d863340e93a3 Mon Sep 17 00:00:00 2001 From: Francois Perrad Date: Wed, 6 Mar 2019 16:24:26 +0100 Subject: [PATCH 0235/7482] package/libump: remove package This library was previously a part of sunxi-mali. Signed-off-by: Francois Perrad Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 7 +++++++ DEVELOPERS | 1 - package/Config.in | 1 - package/libump/Config.in | 13 ------------- package/libump/libump.hash | 2 -- package/libump/libump.mk | 13 ------------- .../xdriver_xf86-video-fbturbo.mk | 4 ---- 7 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 package/libump/Config.in delete mode 100644 package/libump/libump.hash delete mode 100644 package/libump/libump.mk diff --git a/Config.in.legacy b/Config.in.legacy index c094f07584..2030b51e1d 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2019.05" +config BR2_PACKAGE_LIBUMP + bool "libump package removed" + select BR2_LEGACY + help + The libump package was removed, it was only used as a + dependency of sunxi-mali, which itself was removed. + config BR2_PACKAGE_SUNXI_MALI bool "sunxi-mali package removed" select BR2_LEGACY diff --git a/DEVELOPERS b/DEVELOPERS index 62ad09950b..778dffa5d5 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -843,7 +843,6 @@ F: package/ficl/ F: package/gdbm/ F: package/libtomcrypt/ F: package/libtommath/ -F: package/libump/ F: package/libwpe/ F: package/linenoise/ F: package/ljlinenoise/ diff --git a/package/Config.in b/package/Config.in index b8c57d34eb..30391cfc89 100644 --- a/package/Config.in +++ b/package/Config.in @@ -454,7 +454,6 @@ endmenu source "package/kbd/Config.in" source "package/lcdproc/Config.in" source "package/libuio/Config.in" - source "package/libump/Config.in" source "package/linuxconsoletools/Config.in" source "package/linux-backports/Config.in" source "package/lirc-tools/Config.in" diff --git a/package/libump/Config.in b/package/libump/Config.in deleted file mode 100644 index 696ccf3b11..0000000000 --- a/package/libump/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBUMP - bool "libump" - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_arm - help - The ARMs Universal Memory Provider userspace library. - This library is a requirement for ARMs binary Mali driver. - - http://github.com/linux-sunxi/libump - -comment "libump needs a glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/libump/libump.hash b/package/libump/libump.hash deleted file mode 100644 index 5d2ad2eb3e..0000000000 --- a/package/libump/libump.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 745bbb3e6a6b2b1d8caec75d2f2e884691ceefa5c2be0480baed31dba66cf450 libump-ec0680628744f30b8fac35e41a7bd8e23e59c39f.tar.gz diff --git a/package/libump/libump.mk b/package/libump/libump.mk deleted file mode 100644 index 65012ffd13..0000000000 --- a/package/libump/libump.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libump -# -################################################################################ - -LIBUMP_VERSION = ec0680628744f30b8fac35e41a7bd8e23e59c39f -LIBUMP_SITE = $(call github,linux-sunxi,libump,$(LIBUMP_VERSION)) -LIBUMP_LICENSE = Apache-2.0 -LIBUMP_AUTORECONF = YES -LIBUMP_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk index 58a70416dd..049a2b5be1 100644 --- a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk +++ b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk @@ -21,10 +21,6 @@ else XDRIVER_XF86_VIDEO_FBTURBO_CONF_OPTS += --disable-pciaccess endif -ifeq ($(BR2_PACKAGE_LIBUMP),y) -XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libump -endif - define XDRIVER_XF86_VIDEO_FBTURBO_INSTALL_CONF_FILE $(INSTALL) -m 0644 -D $(@D)/xorg.conf $(TARGET_DIR)/etc/X11/xorg.conf endef From a946813dd581ac2e1aea6745edad2bc7ce44e6aa Mon Sep 17 00:00:00 2001 From: Vadim Kochan Date: Fri, 1 Mar 2019 14:33:42 +0200 Subject: [PATCH 0236/7482] utils/test-pkg: generate package config if it is not specified It is possible to generate one-line config for the package just by normalize it to the form: BR2_PACKAGE_${pkg_replaced-to_and_uppercase} it simplifes a bit of testing package where no additional config options are needed. Signed-off-by: Vadim Kochan Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- utils/test-pkg | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/utils/test-pkg b/utils/test-pkg index 1995fa8578..cce4679b04 100755 --- a/utils/test-pkg +++ b/utils/test-pkg @@ -2,12 +2,20 @@ set -e TOOLCHAINS_CSV='support/config-fragments/autobuild/toolchain-configs.csv' +TEMP_CONF="" + +do_clean() { + if [ ! -z "${TEMP_CONF}" ]; then + rm -f "${TEMP_CONF}" + fi +} main() { local o O opts local cfg dir pkg random toolchains_dir toolchain all number mode local ret nb nb_skip nb_fail nb_legal nb_tc build_dir local -a toolchains + local pkg_br_name o='hac:d:n:p:r:t:' O='help,config-snippet:build-dir:package:,random:,toolchains-dir:' @@ -50,8 +58,15 @@ main() { ;; esac done + + trap do_clean INT TERM HUP EXIT + if [ -z "${cfg}" ]; then - printf "error: no config snippet specified\n" >&2; exit 1 + pkg_br_name="${pkg//-/_}" + pkg_br_name="BR2_PACKAGE_${pkg_br_name^^}" + TEMP_CONF=$(mktemp /tmp/test-${pkg}-config.XXXXXX) + echo "${pkg_br_name}=y" > ${TEMP_CONF} + cfg="${TEMP_CONF}" fi if [ ! -e "${cfg}" ]; then printf "error: %s: no such file\n" "${cfg}" >&2; exit 1 From 7ec7ba54055919d89afc93606794d161505fa2d8 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 6 Feb 2019 04:15:26 -0500 Subject: [PATCH 0237/7482] package/binutils: install libiberty for host build Add --enable-install-libiberty to HOST_BINUTILS_CONF_OPTS to allow prelink-cross to build properly. Signed-off-by: Adam Duskett Reviewed-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/binutils/binutils.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 6798356ff2..cfaf0bdeb7 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -84,6 +84,7 @@ HOST_BINUTILS_CONF_OPTS = \ --target=$(GNU_TARGET_NAME) \ --disable-shared \ --enable-static \ + --enable-install-libiberty \ --with-sysroot=$(STAGING_DIR) \ --enable-poison-system-directories \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ From 0bb0f2ba849dac9208d3a5a4107b8edd5ee46a1e Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Wed, 6 Feb 2019 04:15:27 -0500 Subject: [PATCH 0238/7482] package/prelink-cross: new package Prelink-cross emulates a runtime linker for a given sysroot. This is necessary to allow gobject-introspection to build it's typelib files during cross-compiling. Signed-off-by: Adam Duskett Reviewed-by: "Yann E. MORIN" [Thomas: drop Config.in.host file and visible option.] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/prelink-cross/prelink-cross.hash | 3 +++ package/prelink-cross/prelink-cross.mk | 15 +++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 package/prelink-cross/prelink-cross.hash create mode 100644 package/prelink-cross/prelink-cross.mk diff --git a/DEVELOPERS b/DEVELOPERS index 778dffa5d5..cc4044ff2c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -54,6 +54,7 @@ F: package/nginx-naxsi/ F: package/openjdk-bin/ F: package/php/ F: package/policycoreutils/ +F: package/prelink-cross/ F: package/python3/ F: package/python-flask-sqlalchemy/ F: package/python-mutagen/ diff --git a/package/prelink-cross/prelink-cross.hash b/package/prelink-cross/prelink-cross.hash new file mode 100644 index 0000000000..3ac33ac3d0 --- /dev/null +++ b/package/prelink-cross/prelink-cross.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 cb3f5d833cd74b7e90e38465c9c948b0f4138c017509cb91e391b0931063429e prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2.tar.gz +sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/prelink-cross/prelink-cross.mk b/package/prelink-cross/prelink-cross.mk new file mode 100644 index 0000000000..ab7a967f95 --- /dev/null +++ b/package/prelink-cross/prelink-cross.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# host-prelink-cross +# +################################################################################ + +HOST_PRELINK_CROSS_VERSION = a853a5d715d84eec93aa68e8f2df26b7d860f5b2 +HOST_PRELINK_CROSS_SITE = git://git.yoctoproject.org/prelink-cross +HOST_PRELINK_CROSS_SITE_METHOD = git +HOST_PRELINK_CROSS_LICENSE = GPL-2.0 +HOST_PRELINK_CROSS_LICENSE_FILES = COPYING +HOST_PRELINK_CROSS_AUTORECONF = YES +HOST_PRELINK_CROSS_DEPENDENCIES = host-binutils host-elfutils + +$(eval $(host-autotools-package)) From 2edcf77abede09c33024dbf983fac64c30728f5d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 08:58:07 +0100 Subject: [PATCH 0239/7482] package/stella: needs gcc >= 5 std::put_time needs gcc 5.x: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=54354 Fixes: - http://autobuild.buildroot.org/results/cf5bd2f262b108e4b90b6e31e46c5f82b9aef0a0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/stella/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/stella/Config.in b/package/stella/Config.in index 639b9e4ae7..326b3f75eb 100644 --- a/package/stella/Config.in +++ b/package/stella/Config.in @@ -3,7 +3,7 @@ config BR2_PACKAGE_STELLA depends on !BR2_STATIC_LIBS # sdl2 depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # C++14 select BR2_PACKAGE_SDL2 select BR2_PACKAGE_LIBPNG select BR2_PACKAGE_ZLIB @@ -12,7 +12,7 @@ config BR2_PACKAGE_STELLA https://stella-emu.github.io/ -comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 4.9" +comment "stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 5" depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 + !BR2_TOOLCHAIN_GCC_AT_LEAST_5 From 1af9d9dd25b96af77f25c3051f394b8495e07e66 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Sat, 16 Mar 2019 19:01:42 -0700 Subject: [PATCH 0240/7482] package/go: bump to version 1.12.1 Go 1.12 was released on 2/25/2019: https://blog.golang.org/go1.12 Go 1.12.1 was released on 3/14/2019: https://golang.org/doc/devel/release.html#go1.12.minor Additional notes on how Go modules will evolve in 2019 are here: https://blog.golang.org/modules2019 In Go 1.12, module support remains the same as in Go 1.11. GOPATH is scheduled for deprecation in 1.13, however. The Buildroot Go package infrastructure should therefore aim to migrate to a new, currently undefined, Go module friendly compilation approach before Go 1.13 is released. Signed-off-by: Christian Stewart Signed-off-by: Thomas Petazzoni --- package/go/go.hash | 2 +- package/go/go.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/go/go.hash b/package/go/go.hash index 29891399c3..60aa1e1f57 100644 --- a/package/go/go.hash +++ b/package/go/go.hash @@ -1,3 +1,3 @@ # From https://golang.org/dl/ -sha256 bc1ef02bb1668835db1390a2e478dcbccb5dd16911691af9d75184bbe5aa943e go1.11.5.src.tar.gz +sha256 0be127684df4b842a64e58093154f9d15422f1405f1fcff4b2c36ffc6a15818a go1.12.1.src.tar.gz sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 LICENSE diff --git a/package/go/go.mk b/package/go/go.mk index 4daa2fe093..c27f161f48 100644 --- a/package/go/go.mk +++ b/package/go/go.mk @@ -4,7 +4,7 @@ # ################################################################################ -GO_VERSION = 1.11.5 +GO_VERSION = 1.12.1 GO_SITE = https://storage.googleapis.com/golang GO_SOURCE = go$(GO_VERSION).src.tar.gz From 7df834b4f0e9ac7f80df5692cd2a8e6cf9c4f2b2 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 17 Mar 2019 05:54:26 +0200 Subject: [PATCH 0241/7482] package/iw: bump to version 5.0.1 Drop unused GIT_DIR environment. Cc: Matt Weber Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/iw/iw.hash | 2 +- package/iw/iw.mk | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/package/iw/iw.hash b/package/iw/iw.hash index 6423df7732..a85989ece8 100644 --- a/package/iw/iw.hash +++ b/package/iw/iw.hash @@ -1,4 +1,4 @@ # From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 f01671c0074bfdec082a884057edba1b9efd35c89eda554638496f03b769ad89 iw-4.14.tar.xz +sha256 1e38ea794a223525b2ea7fe78fd14f2a56121e62e21ba5f9dbe8c494b35b5c0d iw-5.0.1.tar.xz # Locally calculated sha256 5932fb70481e128940168a5fdf133e6454293c0865c7e757874b235cb6daa2af COPYING diff --git a/package/iw/iw.mk b/package/iw/iw.mk index 8264e8b5dc..8588742111 100644 --- a/package/iw/iw.mk +++ b/package/iw/iw.mk @@ -4,7 +4,7 @@ # ################################################################################ -IW_VERSION = 4.14 +IW_VERSION = 5.0.1 IW_SOURCE = iw-$(IW_VERSION).tar.xz IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw IW_LICENSE = ISC @@ -12,8 +12,7 @@ IW_LICENSE_FILES = COPYING IW_DEPENDENCIES = host-pkgconf libnl IW_MAKE_ENV = \ $(TARGET_MAKE_ENV) \ - PKG_CONFIG="$(HOST_DIR)/bin/pkg-config" \ - GIT_DIR=$(IW_DIR) + PKG_CONFIG="$(HOST_DIR)/bin/pkg-config" define IW_BUILD_CMDS $(IW_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) From c82da04c7ef2eb44b320f2b4863fa3622896d038 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Mar 2019 12:49:43 +0100 Subject: [PATCH 0242/7482] package/python-numpy: bump to version 1.16.2 - Update patches and send them upstream - Update license hash (typos fixed and year updated) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-Don-t-use-fenv.h-on-uClibc.patch | 30 ++++++++++++ .../python-numpy/0001-no-fenv-on-uclibc.patch | 49 ------------------- ...-no-FPU-exceptions-bits-on-ARC-glibc.patch | 31 ++++++++++++ ...-no-FPU-exceptions-bits-on-ARC-glibc.patch | 42 ---------------- package/python-numpy/python-numpy.hash | 6 +-- package/python-numpy/python-numpy.mk | 2 +- 6 files changed, 65 insertions(+), 95 deletions(-) create mode 100644 package/python-numpy/0001-Don-t-use-fenv.h-on-uClibc.patch delete mode 100644 package/python-numpy/0001-no-fenv-on-uclibc.patch create mode 100644 package/python-numpy/0002-FIX-no-FPU-exceptions-bits-on-ARC-glibc.patch delete mode 100644 package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch diff --git a/package/python-numpy/0001-Don-t-use-fenv.h-on-uClibc.patch b/package/python-numpy/0001-Don-t-use-fenv.h-on-uClibc.patch new file mode 100644 index 0000000000..8b3937a1ba --- /dev/null +++ b/package/python-numpy/0001-Don-t-use-fenv.h-on-uClibc.patch @@ -0,0 +1,30 @@ +From 52b47439d17463304e5bd7974dec17ced0b0f24a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 16 Mar 2019 10:38:27 +0100 +Subject: [PATCH] Don't use on uClibc + +Signed-off-by: Thomas Petazzoni +Signed-off-by: Alexey Brodkin +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/numpy/numpy/pull/13137] +--- + numpy/core/src/npymath/ieee754.c.src | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src +index d960838c8..f3f15f841 100644 +--- a/numpy/core/src/npymath/ieee754.c.src ++++ b/numpy/core/src/npymath/ieee754.c.src +@@ -681,7 +681,8 @@ void npy_set_floatstatus_invalid(void) + fp_raise_xcp(FP_INVALID); + } + +-#elif defined(_MSC_VER) || (defined(__osf__) && defined(__alpha)) ++#elif defined(_MSC_VER) || (defined(__osf__) && defined(__alpha)) || \ ++ defined (__UCLIBC__) + + /* + * By using a volatile floating point value, +-- +2.14.1 + diff --git a/package/python-numpy/0001-no-fenv-on-uclibc.patch b/package/python-numpy/0001-no-fenv-on-uclibc.patch deleted file mode 100644 index 5aa377bb21..0000000000 --- a/package/python-numpy/0001-no-fenv-on-uclibc.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 1d309b81a6fdac33dfb5148f618bafe6ebdff958 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 15 Sep 2017 12:51:36 +0300 -Subject: [PATCH] Don't use on uClibc - -The python-numpy code already has provisions to not use when -not available. However, it uses __GLIBC__ to know whether fenv.h is -available or not, but uClibc defines __GLIBC__, so python-numpy thinks -fenv.h is available. - -This patch fixes that by changing all defined(__GLIBC__) occurences by -(defined(__GLIBC__) && !defined(__UCLIBC__)). - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Alexey Brodkin ---- - numpy/core/include/numpy/ufuncobject.h | 2 +- - numpy/core/src/npymath/ieee754.c.src | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h -index d0ac1fd7d732..65e49fcd5b7a 100644 ---- a/numpy/core/include/numpy/ufuncobject.h -+++ b/numpy/core/include/numpy/ufuncobject.h -@@ -319,7 +319,7 @@ typedef struct _loop1d_info { - #if defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || \ - defined(__NetBSD__) || \ -- defined(__GLIBC__) || defined(__APPLE__) || \ -+ (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) || \ - defined(_AIX) || \ -diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src -index 0370ea6c77aa..e63e409b6604 100644 ---- a/numpy/core/src/npymath/ieee754.c.src -+++ b/numpy/core/src/npymath/ieee754.c.src -@@ -612,7 +612,7 @@ void npy_set_floatstatus_invalid(void) - } - - --#elif defined(__GLIBC__) || defined(__APPLE__) || \ -+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - # include --- -2.7.5 - diff --git a/package/python-numpy/0002-FIX-no-FPU-exceptions-bits-on-ARC-glibc.patch b/package/python-numpy/0002-FIX-no-FPU-exceptions-bits-on-ARC-glibc.patch new file mode 100644 index 0000000000..ece52118d7 --- /dev/null +++ b/package/python-numpy/0002-FIX-no-FPU-exceptions-bits-on-ARC-glibc.patch @@ -0,0 +1,31 @@ +From 1125f1ee33324bc91b4e8dd9da49163af572d04a Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 16 Mar 2019 10:48:25 +0100 +Subject: [PATCH] FIX: no FPU exceptions bits on ARC glibc + +The FPU exceptions bits are missing in fenv.h in glibc for ARC +architecture. + +Signed-off-by: Evgeniy Didin +Signed-off-by: Fabrice Fontaine +[Upstream status: https://github.com/numpy/numpy/pull/13137] +--- + numpy/core/src/npymath/ieee754.c.src | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src +index f3f15f841..3f66b24a4 100644 +--- a/numpy/core/src/npymath/ieee754.c.src ++++ b/numpy/core/src/npymath/ieee754.c.src +@@ -682,7 +682,7 @@ void npy_set_floatstatus_invalid(void) + } + + #elif defined(_MSC_VER) || (defined(__osf__) && defined(__alpha)) || \ +- defined (__UCLIBC__) ++ defined (__UCLIBC__) || (defined(__arc__) && defined(__GLIBC__)) + + /* + * By using a volatile floating point value, +-- +2.14.1 + diff --git a/package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch b/package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch deleted file mode 100644 index f2ed4f6f98..0000000000 --- a/package/python-numpy/0003-no-FPU-exceptions-bits-on-ARC-glibc.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ae217b0e77a52f08f46ef66fa88820946984507a Mon Sep 17 00:00:00 2001 -From: Evgeniy Didin -Date: Tue, 6 Feb 2018 15:59:22 +0300 -Subject: [PATCH] FIX: no FPU exceptions bits on ARC glibc - -The FPU exceptions bits are missing in fenv.h in glibc for ARC architecture. - -Signed-off-by: Evgeniy Didin ---- - numpy/core/include/numpy/ufuncobject.h | 2 +- - numpy/core/src/npymath/ieee754.c.src | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/numpy/core/include/numpy/ufuncobject.h b/numpy/core/include/numpy/ufuncobject.h -index 89f72fcea..29e05b179 100644 ---- a/numpy/core/include/numpy/ufuncobject.h -+++ b/numpy/core/include/numpy/ufuncobject.h -@@ -319,7 +319,7 @@ typedef struct _loop1d_info { - #if defined(sun) || defined(__BSD__) || defined(__OpenBSD__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version < 502114)) || \ - defined(__NetBSD__) || \ -- (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ -+ (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__arc__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) || \ - defined(_AIX) || \ -diff --git a/numpy/core/src/npymath/ieee754.c.src b/numpy/core/src/npymath/ieee754.c.src -index 8dc4d77ef..78e646470 100644 ---- a/numpy/core/src/npymath/ieee754.c.src -+++ b/numpy/core/src/npymath/ieee754.c.src -@@ -627,7 +627,7 @@ void npy_set_floatstatus_invalid(void) - } - - --#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ -+#elif (defined(__GLIBC__) && !defined(__UCLIBC__) && !defined(__arc__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - # include --- -2.16.2 - diff --git a/package/python-numpy/python-numpy.hash b/package/python-numpy/python-numpy.hash index 7c7f446118..ef2aa7f16d 100644 --- a/package/python-numpy/python-numpy.hash +++ b/package/python-numpy/python-numpy.hash @@ -1,4 +1,4 @@ -# Copied from https://github.com/numpy/numpy/releases/tag/v1.15.1 -sha256 3c1ccce5d935ef8df16ae0595b459ef08a5cdb05aee195ebc04b9d89a72be7fa numpy-1.15.1.tar.gz +# Copied from https://github.com/numpy/numpy/releases/tag/v1.16.2 +sha256 8088221e6e27da8d5907729f0bfe798f526836f22cc59ae83a0f867e67416a3e numpy-1.16.2.tar.gz # License files, locally calculated -sha256 9e85ee1c3f11444243c9b7667721592a01f1cd90cb28ad937ac99f6241d6b685 LICENSE.txt +sha256 6b5086f61fe0c71564a79304ecbaa60f11fa3f3debf82f73d16a611cab102adc LICENSE.txt diff --git a/package/python-numpy/python-numpy.mk b/package/python-numpy/python-numpy.mk index 26a10c377b..20f42eab69 100644 --- a/package/python-numpy/python-numpy.mk +++ b/package/python-numpy/python-numpy.mk @@ -4,7 +4,7 @@ # ################################################################################ -PYTHON_NUMPY_VERSION = 1.15.1 +PYTHON_NUMPY_VERSION = 1.16.2 PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz PYTHON_NUMPY_SITE = https://github.com/numpy/numpy/releases/download/v$(PYTHON_NUMPY_VERSION) PYTHON_NUMPY_LICENSE = BSD-3-Clause From 75e67c3decef1076e794b727d16a73c03cd83358 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Mar 2019 12:55:03 +0100 Subject: [PATCH 0243/7482] package/arp-scan: bump to version 1.9.5 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/arp-scan/arp-scan.hash | 3 ++- package/arp-scan/arp-scan.mk | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/package/arp-scan/arp-scan.hash b/package/arp-scan/arp-scan.hash index 4b2ddf1816..62f12d3d20 100644 --- a/package/arp-scan/arp-scan.hash +++ b/package/arp-scan/arp-scan.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 ce908ac71c48e85dddf6dd4fe5151d13c7528b1f49717a98b2a2535bd797d892 arp-scan-1.9.tar.gz +sha256 aa9498af84158a315b7e0ea6c2cddfa746660ca3987cbe7e32c0c90f5382d9d2 arp-scan-1.9.5.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING diff --git a/package/arp-scan/arp-scan.mk b/package/arp-scan/arp-scan.mk index b46e941d10..a87fa35151 100644 --- a/package/arp-scan/arp-scan.mk +++ b/package/arp-scan/arp-scan.mk @@ -4,8 +4,8 @@ # ################################################################################ -ARP_SCAN_VERSION = 1.9 -ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION) +ARP_SCAN_VERSION = 1.9.5 +ARP_SCAN_SITE = $(call github,royhills,arp-scan,$(ARP_SCAN_VERSION)) ARP_SCAN_LICENSE = GPL-3.0+ ARP_SCAN_LICENSE_FILES = COPYING ARP_SCAN_DEPENDENCIES = libpcap From d7c2c27fe5e5fdc71ce6fd90c15938dd3a9e6e8d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Mar 2019 13:02:30 +0100 Subject: [PATCH 0244/7482] package/biosdevname: bump to version 0.7.3 - Switch site to github to get latest release - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/biosdevname/Config.in | 2 +- package/biosdevname/biosdevname.hash | 3 ++- package/biosdevname/biosdevname.mk | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/biosdevname/Config.in b/package/biosdevname/Config.in index 704716791a..5cdf54268c 100644 --- a/package/biosdevname/Config.in +++ b/package/biosdevname/Config.in @@ -12,4 +12,4 @@ config BR2_PACKAGE_BIOSDEVNAME system or hardware changes that might otherwise alter the typical ethX naming. - http://linux.dell.com/biosdevname/ + https://github.com/dell/biosdevname/ diff --git a/package/biosdevname/biosdevname.hash b/package/biosdevname/biosdevname.hash index 57946ea085..f4470c32dd 100644 --- a/package/biosdevname/biosdevname.hash +++ b/package/biosdevname/biosdevname.hash @@ -1,2 +1,3 @@ # Locally computed hashes, not provided by upstream -sha256 954575f482ff5de2d49c335b563990859a3eb3506e8fa976f6915eba870d71f6 biosdevname-0.7.2.tar.gz +sha256 3a67fee0c315996bbba586c1c077e57625382d38dc48fb3c9e84d56a7a5effad biosdevname-0.7.3.tar.gz +sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING diff --git a/package/biosdevname/biosdevname.mk b/package/biosdevname/biosdevname.mk index e0de8ef623..6036e24c09 100644 --- a/package/biosdevname/biosdevname.mk +++ b/package/biosdevname/biosdevname.mk @@ -4,8 +4,8 @@ # ################################################################################ -BIOSDEVNAME_VERSION = 0.7.2 -BIOSDEVNAME_SITE = http://linux.dell.com/biosdevname/biosdevname-$(BIOSDEVNAME_VERSION) +BIOSDEVNAME_VERSION = 0.7.3 +BIOSDEVNAME_SITE = $(call github,dell,biosdevname,v$(BIOSDEVNAME_VERSION)) BIOSDEVNAME_LICENSE = GPL BIOSDEVNAME_LICENSE_FILES = COPYING BIOSDEVNAME_CONF_OPTS = --exec-prefix=/ From 260d9e534268083e7aa89e1bdb47bb8f3668a052 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Mar 2019 14:36:48 +0100 Subject: [PATCH 0245/7482] package/cups: security bump to version 2.2.10 - Fixes CVE-2018-4700: Linux session cookies used a predictable random number seed: https://github.com/apple/cups/releases/tag/v2.2.10. - Remove fifth patch (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...05-Fix-builds-without-PAM-Issue-5283.patch | 189 ------------------ package/cups/cups.hash | 2 +- package/cups/cups.mk | 2 +- 3 files changed, 2 insertions(+), 191 deletions(-) delete mode 100644 package/cups/0005-Fix-builds-without-PAM-Issue-5283.patch diff --git a/package/cups/0005-Fix-builds-without-PAM-Issue-5283.patch b/package/cups/0005-Fix-builds-without-PAM-Issue-5283.patch deleted file mode 100644 index ff242f8276..0000000000 --- a/package/cups/0005-Fix-builds-without-PAM-Issue-5283.patch +++ /dev/null @@ -1,189 +0,0 @@ -From 570933a6a3597371bae1beeb754ee8711d6305ab Mon Sep 17 00:00:00 2001 -From: Michael R Sweet -Date: Mon, 2 Apr 2018 20:05:13 -0400 -Subject: [PATCH] Fix builds without PAM (Issue #5283) - -[baruch: drop CHANGES.md hunk] -Signed-off-by: Baruch Siach ---- -Upstream status: commit 570933a6a3 - - CHANGES.md | 8 ++- - scheduler/auth.c | 134 ++--------------------------------------------- - 2 files changed, 11 insertions(+), 131 deletions(-) - -diff --git a/scheduler/auth.c b/scheduler/auth.c -index 8b134b5d7257..fa4e2715de34 100644 ---- a/scheduler/auth.c -+++ b/scheduler/auth.c -@@ -1,8 +1,8 @@ - /* - * Authorization routines for the CUPS scheduler. - * -- * Copyright 2007-2016 by Apple Inc. -- * Copyright 1997-2007 by Easy Software Products, all rights reserved. -+ * Copyright © 2007-2018 by Apple Inc. -+ * Copyright © 1997-2007 by Easy Software Products, all rights reserved. - * - * This file contains Kerberos support code, copyright 2006 by - * Jelmer Vernooij. -@@ -71,9 +71,6 @@ static int check_authref(cupsd_client_t *con, const char *right); - static int compare_locations(cupsd_location_t *a, - cupsd_location_t *b); - static cupsd_authmask_t *copy_authmask(cupsd_authmask_t *am, void *data); --#if !HAVE_LIBPAM --static char *cups_crypt(const char *pw, const char *salt); --#endif /* !HAVE_LIBPAM */ - static void free_authmask(cupsd_authmask_t *am, void *data); - #if HAVE_LIBPAM - static int pam_func(int, const struct pam_message **, -@@ -694,14 +691,14 @@ cupsdAuthorize(cupsd_client_t *con) /* I - Client connection */ - * client... - */ - -- pass = cups_crypt(password, pw->pw_passwd); -+ pass = crypt(password, pw->pw_passwd); - - if (!pass || strcmp(pw->pw_passwd, pass)) - { - # ifdef HAVE_SHADOW_H - if (spw) - { -- pass = cups_crypt(password, spw->sp_pwdp); -+ pass = crypt(password, spw->sp_pwdp); - - if (pass == NULL || strcmp(spw->sp_pwdp, pass)) - { -@@ -1995,129 +1992,6 @@ copy_authmask(cupsd_authmask_t *mask, /* I - Existing auth mask */ - } - - --#if !HAVE_LIBPAM --/* -- * 'cups_crypt()' - Encrypt the password using the DES or MD5 algorithms, -- * as needed. -- */ -- --static char * /* O - Encrypted password */ --cups_crypt(const char *pw, /* I - Password string */ -- const char *salt) /* I - Salt (key) string */ --{ -- if (!strncmp(salt, "$1$", 3)) -- { -- /* -- * Use MD5 passwords without the benefit of PAM; this is for -- * Slackware Linux, and the algorithm was taken from the -- * old shadow-19990827/lib/md5crypt.c source code... :( -- */ -- -- int i; /* Looping var */ -- unsigned long n; /* Output number */ -- int pwlen; /* Length of password string */ -- const char *salt_end; /* End of "salt" data for MD5 */ -- char *ptr; /* Pointer into result string */ -- _cups_md5_state_t state; /* Primary MD5 state info */ -- _cups_md5_state_t state2; /* Secondary MD5 state info */ -- unsigned char digest[16]; /* MD5 digest result */ -- static char result[120]; /* Final password string */ -- -- -- /* -- * Get the salt data between dollar signs, e.g. $1$saltdata$md5. -- * Get a maximum of 8 characters of salt data after $1$... -- */ -- -- for (salt_end = salt + 3; *salt_end && (salt_end - salt) < 11; salt_end ++) -- if (*salt_end == '$') -- break; -- -- /* -- * Compute the MD5 sum we need... -- */ -- -- pwlen = strlen(pw); -- -- _cupsMD5Init(&state); -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state, (unsigned char *)salt, salt_end - salt); -- -- _cupsMD5Init(&state2); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Append(&state2, (unsigned char *)salt + 3, salt_end - salt - 3); -- _cupsMD5Append(&state2, (unsigned char *)pw, pwlen); -- _cupsMD5Finish(&state2, digest); -- -- for (i = pwlen; i > 0; i -= 16) -- _cupsMD5Append(&state, digest, i > 16 ? 16 : i); -- -- for (i = pwlen; i > 0; i >>= 1) -- _cupsMD5Append(&state, (unsigned char *)((i & 1) ? "" : pw), 1); -- -- _cupsMD5Finish(&state, digest); -- -- for (i = 0; i < 1000; i ++) -- { -- _cupsMD5Init(&state); -- -- if (i & 1) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- else -- _cupsMD5Append(&state, digest, 16); -- -- if (i % 3) -- _cupsMD5Append(&state, (unsigned char *)salt + 3, salt_end - salt - 3); -- -- if (i % 7) -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- if (i & 1) -- _cupsMD5Append(&state, digest, 16); -- else -- _cupsMD5Append(&state, (unsigned char *)pw, pwlen); -- -- _cupsMD5Finish(&state, digest); -- } -- -- /* -- * Copy the final sum to the result string and return... -- */ -- -- memcpy(result, salt, (size_t)(salt_end - salt)); -- ptr = result + (salt_end - salt); -- *ptr++ = '$'; -- -- for (i = 0; i < 5; i ++, ptr += 4) -- { -- n = ((((unsigned)digest[i] << 8) | (unsigned)digest[i + 6]) << 8); -- -- if (i < 4) -- n |= (unsigned)digest[i + 12]; -- else -- n |= (unsigned)digest[5]; -- -- to64(ptr, n, 4); -- } -- -- to64(ptr, (unsigned)digest[11], 2); -- ptr += 2; -- *ptr = '\0'; -- -- return (result); -- } -- else -- { -- /* -- * Use the standard crypt() function... -- */ -- -- return (crypt(pw, salt)); -- } --} --#endif /* !HAVE_LIBPAM */ -- -- - /* - * 'free_authmask()' - Free function for auth masks. - */ --- -2.17.0 - diff --git a/package/cups/cups.hash b/package/cups/cups.hash index a19b3b09a6..3d238d61e6 100644 --- a/package/cups/cups.hash +++ b/package/cups/cups.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 3c4b637b737077565ccdfbd5f61785d03f49461ae736fcc2c0ffaf41d2c6ea6a cups-2.2.7-source.tar.gz +sha256 77c8b2b3bb7fe8b5fbfffc307f2c817b2d7ec67b657f261a1dd1c61ab81205bb cups-2.2.10-source.tar.gz sha256 6e0e0ffbde118aae709f7ef65590de9071e8b2cd322f84fd645c6b64f3cc452c LICENSE.txt diff --git a/package/cups/cups.mk b/package/cups/cups.mk index 8f33824879..b91fe7ac4c 100644 --- a/package/cups/cups.mk +++ b/package/cups/cups.mk @@ -4,7 +4,7 @@ # ################################################################################ -CUPS_VERSION = 2.2.7 +CUPS_VERSION = 2.2.10 CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) CUPS_LICENSE = GPL-2.0, LGPL-2.0 From b08d4a9bfb5e597c3a601496517801999fec3dff Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sat, 16 Mar 2019 16:42:38 +0100 Subject: [PATCH 0246/7482] package/libglib2: bump to version 2.56.4 Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/libglib2/libglib2.hash | 4 ++-- package/libglib2/libglib2.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/libglib2/libglib2.hash b/package/libglib2/libglib2.hash index 57403a2154..faa01ef563 100644 --- a/package/libglib2/libglib2.hash +++ b/package/libglib2/libglib2.hash @@ -1,4 +1,4 @@ -# https://download.gnome.org/sources/glib/2.56/glib-2.56.3.sha256sum -sha256 a9a4c5b4c81b6c75bc140bdf5e32120ef3ce841b7413214ecf5f987acec74cb2 glib-2.56.3.tar.xz +# https://download.gnome.org/sources/glib/2.56/glib-2.56.4.sha256sum +sha256 27f703d125efb07f8a743666b580df0b4095c59fc8750e8890132c91d437504c glib-2.56.4.tar.xz # License files, locally calculated sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index f602c371f5..d34bfabd52 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -5,7 +5,7 @@ ################################################################################ LIBGLIB2_VERSION_MAJOR = 2.56 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).3 +LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).4 LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) LIBGLIB2_LICENSE = LGPL-2.1+ From 904750363141935dc6b1143aaa1de21742df474a Mon Sep 17 00:00:00 2001 From: Michel Stempin Date: Sat, 16 Mar 2019 23:37:10 +0100 Subject: [PATCH 0247/7482] package/x11r7/xdriver_xf86-video-fbdev: bump to version 0.5.0 Starting X manually resulted in a symbol error: | Xorg: symbol lookup error: /usr/lib/xorg/modules/drivers/fbdev_drv.so: undefined symbol: shadowUpdatePackedWeak This bug was reported against the fbdev driver, which is fixed upstream in 0.5.0: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900317 Signed-off-by: Michel Stempin Signed-off-by: Thomas Petazzoni --- .../xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash | 2 +- .../x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash index 0f34e5178e..d0cbc09038 100644 --- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash +++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash @@ -1,2 +1,2 @@ # From http://lists.x.org/archives/xorg-announce/2013-September/002324.html -sha256 9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b xf86-video-fbdev-0.4.4.tar.bz2 +sha256 dcc3d85f378022180e437a9ec00a59b6cb7680ff79c40394d695060af2374699 xf86-video-fbdev-0.5.0.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk index f39311e611..a480befdd0 100644 --- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk +++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.4 +XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.5.0 XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_FBDEV_LICENSE = MIT From d13163e976da3fbfe8a4758af0d0e0c6bc38629c Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 16 Mar 2019 10:48:13 +0800 Subject: [PATCH 0248/7482] package/python-aiodns: bump to version 2.0.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aiodns/python-aiodns.hash | 4 ++-- package/python-aiodns/python-aiodns.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiodns/python-aiodns.hash b/package/python-aiodns/python-aiodns.hash index b66693f869..c9511ce776 100644 --- a/package/python-aiodns/python-aiodns.hash +++ b/package/python-aiodns/python-aiodns.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiodns/json -md5 80e0419b49bb4c540b4857ec142219b8 aiodns-1.1.1.tar.gz -sha256 d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea aiodns-1.1.1.tar.gz +md5 3e121f9eb7ef3ba3556ba7ec28c6f63a aiodns-2.0.0.tar.gz +sha256 815fdef4607474295d68da46978a54481dd1e7be153c7d60f9e72773cd38d77d aiodns-2.0.0.tar.gz # Locally computed sha256 checksums sha256 eb0455d35129425ed399883cd710923de3e246a510e2eb84d9f00032d0bbec97 LICENSE diff --git a/package/python-aiodns/python-aiodns.mk b/package/python-aiodns/python-aiodns.mk index 94f719d39e..f02b4b75a3 100644 --- a/package/python-aiodns/python-aiodns.mk +++ b/package/python-aiodns/python-aiodns.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIODNS_VERSION = 1.1.1 +PYTHON_AIODNS_VERSION = 2.0.0 PYTHON_AIODNS_SOURCE = aiodns-$(PYTHON_AIODNS_VERSION).tar.gz -PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/3b/45/dcee156eabca900af3a1bab8acb9531636b13db4b677d44ba468a43969e0 +PYTHON_AIODNS_SITE = https://files.pythonhosted.org/packages/30/2e/b86ce168485b68d40c6a810838669deacf0abf41845c383659c2b613e69f PYTHON_AIODNS_SETUP_TYPE = setuptools PYTHON_AIODNS_LICENSE = MIT PYTHON_AIODNS_LICENSE_FILES = LICENSE From 34c046d528d03dd5b8784716dccabb40189f81de Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 16 Mar 2019 11:12:39 +0800 Subject: [PATCH 0249/7482] package/python-pycares: bump to version 3.0.0 This version drops python 2 support and requires cffi. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-pycares/Config.in | 2 ++ package/python-pycares/python-pycares.hash | 4 ++-- package/python-pycares/python-pycares.mk | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/package/python-pycares/Config.in b/package/python-pycares/Config.in index 4144952d8d..3452ae6b10 100644 --- a/package/python-pycares/Config.in +++ b/package/python-pycares/Config.in @@ -1,5 +1,7 @@ config BR2_PACKAGE_PYTHON_PYCARES bool "python-pycares" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_CFFI # runtime help Python interface for c-ares. diff --git a/package/python-pycares/python-pycares.hash b/package/python-pycares/python-pycares.hash index 2e80a974dc..dfe7ca723d 100644 --- a/package/python-pycares/python-pycares.hash +++ b/package/python-pycares/python-pycares.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/pycares/json -md5 74893b2b380fbb45329a406ae4b1ae89 pycares-2.3.0.tar.gz -sha256 36f4c03df57c41a87eb3d642201684eb5a8bc194f4bafaa9f60ee6dc0aef8e40 pycares-2.3.0.tar.gz +md5 8a53781dd26db01ffe0b3358877bebbd pycares-3.0.0.tar.gz +sha256 b253f5dcaa0ac7076b79388a3ac80dd8f3bd979108f813baade40d3a9b8bf0bd pycares-3.0.0.tar.gz # Locally computed sha256 checksums sha256 427bb3a5372024a26e2c290b24382512bcc7ca123431c4dd178dd613beea7eee LICENSE diff --git a/package/python-pycares/python-pycares.mk b/package/python-pycares/python-pycares.mk index 961c87eaf0..3698ec64f5 100644 --- a/package/python-pycares/python-pycares.mk +++ b/package/python-pycares/python-pycares.mk @@ -4,11 +4,12 @@ # ################################################################################ -PYTHON_PYCARES_VERSION = 2.3.0 +PYTHON_PYCARES_VERSION = 3.0.0 PYTHON_PYCARES_SOURCE = pycares-$(PYTHON_PYCARES_VERSION).tar.gz -PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/89/5c/3a7e1a52d6abb52b9ca1a56d2df699936e89d8b98f75cfd60d03363e7c10 +PYTHON_PYCARES_SITE = https://files.pythonhosted.org/packages/85/de/cd46a73e43e206a6ad1e9cf9cc893c3ed1b21caf57f1e0a8d9a119d290eb PYTHON_PYCARES_SETUP_TYPE = setuptools PYTHON_PYCARES_LICENSE = MIT PYTHON_PYCARES_LICENSE_FILES = LICENSE +PYTHON_PYCARES_DEPENDENCIES = host-python-cffi $(eval $(python-package)) From 98d679f49d9ea93c8af1e8a81adfd5a1adf67ed7 Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Sat, 16 Mar 2019 09:05:20 +0200 Subject: [PATCH 0250/7482] package/uftp: new package Encrypted UDP based FTP with multicast. Signed-off-by: Asaf Kahlon Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/uftp/Config.in | 7 +++++++ package/uftp/uftp.hash | 3 +++ package/uftp/uftp.mk | 21 +++++++++++++++++++++ 5 files changed, 33 insertions(+) create mode 100644 package/uftp/Config.in create mode 100644 package/uftp/uftp.hash create mode 100644 package/uftp/uftp.mk diff --git a/DEVELOPERS b/DEVELOPERS index cc4044ff2c..a188b075fe 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -219,6 +219,7 @@ F: package/stress/ N: Asaf Kahlon F: package/libuv/ F: package/python* +F: package/uftp/ F: package/zeromq/ N: Ash Charles diff --git a/package/Config.in b/package/Config.in index 30391cfc89..bc855060c9 100644 --- a/package/Config.in +++ b/package/Config.in @@ -2029,6 +2029,7 @@ endif source "package/tunctl/Config.in" source "package/tvheadend/Config.in" source "package/udpcast/Config.in" + source "package/uftp/Config.in" source "package/uhttpd/Config.in" source "package/ulogd/Config.in" source "package/ushare/Config.in" diff --git a/package/uftp/Config.in b/package/uftp/Config.in new file mode 100644 index 0000000000..b6a8961628 --- /dev/null +++ b/package/uftp/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_UFTP + bool "uftp" + select BR2_PACKAGE_OPENSSL + help + Encrypted UDP based FTP with multicast. + + http://uftp-multicast.sourceforge.net/ diff --git a/package/uftp/uftp.hash b/package/uftp/uftp.hash new file mode 100644 index 0000000000..57016f2081 --- /dev/null +++ b/package/uftp/uftp.hash @@ -0,0 +1,3 @@ +# Locally computed sha256 +sha256 c04bc75a88fc3d57504269f260be4d0b1bc440508b5a5ca587df6c16b771aa48 uftp-4.9.9.tar.gz +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.txt diff --git a/package/uftp/uftp.mk b/package/uftp/uftp.mk new file mode 100644 index 0000000000..bbc362652b --- /dev/null +++ b/package/uftp/uftp.mk @@ -0,0 +1,21 @@ +################################################################################ +# +# uftp +# +################################################################################ + +UFTP_VERSION = 4.9.9 +UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar +UFTP_DEPENDENCIES = openssl +UFTP_LICENSE = GPL-3.0+ +UFTP_LICENSE_FILES = LICENSE.txt + +define UFTP_BUILD_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) +endef + +define UFTP_INSTALL_TARGET_CMDS + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install +endef + +$(eval $(generic-package)) From b6b9d15a24633307579cdcfffaea7c5a5df683c1 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sat, 16 Mar 2019 20:25:39 +0100 Subject: [PATCH 0251/7482] package/feh: bump to version 3.1.3 Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- package/feh/feh.hash | 2 +- package/feh/feh.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/feh/feh.hash b/package/feh/feh.hash index cb554858bf..02a88fbda9 100644 --- a/package/feh/feh.hash +++ b/package/feh/feh.hash @@ -1,3 +1,3 @@ # Locally calculated after checking pgp signature -sha256 6ec338f80c3f4c30d715f44780f1a09ebfbb99e92a1bb43316428744a839f383 feh-2.27.1.tar.bz2 +sha256 9fe840fbc6ce66dcf1e99296c90eb6fc44a4c2fad9a1069dfc7e0fad88eb56ef feh-3.1.3.tar.bz2 sha256 a289176a74d8e5d071456df5d4ee629aeb86f8eeeb6570076fe126f182c6b91d COPYING diff --git a/package/feh/feh.mk b/package/feh/feh.mk index 3bfd427e79..ac79a7da64 100644 --- a/package/feh/feh.mk +++ b/package/feh/feh.mk @@ -4,7 +4,7 @@ # ################################################################################ -FEH_VERSION = 2.27.1 +FEH_VERSION = 3.1.3 FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 FEH_SITE = http://feh.finalrewind.org FEH_DEPENDENCIES = imlib2 libpng xlib_libXt From c444e6c617f05c87f3b9bc20d2c516379d53f277 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sat, 16 Mar 2019 20:32:31 +0100 Subject: [PATCH 0252/7482] package/modem-manager: bump to version 1.10.0 Drop upstream patch (included in this release). Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...erneldevice-fix-build-with-musl-libc.patch | 67 ------------------- package/modem-manager/modem-manager.hash | 2 +- package/modem-manager/modem-manager.mk | 2 +- 3 files changed, 2 insertions(+), 69 deletions(-) delete mode 100644 package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch diff --git a/package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch b/package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch deleted file mode 100644 index 68181cb5ed..0000000000 --- a/package/modem-manager/0001-kerneldevice-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,67 +0,0 @@ -From ed40ac76b125b1c3b2e2f8522d283b073c23bd3b Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 15 Jun 2018 06:25:46 +0300 -Subject: [PATCH] kerneldevice: fix build with musl libc - -musl libc does not implement the canonicalize_file_name() GNU extension. -Use the POSIX standard realpath() instead. - -Signed-off-by: Baruch Siach ---- -Upstream status: sent to modemmanager-devel@lists.freedesktop.org - - src/kerneldevice/mm-kernel-device-generic.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/kerneldevice/mm-kernel-device-generic.c b/src/kerneldevice/mm-kernel-device-generic.c -index 6b0f072402ff..885bef171f5d 100644 ---- a/src/kerneldevice/mm-kernel-device-generic.c -+++ b/src/kerneldevice/mm-kernel-device-generic.c -@@ -120,7 +120,7 @@ preload_sysfs_path (MMKernelDeviceGeneric *self) - mm_kernel_event_properties_get_subsystem (self->priv->properties), - mm_kernel_event_properties_get_name (self->priv->properties)); - -- self->priv->sysfs_path = canonicalize_file_name (tmp); -+ self->priv->sysfs_path = realpath (tmp, NULL); - if (!self->priv->sysfs_path || !g_file_test (self->priv->sysfs_path, G_FILE_TEST_EXISTS)) { - mm_warn ("Invalid sysfs path read for %s/%s", - mm_kernel_event_properties_get_subsystem (self->priv->properties), -@@ -163,7 +163,7 @@ preload_interface_sysfs_path (MMKernelDeviceGeneric *self) - * The correct parent dir we want to have is the first one with "usb" subsystem. - */ - aux = g_strdup_printf ("%s/device", self->priv->sysfs_path); -- dirpath = canonicalize_file_name (aux); -+ dirpath = realpath (aux, NULL); - g_free (aux); - - while (dirpath) { -@@ -179,7 +179,7 @@ preload_interface_sysfs_path (MMKernelDeviceGeneric *self) - gchar *canonicalized_subsystem; - gchar *subsystem_name; - -- canonicalized_subsystem = canonicalize_file_name (subsystem_filepath); -+ canonicalized_subsystem = realpath (subsystem_filepath, NULL); - g_free (subsystem_filepath); - - subsystem_name = g_path_get_basename (canonicalized_subsystem); -@@ -239,7 +239,7 @@ preload_driver (MMKernelDeviceGeneric *self) - gchar *tmp2; - - tmp = g_strdup_printf ("%s/driver", self->priv->interface_sysfs_path); -- tmp2 = canonicalize_file_name (tmp); -+ tmp2 = realpath (tmp, NULL); - if (tmp2 && g_file_test (tmp2, G_FILE_TEST_EXISTS)) - self->priv->driver = g_path_get_basename (tmp2); - g_free (tmp2); -@@ -308,7 +308,7 @@ preload_physdev_subsystem (MMKernelDeviceGeneric *self) - gchar *subsyspath; - - aux = g_strdup_printf ("%s/subsystem", self->priv->physdev_sysfs_path); -- subsyspath = canonicalize_file_name (aux); -+ subsyspath = realpath (aux, NULL); - self->priv->physdev_subsystem = g_path_get_dirname (subsyspath); - g_free (subsyspath); - g_free (aux); --- -2.17.1 - diff --git a/package/modem-manager/modem-manager.hash b/package/modem-manager/modem-manager.hash index 77a8c2dc43..404ae7929f 100644 --- a/package/modem-manager/modem-manager.hash +++ b/package/modem-manager/modem-manager.hash @@ -1,4 +1,4 @@ # Locally computed -sha256 18abe34421aa3b52ff47d4ba93aa282f8f8944717dd644a5c0c81eeeac9c7eb1 ModemManager-1.8.0.tar.xz +sha256 fd0f39996025dac96995daea8a58ec7dd571582f7563a8ae0d5f65b571b76ee2 ModemManager-1.10.0.tar.xz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB diff --git a/package/modem-manager/modem-manager.mk b/package/modem-manager/modem-manager.mk index e2f89d9de1..aa27dc9ce5 100644 --- a/package/modem-manager/modem-manager.mk +++ b/package/modem-manager/modem-manager.mk @@ -4,7 +4,7 @@ # ################################################################################ -MODEM_MANAGER_VERSION = 1.8.0 +MODEM_MANAGER_VERSION = 1.10.0 MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager MODEM_MANAGER_LICENSE = GPL-2.0+ (programs, plugins), LGPL-2.0+ (libmm-glib) From 0a34650cb1bb83be5a40f6f31f66dc93a54c2c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Krause?= Date: Sat, 16 Mar 2019 20:57:52 +0100 Subject: [PATCH 0253/7482] package/bluez-alsa: bump to version 1.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also: * License file has been renamed: LICENSE.txt -> LICENSE * Update license file hash -> List of contributors are in a seperate file now * Configure option `--with-alsadatadir` has been renamed to `--with-alsaconfdir` * Configure option `--enable-pcm-test` has been removed * New optional configure option `ofono` (no build dependency, will disable internal HFP in favor of oFonos HFP profile) Signed-off-by: Jörg Krause Signed-off-by: Thomas Petazzoni --- package/bluez-alsa/bluez-alsa.hash | 4 ++-- package/bluez-alsa/bluez-alsa.mk | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/package/bluez-alsa/bluez-alsa.hash b/package/bluez-alsa/bluez-alsa.hash index ba81eadf34..384428f880 100644 --- a/package/bluez-alsa/bluez-alsa.hash +++ b/package/bluez-alsa/bluez-alsa.hash @@ -1,3 +1,3 @@ # Locally calculated: -sha256 29dad23877d0cf46a16e2f8d3746219e89068c33d052059caf1caaacd8b40cac bluez-alsa-v1.3.1.tar.gz -sha256 9a18d8b11802d0cec100839a0676a6fc48a4179f8f70b8e12a7f3d6b7a8fd70a LICENSE.txt +sha256 6287ae6135795a78470068ef9d9ea660d556cefc409905bd9211fda04d1e1f8e bluez-alsa-v1.4.0.tar.gz +sha256 45fe8648faa0e735d4aaf60c32ddd37fc7f027d34ccedcf0f69d8aa961b63b25 LICENSE diff --git a/package/bluez-alsa/bluez-alsa.mk b/package/bluez-alsa/bluez-alsa.mk index 5c0bb4f12b..c1806aef8b 100644 --- a/package/bluez-alsa/bluez-alsa.mk +++ b/package/bluez-alsa/bluez-alsa.mk @@ -4,10 +4,10 @@ # ################################################################################ -BLUEZ_ALSA_VERSION = v1.3.1 +BLUEZ_ALSA_VERSION = v1.4.0 BLUEZ_ALSA_SITE = $(call github,Arkq,bluez-alsa,$(BLUEZ_ALSA_VERSION)) BLUEZ_ALSA_LICENSE = MIT -BLUEZ_ALSA_LICENSE_FILES = LICENSE.txt +BLUEZ_ALSA_LICENSE_FILES = LICENSE BLUEZ_ALSA_DEPENDENCIES = alsa-lib bluez5_utils libglib2 sbc host-pkgconf # git repo, no configure @@ -22,9 +22,8 @@ BLUEZ_ALSA_POST_PATCH_HOOKS += BLUEZ_ALSA_MKDIR_M4 BLUEZ_ALSA_CONF_OPTS = \ --enable-aplay \ --disable-debug-time \ - --disable-pcm-test \ --with-alsaplugindir=/usr/lib/alsa-lib \ - --with-alsadatadir=/usr/share/alsa + --with-alsaconfdir=/usr/share/alsa ifeq ($(BR2_PACKAGE_FDK_AAC),y) BLUEZ_ALSA_DEPENDENCIES += fdk-aac @@ -33,6 +32,13 @@ else BLUEZ_ALSA_CONF_OPTS += --disable-aac endif +# no build dependency, disables internal HFP in favor of oFonos HFP profile +ifeq ($(BR2_PACKAGE_OFONO),y) +BLUEZ_ALSA_CONF_OPTS += --enable-ofono +else +BLUEZ_ALSA_CONF_OPTS += --disable-ofono +endif + ifeq ($(BR2_PACKAGE_BLUEZ_ALSA_HCITOP),y) BLUEZ_ALSA_DEPENDENCIES += libbsd ncurses BLUEZ_ALSA_CONF_OPTS += --enable-hcitop From 38b0aabea070e9e0d48ae28f25f38b472e5f617d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Mar 2019 19:25:24 +0100 Subject: [PATCH 0254/7482] package/xapp_xfd: add optional xlib_libxkbfile dependency Fixes: - http://autobuild.buildroot.org/results/6a487750c0f08f1a87ae4e30e139e5a1a6004b81 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/x11r7/xapp_xfd/xapp_xfd.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/x11r7/xapp_xfd/xapp_xfd.mk b/package/x11r7/xapp_xfd/xapp_xfd.mk index 84b4a77770..8bea7a2fa7 100644 --- a/package/x11r7/xapp_xfd/xapp_xfd.mk +++ b/package/x11r7/xapp_xfd/xapp_xfd.mk @@ -12,4 +12,11 @@ XAPP_XFD_LICENSE_FILES = COPYING XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft XAPP_XFD_CONF_OPTS = --with-appdefaultdir=/usr/share/X11/app-defaults +ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) +XAPP_XFD_CONF_OPTS += --with-xkb +XAPP_XFD_DEPENDENCIES += xlib_libxkbfile +else +XAPP_XFD_CONF_OPTS += --without-xkb +endif + $(eval $(autotools-package)) From e40c4eddc08ee79cc28b06ff5b1f5780cb1d863e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 16 Mar 2019 19:31:15 +0100 Subject: [PATCH 0255/7482] package/xvkbd: bump to version 3.9 - Add COPYING to license files as README does not contain the full GPL text - Add hash for license files Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/xvkbd/xvkbd.hash | 4 +++- package/xvkbd/xvkbd.mk | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/xvkbd/xvkbd.hash b/package/xvkbd/xvkbd.hash index 18148e5e09..402d3179ab 100644 --- a/package/xvkbd/xvkbd.hash +++ b/package/xvkbd/xvkbd.hash @@ -1,2 +1,4 @@ # Locally calculated -sha256 895f768269820e7c0379b0daac3687bda0c670d192ebb7e61e5613a5939ec90b xvkbd-3.7.tar.gz +sha256 b81c37ddfb7b78993dad15d304f8fd78e540d57c0a72f7e3316fd45fba919a9d xvkbd-3.9.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 7f72a6f6e9a183efe65fb22c77f41bf076582f8a375881129461f50652af61e4 README diff --git a/package/xvkbd/xvkbd.mk b/package/xvkbd/xvkbd.mk index 132d7e1f0c..4c2befe962 100644 --- a/package/xvkbd/xvkbd.mk +++ b/package/xvkbd/xvkbd.mk @@ -4,10 +4,10 @@ # ################################################################################ -XVKBD_VERSION = 3.7 +XVKBD_VERSION = 3.9 XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd XVKBD_LICENSE = GPL-2.0+ -XVKBD_LICENSE_FILES = README +XVKBD_LICENSE_FILES = COPYING README # Passing USRLIBDIR ensures that the stupid Makefile doesn't add # /usr/lib to the library search path. From 02f436d2d5eaf5491484fdec226832a3955833b2 Mon Sep 17 00:00:00 2001 From: Petr Vorel Date: Sat, 16 Mar 2019 18:40:36 +0100 Subject: [PATCH 0256/7482] package/network-manager: bump to version 1.14.6 Drop upstream patch (included in this release). Signed-off-by: Petr Vorel Signed-off-by: Thomas Petazzoni --- ...we-have-enough-space-for-the-DHCP6-o.patch | 38 ------------------- package/network-manager/network-manager.hash | 4 +- package/network-manager/network-manager.mk | 4 +- 3 files changed, 4 insertions(+), 42 deletions(-) delete mode 100644 package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch diff --git a/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch b/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch deleted file mode 100644 index c6066abe28..0000000000 --- a/package/network-manager/0001-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 01ca2053bbea09f35b958c8cc7631e15469acb79 Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Fri, 19 Oct 2018 12:12:33 +0200 -Subject: dhcp6: make sure we have enough space for the DHCP6 option header - -Fixes a vulnerability originally discovered by Felix Wilhelm from -Google. - -CVE-2018-15688 -LP: #1795921 -https://bugzilla.redhat.com/show_bug.cgi?id=1639067 - -(cherry picked from commit 4dac5eaba4e419b29c97da38a8b1f82336c2c892) - -Patch downloaded from upstream commit: -https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=01ca2053bbea09f35b958c8cc7631e15469acb79 - -Signed-off-by: Bernd Kuhls ---- - src/systemd/src/libsystemd-network/dhcp6-option.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/systemd/src/libsystemd-network/dhcp6-option.c b/src/systemd/src/libsystemd-network/dhcp6-option.c -index d178fe2..9027c14 100644 ---- a/src/systemd/src/libsystemd-network/dhcp6-option.c -+++ b/src/systemd/src/libsystemd-network/dhcp6-option.c -@@ -108,7 +108,7 @@ int dhcp6_option_append_ia(uint8_t **buf, size_t *buflen, const DHCP6IA *ia) { - return -EINVAL; - } - -- if (*buflen < len) -+ if (*buflen < offsetof(DHCP6Option, data) + len) - return -ENOBUFS; - - ia_hdr = *buf; --- -cgit v1.1 - diff --git a/package/network-manager/network-manager.hash b/package/network-manager/network-manager.hash index 3439439175..7c64e6505e 100644 --- a/package/network-manager/network-manager.hash +++ b/package/network-manager/network-manager.hash @@ -1,5 +1,5 @@ -# From https://download.gnome.org/sources/NetworkManager/1.10/NetworkManager-1.10.8.sha256sum -sha256 eb4ac8ce75fed5ec804f409caec7b54342d4e01512baf7d7fc119fd40ac8a938 NetworkManager-1.10.8.tar.xz +# From http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.14/NetworkManager-1.14.6.sha256sum +sha256 693bcdad15eec7f07a06cbc6e43ddb3b1c13b2d2d23ec165fbb5adf4c3323a5d NetworkManager-1.14.6.tar.xz # Locally computed sha256 49d9659a4f9a09747c320d51d3cf9dfde210de67b70862acf849890f6477b00d COPYING sha256 3a2968e3abb4fea464cd8dc1146d71996f9544af91a5f687bc4f3a2932df49b4 libnm-util/COPYING diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 2b9f68a030..721533038c 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -4,8 +4,8 @@ # ################################################################################ -NETWORK_MANAGER_VERSION_MAJOR = 1.10 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).8 +NETWORK_MANAGER_VERSION_MAJOR = 1.14 +NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).6 NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) NETWORK_MANAGER_INSTALL_STAGING = YES From 4a04886a6423b78e8adf72bb6c22a50c8ed45459 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 16 Mar 2019 06:26:36 +0800 Subject: [PATCH 0257/7482] package/gnu-efi: fix gnu-efi in projects using -nostdinc This fixes the problem with undeclared intptr_t type for builds not including stdint.h, without breaking builds using -nostdinc. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- ...roblem-with-undeclared-intptr_t-type.patch | 114 ++++++++++++++++++ .../0001-efilink-fix-build-with-gcc-4.8.patch | 35 ------ 2 files changed, 114 insertions(+), 35 deletions(-) create mode 100644 package/gnu-efi/0001-Fix-for-problem-with-undeclared-intptr_t-type.patch delete mode 100644 package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch diff --git a/package/gnu-efi/0001-Fix-for-problem-with-undeclared-intptr_t-type.patch b/package/gnu-efi/0001-Fix-for-problem-with-undeclared-intptr_t-type.patch new file mode 100644 index 0000000000..1d1b1f94b4 --- /dev/null +++ b/package/gnu-efi/0001-Fix-for-problem-with-undeclared-intptr_t-type.patch @@ -0,0 +1,114 @@ +From 1a53d8f88a452847b25f9689f9a08dbcf82c86e4 Mon Sep 17 00:00:00 2001 +From: Esben Haabendal +Date: Fri, 15 Mar 2019 11:57:51 +0100 +Subject: [PATCH] Fix for problem with undeclared intptr_t type + +When building gnu-efi with old compilers with pre C90 compilers: + +In file included from gnu-efi-3.0.9/lib/../inc/efilib.h:25:0, + from gnu-efi-3.0.9/lib/lib.h:24, + from gnu-efi-3.0.9/lib/dpath.c:25: +gnu-efi-3.0.9/lib/dpath.c: In function 'FileDevicePath': +gnu-efi-3.0.9/lib/../inc/efilink.h:145:47: error: 'intptr_t' undeclared (first use in this function) + #define EFI_FIELD_OFFSET(TYPE,Field) ((UINTN)(intptr_t)(&(((TYPE *) 0)->Field))) + +Problem introduced with commit a46a62b12b58139c31d4288384808365c4053bf2 +(Fix some types gcc doesn't like). + +Avoid this by adding intptr_t (and uintptr_t) typedefs for builds that does +not include stdint.h. + +Signed-off-by: Esben Haabendal +Signed-off-by: James Hilliard +[Upstream status: +https://sourceforge.net/p/gnu-efi/code/merge-requests/5] +--- + inc/aarch64/efibind.h | 2 ++ + inc/arm/efibind.h | 2 ++ + inc/ia32/efibind.h | 2 ++ + inc/ia64/efibind.h | 2 ++ + inc/mips64el/efibind.h | 2 ++ + inc/x86_64/efibind.h | 2 ++ + 6 files changed, 12 insertions(+) + +diff --git a/inc/aarch64/efibind.h b/inc/aarch64/efibind.h +index bdaa523..3c8cf96 100644 +--- a/inc/aarch64/efibind.h ++++ b/inc/aarch64/efibind.h +@@ -27,6 +27,8 @@ typedef unsigned short uint16_t; + typedef short int16_t; + typedef unsigned char uint8_t; + typedef signed char int8_t; // unqualified 'char' is unsigned on ARM ++typedef uint64_t uintptr_t; ++typedef int64_t intptr_t; + + #else + #include +diff --git a/inc/arm/efibind.h b/inc/arm/efibind.h +index 40a5a9c..7a22b9c 100644 +--- a/inc/arm/efibind.h ++++ b/inc/arm/efibind.h +@@ -27,6 +27,8 @@ typedef unsigned short uint16_t; + typedef short int16_t; + typedef unsigned char uint8_t; + typedef signed char int8_t; // unqualified 'char' is unsigned on ARM ++typedef uint32_t uintptr_t; ++typedef int32_t intptr_t; + + #else + #include +diff --git a/inc/ia32/efibind.h b/inc/ia32/efibind.h +index 1b11f10..dd01385 100644 +--- a/inc/ia32/efibind.h ++++ b/inc/ia32/efibind.h +@@ -75,6 +75,8 @@ Revision History + typedef unsigned char uint8_t; + typedef char int8_t; + #endif ++ typedef uint32_t uintptr_t; ++ typedef int32_t intptr_t; + #elif defined(__GNUC__) + #include + #endif +diff --git a/inc/ia64/efibind.h b/inc/ia64/efibind.h +index b415461..b9b2e62 100644 +--- a/inc/ia64/efibind.h ++++ b/inc/ia64/efibind.h +@@ -62,6 +62,8 @@ Revision History + typedef unsigned char uint8_t; + typedef char int8_t; + #endif ++ typedef uint64_t uintptr_t; ++ typedef int64_t intptr_t; + #elif defined(__GNUC__) + #include + #endif +diff --git a/inc/mips64el/efibind.h b/inc/mips64el/efibind.h +index 4adbca3..32241e5 100644 +--- a/inc/mips64el/efibind.h ++++ b/inc/mips64el/efibind.h +@@ -29,6 +29,8 @@ typedef unsigned short uint16_t; + typedef short int16_t; + typedef unsigned char uint8_t; + typedef signed char int8_t; // unqualified 'char' is unsigned on ARM ++typedef uint64_t uintptr_t; ++typedef int64_t intptr_t; + + #else + #include +diff --git a/inc/x86_64/efibind.h b/inc/x86_64/efibind.h +index 4309f9f..ae40595 100644 +--- a/inc/x86_64/efibind.h ++++ b/inc/x86_64/efibind.h +@@ -84,6 +84,8 @@ Revision History + typedef unsigned char uint8_t; + typedef char int8_t; + #endif ++ typedef uint64_t uintptr_t; ++ typedef int64_t intptr_t; + #elif defined(__GNUC__) + #include + #endif +-- +2.17.1 + diff --git a/package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch b/package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch deleted file mode 100644 index 57c78c9bd4..0000000000 --- a/package/gnu-efi/0001-efilink-fix-build-with-gcc-4.8.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6335e5c697c57d8b5854b8202de3733bcb151ca6 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 18 Jan 2019 22:05:37 +0100 -Subject: [PATCH] efilink: fix build with gcc 4.8 - -intptr_t is undefined without an include on stdint.h - -Fixes: - - http://autobuild.buildroot.org/results/a0ca37b5ed27af445344e3ac49dc87bb17512c50 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://sourceforge.net/p/gnu-efi/code/merge-requests/3] ---- - inc/efilink.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/inc/efilink.h b/inc/efilink.h -index cc5aa2d..b69a6fd 100644 ---- a/inc/efilink.h -+++ b/inc/efilink.h -@@ -1,6 +1,10 @@ - #ifndef _EFI_LINK_H - #define _EFI_LINK_H - -+#if defined(__GNUC__) -+#include -+#endif -+ - /*++ - - Copyright (c) 1998 Intel Corporation --- -2.14.1 - From 6f28ce5322259b563c8a0f1056c38aab2d9ad8a2 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Sat, 16 Mar 2019 06:26:37 +0800 Subject: [PATCH 0258/7482] package/systemd: enable building of systemd-boot systemd-boot is the integration of gummiboot into systemd, when gummiboot is no longer maintained [0]. Add an option to build systemd-boot as part of the systemd build. Install the boot files, that can serve as a template for the user to tweak for their system. [0] https://cgit.freedesktop.org/gummiboot/commit/?id=55df1539c9d330732e88bd196afee386db6e4a1d Signed-off-by: James Hilliard [yann.morin.1998@free.fr: - add missing depends on i386 || x86_64 - add missing dependency to gnu-efi - add missing boot files ] Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- package/systemd/Config.in | 28 +++++++++++++++++++ package/systemd/boot-files/buildroot.conf | 3 +++ package/systemd/boot-files/loader.conf | 2 ++ package/systemd/systemd.mk | 33 +++++++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 package/systemd/boot-files/buildroot.conf create mode 100644 package/systemd/boot-files/loader.conf diff --git a/package/systemd/Config.in b/package/systemd/Config.in index 490222f376..63d9ea52e3 100644 --- a/package/systemd/Config.in +++ b/package/systemd/Config.in @@ -78,6 +78,34 @@ if BR2_PACKAGE_SYSTEMD config BR2_PACKAGE_PROVIDES_UDEV default "systemd" +config BR2_PACKAGE_SYSTEMD_BOOT + bool "systemd-boot" + depends on BR2_i386 || BR2_x86_64 + select BR2_PACKAGE_GNU_EFI + help + systemd-boot is a simple UEFI boot manager which executes + configured EFI images. The default entry is selected by a + configured pattern (glob) or an on-screen menu. + + systemd-boot operates on the EFI System Partition (ESP) + only. Configuration file fragments, kernels, initrds, other + EFI images need to reside on the ESP. Linux kernels need to + be built with CONFIG_EFI_STUB to be able to be directly + executed as an EFI image. + + See the Grub2 help text for details on preparing an EFI + capable disk image using systemd-boot: the instructions are + exactly the same, except that the systemd-boot configuration + files will be located in /loader/ inside the EFI partition. + + https://www.freedesktop.org/wiki/Software/systemd/systemd-boot/ + +config BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH + string + default "ia32" if BR2_i386 + default "x64" if BR2_x86_64 + depends on BR2_PACKAGE_SYSTEMD_BOOT + config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY bool "HTTP server for journal events" select BR2_PACKAGE_LIBMICROHTTPD diff --git a/package/systemd/boot-files/buildroot.conf b/package/systemd/boot-files/buildroot.conf new file mode 100644 index 0000000000..16d4d85f4a --- /dev/null +++ b/package/systemd/boot-files/buildroot.conf @@ -0,0 +1,3 @@ +title Buildroot +linux /bzImage +options root=/dev/sda2 rootwait console=tty1 diff --git a/package/systemd/boot-files/loader.conf b/package/systemd/boot-files/loader.conf new file mode 100644 index 0000000000..93b77b8f93 --- /dev/null +++ b/package/systemd/boot-files/loader.conf @@ -0,0 +1,2 @@ +timeout 3 +default buildroot diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 928e2dc1b6..5389b7ae3a 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -26,6 +26,7 @@ SYSTEMD_CONF_OPTS += \ -Dima=false \ -Defi=false \ -Dgnu-efi=false \ + -Dlibcryptsetup=false \ -Dldconfig=false \ -Ddefault-dnssec=no \ -Dtests=false \ @@ -352,6 +353,34 @@ else SYSTEMD_CONF_OPTS += -Dhibernate=false endif +ifeq ($(BR2_PACKAGE_SYSTEMD_BOOT),y) +SYSTEMD_INSTALL_IMAGES = YES +SYSTEMD_DEPENDENCIES += gnu-efi +SYSTEMD_CONF_OPTS += \ + -Defi=true \ + -Dgnu-efi=true \ + -Defi-cc=$(TARGET_CC) \ + -Defi-ld=$(TARGET_LD) \ + -Defi-libdir=$(STAGING_DIR)/usr/lib \ + -Defi-ldsdir=$(STAGING_DIR)/usr/lib \ + -Defi-includedir=$(STAGING_DIR)/usr/include/efi + +SYSTEMD_BOOT_EFI_ARCH = $(call qstrip,$(BR2_PACKAGE_SYSTEMD_BOOT_EFI_ARCH)) +define SYSTEMD_INSTALL_BOOT_FILES + $(INSTALL) -D -m 0644 $(@D)/build/src/boot/efi/systemd-boot$(SYSTEMD_BOOT_EFI_ARCH).efi \ + $(BINARIES_DIR)/efi-part/EFI/BOOT/boot$(SYSTEMD_BOOT_EFI_ARCH).efi + echo "boot$(SYSTEMD_BOOT_EFI_ARCH).efi" > \ + $(BINARIES_DIR)/efi-part/startup.nsh + $(INSTALL) -D -m 0644 $(SYSTEMD_PKGDIR)/boot-files/loader.conf \ + $(BINARIES_DIR)/efi-part/loader/loader.conf + $(INSTALL) -D -m 0644 $(SYSTEMD_PKGDIR)/boot-files/buildroot.conf \ + $(BINARIES_DIR)/efi-part/loader/entries/buildroot.conf +endef + +else +SYSTEMD_CONF_OPTS += -Defi=false -Dgnu-efi=false +endif # BR2_PACKAGE_SYSTEMD_BOOT == y + SYSTEMD_FALLBACK_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) ifneq ($(SYSTEMD_FALLBACK_HOSTNAME),) SYSTEMD_CONF_OPTS += -Dfallback-hostname=$(SYSTEMD_FALLBACK_HOSTNAME) @@ -376,6 +405,10 @@ SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ SYSTEMD_INSTALL_MACHINEID_HOOK \ SYSTEMD_INSTALL_RESOLVCONF_HOOK +define SYSTEMD_INSTALL_IMAGES_CMDS + $(SYSTEMD_INSTALL_BOOT_FILES) +endef + define SYSTEMD_USERS - - input -1 * - - - Input device group - - systemd-journal -1 * - - - Journal From 5366b8f734fe7aff7e95c1f92627265c5a75becc Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 15 Mar 2019 16:52:31 -0400 Subject: [PATCH 0259/7482] package/openjdk: new package OpenJDK is a free and open-source implementation of the Java Platform. This package provides the option to build a client or a server JVM interpreter. The default option is the server option, as that is what the majority of users use. This JVM interpreter loads more slowly, putting more effort into JIT compilations to yield higher performance. Unlike most autotools packages, OpenJDK is exceptionally different and has many quirks, some of which are below: - X11, alsa, and cups are required to build Java, even if it's a headless build. See http://hg.openjdk.java.net/jdk10/jdk10/raw-file/tip/common/doc/building.html#external-library-requirements for more information. - host-zip is needed for the zip executable. - There is no autogen.sh file, instead, a user must call "./configure autogen." - OpenJDK ignores some variables unless passed via the environment. These variables are: PATH, LD, CC, CXX, and CPP. - OpenJDK defaults ld to the ld binary but passes -Xlinker and -z as arguments during the linking process, which causes linking failures. To fix this issue, ld is set to gcc. - Make -jn is unsupported. Instead, one must use the "--with-jobs=" configure option, and use $(MAKE1). Signed-off-by: Adam Duskett [Thomas: - drop explanations about CC, LD, CXX, etc. be set to their "actual binaries" instead of ccache: TARGET_CC/TARGET_LD/TARGET_CXX point to the compiler wrapper, so the usage of ccache is hidden - make sure at least one of the variants is enabled in Config.in - drop the submenu for variant selection - use system zlib instead of the bundled one. This works fine when BUILD_SYSROOT_CFLAGS and BUILD_SYSROOT_LDFLAGS are passed - fix minor nits in the Config.in comments] Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/openjdk/Config.in | 60 +++++++++++++++++++ package/openjdk/openjdk.hash | 3 + package/openjdk/openjdk.mk | 113 +++++++++++++++++++++++++++++++++++ 5 files changed, 178 insertions(+) create mode 100644 package/openjdk/Config.in create mode 100644 package/openjdk/openjdk.hash create mode 100644 package/openjdk/openjdk.mk diff --git a/DEVELOPERS b/DEVELOPERS index a188b075fe..4412c4512e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -51,6 +51,7 @@ F: package/libsemanage/ F: package/libsepol/ F: package/libwebsockets/ F: package/nginx-naxsi/ +F: package/openjdk/ F: package/openjdk-bin/ F: package/php/ F: package/policycoreutils/ diff --git a/package/Config.in b/package/Config.in index bc855060c9..6891004660 100644 --- a/package/Config.in +++ b/package/Config.in @@ -667,6 +667,7 @@ menu "Mono libraries/modules" endmenu endif source "package/nodejs/Config.in" + source "package/openjdk/Config.in" source "package/perl/Config.in" if BR2_PACKAGE_PERL menu "Perl libraries/modules" diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in new file mode 100644 index 0000000000..96eef79eb0 --- /dev/null +++ b/package/openjdk/Config.in @@ -0,0 +1,60 @@ +config BR2_PACKAGE_HOST_OPENJDK_BIN_ARCH_SUPPORTS + bool + default y if BR2_HOSTARCH = "x86_64" + +config BR2_PACKAGE_OPENJDK + bool "openjdk" + depends on !BR2_SOFT_FLOAT + depends on !BR2_STATIC_LIBS # glibc + depends on BR2_INSTALL_LIBSTDCPP # cups + depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib, cups, libusb + depends on BR2_TOOLCHAIN_USES_GLIBC + depends on BR2_USE_MMU # cups + depends on BR2_PACKAGE_XORG7 + select BR2_PACKAGE_ALSA_LIB + select BR2_PACKAGE_CUPS + select BR2_PACKAGE_FONTCONFIG + select BR2_PACKAGE_GIFLIB + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LCMS2 + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBUSB + select BR2_PACKAGE_XLIB_LIBXRENDER + select BR2_PACKAGE_XLIB_LIBXT + select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_ZLIB + # make sure at least one variant is enabled + select BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER \ + if !BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT + help + OpenJDK is a free and open-source implementation of the + Java Platform. + + http://openjdk.java.net/ + +if BR2_PACKAGE_OPENJDK + +config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT + bool "build client variant" + help + Quick loading, but slower run-time performance. + +config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER + bool "build server variant" + help + Slower loading, but faster run-time performance. + +endif + +comment "openjdk needs X.Org" + depends on BR2_USE_MMU + depends on !BR2_PACKAGE_XORG7 + +comment "openjdk needs glibc, and a toolchain w/ wchar, dynamic library, threads, C++" + depends on BR2_USE_MMU + depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ + !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC + +comment "openjdk does not support soft float configurations" + depends on BR2_USE_MMU + depends on BR2_SOFT_FLOAT diff --git a/package/openjdk/openjdk.hash b/package/openjdk/openjdk.hash new file mode 100644 index 0000000000..8b14609066 --- /dev/null +++ b/package/openjdk/openjdk.hash @@ -0,0 +1,3 @@ +# Locally computed +sha256 6c69a2c1b5177659d4263545cf83e0fbcd697669b0107481372be3648af7b89b openjdk-jdk-11.0.2+9.tar.gz +sha256 4b9abebc4338048a7c2dc184e9f800deb349366bdf28eb23c2677a77b4c87726 LICENSE diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk new file mode 100644 index 0000000000..2730d014d8 --- /dev/null +++ b/package/openjdk/openjdk.mk @@ -0,0 +1,113 @@ +################################################################################ +# +# openjdk +# +################################################################################ + +OPENJDK_VERSION_MAJOR = 11.0.2 +OPENJDK_VERSION_MINOR = 9 +OPENJDK_VERSION = jdk-$(OPENJDK_VERSION_MAJOR)+$(OPENJDK_VERSION_MINOR) +OPENJDK_SITE = $(call github,AdoptOpenJDK,openjdk-jdk11u,$(OPENJDK_VERSION)) +OPENJDK_LICENSE = GPL-2.0+ with exception +OPENJDK_LICENSE_FILES = LICENSE + +# OpenJDK requires Alsa, cups, and X11 even for a headless build. +# host-zip is needed for the zip executable. +OPENJDK_DEPENDENCIES = \ + host-openjdk-bin \ + host-pkgconf \ + host-zip \ + host-zlib \ + alsa-lib \ + cups \ + fontconfig \ + giflib \ + jpeg \ + lcms2 \ + libpng \ + libusb \ + xlib_libXrender \ + xlib_libXt \ + xlib_libXtst \ + zlib + +# JVM variants +ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT),y) +OPENJDK_JVM_VARIANTS += client +endif + +ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER),y) +OPENJDK_JVM_VARIANTS += server +endif +OPENJDK_JVM_VARIANT_LIST = $(subst $(space),$(comma),$(OPENJDK_JVM_VARIANTS)) + +# OpenJDK ignores some variables unless passed via the environment. +# These variables are PATH, LD, CC, CXX, and CPP. +# OpenJDK defaults ld to the ld binary but passes -Xlinker and -z as +# arguments during the linking process, which causes compilation failures. +# To fix this issue, LD is set to point to gcc. +OPENJDK_CONF_ENV = \ + PATH=$(BR_PATH) \ + CC=$(TARGET_CC) \ + CPP=$(TARGET_CPP) \ + CXX=$(TARGET_CXX) \ + LD=$(TARGET_CC) \ + BUILD_SYSROOT_CFLAGS="$(HOST_CFLAGS)" \ + BUILD_SYSROOT_LDFLAGS="$(HOST_LDFLAGS)" + +OPENJDK_CONF_OPTS = \ + --disable-full-docs \ + --disable-hotspot-gtest \ + --disable-manpages \ + --disable-warnings-as-errors \ + --enable-headless-only \ + --enable-openjdk-only \ + --enable-unlimited-crypto \ + --openjdk-target=$(GNU_TARGET_NAME) \ + --with-boot-jdk=$(HOST_DIR) \ + --with-debug-level=release \ + --with-devkit=$(HOST_DIR) \ + --with-extra-cflags="$(TARGET_CFLAGS)" \ + --with-extra-cxxflags="$(TARGET_CXXFLAGS)" \ + --with-giflib=system \ + --with-jobs=$(PARALLEL_JOBS) \ + --with-jvm-variants=$(OPENJDK_JVM_VARIANT_LIST) \ + --with-lcms=system \ + --with-libjpeg=system \ + --with-libpng=system \ + --with-zlib=system \ + --with-native-debug-symbols=none \ + --without-version-pre \ + --with-sysroot=$(STAGING_DIR) \ + --with-vendor-name="AdoptOpenJDK" \ + --with-vendor-url="https://adoptopenjdk.net/" \ + --with-vendor-version-string="AdoptOpenJDK" \ + --with-version-build="$(OPENJDK_VERSION_MAJOR)" \ + --with-version-string="$(OPENJDK_VERSION_MAJOR)" + +ifeq ($(BR2_CCACHE),y) +OPENJDK_CONF_OPTS += \ + --enable-ccache \ + --with-ccache-dir=$(BR2_CCACHE_DIR) +endif + +# Autogen and configure are performed in a single step. +define OPENJDK_CONFIGURE_CMDS + chmod +x $(@D)/configure + cd $(@D); $(OPENJDK_CONF_ENV) ./configure autogen $(OPENJDK_CONF_OPTS) +endef + +# Make -jn is unsupported. Instead, set the "--with-jobs=" configure option, +# and use $(MAKE1). +define OPENJDK_BUILD_CMDS + $(MAKE1) -C $(@D) legacy-jre-image +endef + +# Calling make install always builds and installs the JDK instead of the JRE, +# which makes manual installation necessary. +define OPENJDK_INSTALL_TARGET_CMDS + cp -dpfr $(@D)/build/linux-*-release/images/jre/bin/* $(TARGET_DIR)/usr/bin/ + cp -dpfr $(@D)/build/linux-*-release/images/jre/lib/* $(TARGET_DIR)/usr/lib/ +endef + +$(eval $(generic-package)) From 3641d98ec422607592a452b9e076bf34be1f98b1 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 15 Mar 2019 16:52:32 -0400 Subject: [PATCH 0260/7482] package/openjdk: use AArch64 optimizations Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/openjdk/openjdk.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index 2730d014d8..cf98dd73e1 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -85,6 +85,11 @@ OPENJDK_CONF_OPTS = \ --with-version-build="$(OPENJDK_VERSION_MAJOR)" \ --with-version-string="$(OPENJDK_VERSION_MAJOR)" +# If building for AArch64, use the provided CPU port. +ifeq ($(BR2_aarch64),y) +OPENJDK_CONF_OPTS += --with-cpu-port=aarch64 --with-abi-profile=aarch64 +endif + ifeq ($(BR2_CCACHE),y) OPENJDK_CONF_OPTS += \ --enable-ccache \ From df7bf8fb4124ae7de1f002dc03154279bfec660a Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Fri, 15 Mar 2019 16:52:33 -0400 Subject: [PATCH 0261/7482] support/testing/tests/package/test_openjdk: new test This test is a simple "Hello, World" integration test of the OpenJDK package. It compiles the Java app on the host, then runs it on an emulated AARCH64 target and verifies "Hello, World" is printed. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 2 + .../package/br2-external/openjdk/Config.in | 1 + .../br2-external/openjdk/external.desc | 1 + .../package/br2-external/openjdk/external.mk | 1 + .../package/openjdk-hello-world/Config.in | 5 +++ .../openjdk-hello-world/HelloWorld.java | 7 ++++ .../openjdk-hello-world.mk | 18 ++++++++ support/testing/tests/package/test_openjdk.py | 42 +++++++++++++++++++ 9 files changed, 78 insertions(+) create mode 100644 support/testing/tests/package/br2-external/openjdk/Config.in create mode 100644 support/testing/tests/package/br2-external/openjdk/external.desc create mode 100644 support/testing/tests/package/br2-external/openjdk/external.mk create mode 100644 support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in create mode 100644 support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java create mode 100644 support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk create mode 100644 support/testing/tests/package/test_openjdk.py diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 28feeef2ef..2dc489ff76 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -327,6 +327,7 @@ tests.package.test_ipython.TestIPythonPy2: { extends: .runtime_test } tests.package.test_ipython.TestIPythonPy3: { extends: .runtime_test } tests.package.test_lua.TestLua: { extends: .runtime_test } tests.package.test_lua.TestLuajit: { extends: .runtime_test } +tests.package.test_openjdk.TestOpenJdk: { extends: .runtime_test } tests.package.test_perl.TestPerl: { extends: .runtime_test } tests.package.test_perl_class_load.TestPerlClassLoad: { extends: .runtime_test } tests.package.test_perl_dbd_mysql.TestPerlDBDmysql: { extends: .runtime_test } diff --git a/DEVELOPERS b/DEVELOPERS index 4412c4512e..2da50e0299 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1501,6 +1501,8 @@ F: package/valijson/ F: package/wpa_supplicant/ F: package/wireless_tools/ F: package/xen/ +F: support/testing/tests/package/br2-external/openjdk/ +F: support/testing/tests/package/test_openjdk.py N: Mauro Condarelli F: package/mc/ diff --git a/support/testing/tests/package/br2-external/openjdk/Config.in b/support/testing/tests/package/br2-external/openjdk/Config.in new file mode 100644 index 0000000000..00c7fd4799 --- /dev/null +++ b/support/testing/tests/package/br2-external/openjdk/Config.in @@ -0,0 +1 @@ +source "$BR2_EXTERNAL_OPENJDK_PATH/package/openjdk-hello-world/Config.in" diff --git a/support/testing/tests/package/br2-external/openjdk/external.desc b/support/testing/tests/package/br2-external/openjdk/external.desc new file mode 100644 index 0000000000..f28ba5060c --- /dev/null +++ b/support/testing/tests/package/br2-external/openjdk/external.desc @@ -0,0 +1 @@ +name: OPENJDK diff --git a/support/testing/tests/package/br2-external/openjdk/external.mk b/support/testing/tests/package/br2-external/openjdk/external.mk new file mode 100644 index 0000000000..54c24e8c64 --- /dev/null +++ b/support/testing/tests/package/br2-external/openjdk/external.mk @@ -0,0 +1 @@ +include $(sort $(wildcard $(BR2_EXTERNAL_OPENJDK_PATH)/package/*/*.mk)) diff --git a/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in b/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in new file mode 100644 index 0000000000..c37346a486 --- /dev/null +++ b/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/Config.in @@ -0,0 +1,5 @@ +config BR2_PACKAGE_OPENJDK_HELLO_WORLD + bool "openjdk hello world" + depends on BR2_PACKAGE_OPENJDK + help + Simple class for testing openjdk diff --git a/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java b/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java new file mode 100644 index 0000000000..37489e44c3 --- /dev/null +++ b/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/HelloWorld.java @@ -0,0 +1,7 @@ +public class HelloWorld +{ + public static void main(String[] args) + { + System.out.println("Hello, World"); + } +} diff --git a/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk b/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk new file mode 100644 index 0000000000..998117b8e2 --- /dev/null +++ b/support/testing/tests/package/br2-external/openjdk/package/openjdk-hello-world/openjdk-hello-world.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# openjdk hello world +# +################################################################################ + +OPENJDK_HELLO_WORLD_DEPENDENCIES = openjdk + +define OPENJDK_HELLO_WORLD_BUILD_CMDS + $(INSTALL) -D $(OPENJDK_HELLO_WORLD_PKGDIR)/HelloWorld.java $(@D)/HelloWorld.java + $(HOST_DIR)/bin/javac $(@D)/HelloWorld.java +endef + +define OPENJDK_HELLO_WORLD_INSTALL_TARGET_CMDS + $(INSTALL) -D -m 755 $(@D)/HelloWorld.class $(TARGET_DIR)/usr/bin/HelloWorld.class +endef + +$(eval $(generic-package)) diff --git a/support/testing/tests/package/test_openjdk.py b/support/testing/tests/package/test_openjdk.py new file mode 100644 index 0000000000..5fbb500fbd --- /dev/null +++ b/support/testing/tests/package/test_openjdk.py @@ -0,0 +1,42 @@ +import os + +import infra.basetest + + +class TestOpenJdk(infra.basetest.BRTest): + br2_external = [infra.filepath("tests/package/br2-external/openjdk")] + config = \ + """ + BR2_aarch64=y + BR2_TOOLCHAIN_EXTERNAL=y + BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0" + BR2_LINUX_KERNEL=y + BR2_LINUX_KERNEL_CUSTOM_VERSION=y + BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.7" + BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y + BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/aarch64-virt/linux.config" + BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y + BR2_TARGET_ROOTFS_CPIO=y + BR2_TARGET_ROOTFS_CPIO_GZIP=y + BR2_PACKAGE_XORG7=y + BR2_PACKAGE_OPENJDK=y + BR2_PACKAGE_OPENJDK_HELLO_WORLD=y + """ + + def login(self): + img = os.path.join(self.builddir, "images", "rootfs.cpio.gz") + kern = os.path.join(self.builddir, "images", "Image") + self.emulator.boot(arch="aarch64", + kernel=kern, + kernel_cmdline=["console=ttyAMA0"], + options=["-M", "virt", "-cpu", "cortex-a57", "-m", "512M", "-initrd", img]) + self.emulator.login() + + def test_run(self): + self.login() + + cmd = "java -cp /usr/bin HelloWorld" + output, exit_code = self.emulator.run(cmd, 120) + print(output) + self.assertEqual(exit_code, 0) + self.assertEqual(output, ["Hello, World"]) From aab752e727a3aa4639635e43686562e8d90510b7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 17 Mar 2019 14:03:33 +0100 Subject: [PATCH 0262/7482] package/xenomai: drop empty line at end of .hash file Fixes the following check-package warning: package/xenomai/xenomai.hash:3: empty line at end of file Signed-off-by: Thomas Petazzoni --- package/xenomai/xenomai.hash | 1 - 1 file changed, 1 deletion(-) diff --git a/package/xenomai/xenomai.hash b/package/xenomai/xenomai.hash index e275b7424a..cd518e20e9 100644 --- a/package/xenomai/xenomai.hash +++ b/package/xenomai/xenomai.hash @@ -1,3 +1,2 @@ # Locally computed; sha256 c373261ddb8280d9d7078cdd9cd9646dfb7d70d8cd3aa9693d9148f03990d711 xenomai-3.0.8.tar.bz2 - From 2ff6ee09473c4b7e2992c71023d92ad04bd6da7d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 17 Mar 2019 14:07:32 +0100 Subject: [PATCH 0263/7482] package/systemd: drop optiopns that are now conditional Commit 6f28ce53222 (package/systemd: enable building of systemd-boot) made the efi and gnu-efi optiona conditional upon whether systemd-boot is built or not, but forgot to remove the non-conditional ones. Signed-off-by: "Yann E. MORIN" Cc: James Hilliard Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- package/systemd/systemd.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index 5389b7ae3a..edc4a9ecc1 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -24,8 +24,6 @@ SYSTEMD_CONF_OPTS += \ -Dblkid=true \ -Dman=false \ -Dima=false \ - -Defi=false \ - -Dgnu-efi=false \ -Dlibcryptsetup=false \ -Dldconfig=false \ -Ddefault-dnssec=no \ From a54194f35c5c65d1e73491f9f75aaaee905e3d15 Mon Sep 17 00:00:00 2001 From: Matt Weber Date: Tue, 26 Feb 2019 11:36:45 -0600 Subject: [PATCH 0264/7482] package/openjdk: support zero hotspot variant The OpenJDK package supports a non-assembler variant of the hotspot virtual machine. This allows archtectures which don't have hard-coded support (which provides better performance) to still build a virtual machine that can execute JAVA. Signed-off-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- package/openjdk/Config.in | 14 +++++++++++++- package/openjdk/openjdk.mk | 5 ++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/package/openjdk/Config.in b/package/openjdk/Config.in index 96eef79eb0..dd1f3c59cf 100644 --- a/package/openjdk/Config.in +++ b/package/openjdk/Config.in @@ -25,7 +25,8 @@ config BR2_PACKAGE_OPENJDK select BR2_PACKAGE_ZLIB # make sure at least one variant is enabled select BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER \ - if !BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT + if !BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT && !BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO && !BR2_powerpc + select BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO if BR2_powerpc help OpenJDK is a free and open-source implementation of the Java Platform. @@ -36,14 +37,25 @@ if BR2_PACKAGE_OPENJDK config BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT bool "build client variant" + depends on !BR2_powerpc help Quick loading, but slower run-time performance. config BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER bool "build server variant" + depends on !BR2_powerpc help Slower loading, but faster run-time performance. +config BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO + bool "build zero variant" + select BR2_PACKAGE_LIBFFI + help + A non-assembler variant with wide arch support, however + performance is less then client/server. + + http://openjdk.java.net/projects/zero + endif comment "openjdk needs X.Org" diff --git a/package/openjdk/openjdk.mk b/package/openjdk/openjdk.mk index cf98dd73e1..602e26b34b 100644 --- a/package/openjdk/openjdk.mk +++ b/package/openjdk/openjdk.mk @@ -35,10 +35,13 @@ OPENJDK_DEPENDENCIES = \ ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_CLIENT),y) OPENJDK_JVM_VARIANTS += client endif - ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_SERVER),y) OPENJDK_JVM_VARIANTS += server endif +ifeq ($(BR2_PACKAGE_OPENJDK_JVM_VARIANT_ZERO),y) +OPENJDK_JVM_VARIANTS += zero +OPENJDK_DEPENDENCIES += libffi +endif OPENJDK_JVM_VARIANT_LIST = $(subst $(space),$(comma),$(OPENJDK_JVM_VARIANTS)) # OpenJDK ignores some variables unless passed via the environment. From 1e414fbe9b9193da566d2af71537a14e9fcae869 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 3 Mar 2019 11:16:29 +0100 Subject: [PATCH 0265/7482] support/graph-depends: make sure mandatory deps are displayed The current graph-depends implementation filters out a number of "mandatory" dependencies that all packages have: dependency on "toolchain" and dependency on "skeleton". Despite this filtering, in full graph dependencies, "toolchain" and "skeleton" are still shown, because they are target packages, and therefore appear in the result of "make show-targets". Thanks to this, they will be visible as dependencies of the "ALL" node, which is the root of the dependency tree. However, as we are going to introduce host-skeleton as a "mandatory dependency" to be filtered out, this is no longer going to work. This commit adjusts the remove_extra_deps() function to ensure that when a mandatory dependency is removed, this dependency exists between the root of the dependency tree and the mandatory dependency. This issue was noticed by Yann E. Morin, and this commit provides a different implementation than what Yann proposed in https://patchwork.ozlabs.org/patch/910453/. Signed-off-by: Thomas Petazzoni [yann.morin.1998@free.fr: - list mandatory deps before removing them - fix flake8 warnings ] Signed-off-by: "Yann E. MORIN" Signed-off-by: Thomas Petazzoni --- support/scripts/graph-depends | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index d2b100f385..5a6f6930e9 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -181,6 +181,12 @@ def remove_mandatory_deps(pkg, deps): return [p for p in deps[pkg] if p not in MANDATORY_DEPS] +# This function returns all dependencies of pkg that are part of the +# mandatory dependencies: +def get_mandatory_deps(pkg, deps): + return [p for p in deps[pkg] if p in MANDATORY_DEPS] + + # This function will check that there is no loop in the dependency chain # As a side effect, it builds up the dependency cache. def check_circular_deps(deps): @@ -213,6 +219,9 @@ def check_circular_deps(deps): def remove_extra_deps(deps, rootpkg, transitive): for pkg in list(deps.keys()): if not pkg == rootpkg: + for d in get_mandatory_deps(pkg, deps): + if d not in deps[rootpkg]: + deps[rootpkg].append(d) deps[pkg] = remove_mandatory_deps(pkg, deps) for pkg in list(deps.keys()): if not transitive or pkg == rootpkg: From 66cf4201f92082162a7be6e58f5e11368e226ae3 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Mar 2019 11:16:30 +0100 Subject: [PATCH 0266/7482] support/graph-depends: add option to exclude mandatory deps Some times, multiple dependency graphs for a set of packages (mostly the application-level packages for the project) are included in reports (e.g. delivery notes). Repeating the mandatory dependencies on all those graphs is useless and clutters the important dependencies. When we had only two such mandatory dependencies (toolchain, skeleton), it was manageable to list them as manual exclusions: -x toolchain -x skeleton But we now have quite a few such dependencies, and it becomes a bit more cumbersome to manage, not counting the ones we may add in the future. Add an option to exclude all those mandatory dependencies, to generate neat graphs. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/scripts/graph-depends | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 5a6f6930e9..5c5de7dd0b 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -311,6 +311,8 @@ def parse_args(): "'host' to stop on host packages.") parser.add_argument("--exclude", "-x", metavar="PACKAGE", dest="exclude_list", action="append", help="Like --stop-on, but do not add PACKAGE to the graph.") + parser.add_argument("--exclude-mandatory", "-X", action="store_true", + help="Like if -x was passed for all mandatory dependencies.") parser.add_argument("--colors", "-c", metavar="COLOR_LIST", dest="colors", default="lightblue,grey,gainsboro", help="Comma-separated list of the three colors to use" + @@ -364,6 +366,9 @@ def main(): else: exclude_list = args.exclude_list + if args.exclude_mandatory: + exclude_list += MANDATORY_DEPS + if args.direct: get_depends_func = brpkgutil.get_depends arrow_dir = "forward" From 946d34b52da7e1b148ebf20cab6faf76c6acceea Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Mar 2019 11:16:31 +0100 Subject: [PATCH 0267/7482] support/graph-depends: also cut on host-skeleton host-skeleton is a dependency of almost all packages, except a very few. As such, it clutters the dependency graph uselessly. Do with it as we do for the skeleton: cut the dependency chains. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/scripts/graph-depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 5c5de7dd0b..c3e5d83ee8 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -172,7 +172,7 @@ def remove_transitive_deps(pkg, deps): # List of dependencies that all/many packages have, and that we want # to trim when generating the dependency graph. -MANDATORY_DEPS = ['toolchain', 'skeleton'] +MANDATORY_DEPS = ['toolchain', 'skeleton', 'host-skeleton'] # This function removes the dependency on some 'mandatory' package, like the From 3311aa8cf4ee5935a50990e02c609606e160219d Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Mar 2019 11:16:32 +0100 Subject: [PATCH 0268/7482] support/graph-depends: also cut on host-tar When host-tar is needed, it is a mandatory dependency of all packages. As such, drawing the dependency lines toward host-tar would uselessly clutter the graph. So, like for the skeleton and host-skeleton, we cut the dependency chains toward host-tar. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/scripts/graph-depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index c3e5d83ee8..3143c61cc4 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -172,7 +172,7 @@ def remove_transitive_deps(pkg, deps): # List of dependencies that all/many packages have, and that we want # to trim when generating the dependency graph. -MANDATORY_DEPS = ['toolchain', 'skeleton', 'host-skeleton'] +MANDATORY_DEPS = ['toolchain', 'skeleton', 'host-skeleton', 'host-tar'] # This function removes the dependency on some 'mandatory' package, like the From 132aa296f9f6661095c57464973052a09db178c0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Mar 2019 11:16:33 +0100 Subject: [PATCH 0269/7482] support/graph-depends: also cut on host-gzip When host-gzip is needed, it is a mandatory dependency of all packages. As such, drawing the dependency lines toward host-gzip would uselessly clutter the graph. So, like for the skeleton, host-skeleton, and host-tar, we cut the dependency chains toward host-gzip. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Signed-off-by: Thomas Petazzoni --- support/scripts/graph-depends | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/support/scripts/graph-depends b/support/scripts/graph-depends index 3143c61cc4..29134c8237 100755 --- a/support/scripts/graph-depends +++ b/support/scripts/graph-depends @@ -172,7 +172,7 @@ def remove_transitive_deps(pkg, deps): # List of dependencies that all/many packages have, and that we want # to trim when generating the dependency graph. -MANDATORY_DEPS = ['toolchain', 'skeleton', 'host-skeleton', 'host-tar'] +MANDATORY_DEPS = ['toolchain', 'skeleton', 'host-skeleton', 'host-tar', 'host-gzip'] # This function removes the dependency on some 'mandatory' package, like the From 29aeb02aa07ff04b25298404b5289d0972ad990e Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Mar 2019 11:16:34 +0100 Subject: [PATCH 0270/7482] infra/pkg-generic: use pure Makefile-based recursive dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Calling to the graph-depends script is very costly, as it calls back to 'make' a lot of time. It turns out that we already have the list of recursive dependencies, so we can just print that. As for the recursive reverse dependencies, we use the same memoisation technique to cut-down on the expansion cost, which would otherwise be on the order of 𝑶(𝑛²) (with 𝑛 enabled packages). >From a defconfig, modified to use glibc, C++, wchar, locales, ssp, and allyespackageconfig (tweaked to avoid multi providers, etc...), the timings for X-show-recursive-rdepends are: before after speedup #rdeps libnss 0m22.932s 0m5.775s 3.97x 3 qt5base 0m41.176s 0m5.781s 7.12x 67 libjpeg 0m56.185s 0m5.749s 9.71x 228 libxml2 0m54.964s 0m5.795s 9.48x 271 freetype 0m46.754s 0m5.819s 8.07x 287 libpng 0m53.577s 0m5.760s 9.30x 303 sqlite 1m15.222s 0m5.807s 12.95x 801 libopenssl 1m25.471s 0m5.844s 14.63x 931 readline 1m13.805s 0m5.775s 12.78x 958 libzlib 1m11.807s 0m5.820s 12.34x 1039 toolchain 1m23.712s 0m6.080s 13.77x 2107 skeleton 1m27.839s 0m6.293s 13.96x 2111 (+1) host-skeleton 1m27.405s 0m6.350s 13.76x 2172 (+2) - speedup: ratio before/after - #rdeps: number of recursive reverse dependencies, with the extra dependencies returned with this patch, see below for the reason. So, for a low-level package with a lot of reverse dependencies, like libzlibz, libopenssl or readline are, the timings are already very much in favour of the change. This is less impressive with packages that have few dependencies (libnss), but still much faster. Also, remember that the config tested has as much packages enabled as possible, so is in itself a degenerate case. With simpler and more realistic configurations, the gains would probably be a bit lower than reported above, but various tests still report good improvements overall (note: coming up with a 'realistic' configuration is pretty hard, as everyone and their dog have their notion of what is realistic in their context, so nothing displayed here; timings are left as an exercise for the interested parties to report aggravation in their cases should they notice some regression). Note that, more recursive reverse dependencies may be displayed now, since we do not apply the exceptions applied in graph-depends. For example, host-skeleton gains two new recursive reverse dependencies: skeleton and toolchain, which are both exceptions in graph-depends. As for direct (not reverse) dependencies: the gain is not as fantastic as for reverse ones, but it is still noticeable, especially thanks to a21212fb7cf (package/pkg-generic: speed up RECURSIVE_FINAL_DEPENDENCIES); just a few examples for %-show-recursive-depends: before after speedup #deps libzlib 0m46.864s 0m5.902s 7.94x 17 qt5base 0m57.590s 0m5.848s 9.85x 190 sqlite 0m46.601s 0m5.816s 8.01x 24 Basically, displaying recursive dependencies, direct or reverse, is almost a constant now: it only slightly varies by about 10% depending on the complexity of the dependency chain, with the parsing of the Makefiles still accounting for the large majority of the time. (PS. Thanks to Joseph for suggesting a list of interesting packages to test, and thanks to Trent for his example of memoisation!) Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Cc: Joseph Kogut Cc: Trent Piepho Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 4353bd3868..0d17e62a70 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -649,6 +649,18 @@ $(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \ ) \ $$($(2)_FINAL_RECURSIVE_DEPENDENCIES__X)) +$(2)_FINAL_RECURSIVE_RDEPENDENCIES = $$(sort \ + $$(if $$(filter undefined,$$(origin $(2)_FINAL_RECURSIVE_RDEPENDENCIES__X)), \ + $$(eval $(2)_FINAL_RECURSIVE_RDEPENDENCIES__X := \ + $$(foreach p, \ + $$($(2)_RDEPENDENCIES), \ + $$(p) \ + $$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_RDEPENDENCIES) \ + ) \ + ) \ + ) \ + $$($(2)_FINAL_RECURSIVE_RDEPENDENCIES__X)) + $(2)_INSTALL_STAGING ?= NO $(2)_INSTALL_IMAGES ?= NO $(2)_INSTALL_TARGET ?= YES @@ -826,15 +838,13 @@ $(1)-show-depends: @echo $$($(2)_FINAL_ALL_DEPENDENCIES) $(1)-show-recursive-depends: - @cd "$$(CONFIG_DIR)" && \ - $$(TOPDIR)/support/scripts/graph-depends -p $(1) -f -q + @echo $$($(2)_FINAL_RECURSIVE_DEPENDENCIES) $(1)-show-rdepends: @echo $$($(2)_RDEPENDENCIES) $(1)-show-recursive-rdepends: - @cd "$$(CONFIG_DIR)" && \ - $$(TOPDIR)/support/scripts/graph-depends -p $(1) --reverse -f -q + @echo $$($(2)_FINAL_RECURSIVE_RDEPENDENCIES) $(1)-show-build-order: $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPENDENCIES)) @: From 870f37fe044b98fdd393227c746bb00ecfa7184a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 3 Mar 2019 11:16:35 +0100 Subject: [PATCH 0271/7482] core: add make-based full-dependency list Currently, when we need to build the full dependency graph, we call make to show the list of packages (make show-targets), and then call it again and again iteratively while it returns new packages. Since calling make will parse the whole set of our Makefiles, this takes quite a bit of time (~4s each here), and the total can get pretty long. However, make being make, already builds the whole dependency tree information, so we can just ask for it. Add a new top-level rule 'show-dependency-tree' that displays the whole set of dependencies for all packages. For each package, its name, type and version is displayed, then all the direct, first-level dependencies are dumped. We choose a format that is not unlike the dot-graph format, because it is both easy to read as a human, and easy to parse as a machine: foo: target 1.2.3 foo -> bar host-meh bar: target virtual bar -> buz buz: target 2.3.4 buz -> host-meh: host virtual host-meh -> host-bleark host-bleark: host 3.4.5 host-bleark -> rootfs-meh: host rootfs-meh -> host-bleark To be noted: rootfs are currently reported as if they were 'host' packages, to stay aligned with how graph-depends currently treats them. Ideally, graph-depends could be enhanced to recognise them separately, but that is another story. For just plain defconfig, which is about the smallest config we can have with an internal toolchain, we already have a seven-fold improvement (with the graph-depends rule modified to not run the pdf generation, to be able to just compare the tree generation): $ time make graph-depends real 0m27.344s $ time make show-dependency-tree real 0m3.848s >From defconfig, C++, wchar, locales, ssp, and allyespackageconfig, tweaked for even more packages (qt5 not qt4, luajit to avoid multi providers, etc...), the timings are (graph-depends still modified to not generate the pdf): $ time make graph-depends real 1m56.459s $ time make show-dependency-tree real 0m5.748s There. I don't think those numbers need any explanation whatsoever; they do speak on their own. OK, for maths sake, the ratio is about twenty-fold. So, "yeah", I guess... ;-) Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Signed-off-by: Thomas Petazzoni --- Makefile | 4 ++++ fs/common.mk | 8 ++++++++ package/pkg-generic.mk | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/Makefile b/Makefile index 6af8923892..37bbc421ad 100644 --- a/Makefile +++ b/Makefile @@ -876,6 +876,10 @@ graph-depends-requirements: @dot -? >/dev/null 2>&1 || \ { echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1; } +.PHONY: show-dependency-tree +show-dependency-tree: $(patsubst %,%-show-dependency-tree,$(PACKAGES) $(TARGETS_ROOTFS)) + @: + .PHONY: graph-depends graph-depends: graph-depends-requirements @$(INSTALL) -d $(GRAPHS_DIR) diff --git a/fs/common.mk b/fs/common.mk index a560417c6c..daa43efd75 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -47,6 +47,10 @@ ROOTFS_COMMON_DEPENDENCIES = \ $(BR2_TAR_HOST_DEPENDENCY) \ $(if $(PACKAGES_USERS)$(ROOTFS_USERS_TABLES),host-mkpasswd) +rootfs-common-show-dependency-tree: $(patsubst %,%-show-dependency-tree,$(ROOTFS_COMMON_DEPENDENCIES)) + $(info rootfs-common: host) + $(info rootfs-common -> $(foreach d,$(ROOTFS_COMMON_DEPENDENCIES),$(d))) + .PHONY: rootfs-common rootfs-common: $(ROOTFS_COMMON_DEPENDENCIES) target-finalize @$(call MESSAGE,"Generating root filesystems common tables") @@ -80,6 +84,10 @@ ROOTFS_$(2)_TARGET_DIR = $$(ROOTFS_$(2)_DIR)/target ROOTFS_$(2)_DEPENDENCIES += rootfs-common +rootfs-$(1)-show-dependency-tree: $$(patsubst %,%-show-dependency-tree,$$(ROOTFS_$(2)_DEPENDENCIES)) + $$(info rootfs-$(1): host) + $$(info rootfs-$(1) -> $$(foreach d,$$(ROOTFS_$(2)_DEPENDENCIES),$$(d))) + ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) ROOTFS_$(2)_COMPRESS_EXT = .gz ROOTFS_$(2)_COMPRESS_CMD = gzip -9 -c diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 0d17e62a70..62c2e221f7 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -850,6 +850,10 @@ $(1)-show-build-order: $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPEND @: $$(info $(1)) +$(1)-show-dependency-tree: $$(patsubst %,%-show-dependency-tree,$$($(2)_FINAL_ALL_DEPENDENCIES)) + $$(info $(1): $(4) $$(if $$($(2)_IS_VIRTUAL),virtual,$$($(2)_DL_VERSION))) + $$(info $(1) -> $$(foreach d,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(d))) + $(1)-graph-depends: graph-depends-requirements $(call pkg-graph-depends,$(1),--direct) From 5583fd1b031d5c98583d5ffa831aada3e386018a Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 4 Mar 2019 07:44:18 +0800 Subject: [PATCH 0272/7482] package/python-terminaltables: new package Generate simple tables in terminals from a nested list of strings. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-terminaltables/Config.in | 6 ++++++ .../python-terminaltables.hash | 3 +++ .../python-terminaltables/python-terminaltables.mk | 13 +++++++++++++ 5 files changed, 24 insertions(+) create mode 100644 package/python-terminaltables/Config.in create mode 100644 package/python-terminaltables/python-terminaltables.hash create mode 100644 package/python-terminaltables/python-terminaltables.mk diff --git a/DEVELOPERS b/DEVELOPERS index 2da50e0299..359f04490c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1047,6 +1047,7 @@ F: package/python-async-timeout/ F: package/python-cchardet/ F: package/python-multidict/ F: package/python-pycares/ +F: package/python-terminaltables/ F: package/python-yarl/ N: James Knight diff --git a/package/Config.in b/package/Config.in index 6891004660..457018b18e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1051,6 +1051,7 @@ menu "External python modules" source "package/python-systemd/Config.in" source "package/python-tabledata/Config.in" source "package/python-tempora/Config.in" + source "package/python-terminaltables/Config.in" source "package/python-texttable/Config.in" source "package/python-thrift/Config.in" source "package/python-tomako/Config.in" diff --git a/package/python-terminaltables/Config.in b/package/python-terminaltables/Config.in new file mode 100644 index 0000000000..bb3c51c48f --- /dev/null +++ b/package/python-terminaltables/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_PYTHON_TERMINALTABLES + bool "python-terminaltables" + help + Generate simple tables in terminals from a nested list of strings. + + https://github.com/Robpol86/terminaltables diff --git a/package/python-terminaltables/python-terminaltables.hash b/package/python-terminaltables/python-terminaltables.hash new file mode 100644 index 0000000000..3184f5f716 --- /dev/null +++ b/package/python-terminaltables/python-terminaltables.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/terminaltables/json +md5 863797674d8f75d22e16e6c1fdcbeb41 terminaltables-3.1.0.tar.gz +sha256 f3eb0eb92e3833972ac36796293ca0906e998dc3be91fbe1f8615b331b853b81 terminaltables-3.1.0.tar.gz diff --git a/package/python-terminaltables/python-terminaltables.mk b/package/python-terminaltables/python-terminaltables.mk new file mode 100644 index 0000000000..763f82e9a2 --- /dev/null +++ b/package/python-terminaltables/python-terminaltables.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-terminaltables +# +################################################################################ + +PYTHON_TERMINALTABLES_VERSION = 3.1.0 +PYTHON_TERMINALTABLES_SOURCE = terminaltables-$(PYTHON_TERMINALTABLES_VERSION).tar.gz +PYTHON_TERMINALTABLES_SITE = https://files.pythonhosted.org/packages/9b/c4/4a21174f32f8a7e1104798c445dacdc1d4df86f2f26722767034e4de4bff +PYTHON_TERMINALTABLES_SETUP_TYPE = setuptools +PYTHON_TERMINALTABLES_LICENSE = MIT + +$(eval $(python-package)) From 77889217f11fe227c14a5fab03115ea2d25a7de6 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 4 Mar 2019 07:44:19 +0800 Subject: [PATCH 0273/7482] package/python-aioconsole: new package Asynchronous console and interfaces for asyncio. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-aioconsole/Config.in | 7 +++++++ package/python-aioconsole/python-aioconsole.hash | 3 +++ package/python-aioconsole/python-aioconsole.mk | 13 +++++++++++++ 5 files changed, 25 insertions(+) create mode 100644 package/python-aioconsole/Config.in create mode 100644 package/python-aioconsole/python-aioconsole.hash create mode 100644 package/python-aioconsole/python-aioconsole.mk diff --git a/DEVELOPERS b/DEVELOPERS index 359f04490c..ae1d97152c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1033,6 +1033,7 @@ F: configs/pine64_sopine_defconfig N: James Hilliard F: package/lua-std-debug/ F: package/lua-std-normalize/ +F: package/python-aioconsole/ F: package/python-aiodns/ F: package/python-aiohttp/ F: package/python-aiohttp-cors/ diff --git a/package/Config.in b/package/Config.in index 457018b18e..2407c12b52 100644 --- a/package/Config.in +++ b/package/Config.in @@ -800,6 +800,7 @@ if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 menu "External python modules" source "package/python-aioblescan/Config.in" source "package/python-aiocoap/Config.in" + source "package/python-aioconsole/Config.in" source "package/python-aiodns/Config.in" source "package/python-aiohttp/Config.in" source "package/python-aiohttp-cors/Config.in" diff --git a/package/python-aioconsole/Config.in b/package/python-aioconsole/Config.in new file mode 100644 index 0000000000..cd52eecf32 --- /dev/null +++ b/package/python-aioconsole/Config.in @@ -0,0 +1,7 @@ +config BR2_PACKAGE_PYTHON_AIOCONSOLE + bool "python-aioconsole" + depends on BR2_PACKAGE_PYTHON3 + help + Asynchronous console and interfaces for asyncio. + + https://github.com/vxgmichel/aioconsole diff --git a/package/python-aioconsole/python-aioconsole.hash b/package/python-aioconsole/python-aioconsole.hash new file mode 100644 index 0000000000..0e09cfb4ec --- /dev/null +++ b/package/python-aioconsole/python-aioconsole.hash @@ -0,0 +1,3 @@ +# md5, sha256 from https://pypi.org/pypi/aioconsole/json +md5 212dc49e2f2a995c87ce659ba63e7422 aioconsole-0.1.13.tar.gz +sha256 8b9898f0f6539bdce3bc3720d75189e21813f1a7f8350228fc7fd54bf7327d0f aioconsole-0.1.13.tar.gz diff --git a/package/python-aioconsole/python-aioconsole.mk b/package/python-aioconsole/python-aioconsole.mk new file mode 100644 index 0000000000..47245d2038 --- /dev/null +++ b/package/python-aioconsole/python-aioconsole.mk @@ -0,0 +1,13 @@ +################################################################################ +# +# python-aioconsole +# +################################################################################ + +PYTHON_AIOCONSOLE_VERSION = 0.1.13 +PYTHON_AIOCONSOLE_SOURCE = aioconsole-$(PYTHON_AIOCONSOLE_VERSION).tar.gz +PYTHON_AIOCONSOLE_SITE = https://files.pythonhosted.org/packages/ea/ee/80154d7242c2107d02768c5a848e4cded39ce8cd89b48982c217474c8ddd +PYTHON_AIOCONSOLE_SETUP_TYPE = setuptools +PYTHON_AIOCONSOLE_LICENSE = GPL-3.0 + +$(eval $(python-package)) From bab2f30dabc95ac2e170d591c8366802f92320d8 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 4 Mar 2019 07:44:20 +0800 Subject: [PATCH 0274/7482] package/python-aiomonitor: new package aiomonitor adds monitor and python REPL capabilities for asyncio application. Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in | 1 + package/python-aiomonitor/Config.in | 10 ++++++++++ package/python-aiomonitor/python-aiomonitor.hash | 5 +++++ package/python-aiomonitor/python-aiomonitor.mk | 14 ++++++++++++++ 5 files changed, 31 insertions(+) create mode 100644 package/python-aiomonitor/Config.in create mode 100644 package/python-aiomonitor/python-aiomonitor.hash create mode 100644 package/python-aiomonitor/python-aiomonitor.mk diff --git a/DEVELOPERS b/DEVELOPERS index ae1d97152c..cb1c90c39d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1042,6 +1042,7 @@ F: package/python-aiohttp-remotes/ F: package/python-aiohttp-security/ F: package/python-aiohttp-session/ F: package/python-aiohttp-sse/ +F: package/python-aiomonitor/ F: package/python-aiojobs/ F: package/python-aiorwlock/ F: package/python-async-timeout/ diff --git a/package/Config.in b/package/Config.in index 2407c12b52..b5321aeb49 100644 --- a/package/Config.in +++ b/package/Config.in @@ -809,6 +809,7 @@ menu "External python modules" source "package/python-aiohttp-security/Config.in" source "package/python-aiohttp-session/Config.in" source "package/python-aiohttp-sse/Config.in" + source "package/python-aiomonitor/Config.in" source "package/python-aiorwlock/Config.in" source "package/python-aiojobs/Config.in" source "package/python-alsaaudio/Config.in" diff --git a/package/python-aiomonitor/Config.in b/package/python-aiomonitor/Config.in new file mode 100644 index 0000000000..c76c952c82 --- /dev/null +++ b/package/python-aiomonitor/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_PYTHON_AIOMONITOR + bool "python-aiomonitor" + depends on BR2_PACKAGE_PYTHON3 + select BR2_PACKAGE_PYTHON_TERMINALTABLES # runtime + select BR2_PACKAGE_PYTHON_AIOCONSOLE # runtime + help + aiomonitor adds monitor and python REPL capabilities for + asyncio application. + + https://github.com/aio-libs/aiomonitor diff --git a/package/python-aiomonitor/python-aiomonitor.hash b/package/python-aiomonitor/python-aiomonitor.hash new file mode 100644 index 0000000000..ddcfd071e2 --- /dev/null +++ b/package/python-aiomonitor/python-aiomonitor.hash @@ -0,0 +1,5 @@ +# md5, sha256 from https://pypi.org/pypi/aiomonitor/json +md5 0f58ac68497a59d104ecb6ba369df784 aiomonitor-0.4.3.tar.gz +sha256 37cd279c26e2c80b4e6ed9d23476c84c0b75fc3794617fceb6f341437b9af5fe aiomonitor-0.4.3.tar.gz +# Locally computed sha256 checksums +sha256 9b42fe3a288996988c552e387e7877be7525a1649e62086aedd6b32d3cb56365 LICENSE diff --git a/package/python-aiomonitor/python-aiomonitor.mk b/package/python-aiomonitor/python-aiomonitor.mk new file mode 100644 index 0000000000..88f28a52dd --- /dev/null +++ b/package/python-aiomonitor/python-aiomonitor.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-aiomonitor +# +################################################################################ + +PYTHON_AIOMONITOR_VERSION = 0.4.3 +PYTHON_AIOMONITOR_SOURCE = aiomonitor-$(PYTHON_AIOMONITOR_VERSION).tar.gz +PYTHON_AIOMONITOR_SITE = https://files.pythonhosted.org/packages/11/27/2d25a3318e57181e04d2694768f0e1e621b64606d8424076790caa29e401 +PYTHON_AIOMONITOR_SETUP_TYPE = setuptools +PYTHON_AIOMONITOR_LICENSE = Apache-2.0 +PYTHON_AIOMONITOR_LICENSE_FILES = LICENSE + +$(eval $(python-package)) From 8623cc5deb59747c91687ac5a25087ba694b45a0 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 10 Feb 2019 22:38:18 +0100 Subject: [PATCH 0275/7482] package/pkg-generic: tweak only .la files that need it Currently, when we tweak the .la files, we do so unconditionally on all .la files, even those we already fixed in a previous run. This has the nasty side effect that each .la file will be reported as being touched by all packages that are installed after the package that actually installed said .la file. Since we can't easily know what files were installed by a package (that is an instrumentation hook, and comes after the mangling), we use a trick (like is done in libtool?): we do mangle all files, each into a temporary location; if the result is identical to the input, we remove the temporary, while if the result differs from the output, we move the temporary to replace the input. Reported-by: Nicolas Cavallari Reported-by: Thomas Petazzoni Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Nicolas Cavallari Cc: Thomas De Schampheleire Cc: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/pkg-generic.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 62c2e221f7..db7f06ddbe 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -294,7 +294,8 @@ $(BUILD_DIR)/%/.stamp_staging_installed: $(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ;\ fi @$(call MESSAGE,"Fixing libtool files") - $(Q)find $(STAGING_DIR)/usr/lib* -name "*.la" | xargs --no-run-if-empty \ + for la in $$(find $(STAGING_DIR)/usr/lib* -name "*.la"); do \ + cp -a "$${la}" "$${la}.fixed" && \ $(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \ -e "s:$(STAGING_DIR):@STAGING_DIR@:g" \ $(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\ @@ -303,7 +304,14 @@ $(BUILD_DIR)/%/.stamp_staging_installed: $(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\ -e "s:@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):g") \ -e "s:@STAGING_DIR@:$(STAGING_DIR):g" \ - -e "s:@BASE_DIR@:$(BASE_DIR):g" + -e "s:@BASE_DIR@:$(BASE_DIR):g" \ + "$${la}.fixed" && \ + if cmp -s "$${la}" "$${la}.fixed"; then \ + rm -f "$${la}.fixed"; \ + else \ + mv "$${la}.fixed" "$${la}"; \ + fi || exit 1; \ + done @$(call step_end,install-staging) $(Q)touch $@ From 65895f36eea0139c3d590cd5982be5504b2de9ce Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 16:29:29 +0100 Subject: [PATCH 0276/7482] package/fltk: add optional xlib_libXrender dependency xlib_libXrender is enabled by default and has been added since version 1.3.4-1 and https://github.com/fltk/fltk/commit/a6c4b29a184ce7708819f4706877eedcd99a30f5 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/fltk/fltk.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk index 611d79da50..c37a13176c 100644 --- a/package/fltk/fltk.mk +++ b/package/fltk/fltk.mk @@ -54,4 +54,11 @@ else FLTK_CONF_OPTS += --disable-xinerama endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) +FLTK_DEPENDENCIES += xlib_libXrender +FLTK_CONF_OPTS += --enable-xrender +else +FLTK_CONF_OPTS += --disable-xrender +endif + $(eval $(autotools-package)) From 8291bc77930a5ef87f98d1ff97c486dddfcdb244 Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Wed, 6 Feb 2019 14:23:57 +0100 Subject: [PATCH 0277/7482] package/go: rename BR2_PACKAGE_HOST_GO_{ARCH_SUPPORTS,CGO_LINKING_SUPPORTS} The hidden Config.in option BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS name is not very clear as to whether it says whether Go is available for the target architecture or the host architecture. Until now, this was fine since there was support for host Go packages. But as we are about to introduce support for building host Go packages, we need to clarify the meaning of BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS. Since it says whether the target architecture has support for Go or not, we rename it to BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS. And since BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS is tightly related, we rename it to BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS. Signed-off-by: Angelo Compagnucci Tested-by: Adam Duskett [Thomas: entirely rewrite commit log] Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-golang.txt | 8 +++++--- package/docker-cli/Config.in | 8 ++++---- package/docker-containerd/Config.in | 8 ++++---- package/docker-engine/Config.in | 8 ++++---- package/docker-proxy/Config.in | 8 ++++---- package/flannel/Config.in | 8 ++++---- package/go/Config.in.host | 7 ++++--- package/mender/Config.in | 8 ++++---- package/runc/Config.in | 8 ++++---- 9 files changed, 37 insertions(+), 34 deletions(-) diff --git a/docs/manual/adding-packages-golang.txt b/docs/manual/adding-packages-golang.txt index efcf696867..ae90eb7d4f 100644 --- a/docs/manual/adding-packages-golang.txt +++ b/docs/manual/adding-packages-golang.txt @@ -45,9 +45,11 @@ built. ==== +golang-package+ reference In their +Config.in+ file, packages using the +golang-package+ -infrastructure should depend on +BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS+ -and +BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS+ because Buildroot will -automatically add a dependency on +host-go+ to such packages. +infrastructure should depend on +BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS+ +because Buildroot will automatically add a dependency on +host-go+ +to such packages. +If you need CGO support in your package, you must add a dependency on ++BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS+. The main macro of the Go package infrastructure is +golang-package+. It is similar to the +generic-package+ macro. Only diff --git a/package/docker-cli/Config.in b/package/docker-cli/Config.in index 82c35c453d..6f187c9d22 100644 --- a/package/docker-cli/Config.in +++ b/package/docker-cli/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_CLI bool "docker-cli" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help Docker is a platform to build, ship, @@ -20,6 +20,6 @@ config BR2_PACKAGE_DOCKER_CLI_STATIC endif comment "docker-cli needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/docker-containerd/Config.in b/package/docker-containerd/Config.in index 4a4db1cde1..ffa2b208f2 100644 --- a/package/docker-containerd/Config.in +++ b/package/docker-containerd/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_CONTAINERD bool "docker-containerd" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # runc depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc @@ -31,8 +31,8 @@ config BR2_PACKAGE_DOCKER_CONTAINERD_DRIVER_BTRFS endif comment "docker-containerd needs a glibc or musl toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package/docker-engine/Config.in b/package/docker-engine/Config.in index 08f30e434a..bc36b05bed 100644 --- a/package/docker-engine/Config.in +++ b/package/docker-engine/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_ENGINE bool "docker-engine" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # docker-containerd -> runc depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc @@ -53,8 +53,8 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS endif comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.11" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM diff --git a/package/docker-proxy/Config.in b/package/docker-proxy/Config.in index 596e18a3f3..7e40536537 100644 --- a/package/docker-proxy/Config.in +++ b/package/docker-proxy/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_DOCKER_PROXY bool "docker-proxy" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help Libnetwork is a Container Network Model that provides a @@ -14,6 +14,6 @@ config BR2_PACKAGE_DOCKER_PROXY https://github.com/docker/libnetwork comment "docker-proxy needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/flannel/Config.in b/package/flannel/Config.in index 134111b1c0..326361080f 100644 --- a/package/flannel/Config.in +++ b/package/flannel/Config.in @@ -1,12 +1,12 @@ comment "flannel needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS config BR2_PACKAGE_FLANNEL bool "flannel" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS help Flannel is a virtual network that gives a subnet to each diff --git a/package/go/Config.in.host b/package/go/Config.in.host index f619ca0073..893a448709 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -1,4 +1,5 @@ -config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS +# Target go packages should depend on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS +config BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS bool default y depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_20006 @@ -10,10 +11,10 @@ config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS # MIPS R6 support in Go has not yet been developed. depends on !BR2_MIPS_CPU_MIPS64R6 -config BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS +config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS bool default y - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS # Go doesn't support CGO linking on MIPS64x platforms # See: https://github.com/karalabe/xgo/issues/46 depends on !BR2_mips64 && !BR2_mips64el diff --git a/package/mender/Config.in b/package/mender/Config.in index aeb0b2694f..5ab2304e49 100644 --- a/package/mender/Config.in +++ b/package/mender/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_MENDER bool "mender" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_UBOOT_TOOLS # runtime select BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV # runtime @@ -14,6 +14,6 @@ config BR2_PACKAGE_MENDER https://github.com/mendersoftware/mender comment "mender needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/runc/Config.in b/package/runc/Config.in index cfd26e9813..8939193048 100644 --- a/package/runc/Config.in +++ b/package/runc/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_RUNC bool "runc" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # O_TMPFILE depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve @@ -13,8 +13,8 @@ config BR2_PACKAGE_RUNC https://github.com/opencontainers/runc comment "runc needs a glibc or musl toolchain w/ threads, headers >= 3.11" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS + depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS && \ + BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS depends on !BR2_TOOLCHAIN_HAS_THREADS || \ !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAN_USES_UCLIBC depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM From aba08cd218315c8ce5ec97c5e2dd5edbcfa47fdd Mon Sep 17 00:00:00 2001 From: Mirza Krak Date: Wed, 6 Feb 2019 14:23:58 +0100 Subject: [PATCH 0278/7482] package/pkg-golang: add support for building host packages With this you can add: $(eval $(host-golang-package)) to a package .mk file to build for host. Signed-off-by: Mirza Krak Acked-by: Angelo Compagnucci Tested-by: Angelo Compagnucci Signed-off-by: Angelo Compagnucci Tested-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- docs/manual/adding-packages-golang.txt | 7 +++-- package/go/Config.in.host | 6 +++++ package/pkg-golang.mk | 37 +++++++++++++++++++++++--- 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/docs/manual/adding-packages-golang.txt b/docs/manual/adding-packages-golang.txt index ae90eb7d4f..8c467689be 100644 --- a/docs/manual/adding-packages-golang.txt +++ b/docs/manual/adding-packages-golang.txt @@ -52,8 +52,11 @@ If you need CGO support in your package, you must add a dependency on +BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS+. The main macro of the Go package infrastructure is -+golang-package+. It is similar to the +generic-package+ macro. Only -target packages are supported with +golang-package+. ++golang-package+. It is similar to the +generic-package+ macro. The +ability to build host packages is also available, with the ++host-golang-package+ macro. +Host packages built by +host-golang-package+ macro should depend on +BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS. Just like the generic infrastructure, the Go infrastructure works by defining a number of variables before calling the +golang-package+. diff --git a/package/go/Config.in.host b/package/go/Config.in.host index 893a448709..3f16dbaec3 100644 --- a/package/go/Config.in.host +++ b/package/go/Config.in.host @@ -18,3 +18,9 @@ config BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS # Go doesn't support CGO linking on MIPS64x platforms # See: https://github.com/karalabe/xgo/issues/46 depends on !BR2_mips64 && !BR2_mips64el + +# Host go packages should depend on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS +config BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + bool + default y + depends on BR2_PACKAGE_HOST_GO_BOOTSTRAP_ARCH_SUPPORTS diff --git a/package/pkg-golang.mk b/package/pkg-golang.mk index 4f2c7e77e1..b4e8a53065 100644 --- a/package/pkg-golang.mk +++ b/package/pkg-golang.mk @@ -25,12 +25,18 @@ GO_BIN = $(HOST_DIR)/bin/go # We pass an empty GOBIN, otherwise "go install: cannot install # cross-compiled binaries when GOBIN is set" -GO_TARGET_ENV = \ - $(HOST_GO_TARGET_ENV) \ +GO_COMMON_ENV = \ PATH=$(BR_PATH) \ GOBIN= \ CGO_ENABLED=$(HOST_GO_CGO_ENABLED) +GO_TARGET_ENV = \ + $(HOST_GO_TARGET_ENV) \ + $(GO_COMMON_ENV) + +GO_HOST_ENV = \ + $(GO_COMMON_ENV) + ################################################################################ # inner-golang-package -- defines how the configuration, compilation and # installation of a Go package should be done, implements a few hooks to tune @@ -44,7 +50,6 @@ GO_TARGET_ENV = \ # packages # argument 4 is the type (target or host) # -# NOTE Only type target is supported at the moment ################################################################################ define inner-golang-package @@ -98,6 +103,8 @@ endif # Build step. Only define it if not already defined by the package .mk # file. ifndef $(2)_BUILD_CMDS +ifeq ($(4),target) +# Build package for target define $(2)_BUILD_CMDS $$(foreach d,$$($(2)_BUILD_TARGETS),\ cd $$($(2)_SRC_PATH); \ @@ -109,6 +116,20 @@ define $(2)_BUILD_CMDS ./$$(d) ) endef +else +# Build package for host +define $(2)_BUILD_CMDS + $$(foreach d,$$($(2)_BUILD_TARGETS),\ + cd $$($(2)_SRC_PATH); \ + $$(GO_HOST_ENV) \ + GOPATH="$$(@D)/$$($(2)_WORKSPACE)" \ + $$($(2)_GO_ENV) \ + $$(GO_BIN) build -v $$($(2)_BUILD_OPTS) \ + -o $$(@D)/bin/$$(or $$($(2)_BIN_NAME),$$(notdir $$(d))) \ + ./$$(d) + ) +endef +endif endif # Target installation step. Only define it if not already defined by the @@ -121,6 +142,15 @@ define $(2)_INSTALL_TARGET_CMDS endef endif +# Host installation step +ifndef $(2)_INSTALL_CMDS +define $(2)_INSTALL_CMDS + $$(foreach d,$$($(2)_INSTALL_BINS),\ + $(INSTALL) -D -m 0755 $$(@D)/bin/$$(d) $(HOST_DIR)/bin/$$(d) + ) +endef +endif + # Call the generic package infrastructure to generate the necessary make # targets $(call inner-generic-package,$(1),$(2),$(3),$(4)) @@ -132,3 +162,4 @@ endef # inner-golang-package ################################################################################ golang-package = $(call inner-golang-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) +host-golang-package = $(call inner-golang-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) From 33f1bd1f025e0d8f03017da75b04e57f8de3dc6e Mon Sep 17 00:00:00 2001 From: Angelo Compagnucci Date: Wed, 6 Feb 2019 14:23:59 +0100 Subject: [PATCH 0279/7482] package/mender-artifact: new package mender-artifact is a host tool to generate update images in the Mender artifact file format. This package uses the binary archive from github because it bundles the external dependencies. Example usage: $ mender-artifact write rootfs-image \ --update rootfs.ext4 \ --output-path rootfs.mender \ --artifact-name "release-v1.0.0" \ --device-type "beaglebone" Above will generate a Mender artifact called "rootfs.mender" containing the "rootfs.ext4" image along with meta-data. One can read-out the meta-data with the following command: $ mender-artifact read rootfs.mender Mender artifact: Name: release-v1.0.0 Format: mender Version: 2 Signature: no signature Compatible devices: '[beaglebone]' Updates: 0000: Type: rootfs-image Files: name: rootfs.ext4 size: 52428800 modified: 2018-08-27 09:10:55 +0200 CEST checksum: e70b113fb0964a810a3043586eb4fc1c48e684ba78b02ba65fead4aa3e540d87 Signed-off-by: Angelo Compagnucci Tested-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 + package/Config.in.host | 1 + package/mender-artifact/Config.in.host | 18 +++++++++++ package/mender-artifact/mender-artifact.hash | 28 +++++++++++++++++ package/mender-artifact/mender-artifact.mk | 32 ++++++++++++++++++++ 5 files changed, 80 insertions(+) create mode 100644 package/mender-artifact/Config.in.host create mode 100644 package/mender-artifact/mender-artifact.hash create mode 100644 package/mender-artifact/mender-artifact.mk diff --git a/DEVELOPERS b/DEVELOPERS index cb1c90c39d..976e1bbda7 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -166,6 +166,7 @@ F: package/corkscrew/ F: package/fail2ban/ F: package/i2c-tools/ F: package/mender/ +F: package/mender-artifact/ F: package/mono/ F: package/mono-gtksharp3/ F: package/monolite/ diff --git a/package/Config.in.host b/package/Config.in.host index b4c501a33b..fcbeb5b7f4 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -33,6 +33,7 @@ menu "Host utilities" source "package/jsmin/Config.in.host" source "package/lpc3250loader/Config.in.host" source "package/lttng-babeltrace/Config.in.host" + source "package/mender-artifact/Config.in.host" source "package/mfgtools/Config.in.host" source "package/mkpasswd/Config.in.host" source "package/mtd/Config.in.host" diff --git a/package/mender-artifact/Config.in.host b/package/mender-artifact/Config.in.host new file mode 100644 index 0000000000..c7be0ed261 --- /dev/null +++ b/package/mender-artifact/Config.in.host @@ -0,0 +1,18 @@ +config BR2_PACKAGE_HOST_MENDER_ARTIFACT + bool "host mender-artifact" + depends on BR2_PACKAGE_HOST_GO_HOST_ARCH_SUPPORTS + help + The mender-artifact tool is a CLI implementation of the + Mender artifacts library. + + A Mender artifact can be recognized by its .mender suffix. + Mender artifacts can contain binaries, metadata, checksums, + signatures and scripts that are used during a deployment. + The artifact format acts as a wrapper, and uses the tar + format to bundle several files into one. + + In its simplest form, an artifact contains just a rootfs + image, along with its checksum, id and device type + compatibility. + + https://github.com/mendersoftware/mender-artifact diff --git a/package/mender-artifact/mender-artifact.hash b/package/mender-artifact/mender-artifact.hash new file mode 100644 index 0000000000..d44244d31c --- /dev/null +++ b/package/mender-artifact/mender-artifact.hash @@ -0,0 +1,28 @@ +# Locally computed: +sha256 fde448af4811600a130b243d59e21b1f9cdd60fd991bd418246c913ebf945206 2.4.0.tar.gz + +# License hash extracted from LIC_FILES_CHKSUM.sha256 using the +# following command: +# +# sed '/^[A-Za-z0-9_]/s/^/sha256 /' LIC_FILES_CHKSUM.sha256 + +# Apache 2.0 licenses. +sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE +sha256 ceb1b36ff073bd13d9806d4615b931707768ca9023805620acc32dd1cfc2f680 vendor/github.com/mendersoftware/mendertesting/LICENSE +# +# BSD 2 Clause licenses. +sha256 8d427fd87bc9579ea368fde3d49f9ca22eac857f91a9dec7e3004bdfab7dee86 vendor/github.com/pkg/errors/LICENSE +# +# BSD 3 Clause licenses. +sha256 2eb550be6801c1ea434feba53bf6d12e7c71c90253e0a9de4a4f46cf88b56477 vendor/github.com/pmezard/go-difflib/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/sys/LICENSE +sha256 2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067 vendor/golang.org/x/crypto/LICENSE +# +# ISC licenses. +sha256 3525392c6db3b804af76980b2c560ee9ec1abdadd907d76a26091df7c78f3a25 vendor/github.com/davecgh/go-spew/LICENSE +# +# MIT licenses. +sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENSE +sha256 402f39eed8a1851385d0703999aa9f23d067c2ea3e15c63c074e389cbf8f8f8f vendor/github.com/stretchr/testify/LICENSE +sha256 da277af11b85227490377fbcac6afccc68be560c4fff36ac05ca62de55345fd7 vendor/github.com/urfave/cli/LICENSE +sha256 51a0c9ec7f8b7634181b8d4c03e5b5d204ac21d6e72f46c313973424664b2e6b vendor/github.com/sirupsen/logrus/LICENSE diff --git a/package/mender-artifact/mender-artifact.mk b/package/mender-artifact/mender-artifact.mk new file mode 100644 index 0000000000..90d0071d1a --- /dev/null +++ b/package/mender-artifact/mender-artifact.mk @@ -0,0 +1,32 @@ +################################################################################ +# +# host-mender-artifact +# +################################################################################ + +HOST_MENDER_ARTIFACT_VERSION = 2.4.0 +HOST_MENDER_ARTIFACT_SITE = https://github.com/mendersoftware/mender-artifact/archive +HOST_MENDER_ARTIFACT_SOURCE = $(HOST_MENDER_ARTIFACT_VERSION).tar.gz +HOST_MENDER_ARTIFACT_LICENSE = Apache2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT +HOST_MENDER_ARTIFACT_LICENSE_FILES = \ + LICENSE \ + LIC_FILES_CHKSUM.sha256 \ + vendor/github.com/mendersoftware/mendertesting/LICENSE \ + vendor/github.com/pkg/errors/LICENSE \ + vendor/github.com/pmezard/go-difflib/LICENSE \ + vendor/golang.org/x/sys/LICENSE \ + vendor/golang.org/x/crypto/LICENSE \ + vendor/github.com/davecgh/go-spew/LICENSE \ + vendor/github.com/stretchr/testify/LICENSE \ + vendor/github.com/stretchr/testify/LICENSE \ + vendor/github.com/urfave/cli/LICENSE \ + vendor/github.com/sirupsen/logrus/LICENSE + +HOST_MENDER_ARTIFACT_LDFLAGS = -X main.Version=$(HOST_MENDER_ARTIFACT_VERSION) + +HOST_MENDER_ARTIFACT_BUILD_TARGETS = cli/mender-artifact + +HOST_MENDER_ARTIFACT_BIN_NAME = mender-artifact +HOST_MENDER_ARTIFACT_INSTALL_BINS = $(HOST_MENDER_ARTIFACT_BIN_NAME) + +$(eval $(host-golang-package)) From 617749e9eb2b5ff95ed82980f2a626ebadc45fcd Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 17:05:19 +0100 Subject: [PATCH 0280/7482] package/wpan-tools: bump to version 0.9 - Switch site to github - Remove patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...h-fix-compatibility-with-libnl-3.3.0.patch | 49 ------------------- package/wpan-tools/wpan-tools.hash | 7 ++- package/wpan-tools/wpan-tools.mk | 7 +-- 3 files changed, 7 insertions(+), 56 deletions(-) delete mode 100644 package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch diff --git a/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch b/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch deleted file mode 100644 index 8b881ad3ae..0000000000 --- a/package/wpan-tools/0001-src-nl_extras.h-fix-compatibility-with-libnl-3.3.0.patch +++ /dev/null @@ -1,49 +0,0 @@ -From bb522bd584f05e6658d5dba97f48ca018f46394c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 6 May 2017 14:36:08 +0200 -Subject: [PATCH] src/nl_extras.h: fix compatibility with libnl 3.3.0 - -nl_extras.h defines a set of nla_set_s*() functions if not provided by -libnl. They are provided by libnl since version 3.2.26. The test -(LIBNL_VER_MIC <= 26) was working fine while libnl was in the 3.2.x -series, but now that they have incremented the minor version, the -micro version was reset to 0, with the latest libnl version being -3.3.0. - -Due to this, the condition (LIBNL_VER_MIC <= 26) is true, and we get -redefinition errors because nl_extras.h redefines functions already -provided by libnl. - -This commit improves the condition so that nl_extras.h provides the -missing functions only if the minor version is < 2, or if minor is 2 -and micro is < 26. - -Signed-off-by: Thomas Petazzoni ---- - src/nl_extras.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/nl_extras.h b/src/nl_extras.h -index c4d1d14..37844f9 100644 ---- a/src/nl_extras.h -+++ b/src/nl_extras.h -@@ -1,7 +1,7 @@ - #ifndef __NL_EXTRAS_H - #define __NL_EXTRAS_H - --#if LIBNL_VER_MIC <= 26 -+#if (LIBNL_VER_MIN < 2) || (LIBNL_VER_MIN == 2) && (LIBNL_VER_MIC <= 26) - - #ifndef NLA_S8 - -@@ -45,6 +45,6 @@ static inline int32_t nla_get_s32(struct nlattr *nla) - - #endif /* NLA_S64 */ - --#endif /* LIBNL_VER_MIC */ -+#endif /* LIBNL_VER_* */ - - #endif /* __NL_EXTRAS_H */ --- -2.7.4 - diff --git a/package/wpan-tools/wpan-tools.hash b/package/wpan-tools/wpan-tools.hash index cfad89aa00..c9f0df2c1b 100644 --- a/package/wpan-tools/wpan-tools.hash +++ b/package/wpan-tools/wpan-tools.hash @@ -1,4 +1,3 @@ -# From http://wpan.cakelab.org/releases/md5sum -md5 91f0b640ff66910e977fab6525625624 wpan-tools-0.7.tar.xz -# Calculated based on the hash above -sha256 c16de9d7861c2d9b6a4436a0fac730f9f545ee290b92bc770c538ec6a3f22309 wpan-tools-0.7.tar.xz +# Locally calculated +sha256 3e509d9ed838df1247cc9a0c6ca483cb356ae778851817bd7410044687b655e2 wpan-tools-0.9.tar.gz +sha256 fe8e595c24d821a60885eb259619df5e5e3976c48465fde0be29fcd78530798f COPYING diff --git a/package/wpan-tools/wpan-tools.mk b/package/wpan-tools/wpan-tools.mk index d5e43a92c8..d8898a7299 100644 --- a/package/wpan-tools/wpan-tools.mk +++ b/package/wpan-tools/wpan-tools.mk @@ -4,11 +4,12 @@ # ################################################################################ -WPAN_TOOLS_VERSION = 0.7 -WPAN_TOOLS_SOURCE = wpan-tools-$(WPAN_TOOLS_VERSION).tar.xz -WPAN_TOOLS_SITE = http://wpan.cakelab.org/releases +WPAN_TOOLS_VERSION = 0.9 +WPAN_TOOLS_SITE = $(call github,linux-wpan,wpan-tools,wpan-tools-$(WPAN_TOOLS_VERSION)) WPAN_TOOLS_DEPENDENCIES = host-pkgconf libnl WPAN_TOOLS_LICENSE = ISC WPAN_TOOLS_LICENSE_FILES = COPYING +# From git +WPAN_TOOLS_AUTORECONF = YES $(eval $(autotools-package)) From 78d4ddbf3b416885d2e99b32363b174755f9bb30 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 17:07:56 +0100 Subject: [PATCH 0281/7482] package/keepalived: bump to version 2.0.13 Remove patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...01-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch | 61 ------------------- ...de-files-in-configure-COLLISION-test.patch | 38 ------------ package/keepalived/keepalived.hash | 2 +- package/keepalived/keepalived.mk | 2 +- 4 files changed, 2 insertions(+), 101 deletions(-) delete mode 100644 package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch delete mode 100644 package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch diff --git a/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch b/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch deleted file mode 100644 index 4402b48a8b..0000000000 --- a/package/keepalived/0001-Rename-TIMER_MAX-to-TIMER_MAXIMUM.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 7d4856e213f349bcd97b3644b01d6170b226de16 Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Tue, 20 Nov 2018 17:24:58 +0000 -Subject: [PATCH] Rename TIMER_MAX to TIMER_MAXIMUM - -ulibC defines TIMER_MAX, so to avoid naming conflict rename it. - -This issue was reported by Paul Gildea who also -provided the patch. - -Signed-off-by: Quentin Armitage -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/acassen/keepalived/commit/7d4856e213f349bcd97b3644b01d6170b226de16] ---- - lib/parser.c | 8 ++++---- - lib/parser.h | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/parser.c b/lib/parser.c -index 1d53595c0..cc9b644e2 100644 ---- a/lib/parser.c -+++ b/lib/parser.c -@@ -1915,20 +1915,20 @@ read_timer(vector_t *strvec, size_t index, unsigned long *res, unsigned long min - #endif - - if (!max_time) -- max_time = TIMER_MAX; -+ max_time = TIMER_MAXIMUM; - - errno = 0; - timer = strtoul(vector_slot(strvec, index), &endptr, 10); -- *res = (timer > TIMER_MAX ? TIMER_MAX : timer) * TIMER_HZ; -+ *res = (timer > TIMER_MAXIMUM ? TIMER_MAXIMUM : timer) * TIMER_HZ; - - if (FMT_STR_VSLOT(strvec, index)[0] == '-') - report_config_error(CONFIG_INVALID_NUMBER, "%snegative number '%s'", warn, FMT_STR_VSLOT(strvec, index)); - else if (*endptr) - report_config_error(CONFIG_INVALID_NUMBER, "%sinvalid number '%s'", warn, FMT_STR_VSLOT(strvec, index)); -- else if (errno == ERANGE || timer > TIMER_MAX) -+ else if (errno == ERANGE || timer > TIMER_MAXIMUM) - report_config_error(CONFIG_INVALID_NUMBER, "%snumber '%s' outside timer range", warn, FMT_STR_VSLOT(strvec, index)); - else if (timer < min_time || timer > max_time) -- report_config_error(CONFIG_INVALID_NUMBER, "number '%s' outside range [%ld, %ld]", FMT_STR_VSLOT(strvec, index), min_time, max_time ? max_time : TIMER_MAX); -+ report_config_error(CONFIG_INVALID_NUMBER, "number '%s' outside range [%ld, %ld]", FMT_STR_VSLOT(strvec, index), min_time, max_time ? max_time : TIMER_MAXIMUM); - else - return true; - -diff --git a/lib/parser.h b/lib/parser.h -index 88a74474a..291aa8ffe 100644 ---- a/lib/parser.h -+++ b/lib/parser.h -@@ -38,7 +38,7 @@ - #define MAXBUF 1024 - - /* Maximum time read_timer can return */ --#define TIMER_MAX (ULONG_MAX / TIMER_HZ) -+#define TIMER_MAXIMUM (ULONG_MAX / TIMER_HZ) - - /* Configuration test errors. These should be in decreasing order of severity */ - typedef enum { diff --git a/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch b/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch deleted file mode 100644 index 76c88a76bf..0000000000 --- a/package/keepalived/0002-Fix-order-of-include-files-in-configure-COLLISION-test.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e4dd33f16fe56d09c8d59d1254a4ed1d8e9bb29c Mon Sep 17 00:00:00 2001 -From: Quentin Armitage -Date: Thu, 6 Dec 2018 12:16:08 +0000 -Subject: [PATCH] Fix order of include files in configure COLLISION test - -Since Linux 4.4.11 (commit 1575c09) including linux/if.h after -net/if.h works, whereas until glibc fix their headers including -net/if.h after linux/if.h causes compiler redefinition errors. - -Unfortunately the test for the collision was done the wrong way -round, as identified in issue #1079. The patch included in the -issue report corrects the order of inclusion of the header files. - -What we should do is ensure that glibc header files are included -before Linux header files, so that at least if kernel headers from -4.4.11 onwards are used, the conflict will not occur. - -Signed-off-by: Quentin Armitage -Signed-off-by: Fabrice Fontaine -[Retrieved from: https://github.com/acassen/keepalived/commit/e4dd33f16fe56d09c8d59d1254a4ed1d8e9bb29c] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 7a2e8ce1..9badcc62 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1349,8 +1349,8 @@ AC_MSG_CHECKING([for linux/if.h and net/if.h namespace collision]) - SAV_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $kernelinc" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -- #include - #include -+ #include - ]])], - [ - AC_MSG_RESULT([no]) diff --git a/package/keepalived/keepalived.hash b/package/keepalived/keepalived.hash index 3ad3e6e6ac..5f9f569ca7 100644 --- a/package/keepalived/keepalived.hash +++ b/package/keepalived/keepalived.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 40e0e55afed9ca313d621a9c5878579696fafb5504dab521aadaf20ba6e7f597 keepalived-2.0.10.tar.gz +sha256 c7fb38e8a322fb898fb9f6d5d566827a30aa5a4cd1774f474bb4041c85bcbc46 keepalived-2.0.13.tar.gz sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index 4f6db01722..fc6b01521d 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -4,7 +4,7 @@ # ################################################################################ -KEEPALIVED_VERSION = 2.0.10 +KEEPALIVED_VERSION = 2.0.13 KEEPALIVED_SITE = http://www.keepalived.org/software KEEPALIVED_DEPENDENCIES = host-pkgconf openssl KEEPALIVED_LICENSE = GPL-2.0+ From 58a400035e23f6c0a92e3f7527d4541a67c498e2 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 16:30:36 +0100 Subject: [PATCH 0282/7482] package/jhead: bump to version 3.0.3 - Remove patch (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/jhead/0001-use-ldflags.patch | 16 ---------------- package/jhead/jhead.hash | 3 ++- package/jhead/jhead.mk | 2 +- 3 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 package/jhead/0001-use-ldflags.patch diff --git a/package/jhead/0001-use-ldflags.patch b/package/jhead/0001-use-ldflags.patch deleted file mode 100644 index a1d8185a26..0000000000 --- a/package/jhead/0001-use-ldflags.patch +++ /dev/null @@ -1,16 +0,0 @@ -Make jhead use LDFLAGS for the final link. - -Signed-off-by: Gustavo Zacarias - -diff -Nura jhead-2.97.orig/makefile jhead-2.97/makefile ---- jhead-2.97.orig/makefile 2013-03-27 09:22:38.759966389 -0300 -+++ jhead-2.97/makefile 2013-03-27 09:25:06.290691745 -0300 -@@ -14,7 +14,7 @@ - ${CC} $(CFLAGS) -c $< -o $@ - - jhead: $(objs) jhead.h -- ${CC} -o jhead $(objs) -lm -+ ${CC} $(LDFLAGS) -o jhead $(objs) -lm - - clean: - rm -f $(objs) jhead diff --git a/package/jhead/jhead.hash b/package/jhead/jhead.hash index 55af7a7244..9ee5055f7c 100644 --- a/package/jhead/jhead.hash +++ b/package/jhead/jhead.hash @@ -1,2 +1,3 @@ # Locally calculated from download (no sig, hash) -sha256 88cc01da018e242fe2e05db73f91b6288106858dd70f27506c4989a575d2895e jhead-3.00.tar.gz +sha256 82194e0128d9141038f82fadcb5845391ca3021d61bc00815078601619f6c0c2 jhead-3.03.tar.gz +sha256 46c870a208305489eea862ec8b05b030ba1f06d99195f660dc0ba541cc38d82b readme.txt diff --git a/package/jhead/jhead.mk b/package/jhead/jhead.mk index 8a99915bac..65f8cdb73c 100644 --- a/package/jhead/jhead.mk +++ b/package/jhead/jhead.mk @@ -4,7 +4,7 @@ # ################################################################################ -JHEAD_VERSION = 3.00 +JHEAD_VERSION = 3.03 JHEAD_SITE = http://www.sentex.net/~mwandel/jhead JHEAD_LICENSE = Public Domain JHEAD_LICENSE_FILES = readme.txt From 1b539ce01085f5fcab804137d58e486f366bfc26 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 16:32:11 +0100 Subject: [PATCH 0283/7482] package/jack2: bump to version 1.9.12 Remove patches (already in version) Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...1-Fix-initialization-in-test-iodelay.patch | 65 -------------- .../0002-Improve-check-for-ucontext.patch | 84 ------------------- ...upport-depends-on-execinfo.h-existen.patch | 67 --------------- ...004-tests-define-__STDC_LIMIT_MACROS.patch | 41 --------- package/jack2/0005-gcc7.patch | 31 ------- package/jack2/0006-fix-ftbfs-with-clang.patch | 28 ------- package/jack2/jack2.hash | 2 +- package/jack2/jack2.mk | 2 +- 8 files changed, 2 insertions(+), 318 deletions(-) delete mode 100644 package/jack2/0001-Fix-initialization-in-test-iodelay.patch delete mode 100644 package/jack2/0002-Improve-check-for-ucontext.patch delete mode 100644 package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch delete mode 100644 package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch delete mode 100644 package/jack2/0005-gcc7.patch delete mode 100644 package/jack2/0006-fix-ftbfs-with-clang.patch diff --git a/package/jack2/0001-Fix-initialization-in-test-iodelay.patch b/package/jack2/0001-Fix-initialization-in-test-iodelay.patch deleted file mode 100644 index ee2493886b..0000000000 --- a/package/jack2/0001-Fix-initialization-in-test-iodelay.patch +++ /dev/null @@ -1,65 +0,0 @@ -From ff1ed2c4524095055140370c1008a2d9cccc5645 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth -Date: Sat, 11 Jun 2016 05:35:07 +0200 -Subject: [PATCH] Fix initialization in test/iodelay.cpp - -jack_latency_range_t is - -struct _jack_latency_range { - jack_nframes_t min; - jack_nframes_t max; -}; - -and jack_nframes_t is - -typedef uint32_t jack_nframes_t; - -so it's unsigned. Initialising it with -1 is invalid (at least in C++14). We cannot use {0, 0}, because latency_cb has - - jack_latency_range_t range; - range.min = range.max = 0; - if ((range.min != capture_latency.min) || (range.max != - capture_latency.max)) { - capture_latency = range; - } - -so we must not have {0, 0}, otherwise the condition would never be true. - -Using UINT32_MAX should be equivalent to the previous -1. - -[Upstream commit https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645] -Signed-off-by: Thomas Petazzoni ---- - tests/iodelay.cpp | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp -index e1ba63fa..1ef470fd 100644 ---- a/tests/iodelay.cpp -+++ b/tests/iodelay.cpp -@@ -20,6 +20,7 @@ - - #include - #include -+#include - #include - #include - #include -@@ -167,8 +168,8 @@ static jack_client_t *jack_handle; - static jack_port_t *jack_capt; - static jack_port_t *jack_play; - --jack_latency_range_t capture_latency = {-1, -1}; --jack_latency_range_t playback_latency = {-1, -1}; -+jack_latency_range_t capture_latency = {UINT32_MAX, UINT32_MAX}; -+jack_latency_range_t playback_latency = {UINT32_MAX, UINT32_MAX}; - - void - latency_cb (jack_latency_callback_mode_t mode, void *arg) -@@ -266,4 +267,4 @@ int main (int ac, char *av []) - return 0; - } - --// -------------------------------------------------------------------------------- -\ No newline at end of file -+// -------------------------------------------------------------------------------- diff --git a/package/jack2/0002-Improve-check-for-ucontext.patch b/package/jack2/0002-Improve-check-for-ucontext.patch deleted file mode 100644 index b8aa1da721..0000000000 --- a/package/jack2/0002-Improve-check-for-ucontext.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ad79670d6d1e7ef2aad6935715921e5317cbe618 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 23 May 2016 22:28:12 +0200 -Subject: [PATCH] Improve check for ucontext - -The ucontext functionality is not available on all CPUs with all C -libraries. Instead of making just assumptions based on the CPU -architecture, this commit adds the necessary checks in wscript to verify -the availability of the ucontext functionality, before using it in -dbus/sigsegv.c. - -This avoids the long list of architecture exclusions, and make it more -robust when building jack2 for new CPU architectures. - -Signed-off-by: Thomas Petazzoni ---- - dbus/sigsegv.c | 12 ++++++------ - wscript | 16 +++++++++++++++- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c -index df2c42c..00a62b5 100644 ---- a/dbus/sigsegv.c -+++ b/dbus/sigsegv.c -@@ -106,20 +106,20 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { - jack_error("info.si_errno = %d", info->si_errno); - jack_error("info.si_code = %d (%s)", info->si_code, si_code_str); - jack_error("info.si_addr = %p", info->si_addr); --#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) -+#if defined(HAVE_UCONTEXT) && defined(HAVE_NGREG) - for(i = 0; i < NGREG; i++) - jack_error("reg[%02d] = 0x" REGFORMAT, i, --#if defined(__powerpc64__) -+#if defined(HAVE_UCONTEXT_GP_REGS) - ucontext->uc_mcontext.gp_regs[i] --#elif defined(__powerpc__) -+#elif defined(HAVE_UCONTEXT_UC_REGS) - ucontext->uc_mcontext.uc_regs[i] --#elif defined(__sparc__) && defined(__arch64__) -+#elif defined(HAVE_UCONTEXT_MC_GREGS) - ucontext->uc_mcontext.mc_gregs[i] --#else -+#elif defined(HAVE_UCONTEXT_GREGS) - ucontext->uc_mcontext.gregs[i] - #endif - ); --#endif /* alpha, ia64, kFreeBSD, arm, hppa */ -+#endif /* defined(HAVE_UCONTEXT) && defined(HAVE_NGREG) */ - - #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) - # if defined(SIGSEGV_STACK_IA64) -diff --git a/wscript b/wscript -index 63ba3aa..34a56fc 100644 ---- a/wscript -+++ b/wscript -@@ -168,10 +168,24 @@ def configure(conf): - - conf.check_cc(header_name='execinfo.h', define_name="HAVE_EXECINFO_H", mandatory=False) - conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE") -- - if conf.is_defined('HAVE_SAMPLERATE'): - conf.env['LIB_SAMPLERATE'] = ['samplerate'] - -+ # test for the availability of ucontext, and how it should be used -+ for t in ("gp_regs", "uc_regs", "mc_gregs", "gregs"): -+ fragment = "#include \n" -+ fragment += "int main() { ucontext_t *ucontext; return (int) ucontext->uc_mcontext.%s[0]; }" % t -+ confvar = "HAVE_UCONTEXT_%s" % t.upper() -+ conf.check_cc(fragment=fragment, define_name=confvar, mandatory=False, -+ msg="Checking for ucontext->uc_mcontext.%s" % t) -+ if conf.is_defined(confvar): -+ conf.define('HAVE_UCONTEXT', 1) -+ -+ fragment = "#include \n" -+ fragment += "int main() { return NGREG; }" -+ conf.check_cc(fragment=fragment, define_name="HAVE_NGREG", mandatory=False, -+ msg="Checking for NGREG") -+ - conf.sub_config('example-clients') - - if conf.check_cfg(package='celt', atleast_version='0.11.0', args='--cflags --libs', mandatory=False): --- -2.7.4 - diff --git a/package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch b/package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch deleted file mode 100644 index 719c6a83ba..0000000000 --- a/package/jack2/0003-Make-backtrace-support-depends-on-execinfo.h-existen.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4b2c73ad056aa327dc3b505410da68cf384317ba Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Mon, 16 May 2016 22:26:05 +0200 -Subject: [PATCH] Make backtrace support depends on execinfo.h existence - -In some C-libraries (like uclibc), backtrace support is optional, so the -execinfo.h file may not exist. - -This change adds the check for execinfo.h header and conditionnaly enable -backtrace support. - -This issue has been triggered by Buildroot farms: - http://autobuild.buildroot.org/results/391/391e71a988250ea66ec4dbee6f60fdce9eaf2766/build-end.log - -Signed-off-by: Samuel Martin ---- - dbus/sigsegv.c | 8 +++++++- - wscript | 1 + - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c -index ee12f91..0b31d89 100644 ---- a/dbus/sigsegv.c -+++ b/dbus/sigsegv.c -@@ -27,7 +27,9 @@ - #include - #include - #include --#include -+#if defined(HAVE_EXECINFO_H) -+# include -+#endif /* defined(HAVE_EXECINFO_H) */ - #include - #ifndef NO_CPP_DEMANGLE - char * __cxa_demangle(const char * __mangled_name, char * __output_buffer, size_t * __length, int * __status); -@@ -161,12 +163,16 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { - bp = (void**)bp[0]; - } - #else -+# if defined(HAVE_EXECINFO_H) - jack_error("Stack trace (non-dedicated):"); - sz = backtrace(bt, 20); - strings = backtrace_symbols(bt, sz); - - for(i = 0; i < sz; ++i) - jack_error("%s", strings[i]); -+# else /* defined(HAVE_EXECINFO_H) */ -+ jack_error("Stack trace not available"); -+# endif /* defined(HAVE_EXECINFO_H) */ - #endif - jack_error("End of stack trace"); - exit (-1); -diff --git a/wscript b/wscript -index aef4bd8..63ba3aa 100644 ---- a/wscript -+++ b/wscript -@@ -166,6 +166,7 @@ def configure(conf): - if conf.env['BUILD_JACKDBUS'] != True: - conf.fatal('jackdbus was explicitly requested but cannot be built') - -+ conf.check_cc(header_name='execinfo.h', define_name="HAVE_EXECINFO_H", mandatory=False) - conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE") - - if conf.is_defined('HAVE_SAMPLERATE'): --- -2.8.2 - diff --git a/package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch b/package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch deleted file mode 100644 index e4990b5c34..0000000000 --- a/package/jack2/0004-tests-define-__STDC_LIMIT_MACROS.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c971aaab74ca6e7d4ac3a06bd26e7309dfc5da45 Mon Sep 17 00:00:00 2001 -From: Rahul Bedarkar -Date: Mon, 22 Aug 2016 19:04:47 +0530 -Subject: [PATCH] tests: define __STDC_LIMIT_MACROS - -With glibc 2.16, we get following build error when building jack2: - - [193/247] cxx: tests/iodelay.cpp -> build/tests/iodelay.cpp.4.o - ../tests/iodelay.cpp:171:43: error: 'UINT32_MAX' was not declared in this scope - ../tests/iodelay.cpp:171:55: error: 'UINT32_MAX' was not declared in this scope - ../tests/iodelay.cpp:172:44: error: 'UINT32_MAX' was not declared in this scope - ../tests/iodelay.cpp:172:56: error: 'UINT32_MAX' was not declared in this scope - -In glibc 2.17 or older version, Header defines these macros -for C++ only if explicitly requested by defining __STDC_LIMIT_MACROS. - -We can't use since it requires C++11 standard. - -This build issue found by Buildroot autobuilder. -http://autobuild.buildroot.net/results/369/369ce208ffea43dad75ba0a13469159b341e3bf5/ - -Signed-off-by: Rahul Bedarkar ---- - tests/iodelay.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp -index 1ef470f..f5c5836 100644 ---- a/tests/iodelay.cpp -+++ b/tests/iodelay.cpp -@@ -20,6 +20,7 @@ - - #include - #include -+#define __STDC_LIMIT_MACROS - #include - #include - #include --- -2.6.2 - diff --git a/package/jack2/0005-gcc7.patch b/package/jack2/0005-gcc7.patch deleted file mode 100644 index dadaf44ed9..0000000000 --- a/package/jack2/0005-gcc7.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f7bccdca651592cc4082b28fd4a01ed6ef8ab655 Mon Sep 17 00:00:00 2001 -From: Kjetil Matheussen -Date: Sat, 15 Jul 2017 13:21:59 +0200 -Subject: [PATCH] Tests: Fix compilation with gcc7 - -Fixes -../tests/test.cpp: In function ‘int process4(jack_nframes_t, void*)’: -../tests/test.cpp:483:73: error: call of overloaded ‘abs(jack_nframes_t)’ is ambiguous - if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { - -Downloaded from upstream commit -https://github.com/jackaudio/jack2/commit/f7bccdca651592cc4082b28fd4a01ed6ef8ab655 - -Signed-off-by: Bernd Kuhls ---- - tests/test.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test.cpp b/tests/test.cpp -index 8a8a8117..d2ef9a05 100644 ---- a/tests/test.cpp -+++ b/tests/test.cpp -@@ -479,7 +479,7 @@ int process4(jack_nframes_t nframes, void *arg) - jack_nframes_t delta_time = cur_time - last_time; - - Log("calling process4 callback : jack_frame_time = %ld delta_time = %ld\n", cur_time, delta_time); -- if (delta_time > 0 && (jack_nframes_t)abs(delta_time - cur_buffer_size) > tolerance) { -+ if (delta_time > 0 && abs((int64_t)delta_time - (int64_t)cur_buffer_size) > (int64_t)tolerance) { - printf("!!! ERROR !!! jack_frame_time seems to return incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n", cur_buffer_size, delta_time, tolerance); - } - diff --git a/package/jack2/0006-fix-ftbfs-with-clang.patch b/package/jack2/0006-fix-ftbfs-with-clang.patch deleted file mode 100644 index a73fe69e15..0000000000 --- a/package/jack2/0006-fix-ftbfs-with-clang.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001 -From: Adrian Knoth -Date: Thu, 18 Sep 2014 18:29:23 +0200 -Subject: [PATCH] Fix FTBFS with clang++ - -Forwarded from http://bugs.debian.org/757820 - -Downloaded from upstream commit -https://github.com/jackaudio/jack2/commit/d3c8e2d8d78899fba40a3e677ed4dbe388d82269 - -Signed-off-by: Bernd Kuhls ---- - common/memops.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/common/memops.c b/common/memops.c -index 27f6194a..2d416b64 100644 ---- a/common/memops.c -+++ b/common/memops.c -@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s) - */ - static unsigned int seed = 22222; - --inline unsigned int fast_rand() { -+static inline unsigned int fast_rand() { - seed = (seed * 96314165) + 907633515; - return seed; - } diff --git a/package/jack2/jack2.hash b/package/jack2/jack2.hash index ab031b9d94..54107d9bf4 100644 --- a/package/jack2/jack2.hash +++ b/package/jack2/jack2.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d jack2-v1.9.10.tar.gz +sha256 deefe2f936dc32f59ad3cef7e37276c2035ef8a024ca92118f35c9a292272e33 jack2-v1.9.12.tar.gz diff --git a/package/jack2/jack2.mk b/package/jack2/jack2.mk index b61c5d75f7..7f4fbfbe04 100644 --- a/package/jack2/jack2.mk +++ b/package/jack2/jack2.mk @@ -4,7 +4,7 @@ # ################################################################################ -JACK2_VERSION = v1.9.10 +JACK2_VERSION = v1.9.12 JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION)) JACK2_LICENSE = GPL-2.0+ (jack server), LGPL-2.1+ (jack library) JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python From bc516052593947a067c98956931df9df31ee3195 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 16:28:21 +0100 Subject: [PATCH 0284/7482] package/python-ipython: bump to version 7.3.0 - Update hash for COPYING.rst, it has been updated to remove BSD-3-Clause text: https://github.com/ipython/ipython/commit/5a6ef3e35db9ac04bf47a17d96484e03370f03dd - Add LICENSE to license files as this is now the file that contain BSD-3-Clause text Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-ipython/python-ipython.hash | 7 ++++--- package/python-ipython/python-ipython.mk | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index 41bdd70feb..e49ff6b10e 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,5 +1,6 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 7014b8824981eef2cb893ea5398d6b8d ipython-5.8.0.tar.gz -sha256 4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906 ipython-5.8.0.tar.gz +md5 2aec01154a78c6075c5b7f1bfea4abd3 ipython-7.3.0.tar.gz +sha256 06de667a9e406924f97781bda22d5d76bfb39762b678762d86a466e63f65dc39 ipython-7.3.0.tar.gz # Locally computed sha256 -sha256 a5d87689342ec47cebdf623af06cec734c607666c696fe48271f2ff91752443d COPYING.rst +sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst +sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index 79a48bf43d..048428e83a 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 5.8.0 +PYTHON_IPYTHON_VERSION = 7.3.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/41/a6/2d25314b1f9375639d8f8e0f8052e8cec5df511d3449f22c4f1c2d8cb3c6 +PYTHON_IPYTHON_SITE = https://pypi.python.org/packages/82/0a/146b0f0f1ddf13ab8682aed5c5a42250cddf1082e193ec95b50b03b9f791 PYTHON_IPYTHON_LICENSE = BSD-3-Clause -PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst +PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE PYTHON_IPYTHON_SETUP_TYPE = distutils $(eval $(python-package)) From 367adaf0911dfcca172b3702b6c24d009af8923a Mon Sep 17 00:00:00 2001 From: Julien Olivain Date: Sun, 10 Mar 2019 17:30:42 +0100 Subject: [PATCH 0285/7482] configs/imx8mpico: new defconfig Signed-off-by: Julien Olivain Signed-off-by: Thomas Petazzoni --- .gitlab-ci.yml | 1 + DEVELOPERS | 4 ++ board/technexion/imx8mpico/readme.txt | 95 +++++++++++++++++++++++++++ configs/imx8mpico_defconfig | 39 +++++++++++ 4 files changed, 139 insertions(+) create mode 100644 board/technexion/imx8mpico/readme.txt create mode 100644 configs/imx8mpico_defconfig diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2dc489ff76..ef16b73bfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -162,6 +162,7 @@ imx6ulevk_defconfig: { extends: .defconfig } imx6ulpico_defconfig: { extends: .defconfig } imx7d-sdb_defconfig: { extends: .defconfig } imx7dpico_defconfig: { extends: .defconfig } +imx8mpico_defconfig: { extends: .defconfig } lego_ev3_defconfig: { extends: .defconfig } linksprite_pcduino_defconfig: { extends: .defconfig } minnowboard_max-graphical_defconfig: { extends: .defconfig } diff --git a/DEVELOPERS b/DEVELOPERS index 976e1bbda7..c91325e284 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1237,6 +1237,10 @@ F: package/lldpd/ N: Julien Grossholtz F: package/paho-mqtt-c +N: Julien Olivain +F: board/technexion/imx8mpico/ +F: configs/imx8mpico_defconfig + N: Julien Viard de Galbert F: package/dieharder/ F: package/easy-rsa/ diff --git a/board/technexion/imx8mpico/readme.txt b/board/technexion/imx8mpico/readme.txt new file mode 100644 index 0000000000..1a04e44572 --- /dev/null +++ b/board/technexion/imx8mpico/readme.txt @@ -0,0 +1,95 @@ +**************************** +Technexion i.MX8M Pico board +**************************** + +This file documents the Buildroot support for the Technexion i.MX8M +Pico board. The Pico i.MX8M system-on-module [1] is present in +development kits like the Pico Pi i.MX8M [2]. + +Build +===== + +First, configure Buildroot for the i.MX8M Pico board: + + make imx8mpico_defconfig + +Build all components: + + make + +You will find in output/images/ the following files: + - bl31.bin + - boot.vfat + - Image + - imx8-boot-sd.bin + - lpddr4_pmu_train_fw.bin + - pico-8m-dcss-ili9881c.dtb + - pico-8m.dtb + - rootfs.ext4 + - sdcard.img + - signed_hdmi_imx8m.bin + - u-boot.imx + +Flashing sdcard.img on the eMMC +=============================== + +i.MX8M Pico board does not have a SD card slot. The storage is an +eMMC. An easy way to flash the eMMC is to use the u-boot ums +command. The boards are sold pre-flashed with such a u-boot. It is +assumed here that the board has already a working u-boot on eMMC and +jumpers are set to boot on eMMC. See [3]. + +Jumper configuration for eMMC boot: +J1: jumper on pins 4 and 6. +J2: jumper on pins 2 and 4. + +In case the board was flashed with a wrong u-boot, or the eMMC is +erased, u-boot can be loaded by USB Serial Download boot mode, using +imx-usb-loader. See [3] and [4]. + +For flashing: +- Plug the micro USB cable from the Debug USB Port, to your computer +- Plug the USB Type C to your computer, this will power up the board + +In the U-Boot prompt launch: + +=> ums 0 mmc 0 + +This will mount the eMMC content in the host PC as a mass storage device. + +To determine the device associated to the eMMC card have a look in the +/proc/partitions file: + + cat /proc/partitions + +If your system automatically mount some device partitions, make sure +to unmount them. + +Buildroot prepares a bootable "sdcard.img" image in the output/images/ +directory, ready to be dumped on the eMMC. Launch the following +command as root: + + dd if=output/images/sdcard.img of=/dev/ + +*** WARNING! This will destroy all the eMMC content. Use with care! *** + +This operation can take several minutes, depending on the image +size. When tested, a 2MB/s transfer rate was observed. + +For details about the medium image layout, see the definition in +board/freescale/common/imx/genimage.cfg.template. + +Boot the i.MX8M Pico board +========================== + +To boot your newly created system: +- put a micro USB cable into the Debug USB Port and connect using a terminal + emulator at 115200 bps, 8n1; +- power on the board, with USB Type C connector. + +Enjoy! + +[1]. https://www.technexion.com/products/system-on-modules/pico/pico-compute-modules/detail/PICO-IMX8M +[2]. https://www.technexion.com/products/system-on-modules/pico-evaluation-kits/detail/PICO-PI-IMX8M-BASIC +[3]. https://www.technexion.com/support/knowledgebase/boot-configuration-settings-for-pico-baseboards/ +[4]. https://www.technexion.com/support/knowledgebase/loading-bootable-software-images-onto-the-emmc-of-picosom-on-pico-pi/ diff --git a/configs/imx8mpico_defconfig b/configs/imx8mpico_defconfig new file mode 100644 index 0000000000..f22fad0730 --- /dev/null +++ b/configs/imx8mpico_defconfig @@ -0,0 +1,39 @@ +BR2_aarch64=y +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_9=y +BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh" +BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/pico-8m.dtb" +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL=y +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,linux,d69606b85de50b01e7c028ea2188308ab6612c80)/linux-d69606b85de50b01e7c028ea2188308ab6612c80.tar.gz" +BR2_LINUX_KERNEL_DEFCONFIG="tn_imx8" +BR2_LINUX_KERNEL_DTS_SUPPORT=y +BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/pico-8m freescale/pico-8m-dcss-ili9881c" +BR2_PACKAGE_FREESCALE_IMX=y +BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8M=y +BR2_PACKAGE_FIRMWARE_IMX=y +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_ROOTFS_EXT2_4=y +BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +# BR2_TARGET_ROOTFS_TAR is not set +BR2_TARGET_ARM_TRUSTED_FIRMWARE=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.9.88_2.2.0_8qxp_beta2" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y +BR2_TARGET_UBOOT=y +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL=y +BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,TechNexion,u-boot-edm,2fb0ee63229919807737b83d49f5813f594939ac)/u-boot-edm-2fb0ee63229919807737b83d49f5813f594939ac.tar.gz" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pico-8m" +BR2_TARGET_UBOOT_NEEDS_DTC=y +BR2_TARGET_UBOOT_FORMAT_IMX=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM=y +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin" +BR2_TARGET_UBOOT_SPL=y +BR2_PACKAGE_HOST_DOSFSTOOLS=y +BR2_PACKAGE_HOST_GENIMAGE=y +BR2_PACKAGE_HOST_IMX_MKIMAGE=y +BR2_PACKAGE_HOST_MTOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS=y +BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y From 3d9eb78df6b294b22164fc807be98d345e9cd469 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 17 Mar 2019 17:36:39 +0100 Subject: [PATCH 0286/7482] package/python-terminaltables: wrap Config.in help text Fixes the following check-package error: package/python-terminaltables/Config.in:4: help text: <2 spaces><62 chars> (http://nightly.buildroot.org/#writing-rules-config-in) Signed-off-by: Thomas Petazzoni --- package/python-terminaltables/Config.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/python-terminaltables/Config.in b/package/python-terminaltables/Config.in index bb3c51c48f..8f3c4296ed 100644 --- a/package/python-terminaltables/Config.in +++ b/package/python-terminaltables/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PYTHON_TERMINALTABLES bool "python-terminaltables" help - Generate simple tables in terminals from a nested list of strings. + Generate simple tables in terminals from a nested list of + strings. https://github.com/Robpol86/terminaltables From d88a6fa9a96c6af46c847c8b5935a839fd9268af Mon Sep 17 00:00:00 2001 From: Trent Piepho Date: Sat, 23 Feb 2019 02:10:59 +0000 Subject: [PATCH 0287/7482] package/grpc: update to 1.18.0 Bump version. Freshen a patch that had a conflict. Remove duplicate env setting. Add comment about the hack being used to get gRPC to use the buildroot c-ares library. Otherwise it looks like the cmake env settings are out of date vs what the gRPC build documentation says to use. Signed-off-by: Trent Piepho Signed-off-by: Thomas Petazzoni --- ...y-detect-the-availability-of-pthread_setname_.patch | 10 +++++----- package/grpc/grpc.hash | 2 +- package/grpc/grpc.mk | 7 +++++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch b/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch index 766f758172..14807999b8 100644 --- a/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch +++ b/package/grpc/0002-Properly-detect-the-availability-of-pthread_setname_.patch @@ -1,4 +1,4 @@ -From 0aeefca28104f86f14b511feee8d5711f2e8bcb5 Mon Sep 17 00:00:00 2001 +From 0dfb289a3b362b082ac3608d887e42f09dadc0d2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 31 Dec 2018 16:22:07 +0100 Subject: [PATCH] Properly detect the availability of pthread_setname_np() @@ -17,7 +17,7 @@ Signed-off-by: Thomas Petazzoni 2 files changed, 8 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc76cf50da..8dd457fb1a 100644 +index 89e834b..c7bd2ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -94,6 +94,12 @@ endif() @@ -30,11 +30,11 @@ index fc76cf50da..8dd457fb1a 100644 + add_definitions(-DHAVE_PTHREAD_SETNAME_NP) +endif () + - add_definitions(-DPB_FIELD_16BIT) + add_definitions(-DPB_FIELD_32BIT) if (MSVC) diff --git a/include/grpc/impl/codegen/port_platform.h b/include/grpc/impl/codegen/port_platform.h -index b2028a6305..dc89e6ed57 100644 +index 031c0c3..a29a9dc 100644 --- a/include/grpc/impl/codegen/port_platform.h +++ b/include/grpc/impl/codegen/port_platform.h @@ -173,7 +173,9 @@ @@ -48,5 +48,5 @@ index b2028a6305..dc89e6ed57 100644 #else /* musl libc */ #define GPR_MUSL_LIBC_COMPAT 1 -- -2.20.1 +2.14.4 diff --git a/package/grpc/grpc.hash b/package/grpc/grpc.hash index 9e5011125a..3ccf3bdd69 100644 --- a/package/grpc/grpc.hash +++ b/package/grpc/grpc.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 a5342629fe1b689eceb3be4d4f167b04c70a84b9d61cf8b555e968bc500bdb5a grpc-v1.16.1.tar.gz +sha256 069a52a166382dd7b99bf8e7e805f6af40d797cfcee5f80e530ca3fc75fd06e2 grpc-v1.18.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE diff --git a/package/grpc/grpc.mk b/package/grpc/grpc.mk index 6c804429ff..9506e0268a 100644 --- a/package/grpc/grpc.mk +++ b/package/grpc/grpc.mk @@ -4,7 +4,7 @@ # ################################################################################ -GRPC_VERSION = v1.16.1 +GRPC_VERSION = v1.18.0 GRPC_SITE = $(call github,grpc,grpc,$(GRPC_VERSION)) GRPC_LICENSE = Apache-2.0 GRPC_LICENSE_FILES = LICENSE @@ -15,6 +15,10 @@ GRPC_INSTALL_STAGING = YES GRPC_DEPENDENCIES = c-ares host-grpc openssl protobuf zlib HOST_GRPC_DEPENDENCIES = host-c-ares host-openssl host-protobuf host-zlib +# gRPC_CARES_PROVIDER=package won't work because it requires c-ares to have +# installed a cmake config file, but buildroot uses c-ares' autotools build, +# which doesn't do this. These CARES settings trick the gRPC cmake code into +# not looking for c-ares at all and yet still linking with the library. GRPC_CONF_OPTS = \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ @@ -32,7 +36,6 @@ endif HOST_GRPC_CONF_OPTS = \ -D_gRPC_CARES_LIBRARIES=cares \ -DgRPC_CARES_PROVIDER=none \ - -DgRPC_CARES_PROVIDER=none \ -DgRPC_PROTOBUF_PROVIDER=package \ -DgRPC_SSL_PROVIDER=package \ -DgRPC_ZLIB_PROVIDER=package From 20682015c309b91f48eea0ba46730771e712078a Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 18:28:40 +0100 Subject: [PATCH 0288/7482] package/zlog: bump to version ccf8c36e918d6f3c7e6fe9e36eedf8583014c5c9 - Remove patches (already in version) - Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- .../0001-fix-compiling-on-Buildroot.patch | 32 ---------------- ...error-and-avoid-build-failures-becau.patch | 38 ------------------- package/zlog/zlog.hash | 3 +- package/zlog/zlog.mk | 2 +- 4 files changed, 3 insertions(+), 72 deletions(-) delete mode 100644 package/zlog/0001-fix-compiling-on-Buildroot.patch delete mode 100644 package/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch diff --git a/package/zlog/0001-fix-compiling-on-Buildroot.patch b/package/zlog/0001-fix-compiling-on-Buildroot.patch deleted file mode 100644 index 32aa7d6db7..0000000000 --- a/package/zlog/0001-fix-compiling-on-Buildroot.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9f6a55bdb29a2bebc96a68ab53077906c25a9df Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Wed, 22 Jan 2014 15:04:42 +0100 -Subject: [PATCH] Fix compiling on Buildroot - -Buildroot always specifies -D_LARGEFILE_SOURCE, -D_LARGEFILE64_SOURCE, --D_FILE_OFFSET_BITS=64, so define them only if they are not already -defined. - -Signed-off-by: Yegor Yefremov ---- - src/fmacros.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/fmacros.h b/src/fmacros.h -index fa37948..059dfeb 100644 ---- a/src/fmacros.h -+++ b/src/fmacros.h -@@ -14,7 +14,11 @@ - #define _XOPEN_SOURCE - #endif - -+#ifndef _LARGEFILE_SOURCE - #define _LARGEFILE_SOURCE -+#endif -+#ifndef _FILE_OFFSET_BITS - #define _FILE_OFFSET_BITS 64 -+#endif - - #endif --- -1.7.7 diff --git a/package/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch b/package/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch deleted file mode 100644 index 0f1b912387..0000000000 --- a/package/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4a08c9e07fa8b7a1d6a76b927ea97e3eaa784845 Mon Sep 17 00:00:00 2001 -From: Ezequiel Garcia -Date: Sun, 26 Oct 2014 16:16:25 -0300 -Subject: [PATCH] compile: Remove -Werror and avoid build failures because of - warnings - -Using -Werror on production is a bad idea, as otherwise harmless warnings -get treated as errors breaking builds. This is currently the case with -Nios-II architecture toolchain, warning about a deprecated macro: - -../usr/nios2-buildroot-linux-gnu/sysroot/usr/include/features.h:148:3: -error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp] - # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" - -Instead of trying to fix the macro, let's fix the real issue here, -and remove -Werror. - -Signed-off-by: Ezequiel Garcia ---- - src/makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/makefile b/src/makefile -index 294dc08..4ac4c43 100644 ---- a/src/makefile -+++ b/src/makefile -@@ -32,7 +32,7 @@ ZLOG_MINOR=2 - # Fallback to gcc when $CC is not in $PATH. - CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') - OPTIMIZATION?=-O2 --WARNINGS=-Wall -Werror -Wstrict-prototypes -fwrapv -+WARNINGS=-Wall -Wstrict-prototypes -fwrapv - DEBUG?= -g -ggdb - REAL_CFLAGS=$(OPTIMIZATION) -fPIC -pthread $(CFLAGS) $(WARNINGS) $(DEBUG) - REAL_LDFLAGS=$(LDFLAGS) -pthread --- -2.1.0 - diff --git a/package/zlog/zlog.hash b/package/zlog/zlog.hash index 1de23c9a71..699f75c38e 100644 --- a/package/zlog/zlog.hash +++ b/package/zlog/zlog.hash @@ -1,2 +1,3 @@ # Locally computed -sha256 d3afb1f0ce67df29f759da74235949370ac2818faf242f3f674cb48f9f4c57d3 zlog-6ddb9bbf3ff0123e701bf60996f351576ebe9c00.tar.gz +sha256 b150ff725e5f9e839f41c0f3d2e8f0e3cc303aa51194be0bc34a3c3299acc059 zlog-ccf8c36e918d6f3c7e6fe9e36eedf8583014c5c9.tar.gz +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING diff --git a/package/zlog/zlog.mk b/package/zlog/zlog.mk index 8e005e4340..fedce12cbb 100644 --- a/package/zlog/zlog.mk +++ b/package/zlog/zlog.mk @@ -4,7 +4,7 @@ # ################################################################################ -ZLOG_VERSION = 6ddb9bbf3ff0123e701bf60996f351576ebe9c00 +ZLOG_VERSION = ccf8c36e918d6f3c7e6fe9e36eedf8583014c5c9 ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) ZLOG_LICENSE = LGPL-2.1 ZLOG_LICENSE_FILES = COPYING From c46afc37dc877f1e94ffde0d77585290711b27ec Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 17 Mar 2019 21:09:46 +0200 Subject: [PATCH 0289/7482] package/libpcap: fix bluez circular dependency The optional bluez_utils dependency of libpcap creates a circular dependency: $ make dbus-show-recursive-depends Recursion detected for : systemd which is a dependency of: dbus which is a dependency of: bluez_utils which is a dependency of: libpcap which is a dependency of: iptables which is a dependency of: systemd make: *** [package/dbus/dbus.mk:121: dbus-show-recursive-depends] Error 1 Drop support for bluez_utils. For bluez5_utils, which also depends on dbus, we only need the headers in the bluez5_utils-headers package. Use that to break the circular dependency. Fixes: http://autobuild.buildroot.net/results/9c3/9c3ee798fa6bb501a20a7892c0b085d2b279b664/ Suggested-by: Yann E. MORIN Signed-off-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libpcap/libpcap.mk | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 83188c8c48..2f46426d37 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -26,10 +26,8 @@ define LIBPCAP_CONFIG_REMOVE_RPATH endef LIBPCAP_POST_BUILD_HOOKS = LIBPCAP_CONFIG_REMOVE_RPATH -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -LIBPCAP_DEPENDENCIES += bluez_utils -else ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) -LIBPCAP_DEPENDENCIES += bluez5_utils +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) +LIBPCAP_DEPENDENCIES += bluez5_utils-headers else LIBPCAP_CONF_OPTS += --disable-bluetooth endif From 53e3860a0e22fca5348a781a5b2e70c19403d172 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 18 Mar 2019 06:05:57 +0800 Subject: [PATCH 0290/7482] package/python-aiojobs: drop aiohttp dependency aiohttp isn't a required dependency for aiojobs Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aiojobs/Config.in | 1 - 1 file changed, 1 deletion(-) diff --git a/package/python-aiojobs/Config.in b/package/python-aiojobs/Config.in index 54d6c02a8e..ab61985164 100644 --- a/package/python-aiojobs/Config.in +++ b/package/python-aiojobs/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_PYTHON_AIOJOBS bool "python-aiojobs" depends on BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_AIOHTTP # runtime help Jobs scheduler for managing background task (asyncio). From faeb44b5e2c79439b189b6399ea81cd9509920a9 Mon Sep 17 00:00:00 2001 From: James Hilliard Date: Mon, 18 Mar 2019 06:12:34 +0800 Subject: [PATCH 0291/7482] package/python-aiorwlock: bump to version 0.6.0 Signed-off-by: James Hilliard Signed-off-by: Thomas Petazzoni --- package/python-aiorwlock/python-aiorwlock.hash | 4 ++-- package/python-aiorwlock/python-aiorwlock.mk | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/python-aiorwlock/python-aiorwlock.hash b/package/python-aiorwlock/python-aiorwlock.hash index 51d1a29f20..8556f5ebd3 100644 --- a/package/python-aiorwlock/python-aiorwlock.hash +++ b/package/python-aiorwlock/python-aiorwlock.hash @@ -1,5 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/aiorwlock/json -md5 ee741761e4c9b1612e9dccf7f8bccdd0 aiorwlock-0.5.0.tar.gz -sha256 3cd892576d024934d72c3dd098033f276ace3495e71a1197daa8d21409a52174 aiorwlock-0.5.0.tar.gz +md5 8eccf28315b4f851f6f7e9332edeec52 aiorwlock-0.6.0.tar.gz +sha256 cd310f33a7ea3bf6fd76fcf0c1ba6e4d7eef4d5ded59e95859494425fb7e599d aiorwlock-0.6.0.tar.gz # Locally computed sha256 checksums sha256 56fb2baf14d84c59c15abbfbb1fdf30a724017e2ce97894a8236764513d10397 LICENSE diff --git a/package/python-aiorwlock/python-aiorwlock.mk b/package/python-aiorwlock/python-aiorwlock.mk index ca6aa25294..48e74c02fd 100644 --- a/package/python-aiorwlock/python-aiorwlock.mk +++ b/package/python-aiorwlock/python-aiorwlock.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_AIORWLOCK_VERSION = 0.5.0 +PYTHON_AIORWLOCK_VERSION = 0.6.0 PYTHON_AIORWLOCK_SOURCE = aiorwlock-$(PYTHON_AIORWLOCK_VERSION).tar.gz -PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/0c/20/d30f332e6ecb2be467ab5603e277b26e3a8eb2a72f75bf8d309bdd4c0c82 +PYTHON_AIORWLOCK_SITE = https://files.pythonhosted.org/packages/77/cf/2a2584c4fc1096ae959d7d189f205eb9c872ec58aca2cde16009d2d83b9e PYTHON_AIORWLOCK_SETUP_TYPE = setuptools PYTHON_AIORWLOCK_LICENSE = Apache-2.0 PYTHON_AIORWLOCK_LICENSE_FILES = LICENSE From 30742cb4eee4510b803c53c7c12de31d8c256ad1 Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sun, 17 Mar 2019 20:47:59 +0000 Subject: [PATCH 0292/7482] package/nodejs: correct license file hash The LICENSE file in nodejs 10.15.3 updated to include additional 3rd party licenses. Fixes: - http://autobuild.buildroot.net/results/4bf66b9f05e9d04171156e44c7dd87619e429747 - http://autobuild.buildroot.net/results/a65776ba1045f12263a686933eb6a4b5d6ff7333 - http://autobuild.buildroot.net/results/aab619106a7d763f45e95a7ae3d85816fb4a6512 - http://autobuild.buildroot.net/results/bb6cb93f323be22e4c0efc05011042526c01f62c Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/nodejs/nodejs.hash b/package/nodejs/nodejs.hash index e9c174e662..6cb2cdd5b7 100644 --- a/package/nodejs/nodejs.hash +++ b/package/nodejs/nodejs.hash @@ -2,4 +2,4 @@ sha256 4e22d926f054150002055474e452ed6cbb85860aa7dc5422213a2002ed9791d5 node-v10.15.3.tar.xz # Hash for license file -sha256 b87be6c1479ed977481115869c2dd8b6d59e5ea55aa09939d6c898242121b2f5 LICENSE +sha256 7ab373b3671d57d91078f5345ea9486443c9ca498eb9f8cf87dee2641a6fa09d LICENSE From 620038c1492311ce446d38d73318ef6b4ab8a7ba Mon Sep 17 00:00:00 2001 From: Martin Bark Date: Sun, 17 Mar 2019 20:48:00 +0000 Subject: [PATCH 0293/7482] package/nodejs: link with libatomic when needed Fixes: - http://autobuild.buildroot.net/results/804951467d3f5b212bd33b95dc8fe9c6f5f63838 Signed-off-by: Martin Bark Signed-off-by: Thomas Petazzoni --- package/nodejs/nodejs.mk | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/package/nodejs/nodejs.mk b/package/nodejs/nodejs.mk index 5cae449244..2577239e19 100644 --- a/package/nodejs/nodejs.mk +++ b/package/nodejs/nodejs.mk @@ -116,6 +116,12 @@ NODEJS_MIPS_ARCH_VARIANT = r1 endif endif +NODEJS_LDFLAGS = $(TARGET_LDFLAGS) + +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +NODEJS_LDFLAGS += -latomic +endif + define NODEJS_CONFIGURE_CMDS mkdir -p $(@D)/bin ln -sf $(HOST_DIR)/bin/python2 $(@D)/bin/python @@ -123,6 +129,7 @@ define NODEJS_CONFIGURE_CMDS (cd $(@D); \ $(TARGET_CONFIGURE_OPTS) \ PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" \ PYTHON=$(HOST_DIR)/bin/python2 \ $(HOST_DIR)/bin/python2 ./configure \ @@ -145,6 +152,7 @@ define NODEJS_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" endef @@ -156,6 +164,7 @@ NODEJS_MODULES_LIST= $(call qstrip,\ # Define NPM for other packages to use NPM = $(TARGET_CONFIGURE_OPTS) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" \ npm_config_arch=$(NODEJS_CPU) \ npm_config_target_arch=$(NODEJS_CPU) \ @@ -184,6 +193,7 @@ define NODEJS_INSTALL_TARGET_CMDS $(TARGET_CONFIGURE_OPTS) \ NO_LOAD=cctest.target.mk \ PATH=$(@D)/bin:$(BR_PATH) \ + LDFLAGS="$(NODEJS_LDFLAGS)" \ LD="$(TARGET_CXX)" $(NODEJS_INSTALL_MODULES) endef From 0c34e138b597668a79fc7e71f339a556a6b695e9 Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Sun, 17 Mar 2019 22:18:48 +0100 Subject: [PATCH 0294/7482] package/binutils: upstream fixes for 2.31.1 Combining musl and binutils 2.31.1 will produce static applications that crash immediately. This commit picks up 3 upstream commits to remedy this. See https://sourceware.org/bugzilla/show_bug.cgi?id=23428 Signed-off-by: Norbert Lange Signed-off-by: Thomas Petazzoni --- ...OPERTY_X86_ISA_1_USED-note-if-needed.patch | 568 +++++++++++++++++ ...ly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch | 588 ++++++++++++++++++ ...operly-add-X86_ISA_1_NEEDED-property.patch | 140 +++++ 3 files changed, 1296 insertions(+) create mode 100644 package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch create mode 100644 package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch create mode 100644 package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch diff --git a/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch b/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch new file mode 100644 index 0000000000..8a05af4bb6 --- /dev/null +++ b/package/binutils/2.31.1/0012-x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch @@ -0,0 +1,568 @@ +From 6737a6b34f4823deb7142f27b4074831a37ac1e1 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Fri, 20 Jul 2018 09:18:47 -0700 +Subject: [PATCH] x86: Add a GNU_PROPERTY_X86_ISA_1_USED note if needed + +When -z separate-code, which is enabled by default for Linux/x86, is +used to create executable, ld won't place any data in the code-only +PT_LOAD segment. If there are no data sections placed before the +code-only PT_LOAD segment, the program headers won't be mapped into +any PT_LOAD segment. When the executable tries to access it (based +on the program header address passed in AT_PHDR), it will lead to +segfault. This patch inserts a GNU_PROPERTY_X86_ISA_1_USED note if +there may be no data sections before the text section so that the +first PT_LOAD segment won't be code-only and will contain the program +header. + +Testcases are adjusted to either pass "-z noseparate-code" to ld or +discard the .note.gnu.property section. A Linux/x86 run-time test is +added. + +bfd/ + + PR ld/23428 + * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the + separate code program header is needed, make sure that the first + read-only PT_LOAD segment has no code by adding a + GNU_PROPERTY_X86_ISA_1_USED note. + +ld/ + + PR ld/23428 + * testsuite/ld-elf/linux-x86.S: New file. + * testsuite/ld-elf/linux-x86.exp: Likewise. + * testsuite/ld-elf/pr23428.c: Likewise. + * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld + for Linux/x86 targets. + * testsuite/ld-i386/abs-iamcu.d: Likewise. + * testsuite/ld-i386/abs.d: Likewise. + * testsuite/ld-i386/pr12718.d: Likewise. + * testsuite/ld-i386/pr12921.d: Likewise. + * testsuite/ld-x86-64/abs-k1om.d: Likewise. + * testsuite/ld-x86-64/abs-l1om.d: Likewise. + * testsuite/ld-x86-64/abs.d: Likewise. + * testsuite/ld-x86-64/pr12718.d: Likewise. + * testsuite/ld-x86-64/pr12921.d: Likewise. + * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property + section. + * testsuite/ld-scripts/print-memory-usage.t: Likewise. + * testsuite/ld-scripts/size-2.t: Likewise. + * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld + to create executable if language is "asm". + +(cherry picked from commit 241e64e3b42cd9eba514b8e0ad2ef39a337f10a5) +Signed-off-by: Norbert Lange +--- + bfd/ChangeLog | 8 ++++ + bfd/elfxx-x86.c | 60 +++++++++++++++++++------- + ld/ChangeLog | 24 +++++++++++ + ld/testsuite/ld-elf/linux-x86.S | 63 ++++++++++++++++++++++++++++ + ld/testsuite/ld-elf/linux-x86.exp | 46 ++++++++++++++++++++ + ld/testsuite/ld-elf/pr23428.c | 43 +++++++++++++++++++ + ld/testsuite/ld-elf/sec64k.exp | 2 + + ld/testsuite/ld-i386/abs-iamcu.d | 2 +- + ld/testsuite/ld-i386/abs.d | 2 +- + ld/testsuite/ld-i386/pr12718.d | 2 +- + ld/testsuite/ld-i386/pr12921.d | 2 +- + ld/testsuite/ld-linkonce/zeroeh.ld | 1 + + ld/testsuite/ld-scripts/print-memory-usage.t | 2 + + ld/testsuite/ld-scripts/size-2.t | 1 + + ld/testsuite/ld-x86-64/abs-k1om.d | 2 +- + ld/testsuite/ld-x86-64/abs-l1om.d | 2 +- + ld/testsuite/ld-x86-64/abs.d | 2 +- + ld/testsuite/ld-x86-64/pr12718.d | 2 +- + ld/testsuite/ld-x86-64/pr12921.d | 2 +- + ld/testsuite/lib/ld-lib.exp | 5 ++- + 20 files changed, 248 insertions(+), 25 deletions(-) + create mode 100644 ld/testsuite/ld-elf/linux-x86.S + create mode 100644 ld/testsuite/ld-elf/linux-x86.exp + create mode 100644 ld/testsuite/ld-elf/pr23428.c + +diff --git a/bfd/ChangeLog b/bfd/ChangeLog +index 1c1174a..d3831b7 100644 +--- a/bfd/ChangeLog ++++ b/bfd/ChangeLog +@@ -1,3 +1,11 @@ ++2018-07-23 H.J. Lu ++ ++ PR ld/23428 ++ * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): If the ++ separate code program header is needed, make sure that the first ++ read-only PT_LOAD segment has no code by adding a ++ GNU_PROPERTY_X86_ISA_1_USED note. ++ + 2018-07-18 Nick Clifton + + * development.sh: Set to true. +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index a2497aa..2e4ff88 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2524,6 +2524,7 @@ _bfd_x86_elf_link_setup_gnu_properties + const struct elf_backend_data *bed; + unsigned int class_align = ABI_64_P (info->output_bfd) ? 3 : 2; + unsigned int got_align; ++ bfd_boolean has_text = FALSE; + + features = 0; + if (info->ibt) +@@ -2538,24 +2539,59 @@ _bfd_x86_elf_link_setup_gnu_properties + if (bfd_get_flavour (pbfd) == bfd_target_elf_flavour + && bfd_count_sections (pbfd) != 0) + { ++ if (!has_text) ++ { ++ /* Check if there is no non-empty text section. */ ++ sec = bfd_get_section_by_name (pbfd, ".text"); ++ if (sec != NULL && sec->size != 0) ++ has_text = TRUE; ++ } ++ + ebfd = pbfd; + + if (elf_properties (pbfd) != NULL) + break; + } + +- if (ebfd != NULL && features) ++ bed = get_elf_backend_data (info->output_bfd); ++ ++ htab = elf_x86_hash_table (info, bed->target_id); ++ if (htab == NULL) ++ return pbfd; ++ ++ if (ebfd != NULL) + { +- /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and +- GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ +- prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_FEATURE_1_AND, +- 4); +- prop->u.number |= features; +- prop->pr_kind = property_number; ++ prop = NULL; ++ if (features) ++ { ++ /* If features is set, add GNU_PROPERTY_X86_FEATURE_1_IBT and ++ GNU_PROPERTY_X86_FEATURE_1_SHSTK. */ ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_FEATURE_1_AND, ++ 4); ++ prop->u.number |= features; ++ prop->pr_kind = property_number; ++ } ++ else if (has_text ++ && elf_properties (ebfd) == NULL ++ && elf_tdata (info->output_bfd)->o->build_id.sec == NULL ++ && !htab->elf.dynamic_sections_created ++ && !info->traditional_format ++ && (info->output_bfd->flags & D_PAGED) != 0 ++ && info->separate_code) ++ { ++ /* If the separate code program header is needed, make sure ++ that the first read-only PT_LOAD segment has no code by ++ adding a GNU_PROPERTY_X86_ISA_1_USED note. */ ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_ISA_1_USED, ++ 4); ++ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; ++ prop->pr_kind = property_number; ++ } + + /* Create the GNU property note section if needed. */ +- if (pbfd == NULL) ++ if (prop != NULL && pbfd == NULL) + { + sec = bfd_make_section_with_flags (ebfd, + NOTE_GNU_PROPERTY_SECTION_NAME, +@@ -2581,12 +2617,6 @@ error_alignment: + + pbfd = _bfd_elf_link_setup_gnu_properties (info); + +- bed = get_elf_backend_data (info->output_bfd); +- +- htab = elf_x86_hash_table (info, bed->target_id); +- if (htab == NULL) +- return pbfd; +- + htab->r_info = init_table->r_info; + htab->r_sym = init_table->r_sym; + +diff --git a/ld/ChangeLog b/ld/ChangeLog +index c07e442..cfadbd4 100644 +--- a/ld/ChangeLog ++++ b/ld/ChangeLog +@@ -1,3 +1,27 @@ ++2018-07-23 H.J. Lu ++ ++ PR ld/23428 ++ * testsuite/ld-elf/linux-x86.S: New file. ++ * testsuite/ld-elf/linux-x86.exp: Likewise. ++ * testsuite/ld-elf/pr23428.c: Likewise. ++ * testsuite/ld-elf/sec64k.exp: Pass "-z noseparate-code" to ld ++ for Linux/x86 targets. ++ * testsuite/ld-i386/abs-iamcu.d: Likewise. ++ * testsuite/ld-i386/abs.d: Likewise. ++ * testsuite/ld-i386/pr12718.d: Likewise. ++ * testsuite/ld-i386/pr12921.d: Likewise. ++ * testsuite/ld-x86-64/abs-k1om.d: Likewise. ++ * testsuite/ld-x86-64/abs-l1om.d: Likewise. ++ * testsuite/ld-x86-64/abs.d: Likewise. ++ * testsuite/ld-x86-64/pr12718.d: Likewise. ++ * testsuite/ld-x86-64/pr12921.d: Likewise. ++ * testsuite/ld-linkonce/zeroeh.ld: Discard .note.gnu.property ++ section. ++ * testsuite/ld-scripts/print-memory-usage.t: Likewise. ++ * testsuite/ld-scripts/size-2.t: Likewise. ++ * testsuite/lib/ld-lib.exp (run_ld_link_exec_tests): Use ld to ++ create executable if language is "asm". ++ + 2018-07-18 Nick Clifton + + 2.31.1 Release point. +diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S +new file mode 100644 +index 0000000..bdf40c6 +--- /dev/null ++++ b/ld/testsuite/ld-elf/linux-x86.S +@@ -0,0 +1,63 @@ ++ .text ++ .globl _start ++ .type _start,@function ++ .p2align 4 ++_start: ++ xorl %ebp, %ebp ++#ifdef __LP64__ ++ popq %rdi ++ movq %rsp, %rsi ++ andq $~15, %rsp ++#elif defined __x86_64__ ++ mov (%rsp),%edi ++ addl $4,%esp ++ movl %esp, %esi ++ andl $~15, %esp ++#else ++ popl %esi ++ movl %esp, %ecx ++ andl $~15, %esp ++ ++ subl $8,%esp ++ pushl %ecx ++ pushl %esi ++#endif ++ ++ call main ++ ++ hlt ++ ++ .type syscall, @function ++ .globl syscall ++ .p2align 4 ++syscall: ++#ifdef __x86_64__ ++ movq %rdi, %rax /* Syscall number -> rax. */ ++ movq %rsi, %rdi /* shift arg1 - arg5. */ ++ movq %rdx, %rsi ++ movq %rcx, %rdx ++ movq %r8, %r10 ++ movq %r9, %r8 ++ movq 8(%rsp),%r9 /* arg6 is on the stack. */ ++ syscall /* Do the system call. */ ++#else ++ push %ebp ++ push %edi ++ push %esi ++ push %ebx ++ mov 0x2c(%esp),%ebp ++ mov 0x28(%esp),%edi ++ mov 0x24(%esp),%esi ++ mov 0x20(%esp),%edx ++ mov 0x1c(%esp),%ecx ++ mov 0x18(%esp),%ebx ++ mov 0x14(%esp),%eax ++ int $0x80 ++ pop %ebx ++ pop %esi ++ pop %edi ++ pop %ebp ++#endif ++ ret /* Return to caller. */ ++ .size syscall, .-syscall ++ .section .note.GNU-stack,"",@progbits +diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp +new file mode 100644 +index 0000000..36217c6 +--- /dev/null ++++ b/ld/testsuite/ld-elf/linux-x86.exp +@@ -0,0 +1,46 @@ ++# Expect script for simple native Linux/x86 tests. ++# Copyright (C) 2018 Free Software Foundation, Inc. ++# ++# This file is part of the GNU Binutils. ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 3 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program; if not, write to the Free Software ++# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, ++# MA 02110-1301, USA. ++# ++ ++# Test very simple native Linux/x86 programs with linux-x86.S. ++if { ![isnative] || [which $CC] == 0 \ ++ || (![istarget "i?86-*-linux*"] \ ++ && ![istarget "x86_64-*-linux*"] \ ++ && ![istarget "amd64-*-linux*"]) } { ++ return ++} ++ ++# Add $PLT_CFLAGS if PLT is expected. ++global PLT_CFLAGS ++# Add $NOPIE_CFLAGS and $NOPIE_LDFLAGS if non-PIE is required. ++global NOPIE_CFLAGS NOPIE_LDFLAGS ++ ++run_ld_link_exec_tests [list \ ++ [list \ ++ "Run PR ld/23428 test" \ ++ "--no-dynamic-linker -z separate-code" \ ++ "" \ ++ { linux-x86.S pr23428.c } \ ++ "pr23428" \ ++ "pass.out" \ ++ "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ ++ "asm" \ ++ ] \ ++] +diff --git a/ld/testsuite/ld-elf/pr23428.c b/ld/testsuite/ld-elf/pr23428.c +new file mode 100644 +index 0000000..3631ed7 +--- /dev/null ++++ b/ld/testsuite/ld-elf/pr23428.c +@@ -0,0 +1,43 @@ ++#include ++#include ++#include ++ ++#define STRING_COMMA_LEN(STR) (STR), (sizeof (STR) - 1) ++ ++int ++main (int argc, char **argv) ++{ ++ char **ev = &argv[argc + 1]; ++ char **evp = ev; ++ ElfW(auxv_t) *av; ++ const ElfW(Phdr) *phdr = NULL; ++ size_t phnum = 0; ++ size_t loadnum = 0; ++ int fd = STDOUT_FILENO; ++ size_t i; ++ ++ while (*evp++ != NULL) ++ ; ++ ++ av = (ElfW(auxv_t) *) evp; ++ ++ for (; av->a_type != AT_NULL; ++av) ++ switch (av->a_type) ++ { ++ case AT_PHDR: ++ phdr = (const void *) av->a_un.a_val; ++ break; ++ case AT_PHNUM: ++ phnum = av->a_un.a_val; ++ break; ++ } ++ ++ for (i = 0; i < phnum; i++, phdr++) ++ if (phdr->p_type == PT_LOAD) ++ loadnum++; ++ ++ syscall (SYS_write, fd, STRING_COMMA_LEN ("PASS\n")); ++ ++ syscall (SYS_exit, !loadnum); ++ return 0; ++} +diff --git a/ld/testsuite/ld-elf/sec64k.exp b/ld/testsuite/ld-elf/sec64k.exp +index b58139e..3909c0e 100644 +--- a/ld/testsuite/ld-elf/sec64k.exp ++++ b/ld/testsuite/ld-elf/sec64k.exp +@@ -177,6 +177,8 @@ if { ![istarget "d10v-*-*"] + foreach sfile $sfiles { puts $ofd "#source: $sfile" } + if { [istarget spu*-*-*] } { + puts $ofd "#ld: --local-store 0:0" ++ } elseif { [istarget "i?86-*-linux*"] || [istarget "x86_64-*-linux*"] } { ++ puts $ofd "#ld: -z noseparate-code" + } else { + puts $ofd "#ld:" + } +diff --git a/ld/testsuite/ld-i386/abs-iamcu.d b/ld/testsuite/ld-i386/abs-iamcu.d +index ac9beff..aba7d6b 100644 +--- a/ld/testsuite/ld-i386/abs-iamcu.d ++++ b/ld/testsuite/ld-i386/abs-iamcu.d +@@ -2,7 +2,7 @@ + #source: abs.s + #source: zero.s + #as: --32 -march=iamcu +-#ld: -m elf_iamcu ++#ld: -m elf_iamcu -z noseparate-code + #objdump: -rs -j .text + + .*: file format .* +diff --git a/ld/testsuite/ld-i386/abs.d b/ld/testsuite/ld-i386/abs.d +index e660aca..191ee44 100644 +--- a/ld/testsuite/ld-i386/abs.d ++++ b/ld/testsuite/ld-i386/abs.d +@@ -2,7 +2,7 @@ + #as: --32 + #source: abs.s + #source: zero.s +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #objdump: -rs + + .*: file format .* +diff --git a/ld/testsuite/ld-i386/pr12718.d b/ld/testsuite/ld-i386/pr12718.d +index ec51540..7eba52d 100644 +--- a/ld/testsuite/ld-i386/pr12718.d ++++ b/ld/testsuite/ld-i386/pr12718.d +@@ -1,6 +1,6 @@ + #name: PR ld/12718 + #as: --32 +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #readelf: -S + + There are 5 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-i386/pr12921.d b/ld/testsuite/ld-i386/pr12921.d +index e49079b..ea2da3e 100644 +--- a/ld/testsuite/ld-i386/pr12921.d ++++ b/ld/testsuite/ld-i386/pr12921.d +@@ -1,6 +1,6 @@ + #name: PR ld/12921 + #as: --32 +-#ld: -melf_i386 ++#ld: -melf_i386 -z noseparate-code + #readelf: -S --wide + + There are 7 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-linkonce/zeroeh.ld b/ld/testsuite/ld-linkonce/zeroeh.ld +index b22eaa1..f89855a 100644 +--- a/ld/testsuite/ld-linkonce/zeroeh.ld ++++ b/ld/testsuite/ld-linkonce/zeroeh.ld +@@ -2,4 +2,5 @@ SECTIONS { + .text 0xa00 : { *(.text); *(.gnu.linkonce.t.*) } + .gcc_except_table 0x2000 : { *(.gcc_except_table) } + .eh_frame 0x4000 : { *(.eh_frame) } ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-scripts/print-memory-usage.t b/ld/testsuite/ld-scripts/print-memory-usage.t +index 5ff057a..6eda1d2 100644 +--- a/ld/testsuite/ld-scripts/print-memory-usage.t ++++ b/ld/testsuite/ld-scripts/print-memory-usage.t +@@ -11,4 +11,6 @@ SECTIONS + *(.data) + *(.rw) + } ++ ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-scripts/size-2.t b/ld/testsuite/ld-scripts/size-2.t +index 7238639..c3c4edd 100644 +--- a/ld/testsuite/ld-scripts/size-2.t ++++ b/ld/testsuite/ld-scripts/size-2.t +@@ -18,4 +18,5 @@ SECTIONS + LONG (SIZEOF (.tdata)) + LONG (SIZEOF (.tbss)) + } :image ++ /DISCARD/ : { *(.note.gnu.property) } + } +diff --git a/ld/testsuite/ld-x86-64/abs-k1om.d b/ld/testsuite/ld-x86-64/abs-k1om.d +index 2c26639..6b0fde0 100644 +--- a/ld/testsuite/ld-x86-64/abs-k1om.d ++++ b/ld/testsuite/ld-x86-64/abs-k1om.d +@@ -2,7 +2,7 @@ + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s + #as: --64 -march=k1om +-#ld: -m elf_k1om ++#ld: -m elf_k1om -z noseparate-code + #objdump: -rs -j .text + + .*: file format .* +diff --git a/ld/testsuite/ld-x86-64/abs-l1om.d b/ld/testsuite/ld-x86-64/abs-l1om.d +index 1fb96d4..f87869f 100644 +--- a/ld/testsuite/ld-x86-64/abs-l1om.d ++++ b/ld/testsuite/ld-x86-64/abs-l1om.d +@@ -2,7 +2,7 @@ + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s + #as: --64 -march=l1om +-#ld: -m elf_l1om ++#ld: -m elf_l1om -z noseparate-code + #objdump: -rs -j .text + #target: x86_64-*-linux* + +diff --git a/ld/testsuite/ld-x86-64/abs.d b/ld/testsuite/ld-x86-64/abs.d +index b24b018..d99ab46 100644 +--- a/ld/testsuite/ld-x86-64/abs.d ++++ b/ld/testsuite/ld-x86-64/abs.d +@@ -1,7 +1,7 @@ + #name: Absolute non-overflowing relocs + #source: ../ld-i386/abs.s + #source: ../ld-i386/zero.s +-#ld: ++#ld: -z noseparate-code + #objdump: -rs + + .*: file format .* +diff --git a/ld/testsuite/ld-x86-64/pr12718.d b/ld/testsuite/ld-x86-64/pr12718.d +index 07d1732..2c503ff 100644 +--- a/ld/testsuite/ld-x86-64/pr12718.d ++++ b/ld/testsuite/ld-x86-64/pr12718.d +@@ -1,6 +1,6 @@ + #name: PR ld/12718 + #as: --64 +-#ld: -melf_x86_64 ++#ld: -melf_x86_64 -z noseparate-code + #readelf: -S --wide + + There are 5 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/ld-x86-64/pr12921.d b/ld/testsuite/ld-x86-64/pr12921.d +index 6fe6abe..1162d55 100644 +--- a/ld/testsuite/ld-x86-64/pr12921.d ++++ b/ld/testsuite/ld-x86-64/pr12921.d +@@ -1,6 +1,6 @@ + #name: PR ld/12921 + #as: --64 +-#ld: -melf_x86_64 ++#ld: -melf_x86_64 -z noseparate-code + #readelf: -S --wide + + There are 7 section headers, starting at offset 0x[0-9a-f]+: +diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp +index cfbefe9..1095091 100644 +--- a/ld/testsuite/lib/ld-lib.exp ++++ b/ld/testsuite/lib/ld-lib.exp +@@ -1482,7 +1482,10 @@ proc run_ld_link_exec_tests { ldtests args } { + continue + } + +- if { [ string match "c++" $lang ] } { ++ if { [ string match "asm" $lang ] } { ++ set link_proc ld_link ++ set link_cmd $ld ++ } elseif { [ string match "c++" $lang ] } { + set link_proc ld_link + set link_cmd $CXX + } else { +-- +2.9.3 + diff --git a/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch b/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch new file mode 100644 index 0000000000..a4c48985d9 --- /dev/null +++ b/package/binutils/2.31.1/0013-x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch @@ -0,0 +1,588 @@ +From d55c3e36094f06bb1fb02f5eac19fdccf1d91f7e Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 8 Aug 2018 06:09:15 -0700 +Subject: [PATCH] x86: Properly merge GNU_PROPERTY_X86_ISA_1_USED +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf8 +Content-Transfer-Encoding: 8bit + +Without the GNU_PROPERTY_X86_ISA_1_USED property, all ISAs may be used. +If a bit in the GNU_PROPERTY_X86_ISA_1_USED property is unset, the +corresponding x86 instruction set isn’t used. When merging properties +from 2 input files and one input file doesn't have the +GNU_PROPERTY_X86_ISA_1_USED property, the output file shouldn't have +it neither. This patch removes the GNU_PROPERTY_X86_ISA_1_USED +property if an input file doesn't have it. + +This patch replaces the GNU_PROPERTY_X86_ISA_1_USED property with the +GNU_PROPERTY_X86_ISA_1_NEEDED property which is the minimum ISA +requirement. + +bfd/ + + PR ld/23486 + * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Remove + GNU_PROPERTY_X86_ISA_1_USED if an input file doesn't have it. + (_bfd_x86_elf_link_setup_gnu_properties): Adding the + GNU_PROPERTY_X86_ISA_1_NEEDED, instead of + GNU_PROPERTY_X86_ISA_1_USED, property. + +ld/ + + PR ld/23486 + * testsuite/ld-i386/i386.exp: Run PR ld/23486 tests. + * testsuite/ld-x86-64/x86-64.exp: Likewise. + * testsuite/ld-i386/pr23486a.d: New file. + * testsuite/ld-i386/pr23486b.d: Likewise. + * testsuite/ld-x86-64/pr23486a-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486a.d: Likewise. + * testsuite/ld-x86-64/pr23486a.s: Likewise. + * testsuite/ld-x86-64/pr23486b-x32.d: Likewise. + * testsuite/ld-x86-64/pr23486b.d: Likewise. + * testsuite/ld-x86-64/pr23486b.s: Likewise. + * testsuite/ld-i386/property-3.r: Remove "x86 ISA used". + * testsuite/ld-i386/property-4.r: Likewise. + * testsuite/ld-i386/property-5.r: Likewise. + * testsuite/ld-i386/property-x86-ibt3a.d: Likewise. + * testsuite/ld-i386/property-x86-ibt3b.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3a.d: Likewise. + * testsuite/ld-i386/property-x86-shstk3b.d: Likewise. + * testsuite/ld-x86-64/property-3.r: Likewise. + * testsuite/ld-x86-64/property-4.r: Likewise. + * testsuite/ld-x86-64/property-5.r: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-ibt3b.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3a.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b-x32.d: Likewise. + * testsuite/ld-x86-64/property-x86-shstk3b.d: Likewise. + +(cherry picked from commit f7309df20c4e787041cedc4a6aced89c15259e54) +Signed-off-by: Norbert Lange +--- + bfd/ChangeLog | 9 +++++++ + bfd/elfxx-x86.c | 25 ++++++++++++++---- + ld/ChangeLog | 32 +++++++++++++++++++++++ + ld/testsuite/ld-i386/i386.exp | 2 ++ + ld/testsuite/ld-i386/pr23486a.d | 10 +++++++ + ld/testsuite/ld-i386/pr23486b.d | 10 +++++++ + ld/testsuite/ld-i386/property-3.r | 1 - + ld/testsuite/ld-i386/property-4.r | 1 - + ld/testsuite/ld-i386/property-5.r | 1 - + ld/testsuite/ld-i386/property-x86-ibt3a.d | 5 ++-- + ld/testsuite/ld-i386/property-x86-ibt3b.d | 5 ++-- + ld/testsuite/ld-i386/property-x86-shstk3a.d | 5 ++-- + ld/testsuite/ld-i386/property-x86-shstk3b.d | 5 ++-- + ld/testsuite/ld-x86-64/pr23486a-x32.d | 10 +++++++ + ld/testsuite/ld-x86-64/pr23486a.d | 10 +++++++ + ld/testsuite/ld-x86-64/pr23486a.s | 30 +++++++++++++++++++++ + ld/testsuite/ld-x86-64/pr23486b-x32.d | 10 +++++++ + ld/testsuite/ld-x86-64/pr23486b.d | 10 +++++++ + ld/testsuite/ld-x86-64/pr23486b.s | 30 +++++++++++++++++++++ + ld/testsuite/ld-x86-64/property-3.r | 1 - + ld/testsuite/ld-x86-64/property-4.r | 1 - + ld/testsuite/ld-x86-64/property-5.r | 1 - + ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d | 5 ++-- + ld/testsuite/ld-x86-64/property-x86-ibt3a.d | 5 ++-- + ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d | 5 ++-- + ld/testsuite/ld-x86-64/property-x86-ibt3b.d | 5 ++-- + ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d | 5 ++-- + ld/testsuite/ld-x86-64/property-x86-shstk3a.d | 5 ++-- + ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d | 5 ++-- + ld/testsuite/ld-x86-64/property-x86-shstk3b.d | 5 ++-- + ld/testsuite/ld-x86-64/x86-64.exp | 4 +++ + 31 files changed, 211 insertions(+), 47 deletions(-) + create mode 100644 ld/testsuite/ld-i386/pr23486a.d + create mode 100644 ld/testsuite/ld-i386/pr23486b.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a-x32.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486a.s + create mode 100644 ld/testsuite/ld-x86-64/pr23486b-x32.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486b.d + create mode 100644 ld/testsuite/ld-x86-64/pr23486b.s + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 2e4ff88..7ccfd25 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2407,12 +2407,27 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, + switch (pr_type) + { + case GNU_PROPERTY_X86_ISA_1_USED: ++ if (aprop == NULL || bprop == NULL) ++ { ++ /* Only one of APROP and BPROP can be NULL. */ ++ if (aprop != NULL) ++ { ++ /* Remove this property since the other input file doesn't ++ have it. */ ++ aprop->pr_kind = property_remove; ++ updated = TRUE; ++ } ++ break; ++ } ++ goto or_property; ++ + case GNU_PROPERTY_X86_ISA_1_NEEDED: + if (aprop != NULL && bprop != NULL) + { ++or_property: + number = aprop->u.number; + aprop->u.number = number | bprop->u.number; +- /* Remove the property if ISA bits are empty. */ ++ /* Remove the property if all bits are empty. */ + if (aprop->u.number == 0) + { + aprop->pr_kind = property_remove; +@@ -2428,14 +2443,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, + { + if (aprop->u.number == 0) + { +- /* Remove APROP if ISA bits are empty. */ ++ /* Remove APROP if all bits are empty. */ + aprop->pr_kind = property_remove; + updated = TRUE; + } + } + else + { +- /* Return TRUE if APROP is NULL and ISA bits of BPROP ++ /* Return TRUE if APROP is NULL and all bits of BPROP + aren't empty to indicate that BPROP should be added + to ABFD. */ + updated = bprop->u.number != 0; +@@ -2582,9 +2597,9 @@ _bfd_x86_elf_link_setup_gnu_properties + { + /* If the separate code program header is needed, make sure + that the first read-only PT_LOAD segment has no code by +- adding a GNU_PROPERTY_X86_ISA_1_USED note. */ ++ adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ + prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_ISA_1_USED, ++ GNU_PROPERTY_X86_ISA_1_NEEDED, + 4); + prop->u.number = GNU_PROPERTY_X86_ISA_1_486; + prop->pr_kind = property_number; +diff --git a/ld/testsuite/ld-i386/i386.exp b/ld/testsuite/ld-i386/i386.exp +index 6d794fe..78dad02 100644 +--- a/ld/testsuite/ld-i386/i386.exp ++++ b/ld/testsuite/ld-i386/i386.exp +@@ -462,6 +462,8 @@ run_dump_test "pr23189" + run_dump_test "pr23194" + run_dump_test "pr23372a" + run_dump_test "pr23372b" ++run_dump_test "pr23486a" ++run_dump_test "pr23486b" + + if { !([istarget "i?86-*-linux*"] + || [istarget "i?86-*-gnu*"] +diff --git a/ld/testsuite/ld-i386/pr23486a.d b/ld/testsuite/ld-i386/pr23486a.d +new file mode 100644 +index 0000000..41a6dcf +--- /dev/null ++++ b/ld/testsuite/ld-i386/pr23486a.d +@@ -0,0 +1,10 @@ ++#source: ../ld-x86-64/pr23486a.s ++#source: ../ld-x86-64/pr23486b.s ++#as: --32 ++#ld: -r -m elf_i386 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-i386/pr23486b.d b/ld/testsuite/ld-i386/pr23486b.d +new file mode 100644 +index 0000000..08019b7 +--- /dev/null ++++ b/ld/testsuite/ld-i386/pr23486b.d +@@ -0,0 +1,10 @@ ++#source: ../ld-x86-64/pr23486b.s ++#source: ../ld-x86-64/pr23486a.s ++#as: --32 ++#ld: -r -m elf_i386 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-i386/property-3.r b/ld/testsuite/ld-i386/property-3.r +index 0ed91f5..d03203c 100644 +--- a/ld/testsuite/ld-i386/property-3.r ++++ b/ld/testsuite/ld-i386/property-3.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: 586, SSE + x86 ISA needed: i486, 586 + #pass +diff --git a/ld/testsuite/ld-i386/property-4.r b/ld/testsuite/ld-i386/property-4.r +index cb2bc15..da295eb 100644 +--- a/ld/testsuite/ld-i386/property-4.r ++++ b/ld/testsuite/ld-i386/property-4.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-i386/property-5.r b/ld/testsuite/ld-i386/property-5.r +index 5529650..e414159 100644 +--- a/ld/testsuite/ld-i386/property-5.r ++++ b/ld/testsuite/ld-i386/property-5.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x900000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-i386/property-x86-ibt3a.d b/ld/testsuite/ld-i386/property-x86-ibt3a.d +index 4bb35b0..0aedea1 100644 +--- a/ld/testsuite/ld-i386/property-x86-ibt3a.d ++++ b/ld/testsuite/ld-i386/property-x86-ibt3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-ibt3b.d b/ld/testsuite/ld-i386/property-x86-ibt3b.d +index 418d58a..bd69ac6 100644 +--- a/ld/testsuite/ld-i386/property-x86-ibt3b.d ++++ b/ld/testsuite/ld-i386/property-x86-ibt3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-shstk3a.d b/ld/testsuite/ld-i386/property-x86-shstk3a.d +index e261038..76d2a39 100644 +--- a/ld/testsuite/ld-i386/property-x86-shstk3a.d ++++ b/ld/testsuite/ld-i386/property-x86-shstk3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-i386/property-x86-shstk3b.d b/ld/testsuite/ld-i386/property-x86-shstk3b.d +index 25f3d23..e770ecf 100644 +--- a/ld/testsuite/ld-i386/property-x86-shstk3b.d ++++ b/ld/testsuite/ld-i386/property-x86-shstk3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: i486, 586, SSE2, SSE3 +- x86 ISA needed: 586, SSE, SSE3, SSE4_1 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: 586, SSE, SSE3, SSE4_1 +diff --git a/ld/testsuite/ld-x86-64/pr23486a-x32.d b/ld/testsuite/ld-x86-64/pr23486a-x32.d +new file mode 100644 +index 0000000..6d9fa68 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a-x32.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --x32 ++#ld: -r -m elf32_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486a.d b/ld/testsuite/ld-x86-64/pr23486a.d +new file mode 100644 +index 0000000..dc2b7bf +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --64 -defsym __64_bit__=1 ++#ld: -r -m elf_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486a.s b/ld/testsuite/ld-x86-64/pr23486a.s +new file mode 100644 +index 0000000..a07d0c7 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486a.s +@@ -0,0 +1,30 @@ ++ .section ".note.gnu.property", "a" ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ .long 1f - 0f /* name length. */ ++ .long 4f - 1f /* data length. */ ++ /* NT_GNU_PROPERTY_TYPE_0 */ ++ .long 5 /* note type. */ ++0: ++ .asciz "GNU" /* vendor name. */ ++1: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ /* GNU_PROPERTY_X86_ISA_1_USED */ ++ .long 0xc0000000 /* pr_type. */ ++ .long 3f - 2f /* pr_datasz. */ ++2: ++ .long 0xa ++3: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++4: +diff --git a/ld/testsuite/ld-x86-64/pr23486b-x32.d b/ld/testsuite/ld-x86-64/pr23486b-x32.d +new file mode 100644 +index 0000000..0445e69 +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b-x32.d +@@ -0,0 +1,10 @@ ++#source: pr23486b.s ++#source: pr23486a.s ++#as: --x32 ++#ld: -r -m elf32_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486b.d b/ld/testsuite/ld-x86-64/pr23486b.d +new file mode 100644 +index 0000000..dc2b7bf +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b.d +@@ -0,0 +1,10 @@ ++#source: pr23486a.s ++#source: pr23486b.s ++#as: --64 -defsym __64_bit__=1 ++#ld: -r -m elf_x86_64 ++#readelf: -n ++ ++Displaying notes found in: .note.gnu.property ++ Owner Data size Description ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586 +diff --git a/ld/testsuite/ld-x86-64/pr23486b.s b/ld/testsuite/ld-x86-64/pr23486b.s +new file mode 100644 +index 0000000..c5167ee +--- /dev/null ++++ b/ld/testsuite/ld-x86-64/pr23486b.s +@@ -0,0 +1,30 @@ ++ .section ".note.gnu.property", "a" ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ .long 1f - 0f /* name length. */ ++ .long 4f - 1f /* data length. */ ++ /* NT_GNU_PROPERTY_TYPE_0 */ ++ .long 5 /* note type. */ ++0: ++ .asciz "GNU" /* vendor name. */ ++1: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++ /* GNU_PROPERTY_X86_ISA_1_NEEDED */ ++ .long 0xc0000001 /* pr_type. */ ++ .long 3f - 2f /* pr_datasz. */ ++2: ++ .long 0x3 ++3: ++.ifdef __64_bit__ ++ .p2align 3 ++.else ++ .p2align 2 ++.endif ++4: +diff --git a/ld/testsuite/ld-x86-64/property-3.r b/ld/testsuite/ld-x86-64/property-3.r +index 0ed91f5..d03203c 100644 +--- a/ld/testsuite/ld-x86-64/property-3.r ++++ b/ld/testsuite/ld-x86-64/property-3.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: 586, SSE + x86 ISA needed: i486, 586 + #pass +diff --git a/ld/testsuite/ld-x86-64/property-4.r b/ld/testsuite/ld-x86-64/property-4.r +index cb2bc15..da295eb 100644 +--- a/ld/testsuite/ld-x86-64/property-4.r ++++ b/ld/testsuite/ld-x86-64/property-4.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x800000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-x86-64/property-5.r b/ld/testsuite/ld-x86-64/property-5.r +index 5529650..e414159 100644 +--- a/ld/testsuite/ld-x86-64/property-5.r ++++ b/ld/testsuite/ld-x86-64/property-5.r +@@ -3,6 +3,5 @@ Displaying notes found in: .note.gnu.property + Owner Data size Description + GNU 0x[0-9a-f]+ NT_GNU_PROPERTY_TYPE_0 + Properties: stack size: 0x900000 +- x86 ISA used: i486, 586, SSE + x86 ISA needed: i486, 586, SSE + #pass +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +index 011426f..4cec728 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +index 1b4229a..a8df49a 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3a.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +index 290ed6a..c112626 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +index 1142e03..f10dffd 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-ibt3b.d ++++ b/ld/testsuite/ld-x86-64/property-x86-ibt3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +index 819542d..0147a3c 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +index 4c5d0e0..1f8c2dc 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3a.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3a.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +index ba181e0..7ca2539 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b-x32.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000018 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x0000000c NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +index 5216f38..f66a40e 100644 +--- a/ld/testsuite/ld-x86-64/property-x86-shstk3b.d ++++ b/ld/testsuite/ld-x86-64/property-x86-shstk3b.d +@@ -6,6 +6,5 @@ + + Displaying notes found in: .note.gnu.property + Owner Data size Description +- GNU 0x00000020 NT_GNU_PROPERTY_TYPE_0 +- Properties: x86 ISA used: 586, SSE, SSE3, SSE4_1 +- x86 ISA needed: i486, 586, SSE2, SSE3 ++ GNU 0x00000010 NT_GNU_PROPERTY_TYPE_0 ++ Properties: x86 ISA needed: i486, 586, SSE2, SSE3 +diff --git a/ld/testsuite/ld-x86-64/x86-64.exp b/ld/testsuite/ld-x86-64/x86-64.exp +index 6edb9e8..ae21e55 100644 +--- a/ld/testsuite/ld-x86-64/x86-64.exp ++++ b/ld/testsuite/ld-x86-64/x86-64.exp +@@ -403,6 +403,10 @@ run_dump_test "pr23372a" + run_dump_test "pr23372a-x32" + run_dump_test "pr23372b" + run_dump_test "pr23372b-x32" ++run_dump_test "pr23486a" ++run_dump_test "pr23486a-x32" ++run_dump_test "pr23486b" ++run_dump_test "pr23486b-x32" + + if { ![istarget "x86_64-*-linux*"] && ![istarget "x86_64-*-nacl*"]} { + return +-- +2.9.3 + diff --git a/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch b/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch new file mode 100644 index 0000000000..356914c999 --- /dev/null +++ b/package/binutils/2.31.1/0014-x86-Properly-add-X86_ISA_1_NEEDED-property.patch @@ -0,0 +1,140 @@ +From 28a27bdbb9500797e6767f80c8128b09112aeed5 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Sat, 11 Aug 2018 06:41:33 -0700 +Subject: [PATCH] x86: Properly add X86_ISA_1_NEEDED property + +Existing properties may be removed during property merging. We avoid +adding X86_ISA_1_NEEDED property only if existing properties won't be +removed. + +bfd/ + + PR ld/23428 + * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Don't + add X86_ISA_1_NEEDED property only if existing properties won't + be removed. + +ld/ + + PR ld/23428 + * testsuite/ld-elf/dummy.s: New file. + * testsuite/ld-elf/linux-x86.S: Add X86_FEATURE_1_AND property. + * testsuite/ld-elf/linux-x86.exp: Add dummy.s to pr23428. + +(cherry picked from commit ab9e342807d132182892de1be1a92d6e91a5c1da) +Signed-off-by: Norbert Lange +--- + bfd/ChangeLog | 7 +++++++ + bfd/elfxx-x86.c | 28 ++++++++++++++++++++++------ + ld/ChangeLog | 7 +++++++ + ld/testsuite/ld-elf/dummy.s | 1 + + ld/testsuite/ld-elf/linux-x86.S | 28 ++++++++++++++++++++++++++++ + ld/testsuite/ld-elf/linux-x86.exp | 2 +- + 6 files changed, 66 insertions(+), 7 deletions(-) + create mode 100644 ld/testsuite/ld-elf/dummy.s + +diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c +index 7ccfd25..2d8f7b6 100644 +--- a/bfd/elfxx-x86.c ++++ b/bfd/elfxx-x86.c +@@ -2588,7 +2588,6 @@ _bfd_x86_elf_link_setup_gnu_properties + prop->pr_kind = property_number; + } + else if (has_text +- && elf_properties (ebfd) == NULL + && elf_tdata (info->output_bfd)->o->build_id.sec == NULL + && !htab->elf.dynamic_sections_created + && !info->traditional_format +@@ -2598,11 +2597,28 @@ _bfd_x86_elf_link_setup_gnu_properties + /* If the separate code program header is needed, make sure + that the first read-only PT_LOAD segment has no code by + adding a GNU_PROPERTY_X86_ISA_1_NEEDED note. */ +- prop = _bfd_elf_get_property (ebfd, +- GNU_PROPERTY_X86_ISA_1_NEEDED, +- 4); +- prop->u.number = GNU_PROPERTY_X86_ISA_1_486; +- prop->pr_kind = property_number; ++ elf_property_list *list; ++ bfd_boolean need_property = TRUE; ++ ++ for (list = elf_properties (ebfd); list; list = list->next) ++ switch (list->property.pr_type) ++ { ++ case GNU_PROPERTY_STACK_SIZE: ++ case GNU_PROPERTY_NO_COPY_ON_PROTECTED: ++ case GNU_PROPERTY_X86_ISA_1_NEEDED: ++ /* These properties won't be removed during merging. */ ++ need_property = FALSE; ++ break; ++ } ++ ++ if (need_property) ++ { ++ prop = _bfd_elf_get_property (ebfd, ++ GNU_PROPERTY_X86_ISA_1_NEEDED, ++ 4); ++ prop->u.number = GNU_PROPERTY_X86_ISA_1_486; ++ prop->pr_kind = property_number; ++ } + } + + /* Create the GNU property note section if needed. */ +diff --git a/ld/testsuite/ld-elf/dummy.s b/ld/testsuite/ld-elf/dummy.s +new file mode 100644 +index 0000000..403f980 +--- /dev/null ++++ b/ld/testsuite/ld-elf/dummy.s +@@ -0,0 +1 @@ ++# Dummy +diff --git a/ld/testsuite/ld-elf/linux-x86.S b/ld/testsuite/ld-elf/linux-x86.S +index bdf40c6..d94abc1 100644 +--- a/ld/testsuite/ld-elf/linux-x86.S ++++ b/ld/testsuite/ld-elf/linux-x86.S +@@ -61,3 +61,31 @@ syscall: + ret /* Return to caller. */ + .size syscall, .-syscall + .section .note.GNU-stack,"",@progbits ++ ++ .section ".note.gnu.property", "a" ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++ .long 1f - 0f /* name length */ ++ .long 5f - 2f /* data length */ ++ .long 5 /* note type */ ++0: .asciz "GNU" /* vendor name */ ++1: ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++2: .long 0xc0000002 /* pr_type. */ ++ .long 4f - 3f /* pr_datasz. */ ++3: ++ .long 0x2 ++4: ++#ifdef __LP64__ ++ .p2align 3 ++#else ++ .p2align 2 ++#endif ++5: +diff --git a/ld/testsuite/ld-elf/linux-x86.exp b/ld/testsuite/ld-elf/linux-x86.exp +index 36217c6..f6f5a80 100644 +--- a/ld/testsuite/ld-elf/linux-x86.exp ++++ b/ld/testsuite/ld-elf/linux-x86.exp +@@ -37,7 +37,7 @@ run_ld_link_exec_tests [list \ + "Run PR ld/23428 test" \ + "--no-dynamic-linker -z separate-code" \ + "" \ +- { linux-x86.S pr23428.c } \ ++ { linux-x86.S pr23428.c dummy.s } \ + "pr23428" \ + "pass.out" \ + "$NOPIE_CFLAGS -fno-asynchronous-unwind-tables" \ +-- +2.9.3 + From 399d83f780d7cf93a6168185f88b643e7776eb8c Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 21:40:55 +0100 Subject: [PATCH 0295/7482] Revert "package/python-ipython: bump to version 7.3.0" This reverts commit bc516052593947a067c98956931df9df31ee3195. which adds a dependency on python3 as well as adddtional python runtime modules. So revert this patch to polish a better bump. Fixes: - http://autobuild.buildroot.org/results/7d765d2b15bfe72b05de62e86a01d57f1696c837 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-ipython/python-ipython.hash | 7 +++---- package/python-ipython/python-ipython.mk | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/package/python-ipython/python-ipython.hash b/package/python-ipython/python-ipython.hash index e49ff6b10e..41bdd70feb 100644 --- a/package/python-ipython/python-ipython.hash +++ b/package/python-ipython/python-ipython.hash @@ -1,6 +1,5 @@ # md5, sha256 from https://pypi.org/pypi/ipython/json -md5 2aec01154a78c6075c5b7f1bfea4abd3 ipython-7.3.0.tar.gz -sha256 06de667a9e406924f97781bda22d5d76bfb39762b678762d86a466e63f65dc39 ipython-7.3.0.tar.gz +md5 7014b8824981eef2cb893ea5398d6b8d ipython-5.8.0.tar.gz +sha256 4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906 ipython-5.8.0.tar.gz # Locally computed sha256 -sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst -sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE +sha256 a5d87689342ec47cebdf623af06cec734c607666c696fe48271f2ff91752443d COPYING.rst diff --git a/package/python-ipython/python-ipython.mk b/package/python-ipython/python-ipython.mk index 048428e83a..79a48bf43d 100644 --- a/package/python-ipython/python-ipython.mk +++ b/package/python-ipython/python-ipython.mk @@ -4,11 +4,11 @@ # ################################################################################ -PYTHON_IPYTHON_VERSION = 7.3.0 +PYTHON_IPYTHON_VERSION = 5.8.0 PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://pypi.python.org/packages/82/0a/146b0f0f1ddf13ab8682aed5c5a42250cddf1082e193ec95b50b03b9f791 +PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/41/a6/2d25314b1f9375639d8f8e0f8052e8cec5df511d3449f22c4f1c2d8cb3c6 PYTHON_IPYTHON_LICENSE = BSD-3-Clause -PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE +PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst PYTHON_IPYTHON_SETUP_TYPE = distutils $(eval $(python-package)) From f08bae943467fa821a37ac402e7ede5ad5b7b3ec Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 18:06:26 +0100 Subject: [PATCH 0296/7482] package/python-pylibftdi: bump to version 0.17.0 Add hash for license file Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/python-pylibftdi/python-pylibftdi.hash | 9 ++++++--- package/python-pylibftdi/python-pylibftdi.mk | 4 ++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/package/python-pylibftdi/python-pylibftdi.hash b/package/python-pylibftdi/python-pylibftdi.hash index 54b33a1124..669913fa97 100644 --- a/package/python-pylibftdi/python-pylibftdi.hash +++ b/package/python-pylibftdi/python-pylibftdi.hash @@ -1,3 +1,6 @@ -# md5 from https://pypi.python.org/pypi/pylibftdi/json, sha256 locally computed -md5 eaee7fb3a67f33a35a164a9628daaafe pylibftdi-0.15.0.tar.gz -sha256 51ef08ebcc4ec3eaec2366e9648d3f8fa1b737ea507a7f3a374ac58abf148e77 pylibftdi-0.15.0.tar.gz +# md5, sha256 from https://pypi.python.org/pypi/pylibftdi/json +md5 555713983cfb7a67b0c1a1418a065bbc pylibftdi-0.17.0.tar.gz +sha256 dc615a5338c866cc1a316cabef2ea5862b75c81de9410b85a85f38a033214c8c pylibftdi-0.17.0.tar.gz + +# Hash for license file +sha256 581b6a16b3aaf23c4f7caee5defa099af833a95916e57ef24d7c12f893a0c160 LICENSE.txt diff --git a/package/python-pylibftdi/python-pylibftdi.mk b/package/python-pylibftdi/python-pylibftdi.mk index 0a5887b2ee..7f1c54ebc7 100644 --- a/package/python-pylibftdi/python-pylibftdi.mk +++ b/package/python-pylibftdi/python-pylibftdi.mk @@ -4,9 +4,9 @@ # ################################################################################ -PYTHON_PYLIBFTDI_VERSION = 0.15.0 +PYTHON_PYLIBFTDI_VERSION = 0.17.0 PYTHON_PYLIBFTDI_SOURCE = pylibftdi-$(PYTHON_PYLIBFTDI_VERSION).tar.gz -PYTHON_PYLIBFTDI_SITE = https://pypi.python.org/packages/e5/bb/d7a86dbd7685e3866ea75d21c6c726d01706fdc0aa5dc9051ce18ae65693 +PYTHON_PYLIBFTDI_SITE = https://pypi.python.org/packages/33/30/88b80d63ad3dae29972490ed7b16d7a9ef5f70bd35748ce3ee982bf42c41 PYTHON_PYLIBFTDI_LICENSE = MIT PYTHON_PYLIBFTDI_LICENSE_FILES = LICENSE.txt PYTHON_PYLIBFTDI_DEPENDENCIES = libftdi From 497f6922aa143bf0c307238c22aed51814654b5b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 18:05:16 +0100 Subject: [PATCH 0297/7482] package/qpdf: bump to version 8.4.0 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/qpdf/qpdf.hash | 4 ++-- package/qpdf/qpdf.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/qpdf/qpdf.hash b/package/qpdf/qpdf.hash index 4bf2d3b30d..825d2048e6 100644 --- a/package/qpdf/qpdf.hash +++ b/package/qpdf/qpdf.hash @@ -1,4 +1,4 @@ -# From https://sourceforge.net/projects/qpdf/files/qpdf/8.2.1/qpdf-8.2.1.sha512/download -sha512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c qpdf-8.2.1.tar.gz +# From https://sourceforge.net/projects/qpdf/files/qpdf/8.4.0/qpdf-8.4.0.sha512/download +sha512 13225c6285311e8fe89970971b082b9613e70d474ee71dd5572f1ae268234d366c2c9c7bf427c4758a746a1a27ecc0127d31044ab501dbc08885c8aa0a514028 qpdf-8.4.0.tar.gz # Locally computed: sha256 fb929ac30decb4dc3a2eea2bec6c43296a797c5d2d602deb3784ee39430583d5 Artistic-2.0 diff --git a/package/qpdf/qpdf.mk b/package/qpdf/qpdf.mk index 2f6efdd73e..6ed3195733 100644 --- a/package/qpdf/qpdf.mk +++ b/package/qpdf/qpdf.mk @@ -4,7 +4,7 @@ # ################################################################################ -QPDF_VERSION = 8.2.1 +QPDF_VERSION = 8.4.0 QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) QPDF_INSTALL_STAGING = YES QPDF_LICENSE = Artistic-2.0 From 3cb7546d95bbe227562040d6439b0ab4b62b7c9b Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sun, 17 Mar 2019 22:10:16 +0100 Subject: [PATCH 0298/7482] package/kf5-modemmanager-qt: link with libatomic when needed On some architectures, atomic binutils are provided by the libatomic library from gcc. Linking with libatomic is therefore necessary, otherwise the build fails with: sparc-buildroot-linux-uclibc/sysroot/lib/libatomic.so.1: error adding symbols: DSO missing from command line This is often for example the case on sparcv8 32 bit. Fixes: - http://autobuild.buildroot.org/results/b941a3deaa57cac79f1686d47ca6ababf2f0d5e4 Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk index 9bbeeaa760..20fbc102c6 100644 --- a/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk +++ b/package/kf5/kf5-modemmanager-qt/kf5-modemmanager-qt.mk @@ -13,4 +13,9 @@ KF5_MODEMMANAGER_QT_LICENSE_FILE = COPYING.LIB KF5_MODEMMANAGER_QT_DEPENDENCIES = kf5-extra-cmake-modules modem-manager qt5base KF5_MODEMMANAGER_QT_INSTALL_STAGING = YES +# Uses __atomic_fetch_add_4 +ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) +KF5_MODEMMANAGER_QT_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" +endif + $(eval $(cmake-package)) From ded8a6f8ec54528c92efc7d646ac6f6b3d44bb3d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 18 Mar 2019 22:09:50 +0100 Subject: [PATCH 0299/7482] Revert "package/prelink-cross: new package" This reverts commit 0bb0f2ba849dac9208d3a5a4107b8edd5ee46a1e, because using "host-binutils" is not correct as it should only be used with internal toolchains, and not external toolchains. Signed-off-by: Thomas Petazzoni --- DEVELOPERS | 1 - package/prelink-cross/prelink-cross.hash | 3 --- package/prelink-cross/prelink-cross.mk | 15 --------------- 3 files changed, 19 deletions(-) delete mode 100644 package/prelink-cross/prelink-cross.hash delete mode 100644 package/prelink-cross/prelink-cross.mk diff --git a/DEVELOPERS b/DEVELOPERS index c91325e284..3e0ac08e11 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -55,7 +55,6 @@ F: package/openjdk/ F: package/openjdk-bin/ F: package/php/ F: package/policycoreutils/ -F: package/prelink-cross/ F: package/python3/ F: package/python-flask-sqlalchemy/ F: package/python-mutagen/ diff --git a/package/prelink-cross/prelink-cross.hash b/package/prelink-cross/prelink-cross.hash deleted file mode 100644 index 3ac33ac3d0..0000000000 --- a/package/prelink-cross/prelink-cross.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 cb3f5d833cd74b7e90e38465c9c948b0f4138c017509cb91e391b0931063429e prelink-cross-a853a5d715d84eec93aa68e8f2df26b7d860f5b2.tar.gz -sha256 b8a2f73f743dc1a51aff23f1aacbca4b868564db52496fa3c0caba755bfd1eaf COPYING diff --git a/package/prelink-cross/prelink-cross.mk b/package/prelink-cross/prelink-cross.mk deleted file mode 100644 index ab7a967f95..0000000000 --- a/package/prelink-cross/prelink-cross.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# host-prelink-cross -# -################################################################################ - -HOST_PRELINK_CROSS_VERSION = a853a5d715d84eec93aa68e8f2df26b7d860f5b2 -HOST_PRELINK_CROSS_SITE = git://git.yoctoproject.org/prelink-cross -HOST_PRELINK_CROSS_SITE_METHOD = git -HOST_PRELINK_CROSS_LICENSE = GPL-2.0 -HOST_PRELINK_CROSS_LICENSE_FILES = COPYING -HOST_PRELINK_CROSS_AUTORECONF = YES -HOST_PRELINK_CROSS_DEPENDENCIES = host-binutils host-elfutils - -$(eval $(host-autotools-package)) From 1ed3f7d45dae4218430d07fd9bf433868922fa5f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 18 Mar 2019 22:10:22 +0100 Subject: [PATCH 0300/7482] Revert "package/binutils: install libiberty for host build" This reverts commit 7ec7ba54055919d89afc93606794d161505fa2d8, as it causes build failures of host-gdb: /usr/bin/ld: /home/buildroot/autobuild/instance-0/output/host/lib/libiberty.a(cplus-dem.o): relocation R_X86_64_PC32 against symbol `_sch_istable' can not be used when making a shared object; recompile with -fPIC /usr/bin/ld: final link failed: Bad value Indeed, the host-gdb build picks up the libiberty installed in $(HOST_DIR) instead of using its own internal version. This needs to be addressed before we can make host-binutils install libiberty in $(HOST_DIR). Signed-off-by: Thomas Petazzoni --- package/binutils/binutils.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index cfaf0bdeb7..6798356ff2 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -84,7 +84,6 @@ HOST_BINUTILS_CONF_OPTS = \ --target=$(GNU_TARGET_NAME) \ --disable-shared \ --enable-static \ - --enable-install-libiberty \ --with-sysroot=$(STAGING_DIR) \ --enable-poison-system-directories \ $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ From baffecda1678d68ab6d16514ae1903d2d4dc1e5d Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Sat, 16 Mar 2019 23:14:40 +0100 Subject: [PATCH 0301/7482] package/gst1-plugins-bad: add webrtc option - remove old webrtc Config.in.legacy entry introduced by [1] (misnamed webrtc option was introduced with 2017.02, renamed to webrtcdsp for 2017.08 and although backported to 2017.02.4) [1] https://git.buildroot.net/buildroot/commit/?id=4c06d2490a07f0b88f42c56c7409899fd2f5608a Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- Config.in.legacy | 10 ---------- package/gstreamer1/gst1-plugins-bad/Config.in | 11 +++++++++++ .../gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 7 +++++++ 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 2030b51e1d..0a0bce41f9 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -1685,16 +1685,6 @@ config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD bool "mad (*.mp3 audio) removed" select BR2_LEGACY -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC - bool "gst1-plugins-bad webrtc renamed to webrtcdsp" - select BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP - select BR2_LEGACY - help - The WebRTC plugin in GStreamer 1.x has always been named - webrtcdsp, but was wrongly introduced in Buildroot under the - name webrtc. Therefore, we have renamed the option to match - the actual name of the GStreamer plugin. - config BR2_STRIP_none bool "Strip command 'none' has been removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-bad/Config.in b/package/gstreamer1/gst1-plugins-bad/Config.in index 869f0a9d45..6830902f3a 100644 --- a/package/gstreamer1/gst1-plugins-bad/Config.in +++ b/package/gstreamer1/gst1-plugins-bad/Config.in @@ -558,6 +558,17 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP help Webp image format plugin +config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC + bool "webrtc" + depends on !BR2_STATIC_LIBS # libnice -> gnutls + select BR2_PACKAGE_GST1_PLUGINS_BASE # libgstsdp + select BR2_PACKAGE_LIBNICE + help + WebRTC plugins (webrtcbin - a bin for webrtc connections) + +comment "webrtc needs a toolchain w/ dynamic library" + depends on BR2_STATIC_LIBS + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP bool "webrtcdsp" # All depends from webrtc-audio-processing diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk index f5b081f972..e4e7661ac4 100644 --- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk @@ -703,6 +703,13 @@ else GST1_PLUGINS_BAD_CONF_OPTS += --disable-webp endif +ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC),y) +GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtc +GST1_PLUGINS_BAD_DEPENDENCIES += gst1-plugins-base libnice +else +GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtc +endif + ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTCDSP),y) GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtcdsp GST1_PLUGINS_BAD_DEPENDENCIES += webrtc-audio-processing From a4958567284026f979f6e0056a5b98bedd77e88f Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Mon, 18 Mar 2019 21:02:02 +0000 Subject: [PATCH 0302/7482] package/glibc: update glibc version for RISC-V 32-bit Signed-off-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- .../glibc.hash | 2 +- ...C-V-32-bit-build-of-riscv-glibc-2.26.patch | 59 ------------------- ...rror-that-breaks-RISC-V-architecture.patch | 39 ------------ package/glibc/glibc.mk | 2 +- 4 files changed, 2 insertions(+), 100 deletions(-) rename package/glibc/{4e2943456e690d89f48e6e710757dd09404b0c9a => 06983fe52cfe8e4779035c27e8cc5d2caab31531}/glibc.hash (71%) delete mode 100644 package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch delete mode 100644 package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch diff --git a/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/glibc.hash b/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash similarity index 71% rename from package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/glibc.hash rename to package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash index 3eb5e04e96..09ddc7be72 100644 --- a/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/glibc.hash +++ b/package/glibc/06983fe52cfe8e4779035c27e8cc5d2caab31531/glibc.hash @@ -1,5 +1,5 @@ # Locally calculated (fetched from Github) -sha256 a40f908125135bad2cf92c18d07ad25b3091b161b3a5d3aea46c23ffd2ac90b8 glibc-4e2943456e690d89f48e6e710757dd09404b0c9a.tar.gz +sha256 703877c0df77fce00719fe55cc62b07bb8d5f44fdb704bbb1b0bf2cf38afe10a glibc-06983fe52cfe8e4779035c27e8cc5d2caab31531.tar.gz # Hashes for license files sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch b/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch deleted file mode 100644 index ab157e9e7b..0000000000 --- a/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0001-Fix-RISC-V-32-bit-build-of-riscv-glibc-2.26.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 4909cfbbe8dd512b8fc0892859549c26e1b14d30 Mon Sep 17 00:00:00 2001 -From: Mark Corbin -Date: Sun, 21 Oct 2018 10:38:18 +0100 -Subject: [PATCH] Fix RISC-V 32-bit build of riscv-glibc 2.26 - -This patch fixes two build errors with the 32-bit version of -glibc-2.26 from the riscv-glibc repository. - -A void reference to 'refsym' has been added to dl-runtime.c to avoid -an 'unused variable' error when building with '-Werror'. - -Some data types were hard-coded for 64-bit in ldsodefs.h. These have -been modified to allow 32-bit builds. - -This patch was provided by Fabrice Bellard as part of his RISC-V -Buildroot development source. - -Signed-off-by: Mark Corbin ---- - elf/dl-runtime.c | 1 + - sysdeps/riscv/ldsodefs.h | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/elf/dl-runtime.c b/elf/dl-runtime.c -index 51d3819d4a..e728e8907e 100644 ---- a/elf/dl-runtime.c -+++ b/elf/dl-runtime.c -@@ -146,6 +146,7 @@ _dl_fixup ( - if (__glibc_unlikely (GLRO(dl_bind_not))) - return value; - -+ (void)refsym; - return elf_machine_fixup_plt (l, result, refsym, sym, reloc, rel_addr, value); - } - -diff --git a/sysdeps/riscv/ldsodefs.h b/sysdeps/riscv/ldsodefs.h -index db993df80a..91e7a8c88f 100644 ---- a/sysdeps/riscv/ldsodefs.h -+++ b/sysdeps/riscv/ldsodefs.h -@@ -25,14 +25,14 @@ struct La_riscv_regs; - struct La_riscv_retval; - - #define ARCH_PLTENTER_MEMBERS \ -- Elf64_Addr (*riscv_gnu_pltenter) (Elf64_Sym *, unsigned int, \ -+ ElfW(Addr) (*riscv_gnu_pltenter) (ElfW(Sym) *, unsigned int, \ - uintptr_t *, uintptr_t *, \ - const struct La_riscv_regs *, \ - unsigned int *, const char *name, \ - long int *framesizep); - - #define ARCH_PLTEXIT_MEMBERS \ -- unsigned int (*riscv_gnu_pltexit) (Elf64_Sym *, unsigned int, \ -+ unsigned int (*riscv_gnu_pltexit) (ElfW(Sym) *, unsigned int, \ - uintptr_t *, uintptr_t *, \ - const struct La_riscv_regs *, \ - struct La_riscv_retval *, \ --- -2.17.1 - diff --git a/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch b/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch deleted file mode 100644 index 961d5a1cb6..0000000000 --- a/package/glibc/4e2943456e690d89f48e6e710757dd09404b0c9a/0002-Fix-mcontext_t-error-that-breaks-RISC-V-architecture.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6b4520e13c2ed7fca725d5f5c879854cd7c96c19 Mon Sep 17 00:00:00 2001 -From: Mark Corbin -Date: Mon, 4 Feb 2019 10:35:27 +0000 -Subject: [PATCH] Fix mcontext_t error that breaks RISC-V architecture - package builds - -The riscv-glibc repository version of glibc 2.26 will build for -RISC-V 32bit, but when many packages are built against the resulting -library an 'unknown type name mcontext_t' error is reported. The -definition of mcontext_h in the ucontext.h header file needs to be -moved outside of the '#ifdef __USE_MISC' structure to fix this -issue. - -Signed-off-by: Mark Corbin ---- - sysdeps/unix/sysv/linux/riscv/sys/ucontext.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h b/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h -index 8f02f09106..b9dd04564a 100644 ---- a/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h -+++ b/sysdeps/unix/sysv/linux/riscv/sys/ucontext.h -@@ -48,12 +48,11 @@ typedef greg_t gregset_t[NGREG]; - - /* Container for floating-point state. */ - typedef union __riscv_fp_state fpregset_t; -+#endif - - /* Context to describe whole processor state. */ - typedef struct sigcontext mcontext_t; - --#endif -- - /* Userlevel context. */ - typedef struct ucontext - { --- -2.19.1 - diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index cb867d4d5b..5ee53df2b2 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -8,7 +8,7 @@ ifeq ($(BR2_arc),y) GLIBC_VERSION = arc-2018.09-release GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION)) else ifeq ($(BR2_RISCV_32),y) -GLIBC_VERSION = 4e2943456e690d89f48e6e710757dd09404b0c9a +GLIBC_VERSION = 06983fe52cfe8e4779035c27e8cc5d2caab31531 GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION)) else # Generate version string using: From e92d5624236e47e1abe44f2ace24fceb1882c0a5 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Mon, 18 Mar 2019 21:02:02 +0000 Subject: [PATCH 0303/7482] configs/qemu_riscv32_virt: upgrade to 4.20 kernel Signed-off-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- configs/qemu_riscv32_virt_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig index fb37da6a89..6f9a61b11c 100644 --- a/configs/qemu_riscv32_virt_defconfig +++ b/configs/qemu_riscv32_virt_defconfig @@ -10,14 +10,14 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -# Linux headers same as kernel, a 4.15 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +# Linux headers same as kernel, a 4.20 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_GIT=y BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" -BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="8fe28cb58bcb235034b64cbbb7550a8a43fd88be" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux.config" From 19064985e8383b205536b5468f2c3261f11eb70d Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Mon, 18 Mar 2019 21:02:03 +0000 Subject: [PATCH 0304/7482] configs/qemu_riscv64_virt: re-order options Fix the config layout, no functional change. Signed-off-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- configs/qemu_riscv64_virt_defconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/qemu_riscv64_virt_defconfig b/configs/qemu_riscv64_virt_defconfig index 65dbef4135..596edf2fcd 100644 --- a/configs/qemu_riscv64_virt_defconfig +++ b/configs/qemu_riscv64_virt_defconfig @@ -4,11 +4,11 @@ BR2_RISCV_64=y # System BR2_SYSTEM_DHCP="eth0" +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Filesystem BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_GENERIC_GETTY=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" # Linux headers same as kernel, a 4.20 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_20=y From 5068a6838150be65d3381a0b1de744a7ec126983 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Mar 2019 22:41:03 +0100 Subject: [PATCH 0305/7482] package/keepalived: drop autoreconf Commit 78d4ddbf3b416885d2e99b32363b174755f9bb30 removed all patches so autoreconf is not needed anymore Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/keepalived/keepalived.mk | 2 -- 1 file changed, 2 deletions(-) diff --git a/package/keepalived/keepalived.mk b/package/keepalived/keepalived.mk index fc6b01521d..fcdb43ce13 100644 --- a/package/keepalived/keepalived.mk +++ b/package/keepalived/keepalived.mk @@ -10,8 +10,6 @@ KEEPALIVED_DEPENDENCIES = host-pkgconf openssl KEEPALIVED_LICENSE = GPL-2.0+ KEEPALIVED_LICENSE_FILES = COPYING KEEPALIVED_CONF_OPTS = --disable-hardening -# We're patching configure.ac -KEEPALIVED_AUTORECONF = YES ifeq ($(BR2_PACKAGE_JSON_C),y) KEEPALIVED_DEPENDENCIES += json-c From 114e9dcd28e1001b74689215ec669b8940dc3ea9 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 18 Mar 2019 22:43:24 +0100 Subject: [PATCH 0306/7482] package/meson: bump version to 0.50.0 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index fadef6df8a..e3d740b17c 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.49.2/meson-0.49.2.tar.gz.asc -sha256 ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd meson-0.49.2.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.50.0/meson-0.50.0.tar.gz.asc +sha256 2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f meson-0.50.0.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index 49e27f5527..fbfef7002f 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.49.2 +MESON_VERSION = 0.50.0 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From 00dcde3eb12d194d31356fd6e54c0328acd371a1 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Mon, 18 Mar 2019 17:45:09 -0400 Subject: [PATCH 0307/7482] package/angularjs: bump version to 1.7.8 Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/angularjs/angularjs.hash | 4 ++-- package/angularjs/angularjs.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/angularjs/angularjs.hash b/package/angularjs/angularjs.hash index 918c049c73..61a9ceeb7c 100644 --- a/package/angularjs/angularjs.hash +++ b/package/angularjs/angularjs.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 4d4e87d24c7d522f4ee765e4f7d454b9cf2a0f6407248545528064e66ad7b085 angular-1.6.7.zip -sha256 cec36623ceba33c503784164917c206047079159bf88f51a695a4dfb9d9b7ede angular.js +sha256 4d1e5755d7722fed1fa223d854f209251bfee042c72ffe5cca63c4c1a7a19d78 angular-1.7.8.zip +sha256 db7862d0083ae74b5c94005d18274c3528f1be2932b72438e2f606a3d1f23ab5 angular.js diff --git a/package/angularjs/angularjs.mk b/package/angularjs/angularjs.mk index a941bc3828..cb5ec7c10a 100644 --- a/package/angularjs/angularjs.mk +++ b/package/angularjs/angularjs.mk @@ -4,7 +4,7 @@ # ################################################################################ -ANGULARJS_VERSION = 1.6.7 +ANGULARJS_VERSION = 1.7.8 ANGULARJS_SOURCE = angular-$(ANGULARJS_VERSION).zip ANGULARJS_SITE = https://code.angularjs.org/$(ANGULARJS_VERSION) ANGULARJS_LICENSE = MIT From 0af24710da70b04947229333c9450c86499b3108 Mon Sep 17 00:00:00 2001 From: Peter Seiderer Date: Mon, 18 Mar 2019 22:23:44 +0100 Subject: [PATCH 0308/7482] package/qt5: bump latest version to 5.12.2 Signed-off-by: Peter Seiderer Signed-off-by: Thomas Petazzoni --- package/qt5/qt5.mk | 2 +- package/qt5/qt53d/qt53d.hash | 4 ++-- .../0001-qtbase-Fix-build-error-when-using-EGL.patch | 0 .../0004-double-conversion-enable-for-microblaze.patch | 0 package/qt5/qt5base/{5.12.1 => 5.12.2}/qt5base.hash | 4 ++-- package/qt5/qt5canvas3d/qt5canvas3d.hash | 4 ++-- package/qt5/qt5charts/qt5charts.hash | 4 ++-- .../qt5connectivity/{5.12.1 => 5.12.2}/qt5connectivity.hash | 4 ++-- .../0001-qsgtexture-fix-debug-build-with-uclibc.patch | 0 package/qt5/qt5declarative/qt5declarative.hash | 4 ++-- package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash | 4 ++-- package/qt5/qt5imageformats/qt5imageformats.hash | 4 ++-- package/qt5/qt5location/qt5location.hash | 4 ++-- package/qt5/qt5multimedia/qt5multimedia.hash | 4 ++-- package/qt5/qt5quickcontrols/qt5quickcontrols.hash | 4 ++-- .../{5.12.1 => 5.12.2}/qt5quickcontrols2.hash | 4 ++-- package/qt5/qt5script/qt5script.hash | 4 ++-- package/qt5/qt5scxml/qt5scxml.hash | 4 ++-- package/qt5/qt5sensors/qt5sensors.hash | 4 ++-- package/qt5/qt5serialbus/{5.12.1 => 5.12.2}/qt5serialbus.hash | 4 ++-- .../qt5/qt5serialport/{5.12.1 => 5.12.2}/qt5serialport.hash | 4 ++-- package/qt5/qt5svg/qt5svg.hash | 4 ++-- package/qt5/qt5tools/qt5tools.hash | 4 ++-- .../{5.12.1 => 5.12.2}/qt5virtualkeyboard.hash | 4 ++-- package/qt5/qt5wayland/qt5wayland.hash | 4 ++-- package/qt5/qt5webchannel/qt5webchannel.hash | 4 ++-- package/qt5/qt5webengine/{5.12.1 => 5.12.2}/qt5webengine.hash | 4 ++-- package/qt5/qt5websockets/qt5websockets.hash | 4 ++-- package/qt5/qt5x11extras/{5.12.1 => 5.12.2}/qt5x11extras.hash | 4 ++-- package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash | 4 ++-- 30 files changed, 53 insertions(+), 53 deletions(-) rename package/qt5/qt5base/{5.12.1 => 5.12.2}/0001-qtbase-Fix-build-error-when-using-EGL.patch (100%) rename package/qt5/qt5base/{5.12.1 => 5.12.2}/0004-double-conversion-enable-for-microblaze.patch (100%) rename package/qt5/qt5base/{5.12.1 => 5.12.2}/qt5base.hash (81%) rename package/qt5/qt5connectivity/{5.12.1 => 5.12.2}/qt5connectivity.hash (74%) rename package/qt5/qt5declarative/{5.12.1 => 5.12.2}/0001-qsgtexture-fix-debug-build-with-uclibc.patch (100%) rename package/qt5/qt5quickcontrols2/{5.12.1 => 5.12.2}/qt5quickcontrols2.hash (66%) rename package/qt5/qt5serialbus/{5.12.1 => 5.12.2}/qt5serialbus.hash (71%) rename package/qt5/qt5serialport/{5.12.1 => 5.12.2}/qt5serialport.hash (74%) rename package/qt5/qt5virtualkeyboard/{5.12.1 => 5.12.2}/qt5virtualkeyboard.hash (78%) rename package/qt5/qt5webengine/{5.12.1 => 5.12.2}/qt5webengine.hash (99%) rename package/qt5/qt5x11extras/{5.12.1 => 5.12.2}/qt5x11extras.hash (74%) diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index d8012a913d..6da898121d 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -6,7 +6,7 @@ ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) QT5_VERSION_MAJOR = 5.12 -QT5_VERSION = $(QT5_VERSION_MAJOR).1 +QT5_VERSION = $(QT5_VERSION_MAJOR).2 QT5_SOURCE_TARBALL_PREFIX = everywhere-src else QT5_VERSION_MAJOR = 5.6 diff --git a/package/qt5/qt53d/qt53d.hash b/package/qt5/qt53d/qt53d.hash index f135173bb7..5c0eac7c34 100644 --- a/package/qt5/qt53d/qt53d.hash +++ b/package/qt5/qt53d/qt53d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qt3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 10d05a30e925fcad971126c7f47a5e32c39f007dab96b298b2094501f9607ffe qt3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qt3d-everywhere-src-5.12.1.tar.xz.sha256 -sha256 ce51ed3fe403672db2c874cbaa60f3a139ec817abd1270dc5e4255d35fd64bf1 qt3d-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qt3d-everywhere-src-5.12.2.tar.xz.sha256 +sha256 d4036e7ac146ba78784dde0dd99e8182372b7c38e832e33b61fed4187de0ad06 qt3d-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPL diff --git a/package/qt5/qt5base/5.12.1/0001-qtbase-Fix-build-error-when-using-EGL.patch b/package/qt5/qt5base/5.12.2/0001-qtbase-Fix-build-error-when-using-EGL.patch similarity index 100% rename from package/qt5/qt5base/5.12.1/0001-qtbase-Fix-build-error-when-using-EGL.patch rename to package/qt5/qt5base/5.12.2/0001-qtbase-Fix-build-error-when-using-EGL.patch diff --git a/package/qt5/qt5base/5.12.1/0004-double-conversion-enable-for-microblaze.patch b/package/qt5/qt5base/5.12.2/0004-double-conversion-enable-for-microblaze.patch similarity index 100% rename from package/qt5/qt5base/5.12.1/0004-double-conversion-enable-for-microblaze.patch rename to package/qt5/qt5base/5.12.2/0004-double-conversion-enable-for-microblaze.patch diff --git a/package/qt5/qt5base/5.12.1/qt5base.hash b/package/qt5/qt5base/5.12.2/qt5base.hash similarity index 81% rename from package/qt5/qt5base/5.12.1/qt5base.hash rename to package/qt5/qt5base/5.12.2/qt5base.hash index 29148fa080..c6758471f6 100644 --- a/package/qt5/qt5base/5.12.1/qt5base.hash +++ b/package/qt5/qt5base/5.12.2/qt5base.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtbase-everywhere-src-5.12.1.tar.xz.sha256 -sha256 533078ce02678988576e224cb3844979907950cf83e0fda3364bc1d5701c9049 qtbase-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtbase-everywhere-src-5.12.2.tar.xz.sha256 +sha256 562c095a59c95f393762ec53bc05c0d80fad1758fd5ff7a5231967d1a98d56c1 qtbase-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5canvas3d/qt5canvas3d.hash b/package/qt5/qt5canvas3d/qt5canvas3d.hash index fe31ba3867..fc36119164 100644 --- a/package/qt5/qt5canvas3d/qt5canvas3d.hash +++ b/package/qt5/qt5canvas3d/qt5canvas3d.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcanvas3d-opensource-src-5.6.3.tar.xz.mirrorlist sha256 e99e0e159f2fba539b7947a1921072f6807f20958d32809edbf12aac571f56ff qtcanvas3d-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtcanvas3d-everywhere-src-5.12.1.tar.xz.sha256 -sha256 c7c940a06062b1e5078fd697e1da0cdaeaa315b6fcea81de15308a9d3f8ac254 qtcanvas3d-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtcanvas3d-everywhere-src-5.12.2.tar.xz.sha256 +sha256 5e74b083294956505945621f6f56a3d7a314502277a109d6fb6b25c74dea2dca qtcanvas3d-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5charts/qt5charts.hash b/package/qt5/qt5charts/qt5charts.hash index 02e01cac2a..5ec0c07790 100644 --- a/package/qt5/qt5charts/qt5charts.hash +++ b/package/qt5/qt5charts/qt5charts.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtcharts-opensource-src-2.1.3.tar.xz.mirrorlist sha256 f636a9b1c255f678f11b36cd73abc807d16dae0c31ecbc75c09524703aae7d2f qtcharts-opensource-src-2.1.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtcharts-everywhere-src-5.12.1.tar.xz.sha256 -sha256 142eb2b87a0bc2220a9f12e56bf390b846968c201d135b1a2a2338545692fdc0 qtcharts-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtcharts-everywhere-src-5.12.2.tar.xz.sha256 +sha256 11d88d3e0ec86730219f7c2efa17f696ec8766415c488b208bfcb8f3c3a68a31 qtcharts-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5connectivity/5.12.1/qt5connectivity.hash b/package/qt5/qt5connectivity/5.12.2/qt5connectivity.hash similarity index 74% rename from package/qt5/qt5connectivity/5.12.1/qt5connectivity.hash rename to package/qt5/qt5connectivity/5.12.2/qt5connectivity.hash index a46de7f3c6..180d18f016 100644 --- a/package/qt5/qt5connectivity/5.12.1/qt5connectivity.hash +++ b/package/qt5/qt5connectivity/5.12.2/qt5connectivity.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtconnectivity-everywhere-src-5.12.1.tar.xz.sha256 -sha256 0edd0bd784a71809540dc23d24a842bd88dee2cdb5394b69c9e704f7e1ac8d6c qtconnectivity-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtconnectivity-everywhere-src-5.12.2.tar.xz.sha256 +sha256 15eb21a1c102408e43c7204a82ad144e97ebe05dc4a15edb0900cd49762a226e qtconnectivity-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5declarative/5.12.1/0001-qsgtexture-fix-debug-build-with-uclibc.patch b/package/qt5/qt5declarative/5.12.2/0001-qsgtexture-fix-debug-build-with-uclibc.patch similarity index 100% rename from package/qt5/qt5declarative/5.12.1/0001-qsgtexture-fix-debug-build-with-uclibc.patch rename to package/qt5/qt5declarative/5.12.2/0001-qsgtexture-fix-debug-build-with-uclibc.patch diff --git a/package/qt5/qt5declarative/qt5declarative.hash b/package/qt5/qt5declarative/qt5declarative.hash index d583ab15d5..422b45249f 100644 --- a/package/qt5/qt5declarative/qt5declarative.hash +++ b/package/qt5/qt5declarative/qt5declarative.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtdeclarative-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f63fc053d0d16b8a9ca9308f8ead77874b470ae31b66057e2bd336bf648191fc qtdeclarative-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtdeclarative-everywhere-src-5.12.1.tar.xz.sha256 -sha256 a384a734d94f28a98aa74e076d50fa6b9724af83526feb6c371945545d8cb409 qtdeclarative-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtdeclarative-everywhere-src-5.12.2.tar.xz.sha256 +sha256 470568745602e7fa21cdca42b1641162e4257cfeb7a2dcf8af24538c9516cc5b qtdeclarative-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash index e570531629..b46c68542c 100644 --- a/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ b/package/qt5/qt5graphicaleffects/qt5graphicaleffects.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtgraphicaleffects-opensource-src-5.6.3.tar.xz.mirrorlist sha256 c742592d5e45b122b29df60b69be23ba7c817f2dc471db86e054f6ea24a999ed qtgraphicaleffects-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtgraphicaleffects-everywhere-src-5.12.1.tar.xz.sha256 -sha256 2e63abf6b02b86461b73b317eba00b6721601a9469c22da28e3f4ea1d5df68d7 qtgraphicaleffects-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtgraphicaleffects-everywhere-src-5.12.2.tar.xz.sha256 +sha256 429398b6c661897b3c7cd62fb3657a2de60ad9152578edeeca0abde6e7ae5a86 qtgraphicaleffects-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5imageformats/qt5imageformats.hash b/package/qt5/qt5imageformats/qt5imageformats.hash index 3fd6ba46e5..da656554cb 100644 --- a/package/qt5/qt5imageformats/qt5imageformats.hash +++ b/package/qt5/qt5imageformats/qt5imageformats.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtimageformats-opensource-src-5.6.3.tar.xz.mirrorlist sha256 efe4da3c90c976c9b9a2eb6b081d2b8e1435935695104456276ce98e8a5848c3 qtimageformats-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtimageformats-everywhere-src-5.12.1.tar.xz.sha256 -sha256 0425f35dbcc83cd5840e2d3a73ed4c57c426af9d6ac7b9fe3a40d23560653421 qtimageformats-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtimageformats-everywhere-src-5.12.2.tar.xz.sha256 +sha256 1ea757728f205deb6b3f5873f5c7c3129cded5993077500a9fb249559bee7a9c qtimageformats-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5location/qt5location.hash b/package/qt5/qt5location/qt5location.hash index e79eb611b4..2a52e1f116 100644 --- a/package/qt5/qt5location/qt5location.hash +++ b/package/qt5/qt5location/qt5location.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtlocation-opensource-src-5.6.3.tar.xz.mirrorlist sha256 b7a81c58cc331fb15bea8fba21d3c9a59f6dc6ad2e4855e30a14ce59a2af1466 qtlocation-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtlocation-everywhere-src-5.12.1.tar.xz.sha256 -sha256 8b922373e6eefd1b0e2a993dbf3d0b3f3df777bc720d40cad3ccb46e1936bc50 qtlocation-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtlocation-everywhere-src-5.12.2.tar.xz.sha256 +sha256 a31f27f457ac57e7203ae808b95ba0053d182e22425de03840af761e343d8bef qtlocation-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5multimedia/qt5multimedia.hash b/package/qt5/qt5multimedia/qt5multimedia.hash index 5911c24c3d..8c150cce40 100644 --- a/package/qt5/qt5multimedia/qt5multimedia.hash +++ b/package/qt5/qt5multimedia/qt5multimedia.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtmultimedia-opensource-src-5.6.3.tar.xz.mirrorlist sha256 ae36039ea8037742342f1615687e0ca2188f3ed0d700627a5e5be546c15e1b46 qtmultimedia-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtmultimedia-everywhere-src-5.12.1.tar.xz.sha256 -sha256 9c5ba11225f57d3a8124f109514443e290a9eb94e063a5b1f78e63edfb5f0b18 qtmultimedia-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtmultimedia-everywhere-src-5.12.2.tar.xz.sha256 +sha256 5d3c90c546e64abf523432a3df5e7a3f1b5ad72e7d0b5ea6260729fbefeb30f5 qtmultimedia-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash index 240f4b4c8c..c7944c89ba 100644 --- a/package/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ b/package/qt5/qt5quickcontrols/qt5quickcontrols.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtquickcontrols-opensource-src-5.6.3.tar.xz.mirrorlist sha256 31bb0fc8f21b855af6ff02c415be3246128b523d0ef7c05e248e92281ab0db8e qtquickcontrols-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtquickcontrols-everywhere-src-5.12.1.tar.xz.sha256 -sha256 15164b00921352b5145a4fc3be0015b8521138a0cb1ecfb9811f39fd35ecd62c qtquickcontrols-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtquickcontrols-everywhere-src-5.12.2.tar.xz.sha256 +sha256 9b5c87605d08849927dd09bf9b03a939511461372b7e20004abe1116cf9fc73e qtquickcontrols-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5quickcontrols2/5.12.1/qt5quickcontrols2.hash b/package/qt5/qt5quickcontrols2/5.12.2/qt5quickcontrols2.hash similarity index 66% rename from package/qt5/qt5quickcontrols2/5.12.1/qt5quickcontrols2.hash rename to package/qt5/qt5quickcontrols2/5.12.2/qt5quickcontrols2.hash index 73cb76b53f..25ae01a67d 100644 --- a/package/qt5/qt5quickcontrols2/5.12.1/qt5quickcontrols2.hash +++ b/package/qt5/qt5quickcontrols2/5.12.2/qt5quickcontrols2.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtquickcontrols2-everywhere-src-5.12.1.tar.xz.sha256 -sha256 caa47b6d771b11c65d595fdd0f0942c3d78cda2884d318e3b1da8ec67155a8e7 qtquickcontrols2-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtquickcontrols2-everywhere-src-5.12.2.tar.xz.sha256 +sha256 1fbd703612a2c0257861e07a2b709f6fbad00cb6df70a1c2c1fafa9de522e549 qtquickcontrols2-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 d2cfc059acb4abd8e513cd0a73cd8489f34cbafa7bc34d5d31fb3210821cf8ca LICENSE.GPLv3 diff --git a/package/qt5/qt5script/qt5script.hash b/package/qt5/qt5script/qt5script.hash index c5458b5517..4683dce90b 100644 --- a/package/qt5/qt5script/qt5script.hash +++ b/package/qt5/qt5script/qt5script.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtscript-opensource-src-5.6.3.tar.xz.mirrorlist sha256 f08720dd0e3a70377c1cb7fa3b129e24f4cdedade279e51b67c9271ab470b389 qtscript-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtscript-everywhere-src-5.12.1.tar.xz.sha256 -sha256 e5c158fb85799404d20d1ec5dd33a25d5f5736807e1008ce626f666a52c80624 qtscript-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtscript-everywhere-src-5.12.2.tar.xz.sha256 +sha256 f8717d51072b4d4455755ae081e45f23f3d0ce25602f96231dd7703bd818a2e6 qtscript-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5scxml/qt5scxml.hash b/package/qt5/qt5scxml/qt5scxml.hash index bd37c9ee8b..437d18891b 100644 --- a/package/qt5/qt5scxml/qt5scxml.hash +++ b/package/qt5/qt5scxml/qt5scxml.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtscxml-everywhere-src-5.12.1.tar.xz.sha256 -sha256 59a2aa1000fe03b0a3eff6fddd21f782e305408fcdd7af1f564a382331cb20b7 qtscxml-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtscxml-everywhere-src-5.12.2.tar.xz.sha256 +sha256 69592542fdf4b2efe6a6378ecb1bfdda9e7f48007e191d7f77a0009e213a8623 qtscxml-everywhere-src-5.12.2.tar.xz # Hashes for license files: diff --git a/package/qt5/qt5sensors/qt5sensors.hash b/package/qt5/qt5sensors/qt5sensors.hash index 6f5d02033f..f297d2aa2a 100644 --- a/package/qt5/qt5sensors/qt5sensors.hash +++ b/package/qt5/qt5sensors/qt5sensors.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsensors-opensource-src-5.6.3.tar.xz.mirrorlist sha256 7502d4dc5571865a7eea2a4180c3be396dfb8ce22df4c4f3d7e9ff32ab334973 qtsensors-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtsensors-everywhere-src-5.12.1.tar.xz.sha256 -sha256 ebc8b4bcfacf10c3bea3f400da7bf3fc7f44f90fa9eb0320c3b87f17307a63e4 qtsensors-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtsensors-everywhere-src-5.12.2.tar.xz.sha256 +sha256 758a131ad86c4b8b8364e48d659a680ed12d03c091c5ab2958d06b7b0aa2e50c qtsensors-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5serialbus/5.12.1/qt5serialbus.hash b/package/qt5/qt5serialbus/5.12.2/qt5serialbus.hash similarity index 71% rename from package/qt5/qt5serialbus/5.12.1/qt5serialbus.hash rename to package/qt5/qt5serialbus/5.12.2/qt5serialbus.hash index 429232c45e..098f05f2bb 100644 --- a/package/qt5/qt5serialbus/5.12.1/qt5serialbus.hash +++ b/package/qt5/qt5serialbus/5.12.2/qt5serialbus.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtserialbus-everywhere-src-5.12.1.tar.xz.sha256 -sha256 97f0c690c77b0e19a8c90e376ecc94d59b21adb20a90179700d1c514a4c50d74 qtserialbus-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtserialbus-everywhere-src-5.12.2.tar.xz.sha256 +sha256 16bfee0be81805d82d4f9c04425b5bc2678ca01fa1617fc72613a893438aaa48 qtserialbus-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 edfe70e99be2a7c109d860b19204609e582720b211c50caedac729da372a1253 LICENSE.GPLv2 diff --git a/package/qt5/qt5serialport/5.12.1/qt5serialport.hash b/package/qt5/qt5serialport/5.12.2/qt5serialport.hash similarity index 74% rename from package/qt5/qt5serialport/5.12.1/qt5serialport.hash rename to package/qt5/qt5serialport/5.12.2/qt5serialport.hash index 6adcaaff61..66ddf16f35 100644 --- a/package/qt5/qt5serialport/5.12.1/qt5serialport.hash +++ b/package/qt5/qt5serialport/5.12.2/qt5serialport.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtserialport-everywhere-src-5.12.1.tar.xz.mirrorlist -sha256 243b2502283c45f5163d68c3f23c787d46eb0e3ba58f3d9a0560dc7968a6ce19 qtserialport-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtserialport-everywhere-src-5.12.2.tar.xz.mirrorlist +sha256 72163cedda4c6fa787db8666bec6b5057272dc87bf8de6addba3440dd472bd7f qtserialport-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5svg/qt5svg.hash b/package/qt5/qt5svg/qt5svg.hash index ddc059aa99..4f06a21d86 100644 --- a/package/qt5/qt5svg/qt5svg.hash +++ b/package/qt5/qt5svg/qt5svg.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtsvg-opensource-src-5.6.3.tar.xz.mirrorlist sha256 100f183517b46554079beabd8d2cabe3070a74dd0a2e64b6a304eac71cfadcec qtsvg-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtsvg-everywhere-src-5.12.1.tar.xz.sha256 -sha256 5bc1f744d32c06f5aa4eff33759568106a995ce21fa1326a247dfa5f783f63c8 qtsvg-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtsvg-everywhere-src-5.12.2.tar.xz.sha256 +sha256 ed9f2118a6d33f53e5d9ed18dcd36f252a4fbaf68382a1c4a663ba75b25ae7bd qtsvg-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5tools/qt5tools.hash b/package/qt5/qt5tools/qt5tools.hash index 06e2127dba..41c98e733a 100644 --- a/package/qt5/qt5tools/qt5tools.hash +++ b/package/qt5/qt5tools/qt5tools.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qttools-opensource-src-5.6.3.tar.xz.mirrorlist sha256 1a63ba838058d73cb540040589b235ded77f76402693decfd6d4d3c75ea67926 qttools-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qttools-everywhere-src-5.12.1.tar.xz.sha256 -sha256 ab1da4fbd84a9d3873e4ed212a0ae614c6059b8e7dca2f0a599a6f7e61f6cbf3 qttools-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qttools-everywhere-src-5.12.2.tar.xz.sha256 +sha256 4aa3a089794ab1c629b666fffb5da4371351a9e85ea691d5d988c2ff63586005 qttools-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5virtualkeyboard/5.12.1/qt5virtualkeyboard.hash b/package/qt5/qt5virtualkeyboard/5.12.2/qt5virtualkeyboard.hash similarity index 78% rename from package/qt5/qt5virtualkeyboard/5.12.1/qt5virtualkeyboard.hash rename to package/qt5/qt5virtualkeyboard/5.12.2/qt5virtualkeyboard.hash index 0e6860f3d6..69c947359a 100644 --- a/package/qt5/qt5virtualkeyboard/5.12.1/qt5virtualkeyboard.hash +++ b/package/qt5/qt5virtualkeyboard/5.12.2/qt5virtualkeyboard.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz.sha256 -sha256 a9e3ed4786d603314144c7ad29a9fdeb6e5c3f2ea5a27f6545cc9777244cd683 qtvirtualkeyboard-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtvirtualkeyboard-everywhere-src-5.12.2.tar.xz.sha256 +sha256 7111de5c78f8a0d29394409727647b90ae5906fd5105c843af98c3ae3804248d qtvirtualkeyboard-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 LICENSE.GPL3 diff --git a/package/qt5/qt5wayland/qt5wayland.hash b/package/qt5/qt5wayland/qt5wayland.hash index 5b898bd3da..2fdcc34382 100644 --- a/package/qt5/qt5wayland/qt5wayland.hash +++ b/package/qt5/qt5wayland/qt5wayland.hash @@ -1,8 +1,8 @@ # hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwayland-opensource-src-5.6.3.tar.xz.mirrorlist sha256 5a475278b2db73aa7fa7f3ba6d98d8d72774f5c77e172495007d79f91d09daa3 qtwayland-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwayland-everywhere-src-5.12.1.tar.xz.sha256 -sha256 88f0507628b3697b0d59349d27b5e60a313a3138927722d6cf981089fff02553 qtwayland-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtwayland-everywhere-src-5.12.2.tar.xz.sha256 +sha256 b7840692420d106871433eb1b678277f09927d48ec6eb31a1851ee9c60d9df84 qtwayland-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webchannel/qt5webchannel.hash b/package/qt5/qt5webchannel/qt5webchannel.hash index 1bbb8fbf20..e56c7907eb 100644 --- a/package/qt5/qt5webchannel/qt5webchannel.hash +++ b/package/qt5/qt5webchannel/qt5webchannel.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebchannel-opensource-src-5.6.3.tar.xz.mirrorlist sha256 8eb1b0ac2286653c7932758c21e7760788a5d7cfd6162da09afa926d5be50713 qtwebchannel-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwebchannel-everywhere-src-5.12.1.tar.xz.sha256 -sha256 40c3e74347c67a9864d0d54f14120555860e4ce529746407325b3cd6e9aeb5bf qtwebchannel-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtwebchannel-everywhere-src-5.12.2.tar.xz.sha256 +sha256 8eb9cff9492937daa1bf5d001e39afec68c310ce5596807345e2a555dcc80b8e qtwebchannel-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5webengine/5.12.1/qt5webengine.hash b/package/qt5/qt5webengine/5.12.2/qt5webengine.hash similarity index 99% rename from package/qt5/qt5webengine/5.12.1/qt5webengine.hash rename to package/qt5/qt5webengine/5.12.2/qt5webengine.hash index cf0152b06e..72e3cdbfd2 100644 --- a/package/qt5/qt5webengine/5.12.1/qt5webengine.hash +++ b/package/qt5/qt5webengine/5.12.2/qt5webengine.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwebengine-everywhere-src-5.12.1.tar.xz.sha256 -sha256 43e91e06bc4a60ef0f91d15ae06425cf9c6b4f7dafe960259a5b013c687c3bd0 qtwebengine-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtwebengine-everywhere-src-5.12.2.tar.xz.sha256 +sha256 082b1d6e60c1be61881bc8533acc67d9688620d6b3a538417f62b27b34ead493 qtwebengine-everywhere-src-5.12.2.tar.xz # Locally calculated sha256 f34787ef0342c614b667186a6ec2f5d6b9d650e30142a2788a589a89743e88e9 LICENSE.Chromium diff --git a/package/qt5/qt5websockets/qt5websockets.hash b/package/qt5/qt5websockets/qt5websockets.hash index 3b2f4fa3c3..3f4f438a4d 100644 --- a/package/qt5/qt5websockets/qt5websockets.hash +++ b/package/qt5/qt5websockets/qt5websockets.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtwebsockets-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a2439045616c89dfe06333734ff4726075c92e01db6e6b6863bc138e39c028eb qtwebsockets-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtwebsockets-everywhere-src-5.12.1.tar.xz.sha256 -sha256 2fd0627916d817599c5f855a97156113ed3625b90b350603be6f668762abfc79 qtwebsockets-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtwebsockets-everywhere-src-5.12.2.tar.xz.sha256 +sha256 ab9ce815b1466abe52910c9b50c0f61df8af74f9521574bb534f7f562d0e8c04 qtwebsockets-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5x11extras/5.12.1/qt5x11extras.hash b/package/qt5/qt5x11extras/5.12.2/qt5x11extras.hash similarity index 74% rename from package/qt5/qt5x11extras/5.12.1/qt5x11extras.hash rename to package/qt5/qt5x11extras/5.12.2/qt5x11extras.hash index b065234f4c..1ab741d9e8 100644 --- a/package/qt5/qt5x11extras/5.12.1/qt5x11extras.hash +++ b/package/qt5/qt5x11extras/5.12.2/qt5x11extras.hash @@ -1,5 +1,5 @@ -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtx11extras-everywhere-src-5.12.1.tar.xz.mirrorlist -sha256 08fb1c40e1562d43087368a5efa39569fa1ad52b72d2360f9fc1fe18b00da366 qtx11extras-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtx11extras-everywhere-src-5.12.2.tar.xz.mirrorlist +sha256 711f39ddc6237787a5522278be235fe3af547a4674bb265e6dff5c2892fe6084 qtx11extras-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 diff --git a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash index f22e4e54ff..1113860644 100644 --- a/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ b/package/qt5/qt5xmlpatterns/qt5xmlpatterns.hash @@ -1,8 +1,8 @@ # Hash from: https://download.qt.io/official_releases/qt/5.6/5.6.3/submodules/qtxmlpatterns-opensource-src-5.6.3.tar.xz.mirrorlist sha256 a461ff9f0d7310de9b9904ff9cd34919e958bf4071a6fc7096450b8990ab51f6 qtxmlpatterns-opensource-src-5.6.3.tar.xz -# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtxmlpatterns-everywhere-src-5.12.1.tar.xz.sha256 -sha256 76988ca9a7a184b9013b8a5864dad150e4603890c7eb7aecad4baad071802ecb qtxmlpatterns-everywhere-src-5.12.1.tar.xz +# Hash from: https://download.qt.io/official_releases/qt/5.12/5.12.2/submodules/qtxmlpatterns-everywhere-src-5.12.2.tar.xz.sha256 +sha256 2e535ec17b542f2a0b87a9db93284666015cc07b6188894ace7e75104c6d860d qtxmlpatterns-everywhere-src-5.12.2.tar.xz # Hashes for license files: sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE.GPL2 From 3bc0830d5de3e2b94f0565b7a7314b1515dd4612 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Mar 2019 21:46:40 +0100 Subject: [PATCH 0309/7482] package/uftp: needs MMU, threads and wchar Fixes: - http://autobuild.buildroot.org/results/47dd067dfdcaae99d50216f59ea6af115d8f1e1e Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/uftp/Config.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/uftp/Config.in b/package/uftp/Config.in index b6a8961628..ca6e5f9a05 100644 --- a/package/uftp/Config.in +++ b/package/uftp/Config.in @@ -1,7 +1,14 @@ config BR2_PACKAGE_UFTP bool "uftp" + depends on BR2_USE_MMU # fork() + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR select BR2_PACKAGE_OPENSSL help Encrypted UDP based FTP with multicast. http://uftp-multicast.sourceforge.net/ + +comment "uftp needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR From a3a4d4d4d307fd21f19ae43e77ac21b85adad7f2 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 19 Mar 2019 18:15:47 +0000 Subject: [PATCH 0310/7482] linux: allow BR2_LINUX_KERNEL_IMAGE on RISC-V We will need to build Image files for OpenSBI so allow that now. Signed-off-by: Alistair Francis Signed-off-by: Thomas Petazzoni --- linux/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/Config.in b/linux/Config.in index 818b94e1c0..dc10238053 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -258,7 +258,7 @@ config BR2_LINUX_KERNEL_SIMPLEIMAGE config BR2_LINUX_KERNEL_IMAGE bool "Image" - depends on BR2_aarch64 + depends on BR2_aarch64 || BR2_riscv config BR2_LINUX_KERNEL_LINUX_BIN bool "linux.bin" From 8f43ec6ce8d766d8954d4dd5366cef910c2b11b5 Mon Sep 17 00:00:00 2001 From: Adam Duskett Date: Tue, 19 Mar 2019 11:31:49 -0400 Subject: [PATCH 0311/7482] package/libglib2: add optional dependency in libselinux If libselinux is selected, explicitly set --enable-selinux in the configure options and build the library first. Signed-off-by: Adam Duskett Signed-off-by: Thomas Petazzoni --- package/libglib2/libglib2.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index d34bfabd52..63bfec32d6 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -137,6 +137,13 @@ LIBGLIB2_CONF_OPTS += --with-libiconv=gnu LIBGLIB2_DEPENDENCIES += libiconv endif +ifeq ($(BR2_PACKAGE_LIBSELINUX),y) +LIBGLIB2_CONF_OPTS += --enable-selinux +LIBGLIB2_DEPENDENCIES += libselinux +else +LIBGLIB2_CONF_OPTS += --disable-selinux +endif + # Purge gdb-related files ifneq ($(BR2_PACKAGE_GDB),y) define LIBGLIB2_REMOVE_GDB_FILES From 1e4da9c1f953679fa2bf42ad4b23fc51e2bfbeb7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 19 Mar 2019 22:27:53 +0100 Subject: [PATCH 0312/7482] package/angularjs: fix license file hash The update of angularjs to 1.7.8 in commit 00dcde3eb12d194d31356fd6e54c0328acd371a1 broke legal-info for this package, because the hash of the license file changed. In fact, we are using angular.js as the license file and obviously it is likely to change between each release. The new angular.js still specifies a MIT license, so we can update the license file hash. Fixes: http://autobuild.buildroot.net/results/0b8ad8d8384d605c2230e862548ccaba1f06d9b0/ Signed-off-by: Thomas Petazzoni --- package/angularjs/angularjs.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/angularjs/angularjs.hash b/package/angularjs/angularjs.hash index 61a9ceeb7c..81ef5c160f 100644 --- a/package/angularjs/angularjs.hash +++ b/package/angularjs/angularjs.hash @@ -1,3 +1,3 @@ # Locally computed: sha256 4d1e5755d7722fed1fa223d854f209251bfee042c72ffe5cca63c4c1a7a19d78 angular-1.7.8.zip -sha256 db7862d0083ae74b5c94005d18274c3528f1be2932b72438e2f606a3d1f23ab5 angular.js +sha256 e3b0100b35fa76ace389c29ee0f69b68126d2e759f7e5df82d4f56254ba53688 angular.js From 3033e83d1224c1710cb6f5e0691b80cd62b1c657 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 18 Mar 2019 23:40:42 +0100 Subject: [PATCH 0313/7482] package/libpcap: fix bluez5_utils-headers dependency Commit c46afc37dc877f1e94ffde0d77585290711b27ec changed bluez5-utils dependency by bluez5_utils-headers without replacing the test on BR2_PACKAGE_BLUEZ5_UTILS by BR2_PACKAGE_BLUEZ5_UTILS_HEADERS Fix this mistake and also add a select on BR2_PACKAGE_BLUEZ5_UTILS_HEADERS if BR2_PACKAGE_BLUEZ5_UTILS is set so the user does not have to do it Fixes: - http://autobuild.buildroot.org/results/c6828df1f3782564451ddd4187ff026679bf37d8 Signed-off-by: Fabrice Fontaine Acked-by: Baruch Siach Signed-off-by: Thomas Petazzoni --- package/libpcap/Config.in | 1 + package/libpcap/libpcap.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package/libpcap/Config.in b/package/libpcap/Config.in index 643acbef6e..74429f209a 100644 --- a/package/libpcap/Config.in +++ b/package/libpcap/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBPCAP bool "libpcap" + select BR2_PACKAGE_BLUEZ5_UTILS_HEADERS if BR2_PACKAGE_BLUEZ5_UTILS select BR2_PACKAGE_ZLIB help A system-independent library for user-level network packet diff --git a/package/libpcap/libpcap.mk b/package/libpcap/libpcap.mk index 2f46426d37..ebceca5273 100644 --- a/package/libpcap/libpcap.mk +++ b/package/libpcap/libpcap.mk @@ -26,7 +26,7 @@ define LIBPCAP_CONFIG_REMOVE_RPATH endef LIBPCAP_POST_BUILD_HOOKS = LIBPCAP_CONFIG_REMOVE_RPATH -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) +ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),y) LIBPCAP_DEPENDENCIES += bluez5_utils-headers else LIBPCAP_CONF_OPTS += --disable-bluetooth From 83f7a923d092411c2c15cc08b66c379ce7359571 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 20 Mar 2019 13:36:54 +0100 Subject: [PATCH 0314/7482] package/gesftpserver: bump version to latest stable By default, gesftpserver wants to treat al warnings as errors, but there is an actual warning in the release, so we quiesce that by not treating warnings as errors. We also backport a patch from upstream, to fix the ordering of some fields when sending file attributes. Signed-off-by: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- ...v3-attributes-according-to-draft-iet.patch | 30 +++++++++++++++++++ package/gesftpserver/gesftpserver.hash | 3 +- package/gesftpserver/gesftpserver.mk | 6 +++- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch diff --git a/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch b/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch new file mode 100644 index 0000000000..3697d0e525 --- /dev/null +++ b/package/gesftpserver/0001-Change-order-of-v3-attributes-according-to-draft-iet.patch @@ -0,0 +1,30 @@ +From 4b5c7eb63894bd2b1fedeb2a8e9bd16bf3c8c555 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bernd=20Holzm=C3=BCller?= + +Date: Mon, 11 Feb 2019 23:57:01 +0100 +Subject: [PATCH] Change order of v3-attributes according to + draft-ietf-secsh-filexfer-00/02 + +[yann.morin.1998@free.fr: backport from upstream] +Signed-off-by: "Yann E. MORIN" +--- + v3.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/v3.c b/v3.c +index 57cc31e..1fd86ad 100644 +--- a/v3.c ++++ b/v3.c +@@ -121,8 +121,8 @@ static void v3_sendattrs(struct sftpjob *job, const struct sftpattr *attrs) { + fatal("sending out-of-range mtime"); + if(a != attrs->atime.seconds) + fatal("sending out-of-range mtime"); +- sftp_send_uint32(job->worker, m); + sftp_send_uint32(job->worker, a); ++ sftp_send_uint32(job->worker, m); + } + /* Note that we just discard unknown bits rather than reporting errors. */ + } +-- +2.14.1 + diff --git a/package/gesftpserver/gesftpserver.hash b/package/gesftpserver/gesftpserver.hash index 1a8a5f3492..790cbe97c2 100644 --- a/package/gesftpserver/gesftpserver.hash +++ b/package/gesftpserver/gesftpserver.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 8ac1938d0f62a05799b2aeab489d6ce098c3fe53280a9b66c0957b1fdcbcbab9 sftpserver-0.2.2.tar.gz +sha256 4963b85787de3485085a5356c671c58b8b33125f528ff1b2fe8b534ed8a0c1bd sftpserver-1.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/gesftpserver/gesftpserver.mk b/package/gesftpserver/gesftpserver.mk index 58c6270a09..ff7ce768ae 100644 --- a/package/gesftpserver/gesftpserver.mk +++ b/package/gesftpserver/gesftpserver.mk @@ -4,11 +4,15 @@ # ################################################################################ -GESFTPSERVER_VERSION = 0.2.2 +GESFTPSERVER_VERSION = 1 GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz GESFTPSERVER_SITE = http://www.greenend.org.uk/rjk/sftpserver GESFTPSERVER_LICENSE = GPL-2.0+ GESFTPSERVER_LICENSE_FILES = COPYING + +# "Missing prototype" warning treated as error +GESFTPSERVER_CONF_OPTS = --disable-warnings-as-errors + # forgets to link against pthread when cross compiling GESFTPSERVER_CONF_ENV = LIBS=-lpthread From f389df2334750194b0a19cb5dff86739f2bf7e2d Mon Sep 17 00:00:00 2001 From: Ryan Coe Date: Tue, 19 Mar 2019 16:47:19 -0700 Subject: [PATCH 0315/7482] package/mariadb: security bump to version 10.3.13 Release notes: https://mariadb.com/kb/en/library/mariadb-10313-release-notes/ Changelog: https://mariadb.com/kb/en/mariadb-10313-changelog/ Fixes the following security vulnerabilities: CVE-2019-2510 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: InnoDB). Supported versions that are affected are 5.7.24 and prior and 8.0.13 and prior. Easily exploitable vulnerability allows high privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. CVE-2019-2537 - Vulnerability in the MySQL Server component of Oracle MySQL (subcomponent: Server: DDL). Supported versions that are affected are 5.6.42 and prior, 5.7.24 and prior and 8.0.13 and prior. Easily exploitable vulnerability allows high privileged attacker with network access via multiple protocols to compromise MySQL Server. Successful attacks of this vulnerability can result in unauthorized ability to cause a hang or frequently repeatable crash (complete DOS) of MySQL Server. Note that the hash for README.md changed due to Travis CI and Appveyor CI updates. Signed-off-by: Ryan Coe Signed-off-by: Peter Korsgaard --- package/mariadb/mariadb.hash | 12 ++++++------ package/mariadb/mariadb.mk | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index f68eb40224..db24f7bb9b 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,9 +1,9 @@ -# From https://downloads.mariadb.org/mariadb/10.3.11 -md5 e13ab133060886cda814d68ebd1dc27b mariadb-10.3.11.tar.gz -sha1 7b75d7ec06642f26ce197e07f5ba16283061cc87 mariadb-10.3.11.tar.gz -sha256 211655b794c9d5397ba3be6c90737eac02e882f296268299239db47ba328f1b2 mariadb-10.3.11.tar.gz -sha512 1adc1f9bbabf848726c669a7a0ab01257ba31882758b53fbf3b1316f2295670dba1c3d1f3292d7c1a749c701504588694a55d020839e690595897b0e20435298 mariadb-10.3.11.tar.gz +# From https://downloads.mariadb.org/mariadb/10.3.13 +md5 603ce42e35b9a688f2cca05275acb5cb mariadb-10.3.13.tar.gz +sha1 08467885412184e99b835732913d445fd2c4b1b3 mariadb-10.3.13.tar.gz +sha256 b2aa857ef5b84f85a7ea60a1eac7b34c0ca5151c71a0d44ce2d7fb028d71459a mariadb-10.3.13.tar.gz +sha512 3cbd93291aa43b235e5b81d953ea69fb32df54fb518f922f69b5485952f01fae693c77b0efac37f414ed7ff132d3b58f899812bdb7be8a5b344c3640e2c3a0dd mariadb-10.3.13.tar.gz # Hash for license files -sha256 a298aaf95cb7e594d15b29ae6b5a9ee22a2be4344379fd29304df4e0f19f695a README.md +sha256 43f4b5b13cecbbdb04a180cbf6c2bd64237819d1a32165b7d475c1b392e6a8d1 README.md sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index e17649209a..356dd29af3 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.3.11 +MARIADB_VERSION = 10.3.13 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text From c11aae0e064ad285deaa7ccaf141cc9920a59442 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Mar 2019 23:17:29 +0100 Subject: [PATCH 0316/7482] package/uftp: fix openssl static linking Fixes: - http://autobuild.buildroot.org/results/051cfd993b65830c34e675d797e241c272b6f35a Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/uftp/uftp.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/package/uftp/uftp.mk b/package/uftp/uftp.mk index bbc362652b..f9f0502b49 100644 --- a/package/uftp/uftp.mk +++ b/package/uftp/uftp.mk @@ -6,16 +6,19 @@ UFTP_VERSION = 4.9.9 UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar -UFTP_DEPENDENCIES = openssl +UFTP_DEPENDENCIES = host-pkgconf openssl UFTP_LICENSE = GPL-3.0+ UFTP_LICENSE_FILES = LICENSE.txt +UFTP_MAKE_OPTS = CRYPT_LIB="`$(PKG_CONFIG_HOST_BINARY) --libs libssl`" + define UFTP_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(UFTP_MAKE_OPTS) endef define UFTP_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install + $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(UFTP_MAKE_OPTS) \ + DESTDIR=$(TARGET_DIR) install endef $(eval $(generic-package)) From 340f89403efc50c3a6096d13282de0761ecf683e Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Tue, 19 Mar 2019 23:17:30 +0100 Subject: [PATCH 0317/7482] package/uftp: openssl is optional, not mandatory Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/uftp/Config.in | 1 - package/uftp/uftp.mk | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package/uftp/Config.in b/package/uftp/Config.in index ca6e5f9a05..b88fb03ae2 100644 --- a/package/uftp/Config.in +++ b/package/uftp/Config.in @@ -3,7 +3,6 @@ config BR2_PACKAGE_UFTP depends on BR2_USE_MMU # fork() depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_WCHAR - select BR2_PACKAGE_OPENSSL help Encrypted UDP based FTP with multicast. diff --git a/package/uftp/uftp.mk b/package/uftp/uftp.mk index f9f0502b49..abdb0a4def 100644 --- a/package/uftp/uftp.mk +++ b/package/uftp/uftp.mk @@ -6,11 +6,15 @@ UFTP_VERSION = 4.9.9 UFTP_SITE = http://sourceforge.net/projects/uftp-multicast/files/source-tar -UFTP_DEPENDENCIES = host-pkgconf openssl UFTP_LICENSE = GPL-3.0+ UFTP_LICENSE_FILES = LICENSE.txt -UFTP_MAKE_OPTS = CRYPT_LIB="`$(PKG_CONFIG_HOST_BINARY) --libs libssl`" +ifeq ($(BR2_PACKAGE_OPENSSL),y) +UFTP_DEPENDENCIES += host-pkgconf openssl +UFTP_MAKE_OPTS += CRYPT_LIB="`$(PKG_CONFIG_HOST_BINARY) --libs libssl`" +else +UFTP_MAKE_OPTS += NO_ENCRYPTION=1 +endif define UFTP_BUILD_CMDS $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(UFTP_MAKE_OPTS) From d693ae7dc50f2346d67d604e8111e9d599f2629a Mon Sep 17 00:00:00 2001 From: Asaf Kahlon Date: Wed, 20 Mar 2019 20:44:46 +0200 Subject: [PATCH 0318/7482] package/libuv: bump to version 1.27.0 Signed-off-by: Asaf Kahlon Signed-off-by: Peter Korsgaard --- package/libuv/libuv.hash | 2 +- package/libuv/libuv.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/libuv/libuv.hash b/package/libuv/libuv.hash index e0a217c625..be8a81996d 100644 --- a/package/libuv/libuv.hash +++ b/package/libuv/libuv.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 e414cf74615b7dae768f0f5667092f1d4975f5067c087bcbe0641e241ebe4693 libuv-v1.26.0.tar.gz +sha256 4afcdc84cd315b77c8e532e7b3fde43d536af0e2e835eafbd0e75518ed26dbed libuv-v1.27.0.tar.gz sha256 6d20216ae022fbeed23916f48508fd807ece3d8464992330643b0e64e5c0c24b LICENSE diff --git a/package/libuv/libuv.mk b/package/libuv/libuv.mk index 4ab7f754ff..c6c37618eb 100644 --- a/package/libuv/libuv.mk +++ b/package/libuv/libuv.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBUV_VERSION = v1.26.0 +LIBUV_VERSION = v1.27.0 LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) LIBUV_DEPENDENCIES = host-pkgconf LIBUV_INSTALL_STAGING = YES From 3a026d650ced90ee6de5b13daa3b93ba1ca0a1cc Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 20 Mar 2019 20:10:01 +0100 Subject: [PATCH 0319/7482] package/jq: security bump to version 1.6 - Fix CVE-2015-8863 and CVE-2016-4074: https://github.com/stedolan/jq/issues/1406 - Add hash for license file - Disable oniguruma (enabled by default) Signed-off-by: Fabrice Fontaine Signed-off-by: Peter Korsgaard --- package/jq/jq.hash | 3 ++- package/jq/jq.mk | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package/jq/jq.hash b/package/jq/jq.hash index 2cd640563a..449619b024 100644 --- a/package/jq/jq.hash +++ b/package/jq/jq.hash @@ -1,2 +1,3 @@ # Locally calculated -sha256 c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c jq-1.5.tar.gz +sha256 5de8c8e29aaa3fb9cc6b47bb27299f271354ebb72514e3accadc7d38b5bbaa72 jq-1.6.tar.gz +sha256 111136aebcbfa68b6b0084e582b30e981da76adcff84eab6f9be32a1f38c5bf1 COPYING diff --git a/package/jq/jq.mk b/package/jq/jq.mk index 79629faa5e..aebe8c86e4 100644 --- a/package/jq/jq.mk +++ b/package/jq/jq.mk @@ -4,7 +4,7 @@ # ################################################################################ -JQ_VERSION = 1.5 +JQ_VERSION = 1.6 JQ_SITE = https://github.com/stedolan/jq/releases/download/jq-$(JQ_VERSION) JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation) JQ_LICENSE_FILES = COPYING @@ -17,8 +17,8 @@ JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99 -D_GNU_SOURCE" HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99 -D_GNU_SOURCE" # jq explicitly enables maintainer mode, which we don't need/want -JQ_CONF_OPTS += --disable-maintainer-mode -HOST_JQ_CONF_OPTS += --disable-maintainer-mode +JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma +HOST_JQ_CONF_OPTS += --disable-maintainer-mode --without-oniguruma $(eval $(autotools-package)) $(eval $(host-autotools-package)) From 5ab992231d8128fdc20644f0c3fd8e7effefbda5 Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Wed, 20 Mar 2019 14:47:52 +0100 Subject: [PATCH 0320/7482] gummiboot: use new official upstream git repository Signed-off-by: Esben Haabendal Signed-off-by: Peter Korsgaard --- boot/gummiboot/gummiboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk index 85a5daaeab..0e67e5e8ce 100644 --- a/boot/gummiboot/gummiboot.mk +++ b/boot/gummiboot/gummiboot.mk @@ -4,7 +4,7 @@ # ################################################################################ -GUMMIBOOT_SITE = http://cgit.freedesktop.org/gummiboot +GUMMIBOOT_SITE = https://gitlab.freedesktop.org/archived-projects/gummiboot.git GUMMIBOOT_SITE_METHOD = git GUMMIBOOT_VERSION = 43 GUMMIBOOT_LICENSE = LGPL-2.1+ From 74d99ad941677db785b5175a938c8cdce7707543 Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Wed, 20 Mar 2019 14:47:53 +0100 Subject: [PATCH 0321/7482] gummiboot: upgrade to last commit before being removed This upgrades to version 48 plus the last commits done after that. Note, that after that, gummiboot is officially dead, so there will be no more upstream commits after this. For various reasons, there are still users of gummiboot, so let's base our work on the latest gummiboot "version". Signed-off-by: Esben Haabendal Signed-off-by: Peter Korsgaard --- boot/gummiboot/gummiboot.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/gummiboot/gummiboot.mk b/boot/gummiboot/gummiboot.mk index 0e67e5e8ce..748e87030e 100644 --- a/boot/gummiboot/gummiboot.mk +++ b/boot/gummiboot/gummiboot.mk @@ -6,7 +6,7 @@ GUMMIBOOT_SITE = https://gitlab.freedesktop.org/archived-projects/gummiboot.git GUMMIBOOT_SITE_METHOD = git -GUMMIBOOT_VERSION = 43 +GUMMIBOOT_VERSION = 2bcd919c681c952eb867ef1bdb458f1bc49c2d55 GUMMIBOOT_LICENSE = LGPL-2.1+ GUMMIBOOT_LICENSE_FILES = LICENSE From b38dfa7554760327b35b43d3137c73056c2419fd Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Wed, 20 Mar 2019 14:47:54 +0100 Subject: [PATCH 0322/7482] gummiboot: fix compatibility with newer glibc versions Signed-off-by: Esben Haabendal Signed-off-by: Peter Korsgaard --- ...w-building-with-newer-glibc-versions.patch | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch diff --git a/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch b/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch new file mode 100644 index 0000000000..b35cd499bc --- /dev/null +++ b/boot/gummiboot/0001-Allow-building-with-newer-glibc-versions.patch @@ -0,0 +1,31 @@ +From 40ab4167b5a45c772304a879c71b47d54de3b0e3 Mon Sep 17 00:00:00 2001 +From: Esben Haabendal +Date: Wed, 20 Mar 2019 14:19:40 +0100 +Subject: [PATCH] Allow building with newer glibc versions + +Newer glibc versions does not include sys/sysmacros.h from sys/types.h +anymore. Including it unconditionally should be safe. + +See https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html for why +this was done. + +Signed-off-by: Esben Haabendal +--- + src/setup/setup.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/setup/setup.c b/src/setup/setup.c +index 6a4275a2ae36..53429375a146 100644 +--- a/src/setup/setup.c ++++ b/src/setup/setup.c +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include "efivars.h" + +-- +2.21.0 + From 9dbc934217e170578d4cbfdf524bc1b3988d0b9e Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 19 Mar 2019 00:21:02 +0100 Subject: [PATCH 0323/7482] boot/arm-trusted-firmware: support 32bit Arm targets This change allows one to build the TF-A (Trusted Firmware A) for 32bit architectures Armv7 and Armv8 platforms. TF-A supports these configuration since release v1.5. Change dependency on BR2_aarch64 into a dependency on either BR2_ARM_CPU_ARMV8A/BR2_ARM_CPU_ARMV7A to better define the target architectures supported by the package. Set package configuration directive ARM_ARCH_MAJOR according to BR2_ARM_CPU_ARMV8A/BR2_ARM_CPU_ARMV7A. Set package configuration directive ARCH based on BR2_aarch64/BR2_arm. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 3 ++- boot/arm-trusted-firmware/arm-trusted-firmware.mk | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 823a3510b5..428a4ce155 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -1,6 +1,7 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE bool "ARM Trusted Firmware (ATF)" - depends on BR2_aarch64 && BR2_TARGET_UBOOT + depends on (BR2_ARM_CPU_ARMV8A || BR2_ARM_CPU_ARMV7A) && \ + BR2_TARGET_UBOOT help Enable this option if you want to build the ATF for your ARM based embedded device. diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 8ca3864dd0..fb80bd1fbe 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -35,6 +35,18 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) +ifeq ($(BR2_ARM_CPU_ARMV7A),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=7 +else ifeq ($(BR2_ARM_CPU_ARMV8A),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARM_ARCH_MAJOR=8 +endif + +ifeq ($(BR2_arm),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARCH=aarch32 +else ifeq ($(BR2_aarch64),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARCH=aarch64 +endif + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/u-boot.bin ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot From 6959d628d421d88e7b12bb1cbbaaadaa0a2e20f4 Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 19 Mar 2019 00:21:03 +0100 Subject: [PATCH 0324/7482] boot/arm-trusted-firmware: add support for using OP-TEE as BL32 This change allows one to build trusted firmware (TF-A) with OP-TEE as BL32 secure payload. When BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_DEFAULT is enabled TF-A builds a BL32 stage according the TF-A configuration directive. If these specify no BL32 stage then TF-A will build without BL32 support. This is the default configuration and reflects TF-A legacy integration in BR. When BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE is enabled TF-A builds with support for the OP-TEE OS as BL32. Signed-off-by: Etienne Carriere [Thomas: rename config options, simplify option prompts, and rework option description.] Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 24 +++++++++++++++++++ .../arm-trusted-firmware.mk | 14 +++++++++++ 2 files changed, 38 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 428a4ce155..92cd6e5642 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -91,6 +91,30 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31_UBOOT bl31.bin. This is used for example by the Xilinx version of U-Boot SPL to load ATF on the ZynqMP SoC. +choice + prompt "BL32" + default BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_DEFAULT + help + Select BL32 stage for the trusted firmware + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_DEFAULT + bool "Default" + help + With this option selected, ATF will not use any BL32 stage, + unless if one is explicitly chosen using the SPD (for + AArch64) or AARCH32_SP (for AArch32) variables, which can be + passed through + BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES. + +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE + bool "OP-TEE OS" + depends on BR2_TARGET_OPTEE_OS + help + This option allows to embed OP-TEE OS as the BL32 part of + the ARM Trusted Firmware boot sequence. + +endchoice + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33 bool "Use U-Boot as BL33" depends on BR2_TARGET_UBOOT diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index fb80bd1fbe..f35e91eefe 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -47,6 +47,20 @@ else ifeq ($(BR2_aarch64),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ARCH=aarch64 endif +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE),y) +ARM_TRUSTED_FIRMWARE_DEPENDENCIES += optee-os +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ + BL32=$(BINARIES_DIR)/tee-header_v2.bin \ + BL32_EXTRA1=$(BINARIES_DIR)/tee-pager_v2.bin \ + BL32_EXTRA2=$(BINARIES_DIR)/tee-pageable_v2.bin +ifeq ($(BR2_aarch64),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += SPD=opteed +endif +ifeq ($(BR2_arm),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += AARCH32_SP=optee +endif +endif # BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL32_OPTEE + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_UBOOT_AS_BL33),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += BL33=$(BINARIES_DIR)/u-boot.bin ARM_TRUSTED_FIRMWARE_DEPENDENCIES += uboot From afd6ee3fb19c37c72d69b615d1bc342af4fc433a Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 19 Mar 2019 00:21:04 +0100 Subject: [PATCH 0325/7482] boot/arm-trusted-firmware: support debug mode When the trusted firmware is built with debug support (DEBUG defined), the generated images are located in a different path compared to a build without debug support. The non debug images are located in generated directory build//release/ while the debug images are located in generated directory build//debug/. This change introduces the boolean option BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG to define whether the release or debug configuration is used to build trusted firmware. Note that enabling trusted firmware debug support using BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES="... DEBUG=1 ..." would not work since Buildroot will try to copy the generated files from the wrong path. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- boot/arm-trusted-firmware/Config.in | 5 +++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index 92cd6e5642..beb95fbf06 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -130,4 +130,9 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES Additional parameters for the ATF build E.G. 'DEBUG=1 LOG_LEVEL=20' +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG + bool "Build in debug mode" + help + Enable this option to build ATF with DEBUG=1. + endif diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index f35e91eefe..9a23e3d336 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -28,7 +28,13 @@ endif ARM_TRUSTED_FIRMWARE_INSTALL_IMAGES = YES ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) + +ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) +ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug +else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release +endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ From c7fa6671577538b61bf2f35c3fc0e304dffa175a Mon Sep 17 00:00:00 2001 From: Etienne Carriere Date: Tue, 19 Mar 2019 00:21:06 +0100 Subject: [PATCH 0326/7482] package/optee-test: fix dependency in TAs build Fix TA build command to build TA libraries before TAs. Signed-off-by: Etienne Carriere Signed-off-by: Thomas Petazzoni --- package/optee-test/optee-test.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/optee-test/optee-test.mk b/package/optee-test/optee-test.mk index 73accf3d1e..abed09d5e3 100644 --- a/package/optee-test/optee-test.mk +++ b/package/optee-test/optee-test.mk @@ -16,7 +16,7 @@ OPTEE_TEST_CONF_OPTS = -DOPTEE_TEST_SDK=$(OPTEE_OS_SDK) # Trusted Application are not built from CMake due to ta_dev_kit # dependencies. We must build and install them on target. define OPTEE_TEST_BUILD_TAS - $(foreach f,$(wildcard $(@D)/ta/*/Makefile), \ + $(foreach f,$(wildcard $(@D)/ta/*_lib/Makefile) $(wildcard $(@D)/ta/*/Makefile), \ $(TARGET_CONFIGURE_OPTS) \ $(MAKE) CROSS_COMPILE=$(TARGET_CROSS) \ TA_DEV_KIT_DIR=$(OPTEE_OS_SDK) \ From be8d11c7e55d8dfe395774c04a7a35b949aa6d97 Mon Sep 17 00:00:00 2001 From: "Arnout Vandecappelle (Essensium/Mind)" Date: Mon, 18 Mar 2019 14:10:40 +0100 Subject: [PATCH 0327/7482] system/skeleton: remove password expiration from shadow The fields in /etc/shadow were set as follows: root::10933:0:99999:7::: This sets the date of last password change to Jan 1, 2000, the minimum password age to 0 days, the maximum password age to near-infinity, and a warning period of 7 days. In practice, this means the password never expires. So all of this is quite useless. On the other hand, mkusers creates lines without all of these options. It just sets ::::: which disables password expiration completely. To make things consistent, do the same for the skeleton entries. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- system/skeleton/etc/shadow | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/system/skeleton/etc/shadow b/system/skeleton/etc/shadow index 06778f13f9..37de977cba 100644 --- a/system/skeleton/etc/shadow +++ b/system/skeleton/etc/shadow @@ -1,9 +1,9 @@ -root::10933:0:99999:7::: -daemon:*:10933:0:99999:7::: -bin:*:10933:0:99999:7::: -sys:*:10933:0:99999:7::: -sync:*:10933:0:99999:7::: -mail:*:10933:0:99999:7::: -www-data:*:10933:0:99999:7::: -operator:*:10933:0:99999:7::: -nobody:*:10933:0:99999:7::: +root:::::::: +daemon:*::::::: +bin:*::::::: +sys:*::::::: +sync:*::::::: +mail:*::::::: +www-data:*::::::: +operator:*::::::: +nobody:*::::::: From c37b81af64dd8d6729325d8edbe633e6a186bb3d Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 20 Mar 2019 22:54:11 +0100 Subject: [PATCH 0328/7482] Revert "package/meson: bump version to 0.50.0" This reverts commit 114e9dcd28e1001b74689215ec669b8940dc3ea9. Indeed, there is major issue with this version because c_std is not passed anymore when cross-compiling: https://github.com/mesonbuild/meson/issues/5097 As a result, some meson packages (at least systemd, libmpdclient, glib-networking) fail to build Fixes: - http://autobuild.buildroot.org/results/9eae2181fb3fcfe12481e5496b7d87c0dcd109eb - http://autobuild.buildroot.org/results/e828c7925d9247e14d8a8694febfee8ce6c86e81 - http://autobuild.buildroot.org/results/031aee7cf12ad882727eb2da5e953fd8813b52e2 Signed-off-by: Fabrice Fontaine Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/meson/meson.hash | 4 ++-- package/meson/meson.mk | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/meson/meson.hash b/package/meson/meson.hash index e3d740b17c..fadef6df8a 100644 --- a/package/meson/meson.hash +++ b/package/meson/meson.hash @@ -1,4 +1,4 @@ # Locally calculated after checking pgp signature -# https://github.com/mesonbuild/meson/releases/download/0.50.0/meson-0.50.0.tar.gz.asc -sha256 2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f meson-0.50.0.tar.gz +# https://github.com/mesonbuild/meson/releases/download/0.49.2/meson-0.49.2.tar.gz.asc +sha256 ef9f14326ec1e30d3ba1a26df0f92826ede5a79255ad723af78a2691c37109fd meson-0.49.2.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 COPYING diff --git a/package/meson/meson.mk b/package/meson/meson.mk index fbfef7002f..49e27f5527 100644 --- a/package/meson/meson.mk +++ b/package/meson/meson.mk @@ -4,7 +4,7 @@ # ################################################################################ -MESON_VERSION = 0.50.0 +MESON_VERSION = 0.49.2 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION) MESON_LICENSE = Apache-2.0 MESON_LICENSE_FILES = COPYING From ea62ff85b59aa1ff7757787061eb451b4b4780df Mon Sep 17 00:00:00 2001 From: Norbert Lange Date: Fri, 15 Mar 2019 14:30:30 +0100 Subject: [PATCH 0329/7482] package/libfuse: Install udev rules and set permissions This fixes some omissions from the installation. Install the udev rules. Tell buildroot about the fuse device. Apply setuid permissions on the fusermount tool. Signed-off-by: Norbert Lange Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- package/libfuse/libfuse.mk | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/package/libfuse/libfuse.mk b/package/libfuse/libfuse.mk index e8a79a3166..84027ebedb 100644 --- a/package/libfuse/libfuse.mk +++ b/package/libfuse/libfuse.mk @@ -14,11 +14,22 @@ LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) LIBFUSE_CONF_OPTS = \ --disable-example \ --enable-lib \ - --enable-util + --enable-util \ + UDEV_RULES_PATH=/lib/udev/rules.d define LIBFUSE_INSTALL_TARGET_CMDS cp -dpf $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/ cp -dpf $(STAGING_DIR)/usr/lib/libfuse.so* $(TARGET_DIR)/usr/lib/ + mkdir -p $(TARGET_DIR)/lib/udev/rules.d + cp $(STAGING_DIR)/lib/udev/rules.d/*-fuse.rules $(TARGET_DIR)/lib/udev/rules.d +endef + +define LIBFUSE_DEVICES + /dev/fuse c 666 0 0 10 229 0 0 - +endef + +define LIBFUSE_PERMISSIONS + /usr/bin/fusermount f 4755 0 0 - - - - - endef $(eval $(autotools-package)) From f4f7dd9557cf139f6014ada77e947152d5a82fb3 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Wed, 20 Mar 2019 22:18:59 +0100 Subject: [PATCH 0330/7482] package/libssh2: security bump to latest git Bump the version to latest git to fix the following security issues: CVE-2019-3855 Possible integer overflow in transport read allows out-of-bounds write URL: https://www.libssh2.org/CVE-2019-3855.html Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3855.patch CVE-2019-3856 Possible integer overflow in keyboard interactive handling allows out-of-bounds write URL: https://www.libssh2.org/CVE-2019-3856.html Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3856.patch CVE-2019-3857 Possible integer overflow leading to zero-byte allocation and out-of-bounds write URL: https://www.libssh2.org/CVE-2019-3857.html Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3857.patch CVE-2019-3858 Possible zero-byte allocation leading to an out-of-bounds read URL: https://www.libssh2.org/CVE-2019-3858.html Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3858.patch CVE-2019-3859 Out-of-bounds reads with specially crafted payloads due to unchecked use of `_libssh2_packet_require` and `_libssh2_packet_requirev` URL: https://www.libssh2.org/CVE-2019-3859.html Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3859.patch CVE-2019-3860 Out-of-bounds reads with specially crafted SFTP packets URL: https://www.libssh2.org/CVE-2019-3860.html Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3860.patch CVE-2019-3861 Out-of-bounds reads with specially crafted SSH packets URL: https://www.libssh2.org/CVE-2019-3861.html Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3861.patch CVE-2019-3862 Out-of-bounds memory comparison URL: https://www.libssh2.org/CVE-2019-3862.html Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3862.patch CVE-2019-3863 Integer overflow in user authenicate keyboard interactive allows out-of-bounds writes URL: https://www.libssh2.org/CVE-2019-3863.html Patch: https://libssh2.org/1.8.0-CVE/CVE-2019-3863.txt Drop 0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch as that is now upstream. Signed-off-by: Peter Korsgaard Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- ...ferencing-ambiguity-potentially-caus.patch | 51 ------------------- package/libssh2/libssh2.hash | 2 +- package/libssh2/libssh2.mk | 2 +- 3 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch diff --git a/package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch b/package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch deleted file mode 100644 index 44eed2bac4..0000000000 --- a/package/libssh2/0003-openssl-fix-dereferencing-ambiguity-potentially-caus.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 28fe5e4de437f8fce6e428b7db9bc8640cda4c61 Mon Sep 17 00:00:00 2001 -From: Giulio Benetti -Date: Thu, 13 Sep 2018 09:51:35 +0200 -Subject: [PATCH] openssl: fix dereferencing ambiguity potentially causing - build failure -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When dereferencing from *aes_ctr_cipher, being a pointer itself, -ambiguity can occur with compiler and build can fail reporting: -openssl.c:574:20: error: ‘*aes_ctr_cipher’ is a pointer; did you mean to use ‘->’? - *aes_ctr_cipher->nid = type; - -Sorround every *aes_ctr_cipher-> occurence with paranthesis like this -(*aes_ctr_cipher)-> - -Signed-off-by: Giulio Benetti -Upstream: https://github.com/libssh2/libssh2/commit/b5b6673c2823a18753a14571a6c01bde33fa3a8b ---- - src/openssl.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/openssl.c b/src/openssl.c -index 678d5de..c26aaec 100644 ---- a/src/openssl.c -+++ b/src/openssl.c -@@ -571,13 +571,13 @@ make_ctr_evp (size_t keylen, EVP_CIPHER **aes_ctr_cipher, int type) - EVP_CIPHER_meth_set_cleanup(*aes_ctr_cipher, aes_ctr_cleanup); - } - #else -- *aes_ctr_cipher->nid = type; -- *aes_ctr_cipher->block_size = 16; -- *aes_ctr_cipher->key_len = keylen; -- *aes_ctr_cipher->iv_len = 16; -- *aes_ctr_cipher->init = aes_ctr_init; -- *aes_ctr_cipher->do_cipher = aes_ctr_do_cipher; -- *aes_ctr_cipher->cleanup = aes_ctr_cleanup; -+ (*aes_ctr_cipher)->nid = type; -+ (*aes_ctr_cipher)->block_size = 16; -+ (*aes_ctr_cipher)->key_len = keylen; -+ (*aes_ctr_cipher)->iv_len = 16; -+ (*aes_ctr_cipher)->init = aes_ctr_init; -+ (*aes_ctr_cipher)->do_cipher = aes_ctr_do_cipher; -+ (*aes_ctr_cipher)->cleanup = aes_ctr_cleanup; - #endif - - return *aes_ctr_cipher; --- -2.17.1 - diff --git a/package/libssh2/libssh2.hash b/package/libssh2/libssh2.hash index d57c8d7062..c4732a2c07 100644 --- a/package/libssh2/libssh2.hash +++ b/package/libssh2/libssh2.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 ec2b32b44ae5f8fe094f663f63953fb31314de838eb36e8c47e5a89137b5a1bc libssh2-8b870ad771cbd9cd29edbb3dbb0878e950f868ab.tar.gz +sha256 468e7a81a8121c06cb099eef2e17106b0b8c2e1d890b1c0e34e1951f182babb1 libssh2-1b3cbaff518f32e5b70650d4b7b52361b1410d37.tar.gz sha256 e15ed284a15e80115467d6d7f030f0d89d8fabbecd78fb6e0f861f0cfc128fd9 COPYING diff --git a/package/libssh2/libssh2.mk b/package/libssh2/libssh2.mk index 89cb733224..ed0dd40bec 100644 --- a/package/libssh2/libssh2.mk +++ b/package/libssh2/libssh2.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSSH2_VERSION = 8b870ad771cbd9cd29edbb3dbb0878e950f868ab +LIBSSH2_VERSION = 1b3cbaff518f32e5b70650d4b7b52361b1410d37 LIBSSH2_SITE = $(call github,libssh2,libssh2,$(LIBSSH2_VERSION)) LIBSSH2_LICENSE = BSD LIBSSH2_LICENSE_FILES = COPYING From ecc2c563696abf584ac78d00c2293648a7cfed89 Mon Sep 17 00:00:00 2001 From: Esben Haabendal Date: Thu, 21 Mar 2019 06:44:35 +0100 Subject: [PATCH 0331/7482] gummiboot: Add to DEVELOPERS file Signed-off-by: Esben Haabendal Signed-off-by: Peter Korsgaard --- DEVELOPERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DEVELOPERS b/DEVELOPERS index 3e0ac08e11..c0a4814a86 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -697,6 +697,9 @@ F: package/mxsldr/ N: Ernesto L. Williams Jr F: package/szip/ +N: Esben Haabendal +F: boot/gummiboot/ + N: Etienne Carriere F: boot/optee-os/ F: package/optee-benchmark/ From 02300786c2fcba2cf641a040a2d87c4022ddb7fc Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 21 Mar 2019 08:40:43 +0100 Subject: [PATCH 0332/7482] package/libseccomp: security bump to version 2.4.0 >From the advisory: Jann Horn identified a problem in current versions of libseccomp where the library did not correctly generate 64-bit syscall argument comparisons using the arithmetic operators (LT, GT, LE, GE). Jann has done a search using codesearch.debian.net and it would appear that only systemd and Tor are using libseccomp in such a way as to trigger the bad code. In the case of systemd this appears to affect the socket address family and scheduling class filters. In the case of Tor it appears that the bad filters could impact the memory addresses passed to mprotect(2). The libseccomp v2.4.0 release fixes this problem, and should be a direct drop-in replacement for previous v2.x releases. https://www.openwall.com/lists/oss-security/2019/03/15/1 v2.4.0 adds a new scmp_api_level utility, so update 0001-remove-static.patch to match. Signed-off-by: Peter Korsgaard --- package/libseccomp/0001-remove-static.patch | 18 +++++++++++------- package/libseccomp/libseccomp.hash | 2 +- package/libseccomp/libseccomp.mk | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/package/libseccomp/0001-remove-static.patch b/package/libseccomp/0001-remove-static.patch index 9f0ac210c7..60a1ff00b6 100644 --- a/package/libseccomp/0001-remove-static.patch +++ b/package/libseccomp/0001-remove-static.patch @@ -1,4 +1,4 @@ -From 8632287cf6863b580340f846ac14adf2609abdb0 Mon Sep 17 00:00:00 2001 +From 5d010fb06eae43b284e5ccc322f6de47eb42b751 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 2 Jun 2018 13:45:22 +0200 Subject: [PATCH] remove static @@ -14,16 +14,18 @@ and slighly updated to work with 2.3.3 Signed-off-by: Bernd Kuhls Signed-off-by: Fabrice Fontaine +[Peter: updated for v2.4.0 which adds scmp_api_level] +Signed-off-by: Peter Korsgaard --- - tools/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) + tools/Makefile.am | 3 --- + 1 file changed, 3 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am -index 70b4aed..ef74270 100644 +index f768365..5f9d571 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am -@@ -35,8 +35,6 @@ scmp_bpf_disasm_SOURCES = scmp_bpf_disasm.c bpf.h util.h - scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h +@@ -37,10 +37,7 @@ scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h + scmp_api_level_SOURCES = scmp_api_level.c scmp_sys_resolver_LDADD = ../src/libseccomp.la -scmp_sys_resolver_LDFLAGS = -static @@ -31,6 +33,8 @@ index 70b4aed..ef74270 100644 -scmp_arch_detect_LDFLAGS = -static scmp_bpf_disasm_LDADD = util.la scmp_bpf_sim_LDADD = util.la + scmp_api_level_LDADD = ../src/libseccomp.la +-scmp_api_level_LDFLAGS = -static -- -2.14.1 +2.11.0 diff --git a/package/libseccomp/libseccomp.hash b/package/libseccomp/libseccomp.hash index 0362ce9ba4..0823903c36 100644 --- a/package/libseccomp/libseccomp.hash +++ b/package/libseccomp/libseccomp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 5a52495207f00d1254707f11226e17c16ec53f5038d65bbabf1892873fa2fe5b libseccomp-v2.3.3.tar.gz +sha256 b7ee0299157fb7a6a81c99f2e0d7e64429b7d7c0eae43c3a6ef91e87eeed2868 libseccomp-v2.4.0.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b LICENSE diff --git a/package/libseccomp/libseccomp.mk b/package/libseccomp/libseccomp.mk index afa2d36122..90b981f042 100644 --- a/package/libseccomp/libseccomp.mk +++ b/package/libseccomp/libseccomp.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBSECCOMP_VERSION = v2.3.3 +LIBSECCOMP_VERSION = v2.4.0 LIBSECCOMP_SITE = $(call github,seccomp,libseccomp,$(LIBSECCOMP_VERSION)) LIBSECCOMP_LICENSE = LGPL-2.1 LIBSECCOMP_LICENSE_FILES = LICENSE From c2c57aa30f4a77c1b7b835ed2f9002ecd35b7aac Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 21 Mar 2019 21:47:02 +0100 Subject: [PATCH 0333/7482] package/libopenssl: bump to version 1.1.1b Drop patches 4..6 as they are now upstream. Update the hash of the license file as the copyright dates changed. Signed-off-by: Peter Korsgaard --- ...the-same-HAVE_FORK-NO_FORK-as-in-spe.patch | 46 -- ...uce-stack-usage-in-tls13_hkdf_expand.patch | 62 --- ...me-SSL_export_keying_material-issues.patch | 426 ------------------ package/libopenssl/libopenssl.hash | 6 +- package/libopenssl/libopenssl.mk | 2 +- 5 files changed, 4 insertions(+), 538 deletions(-) delete mode 100644 package/libopenssl/0004-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch delete mode 100644 package/libopenssl/0005-Revert-Reduce-stack-usage-in-tls13_hkdf_expand.patch delete mode 100644 package/libopenssl/0006-Fix-some-SSL_export_keying_material-issues.patch diff --git a/package/libopenssl/0004-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch b/package/libopenssl/0004-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch deleted file mode 100644 index 83989fe742..0000000000 --- a/package/libopenssl/0004-apps-ocsp.c-Use-the-same-HAVE_FORK-NO_FORK-as-in-spe.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 4c992673890f1d1ecb9aa46112b2ca80db016b67 Mon Sep 17 00:00:00 2001 -From: Richard Levitte -Date: Mon, 12 Nov 2018 18:16:27 +0100 -Subject: [PATCH] apps/ocsp.c Use the same HAVE_FORK / NO_FORK as in speed.c - -This allows the user to override our defaults if needed, and in a -consistent manner. - -Partial fix for #7607 - -Upstream: https://github.com/openssl/openssl/pull/7624 -Signed-off-by: Patrick Havelange ---- - apps/ocsp.c | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/apps/ocsp.c b/apps/ocsp.c -index 7fd78624bb..315b072932 100644 ---- a/apps/ocsp.c -+++ b/apps/ocsp.c -@@ -36,7 +36,21 @@ NON_EMPTY_TRANSLATION_UNIT - # include - # include - --# if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_NO_SOCK) \ -+#ifndef HAVE_FORK -+# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) -+# define HAVE_FORK 0 -+# else -+# define HAVE_FORK 1 -+# endif -+#endif -+ -+#if HAVE_FORK -+# undef NO_FORK -+#else -+# define NO_FORK -+#endif -+ -+# if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ - && !defined(OPENSSL_NO_POSIX_IO) - # define OCSP_DAEMON - # include --- -2.17.1 - diff --git a/package/libopenssl/0005-Revert-Reduce-stack-usage-in-tls13_hkdf_expand.patch b/package/libopenssl/0005-Revert-Reduce-stack-usage-in-tls13_hkdf_expand.patch deleted file mode 100644 index 104fa476a2..0000000000 --- a/package/libopenssl/0005-Revert-Reduce-stack-usage-in-tls13_hkdf_expand.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 56e0f123dc17cb99f50efbae4bbbab77f360818f Mon Sep 17 00:00:00 2001 -From: Matt Caswell -Date: Mon, 3 Dec 2018 18:14:57 +0000 -Subject: [PATCH] Revert "Reduce stack usage in tls13_hkdf_expand" - -This reverts commit ec0c5f5693e39c5a013f81e6dd9dfd09ec65162d. - -SSL_export_keying_material() may use longer label lengths. - -Fixes #7712 - -Reviewed-by: Tim Hudson -(Merged from https://github.com/openssl/openssl/pull/7755) - -(cherry picked from commit ed371b8cbac0d0349667558c061c1ae380cf75eb) -Signed-off-by: Bernd Kuhls ---- - ssl/tls13_enc.c | 16 ++++------------ - 1 file changed, 4 insertions(+), 12 deletions(-) - -diff --git a/ssl/tls13_enc.c b/ssl/tls13_enc.c -index b6825d20c2..f7ab0fa470 100644 ---- a/ssl/tls13_enc.c -+++ b/ssl/tls13_enc.c -@@ -13,14 +13,7 @@ - #include - #include - --/* -- * RFC 8446, 7.1 Key Schedule, says: -- * Note: With common hash functions, any label longer than 12 characters -- * requires an additional iteration of the hash function to compute. -- * The labels in this specification have all been chosen to fit within -- * this limit. -- */ --#define TLS13_MAX_LABEL_LEN 12 -+#define TLS13_MAX_LABEL_LEN 246 - - /* Always filled with zeros */ - static const unsigned char default_zeros[EVP_MAX_MD_SIZE]; -@@ -36,15 +29,14 @@ int tls13_hkdf_expand(SSL *s, const EVP_MD *md, const unsigned char *secret, - const unsigned char *data, size_t datalen, - unsigned char *out, size_t outlen) - { -- static const unsigned char label_prefix[] = "tls13 "; -+ const unsigned char label_prefix[] = "tls13 "; - EVP_PKEY_CTX *pctx = EVP_PKEY_CTX_new_id(EVP_PKEY_HKDF, NULL); - int ret; - size_t hkdflabellen; - size_t hashlen; - /* -- * 2 bytes for length of derived secret + 1 byte for length of combined -- * prefix and label + bytes for the label itself + 1 byte length of hash -- * + bytes for the hash itself -+ * 2 bytes for length of whole HkdfLabel + 1 byte for length of combined -+ * prefix and label + bytes for the label itself + bytes for the hash - */ - unsigned char hkdflabel[sizeof(uint16_t) + sizeof(uint8_t) + - + sizeof(label_prefix) + TLS13_MAX_LABEL_LEN --- -2.20.1 - diff --git a/package/libopenssl/0006-Fix-some-SSL_export_keying_material-issues.patch b/package/libopenssl/0006-Fix-some-SSL_export_keying_material-issues.patch deleted file mode 100644 index 242ec7a8cd..0000000000 --- a/package/libopenssl/0006-Fix-some-SSL_export_keying_material-issues.patch +++ /dev/null @@ -1,426 +0,0 @@ -From db860ea3dcf56a1993c66da22bd44460d7ac4914 Mon Sep 17 00:00:00 2001 -From: Matt Caswell -Date: Tue, 4 Dec 2018 08:37:04 +0000 -Subject: [PATCH] Fix some SSL_export_keying_material() issues - -Fix some issues in tls13_hkdf_expand() which impact the above function -for TLSv1.3. In particular test that we can use the maximum label length -in TLSv1.3. - -Reviewed-by: Tim Hudson -(Merged from https://github.com/openssl/openssl/pull/7755) - -(cherry picked from commit 0fb2815b873304d145ed00283454fc9f3bd35e6b) -Signed-off-by: Bernd Kuhls ---- - doc/man3/SSL_export_keying_material.pod | 3 +- - ssl/ssl_locl.h | 2 +- - ssl/statem/extensions.c | 2 +- - ssl/statem/statem_clnt.c | 2 +- - ssl/statem/statem_srvr.c | 2 +- - ssl/tls13_enc.c | 73 +++++++++++++++++-------- - test/sslapitest.c | 48 ++++++++++++---- - test/tls13secretstest.c | 2 +- - 8 files changed, 92 insertions(+), 42 deletions(-) - -diff --git a/doc/man3/SSL_export_keying_material.pod b/doc/man3/SSL_export_keying_material.pod -index abebf911fc..4c81a60ffb 100644 ---- a/doc/man3/SSL_export_keying_material.pod -+++ b/doc/man3/SSL_export_keying_material.pod -@@ -59,7 +59,8 @@ B