From e2c5911fe48dbf78eb99462c563e99afa2b7d9da Mon Sep 17 00:00:00 2001 From: Oleg Moskalenko Date: Sat, 18 Jul 2015 21:54:16 -0700 Subject: [PATCH 1/5] working on 4.4.5.4 --- ChangeLog | 4 ++++ INSTALL | 4 ++-- NOTE | 2 +- README.turnadmin | 4 ++-- README.turnserver | 8 ++++---- README.turnutils | 4 ++-- examples/etc/turnserver.conf | 2 +- rpm/CentOS6.pre.build.sh | 4 ++-- rpm/build.instructions.txt | 2 +- rpm/build.settings.sh | 5 ++--- rpm/build.sh | 2 +- rpm/common.pre.build.sh | 2 +- rpm/turnserver.spec | 4 +++- src/apps/relay/mainrelay.c | 2 +- src/ns_turn_defs.h | 2 +- 15 files changed, 28 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index fd28c9a..819173e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +7/18/2015 Oleg Moskalenko +Version 4.4.5.4 'Ardee West': + - moved to github. + 6/20/2015 Oleg Moskalenko Version 4.4.5.3 'Ardee West': - third-party authorization STUN attributes adjusted according diff --git a/INSTALL b/INSTALL index f97fc2a..0500d54 100644 --- 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 index 3cb9955..75b5886 100644 --- 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 index f76aaee..fee7bf6 100644 --- 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 index 01ac596..3b2bf8c 100644 --- 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 index 2233b66..c7e23ee 100644 --- 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 index 20b19ad..afd3214 100644 --- 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/rpm/CentOS6.pre.build.sh b/rpm/CentOS6.pre.build.sh index cd80113..4b2760b 100755 --- 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=${TURNSERVER_GIT_URL}/${LIBEVENT_SPEC_DIR} LIBEVENT_SPEC_FILE=libevent.spec # Common packs @@ -31,7 +31,7 @@ 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} + git clone ${LIBEVENT_SPEC_GIT_URL} ${LIBEVENT_SPEC_DIR} ER=$? if ! [ ${ER} -eq 0 ] ; then cd ${CPWD} diff --git a/rpm/build.instructions.txt b/rpm/build.instructions.txt index 8f5050b..bd8ab16 100644 --- 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 git@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 index ec4de76..ccd2093 100755 --- 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=git@github.com:coturn/coturn.git WGETOPTIONS="--no-check-certificate" RPMOPTIONS="-ivh --force" diff --git a/rpm/build.sh b/rpm/build.sh index 1edefe6..6a876ae 100755 --- 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} turnserver-${TURNVERSION} ER=$? if ! [ ${ER} -eq 0 ] ; then cd ${CPWD} diff --git a/rpm/common.pre.build.sh b/rpm/common.pre.build.sh index 0bf831e..4c98718 100755 --- 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" sudo yum -y install ${PACKS} ER=$? if ! [ ${ER} -eq 0 ] ; then diff --git a/rpm/turnserver.spec b/rpm/turnserver.spec index e4716dd..f6483ca 100644 --- a/rpm/turnserver.spec +++ b/rpm/turnserver.spec @@ -1,5 +1,5 @@ Name: turnserver -Version: 4.4.5.3 +Version: 4.4.5.4 Release: 0%{dist} Summary: Coturn TURN Server @@ -289,6 +289,8 @@ fi %{_includedir}/turn/client/TurnMsgLib.h %changelog +* Sat Jul 18 2015 Oleg Moskalenko + - Sync to 4.4.5.4 * Sat Jun 20 2015 Oleg Moskalenko - Sync to 4.4.5.3 * Wed May 29 2015 Oleg Moskalenko diff --git a/src/apps/relay/mainrelay.c b/src/apps/relay/mainrelay.c index 6632675..75c587b 100644 --- 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 index bc00fbe..c3815de 100644 --- 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 "'" From e770441b3390e15ef59de44b457b396c534099c4 Mon Sep 17 00:00:00 2001 From: Oleg Moskalenko Date: Sat, 18 Jul 2015 22:14:43 -0700 Subject: [PATCH 2/5] working on rpm --- rpm/CentOS6.pre.build.sh | 7 +++++-- rpm/build.sh | 2 +- rpm/common.pre.build.sh | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/rpm/CentOS6.pre.build.sh b/rpm/CentOS6.pre.build.sh index 4b2760b..85e19d9 100755 --- 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 -LIBEVENT_SPEC_GIT_URL=${TURNSERVER_GIT_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,15 @@ fi if ! [ -f ${BUILDDIR}/SPECS/${LIBEVENT_SPEC_FILE} ] ; then cd ${BUILDDIR}/tmp rm -rf ${LIBEVENT_SPEC_DIR} - git clone ${LIBEVENT_SPEC_GIT_URL} ${LIBEVENT_SPEC_DIR} + mkdir ${LIBEVENT_SPEC_DIR} + cd ${LIBEVENT_SPEC_DIR} + wget --quiet --no-check-certificate ${LIBEVENT_SPEC_GIT_URL}/${LIBEVENT_SPEC_FILE} 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.sh b/rpm/build.sh index 6a876ae..e1e918a 100755 --- a/rpm/build.sh +++ b/rpm/build.sh @@ -20,7 +20,7 @@ fi cd ${BUILDDIR}/tmp rm -rf turnserver-${TURNVERSION} -git clone ${TURNSERVER_GIT_URL} 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 index 4c98718..499d036 100755 --- 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 git" +PACKS="make gcc redhat-rpm-config rpm-build doxygen openssl-devel git wget" sudo yum -y install ${PACKS} ER=$? if ! [ ${ER} -eq 0 ] ; then From 183895d8c6f0c8f9797bd2746e50a0c9f8b8a508 Mon Sep 17 00:00:00 2001 From: Oleg Moskalenko Date: Sun, 19 Jul 2015 00:01:12 -0700 Subject: [PATCH 3/5] working on rpm --- rpm/CentOS6.pre.build.sh | 2 +- rpm/build.instructions.txt | 2 +- rpm/build.settings.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpm/CentOS6.pre.build.sh b/rpm/CentOS6.pre.build.sh index 85e19d9..c18cd70 100755 --- a/rpm/CentOS6.pre.build.sh +++ b/rpm/CentOS6.pre.build.sh @@ -33,7 +33,7 @@ if ! [ -f ${BUILDDIR}/SPECS/${LIBEVENT_SPEC_FILE} ] ; then rm -rf ${LIBEVENT_SPEC_DIR} mkdir ${LIBEVENT_SPEC_DIR} cd ${LIBEVENT_SPEC_DIR} - wget --quiet --no-check-certificate ${LIBEVENT_SPEC_GIT_URL}/${LIBEVENT_SPEC_FILE} + wget ${WGETOPTIONS} ${LIBEVENT_SPEC_GIT_URL}/${LIBEVENT_SPEC_FILE} ER=$? if ! [ ${ER} -eq 0 ] ; then cd ${CPWD} diff --git a/rpm/build.instructions.txt b/rpm/build.instructions.txt index bd8ab16..9196b34 100644 --- 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 Github, "git clone git@github.com:coturn/coturn.git" + 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 index ccd2093..1e9afd3 100755 --- a/rpm/build.settings.sh +++ b/rpm/build.settings.sh @@ -5,7 +5,7 @@ TURNVERSION=4.4.5.4 BUILDDIR=~/rpmbuild ARCH=`uname -p` -TURNSERVER_GIT_URL=git@github.com:coturn/coturn.git +TURNSERVER_GIT_URL=https://github.com/coturn/coturn.git WGETOPTIONS="--no-check-certificate" RPMOPTIONS="-ivh --force" From 39c358f3de97f647de637359e08ff0a0df6fb8d5 Mon Sep 17 00:00:00 2001 From: Oleg Moskalenko Date: Sun, 19 Jul 2015 00:14:21 -0700 Subject: [PATCH 4/5] working on rpm --- rpm/CentOS6.pre.build.sh | 6 ++++++ rpm/turnserver.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/rpm/CentOS6.pre.build.sh b/rpm/CentOS6.pre.build.sh index c18cd70..9e1e61c 100755 --- a/rpm/CentOS6.pre.build.sh +++ b/rpm/CentOS6.pre.build.sh @@ -39,6 +39,12 @@ if ! [ -f ${BUILDDIR}/SPECS/${LIBEVENT_SPEC_FILE} ] ; 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 diff --git a/rpm/turnserver.spec b/rpm/turnserver.spec index f6483ca..79d0510 100644 --- a/rpm/turnserver.spec +++ b/rpm/turnserver.spec @@ -5,7 +5,7 @@ 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 From 94fcae4b5e0386a2f50832d9485a516b2af3922a Mon Sep 17 00:00:00 2001 From: Oleg Moskalenko Date: Sun, 19 Jul 2015 00:46:58 -0700 Subject: [PATCH 5/5] man pages adjusted --- man/man1/turnadmin.1 | 6 +++--- man/man1/turnserver.1 | 10 +++++----- man/man1/turnutils.1 | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/man/man1/turnadmin.1 b/man/man1/turnadmin.1 index 2269b37..c178c73 100644 --- 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 index 51389c9..ed07604 100644 --- 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 index d0dcf26..80bc36e 100644 --- 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