Merge ~simpoir/ubuntu/+source/rsyslog:fix/2137562 into ubuntu/+source/rsyslog:ubuntu/devel

[Simon Poirier]

[Simon Poirier (simpoir)]

PPA build with patch: https://launchpad.net/~simpoir/+archive/ubuntu/rsyslog/+build/32114282

[Nick Rosbrook (enr0n)]

LGTM, and uploaded. Thanks for following up on this.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index b0fd58e..1e80e72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rsyslog (8.2512.0-1ubuntu2) resolute; urgency=medium
+
+  * fix ftbfs with tests on armhf (LP: #2137562)
+    Revert to gnusort on test with large data for its memory usage on 32bit.
+
+ -- Simon Poirier <[e-mail]>  Tue, 06 Jan 2026 09:55:32 -0500
+
 rsyslog (8.2512.0-1ubuntu1) resolute; urgency=medium
 
   * Merge with Debian unstable (LP: #2130067). Remaining changes:
diff --git a/debian/control b/debian/control
index aecaecb..f59f244 100644
--- a/debian/control
+++ b/debian/control
@@ -41,6 +41,7 @@ Build-Depends: debhelper-compat (= 13),
                python3-sphinx <!nodoc>,
                python3-sphinx-rtd-theme <!nodoc>,
                python3-sphinxcontrib-mermaid <!nodoc>,
+               gnu-coreutils,
 Standards-Version: 4.7.2
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/debian/rsyslog.git
diff --git a/debian/patches/gnusort-in-tests.patch b/debian/patches/gnusort-in-tests.patch
new file mode 100644
index 0000000..dc70451
--- /dev/null
+++ b/debian/patches/gnusort-in-tests.patch
@@ -0,0 +1,30 @@
+Description: fix ftbfs with tests on armhf
+ Revert to gnusort on test with large data for its memory usage on 32bit arch.
+Author: Simon Poirier <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/rsyslog/+bug/2137562
+Last-Update: 2026-01-05
+
+Index: rsyslog/tests/imfile-basic-2GB-file.sh
+===================================================================
+--- rsyslog.orig/tests/imfile-basic-2GB-file.sh
++++ rsyslog/tests/imfile-basic-2GB-file.sh
+@@ -6,6 +6,7 @@
+ # This is part of the rsyslog testbench, licensed under ASL 2.0
+ . ${srcdir:=.}/diag.sh init
+ export TB_TEST_MAX_RUNTIME=8000 # test is very slow as it works on large files
++RS_SORTCMD=gnusort # dataset OOM with rust-coreutils on armhf
+ generate_conf
+ add_conf '
+ module(load="../plugins/imfile/.libs/imfile")
+Index: rsyslog/tests/imfile-truncate-2GB-file.sh
+===================================================================
+--- rsyslog.orig/tests/imfile-truncate-2GB-file.sh
++++ rsyslog/tests/imfile-truncate-2GB-file.sh
+@@ -6,6 +6,7 @@
+ # This is part of the rsyslog testbench, licensed under ASL 2.0
+ . ${srcdir:=.}/diag.sh init
+ export TB_TEST_MAX_RUNTIME=8000 # test is very slow as it works on large files
++RS_SORTCMD=gnusort # dataset OOM with rust-coreutils on armhf
+ generate_conf
+ add_conf '
+ module(load="../plugins/imfile/.libs/imfile")
diff --git a/debian/patches/series b/debian/patches/series
index 1f7b37b..6260668 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Don-t-create-a-database.patch
 Increase-timeouts-in-imfile-basic-2GB-file-and-imfile-tru.patch
 Skip-tests-based-on-omfwd-lb-1target-retry-test_skeleton..patch
 Skip-imfile-logrotate-async.sh.patch
+gnusort-in-tests.patch