Merge pull request coturn#15 from coturn/4.4.5.4

mom040267 · mom040267 · commit 95a03463a02b · 2015-07-19T01:14:04.000-07:00
4.4.5.4
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+7/18/2015 Oleg Moskalenko <mom040267@gmail.com>
+Version 4.4.5.4 'Ardee West':
+	- moved to github.
+
 6/20/2015 Oleg Moskalenko <mom040267@gmail.com>
 Version 4.4.5.3 'Ardee West':
 	- third-party authorization STUN attributes adjusted according
diff --git a/INSTALL b/INSTALL
@@ -1112,11 +1112,11 @@ XX. Performance tuning
 
 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
 
-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.
 It may give you an idea how it can be done.
diff --git a/NOTE b/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/
 
diff --git a/README.turnadmin b/README.turnadmin
@@ -213,11 +213,11 @@ to see the man page.
 
 	project page:
 
-	http://code.google.com/p/coturn/
+	https://github.com/coturn/coturn/
 
 	Wiki page:
 
-	http://code.google.com/p/coturn/wiki/Readme
+	https://github.com/coturn/coturn/wiki
 
 	forum:
 
diff --git a/README.turnserver b/README.turnserver
@@ -540,7 +540,7 @@ LOAD BALANCE AND PERFORMANCE TUNING
 
 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
 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)
 application, then the rest is just 'classic" long-term credentials mechanism.
@@ -911,11 +911,11 @@ SEE ALSO
 
 project page:
 
-http://code.google.com/p/coturn/
+https://github.com/coturn/coturn/
 
 Wiki page:
 
-http://code.google.com/p/coturn/wiki/Readme
+https://github.com/coturn/coturn/wiki
 
 forum:
 
diff --git a/README.turnutils b/README.turnutils
@@ -293,11 +293,11 @@ SEE ALSO
 
 	project page:
 
-	http://code.google.com/p/coturn/
+	https://github.com/coturn/coturn/
 
 	Wiki page:
 
-	http://code.google.com/p/coturn/wiki/Readme
+	https://github.com/coturn/coturn/wiki
 
 	forum:
 
diff --git a/examples/etc/turnserver.conf b/examples/etc/turnserver.conf
@@ -183,7 +183,7 @@
 # This feature can be used with the long-term authentication mechanism, only.
 # This feature purpose is to support "TURN Server REST API", see
 # "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:
 # 
diff --git a/man/man1/turnadmin.1 b/man/man1/turnadmin.1
@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH TURN 1 "15 June 2015" "" ""
+.TH TURN 1 "19 July 2015" "" ""
 .SH GENERAL INFORMATION
 
 \fIturnadmin\fP is a TURN administration tool. This tool can be used to manage 
@@ -301,11 +301,11 @@ to see the man page.
 
 project page:
 .PP
-http://code.google.com/p/coturn/
+https://github.com/coturn/coturn/
 .PP
 Wiki page:
 .PP
-http://code.google.com/p/coturn/wiki/Readme
+https://github.com/coturn/coturn/wiki
 .PP
 forum:
 .PP
diff --git a/man/man1/turnserver.1 b/man/man1/turnserver.1
@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH TURN 1 "15 June 2015" "" ""
+.TH TURN 1 "19 July 2015" "" ""
 .SH GENERAL INFORMATION
 
 The \fBTURN Server\fP project contains the source code of a TURN server and TURN client 
@@ -771,7 +771,7 @@ Set network engine type for the process (for internal purposes).
 
 This topic is covered in the wiki page:
 .PP
-http://code.google.com/p/coturn/wiki/turn_performance_and_load_balance
+https://github.com/coturn/coturn/wiki/turn_performance_and_load_balance
 .PP
 ===================================
 .SH WEBRTC USAGE
@@ -872,7 +872,7 @@ knowledge of the shared secret, a new temporary password cannot be generated.
 .PP
 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 \fBTURN Server\fP
-project's page http://code.google.com/p/coturn/.
+project's page https://github.com/coturn/coturn/.
 .PP
 Once the temporary username and password are obtained by the client (browser)
 application, then the rest is just 'classic" long\-term credentials mechanism.
