From 96b114089204112399d079c406cc91a5974a9b5b Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 24 Jul 2023 11:23:46 +0200
Subject: 6: Use libexpat 2.5.0

This version contains security fixes.  Prepare for RTEMS 6.1 release.

Update #4921.
---
 bare/config/devel/expat-2.5.0-1.cfg  | 20 ++++++++++++++++++++
 rtems/config/6/rtems-default.bset    |  2 +-
 rtems/config/6/rtems-microblaze.bset |  2 +-
 rtems/config/7/rtems-default.bset    |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 bare/config/devel/expat-2.5.0-1.cfg

diff --git a/bare/config/devel/expat-2.5.0-1.cfg b/bare/config/devel/expat-2.5.0-1.cfg
new file mode 100644
index 0000000..37188af
--- /dev/null
+++ b/bare/config/devel/expat-2.5.0-1.cfg
@@ -0,0 +1,20 @@
+#
+# Expat 2.5.0
+#
+
+%if %{release} == %{nil}
+%define release 1
+%endif
+
+%include %{_configdir}/base.cfg
+
+%define expat_version     2.5.0
+%define expat_version_dir R_2_5_0
+
+%hash sha512 expat-%{expat_version}.tar.gz \
+  8f99pfr7R9zW4PDYkoJqum3nZQnISXvAA4LxEJq44qk9OWlD27UiFkVwRJk6Odc3KASK32UNjoPigYntx7eEAg==
+
+#
+# The Expat build instructions. We use 2.xx Release 1.
+#
+%include %{_configdir}/expat-2-1.cfg
diff --git a/rtems/config/6/rtems-default.bset b/rtems/config/6/rtems-default.bset
index 4416c65..2f6992f 100644
--- a/rtems/config/6/rtems-default.bset
+++ b/rtems/config/6/rtems-default.bset
@@ -10,7 +10,7 @@
 #  --with-rtems-gcc=tools/rtems-gcc-head-newlib-head
 #
 %defineifnot with_rtems_dtc      devel/dtc-1.6.1-1
-%defineifnot with_rtems_expat    devel/expat-2.4.8-1
+%defineifnot with_rtems_expat    devel/expat-2.5.0-1
 %defineifnot with_rtems_gmp      devel/gmp-6.2.1
 %defineifnot with_rtems_gdb      tools/rtems-gdb-13.2
 %defineifnot with_rtems_binutils tools/rtems-binutils-2.39
diff --git a/rtems/config/6/rtems-microblaze.bset b/rtems/config/6/rtems-microblaze.bset
index 1870935..f17c59d 100644
--- a/rtems/config/6/rtems-microblaze.bset
+++ b/rtems/config/6/rtems-microblaze.bset
@@ -11,7 +11,7 @@
 # GDB needs expat so it needs to be built before.
 #
 
-devel/expat-2.4.8-1
+devel/expat-2.5.0-1
 devel/gmp-6.2.1
 tools/rtems-gdb-13.2
 
diff --git a/rtems/config/7/rtems-default.bset b/rtems/config/7/rtems-default.bset
index 0a8fcac..3abfd78 100644
--- a/rtems/config/7/rtems-default.bset
+++ b/rtems/config/7/rtems-default.bset
@@ -10,7 +10,7 @@
 #  --with-rtems-gcc=tools/rtems-gcc-head-newlib-head
 #
 %defineifnot with_rtems_dtc      devel/dtc-1.6.1-1
-%defineifnot with_rtems_expat    devel/expat-2.4.8-1
+%defineifnot with_rtems_expat    devel/expat-2.5.0-1
 %defineifnot with_rtems_gmp      devel/gmp-6.2.1
 %defineifnot with_rtems_gdb      tools/rtems-gdb-head
 %defineifnot with_rtems_binutils tools/rtems-binutils-head
-- 
cgit v1.2.3