From c6de7a4eed9eb3fef96ac01d98cff04e9e19116e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Jun 28 2022 22:11:47 +0000
Subject: import dotnet6.0-6.0.106-2.el8


---

diff --git a/.dotnet6.0.metadata b/.dotnet6.0.metadata
index b22fc74..15a9a13 100644
--- a/.dotnet6.0.metadata
+++ b/.dotnet6.0.metadata
@@ -1 +1 @@
-ea3d59e0bd3c55363d7491c301efbe9b3abcfb0b SOURCES/dotnet-v6.0.105-SDK.tar.gz
+c82bfa5f9a642621fed796e5e9286a746d81e8a2 SOURCES/dotnet-v6.0.106-SDK.tar.gz
diff --git a/.gitignore b/.gitignore
index d1f5881..fed6e16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v6.0.105-SDK.tar.gz
+SOURCES/dotnet-v6.0.106-SDK.tar.gz
diff --git a/SOURCES/check-debug-symbols.py b/SOURCES/check-debug-symbols.py
index be26d87..53d5fd2 100755
--- a/SOURCES/check-debug-symbols.py
+++ b/SOURCES/check-debug-symbols.py
@@ -65,7 +65,7 @@ def scan_file(file):
 
 def is_elf(file):
     result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True)
-    return re.search('ELF 64-bit LSB (?:executable|shared object)', result.stdout)
+    return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout)
 
 def scan_file_if_sensible(file):
     if is_elf(file):
diff --git a/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch b/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch
new file mode 100644
index 0000000..810cf67
--- /dev/null
+++ b/SOURCES/xliff-tasks-use-work-tree-with-git-apply.patch
@@ -0,0 +1,11 @@
+--- a/eng/SourceBuild.props
++++ b/eng/SourceBuild.props
+@@ -15,7 +15,7 @@
+     </ItemGroup>
+ 
+     <Exec
+-      Command="git apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
++      Command="git --work-tree=&quot;$(RepoRoot)&quot; apply --ignore-whitespace --whitespace=nowarn &quot;%(SourceBuildPatchFile.FullPath)&quot;"
+       WorkingDirectory="$(RepoRoot)"
+       Condition="'@(SourceBuildPatchFile)' != ''" />
+   </Target>
diff --git a/SPECS/dotnet6.0.spec b/SPECS/dotnet6.0.spec
index fb952f6..46bd622 100644
--- a/SPECS/dotnet6.0.spec
+++ b/SPECS/dotnet6.0.spec
@@ -20,10 +20,10 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}
 
-%global host_version 6.0.5
-%global runtime_version 6.0.5
+%global host_version 6.0.6
+%global runtime_version 6.0.6
 %global aspnetcore_runtime_version %{runtime_version}
-%global sdk_version 6.0.105
+%global sdk_version 6.0.106
 %global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|')
 %global templates_version %{runtime_version}
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@@ -60,7 +60,7 @@
 
 Name:           dotnet6.0
 Version:        %{sdk_rpm_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        .NET Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
@@ -93,6 +93,9 @@ Patch102:       runtime-66594-s390x-debuginfo.patch
 # Disable apphost, needed for s390x
 Patch500:       fsharp-no-apphost.patch
 
+# This is the suggestion from https://github.com/dotnet/source-build/pull/2450, applied
+Patch600:       xliff-tasks-use-work-tree-with-git-apply.patch
+
 # Disable apphost, needed for s390x
 Patch700:       arcade-no-apphost.patch
 
@@ -406,6 +409,10 @@ pushd src/fsharp
 %patch500 -p1
 popd
 
+pushd src/xliff-tasks
+%patch600 -p1
+popd
+
 pushd src/arcade
 %patch700 -p1
 popd
@@ -627,6 +634,10 @@ echo "Testing build results for debug symbols..."
 
 
 %changelog
+* Thu Jun 23 2022 Omair Majid <omajid@redhat.com> - 6.0.106-1
+- Update to .NET SDK 6.0.106 and Runtime 6.0.6
+- Resolves: RHBZ#2093430
+
 * Mon May 16 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
 - Update to .NET SDK 6.0.105 and Runtime 6.0.5
 - Resolves: RHBZ#2082265