@@ -1155,11 +1155,11 @@ STUN NAT behavior discovery RFC 5780
 
 project page:
 .PP
-http://code.google.com/p/coturn/
+https://github.com/coturn/coturn/
 .PP
 Wiki page:
 .PP
-http://code.google.com/p/coturn/wiki/Readme
+https://github.com/coturn/coturn/wiki
 .PP
 forum:
 .PP
diff --git a/man/man1/turnutils.1 b/man/man1/turnutils.1
@@ -1,5 +1,5 @@
 .\" Text automatically generated by txt2man
-.TH TURN 1 "15 June 2015" "" ""
+.TH TURN 1 "19 July 2015" "" ""
 .SH GENERAL INFORMATION
 
 A set of turnutils_* programs provides some utility functionality to be used
@@ -411,11 +411,11 @@ STUN NAT behavior discovery RFC 5780
 
 project page:
 .PP
-http://code.google.com/p/coturn/
+https://github.com/coturn/coturn/
 .PP
 Wiki page:
 .PP
-http://code.google.com/p/coturn/wiki/Readme
+https://github.com/coturn/coturn/wiki
 .PP
 forum:
 .PP
diff --git a/rpm/CentOS6.pre.build.sh b/rpm/CentOS6.pre.build.sh
@@ -12,7 +12,7 @@ LIBEVENT_MAJOR_VERSION=2
 LIBEVENT_VERSION=${LIBEVENT_MAJOR_VERSION}.0.21
 LIBEVENT_DISTRO=libevent-${LIBEVENT_VERSION}-stable.tar.gz
 LIBEVENT_SPEC_DIR=libevent.rpm
-LIBEVENTSPEC_SVN_URL=${TURNSERVER_SVN_URL}/${LIBEVENT_SPEC_DIR}
+LIBEVENT_SPEC_GIT_URL=https://github.com/coturn/coturn/raw/libevent.rpm
 LIBEVENT_SPEC_FILE=libevent.spec
 
 # Common packs
@@ -31,12 +31,21 @@ fi
 if ! [ -f ${BUILDDIR}/SPECS/${LIBEVENT_SPEC_FILE} ] ; then 
     cd ${BUILDDIR}/tmp
     rm -rf ${LIBEVENT_SPEC_DIR}
-    svn export ${LIBEVENTSPEC_SVN_URL} ${LIBEVENT_SPEC_DIR}
+    mkdir ${LIBEVENT_SPEC_DIR}
+    cd ${LIBEVENT_SPEC_DIR}
+    wget ${WGETOPTIONS} ${LIBEVENT_SPEC_GIT_URL}/${LIBEVENT_SPEC_FILE}
     ER=$?
     if ! [ ${ER} -eq 0 ] ; then
 	cd ${CPWD}
 	exit -1
     fi
+    wget ${WGETOPTIONS} ${LIBEVENT_SPEC_GIT_URL}/${LIBEVENT_DISTRO}
+    ER=$?
+    if ! [ ${ER} -eq 0 ] ; then
+	cd ${CPWD}
+	exit -1
+    fi
+    cd ..
     
     if ! [ -f ${LIBEVENT_SPEC_DIR}/${LIBEVENT_SPEC_FILE} ] ; then
 	echo "ERROR: cannot download ${LIBEVENT_SPEC_FILE} file"
diff --git a/rpm/build.instructions.txt b/rpm/build.instructions.txt
@@ -26,7 +26,7 @@ To build the TURN server:
        	mysql-devel (or mariadb-devel), postgresql-devel, hiredis-devel
     4) $ mkdir ~/rpmbuild
     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 https://github.com/coturn/coturn.git"
     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"
 
diff --git a/rpm/build.settings.sh b/rpm/build.settings.sh
@@ -2,11 +2,10 @@
 
 # Common settings script.
 
-TURNVERSION=4.4.5.3
+TURNVERSION=4.4.5.4
 BUILDDIR=~/rpmbuild
 ARCH=`uname -p`
