Commit Graph

18 Commits

Author SHA1 Message Date
Joshua C. Colp 7526d1d6c1
LICENSE: Update link to trademark policy. (#44)
Resolves: #43
2023-05-02 08:17:00 -06:00
Naveen Albert 2ba5da15b0 configs, LICENSE: remove pbx.digium.com.
pbx.digium.com no longer accepts IAX2 calls and
there are no plans for it to come back.

Accordingly, nonworking IAX2 URIs are removed from
both the LICENSE file and the sample config.

ASTERISK-29923 #close

Change-Id: I257c54d4d812ed6b4bd4cbec2cd7ebe2b87b5bad
2022-02-25 13:33:03 -06:00
Matthew Jordan 3194892ea2 LICENSE: Clarify language in Asterisk's LICENSE to allow for linking to UniMRCP
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
2014-08-28 21:54:44 +00:00
Matthew Jordan c07fa05aa7 LICENSE: Update language to include ARI
........

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
2013-12-18 00:17:15 +00:00
Jeff Peeler 4a03da160e Merged revisions 245044 via svnmerge from
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
2010-02-05 19:26:22 +00:00
Russell Bryant 9c35faac65 Merged revisions 133578 via svnmerge from
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
2008-07-25 15:00:49 +00:00
Kevin P. Fleming 2fa3e85e4a Merged revisions 132311 via svnmerge from
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
2008-07-19 16:46:33 +00:00
Tilghman Lesher 8bbd267dff Merged revisions 85523 via svnmerge from
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
2007-10-12 18:37:34 +00:00
Kevin P. Fleming 12a8ae6c91 Merged revisions 82335 via svnmerge from
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
2007-09-13 18:13:44 +00:00
Russell Bryant 51e7035dfe Merge a big batch of documentation fixes for escaping, marking URLs, places
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
2007-07-26 14:49:51 +00:00
Kevin P. Fleming 75ae42ff30 Merged revisions 45327 via svnmerge from
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
2006-10-17 17:22:52 +00:00
Olle Johansson a2af69ed6f Add reference to the latest trademark policy on digium.com
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@42555 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-09 15:09:16 +00:00
Kevin P. Fleming 2c65582b66 remove extraneous svn:executable properties
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-11-29 18:24:39 +00:00
Kevin P. Fleming 754446e5ac move GPL/trademark licensing information into LICENSE file
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6794 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-10-15 05:29:13 +00:00
Kevin P. Fleming ce16733e72 move GPL text to proper file name
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6793 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2005-10-15 05:12:12 +00:00
Kevin P. Fleming 1632d52795 major header file cleanup: license, copyrights, descriptions, markers, etc.
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
2005-08-30 18:32:10 +00:00
Mark Spencer 19c6e1bde8 Version 0.1.1 from FTP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1999-12-08 00:16:51 +00:00
Mark Spencer 34a72b4a63 Version 0.1.0 from FTP
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@20 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1999-11-14 10:06:00 +00:00