Merge pull request #78 from h-vetinari/bump

zlib 1.3.1
conda-forge · Feb 29, 2024 · 7e99a51 · 7e99a51
2 parents 6e17802 + cce15a3
commit 7e99a51
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_docker_build.sh b/.scripts/run_docker_build.sh
diff --git a/recipe/CVE-2023-45853.patch b/recipe/CVE-2023-45853.patch
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -1,4 +1,4 @@
-{% set version = "1.3" %}
+{% set version = "1.3.1" %}
 {% set build_num = 0 %}
 
 package:
@@ -9,10 +9,7 @@ source:
   url:
     - http://zlib.net/zlib-{{ version }}.tar.gz
     - https://gnupg.org/ftp/gcrypt/zlib/zlib-{{ version }}.tar.gz
-  sha256: ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
-  patches:
-    # This patch is ported from https://github.com/madler/zlib/pull/843 and can be dropped after the availability of 1.3.1 patch release
-    - CVE-2023-45853.patch
+  sha256: 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
 
 build:
   number: {{ build_num }}