Skip to content

Commit

Permalink
zlib: bump version to 1.2.13 to correctly handle CRC inputs (#5408)
Browse files Browse the repository at this point in the history
The releases of zlib < 1.2.13 are not sensitive to incorrect CRC
inputs with bits set above the low 32. Bump version to 1.2.13 to
fix this issue.

Reference: madler/zlib#613
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
  • Loading branch information
mfrw authored Apr 28, 2023
1 parent f07bc9c commit c08f77b
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 94 deletions.
39 changes: 0 additions & 39 deletions SPECS/zlib/CVE-2022-37434.patch

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion SPECS/zlib/zlib.signatures.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"Signatures": {
"zlib-1.2.12.tar.xz": "7db46b8d7726232a621befaab4a1c870f00a90805511c0e0090441dac57def18"
"zlib-1.2.13.tar.xz": "d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98"
}
}
12 changes: 7 additions & 5 deletions SPECS/zlib/zlib.spec
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
Summary: Compression and decompression routines
Name: zlib
Version: 1.2.12
Release: 2%{?dist}
Version: 1.2.13
Release: 1%{?dist}
URL: https://www.zlib.net/
License: zlib
Group: Applications/System
Vendor: Microsoft Corporation
Distribution: Mariner
Source0: https://www.zlib.net/%{name}-%{version}.tar.xz
Patch0: CVE-2022-37434.patch
Patch1: Fix-extra-field-processing-bug-that-dereferences-NULL.patch
%description
Compression and decompression routines
%package devel
Expand Down Expand Up @@ -51,8 +49,12 @@ make %{?_smp_mflags} check
%{_mandir}/man3/zlib.3.gz

%changelog
* Thu Apr 27 2023 Muhammad Falak <mwani@microsoft.com> - 1.2.13-1
- Upgrade version to address java exception
- Drop un-needed patches

* Tue Aug 16 2022 Muhammad Falak <mwani@microsoft.com> - 1.2.12-2
- Introduce patches from upstrea to address CVE-2022-37434
- Introduce patches from upstream to address CVE-2022-37434

* Tue Apr 12 2022 Nicolas Guibourge <nicolasg@microsoft.com> - 1.2.12-1
- Upgrade to 1.12.2 to fix CVE-2018-25032
Expand Down
6 changes: 3 additions & 3 deletions cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -30400,8 +30400,8 @@
"type": "other",
"other": {
"name": "zlib",
"version": "1.2.12",
"downloadUrl": "https://www.zlib.net/zlib-1.2.12.tar.xz"
"version": "1.2.13",
"downloadUrl": "https://www.zlib.net/zlib-1.2.13.tar.xz"
}
}
},
Expand Down Expand Up @@ -30447,4 +30447,4 @@
}
],
"Version": 1
}
}
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ glibc-iconv-2.35-3.cm2.aarch64.rpm
glibc-lang-2.35-3.cm2.aarch64.rpm
glibc-nscd-2.35-3.cm2.aarch64.rpm
glibc-tools-2.35-3.cm2.aarch64.rpm
zlib-1.2.12-2.cm2.aarch64.rpm
zlib-devel-1.2.12-2.cm2.aarch64.rpm
zlib-1.2.13-1.cm2.aarch64.rpm
zlib-devel-1.2.13-1.cm2.aarch64.rpm
file-5.40-2.cm2.aarch64.rpm
file-devel-5.40-2.cm2.aarch64.rpm
file-libs-5.40-2.cm2.aarch64.rpm
Expand Down
4 changes: 2 additions & 2 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ glibc-iconv-2.35-3.cm2.x86_64.rpm
glibc-lang-2.35-3.cm2.x86_64.rpm
glibc-nscd-2.35-3.cm2.x86_64.rpm
glibc-tools-2.35-3.cm2.x86_64.rpm
zlib-1.2.12-2.cm2.x86_64.rpm
zlib-devel-1.2.12-2.cm2.x86_64.rpm
zlib-1.2.13-1.cm2.x86_64.rpm
zlib-devel-1.2.13-1.cm2.x86_64.rpm
file-5.40-2.cm2.x86_64.rpm
file-devel-5.40-2.cm2.x86_64.rpm
file-libs-5.40-2.cm2.x86_64.rpm
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/toolchain_aarch64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -582,9 +582,9 @@ xz-lang-5.2.5-1.cm2.aarch64.rpm
xz-libs-5.2.5-1.cm2.aarch64.rpm
zip-3.0-5.cm2.aarch64.rpm
zip-debuginfo-3.0-5.cm2.aarch64.rpm
zlib-1.2.12-2.cm2.aarch64.rpm
zlib-debuginfo-1.2.12-2.cm2.aarch64.rpm
zlib-devel-1.2.12-2.cm2.aarch64.rpm
zlib-1.2.13-1.cm2.aarch64.rpm
zlib-debuginfo-1.2.13-1.cm2.aarch64.rpm
zlib-devel-1.2.13-1.cm2.aarch64.rpm
zstd-1.5.0-1.cm2.aarch64.rpm
zstd-debuginfo-1.5.0-1.cm2.aarch64.rpm
zstd-devel-1.5.0-1.cm2.aarch64.rpm
Expand Down
6 changes: 3 additions & 3 deletions toolkit/resources/manifests/package/toolchain_x86_64.txt
Original file line number Diff line number Diff line change
Expand Up @@ -582,9 +582,9 @@ xz-lang-5.2.5-1.cm2.x86_64.rpm
xz-libs-5.2.5-1.cm2.x86_64.rpm
zip-3.0-5.cm2.x86_64.rpm
zip-debuginfo-3.0-5.cm2.x86_64.rpm
zlib-1.2.12-2.cm2.x86_64.rpm
zlib-debuginfo-1.2.12-2.cm2.x86_64.rpm
zlib-devel-1.2.12-2.cm2.x86_64.rpm
zlib-1.2.13-1.cm2.x86_64.rpm
zlib-debuginfo-1.2.13-1.cm2.x86_64.rpm
zlib-devel-1.2.13-1.cm2.x86_64.rpm
zstd-1.5.0-1.cm2.x86_64.rpm
zstd-debuginfo-1.5.0-1.cm2.x86_64.rpm
zstd-devel-1.5.0-1.cm2.x86_64.rpm
Expand Down

0 comments on commit c08f77b

Please sign in to comment.