[1.9.4] Update grpcio to v1.53.2 to fix CVE (#1017)

* Update grpcio to 1.53.2 to fix CVE * Update grpcio to 1.53.2 to fix CVE --------- Co-authored-by: ArchanaShinde1 <archanashinde2504@gmail.com>
open-ce · Feb 20, 2024 · 967393b · 967393b
1 parent c435140
commit 967393b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 23 deletions.
diff --git a/envs/apache-beam-env.yaml b/envs/apache-beam-env.yaml
@@ -45,8 +45,7 @@ packages:
   - feedstock : https://github.com/conda-forge/grpcio-feedstock
     git_tag : a99441fbf15d9bafd4370ea1c88c3c54311efdff
     patches :
-      - feedstock-patches/grpcio/0001-Updated-to-1.53.0.patch            #[not s390x]
-      - feedstock-patches/grpcio/0001-use-gcc-11.2-to-fix-build-for-cuda-11.2.patch    #[not s390x]
+      - feedstock-patches/grpcio/0001-Update-to-1.53.2-to-fix-CVE.patch            #[not s390x]
       - feedstock-patches/grpcio/0001-opence-changes-for-s390x.patch     #[s390x]
   - feedstock : apache-beam
 {% endif %}

diff --git a/...tches/grpcio/0001-Updated-to-1.53.0.patch → ...io/0001-Update-to-1.53.2-to-fix-CVE.patch b/...tches/grpcio/0001-Updated-to-1.53.0.patch → ...io/0001-Update-to-1.53.2-to-fix-CVE.patch
@@ -1,19 +1,19 @@
-From 7ad5a9fc6afe897d52f18a84a9fbfdd206043567 Mon Sep 17 00:00:00 2001
-From: Deepali Chourasia <deepch23@in.ibm.com>
-Date: Fri, 15 Sep 2023 10:43:05 +0000
-Subject: [PATCH] Update to 1.53.0
+From 56a4b91792605c02e6fad6de3be8fedfb7ef0df4 Mon Sep 17 00:00:00 2001
+From: ArchanaShinde1 <archanashinde2504@gmail.com>
+Date: Tue, 20 Feb 2024 09:33:56 +0000
+Subject: [PATCH] Update to 1.53.2 to fix CVE
 
 ---
  recipe/meta.yaml | 28 ++++++++++++++--------------
  1 file changed, 14 insertions(+), 14 deletions(-)
 
 diff --git a/recipe/meta.yaml b/recipe/meta.yaml
-index 19fa19a..ee6952f 100644
+index 19fa19a..ed5415d 100644
 --- a/recipe/meta.yaml
 +++ b/recipe/meta.yaml
 @@ -1,4 +1,4 @@
 -{% set version = "1.46.3" %}
-+{% set version = "1.53.0" %}
++{% set version = "1.53.2" %}
 
  package:
    name: grpcio
@@ -22,7 +22,7 @@ index 19fa19a..ee6952f 100644
  source:
    url: https://pypi.io/packages/source/g/grpcio/grpcio-{{ version }}.tar.gz
 -  sha256: 4b8fd8b1cd553635274b83cd984f0755e6779886eca53c1c71d48215962eb689
-+  sha256: a4952899b4931a6ba12951f9a141ef3e74ff8a6ec9aa2dc602afa40f63595e33
++  sha256: 0c9e42f2499c8603af1d88771dc97e2c6b0310c278337058fd7fd1ddb35ab853
    patches:
      - 0001-Monkey-patch-distutils.ccompiler.spawn-to-elide-std-.patch
 -    - 0002-windows-ssl-lib-names.patch

diff --git a/envs/feedstock-patches/grpcio/0001-opence-changes-for-s390x.patch b/envs/feedstock-patches/grpcio/0001-opence-changes-for-s390x.patch
@@ -1,7 +1,7 @@
-From 116e56c25c1fb72b01faeb04787f71d9f0bc1491 Mon Sep 17 00:00:00 2001
-From: Nishidha Panpaliya <npanpa23@in.ibm.com>
-Date: Thu, 5 Oct 2023 13:08:22 +0000
-Subject: [PATCH] opence changes for s390x
+From 73124a58b197dd0365310143362d6fe494bc18ee Mon Sep 17 00:00:00 2001
+From: ArchanaShinde1 <archana.shinde2504@gmail.com>
+Date: Tue, 20 Feb 2024 11:56:18 +0000
+Subject: [PATCH] Update to 1.53.2 to fix CVE
 
 ---
  config/conda_build_config.yaml          |  4 ++++
@@ -93,12 +93,12 @@ index f797569..ca7c25a 100644
 
  $PYTHON -m pip install . --no-deps --ignore-installed --no-cache-dir -vvv
 diff --git a/recipe/meta.yaml b/recipe/meta.yaml
-index 19fa19a..690bf38 100644
+index 19fa19a..16a4566 100644
 --- a/recipe/meta.yaml
 +++ b/recipe/meta.yaml
 @@ -1,4 +1,4 @@
 -{% set version = "1.46.3" %}
-+{% set version = "1.53.0" %}
++{% set version = "1.53.2" %}
 
  package:
    name: grpcio
@@ -107,7 +107,7 @@ index 19fa19a..690bf38 100644
  source:
    url: https://pypi.io/packages/source/g/grpcio/grpcio-{{ version }}.tar.gz
 -  sha256: 4b8fd8b1cd553635274b83cd984f0755e6779886eca53c1c71d48215962eb689
-+  sha256: a4952899b4931a6ba12951f9a141ef3e74ff8a6ec9aa2dc602afa40f63595e33
++  sha256: 0c9e42f2499c8603af1d88771dc97e2c6b0310c278337058fd7fd1ddb35ab853
    patches:
      - 0001-Monkey-patch-distutils.ccompiler.spawn-to-elide-std-.patch
 -    - 0002-windows-ssl-lib-names.patch
@@ -159,5 +159,5 @@ index 19fa19a..690bf38 100644
      - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}  # [osx and x86_64]
 
 -- 
