From fa8577054527a7d7632671ca4d613d5a20566563 Mon Sep 17 00:00:00 2001 From: sherlock2010 <15151851377@163.com> Date: Wed, 15 Nov 2023 09:00:19 +0000 Subject: [PATCH] remove cert expired on 20230930 --- grpc.spec | 9 ++++- remove-cert-expired-on-20230930.patch | 51 +++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 remove-cert-expired-on-20230930.patch diff --git a/grpc.spec b/grpc.spec index beb2d0b..a864669 100644 --- a/grpc.spec +++ b/grpc.spec @@ -3,7 +3,7 @@ Name: grpc Version: 1.41.1 -Release: 7 +Release: 8 Summary: A modern, open source high performance RPC framework that can run in any environment License: ASL 2.0 URL: https://www.grpc.io @@ -15,6 +15,7 @@ Patch0010: backport-grpc-1.41.1-python-grpcio-use-system-abseil.patch Patch0011: backport-Ignore-Connection-Aborted-errors-on-accept-29318.patch Patch0012: backport-iomgr-EventEngine-Improve-server-handling-o.patch Patch0013: fix-CVE-2023-33953-add-header-limit.patch +Patch0014: remove-cert-expired-on-20230930.patch BuildRequires: gcc-c++ pkgconfig protobuf-devel protobuf-compiler BuildRequires: openssl-devel c-ares-devel gtest-devel zlib-devel gperftools-devel @@ -141,6 +142,12 @@ cd ../.. %{python3_sitearch}/grpcio-%{version}-py?.?.egg-info %changelog +* Wed Nov 15 2023 zhouyihang - 1.41.1-8 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:remove cert expired on 20230930 + * Thu Sep 21 2023 zhouyihang - 1.41.1-7 - Type:CVE - ID:CVE-2023-33953 diff --git a/remove-cert-expired-on-20230930.patch b/remove-cert-expired-on-20230930.patch new file mode 100644 index 0000000..57e35f4 --- /dev/null +++ b/remove-cert-expired-on-20230930.patch @@ -0,0 +1,51 @@ +From 924b52b761bb3fae1f9a316e6a7989f3d3be8687 Mon Sep 17 00:00:00 2001 +From: sunsuwan +Date: Tue, 8 Aug 2023 15:27:04 +0800 +Subject: [PATCH] remove cert expired on 20230930 + +--- + etc/roots.pem | 28 ---------------------------- + 1 file changed, 28 deletions(-) + +diff --git a/etc/roots.pem b/etc/roots.pem +index bd5911a..c599727 100644 +--- a/etc/roots.pem ++++ b/etc/roots.pem +@@ -248,34 +248,6 @@ mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK + 4SVhM7JZG+Ju1zdXtg2pEto= + -----END CERTIFICATE----- + +-# Issuer: O=SECOM Trust.net OU=Security Communication RootCA1 +-# Subject: O=SECOM Trust.net OU=Security Communication RootCA1 +-# Label: "Security Communication Root CA" +-# Serial: 0 +-# MD5 Fingerprint: f1:bc:63:6a:54:e0:b5:27:f5:cd:e7:1a:e3:4d:6e:4a +-# SHA1 Fingerprint: 36:b1:2b:49:f9:81:9e:d7:4c:9e:bc:38:0f:c6:56:8f:5d:ac:b2:f7 +-# SHA256 Fingerprint: e7:5e:72:ed:9f:56:0e:ec:6e:b4:80:00:73:a4:3f:c3:ad:19:19:5a:39:22:82:01:78:95:97:4a:99:02:6b:6c +------BEGIN CERTIFICATE----- +-MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEY +-MBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21t +-dW5pY2F0aW9uIFJvb3RDQTEwHhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5 +-WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMPU0VDT00gVHJ1c3QubmV0MScwJQYD +-VQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEwggEiMA0GCSqGSIb3 +-DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw8yl8 +-9f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJ +-DKaVv0uMDPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9 +-Ms+k2Y7CI9eNqPPYJayX5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/N +-QV3Is00qVUarH9oe4kA92819uZKAnDfdDJZkndwi92SL32HeFZRSFaB9UslLqCHJ +-xrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2JChzAgMBAAGjPzA9MB0G +-A1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYwDwYDVR0T +-AQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vG +-kl3g0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfr +-Uj94nK9NrvjVT8+amCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5 +-Bw+SUEmK3TGXX8npN6o7WWWXlDLJs58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJU +-JRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ6rBK+1YWc26sTfcioU+tHXot +-RSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAiFL39vmwLAw== +------END CERTIFICATE----- +- + # Issuer: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com + # Subject: CN=XRamp Global Certification Authority O=XRamp Security Services Inc OU=www.xrampsecurity.com + # Label: "XRamp Global CA Root" +-- +2.33.0 + -- Gitee