浏览代码

working on 4.4.5.4

Oleg Moskalenko 10 年之前
父节点
当前提交
e2c5911fe4

+ 4 - 0
ChangeLog

@@ -1,3 +1,7 @@
+7/18/2015 Oleg Moskalenko <[email protected]>
+Version 4.4.5.4 'Ardee West':
+	- moved to github.
+
 6/20/2015 Oleg Moskalenko <[email protected]>
 6/20/2015 Oleg Moskalenko <[email protected]>
 Version 4.4.5.3 'Ardee West':
 Version 4.4.5.3 'Ardee West':
 	- third-party authorization STUN attributes adjusted according
 	- third-party authorization STUN attributes adjusted according

+ 2 - 2
INSTALL

@@ -1112,11 +1112,11 @@ XX. Performance tuning
 
 
 This topic is covered in the wiki page:
 This topic is covered in the wiki page:
 
 
-http://code.google.com/p/coturn/wiki/turn_performance_and_load_balance
+https://github.com/coturn/coturn/wiki/TURN-Performance-and-Load-Balance
 
 
 XXI. TURN Server setup
 XXI. TURN Server setup
 
 
-Read the project wiki pages: http://code.google.com/p/coturn/w/list
+Read the project wiki pages: https://github.com/coturn/coturn/wiki
 
 
 Also, check the project from page links to the TURN/WebRTC configuration examples.
 Also, check the project from page links to the TURN/WebRTC configuration examples.
 It may give you an idea how it can be done.
 It may give you an idea how it can be done.

+ 1 - 1
NOTE

@@ -1,2 +1,2 @@
-This project is active in Google code: http://code.google.com/p/coturn/
+This project is active in Github: https://github.com/coturn/coturn/
 
 

+ 2 - 2
README.turnadmin

@@ -213,11 +213,11 @@ to see the man page.
 
 
 	project page:
 	project page:
 
 
-	http://code.google.com/p/coturn/
+	https://github.com/coturn/coturn/
 
 
 	Wiki page:
 	Wiki page:
 
 
-	http://code.google.com/p/coturn/wiki/Readme
+	https://github.com/coturn/coturn/wiki
 
 
 	forum:
 	forum:
 
 

+ 4 - 4
README.turnserver

@@ -540,7 +540,7 @@ LOAD BALANCE AND PERFORMANCE TUNING
 
 
 This topic is covered in the wiki page:
 This topic is covered in the wiki page:
 
 
-http://code.google.com/p/coturn/wiki/turn_performance_and_load_balance
+https://github.com/coturn/coturn/wiki/turn_performance_and_load_balance
 	 
 	 
 ===================================
 ===================================
 
 
@@ -638,7 +638,7 @@ knowledge of the shared secret, a new temporary password cannot be generated.
 
 
 This is all formally described in Justin's Uberti TURN REST API document
 This is all formally described in Justin's Uberti TURN REST API document
 that can be obtained following the link "TURN REST API" in the TURN Server
 that can be obtained following the link "TURN REST API" in the TURN Server
-project's page http://code.google.com/p/coturn/.
+project's page https://github.com/coturn/coturn/.
 
 
 Once the temporary username and password are obtained by the client (browser)
 Once the temporary username and password are obtained by the client (browser)
 application, then the rest is just 'classic" long-term credentials mechanism.
 application, then the rest is just 'classic" long-term credentials mechanism.
@@ -911,11 +911,11 @@ SEE ALSO
 
 
 project page:
 project page:
 
 
-http://code.google.com/p/coturn/
+https://github.com/coturn/coturn/
 
 
 Wiki page:
 Wiki page:
 
 
-http://code.google.com/p/coturn/wiki/Readme
+https://github.com/coturn/coturn/wiki
 
 
 forum:
 forum:
 
 

+ 2 - 2
README.turnutils

@@ -293,11 +293,11 @@ SEE ALSO
 
 
 	project page:
 	project page:
 
 
-	http://code.google.com/p/coturn/
+	https://github.com/coturn/coturn/
 
 
 	Wiki page:
 	Wiki page:
 
 
-	http://code.google.com/p/coturn/wiki/Readme
+	https://github.com/coturn/coturn/wiki
 
 
 	forum:
 	forum:
 
 

