winlin

fix #484, hotfix the openssl build script 2.0.190

@@ -344,6 +344,7 @@ Remark: @@ -344,6 +344,7 @@ Remark:
344 344
345 ## History 345 ## History
346 346
  347 +* v2.0, 2015-09-21, fix [#484][bug #484] hotfix the openssl build script 2.0.190
347 * <strong>v2.0, 2015-09-14, [2.0 alpha1(2.0.189)][r2.0a1] released. 89269 lines.</strong> 348 * <strong>v2.0, 2015-09-14, [2.0 alpha1(2.0.189)][r2.0a1] released. 89269 lines.</strong>
348 * v2.0, 2015-09-14, fix [#474][bug #474] config to donot parse width/height from sps. 2.0.189 349 * v2.0, 2015-09-14, fix [#474][bug #474] config to donot parse width/height from sps. 2.0.189
349 * v2.0, 2015-09-14, for [#474][bug #474] always release publish for source. 350 * v2.0, 2015-09-14, for [#474][bug #474] always release publish for source.
@@ -601,7 +601,8 @@ fi @@ -601,7 +601,8 @@ fi
601 if [ $SRS_OSX = YES ]; then 601 if [ $SRS_OSX = YES ]; then
602 CONFIGURE_TOOL="./Configure darwin64-`uname -m`-cc" 602 CONFIGURE_TOOL="./Configure darwin64-`uname -m`-cc"
603 fi 603 fi
604 -# @see http://www.openssl.org/news/secadv_20140407.txt 604 +OPENSSL_HOTFIX="-DOPENSSL_NO_HEARTBEATS"
  605 +# @see http://www.openssl.org/news/secadv/20140407.txt
605 # Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately 606 # Affected users should upgrade to OpenSSL 1.0.1g. Users unable to immediately
606 # upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS. 607 # upgrade can alternatively recompile OpenSSL with -DOPENSSL_NO_HEARTBEATS.
607 if [ $SRS_SSL = YES ]; then 608 if [ $SRS_SSL = YES ]; then
@@ -618,7 +619,7 @@ if [ $SRS_SSL = YES ]; then @@ -618,7 +619,7 @@ if [ $SRS_SSL = YES ]; then
618 ( 619 (
619 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 620 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
620 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 621 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
621 - $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared no-asm && 622 + $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared no-asm $OPENSSL_HOTFIX &&
622 make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \ 623 make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" \
623 LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} && 624 LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} &&
624 make install_sw && 625 make install_sw &&
@@ -635,7 +636,7 @@ if [ $SRS_SSL = YES ]; then @@ -635,7 +636,7 @@ if [ $SRS_SSL = YES ]; then
635 ( 636 (
636 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 637 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
637 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 638 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
638 - $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared && 639 + $CONFIGURE_TOOL --prefix=`pwd`/_release -no-shared $OPENSSL_HOTFIX &&
639 make && make install_sw && 640 make && make install_sw &&
640 cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl && 641 cd .. && rm -rf openssl && ln -sf openssl-1.0.1f/_release openssl &&
641 cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp 642 cd .. && rm -f ${SRS_OBJS}/_flag.ssl.arm.tmp
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 189 34 +#define VERSION_REVISION 190
35 35
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "SRS" 37 #define RTMP_SIG_SRS_KEY "SRS"