-2.40.1
+2.34.1
 
diff --git a/envs/tensorboard-env.yaml b/envs/tensorboard-env.yaml
@@ -15,8 +15,7 @@ packages:
   - feedstock : https://github.com/conda-forge/grpcio-feedstock 
     git_tag : a99441fbf15d9bafd4370ea1c88c3c54311efdff
     patches : 
-      - feedstock-patches/grpcio/0001-Updated-to-1.53.0.patch            #[not s390x]
-      - feedstock-patches/grpcio/0001-use-gcc-11.2-to-fix-build-for-cuda-11.2.patch    #[not s390x]
+      - feedstock-patches/grpcio/0001-Update-to-1.53.2-to-fix-CVE.patch            #[not s390x]
       - feedstock-patches/grpcio/0001-opence-changes-for-s390x.patch     #[s390x]
   - feedstock : tensorboard
 

diff --git a/envs/tensorflow-env.yaml b/envs/tensorflow-env.yaml
@@ -22,8 +22,7 @@ packages:
   - feedstock : https://github.com/conda-forge/grpcio-feedstock
     git_tag : a99441fbf15d9bafd4370ea1c88c3c54311efdff
     patches :
-      - feedstock-patches/grpcio/0001-Updated-to-1.53.0.patch            #[not s390x]
-      - feedstock-patches/grpcio/0001-use-gcc-11.2-to-fix-build-for-cuda-11.2.patch    #[not s390x]
+      - feedstock-patches/grpcio/0001-Update-to-1.53.2-to-fix-CVE.patch            #[not s390x]
       - feedstock-patches/grpcio/0001-opence-changes-for-s390x.patch     #[s390x]
   - feedstock : keras
   - feedstock : tensorflow

diff --git a/envs/tensorflow-serving-env.yaml b/envs/tensorflow-serving-env.yaml
@@ -19,8 +19,7 @@ packages:
     - feedstock : https://github.com/conda-forge/grpcio-feedstock
       git_tag : a99441fbf15d9bafd4370ea1c88c3c54311efdff
       patches :
-        - feedstock-patches/grpcio/0001-Updated-to-1.53.0.patch            #[not s390x]
-        - feedstock-patches/grpcio/0001-use-gcc-11.2-to-fix-build-for-cuda-11.2.patch    #[not s390x]
+        - feedstock-patches/grpcio/0001-Update-to-1.53.2-to-fix-CVE.patch            #[not s390x]
         - feedstock-patches/grpcio/0001-opence-changes-for-s390x.patch     #[s390x]
     - feedstock: libevent      #[ppc_arch != "p10"]
     - feedstock: tensorflow-serving