Your message dated Thu, 12 May 2022 09:49:04 +0000
with message-id <[email protected]>
and subject line Bug#1010882: fixed in aseba 1.6.99+dfsg-3
has caused the Debian Bug report #1010882,
regarding aseba: FTBFS because of non-constant SIGSTKSZ
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
1010882: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1010882
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: aseba
Version: 1.6.99+dfsg
Severity: normal
Tags: patch
User: [email protected]
Usertags: origin-ubuntu kinetic ubuntu-patch
Dear Maintainer,
SIGSTKSZ is not constant anymore so altStackMem must be allocated
dynamically: this patch implements what is done upstream.
In Ubuntu, the attached patch was applied to fix the FTBFS as can be
seen in [1].
Not related but I updated the homepage link to directly point to aseba,
it took me a few minutes to find it from the original link.
Thanks for considering the patch.
[1]
https://launchpad.net/~alexghiti/+archive/ubuntu/riscv/+sourcepub/13492679/+listing-archive-extra
-- System Information:
Debian Release: bookworm/sid
APT prefers jammy-updates
APT policy: (500, 'jammy-updates'), (500, 'jammy-security'), (500, 'jammy')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 5.15.0-27-generic (SMP w/16 CPU threads)
Kernel taint flags: TAINT_WARN
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL
set to en_US.UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru aseba-1.6.99+dfsg/debian/control aseba-1.6.99+dfsg/debian/control
--- aseba-1.6.99+dfsg/debian/control 2020-09-17 18:17:11.000000000 +0200
+++ aseba-1.6.99+dfsg/debian/control 2022-05-03 16:24:08.000000000 +0200
@@ -15,7 +15,7 @@
Standards-Version: 4.5.0
Vcs-Browser: https://salsa.debian.org/science-team/aseba.git
Vcs-Git: https://salsa.debian.org/science-team/aseba.git
-Homepage: https://www.thymio.org/
+Homepage: https://github.com/aseba-community/aseba
Package: aseba
Architecture: any
diff -Nru
aseba-1.6.99+dfsg/debian/patches/0001-third_party-catch2-Fix-non-constant-SIGSTKSZ.patch
aseba-1.6.99+dfsg/debian/patches/0001-third_party-catch2-Fix-non-constant-SIGSTKSZ.patch
---
aseba-1.6.99+dfsg/debian/patches/0001-third_party-catch2-Fix-non-constant-SIGSTKSZ.patch
1970-01-01 01:00:00.000000000 +0100
+++
aseba-1.6.99+dfsg/debian/patches/0001-third_party-catch2-Fix-non-constant-SIGSTKSZ.patch
2022-05-03 16:21:52.000000000 +0200
@@ -0,0 +1,81 @@
+From 830dbd151a5743629f3c6fb2827bb65bb6bca70d Mon Sep 17 00:00:00 2001
+From: Alexandre Ghiti <[email protected]>
+Date: Tue, 3 May 2022 15:15:12 +0200
+Subject: [PATCH] third_party: catch2: Fix non-constant SIGSTKSZ
+
+SIGSTKSZ is not constant anymore so altStackMem must be allocated
+dynamically: this patch implements what is done upstream.
+
+Signed-off-by: Alexandre Ghiti <[email protected]>
+---
+ third_party/catch2/include/catch2/catch.hpp | 23 ++++++++++++++++++---
+ 1 file changed, 20 insertions(+), 3 deletions(-)
+
+diff --git a/third_party/catch2/include/catch2/catch.hpp
b/third_party/catch2/include/catch2/catch.hpp
+index 081cb41..2de9330 100644
+--- a/third_party/catch2/include/catch2/catch.hpp
++++ b/third_party/catch2/include/catch2/catch.hpp
+@@ -4731,7 +4731,8 @@ namespace Catch {
+ static bool isSet;
+ static struct sigaction oldSigActions[];
+ static stack_t oldSigStack;
+- static char altStackMem[];
++ static char* altStackMem;
++ static std::size_t altStackSize;
+
+ static void handleSignal( int sig );
+
+@@ -7226,6 +7227,11 @@ namespace {
+ void reportFatal( char const * const message ) {
+
Catch::getCurrentContext().getResultCapture()->handleFatalErrorCondition(
message );
+ }
++
++ //! Minimal size Catch2 needs for its own fatal error handling.
++ //! Picked empirically, so it might not be sufficient on all
++ //! platforms, and for all configurations.
++ constexpr std::size_t minStackSizeForErrors = 32 * 1024;
+ }
+
+ #endif // signals/SEH handling
+@@ -7318,10 +7324,16 @@ namespace Catch {
+ }
+
+ FatalConditionHandler::FatalConditionHandler() {
++ assert(!altStackMem && "Cannot initialize POSIX signal handler when
one already exists");
++ if (altStackSize == 0) {
++ altStackSize = std::max(static_cast<size_t>(SIGSTKSZ),
minStackSizeForErrors);
++ }
++ altStackMem = new char[altStackSize]();
++
+ isSet = true;
+ stack_t sigStack;
+ sigStack.ss_sp = altStackMem;
+- sigStack.ss_size = SIGSTKSZ;
++ sigStack.ss_size = altStackSize;
+ sigStack.ss_flags = 0;
+ sigaltstack(&sigStack, &oldSigStack);
+ struct sigaction sa = { };
+@@ -7334,6 +7346,10 @@ namespace Catch {
+ }
+
+ FatalConditionHandler::~FatalConditionHandler() {
++ delete[] altStackMem;
++ // We signal that another instance can be constructed by zeroing
++ // out the pointer.
++ altStackMem = nullptr;
+ reset();
+ }
+
+@@ -7352,7 +7368,8 @@ namespace Catch {
+ bool FatalConditionHandler::isSet = false;
+ struct sigaction
FatalConditionHandler::oldSigActions[sizeof(signalDefs)/sizeof(SignalDefs)] =
{};
+ stack_t FatalConditionHandler::oldSigStack = {};
+- char FatalConditionHandler::altStackMem[SIGSTKSZ] = {};
++ char* FatalConditionHandler::altStackMem = nullptr;
++ std::size_t FatalConditionHandler::altStackSize = 0;
+
+ } // namespace Catch
+
+--
+2.34.1
+
diff -Nru aseba-1.6.99+dfsg/debian/patches/series
aseba-1.6.99+dfsg/debian/patches/series
--- aseba-1.6.99+dfsg/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ aseba-1.6.99+dfsg/debian/patches/series 2022-05-03 16:22:39.000000000
+0200
@@ -0,0 +1 @@
+0001-third_party-catch2-Fix-non-constant-SIGSTKSZ.patch
--- End Message ---
--- Begin Message ---
Source: aseba
Source-Version: 1.6.99+dfsg-3
Done: Georges Khaznadar <[email protected]>
We believe that the bug you reported is fixed in the latest version of
aseba, which is due to be installed in the Debian FTP archive.
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Georges Khaznadar <[email protected]> (supplier of updated aseba package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Thu, 12 May 2022 10:49:30 +0200
Source: aseba
Architecture: source
Version: 1.6.99+dfsg-3
Distribution: unstable
Urgency: medium
Maintainer: Georges Khaznadar <[email protected]>
Changed-By: Georges Khaznadar <[email protected]>
Closes: 1010882
Changes:
aseba (1.6.99+dfsg-3) unstable; urgency=medium
.
* adopted Alexandre Ghiti's patch, thanks!
- Closes: #1010882
- defines a new homepage: https://github.com/aseba-community/aseba
* bumped Standards-Version: 4.6.1, debhelper-compat (=13)
* added an override for dh_auto_clean, to remove built .qm files
Checksums-Sha1:
e4161aeb6c61f06b7f96683ed9c2746ebcb7620b 2272 aseba_1.6.99+dfsg-3.dsc
c4a028e5fc5562066de130d55f1dea251dc05e25 4852 aseba_1.6.99+dfsg-3.debian.tar.xz
787c96702ae345e0dc562fffd6e7e1cfbcf0b53e 15143
aseba_1.6.99+dfsg-3_source.buildinfo
Checksums-Sha256:
1de8eda238d236a4abcd8a8e7ed3f9863962cfe705daadf9b3ad7bb667a10f94 2272
aseba_1.6.99+dfsg-3.dsc
7a0ede13bd455d11f2a18cefafa47aabfcba26b374127fcfc7093be4d29f11be 4852
aseba_1.6.99+dfsg-3.debian.tar.xz
3ef9a17c7ce318f557e520aa1b73f0d34d1bb7b765db7be3396fb0fe18afef1a 15143
aseba_1.6.99+dfsg-3_source.buildinfo
Files:
346f9ec6e0484b59ea33d74773234991 2272 devel optional aseba_1.6.99+dfsg-3.dsc
07ce57cfbbee53bfc6ece76c5d075d8d 4852 devel optional
aseba_1.6.99+dfsg-3.debian.tar.xz
2728326396342ffe761f0666858d08c1 15143 devel optional
aseba_1.6.99+dfsg-3_source.buildinfo
-----BEGIN PGP SIGNATURE-----
iQJIBAEBCAAyFiEEM0CzZP9nFT+3zK6FHCgWkHE2rjkFAmJ81RMUHGdlb3JnZXNr
QGRlYmlhbi5vcmcACgkQHCgWkHE2rjkbsBAApZX8E7ZFNu2Q0Hbnkr0IcCfcJTMV
kEp4UAOYGTQgyeBjS+skEqlsVIppgUHnMXzkXOQAaZyp7JXJ9u1WowLcrIiadD5O
wZFkLSnHS9AmPK1B3hdrmXhQvKK45edu1+7WXXANj1jlWt8AF5vh7K05QMyj3IPW
+mUl4yYAhc9mJHn7AGNvxAGr1hrln38eAwCMH33O3/VqMsXU68LvsRURhNlm3uqy
sowcMvnKI9figVjOX3cKdwvEVc+eyQAemmIi/vb4I0OAhUyqWVW1vay+MxbhPKWo
cRAUp4ag0mtyvvVqm9TTUWAQvwmwdK3FKIvNWy9JaCRPRhJcxhiErR3jC8ENtw3p
nDmlyqroq6d92NN9zfpdhSYw4sQQWusGJY5qzfIWUvSmUYOdtq64oeuBLl/nK9H0
VMIwdTZf9V+b5Ig8piozSY3IjZiptfsJ8AEhWQZ/lwYaXdgXlZ7i4hMX73urswxM
HiQS6aMRptk0v+VFNJBp6qxXSrdlT8iyhlIWNyqI1qH8/oP+/IS5Rg8ibHq8A6DL
r8kwhDHHk6q0iz9C7W5PGOg/7v9uw8H2enkpCvgLckW6WmTFh0Y63RLdS0iTTDBD
5t/Z4w6AJ/9ZsPe2UqDwU1/03In0X2sBfZ9KYgi3Gt3XaaShjFyuxkTd+7aWzomw
AquZzDGz6dhWcMU=
=XSyg
-----END PGP SIGNATURE-----
--- End Message ---
