From d8a64aaab50cc0aca253e5f2d57ee567583444f2 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Mon, 21 Sep 2015 12:01:48 +0800
Subject: [PATCH] fix #484, hotfix the openssl build script 2.0.190

---
 README.md                   | 1 +
 trunk/auto/depends.sh       | 7 ++++---
 trunk/src/core/srs_core.hpp | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 114c33abd..bd9310f16 100755
--- a/README.md
+++ b/README.md
@@ -344,6 +344,7 @@ Remark:
 
 ## History
 
+* v2.0, 2015-09-21, fix [#484][bug #484] hotfix the openssl build script 2.0.190
 * <strong>v2.0, 2015-09-14, [2.0 alpha1(2.0.189)][r2.0a1] released. 89269 lines.</strong>
 * v2.0, 2015-09-14, fix [#474][bug #474] config to donot parse width/height from sps. 2.0.189
 * v2.0, 2015-09-14, for [#474][bug #474] always release publish for source.
diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
index 7b7356e7e..f1666caf6 100644
--- a/trunk/auto/depends.sh
+++ b/trunk/auto/depends.sh
@@ -601,7 +601,8 @@ fi
 if [ $SRS_OSX = YES ]; then
     CONFIGURE_TOOL="./Configure darwin64-`uname -m`-cc"
 fi
-# @see http://www.openssl.org/news/secadv_20140407.txt
+OPENSSL_HOTFIX="-DOPENSSL_NO_HEARTBEATS"
+# @see http://www.openssl.org/news/secadv/20140407.txt
 # Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately
 # upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS.
 if [ $SRS_SSL = YES ]; then
@@ -618,7 +619,7 @@ if [ $SRS_SSL = YES ]; then
                 (
                     rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 
                     unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 
-                    $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared no-asm &&
+                    $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared no-asm $OPENSSL_HOTFIX &&
                     make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \
                         LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} && 
                     make install_sw &&
@@ -635,7 +636,7 @@ if [ $SRS_SSL = YES ]; then
                 (
                     rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 
                     unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 
-                    $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared &&
+                    $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared $OPENSSL_HOTFIX &&
                     make && make install_sw &&
                     cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl &&
                     cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index ebe87801d..9fe6665fe 100644
--- a/trunk/src/core/srs_core.hpp
+++ b/trunk/src/core/srs_core.hpp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 #define VERSION_MAJOR       2
 #define VERSION_MINOR       0
-#define VERSION_REVISION    189
+#define VERSION_REVISION    190
 
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"