diff -Nru meson-1.3.1/debian/changelog meson-1.3.1/debian/changelog
--- meson-1.3.1/debian/changelog	2023-12-26 18:31:01.000000000 +0100
+++ meson-1.3.1/debian/changelog	2024-01-18 11:39:04.000000000 +0100
@@ -1,3 +1,9 @@
+meson (1.3.1-1ubuntu2) UNRELEASED; urgency=medium
+
+  * Fix rust test failing without stack-protector on ARM
+
+ -- Paul Mars <paul.mars@canonical.com>  Thu, 18 Jan 2024 11:39:04 +0100
+
 meson (1.3.1-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru meson-1.3.1/debian/control meson-1.3.1/debian/control
--- meson-1.3.1/debian/control	2023-12-11 20:52:05.000000000 +0100
+++ meson-1.3.1/debian/control	2024-01-18 11:39:04.000000000 +0100
@@ -1,5 +1,6 @@
 Source: meson
-Maintainer: Jussi Pakkanen <jpakkane@gmail.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Jussi Pakkanen <jpakkane@gmail.com>
 Section: devel
 Priority: optional
 Standards-Version: 4.6.2
diff -Nru meson-1.3.1/debian/patches/2-disable-rootdir-test.patch meson-1.3.1/debian/patches/2-disable-rootdir-test.patch
--- meson-1.3.1/debian/patches/2-disable-rootdir-test.patch	2022-12-29 23:19:40.000000000 +0100
+++ meson-1.3.1/debian/patches/2-disable-rootdir-test.patch	2024-01-16 18:19:54.000000000 +0100
@@ -1,8 +1,6 @@
-diff --git a/test cases/common/221 fs module/meson.build b/test cases/common/221 fs module/meson.build
-index a7327682..c5f90bbb 100644
 --- a/test cases/common/220 fs module/meson.build	
 +++ b/test cases/common/220 fs module/meson.build	
-@@ -30,12 +30,16 @@ assert(fs.is_dir('subprojects'), 'Dir not detected correctly.')
+@@ -29,12 +29,16 @@
  assert(not fs.is_dir('meson.build'), 'File detected as a dir.')
  assert(not fs.is_dir('nonexisting'), 'Bad path detected as a dir.')
  
diff -Nru meson-1.3.1/debian/patches/3-add-stack-protector-on-arm64.patch meson-1.3.1/debian/patches/3-add-stack-protector-on-arm64.patch
--- meson-1.3.1/debian/patches/3-add-stack-protector-on-arm64.patch	1970-01-01 01:00:00.000000000 +0100
+++ meson-1.3.1/debian/patches/3-add-stack-protector-on-arm64.patch	2024-01-18 11:39:04.000000000 +0100
@@ -0,0 +1,27 @@
+Description: test patch
+ <long description that can span multiple lines, optional>
+Author: <name and email of author, optional>
+Origin: <upstream|backport|vendor|other>, <URL, required except if Author is present>
+Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
+Bug-<Vendor>: <URL to the vendor bug report if any, optional>
+Forwarded: <URL|no|not-needed, useless if you have a Bug field, optional>
+Applied-Upstream: <version|URL|commit, identifies patches merged upstream, optional>
+Reviewed-by: <name and email of a reviewer, optional>
+Last-Update: 2024-01-16 <YYYY-MM-DD, last update of the meta-information, optional>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/test cases/rust/13 external c dependencies/meson.build	
++++ b/test cases/rust/13 external c dependencies/meson.build	
+@@ -4,6 +4,12 @@
+   error('MESON_SKIP_TEST: does not work right on macos, please fix!')
+ endif
+ 
++cpu = host_machine.cpu_family()
++
++if cpu == 'aarch64'
++  add_project_link_arguments('-fstack-protector', language: 'C')
++endif
++
+ dep_zlib = dependency('zlib', static : get_option('static'), method : get_option('method'), required : false)
+ if not dep_zlib.found()
+   error('MESON_SKIP_TEST: Could not find a @0@ zlib'.format(get_option('static') ? 'static' : 'shared'))
diff -Nru meson-1.3.1/debian/patches/series meson-1.3.1/debian/patches/series
--- meson-1.3.1/debian/patches/series	2023-03-28 12:13:25.000000000 +0200
+++ meson-1.3.1/debian/patches/series	2024-01-16 16:49:17.000000000 +0100
@@ -1,2 +1,3 @@
 1-disable-openmpi.patch
 2-disable-rootdir-test.patch
+3-add-stack-protector-on-arm64.patch