diff --git a/grpc.spec b/grpc.spec index eefacff53c2c6705e272dd896442cda9a796ed6a..ad2d949f7818c7e4c987633eef166220524ea541 100644 --- a/grpc.spec +++ b/grpc.spec @@ -4,7 +4,7 @@ Name: grpc Version: 1.60.0 -Release: 2 +Release: 3 Summary: A modern, open source high performance RPC framework that can run in any environment License: ASL 2.0 URL: https://www.grpc.io @@ -14,6 +14,7 @@ Patch0006: repair-pkgconfig-path.patch Patch0007: add-secure-compile-option-in-Makefile.patch Patch0009: remove-cert-expired-on-20230930.patch Patch0010: backport-Specify-noexcept-for-cdef-functions.patch +Patch0011: remove-cert-expired-at-20250512.patch BuildRequires: gcc-c++ pkgconfig protobuf-devel protobuf-compiler protobuf-lite-devel BuildRequires: openssl-devel c-ares-devel gtest-devel zlib-devel gperftools-devel @@ -156,6 +157,12 @@ cd ../.. %{python3_sitearch}/grpcio-%{version}-py* %changelog +* Fri Jun 21 2024 zhouyihang - 1.60.0-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove cert expired at 20250512 + * Mon Feb 05 2024 zhouyihang - 1.60.0-2 - Type:bugfix - CVE:NA diff --git a/remove-cert-expired-at-20250512.patch b/remove-cert-expired-at-20250512.patch new file mode 100644 index 0000000000000000000000000000000000000000..3b96cf9be7aedd428a59439e7b8acf6b1b030af1 --- /dev/null +++ b/remove-cert-expired-at-20250512.patch @@ -0,0 +1,51 @@ +From 15327a17f80de1251e84d38dda045bbfd7061125 Mon Sep 17 00:00:00 2001 +From: renmingshuai +Date: Tue, 28 May 2024 20:59:35 +0800 +Subject: [PATCH] huawei-remove-cert-expired-at-20250512 + +--- + etc/roots.pem | 29 ----------------------------- + 1 file changed, 29 deletions(-) + +diff --git a/etc/roots.pem b/etc/roots.pem +index c599727..d84a8f5 100644 +--- a/etc/roots.pem ++++ b/etc/roots.pem +@@ -64,35 +64,6 @@ bYQLCIt+jerXmCHG8+c8eS9enNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/Er + fF6adulZkMV8gzURZVE= + -----END CERTIFICATE----- + +-# Issuer: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust +-# Subject: CN=Baltimore CyberTrust Root O=Baltimore OU=CyberTrust +-# Label: "Baltimore CyberTrust Root" +-# Serial: 33554617 +-# MD5 Fingerprint: ac:b6:94:a5:9c:17:e0:d7:91:52:9b:b1:97:06:a6:e4 +-# SHA1 Fingerprint: d4:de:20:d0:5e:66:fc:53:fe:1a:50:88:2c:78:db:28:52:ca:e4:74 +-# SHA256 Fingerprint: 16:af:57:a9:f6:76:b0:ab:12:60:95:aa:5e:ba:de:f2:2a:b3:11:19:d6:44:ac:95:cd:4b:93:db:f3:f2:6a:eb +------BEGIN CERTIFICATE----- +-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ +-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD +-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX +-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y +-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy +-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr +-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr +-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK +-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu +-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy +-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye +-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1 +-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3 +-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92 +-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx +-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0 +-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz +-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS +-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp +------END CERTIFICATE----- +- + # Issuer: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc. + # Subject: CN=Entrust Root Certification Authority O=Entrust, Inc. OU=www.entrust.net/CPS is incorporated by reference/(c) 2006 Entrust, Inc. + # Label: "Entrust Root Certification Authority" +-- +2.33.0