diff --git a/add-secure-compile-option-in-Makefile.patch b/add-secure-compile-option-in-Makefile.patch index 4705fdac7d5779b7163dbf4cfb43eea8e1dd45c0..4926838e543bfad82be174bfb74919cf49ebebb4 100644 --- a/add-secure-compile-option-in-Makefile.patch +++ b/add-secure-compile-option-in-Makefile.patch @@ -8,9 +8,9 @@ diff -urN grpc/CMakeLists.txt grpc_new/CMakeLists.txt endif() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_gRPC_C_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_gRPC_C_CXX_FLAGS}") -+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,now -fPIE -fPIC") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,now -fstack-protector-strong") -+set(_gRPC_ALLTARGETS_LIBRARYIES "${_gRPC_ALLTARGETS_LIBRARYIES} -Wl,-z,now -pie") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-z,relro -Wl,-z,now -fPIE -fPIC -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2 -O2") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-z,relro -Wl,-z,now -fPIE -fPIC -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2 -O2") ++set(_gRPC_ALLTARGETS_LIBRARYIES "${_gRPC_ALLTARGETS_LIBRARYIES} -Wl,-z,relro -Wl,-z,now -pie") if(gRPC_USE_PROTO_LITE) set(_gRPC_PROTOBUF_LIBRARY_NAME "libprotobuf-lite") @@ -23,9 +23,9 @@ index 6ede6e34d2..d6190ecde4 100644 DEFINES += $(EXTRA_DEFINES) LDLIBS += $(EXTRA_LDLIBS) -+CFLAGS += -Wl,-z,now -fPIE -fPIC -+CPPFLAGS += -Wl,-z,now -fstack-protector-strong -+LDFLAGS += -Wl,-z,now -pie ++CFLAGS += -Wl,-z,relro -Wl,-z,now -fPIE -fPIC -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2 -O2 ++CPPFLAGS += -Wl,-z,relro -Wl,-z,now -fPIE -fPIC -fstack-protector-strong -Wp,-D_FORTIFY_SOURCE=2 -O2 ++LDFLAGS += -Wl,-z,relro -Wl,-z,now -pie + HOST_CPPFLAGS += $(CPPFLAGS) HOST_CFLAGS += $(CFLAGS) diff --git a/grpc.spec b/grpc.spec index ba0f54a22e3336675a3e3cbeb694a886081cc010..53bcaddcfb5aee6838691c21586e582c66fc1ef8 100644 --- a/grpc.spec +++ b/grpc.spec @@ -1,6 +1,6 @@ Name: grpc Version: 1.31.0 -Release: 6 +Release: 7 Summary: A modern, open source high performance RPC framework that can run in any environment License: ASL 2.0 URL: https://www.grpc.io @@ -77,7 +77,8 @@ cmake ../../ -DgRPC_INSTALL=ON\ -DgRPC_INSTALL_SHAREDIR=%{buildroot}%{_datadir}/%{name} \ -DgRPC_INSTALL_PKGCONFIGDIR=%{buildroot}%{_libdir}/pkgconfig \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DBUILD_SHARED_LIBS=ON + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_VERBOSE_MAKEFILE=ON make -j24 V=1 # build python module @@ -126,6 +127,12 @@ cd ../.. %{python3_sitearch}/grpcio-%{version}-py?.?.egg-info %changelog +* Thu Oct 20 2022 zhouyihang - 1.31.0-7 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:add some secure compilation options + * Tue Oct 11 2022 gaihuiying - 1.31.0-6 - Type:bugfix - ID:NA