This is an automated email from the git hooks/post-receive script.

guillem pushed a commit to branch main
in repository dpkg.

View the commit online:
https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=1d46b351f37a343a20241905327ebf59a52ed4f4

The following commit(s) were added to refs/heads/main by this push:
     new 1d46b351f Dpkg::Vendor::Debian: Fix stackclash condition to enable the 
feature
1d46b351f is described below

commit 1d46b351f37a343a20241905327ebf59a52ed4f4 (HEAD -> main)
Author: Guillem Jover <[email protected]>
AuthorDate: Thu Oct 26 12:48:21 2023 +0200

    Dpkg::Vendor::Debian: Fix stackclash condition to enable the feature
    
    We were using the cpu to check where to enable this feature, but this
    should have been the arch, as that's what the names we match against
    are. We used these specific names to avoid enabling this feature on
    all arm based architectures where this feature might not be supported,
    and instead only enable it on new ones.
    
    Closes: #1054583
---
 scripts/Dpkg/Vendor/Debian.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Dpkg/Vendor/Debian.pm b/scripts/Dpkg/Vendor/Debian.pm
index 000f7e7f5..49935c9d7 100644
--- a/scripts/Dpkg/Vendor/Debian.pm
+++ b/scripts/Dpkg/Vendor/Debian.pm
@@ -337,7 +337,7 @@ sub set_build_features {
        #   compiler supports it incorrectly (leads to SEGV)
        $use_feature{hardening}{stackprotector} = 0;
     }
-    if (none { $cpu eq $_ } qw(amd64 arm64 armhf armel)) {
+    if (none { $arch eq $_ } qw(amd64 arm64 armhf armel)) {
         # Stack clash protector only available on amd64 and arm.
         $use_feature{hardening}{stackclash} = 0;
     }

-- 
Dpkg.Org's dpkg

Reply via email to