Module: sip-router Branch: master Commit: cbfe9a14fdb05e8212ba4a0b24472f5239850a77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbfe9a14...
Author: oej oej@edvina.net Committer: oej oej@edvina.net Date: Sat Oct 10 21:48:04 2009 +0200
Changing legal template to sip-router standard
Daniel - please check that this is ok for you.
---
modules/mi_rpc/mi_rpc_mod.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/modules/mi_rpc/mi_rpc_mod.c b/modules/mi_rpc/mi_rpc_mod.c index b678f25..de9db37 100644 --- a/modules/mi_rpc/mi_rpc_mod.c +++ b/modules/mi_rpc/mi_rpc_mod.c @@ -5,19 +5,35 @@ * * Copyright (C) 2009 Daniel-Constantin Mierla (asipto.com). * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. + * This file is part of SIP-router, a free SIP server. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * SIP-router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * SIP-router is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + */ + +/*! + * \file + * \brief Management interface :: RPC support + * \ingroup mi_rpc + */ + +/*! + * \defgroup mi_rpc Management interface :: RPC support */
+ #include <stdlib.h> #include <string.h> #include <unistd.h>
On Oct 10, 2009 at 21:48, Olle E. Johansson oej@edvina.net wrote:
Module: sip-router Branch: master Commit: cbfe9a14fdb05e8212ba4a0b24472f5239850a77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbfe9a14...
Author: oej oej@edvina.net Committer: oej oej@edvina.net Date: Sat Oct 10 21:48:04 2009 +0200
Changing legal template to sip-router standard
You did change the licence, from BSD to GPL, which is not alright, unless the (c) holder agrees.
I cannot speak for Daniel, but in general this is not alright at all.
Daniel - please check that this is ok for you.
Andrei
10 okt 2009 kl. 22.16 skrev Andrei Pelinescu-Onciul:
On Oct 10, 2009 at 21:48, Olle E. Johansson oej@edvina.net wrote:
Module: sip-router Branch: master Commit: cbfe9a14fdb05e8212ba4a0b24472f5239850a77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbfe9a14...
Author: oej oej@edvina.net Committer: oej oej@edvina.net Date: Sat Oct 10 21:48:04 2009 +0200
Changing legal template to sip-router standard
You did change the licence, from BSD to GPL, which is not alright, unless the (c) holder agrees.
I cannot speak for Daniel, but in general this is not alright at all.
Daniel - please check that this is ok for you.
Which is why I added this to check...
Thanks for the feedback!
/O
On 11.10.2009 6:01 Uhr, Olle E. Johansson wrote:
10 okt 2009 kl. 22.16 skrev Andrei Pelinescu-Onciul:
On Oct 10, 2009 at 21:48, Olle E. Johansson oej@edvina.net wrote:
Module: sip-router Branch: master Commit: cbfe9a14fdb05e8212ba4a0b24472f5239850a77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbfe9a14...
Author: oej oej@edvina.net Committer: oej oej@edvina.net Date: Sat Oct 10 21:48:04 2009 +0200
Changing legal template to sip-router standard
You did change the licence, from BSD to GPL, which is not alright, unless the (c) holder agrees.
I cannot speak for Daniel, but in general this is not alright at all.
Daniel - please check that this is ok for you.
Which is why I added this to check...
no, it is not right. Please revert and do not touch the copyright and/or license texts directly. Inform the author about anything you think might not be right. Now this exists on the web a version with GPL without a need for it or authors' willingness.
Also you rushed in updating application name in license texts, there are some still some steps before getting to a common name.
If you have something to update to others' modules, do it if it is only pure admin or devel documentation. Changes in application name should be done one at once, when it is decided. Also copyright/license updates must be done only by author or after author approval, not before.
Thanks, Daniel
On Oct 11, 2009 at 06:01, Olle E. Johansson oej@edvina.net wrote:
10 okt 2009 kl. 22.16 skrev Andrei Pelinescu-Onciul:
On Oct 10, 2009 at 21:48, Olle E. Johansson oej@edvina.net wrote:
Module: sip-router Branch: master Commit: cbfe9a14fdb05e8212ba4a0b24472f5239850a77 URL:
An easy way to revert is: git revert cbfe9a ^^^^^^ first few letters of the target commit (cbfe9a14fdb05e8212ba4a0b24472f5239850a77)
Andrei