Normalize vendored zlib to upstream 1.2.11

cgmanifest.json

@@ -0,0 +1,35 @@
+{
+  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
+  "Registrations": [
+    {
+      "Component": {
+        "Type": "git",
+        "git": {
+          "RepositoryUrl": "https://github.com/nlohmann/json",
+          "CommitHash": "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "git",
+        "git": {
+          "RepositoryUrl": "https://github.com/sqlite/sqlite",
+          "CommitHash": "60405cd15cdd085745101a29112043299d439cfa"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "git",
+        "git": {
+          "RepositoryUrl": "https://github.com/madler/zlib",
+          "CommitHash": "cacf7f1d4e3d44d871b605da3b647f07d718623f"
+        }
+      },
+      "DevelopmentDependency": false
+    }
+  ]
+}

docs/List-of-OSS-Components.md

@@ -6,7 +6,7 @@ These are the Open Source components used by Microsoft 1DS / C++ Client Telemetr
 
 ZLIB DATA COMPRESSION LIBRARY.
 
-SDK maintains its own snapshot of the mainline ZLib with some Intel architecture performance optimizations [here](../zlib). 
+SDK maintains its own snapshot of the mainline ZLib [here](../zlib).
 It is the responsibility of product teams to ensure that a snapshot of zlib they use meets their product security and licensing requirements.
 
 ## [SQLite](https://www.sqlite.org/index.html)

third_party/cgmanifest.json

@@ -0,0 +1,35 @@
+{
+  "$schema": "https://json.schemastore.org/component-detection-manifest.json",
+  "Registrations": [
+    {
+      "Component": {
+        "Type": "git",
+        "git": {
+          "RepositoryUrl": "https://github.com/tonymillion/Reachability",
+          "CommitHash": "788111ebf98e86368cd03da17f884015d2fc1543"
+        }
+      },
+      "DevelopmentDependency": false
+    },
+    {
+      "Component": {
+        "Type": "git",
+        "git": {
+          "RepositoryUrl": "https://github.com/google/googletest.git",
+          "CommitHash": "58d77fa8070e8cec2dc1ed015d66b454c8d78850"
+        }
+      },
+      "DevelopmentDependency": true
+    },
+    {
+      "Component": {
+        "Type": "git",
+        "git": {
+          "RepositoryUrl": "https://github.com/clibs/sha1/",
+          "CommitHash": "d5b29e11ec4871b78b370e8e00bd0cd56d798dda"
+        }
+      },
+      "DevelopmentDependency": true
+    }
+  ]
+}

tools/ports/mstelemetry/v142-build.patch

@@ -3276,7 +3276,7 @@ diff --git a/zlib/contrib/vstudio/vc14/zlibvc.vcxproj b/zlib/contrib/vstudio/vc1
 index 5ff55579..77518e48 100644
 --- a/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
 +++ b/zlib/contrib/vstudio/vc14/zlibvc.vcxproj
-@@ -1,1218 +1,1218 @@
+@@ -1,1218 +1,1215 @@
 -<?xml version="1.0" encoding="utf-8"?>
 -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 -  <ItemGroup Label="ProjectConfigurations">
@@ -5669,15 +5669,12 @@ index 5ff55579..77518e48 100644
 +    <ClCompile Include="..\..\..\adler32.c" />
 +    <ClCompile Include="..\..\..\compress.c" />
 +    <ClCompile Include="..\..\..\crc32.c" />
-+    <ClCompile Include="..\..\..\crc_folding.c" />
 +    <ClCompile Include="..\..\..\deflate.c" />
-+    <ClCompile Include="..\..\..\fill_window_sse.c" />
 +    <ClCompile Include="..\..\..\gzclose.c" />
 +    <ClCompile Include="..\..\..\gzlib.c" />
 +    <ClCompile Include="..\..\..\gzread.c" />
 +    <ClCompile Include="..\..\..\gzwrite.c" />
 +    <ClCompile Include="..\..\..\infback.c" />
-+    <ClCompile Include="..\..\..\x86.c" />
 +    <ClCompile Include="..\..\masmx64\inffas8664.c" />
 +    <ClCompile Include="..\..\..\inffast.c" />
 +    <ClCompile Include="..\..\..\inflate.c" />

zlib/CMakeLists.txt

@@ -3,7 +3,7 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
 
 project(zlib C)
 
-set(VERSION "1.2.8")
+set(VERSION "1.2.11")
 
 option(ASM686 "Enable building i686 assembly implementation")
 option(AMD64 "Enable building amd64 assembly implementation")

zlib/contrib/vstudio/vc14/zlibvc.vcxproj

@@ -1181,15 +1181,12 @@ bld_ml64.bat</Command>
     <ClCompile Include="..\..\..\adler32.c" />
     <ClCompile Include="..\..\..\compress.c" />
     <ClCompile Include="..\..\..\crc32.c" />
-    <ClCompile Include="..\..\..\crc_folding.c" />
     <ClCompile Include="..\..\..\deflate.c" />
-    <ClCompile Include="..\..\..\fill_window_sse.c" />
     <ClCompile Include="..\..\..\gzclose.c" />
     <ClCompile Include="..\..\..\gzlib.c" />
     <ClCompile Include="..\..\..\gzread.c" />
     <ClCompile Include="..\..\..\gzwrite.c" />
     <ClCompile Include="..\..\..\infback.c" />
-    <ClCompile Include="..\..\..\x86.c" />
     <ClCompile Include="..\..\masmx64\inffas8664.c" />
     <ClCompile Include="..\..\..\inffast.c" />
     <ClCompile Include="..\..\..\inflate.c" />

zlib/crc32.c

@@ -28,8 +28,6 @@
 #  endif /* !DYNAMIC_CRC_TABLE */
 #endif /* MAKECRCH */
 
-#include "deflate.h"
-#include "x86.h"
 #include "zutil.h"      /* for STDC and FAR definitions */
 
 /* Definitions for doing the crc four data bytes at a time. */
@@ -442,28 +440,3 @@ uLong ZEXPORT crc32_combine64(crc1, crc2, len2)
 {
     return crc32_combine_(crc1, crc2, len2);
 }
-
-ZLIB_INTERNAL void crc_reset(deflate_state *const s)
-{
-    if (x86_cpu_enable_simd) {
-        crc_fold_init(s);
-        return;
-    }
-    s->strm->adler = crc32(0L, Z_NULL, 0);
-}
-
-ZLIB_INTERNAL void crc_finalize(deflate_state *const s)
-{
-    if (x86_cpu_enable_simd)
-        s->strm->adler = crc_fold_512to32(s);
-}
-
-ZLIB_INTERNAL void copy_with_crc(z_streamp strm, Bytef *dst, long size)
-{
-    if (x86_cpu_enable_simd) {
-        crc_fold_copy(strm->state, dst, strm->next_in, size);
-        return;
-    }
-    zmemcpy(dst, strm->next_in, size);
-    strm->adler = crc32(strm->adler, dst, size);
-}