From 85a53406c3ac205ba3d93881a4648e6fc201ec7b Mon Sep 17 00:00:00 2001
From: Shahzad Malik Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Fri, 10 Feb 2023 18:30:55 +0100
Subject: [PATCH 1/2] move sanitizer flags in to toolfile; drop sanitizer deps
 for rocm prod

---
 SCRAMV1.spec                                         | 4 ++--
 scram-project-build.file                             | 2 +-
 scram-tools.file/tools/gcc/sanitizer-flags-asan.xml  | 7 +++++++
 scram-tools.file/tools/gcc/sanitizer-flags-ubsan.xml | 8 ++++++++
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 scram-tools.file/tools/gcc/sanitizer-flags-asan.xml
 create mode 100644 scram-tools.file/tools/gcc/sanitizer-flags-ubsan.xml

diff --git a/SCRAMV1.spec b/SCRAMV1.spec
index e5c2eab25db..2c650fd0eb0 100644
--- a/SCRAMV1.spec
+++ b/SCRAMV1.spec
@@ -1,8 +1,8 @@
-### RPM lcg SCRAMV1 V3_00_58
+### RPM lcg SCRAMV1 V3_00_59
 ## NOCOMPILER
 ## NO_VERSION_SUFFIX
 
-%define tag 6654963f322524cb9560b6e46e7d9807c2cec9cf
+%define tag e8f47d278bafb41f8ea16e2ae7247c709ee9d591
 %define branch SCRAMV3
 %define github_user cms-sw
 Source: git+https://github.com/%{github_user}/SCRAM.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
diff --git a/scram-project-build.file b/scram-project-build.file
index defde459e51..5ba32374c58 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -54,7 +54,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V07-05-11
+%define configtag       V07-06-00
 %endif
 
 %if "%{?cvssrc:set}" != "set"
diff --git a/scram-tools.file/tools/gcc/sanitizer-flags-asan.xml b/scram-tools.file/tools/gcc/sanitizer-flags-asan.xml
new file mode 100644
index 00000000000..881c1561681
--- /dev/null
+++ b/scram-tools.file/tools/gcc/sanitizer-flags-asan.xml
@@ -0,0 +1,7 @@
+  <tool name="sanitizer-flags-asan" version="1.0">
+    <ifrelease name="ASAN">
+      <flags CXXFLAGS="-fno-omit-frame-pointer -fsanitize=address"/>
+      <!-- See https://github.com/cms-sw/cmssw/issues/36480 <flags CXXFLAGS="-fsanitize=pointer-compare"/> -->
+      <flags CXXFLAGS="-fsanitize=pointer-subtract"/>
+    </ifrelease>
+  </tool>
diff --git a/scram-tools.file/tools/gcc/sanitizer-flags-ubsan.xml b/scram-tools.file/tools/gcc/sanitizer-flags-ubsan.xml
new file mode 100644
index 00000000000..cb94b0a0626
--- /dev/null
+++ b/scram-tools.file/tools/gcc/sanitizer-flags-ubsan.xml
@@ -0,0 +1,8 @@
+  <tool name="sanitizer-flags-ubsan" version="1.0">
+    <ifrelease name="UBSAN">
+      <flags CXXFLAGS="-fno-omit-frame-pointer -fsanitize=undefined"/>
+      <flags CXXFLAGS="-fsanitize=builtin -fsanitize=pointer-overflow"/>
+      <flags REM_BOOST_SERIALIZATION_CXXFLAGS="-fno-omit-frame-pointer -fsanitize=undefined"/>
+      <flags REM_BOOST_SERIALIZATION_CXXFLAGS="-fsanitize=builtin -fsanitize=pointer-overflow"/>
+    </ifrelease>
+  </tool>

From 15dc434ee83dfa499c4a312b28cde22771b3006e Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Sat, 11 Feb 2023 12:49:52 +0100
Subject: [PATCH 2/2] Update scram-project-build.file

---
 scram-project-build.file | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scram-project-build.file b/scram-project-build.file
index 5ba32374c58..e9784abed2c 100644
--- a/scram-project-build.file
+++ b/scram-project-build.file
@@ -54,7 +54,7 @@ BuildRequires: dwz
 %endif
 
 %if "%{?configtag:set}" != "set"
-%define configtag       V07-06-00
+%define configtag       V07-06-01
 %endif
 
 %if "%{?cvssrc:set}" != "set"