-TURNSERVER_SVN_URL=http://coturn.googlecode.com/svn
-TURNSERVER_SVN_URL_VER=trunk
+TURNSERVER_GIT_URL=https://github.com/coturn/coturn.git
 
 WGETOPTIONS="--no-check-certificate"
 RPMOPTIONS="-ivh --force"
diff --git a/rpm/build.sh b/rpm/build.sh
@@ -20,7 +20,7 @@ fi
 
 cd ${BUILDDIR}/tmp
 rm -rf turnserver-${TURNVERSION}
-svn export ${TURNSERVER_SVN_URL}/${TURNSERVER_SVN_URL_VER}/ turnserver-${TURNVERSION}
+git clone ${TURNSERVER_GIT_URL} --branch ${TURNVERSION} turnserver-${TURNVERSION}
 ER=$?
 if ! [ ${ER} -eq 0 ] ; then
     cd ${CPWD}
diff --git a/rpm/common.pre.build.sh b/rpm/common.pre.build.sh
@@ -16,7 +16,7 @@ mkdir -p ${BUILDDIR}/tmp
 
 # 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 wget"
 sudo yum -y install ${PACKS}
 ER=$?
 if ! [ ${ER} -eq 0 ] ; then
diff --git a/rpm/turnserver.spec b/rpm/turnserver.spec
@@ -1,11 +1,11 @@
 Name:		turnserver
-Version:	4.4.5.3
+Version:	4.4.5.4
 Release:	0%{dist}
 Summary:	Coturn TURN Server
 
 Group:		System Environment/Libraries
 License:	BSD
-URL:		https://code.google.com/p/coturn/ 
+URL:		https://github.com/coturn/coturn/ 
 Source0:	http://turnserver.open-sys.org/downloads/v%{version}/%{name}-%{version}.tar.gz
 
 BuildRequires:	gcc, make, redhat-rpm-config, sqlite-devel
@@ -289,6 +289,8 @@ fi
 %{_includedir}/turn/client/TurnMsgLib.h
 
 %changelog
+* Sat Jul 18 2015 Oleg Moskalenko <mom040267@gmail.com>
+  - Sync to 4.4.5.4
 * Sat Jun 20 2015 Oleg Moskalenko <mom040267@gmail.com>
   - Sync to 4.4.5.3
 * Wed May 29 2015 Oleg Moskalenko <mom040267@gmail.com>
diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c
@@ -588,7 +588,7 @@ static char Usage[] = "Usage: turnserver [options]\n"
 "\n"
 " For more information, see the wiki pages:\n"
 "\n"
-"	http://code.google.com/p/coturn/w/list\n"
+"	https://github.com/coturn/coturn/wiki/\n"
 "\n";
 
 static char AdminUsage[] = "Usage: turnadmin [command] [options]\n"
diff --git a/src/ns_turn_defs.h b/src/ns_turn_defs.h
@@ -31,7 +31,7 @@
 #ifndef __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_SOFTWARE "Coturn-" TURN_SERVER_VERSION " '" TURN_SERVER_VERSION_NAME "'"
 

-Original file line number
+Diff line change
@@ @@ -1,3 +1,7 @@ @@
 +7/18/2015 Oleg Moskalenko <[email protected]>
 +Version 4.4.5.4 'Ardee West':
 +	- moved to github.
++
 /20/2015 Oleg Moskalenko <[email protected]>
 Version 4.4.5.3 'Ardee West':
 	- third-party authorization STUN attributes adjusted according
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-This project is active in Google code: http://code.google.com/p/coturn/`
	`1`	`+This project is active in Github: https://github.com/coturn/coturn/`
`2`	`2`
Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@`
`183`	`183`	`# This feature can be used with the long-term authentication mechanism, only.`
`184`	`184`	`# This feature purpose is to support "TURN Server REST API", see`
`185`	`185`	`# "TURN REST API" link in the project's page`
`186`		`-# http://code.google.com/p/coturn/.`
	`186`	`+# https://github.com/coturn/coturn/`
`187`	`187`	`#`
`188`	`188`	`# This option is used with timestamp:`
`189`	`189`	`#`