Support -D_FORTIFY_SOURCE=3

diff --git a/NEWS b/NEWS
index fba56fe4e87c12d9fc346271130044efcdc52590..c2ef2bffbab592755498f3d768d2ae067d8e09d0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ Version 0.XX
 
 - Update moc handling for Qt6; reported by Ben Westover, patch from Ross
   Vandegrift (Debian bug #1019521).
+- Support -D_FORTIFY_SOURCE=3 added in glibc 2.35; reported by Christian
+  Göttsche (Debian bug #1027084).
 
 
 Version 0.13

diff --git a/bin/blhc b/bin/blhc
index f8399d7c8d3194e1c540d0467e699a8bab22914e..ba27c55dd08ce6abf0038b239e81204dad01dd18 100755 (executable)
--- a/bin/blhc
+++ b/bin/blhc
@@ -243,7 +243,7 @@ my @def_cxxflags = (
 # @def_cxxflags_* is the same as @def_cflags_*.
 my @def_cppflags = ();
 my @def_cppflags_fortify = (
-    '-D_FORTIFY_SOURCE=2', # must be first, see cppflags_fortify_broken()
+    '-D_FORTIFY_SOURCE=[23]', # must be first, see cppflags_fortify_broken()
     # If you add another flag fix hack below (search for "Hack to fix") and
     # $def_cppflags_fortify[0].
 );
@@ -299,6 +299,7 @@ my %flag_renames = (
     '-O(?:2|3)'                    => '-O2',
     '-Wformat(?:=2)?'              => '-Wformat',
     '--param[= ]ssp-buffer-size=4' => '--param=ssp-buffer-size=4',
+    '-D_FORTIFY_SOURCE=[23]'       => '-D_FORTIFY_SOURCE=2',
     '-Wl,(?:-z,)?relro'            => '-Wl,-z,relro',
     '-Wl,(?:-z,)?now'              => '-Wl,-z,now',
 );

diff --git a/t/logs/good b/t/logs/good
index d4d3e7d4cab867a8c899c49cbc39079d08f8b7b5..9fe2a62a11f8d8b8bfc725d1c4f31dafe6c42986 100644 (file)
--- a/t/logs/good
+++ b/t/logs/good
@@ -10,6 +10,7 @@ gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-se
 gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-b.c
 gcc -g -O2 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-c.c
 gcc -g -O3 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=2 -c test-d.c
+gcc -g -O3 -fstack-protector-strong -Wformat -Wformat-security -Werror=format-security -D_FORTIFY_SOURCE=3 -c test-e.c
 gcc -Wl,-z,relro -o test test-a.o test-b.o test-c.o -ltest
 
 # -Wformat-security is implied by -Werror=format-security and no longer used