From ae1e3a88b4210bae6dabdc3a94bf5a4d87d62545 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 09 Jan 2019 15:07:26 +0000
Subject: [PATCH] import rh-dotnet21-dotnet-2.1.503-1.el7

---
 /dev/null                    |   53 --------------------------
 .gitignore                   |    2 
 SPECS/dotnet.spec            |   16 ++++---
 .rh-dotnet21-dotnet.metadata |    2 
 4 files changed, 11 insertions(+), 62 deletions(-)

diff --git a/.gitignore b/.gitignore
index 48e4d49..3497269 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/dotnet-v2.1.6a.tar.gz
+SOURCES/dotnet-2.1.7.tar.gz
diff --git a/.rh-dotnet21-dotnet.metadata b/.rh-dotnet21-dotnet.metadata
index 295aec9..3a5e534 100644
--- a/.rh-dotnet21-dotnet.metadata
+++ b/.rh-dotnet21-dotnet.metadata
@@ -1 +1 @@
-db2f013144bd22de339b990f559614bc29c94920 SOURCES/dotnet-v2.1.6a.tar.gz
+b348ed3c97d1e203080a646aef12c560e580eabe SOURCES/dotnet-2.1.7.tar.gz
diff --git a/SOURCES/corefx-32165-out-of-directory-extract.patch b/SOURCES/corefx-32165-out-of-directory-extract.patch
deleted file mode 100644
index ca93a09..0000000
--- a/SOURCES/corefx-32165-out-of-directory-extract.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 65a19e18d7d4b94f50772bd3118c0b9868766af5 Mon Sep 17 00:00:00 2001
-From: Maryam Ariyan <maryam.ariyan@microsoft.com>
-Date: Fri, 7 Sep 2018 10:53:25 -0700
-Subject: [PATCH] Fixes extract out of directory by ensuring trailing separator
- for nested paths.
-
-Related to PR #32127
----
- .../System/IO/Compression/ZipFileExtensions.cs  |  2 ++
- .../tests/ZipFileConvenienceMethods.cs          | 17 +++++++++++++++++
- 2 files changed, 19 insertions(+)
-
-diff --git a/src/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.cs b/src/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.cs
-index 3fef7883c953..c749c8250f9c 100644
---- a/src/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.cs
-+++ b/src/System.IO.Compression.ZipFile/src/System/IO/Compression/ZipFileExtensions.cs
-@@ -160,6 +160,8 @@ public static void ExtractToDirectory(this ZipArchive source, string destination
-             // Note that this will give us a good DirectoryInfo even if destinationDirectoryName exists:
-             DirectoryInfo di = Directory.CreateDirectory(destinationDirectoryName);
-             string destinationDirectoryFullPath = di.FullName;
-+            if (!destinationDirectoryFullPath.EndsWith(Path.DirectorySeparatorChar))
-+                destinationDirectoryFullPath += Path.DirectorySeparatorChar;
- 
-             foreach (ZipArchiveEntry entry in source.Entries)
-             {
-diff --git a/src/System.IO.Compression.ZipFile/tests/ZipFileConvenienceMethods.cs b/src/System.IO.Compression.ZipFile/tests/ZipFileConvenienceMethods.cs
-index 69c822e3fc7e..3a0255d03862 100644
---- a/src/System.IO.Compression.ZipFile/tests/ZipFileConvenienceMethods.cs
-+++ b/src/System.IO.Compression.ZipFile/tests/ZipFileConvenienceMethods.cs
-@@ -186,6 +186,23 @@ public void ExtractToDirectoryExtension_Unicode()
-             }
-         }
- 
-+        [Theory]
-+        [InlineData("../Foo")]
-+        [InlineData("../Barbell")]
-+        [SkipOnTargetFramework(TargetFrameworkMonikers.NetFramework, "Second case fails.")]
-+        public void ExtractOutOfRoot(string entryName)
-+        {
-+            string archivePath = GetTestFilePath();
-+            using (FileStream stream = new FileStream(archivePath, FileMode.Create))
-+            using (ZipArchive archive = new ZipArchive(stream, ZipArchiveMode.Create, leaveOpen: true))
-+            {
-+                ZipArchiveEntry entry = archive.CreateEntry(entryName);
-+            }
-+
-+            DirectoryInfo destination = Directory.CreateDirectory(Path.Combine(GetTestFilePath(), "Bar"));
-+            Assert.Throws<IOException>(() => ZipFile.ExtractToDirectory(archivePath, destination.FullName));
-+        }
-+
-         [Fact]
-         public void CreatedEmptyDirectoriesRoundtrip()
-         {
diff --git a/SPECS/dotnet.spec b/SPECS/dotnet.spec
index de799d4..7fd42aa 100644
--- a/SPECS/dotnet.spec
+++ b/SPECS/dotnet.spec
@@ -30,12 +30,12 @@
 # on system libcurl package. We require the %%{?scl_prefix}libcurl package
 %global __requires_exclude ^(%{privlibs}|libcurl)\\.so
 
-%global sdk_version 2.1.500
-%global runtime_version 2.1.6
+%global sdk_version 2.1.503
+%global runtime_version 2.1.7
 
 Name:           %{?scl_prefix}dotnet
 Version:        %{sdk_version}
-Release:        5%{?dist}
+Release:        1%{?dist}
 Group:          Development/Languages
 Summary:        .NET Core CLI tools and runtime
 License:        MIT and ASL 2.0 and BSD
@@ -48,11 +48,10 @@
 # - ./build-source-tarball.sh dotnet-%%{sdk_version}
 # - tar cvzf dotnet-%%{sdk_version}.tar.gz dotnet-%%{sdk_version}
 
-Source0:        dotnet-v%{runtime_version}a.tar.gz
+Source0:        dotnet-%{runtime_version}.tar.gz
 Source1:        check-debug-symbols.py
 
 Patch100:       corefx-32956-alpn.patch
-Patch101:       corefx-32165-out-of-directory-extract.patch
 
 Patch300:       core-setup-4510-commit-id.patch
 
@@ -160,7 +159,7 @@
 applications and micro-services.
 
 %prep
-%setup -q -n %{pkg_name}-v%{runtime_version}a
+%setup -q -n %{pkg_name}-%{runtime_version}
 
 # See https://github.com/dotnet/source-build/pull/669
 rm -rf Tools/configuration/configuration.props
@@ -173,7 +172,6 @@
 
 pushd src/corefx
 %patch100 -p1
-%patch101 -p1
 popd
 
 pushd src/core-setup
@@ -258,6 +256,10 @@
 %{_libdir}/%{pkg_name}/sdk/%{sdk_version}
 
 %changelog
+* Thu Dec 13 2018 Omair Majid <omajid@redhat.com> - 2.1.503-1
+- Update to .NET Core Runtime 2.1.7 and SDK 2.1.503
+- Resolves: RHBZ#1659216
+
 * Wed Nov 14 2018 Omair Majid <omajid@redhat.com> - 2.1.500-5
 - Fix extract out of directory
 - Resolves: CVE-2018-8416

--
Gitblit v1.8.0