[Armadeus-commitlog] armadeus branch, master, updated. armadeus-7.0-405-g83ae3cf12

[sszy <ss...@us...>]

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  83ae3cf12806a3c9857b43d320530945dbba4791 (commit)
      from  96ee3345d14a803afa39eabe559f84e431e7bbda (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 83ae3cf12806a3c9857b43d320530945dbba4791
Author: Sébastien Szymanski <seb...@ar...>
Date:   Tue Mar 26 11:29:08 2024 +0100

    [BUILDROOT] Bump to BR 2024.02.1

-----------------------------------------------------------------------

Summary of changes:
 Makefile                                           |  2 +-
 ...kage-expat-security-bump-to-version-2.6.2.patch | 55 ----------------------
 patches/buildroot/2024.02/cleanup_buildroot.sh     |  4 +-
 3 files changed, 3 insertions(+), 58 deletions(-)
 delete mode 100644 patches/buildroot/2024.02/0424-package-expat-security-bump-to-version-2.6.2.patch

diff --git a/Makefile b/Makefile
index 99faac76d..54db33989 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ export ARMADEUS_TOPDIR
 
 #--- User configurable stuff:
 BUILDROOT_MAJOR_VERSION ?= 2024.02
-BUILDROOT_MINOR_VERSION ?=
+BUILDROOT_MINOR_VERSION ?= 1
 ifneq ($(strip $(BUILDROOT_MINOR_VERSION)),)
 BUILDROOT_VERSION := $(BUILDROOT_MAJOR_VERSION).$(BUILDROOT_MINOR_VERSION)
 else
diff --git a/patches/buildroot/2024.02/0424-package-expat-security-bump-to-version-2.6.2.patch b/patches/buildroot/2024.02/0424-package-expat-security-bump-to-version-2.6.2.patch
deleted file mode 100644
index 53bd3f81d..000000000
--- a/patches/buildroot/2024.02/0424-package-expat-security-bump-to-version-2.6.2.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 623bafb092165e0a32611c8b1f628d3e362eb2fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?S=C3=A9bastien=20Szymanski?=
- <seb...@ar...>
-Date: Thu, 14 Mar 2024 17:02:25 +0100
-Subject: [PATCH 1/1] package/expat: security bump to version 2.6.2
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Security fixes:
-	- CVE-2024-28757 -- Prevent billion laughs attacks with isolated
-	  use of external parsers.  Please see the commit message of
-	  commit 1d50b80cf31de87750103656f6eb693746854aa8 for details.
-
-https://blog.hartwork.org/posts/expat-2-6-2-released/
-https://github.com/libexpat/libexpat/blob/R_2_6_2/expat/Changes
-
-Signed-off-by: Sébastien Szymanski <seb...@ar...>
----
- 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 980a9ab6a79d..63890b54df29 100644
---- a/package/expat/expat.hash
-+++ b/package/expat/expat.hash
-@@ -1,7 +1,7 @@
--# From https://sourceforge.net/projects/expat/files/expat/2.6.1/
--md5  84d0ee1c554212dc8f068e538de5b823  expat-2.6.1.tar.xz
--sha1  1a1804b7c565a8b21abbd3433ef67ed8a4476960  expat-2.6.1.tar.xz
-+# From https://sourceforge.net/projects/expat/files/expat/2.6.2/
-+md5  0cb75c8feb842c0794ba89666b762a2d  expat-2.6.1.tar.xz
-+sha1  d9e5f953dcacda3c9e69b4886382c3d8847b81bd  expat-2.6.1.tar.xz
- 
- # Locally calculated
--sha256  cb5f5a8ea211e1cabd59be0a933a52e3c02cc326e86a4d387d8d218e7ee47a3e  expat-2.6.0.tar.xz
-+sha256  ee14b4c5d8908b1bec37ad937607eab183d4d9806a08adee472c3c3121d27364  expat-2.6.2.tar.xz
- sha256  122f2c27000472a201d337b9b31f7eb2b52d091b02857061a8880371612d9534  COPYING
-diff --git a/package/expat/expat.mk b/package/expat/expat.mk
-index e09fcc673fa5..c6b7fc8b44f0 100644
---- a/package/expat/expat.mk
-+++ b/package/expat/expat.mk
-@@ -4,7 +4,7 @@
- #
- ################################################################################
- 
--EXPAT_VERSION = 2.6.1
-+EXPAT_VERSION = 2.6.2
- EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
- EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
- EXPAT_INSTALL_STAGING = YES
--- 
-2.43.2
-
diff --git a/patches/buildroot/2024.02/cleanup_buildroot.sh b/patches/buildroot/2024.02/cleanup_buildroot.sh
index cd5eab3f5..30bdbf58f 100755
--- a/patches/buildroot/2024.02/cleanup_buildroot.sh
+++ b/patches/buildroot/2024.02/cleanup_buildroot.sh
@@ -25,8 +25,6 @@ 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/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk
 rm -rf buildroot/package/gnokii/Config.in
@@ -71,6 +69,8 @@ rm -rf buildroot/package/pywebradio/Config.in
 rm -rf buildroot/package/pywebradio/pywebradio.mk
 rm -rf buildroot/package/quake-pak/Config.in
 rm -rf buildroot/package/quake-pak/quake-pak.mk
+rm -rf buildroot/package/rt-tests/rt-tests.hash
+rm -rf buildroot/package/rt-tests/rt-tests.mk
 rm -rf buildroot/package/sam7-pgm-ng/Config.in
 rm -rf buildroot/package/sam7-pgm-ng/sam7-pgm-ng.mk
 rm -rf buildroot/package/sd8977/Config.in


hooks/post-receive
-- 
armadeus