Raise FORTIFY_SOURCE internally as well

This commit is contained in:
Zdenek Dohnal 2023-03-24 09:44:32 +01:00
parent 8a593f1c3e
commit 96532d498b
2 changed files with 47 additions and 0 deletions

View File

@ -0,0 +1,44 @@
From 23be2dad137fb924f78eba6294eb5c8c208d5fa0 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Fri, 24 Mar 2023 09:37:25 +0100
Subject: [PATCH] configure: Raise FORTIFY_SOURCE level to 3
GCC supports level 3 for some time, try using it.
---
config-scripts/cups-compiler.m4 | 4 ++--
configure | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/config-scripts/cups-compiler.m4 b/config-scripts/cups-compiler.m4
index 266d909ed..25e7f7aa5 100644
--- a/config-scripts/cups-compiler.m4
+++ b/config-scripts/cups-compiler.m4
@@ -108,8 +108,8 @@ AS_IF([test -n "$GCC"], [
], [
# Otherwise use the Fortify enhancements to catch any unbounded
# string operations...
- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
- CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
+ CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=3"
+ CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=3"
])
# Default optimization options...
diff --git a/configure b/configure
index 40d9e7a71..d50ee6a7d 100755
--- a/configure
+++ b/configure
@@ -8102,8 +8102,8 @@ else $as_nop
# Otherwise use the Fortify enhancements to catch any unbounded
# string operations...
- CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=2"
- CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=2"
+ CFLAGS="$CFLAGS -D_FORTIFY_SOURCE=3"
+ CXXFLAGS="$CXXFLAGS -D_FORTIFY_SOURCE=3"
fi
--
2.40.0

View File

@ -76,6 +76,7 @@ Patch1003: cups-ippeveprinter-typo.patch
Patch1004: 0001-Don-t-override-color-settings-from-print-dialog.patch Patch1004: 0001-Don-t-override-color-settings-from-print-dialog.patch
Patch1005: 0001-scheduler-ipp.c-Convert-incoming-ColorModel-attribut.patch Patch1005: 0001-scheduler-ipp.c-Convert-incoming-ColorModel-attribut.patch
Patch1006: 0001-scheduler-printers.c-Check-for-CMYK-as-well-fixes-42.patch Patch1006: 0001-scheduler-printers.c-Check-for-CMYK-as-well-fixes-42.patch
Patch1007: 0001-configure-Raise-FORTIFY_SOURCE-level-to-3.patch
##### Patches removed because IMHO they aren't no longer needed ##### Patches removed because IMHO they aren't no longer needed
##### but still I'll leave them in git in case their removal ##### but still I'll leave them in git in case their removal
@ -298,6 +299,8 @@ to CUPS daemon. This solution will substitute printer drivers and raw queues in
%patch1005 -p1 -b .save-color-settings %patch1005 -p1 -b .save-color-settings
# https://github.com/OpenPrinting/cups/pull/500 # https://github.com/OpenPrinting/cups/pull/500
%patch1006 -p1 -b .check-for-cmyk %patch1006 -p1 -b .check-for-cmyk
# https://github.com/OpenPrinting/cups/pull/642
%patch1007 -p1 -b .raise-fortify
%if %{lspp} %if %{lspp}