From 26fa405a9feed188baad92746784bcbdb856b687 Mon Sep 17 00:00:00 2001 From: njzlisme <5625881+z00377906@user.noreply.gitee.com> Date: Sat, 11 Jan 2020 16:30:11 +0800 Subject: [PATCH 1/3] Initialize subversion repository --- README.md | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..53e33f0 --- /dev/null +++ b/README.md @@ -0,0 +1,39 @@ +# grpc + +#### 介绍 +{**以下是码云平台说明，您可以替换此简介** +码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 +无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} + +#### 软件架构 +软件架构说明 + + +#### 安装教程 + +1. xxxx +2. xxxx +3. xxxx + +#### 使用说明 + +1. xxxx +2. xxxx +3. xxxx + +#### 参与贡献 + +1. Fork 本仓库 +2. 新建 Feat_xxx 分支 +3. 提交代码 +4. 新建 Pull Request + + +#### 码云特技 + +1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md +2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) +3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 +4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 +5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) +6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) -- Gitee From 4a90dc2859915cea5663a30943b64e3e0300cce7 Mon Sep 17 00:00:00 2001 From: zhanglu Date: Sat, 11 Jan 2020 16:45:03 +0800 Subject: [PATCH 2/3] Delete unused patch --- 0001-enforce-system-crypto-policies.patch | 41 ----------------------- grpc.spec | 6 ++-- 2 files changed, 4 insertions(+), 43 deletions(-) delete mode 100644 0001-enforce-system-crypto-policies.patch diff --git a/0001-enforce-system-crypto-policies.patch b/0001-enforce-system-crypto-policies.patch deleted file mode 100644 index a5b9795..0000000 --- a/0001-enforce-system-crypto-policies.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7bf606ebe95c0eb0d9d7d55614b22ea6288d0598 Mon Sep 17 00:00:00 2001 -From: Sergey Avseyev -Date: Sat, 21 Dec 2019 18:52:54 +0800 -Subject: [PATCH] enforce system crypto policies - ---- - test/core/handshake/client_ssl.cc | 3 +-- - test/core/handshake/server_ssl_common.cc | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/test/core/handshake/client_ssl.cc b/test/core/handshake/client_ssl.cc -index 467df6e..b31934e 100644 ---- a/test/core/handshake/client_ssl.cc -+++ b/test/core/handshake/client_ssl.cc -@@ -161,8 +161,7 @@ static void server_thread(void* arg) { - // Set the cipher list to match the one expressed in - // src/core/tsi/ssl_transport_security.c. - const char* cipher_list = -- "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-" -- "SHA384:ECDHE-RSA-AES256-GCM-SHA384"; -+ "PROFILE=SYSTEM"; - if (!SSL_CTX_set_cipher_list(ctx, cipher_list)) { - ERR_print_errors_fp(stderr); - gpr_log(GPR_ERROR, "Couldn't set server cipher list."); -diff --git a/test/core/handshake/server_ssl_common.cc b/test/core/handshake/server_ssl_common.cc -index 41b2829..8b21ea7 100644 ---- a/test/core/handshake/server_ssl_common.cc -+++ b/test/core/handshake/server_ssl_common.cc -@@ -167,8 +167,7 @@ bool server_ssl_test(const char* alpn_list[], unsigned int alpn_list_len, - // Set the cipher list to match the one expressed in - // src/core/tsi/ssl_transport_security.c. - const char* cipher_list = -- "ECDHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-RSA-AES256-" -- "SHA384:ECDHE-RSA-AES256-GCM-SHA384"; -+ "PROFILE=SYSTEM"; - if (!SSL_CTX_set_cipher_list(ctx, cipher_list)) { - ERR_print_errors_fp(stderr); - gpr_log(GPR_ERROR, "Couldn't set server cipher list."); --- -2.19.1 - diff --git a/grpc.spec b/grpc.spec index 9a244bc..1c274ec 100644 --- a/grpc.spec +++ b/grpc.spec @@ -1,6 +1,6 @@ Name: grpc Version: 1.22.0 -Release: 1 +Release: 2 Summary: A modern, open source high performance RPC framework that can run in any environment License: ASL 2.0 URL: https://www.grpc.io @@ -9,7 +9,6 @@ Source0: https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{versio Patch9000: 0001-cxx-Arg-List-Too-Long.patch Patch9001: 0002-add-secure-compile-option-in-Makefile.patch -Patch0001: 0001-enforce-system-crypto-policies.patch Patch0002: 0002-patch-from-15532.patch BuildRequires: gcc-c++ pkgconfig protobuf-devel protobuf-compiler @@ -94,5 +93,8 @@ make install-grpc-cli prefix="%{buildroot}%{_prefix}" %{python3_sitearch}/grpcio-%{version}-py?.?.egg-info %changelog +* Sat Jan 11 2020 openEuler Buildteam - 1.22.0-2 +- Delete unused patch + * Sat Dec 21 2019 openEuler Buildteam - 1.22.0-1 - Package init -- Gitee From ab6ce780c8761a0ffc89f579b34a42553c53aaa2 Mon Sep 17 00:00:00 2001 From: zhanglu Date: Sat, 11 Jan 2020 16:48:27 +0800 Subject: [PATCH 3/3] Delete unused patch --- README.md | 39 --------------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 README.md diff --git a/README.md b/README.md deleted file mode 100644 index 53e33f0..0000000 --- a/README.md +++ /dev/null @@ -1,39 +0,0 @@ -# grpc - -#### 介绍 -{**以下是码云平台说明，您可以替换此简介** -码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台 -无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)} - -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 码云特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目 -5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) -- Gitee