+ 1 - 1
examples/etc/turnserver.conf

@@ -183,7 +183,7 @@
 # This feature can be used with the long-term authentication mechanism, only.
 # This feature can be used with the long-term authentication mechanism, only.
 # This feature purpose is to support "TURN Server REST API", see
 # This feature purpose is to support "TURN Server REST API", see
 # "TURN REST API" link in the project's page 
 # "TURN REST API" link in the project's page 
-# http://code.google.com/p/coturn/.
+# https://github.com/coturn/coturn/
 #
 #
 # This option is used with timestamp:
 # This option is used with timestamp:
 # 
 # 

+ 2 - 2
rpm/CentOS6.pre.build.sh

@@ -12,7 +12,7 @@ LIBEVENT_MAJOR_VERSION=2
 LIBEVENT_VERSION=${LIBEVENT_MAJOR_VERSION}.0.21
 LIBEVENT_VERSION=${LIBEVENT_MAJOR_VERSION}.0.21
 LIBEVENT_DISTRO=libevent-${LIBEVENT_VERSION}-stable.tar.gz
 LIBEVENT_DISTRO=libevent-${LIBEVENT_VERSION}-stable.tar.gz
 LIBEVENT_SPEC_DIR=libevent.rpm
 LIBEVENT_SPEC_DIR=libevent.rpm
-LIBEVENTSPEC_SVN_URL=${TURNSERVER_SVN_URL}/${LIBEVENT_SPEC_DIR}
+LIBEVENT_SPEC_GIT_URL=${TURNSERVER_GIT_URL}/${LIBEVENT_SPEC_DIR}
 LIBEVENT_SPEC_FILE=libevent.spec
 LIBEVENT_SPEC_FILE=libevent.spec
 
 
 # Common packs
 # Common packs
@@ -31,7 +31,7 @@ fi
 if ! [ -f ${BUILDDIR}/SPECS/${LIBEVENT_SPEC_FILE} ] ; then 
 if ! [ -f ${BUILDDIR}/SPECS/${LIBEVENT_SPEC_FILE} ] ; then 
     cd ${BUILDDIR}/tmp
     cd ${BUILDDIR}/tmp
     rm -rf ${LIBEVENT_SPEC_DIR}
     rm -rf ${LIBEVENT_SPEC_DIR}
-    svn export ${LIBEVENTSPEC_SVN_URL} ${LIBEVENT_SPEC_DIR}
+    git clone ${LIBEVENT_SPEC_GIT_URL} ${LIBEVENT_SPEC_DIR}
     ER=$?
     ER=$?
     if ! [ ${ER} -eq 0 ] ; then
     if ! [ ${ER} -eq 0 ] ; then
 	cd ${CPWD}
 	cd ${CPWD}

+ 1 - 1
rpm/build.instructions.txt

@@ -26,7 +26,7 @@ To build the TURN server:
        	mysql-devel (or mariadb-devel), postgresql-devel, hiredis-devel
        	mysql-devel (or mariadb-devel), postgresql-devel, hiredis-devel
     4) $ mkdir ~/rpmbuild
     4) $ mkdir ~/rpmbuild
     5) $ mkdir ~/rpmbuild/SOURCES
     5) $ mkdir ~/rpmbuild/SOURCES
-    6) Export the TURN server from SVN, "svn export http://coturn.googlecode.com/svn/trunk/ turnserver-2.6.7.0"
+    6) Export the TURN server from Github, "git clone [email protected]:coturn/coturn.git"
     7) Create a tarball, "tar zcf ~/rpmbuild/SOURCES/turnserver-2.6.7.0.tar.gz turnserver-2.6.7.0"
     7) Create a tarball, "tar zcf ~/rpmbuild/SOURCES/turnserver-2.6.7.0.tar.gz turnserver-2.6.7.0"
     8) Build the RPMs, "rpmbuild -ta ~/rpmbuild/SOURCES/turnserver-2.6.7.0.tar.gz"
     8) Build the RPMs, "rpmbuild -ta ~/rpmbuild/SOURCES/turnserver-2.6.7.0.tar.gz"
 
 

+ 2 - 3
rpm/build.settings.sh

@@ -2,11 +2,10 @@
 
 
 # Common settings script.
 # Common settings script.
 
 
