From 63d5e2b83dfe4f6e8a43575aebceafe8a14905e2 Mon Sep 17 00:00:00 2001
From: Lukas Javorsky <ljavorsk@redhat.com>
Date: Wed, 22 Jun 2022 17:04:21 +0000
Subject: [PATCH] [1/6] Rebase to 1.2.12

Resolves: CVE-2018-25032, BZ#2069002
---
 .gitignore | 2 ++
 sources    | 2 +-
 zlib.spec  | 8 ++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c338974..0c00884 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /zlib-1.2.11.tar.xz
+/zlib-1.2.12.tar.gz
+/zlib-1.2.12.tar.xz
diff --git a/sources b/sources
index 90377f8..b24ca65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (zlib-1.2.11.tar.xz) = b7f50ada138c7f93eb7eb1631efccd1d9f03a5e77b6c13c8b757017b2d462e19d2d3e01c50fad60a4ae1bc86d431f6f94c72c11ff410c25121e571953017cb67
+SHA512 (zlib-1.2.12.tar.xz) = 12940e81e988f7661da52fa20bdc333314ae86a621fdb748804a20840b065a1d6d984430f2d41f3a057de0effc6ff9bcf42f9ee9510b88219085f59cbbd082bd
diff --git a/zlib.spec b/zlib.spec
index 776f4b9..254067f 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,8 +1,8 @@
 %bcond_without minizip
 
 Name:    zlib
-Version: 1.2.11
-Release: 32%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 Summary: Compression and decompression library
 # /contrib/dotzlib/ have Boost license
 License: zlib and Boost
@@ -183,6 +183,10 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 
 
 %changelog
+* Tue Apr 05 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.12-1
+- Rebase to 1.2.12
+- Resolves: CVE-2018-25032
+
 * Mon Feb 28 2022 Lukas Javorsky <ljavorsk@redhat.com> - 1.2.11-32
 - Apply IBM patch for compressBound() function
 - Source from https://github.com/madler/zlib/issues/410#issuecomment-947212824