Migrate to openssl 1.1

Change-Id: Ie5b7c20fab22ba507f256f0adb5cfe5282e21f02

diff --git a/Makefile b/Makefile
index 4ddd3cf..33753a8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -517,7 +517,7 @@ IS_GIT_FOLDER = true
 endif
 
 ifeq ($(HAS_PKG_CONFIG),true)
-OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl
+OPENSSL_ALPN_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.0.2 openssl1.1
 ZLIB_CHECK_CMD = $(PKG_CONFIG) --exists zlib
 PROTOBUF_CHECK_CMD = $(PKG_CONFIG) --atleast-version=3.5.0 protobuf
 CARES_CHECK_CMD = $(PKG_CONFIG) --atleast-version=1.11.0 libcares
@@ -742,12 +742,12 @@ CPPFLAGS := -I$(EMBED_OPENSSL)/include $(CPPFLAGS)
 else # EMBED_OPENSSL=false
 ifeq ($(HAS_PKG_CONFIG),true)
 OPENSSL_PKG_CONFIG = true
-PC_REQUIRES_SECURE = openssl
-CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) $(CPPFLAGS)
-LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl)
+PC_REQUIRES_SECURE = openssl1.1
+CPPFLAGS := $(shell $(PKG_CONFIG) --cflags openssl1.1) $(CPPFLAGS)
+LDFLAGS_OPENSSL_PKG_CONFIG = $(shell $(PKG_CONFIG) --libs-only-L openssl1.1)
 ifeq ($(SYSTEM),Linux)
 ifneq ($(LDFLAGS_OPENSSL_PKG_CONFIG),)
-LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl | sed s/L/Wl,-rpath,/)
+LDFLAGS_OPENSSL_PKG_CONFIG += $(shell $(PKG_CONFIG) --libs-only-L openssl1.1 | sed s/L/Wl,-rpath,/)
 endif # LDFLAGS_OPENSSL_PKG_CONFIG=''
 endif # System=Linux
 LDFLAGS := $(LDFLAGS_OPENSSL_PKG_CONFIG) $(LDFLAGS)
@@ -763,7 +763,7 @@ endif # EMBED_OPENSSL
 endif # NO_SECURE
 
 ifeq ($(OPENSSL_PKG_CONFIG),true)
-LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl)
+LDLIBS_SECURE += $(shell $(PKG_CONFIG) --libs-only-l openssl1.1)
 else
 LDLIBS_SECURE += $(addprefix -l, $(LIBS_SECURE))
 endif

diff --git a/packaging/grpc.spec b/packaging/grpc.spec
index b138879..06bcdde 100644 (file)
--- a/packaging/grpc.spec
+++ b/packaging/grpc.spec
@@ -36,7 +36,7 @@ BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(libcares)
-BuildRequires:  pkgconfig(openssl) >= 1.0.1
+BuildRequires:  pkgconfig(openssl1.1) >= 1.0.1
 BuildRequires:  pkgconfig(protobuf) >= 3.5
 BuildRequires:  pkgconfig(zlib)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build