From 1c943f27c963f7dfd33f1c676ae78f9dbd17a0a1 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 29 Nov 2019 18:26:40 +0800
Subject: [PATCH 1/3] Release 2.0.265, r2.0-r7

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

diff --git a/README.md b/README.md
index 67031972d..de8a5aedc 100755
--- a/README.md
+++ b/README.md
@@ -294,6 +294,7 @@ Remark:
 
 ## Releases
 
+* 2018-11-29, [Release v2.0-r7][r2.0r7], 2.0 release6, 2.0.265, 86994 lines.
 * 2018-10-28, [Release v2.0-r6][r2.0r6], 2.0 release6, 2.0.263, 86994 lines.
 * 2018-10-28, [Release v2.0-r5][r2.0r5], 2.0 release5, 2.0.258, 86916 lines.
 * 2018-08-12, [Release v2.0-r4][r2.0r4], 2.0 release4, 2.0.255, 86915 lines.
@@ -336,6 +337,8 @@ Remark:
 
 ## History
 
+* <strong>v2.0, 2019-11-29, [2.0 release6(2.0.265)][r2.0r7] released. 86994 lines.</strong>
+* v2.0, 2019-11-29, For [srs-docker](https://github.com/ossrs/srs-docker/tree/master/2.0), install Cherrypy without sudo. 2.0.265
 * v2.0, 2019-04-06, For [#1304][bug #1304], Default HSTRS to on. 2.0.264
 * <strong>v2.0, 2019-04-05, [2.0 release6(2.0.263)][r2.0r6] released. 86994 lines.</strong>
 * v2.0, 2019-04-05, Merge [#1312][bug #1312], Fix GCC7 build error, this statement may fall through. 2.0.263
@@ -1354,6 +1357,7 @@ Winlin
 
 [exo #828]: https://github.com/google/ExoPlayer/pull/828
 
+[r2.0r7]: https://github.com/ossrs/srs/releases/tag/v2.0-r7
 [r2.0r6]: https://github.com/ossrs/srs/releases/tag/v2.0-r6
 [r2.0r5]: https://github.com/ossrs/srs/releases/tag/v2.0-r5
 [r2.0r4]: https://github.com/ossrs/srs/releases/tag/v2.0-r4
diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh
index a7fc91655..a4c682277 100755
--- a/trunk/auto/depends.sh
+++ b/trunk/auto/depends.sh
@@ -573,12 +573,11 @@ if [ $SRS_HTTP_CALLBACK = YES ]; then
     if [[ -f ${SRS_OBJS}/CherryPy-3.2.4/setup.py ]]; then
         echo "CherryPy-3.2.4 is ok.";
     else
-        require_sudoer "install CherryPy-3.2.4"
-        echo "install CherryPy-3.2.4"; 
+        echo "install CherryPy-3.2.4";
         (
-            sudo rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS} && 
+            rm -rf ${SRS_OBJS}/CherryPy-3.2.4 && cd ${SRS_OBJS} &&
             unzip -q ../3rdparty/CherryPy-3.2.4.zip && cd CherryPy-3.2.4 && 
-            sudo python setup.py install
+            python setup.py install --user
         )
     fi
     # check status
diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp
index cd2470f27..75de8d4c6 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    264
+#define VERSION_REVISION    265
 
 // generated by configure, only macros.
 #include <srs_auto_headers.hpp>

From a5b01fc6be16b048f4e842c106916ab647009499 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 29 Nov 2019 18:27:59 +0800
Subject: [PATCH 2/3] Release r2.0-r7

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index de8a5aedc..6f11696b9 100755
--- a/README.md
+++ b/README.md
@@ -294,7 +294,7 @@ Remark:
 
 ## Releases
 
-* 2018-11-29, [Release v2.0-r7][r2.0r7], 2.0 release6, 2.0.265, 86994 lines.
+* 2018-11-29, [Release v2.0-r7][r2.0r7], 2.0 release7, 2.0.265, 86994 lines.
 * 2018-10-28, [Release v2.0-r6][r2.0r6], 2.0 release6, 2.0.263, 86994 lines.
 * 2018-10-28, [Release v2.0-r5][r2.0r5], 2.0 release5, 2.0.258, 86916 lines.
 * 2018-08-12, [Release v2.0-r4][r2.0r4], 2.0 release4, 2.0.255, 86915 lines.

From d695cd958fede367f241ce79eb9824b4664e1882 Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Fri, 29 Nov 2019 18:28:19 +0800
Subject: [PATCH 3/3] Release r2.0-r7

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6f11696b9..650895a69 100755
--- a/README.md
+++ b/README.md
@@ -337,7 +337,7 @@ Remark:
 
 ## History
 
-* <strong>v2.0, 2019-11-29, [2.0 release6(2.0.265)][r2.0r7] released. 86994 lines.</strong>
+* <strong>v2.0, 2019-11-29, [2.0 release7(2.0.265)][r2.0r7] released. 86994 lines.</strong>
 * v2.0, 2019-11-29, For [srs-docker](https://github.com/ossrs/srs-docker/tree/master/2.0), install Cherrypy without sudo. 2.0.265
 * v2.0, 2019-04-06, For [#1304][bug #1304], Default HSTRS to on. 2.0.264
 * <strong>v2.0, 2019-04-05, [2.0 release6(2.0.263)][r2.0r6] released. 86994 lines.</strong>