Skip to content

Commit

Permalink
cgmanifest.json, zlib-ng-version.txt, THIRD-PARTY-NOTICES.TXT updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
carlossanlop committed Sep 5, 2024
1 parent e61a10e commit e060e83
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 12 deletions.
20 changes: 14 additions & 6 deletions THIRD-PARTY-NOTICES.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -69,19 +69,27 @@ written authorization of the copyright holder.
License notice for zlib-ng
-----------------------

https://github.com/zlib-ng/zlib-ng/blob/develop/LICENSE.md
https://github.com/zlib-ng/zlib-ng/blob/d54e3769be0c522015b784eca2af258b1c026107/LICENSE.md

(C) 1995-2024 Jean-loup Gailly and Mark Adler

This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.

Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.

This notice may not be removed or altered from any source distribution.
3. This notice may not be removed or altered from any source distribution.

License notice for LinuxTracepoints
-----------------------------------
Expand Down
2 changes: 1 addition & 1 deletion src/native/external/cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"Type": "git",
"Git": {
"RepositoryUrl": "https://github.com/zlib-ng/zlib-ng",
"CommitHash": "74253725f884e2424a0dd8ae3f69896d5377f325"
"CommitHash": "d54e3769be0c522015b784eca2af258b1c026107"
}
},
"DevelopmentDependency": false
Expand Down
10 changes: 5 additions & 5 deletions src/native/external/zlib-ng-version.txt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
v2.1.6
74253725f884e2424a0dd8ae3f69896d5377f325
v2.2.1
d54e3769be0c522015b784eca2af258b1c026107

https://github.com/zlib-ng/zlib-ng/releases/tag/2.1.6
https://github.com/zlib-ng/zlib-ng/releases/tag/2.2.1

We have removed the following folders from our local copy as these files are not needed for our compilation:

- zlib-ng/docs/
- zlib-ng/doc/
- zlib-ng/test/
- zlib-ng/arch/s390/self-hosted-builder/

Apply https://github.com/dotnet/runtime/pull/105433.patch
Also, if the next version does not yet contain the fixes included in 12bc7edc73308f017ec40c6b2db694a6e3490ac2, cherry-pick it as a patch.

0 comments on commit e060e83

Please sign in to comment.