Age | Commit message (Collapse) | Author |
|
The UniMRCP project distributes Asterisk modules that integrate Asterisk with
UniMRCP, and other Asterisk users use the UniMRCP library as well.
Unfortunately, the UniMRCP license is Apache 2.0, which per the Free Software
Foundation, is not a compatible license with the GPLv2.
"Please note that this license is not compatible with GPL version 2, because it
has some requirements that are not in that GPL version. These include certain
patent termination and indemnification provisions. The patent termination
provision is a good thing, which is why we recommend the Apache 2.0 license for
substantial programs over other lax permissive licenses."
On the other hand, UniMRCP is a great project and we'd like to let people use
it with Asterisk.
This patch updates the LICENSE text to allow users to link Asterisk with
UniMRCP and distribute the resulting binaries.
........
Merged revisions 422293 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........
Merged revisions 422294 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 422295 from http://svn.asterisk.org/svn/asterisk/branches/12
........
Merged revisions 422296 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@422297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
........
Merged revisions 404050 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@404051 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r245044 | kpfleming | 2010-02-05 12:32:29 -0600 (Fri, 05 Feb 2010) | 5 lines
Remove contrib/firmware directory as it is empty
Remove explicit license for IAXy firmware as it is no longer included in the tree
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@245090 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r133578 | russell | 2008-07-25 10:00:31 -0500 (Fri, 25 Jul 2008) | 10 lines
Merged revisions 133577 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r133577 | russell | 2008-07-25 10:00:13 -0500 (Fri, 25 Jul 2008) | 2 lines
Fix the IAX2 URI for calling Digium
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@133579 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r132311 | kpfleming | 2008-07-19 11:45:52 -0500 (Sat, 19 Jul 2008) | 2 lines
grant a license exception to allow distribution of Asterisk binaries that use the UW IMAP Toolkit (which is licensed under a non-GPL-compatible license)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@132312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r85523 | tilghman | 2007-10-12 13:30:55 -0500 (Fri, 12 Oct 2007) | 2 lines
Change Digium address
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85524 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r82335 | kpfleming | 2007-09-13 11:12:00 -0700 (Thu, 13 Sep 2007) | 10 lines
Merged revisions 82334 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r82334 | kpfleming | 2007-09-13 11:10:12 -0700 (Thu, 13 Sep 2007) | 2 lines
clarify the OpenSSL and OpenH323 license exceptions
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82336 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
where verbatim text went off the end of the page on the PDF, and various
other improvements
(closes issue #10307, IgorG)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@77284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r45327 | kpfleming | 2006-10-17 12:22:25 -0500 (Tue, 17 Oct 2006) | 10 lines
Merged revisions 45326 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r45326 | kpfleming | 2006-10-17 12:22:01 -0500 (Tue, 17 Oct 2006) | 2 lines
provide licensing language for IAXy firmware file
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@45328 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6794 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
remove deprecated config_old.c/config_old.h
remove unused cvsid.h
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|
|
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20 65c4cc65-6c06-0410-ace0-fbb531ad65f3
|