胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
e4e36a01 2 parents b471c6e6 d8a64aaa

merge from srs2, fix openssl build

内嵌 并排对比
正在显示 2 个修改的文件 包含 5 行增加 和 3 行删除
@@ -352,6 +352,7 @@ Remark: @@ -352,6 +352,7 @@ Remark:
352 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost. 352 * v3.0, 2015-08-31, fix [#319][bug #319], http raw api support query global and vhost.
353 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2 353 * v3.0, 2015-08-28, fix [#471][bug #471], api response the width and height. 3.0.2
354 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1 354 * v3.0, 2015-08-25, fix [#367][bug #367], support nginx-rtmp exec. 3.0.1
  355 +* <strong>v2.0, 2015-09-14, [2.0 alpha1(2.0.189)][r2.0a1] released. 89269 lines.</strong>
355 * <strong>v2.0, 2015-08-23, [2.0 alpha0(2.0.185)][r2.0a0] released. 89022 lines.</strong> 356 * <strong>v2.0, 2015-08-23, [2.0 alpha0(2.0.185)][r2.0a0] released. 89022 lines.</strong>
356 * v2.0, 2015-08-22, HTTP API support JSONP by specifies the query string callback=xxx. 357 * v2.0, 2015-08-22, HTTP API support JSONP by specifies the query string callback=xxx.
357 * v2.0, 2015-08-20, fix [#380][bug #380], srs-librtmp send sequence header when sps or pps changed. 358 * v2.0, 2015-08-20, fix [#380][bug #380], srs-librtmp send sequence header when sps or pps changed.
@@ -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