From ea18656497539bcb196d770cf283a5aca2052593 Mon Sep 17 00:00:00 2001
From: Alexander Usyskin <alexander.usyskin@intel.com>
Date: Thu, 8 Jan 2026 09:26:05 +0200
Subject: [PATCH 1/2] MeTee: CMake: Linux: overwrite FORTIFY_SOURCE from
 distribution

Distribution can define _FORTIFY_SOURCE in it global build config and
our definition will duplicate it.
It may lead to compile errors like:
"error: "_FORTIFY_SOURCE" redefined [-Werror]"

Undefine _FORTIFY_SOURCE before defining it to fix such errors.

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
---
 linux.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/linux.cmake b/linux.cmake
index 377eb45..967dbc6 100644
--- a/linux.cmake
+++ b/linux.cmake
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: Apache-2.0
-# Copyright (C) 2014-2024 Intel Corporation
+# Copyright (C) 2014-2026 Intel Corporation
 set(TEE_SOURCES src/linux/metee_linux.c src/linux/mei.c)
 
 add_library(${PROJECT_NAME} ${TEE_SOURCES})
@@ -55,7 +55,7 @@ target_compile_options(
 # Security options
 target_compile_options(
   ${PROJECT_NAME}
-  PRIVATE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -O2 -Wformat
+  PRIVATE -fstack-protector-strong -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -O2 -Wformat
           -Wformat-security
   PRIVATE $<$<C_COMPILER_ID:GNU>:-fno-strict-overflow>
   PRIVATE $<$<C_COMPILER_ID:GNU>:-fno-delete-null-pointer-checks>
@@ -71,4 +71,4 @@ endif()
 target_compile_definitions(${PROJECT_NAME} PRIVATE -D_GNU_SOURCE)
 if(ANDROID)
   target_link_libraries(${PROJECT_NAME} PRIVATE log)
-endif()
\ No newline at end of file
+endif()

From 964e26f966056d508b22a8c2c0ce6e9f23cce668 Mon Sep 17 00:00:00 2001
From: Alexander Usyskin <alexander.usyskin@intel.com>
Date: Wed, 14 Jan 2026 12:45:49 +0200
Subject: [PATCH 2/2] MeTee: bump version to 6.2.1

Update CHANGELOG.md

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
---
 CHANGELOG.md | 5 +++++
 VERSION      | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ed2158..105ab2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## [6.2.1]
+
+### Fixed
+ - CMake: Linux: overwrite FORTIFY_SOURCE from distribution
+
 ## [6.2.0]
 
 ### Changed
diff --git a/VERSION b/VERSION
index 6abaeb2..024b066 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.2.0
+6.2.1