From 0626bc5982ab587070529c176966e10f1485d065 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 10 Dec 2018 14:27:55 +0800 Subject: [PATCH 1/2] Use openssl in docker --- trunk/auto/depends.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index f6c90f28d..07716b7f6 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -627,6 +627,12 @@ OPENSSL_HOTFIX="-DOPENSSL_NO_HEARTBEATS" # Affected users should upgrade to OpenSSL 1.1.0e. Users unable to immediately # upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS. if [ $SRS_SSL = YES ]; then + if [[ -f /usr/local/lib64/libssl.a && ! -f ${SRS_OBJS}/openssl/lib/libssl.a ]]; then + (mkdir -p ${SRS_OBJS}/openssl/lib && cd ${SRS_OBJS}/openssl/lib && + ln -sf /usr/local/lib64/libssl.a && ln -sf /usr/local/lib64/libcrypto.a) + (mkdir -p ${SRS_OBJS}/openssl/include && cd ${SRS_OBJS}/openssl/include && + ln -sf /usr/local/include/openssl) + fi if [ $SRS_USE_SYS_SSL = YES ]; then echo "Warning: Use system libssl, without compiling openssl." else From 59d8bb532b1d9d43031db52f46c8fe4ce50df1df Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 16 Dec 2018 23:54:44 +0800 Subject: [PATCH 2/2] Add git --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 82195ea55..c6b144119 100755 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ [Skype](https://github.com/ossrs/srs/wiki/v1_EN_Contact#skype-or-gitter) SRS/3.0, [OuXuli][release3]
-SRS是大娱乐直播领域广泛应用的野鸡服务器,志存高远不限于色情行业。
-SRS's a simplest, conceptual integrated, industrial-strength live streaming origin cluster. +SRS是一个简单的流媒体直播集群。
+SRS is a simple live streaming cluster. Download binaries from github.io: [Centos6-x86_64][centos0], [more...][more0]
Download binaries from ossrs.net: [Centos6-x86_64][centos1], [more...][more1]