From 2cfa91a2b43e469bf6ac37ceeffe3eff40397d5d Mon Sep 17 00:00:00 2001 From: psykose Date: Tue, 9 Aug 2022 07:28:02 +0000 Subject: main/zlib: backport fix for bug in cve fix see https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d --- main/zlib/APKBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'main') diff --git a/main/zlib/APKBUILD b/main/zlib/APKBUILD index 4fcc0c8bb55..4f1bc5afb79 100644 --- a/main/zlib/APKBUILD +++ b/main/zlib/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa pkgname=zlib pkgver=1.2.11 -pkgrel=4 +pkgrel=5 pkgdesc="A compression/decompression Library" arch="all" license="Zlib" @@ -9,6 +9,7 @@ url="https://zlib.net/" subpackages="$pkgname-static $pkgname-dev $pkgname-doc" source="https://sourceforge.net/projects/libpng/files/zlib/1.2.11/zlib-1.2.11.tar.gz $pkgname-CVE-2022-37434.patch::https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1.patch + $pkgname-CVE-2022-37434-bugfix.patch::https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d.patch " # secfixes: # 1.2.11-r4: @@ -34,4 +35,5 @@ package() { DESTDIR="$pkgdir" } sha512sums="73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae zlib-1.2.11.tar.gz -13bf48cb15636d77428e7e20d8c72d772eade1e099740f8541b7adee0e789097fa867512b6f3ebcff8496727999f2bf408e38414771c9b4440ad283f4c029558 zlib-CVE-2022-37434.patch" +13bf48cb15636d77428e7e20d8c72d772eade1e099740f8541b7adee0e789097fa867512b6f3ebcff8496727999f2bf408e38414771c9b4440ad283f4c029558 zlib-CVE-2022-37434.patch +cadeb0b05da99435c2074cb0d7aebdec2bad1c745856c8ac6ea0f2474ef091d8efeea90deafe13757cbaa465ccfbbb1b8873a8025b24f3145b2a87abb84bac83 zlib-CVE-2022-37434-bugfix.patch" -- cgit v1.2.3