From fc94daab48661c46bb559f3dfb23323616394a94 Mon Sep 17 00:00:00 2001 From: Oleg Moskalenko Date: Tue, 22 Jul 2014 10:46:15 -0700 Subject: [PATCH] new scripts and license added --- debian/copyright | 38 ++++++++++++++++++++++++++++++++++++++ debian/coturn.doc-base | 2 +- debian/coturn.docs | 1 + debian/coturn.install | 4 ++++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/debian/copyright b/debian/copyright index ea84ac0b..01d1620e 100644 --- a/debian/copyright +++ b/debian/copyright @@ -9,6 +9,12 @@ License: BSD-COTURN-CITRIX Comment: This is a BSD license. +Files: src/apps/relay/dbdrivers/* +Copyright: COMBINED-CITRIX-VIVOCHA-BSD +License: GPL-3+ +Comment: + This is a BSD license. + Files: src/server/ns_turn_khash.h Copyright: 2008, by Attractive Chaos License: MIT-HASH @@ -53,6 +59,38 @@ License: BSD-COTURN-CITRIX * SUCH DAMAGE. */ +License: COMBINED-CITRIX-VIVOCHA-BSD + /* + * Copyright (C) 2011, 2012, 2013 Citrix Systems + * Copyright (C) 2014 Vivocha S.p.A. + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + License: GPL-3+ The GPL can be found in /usr/share/common-licenses/GPL-3 diff --git a/debian/coturn.doc-base b/debian/coturn.doc-base index ce91150f..da61aba1 100644 --- a/debian/coturn.doc-base +++ b/debian/coturn.doc-base @@ -5,5 +5,5 @@ Abstract: This set of documents describe how the turn server programs can be use Section: Network/Communication Format: Text -Files: /usr/share/doc/coturn/README.turnserver.gz /usr/share/doc/coturn/README.turnadmin.gz /usr/share/doc/coturn/README.turnutils.gz /usr/share/doc/coturn/schema.sql /usr/share/doc/coturn/schema.userdb.redis.gz /usr/share/doc/coturn/schema.stats.redis +Files: /usr/share/doc/coturn/README.turnserver.gz /usr/share/doc/coturn/README.turnadmin.gz /usr/share/doc/coturn/README.turnutils.gz /usr/share/doc/coturn/schema.sql /usr/share/doc/coturn/schema.mongo.sh /usr/share/doc/coturn/schema.userdb.redis.gz /usr/share/doc/coturn/schema.stats.redis diff --git a/debian/coturn.docs b/debian/coturn.docs index 205c1944..ad74ec81 100644 --- a/debian/coturn.docs +++ b/debian/coturn.docs @@ -2,5 +2,6 @@ README.turnadmin README.turnserver README.turnutils turndb/schema.sql +turndb/schema.mongo.sh turndb/schema.userdb.redis turndb/schema.stats.redis diff --git a/debian/coturn.install b/debian/coturn.install index e8ec44e2..d2ccc38f 100644 --- a/debian/coturn.install +++ b/debian/coturn.install @@ -6,6 +6,8 @@ bin/turnutils_uclient usr/bin lib/libturnclient.a usr/lib turndb/schema.sql usr/share/coturn turndb/schema.sql usr/share/doc/coturn +turndb/schema.mongo.sh usr/share/coturn +turndb/schema.mongo.sh usr/share/doc/coturn turndb/testredisdbsetup.sh usr/share/coturn turndb/testsqldbsetup.sql usr/share/coturn turndb/schema.userdb.redis usr/share/coturn @@ -45,11 +47,13 @@ examples/scripts/longtermsecure/secure_udp_c2c.sh usr/share/coturn/examples/scri examples/scripts/longtermsecure/secure_udp_client.sh usr/share/coturn/examples/scripts/longtermsecure examples/scripts/longtermsecuredb/secure_relay_with_db_psql.sh usr/share/coturn/examples/scripts/longtermsecuredb examples/scripts/longtermsecuredb/secure_relay_with_db_mysql.sh usr/share/coturn/examples/scripts/longtermsecuredb +examples/scripts/longtermsecuredb/secure_relay_with_db_mongo.sh usr/share/coturn/examples/scripts/longtermsecuredb examples/scripts/longtermsecuredb/secure_relay_with_db_redis.sh usr/share/coturn/examples/scripts/longtermsecuredb examples/scripts/selfloadbalance/secure_relay.sh usr/share/coturn/examples/scripts/selfloadbalance examples/scripts/selfloadbalance/secure_dos_attack.sh usr/share/coturn/examples/scripts/selfloadbalance examples/scripts/restapi/secure_relay_secret.sh usr/share/coturn/examples/scripts/restapi examples/scripts/restapi/secure_relay_secret_with_db_mysql.sh usr/share/coturn/examples/scripts/restapi +examples/scripts/restapi/secure_relay_secret_with_db_mongo.sh usr/share/coturn/examples/scripts/restapi examples/scripts/restapi/secure_relay_secret_with_db_psql.sh usr/share/coturn/examples/scripts/restapi examples/scripts/restapi/secure_relay_secret_with_db_redis.sh usr/share/coturn/examples/scripts/restapi examples/scripts/restapi/secure_udp_client_with_secret.sh usr/share/coturn/examples/scripts/restapi