-TURNVERSION=4.4.5.3
+TURNVERSION=4.4.5.4
 BUILDDIR=~/rpmbuild
 BUILDDIR=~/rpmbuild
 ARCH=`uname -p`
 ARCH=`uname -p`
-TURNSERVER_SVN_URL=http://coturn.googlecode.com/svn
-TURNSERVER_SVN_URL_VER=trunk
[email protected]:coturn/coturn.git
 
 
 WGETOPTIONS="--no-check-certificate"
 WGETOPTIONS="--no-check-certificate"
 RPMOPTIONS="-ivh --force"
 RPMOPTIONS="-ivh --force"

+ 1 - 1
rpm/build.sh

@@ -20,7 +20,7 @@ fi
 
 
 cd ${BUILDDIR}/tmp
 cd ${BUILDDIR}/tmp
 rm -rf turnserver-${TURNVERSION}
 rm -rf turnserver-${TURNVERSION}
-svn export ${TURNSERVER_SVN_URL}/${TURNSERVER_SVN_URL_VER}/ turnserver-${TURNVERSION}
+git clone ${TURNSERVER_GIT_URL} turnserver-${TURNVERSION}
 ER=$?
 ER=$?
 if ! [ ${ER} -eq 0 ] ; then
 if ! [ ${ER} -eq 0 ] ; then
     cd ${CPWD}
     cd ${CPWD}

+ 1 - 1
rpm/common.pre.build.sh

@@ -16,7 +16,7 @@ mkdir -p ${BUILDDIR}/tmp
 
 
 # Common packs
 # Common packs
 
 
-PACKS="make gcc redhat-rpm-config rpm-build doxygen openssl-devel svn"
+PACKS="make gcc redhat-rpm-config rpm-build doxygen openssl-devel git"
 sudo yum -y install ${PACKS}
 sudo yum -y install ${PACKS}
 ER=$?
 ER=$?
 if ! [ ${ER} -eq 0 ] ; then
 if ! [ ${ER} -eq 0 ] ; then

+ 3 - 1
rpm/turnserver.spec

@@ -1,5 +1,5 @@
 Name:		turnserver
 Name:		turnserver
-Version:	4.4.5.3
+Version:	4.4.5.4
 Release:	0%{dist}
 Release:	0%{dist}
 Summary:	Coturn TURN Server
 Summary:	Coturn TURN Server
 
 
@@ -289,6 +289,8 @@ fi
 %{_includedir}/turn/client/TurnMsgLib.h
 %{_includedir}/turn/client/TurnMsgLib.h
 
 
 %changelog
 %changelog
+* Sat Jul 18 2015 Oleg Moskalenko <[email protected]>
+  - Sync to 4.4.5.4
 * Sat Jun 20 2015 Oleg Moskalenko <[email protected]>
 * Sat Jun 20 2015 Oleg Moskalenko <[email protected]>
   - Sync to 4.4.5.3
   - Sync to 4.4.5.3
 * Wed May 29 2015 Oleg Moskalenko <[email protected]>
 * Wed May 29 2015 Oleg Moskalenko <[email protected]>

+ 1 - 1
src/apps/relay/mainrelay.c

@@ -588,7 +588,7 @@ static char Usage[] = "Usage: turnserver [options]\n"
 "\n"
 "\n"
 " For more information, see the wiki pages:\n"
 " For more information, see the wiki pages:\n"
 "\n"
 "\n"
-"	http://code.google.com/p/coturn/w/list\n"
+"	https://github.com/coturn/coturn/wiki/\n"
 "\n";
 "\n";
 
 
 static char AdminUsage[] = "Usage: turnadmin [command] [options]\n"
 static char AdminUsage[] = "Usage: turnadmin [command] [options]\n"

+ 1 - 1
src/ns_turn_defs.h

@@ -31,7 +31,7 @@
 #ifndef __IOADEFS__
 #ifndef __IOADEFS__
 #define __IOADEFS__
 #define __IOADEFS__
 
 
-#define TURN_SERVER_VERSION "4.4.5.3"
+#define TURN_SERVER_VERSION "4.4.5.4"
 #define TURN_SERVER_VERSION_NAME "Ardee West"
 #define TURN_SERVER_VERSION_NAME "Ardee West"
 #define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"
 #define TURN_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"