[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-262-gce2346918
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-262-gce2346918
|
From: Sébastien S. <ss...@us...> - 2021-06-04 07:51:52
|
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 ce2346918b816d354b09e50776b8f0522632e84b (commit)
from b8e3f46682fac7ac5c4a6cbc9981b4333ce76996 (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 ce2346918b816d354b09e50776b8f0522632e84b
Author: Sébastien Szymanski <seb...@ar...>
Date: Fri Jun 4 09:50:24 2021 +0200
[BUILDROOT] 2021.02: backport patches to bump expat
-----------------------------------------------------------------------
Summary of changes:
.../402-package-expat-bump-to-version-2.3.0.patch | 46 ++++++++++++++++++++
...kage-expat-security-bump-to-version-2.4.1.patch | 49 ++++++++++++++++++++++
patches/buildroot/2021.02/cleanup_buildroot.sh | 8 +++-
3 files changed, 101 insertions(+), 2 deletions(-)
create mode 100644 patches/buildroot/2021.02/402-package-expat-bump-to-version-2.3.0.patch
create mode 100644 patches/buildroot/2021.02/403-package-expat-security-bump-to-version-2.4.1.patch
diff --git a/patches/buildroot/2021.02/402-package-expat-bump-to-version-2.3.0.patch b/patches/buildroot/2021.02/402-package-expat-bump-to-version-2.3.0.patch
new file mode 100644
index 000000000..bb0472a5a
--- /dev/null
+++ b/patches/buildroot/2021.02/402-package-expat-bump-to-version-2.3.0.patch
@@ -0,0 +1,46 @@
+From f2720836b7701225613ca89b676571fa254cd4d8 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Mon, 5 Apr 2021 11:44:02 +0200
+Subject: [PATCH 1/2] package/expat: bump to version 2.3.0
+
+https://github.com/libexpat/libexpat/blob/R_2_3_0/expat/Changes
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ package/expat/expat.hash | 8 ++++----
+ package/expat/expat.mk | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/package/expat/expat.hash b/package/expat/expat.hash
+index 5a8dd41280..dd448982fe 100644
+--- a/package/expat/expat.hash
++++ b/package/expat/expat.hash
+@@ -1,7 +1,7 @@
+-# From https://sourceforge.net/projects/expat/files/expat/2.2.10/
+-md5 e0fe49a6b3480827c9455e4cfc799133 expat-2.2.10.tar.xz
+-sha1 a333b95121a718a77ee481dbade5efcd72a32eb8 expat-2.2.10.tar.xz
++# From https://sourceforge.net/projects/expat/files/expat/2.3.0/
++md5 1c1b523a8d917e6d9f7af4f8881d8ec5 expat-2.3.0.tar.xz
++sha1 596a37d048b357a58990a538a8d83e2e38325122 expat-2.3.0.tar.xz
+
+ # Locally calculated
+-sha256 5dfe538f8b5b63f03e98edac520d7d9a6a4d22e482e5c96d4d06fcc5485c25f2 expat-2.2.10.tar.xz
++sha256 caa34f99b6e3bcea8502507eb6549a0a84510b244a748dfb287271b2d47467a9 expat-2.3.0.tar.xz
+ sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING
+diff --git a/package/expat/expat.mk b/package/expat/expat.mk
+index 4acbade2c8..04ea413e1b 100644
+--- a/package/expat/expat.mk
++++ b/package/expat/expat.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-EXPAT_VERSION = 2.2.10
++EXPAT_VERSION = 2.3.0
+ EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
+ EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
+ EXPAT_INSTALL_STAGING = YES
+--
+2.31.1
+
diff --git a/patches/buildroot/2021.02/403-package-expat-security-bump-to-version-2.4.1.patch b/patches/buildroot/2021.02/403-package-expat-security-bump-to-version-2.4.1.patch
new file mode 100644
index 000000000..60e5a0664
--- /dev/null
+++ b/patches/buildroot/2021.02/403-package-expat-security-bump-to-version-2.4.1.patch
@@ -0,0 +1,49 @@
+From 990d0c1cd282674adf09da316568678bafa505c6 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fon...@gm...>
+Date: Mon, 24 May 2021 09:34:30 +0200
+Subject: [PATCH 2/2] package/expat: security bump to version 2.4.1
+
+Fix CVE-2013-0340 "Billion Laughs":
+https://blog.hartwork.org/posts/cve-2013-0340-billion-laughs-fixed-in-expat-2-4-0/
+
+https://github.com/libexpat/libexpat/blob/R_2_4_1/expat/Changes
+
+Signed-off-by: Fabrice Fontaine <fon...@gm...>
+Signed-off-by: Yann E. MORIN <yan...@fr...>
+---
+ package/expat/expat.hash | 8 ++++----
+ package/expat/expat.mk | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/package/expat/expat.hash b/package/expat/expat.hash
+index dd448982fe..8cf563d8f5 100644
+--- a/package/expat/expat.hash
++++ b/package/expat/expat.hash
+@@ -1,7 +1,7 @@
+-# From https://sourceforge.net/projects/expat/files/expat/2.3.0/
+-md5 1c1b523a8d917e6d9f7af4f8881d8ec5 expat-2.3.0.tar.xz
+-sha1 596a37d048b357a58990a538a8d83e2e38325122 expat-2.3.0.tar.xz
++# From https://sourceforge.net/projects/expat/files/expat/2.4.1/
++md5 a4fb91a9441bcaec576d4c4a56fa3aa6 expat-2.4.1.tar.xz
++sha1 7988e4df355162500f09837aa95cbb48e6754420 expat-2.4.1.tar.xz
+
+ # Locally calculated
+-sha256 caa34f99b6e3bcea8502507eb6549a0a84510b244a748dfb287271b2d47467a9 expat-2.3.0.tar.xz
++sha256 cf032d0dba9b928636548e32b327a2d66b1aab63c4f4a13dd132c2d1d2f2fb6a expat-2.4.1.tar.xz
+ sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING
+diff --git a/package/expat/expat.mk b/package/expat/expat.mk
+index 04ea413e1b..bb1cfd8c8a 100644
+--- a/package/expat/expat.mk
++++ b/package/expat/expat.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+
+-EXPAT_VERSION = 2.3.0
++EXPAT_VERSION = 2.4.1
+ EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
+ EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
+ EXPAT_INSTALL_STAGING = YES
+--
+2.31.1
+
diff --git a/patches/buildroot/2021.02/cleanup_buildroot.sh b/patches/buildroot/2021.02/cleanup_buildroot.sh
index 1a7b5277f..5927c7e75 100755
--- a/patches/buildroot/2021.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2021.02/cleanup_buildroot.sh
@@ -22,7 +22,6 @@ rm -rf buildroot/package/apf-config/apf-config.mk
rm -rf buildroot/package/beremiz/Config.in
rm -rf buildroot/package/beremiz/beremiz.mk
rm -rf buildroot/package/beremiz/host-beremiz-fix_compare_and_swap_problem_to_be_removed_with_kernel_3.1.patch
-rm -rf buildroot/package/boost/boost.mk
rm -rf buildroot/package/busybox/0007-stty-Add-RS485-config-options.patch
rm -rf buildroot/package/busybox/S10mdev
rm -rf buildroot/package/cmux/Config.in
@@ -30,6 +29,8 @@ rm -rf buildroot/package/cmux/cmux.hash
rm -rf buildroot/package/cmux/cmux.mk
rm -rf buildroot/package/e-uae/Config.in
rm -rf buildroot/package/e-uae/e-uae.mk
+rm -rf buildroot/package/expat/expat.hash
+rm -rf buildroot/package/expat/expat.mk
rm -rf buildroot/package/expect/expect.mk
rm -rf buildroot/package/fb-test-app/001-fixes-tty-vc-config-on-fb-test-exit.patch
rm -rf buildroot/package/freescale-imx/Config.in
@@ -47,7 +48,6 @@ rm -rf buildroot/package/freescale-imx/imx-seco/imx-seco.hash
rm -rf buildroot/package/freescale-imx/imx-seco/imx-seco.mk
rm -rf buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.hash
rm -rf buildroot/package/freescale-imx/imx-vpu-hantro/imx-vpu-hantro.mk
-rm -rf buildroot/package/freescale-imx/imx-vpu/imx-vpu.hash
rm -rf buildroot/package/gnash/Config.in
rm -rf buildroot/package/gnash/gnash.mk
rm -rf buildroot/package/gnokii/Config.in
@@ -80,6 +80,10 @@ rm -rf buildroot/package/marble/marble.mk
rm -rf buildroot/package/matiec/Config.in
rm -rf buildroot/package/matiec/host-matiec-001-fix_bison_compilation_error.patch
rm -rf buildroot/package/matiec/matiec.mk
+rm -rf buildroot/package/openocd/0002-CVE-2018-5704-Prevent-some-forms-of-Cross-Protocol-S.patch
+rm -rf buildroot/package/openocd/0003-bitbang-Fix-FTBFS-with-GCC-10.patch
+rm -rf buildroot/package/openocd/openocd.hash
+rm -rf buildroot/package/openocd/openocd.mk
rm -rf buildroot/package/pci_debug/Config.in
rm -rf buildroot/package/pci_debug/pci_debug.hash
rm -rf buildroot/package/pci_debug/pci_debug.mk
hooks/post-receive
--
armadeus
|