[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-261-gb8e3f4668
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-261-gb8e3f4668
|
From: Sébastien S. <ss...@us...> - 2021-05-28 08:52:18
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b8e3f46682fac7ac5c4a6cbc9981b4333ce76996 (commit)
via 951d32421e8b83d1c85caed3fc0839d45189975e (commit)
from 96ccafee29e1aa09b97afbc2e04730a8a41ee140 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b8e3f46682fac7ac5c4a6cbc9981b4333ce76996
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri May 28 10:46:53 2021 +0200
[BUILDROOT] 2021.02: backport patches to bump openocd
commit 951d32421e8b83d1c85caed3fc0839d45189975e
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri May 28 10:44:05 2021 +0200
[BUILDROOT] Bump BR to 2021.02.2
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 +-
...escale-imx-imx-vpu-fix-EULA-COPYING-file-.patch | 49 -------
...0-package-boost-fix-broken-BOOST_SITE-URL.patch | 40 ------
.../400-package-openocd-bump-to-0.11.0.patch | 148 +++++++++++++++++++++
...enocd-add-optional-dependency-on-libgpiod.patch | 34 +++++
5 files changed, 183 insertions(+), 90 deletions(-)
delete mode 100644 patches/buildroot/2021.02/382-package-freescale-imx-imx-vpu-fix-EULA-COPYING-file-.patch
delete mode 100644 patches/buildroot/2021.02/400-package-boost-fix-broken-BOOST_SITE-URL.patch
create mode 100644 patches/buildroot/2021.02/400-package-openocd-bump-to-0.11.0.patch
create mode 100644 patches/buildroot/2021.02/401-package-openocd-add-optional-dependency-on-libgpiod.patch
diff --git a/Makefile b/Makefile
index ca5156a07..7f371d2ff 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
#--- User configurable stuff:
BUILDROOT_MAJOR_VERSION ?= 2021.02
-BUILDROOT_MINOR_VERSION ?= 1
+BUILDROOT_MINOR_VERSION ?= 2
ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
else
diff --git a/patches/buildroot/2021.02/382-package-freescale-imx-imx-vpu-fix-EULA-COPYING-file-.patch b/patches/buildroot/2021.02/382-package-freescale-imx-imx-vpu-fix-EULA-COPYING-file-.patch
deleted file mode 100644
index e41e5736c..000000000
--- a/patches/buildroot/2021.02/382-package-freescale-imx-imx-vpu-fix-EULA-COPYING-file-.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 96142a5426b127a55038cd5cd84134452b9905ab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Tue, 20 Apr 2021 10:29:53 +0200
-Subject: [PATCH 382/388] package/freescale-imx/imx-vpu: fix {EULA, COPYING}
- file hashes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit a646cd27b112 (package/freescale-imx/imx-vpu: bump version to
-5.4.39.3) somehow messed up when updating the hashes of the licene
-files:
-
- >>> imx-vpu 5.4.39.3 Collecting legal info
- ERROR: EULA has wrong sha256 hash:
- ERROR: expected: a39da2e94bd8b99eaac4325633854620ea3a55145259c3a7748c610a80714cfc
- ERROR: got : 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0
- ERROR: Incomplete download, or man-in-the-middle (MITM) attack
-
- ERROR: COPYING has wrong sha256 hash:
- ERROR: expected: 69cbb76b3f10ac5a8c36f34df7bbdf50825815560c00a946fff2922365ef01a2
- ERROR: got : 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d
- ERROR: Incomplete download, or man-in-the-middle (MITM) attack
-
-The most probable cause is some confusion with imx-vpu-hantro, as the
-faulty hashes reported above are those found in imx-vpu-hantro.
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
-[yan...@fr...: rewrite commit log with a probably reason]
-Signed-off-by: Yann E. MORIN <yan...@fr...>
----
- package/freescale-imx/imx-vpu/imx-vpu.hash | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/package/freescale-imx/imx-vpu/imx-vpu.hash b/package/freescale-imx/imx-vpu/imx-vpu.hash
-index 6ab67510b0..e3a53e3fb6 100644
---- a/package/freescale-imx/imx-vpu/imx-vpu.hash
-+++ b/package/freescale-imx/imx-vpu/imx-vpu.hash
-@@ -1,4 +1,4 @@
- # Locally computed
- sha256 87cb799a57df654db29403cb74a75ca5185a1517022d3a4a16b8d69056c36127 imx-vpu-5.4.39.3.bin
--sha256 69cbb76b3f10ac5a8c36f34df7bbdf50825815560c00a946fff2922365ef01a2 COPYING
--sha256 a39da2e94bd8b99eaac4325633854620ea3a55145259c3a7748c610a80714cfc EULA
-+sha256 2ceab29de5ea533b86f570bcc4e9ddbfb5fe85a1da4978a8613ff3fd9bed781d COPYING
-+sha256 7ffad92e72e5f6b23027e7cf93a770a4acef00a92dcf79f22701ed401c5478c0 EULA
---
-2.26.3
-
diff --git a/patches/buildroot/2021.02/400-package-boost-fix-broken-BOOST_SITE-URL.patch b/patches/buildroot/2021.02/400-package-boost-fix-broken-BOOST_SITE-URL.patch
deleted file mode 100644
index fbbaca687..000000000
--- a/patches/buildroot/2021.02/400-package-boost-fix-broken-BOOST_SITE-URL.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7e4b9f6839c6f39553edfd0b4f643ac3e1d1d70c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Mon, 10 May 2021 10:13:27 +0200
-Subject: [PATCH 1/1] package/boost: fix broken BOOST_SITE URL
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Current URL returns 403 error:
-
---2021-05-10 10:04:12-- https://dl.bintray.com/boostorg/release/1.75.0/source/boost_1_75_0.tar.bz2
-Resolving dl.bintray.com... 18.193.131.58, 3.66.199.110
-Connecting to dl.bintray.com|18.193.131.58|:443... connected.
-HTTP request sent, awaiting response... 403 Forbidden
-2021-05-10 10:04:12 ERROR 403: Forbidden.
-
-Update the URL to fix this issue.
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- package/boost/boost.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/package/boost/boost.mk b/package/boost/boost.mk
-index b8f90bb836..8d745ecc72 100644
---- a/package/boost/boost.mk
-+++ b/package/boost/boost.mk
-@@ -6,7 +6,7 @@
-
- BOOST_VERSION = 1.75.0
- BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2
--BOOST_SITE = https://dl.bintray.com/boostorg/release/$(BOOST_VERSION)/source
-+BOOST_SITE = https://boostorg.jfrog.io/artifactory/main/release/$(BOOST_VERSION)/source
- BOOST_INSTALL_STAGING = YES
- BOOST_LICENSE = BSL-1.0
- BOOST_LICENSE_FILES = LICENSE_1_0.txt
---
-2.26.3
-
diff --git a/patches/buildroot/2021.02/400-package-openocd-bump-to-0.11.0.patch b/patches/buildroot/2021.02/400-package-openocd-bump-to-0.11.0.patch
new file mode 100644
index 000000000..32274af50
--- /dev/null
+++ b/patches/buildroot/2021.02/400-package-openocd-bump-to-0.11.0.patch
@@ -0,0 +1,148 @@
+From 61d59cce7a65f1c6b57a11ec43a737ce4692f293 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 21 May 2021 10:18:34 +0200
+Subject: [PATCH 1/2] package/openocd: bump to 0.11.0
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Remove upstream patches.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ ...event-some-forms-of-Cross-Protocol-S.patch | 50 -------------------
+ .../0003-bitbang-Fix-FTBFS-with-GCC-10.patch | 37 --------------
+ package/openocd/openocd.hash | 7 ++-
+ package/openocd/openocd.mk | 2 +-
+ 4 files changed, 4 insertions(+), 92 deletions(-)
+ delete mode 100644 package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
+ delete mode 100644 package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch
+
+diff --git a/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch b/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
+deleted file mode 100644
+index ba19bf5735..0000000000
+--- a/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
++++ /dev/null
+@@ -1,50 +0,0 @@
+-From 3a223ca3ebc7ac24d7726a0cd58e5695bc813657 Mon Sep 17 00:00:00 2001
+-From: Andreas Fritiofson <and...@gm...>
+-Date: Sat, 13 Jan 2018 21:00:47 +0100
+-Subject: [PATCH] CVE-2018-5704: Prevent some forms of Cross Protocol Scripting
+- attacks
+-
+-OpenOCD can be targeted by a Cross Protocol Scripting attack from
+-a web browser running malicious code, such as the following PoC:
+-
+-var x = new XMLHttpRequest();
+-x.open("POST", "http://127.0.0.1:4444", true);
+-x.send("exec xcalc\r\n");
+-
+-This mitigation should provide some protection from browser-based
+-attacks and is based on the corresponding fix in Redis:
+-
+-https://github.com/antirez/redis/blob/8075572207b5aebb1385c4f233f5302544439325/src/networking.c#L1758
+-
+-
+-Upstream-status: Under review: http://openocd.zylin.com/#/c/4335/
+-Change-Id: Ia96ebe19b74b5805dc228bf7364c7971a90a4581
+-Signed-off-by: Andreas Fritiofson <and...@gm...>
+-Reported-by: Josef Gajdusek <at...@at...>
+-Signed-off-by: Peter Korsgaard <pe...@ko...>
+----
+- src/server/startup.tcl | 11 +++++++++++
+- 1 file changed, 11 insertions(+)
+-
+-diff --git a/src/server/startup.tcl b/src/server/startup.tcl
+-index 64ace407..dd1b31e4 100644
+---- a/src/server/startup.tcl
+-+++ b/src/server/startup.tcl
+-@@ -8,3 +8,14 @@ proc ocd_gdb_restart {target_id} {
+- # one target
+- reset halt
+- }
+-+
+-+proc prevent_cps {} {
+-+ echo "Possible SECURITY ATTACK detected."
+-+ echo "It looks like somebody is sending POST or Host: commands to OpenOCD."
+-+ echo "This is likely due to an attacker attempting to use Cross Protocol Scripting"
+-+ echo "to compromise your OpenOCD instance. Connection aborted."
+-+ exit
+-+}
+-+
+-+proc POST {args} { prevent_cps }
+-+proc Host: {args} { prevent_cps }
+---
+-2.11.0
+-
+diff --git a/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch b/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch
+deleted file mode 100644
+index cf83515247..0000000000
+--- a/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch
++++ /dev/null
+@@ -1,37 +0,0 @@
+-From c60252ac2b636c4d99b766a574b9df0966151696 Mon Sep 17 00:00:00 2001
+-From: Andreas Fritiofson <and...@gm...>
+-Date: Fri, 17 Apr 2020 13:49:28 +0200
+-Subject: [PATCH] bitbang: Fix FTBFS with GCC 10
+-
+-GCC 10 defaults to -fno-common which breaks the sharing of bitbang_swd
+-struct between bitbang drivers due to a missing extern.
+-
+-Change-Id: I2b4122f7939cec91a72284006748f99a23548324
+-Signed-off-by: Andreas Fritiofson <and...@gm...>
+-Reviewed-on: http://openocd.zylin.com/5592
+-Tested-by: jenkins
+-Reviewed-by: Antonio Borneo <bor...@gm...>
+-Reviewed-by: Jonathan McDowell <noo...@ea...>
+-
+-Patch taken from upstream: https://github.com/ntfreak/openocd/commit/c60252ac2b636c4d99b766a574b9df0966151696
+-Signed-off-by: Heiko Thiery <heiko.thiery@gmailcom>
+----
+- src/jtag/drivers/bitbang.h | 2 +-
+- 1 file changed, 1 insertion(+), 1 deletion(-)
+-
+-diff --git a/src/jtag/drivers/bitbang.h b/src/jtag/drivers/bitbang.h
+-index edb779ca..bbbc693d 100644
+---- a/src/jtag/drivers/bitbang.h
+-+++ b/src/jtag/drivers/bitbang.h
+-@@ -56,7 +56,7 @@ struct bitbang_interface {
+- void (*swdio_drive)(bool on);
+- };
+-
+--const struct swd_driver bitbang_swd;
+-+extern const struct swd_driver bitbang_swd;
+-
+- extern bool swd_mode;
+-
+---
+-2.20.1
+-
+diff --git a/package/openocd/openocd.hash b/package/openocd/openocd.hash
+index 3fb817b4a2..91eb56d930 100644
+--- a/package/openocd/openocd.hash
++++ b/package/openocd/openocd.hash
+@@ -1,4 +1,3 @@
+-# From http://sourceforge.net/projects/openocd/files/openocd/0.10.0/
+-sha1 3245d43d60a1a93f8b0f6b1ce20b53e38cab7a4a openocd-0.10.0.tar.bz2
+-md5 b412bdef0481a3859c6585eb69f6f6ba openocd-0.10.0.tar.bz2
+-sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
++# From http://sourceforge.net/projects/openocd/files/openocd/0.11.0/
++sha256 43a3ce734aff1d3706ad87793a9f3a5371cb0e357f0ffd0a151656b06b3d1e7d openocd-0.11.0.tar.bz2
++sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
+diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
+index 7887f3a6dc..1460495a88 100644
+--- a/package/openocd/openocd.mk
++++ b/package/openocd/openocd.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-OPENOCD_VERSION = 0.10.0
++OPENOCD_VERSION = 0.11.0
+ OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2
+ OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION)
+ OPENOCD_LICENSE = GPL-2.0+
+--
+2.26.3
+
diff --git a/patches/buildroot/2021.02/401-package-openocd-add-optional-dependency-on-libgpiod.patch b/patches/buildroot/2021.02/401-package-openocd-add-optional-dependency-on-libgpiod.patch
new file mode 100644
index 000000000..4247a2c6f
--- /dev/null
+++ b/patches/buildroot/2021.02/401-package-openocd-add-optional-dependency-on-libgpiod.patch
@@ -0,0 +1,34 @@
+From 20a98fbaf9482b3a9011ea103bdc53dc48eec1d5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
+ <seb...@ar...>
+Date: Fri, 21 May 2021 10:20:11 +0200
+Subject: [PATCH 2/2] package/openocd: add optional dependency on libgpiod
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+To make the Linux GPIOD bitbang adapter driver through libgpiod
+available.
+
+Signed-off-by: Sébastien Szymanski <seb...@ar...>
+---
+ package/openocd/openocd.mk | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/package/openocd/openocd.mk b/package/openocd/openocd.mk
+index 1460495a88..b74426ff47 100644
+--- a/package/openocd/openocd.mk
++++ b/package/openocd/openocd.mk
+@@ -32,7 +32,8 @@ OPENOCD_DEPENDENCIES = \
+ $(if $(BR2_PACKAGE_LIBUSB),libusb) \
+ $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \
+ $(if $(BR2_PACKAGE_LIBHID),libhid) \
+- $(if $(BR2_PACKAGE_HIDAPI),hidapi)
++ $(if $(BR2_PACKAGE_HIDAPI),hidapi) \
++ $(if $(BR2_PACKAGE_LIBGPIOD),libgpiod)
+
+ # Adapters
+ OPENOCD_CONF_OPTS += \
+--
+2.26.3
+
hooks/post-receive
--
armadeus
|