diff --git a/.formatter.exs b/.formatter.exs index d2cda26..d19daff 100644 --- a/.formatter.exs +++ b/.formatter.exs @@ -1,3 +1,5 @@ +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT # Used by "mix format" [ inputs: ["{mix,.formatter}.exs", "{config,lib,test}/**/*.{ex,exs}"] diff --git a/.gitignore b/.gitignore index a0ad33a..1303d48 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# Copyright © 2017-2018 E-MetroTel +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT + # The directory Mix will write compiled artifacts to. /_build diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56f1dbb..ce71e97 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,3 +1,5 @@ +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT image: elixir:1.8.1 cache: diff --git a/.travis.yml b/.travis.yml index 6aeff60..2d9f89a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,6 @@ +# Copyright © 2017-2018 E-MetroTel +# SPDX-License-Identifier: MIT + language: elixir elixir: - 1.4.2 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ab5e92..b51fa23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,9 @@ # Changelog + + ## 0.5.2 - 2022-01-09 diff --git a/LICENSE b/LICENSE deleted file mode 100644 index c0ba3c7..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2017 E-MetroTel - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/LICENSES/CC0-1.0.txt b/LICENSES/CC0-1.0.txt new file mode 100644 index 0000000..0e259d4 --- /dev/null +++ b/LICENSES/CC0-1.0.txt @@ -0,0 +1,121 @@ +Creative Commons Legal Code + +CC0 1.0 Universal + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS + PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM + THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED + HEREUNDER. + +Statement of Purpose + +The laws of most jurisdictions throughout the world automatically confer +exclusive Copyright and Related Rights (defined below) upon the creator +and subsequent owner(s) (each and all, an "owner") of an original work of +authorship and/or a database (each, a "Work"). + +Certain owners wish to permanently relinquish those rights to a Work for +the purpose of contributing to a commons of creative, cultural and +scientific works ("Commons") that the public can reliably and without fear +of later claims of infringement build upon, modify, incorporate in other +works, reuse and redistribute as freely as possible in any form whatsoever +and for any purposes, including without limitation commercial purposes. +These owners may contribute to the Commons to promote the ideal of a free +culture and the further production of creative, cultural and scientific +works, or to gain reputation or greater distribution for their Work in +part through the use and efforts of others. + +For these and/or other purposes and motivations, and without any +expectation of additional consideration or compensation, the person +associating CC0 with a Work (the "Affirmer"), to the extent that he or she +is an owner of Copyright and Related Rights in the Work, voluntarily +elects to apply CC0 to the Work and publicly distribute the Work under its +terms, with knowledge of his or her Copyright and Related Rights in the +Work and the meaning and intended legal effect of CC0 on those rights. + +1. Copyright and Related Rights. A Work made available under CC0 may be +protected by copyright and related or neighboring rights ("Copyright and +Related Rights"). Copyright and Related Rights include, but are not +limited to, the following: + + i. the right to reproduce, adapt, distribute, perform, display, + communicate, and translate a Work; + ii. moral rights retained by the original author(s) and/or performer(s); +iii. publicity and privacy rights pertaining to a person's image or + likeness depicted in a Work; + iv. rights protecting against unfair competition in regards to a Work, + subject to the limitations in paragraph 4(a), below; + v. rights protecting the extraction, dissemination, use and reuse of data + in a Work; + vi. database rights (such as those arising under Directive 96/9/EC of the + European Parliament and of the Council of 11 March 1996 on the legal + protection of databases, and under any national implementation + thereof, including any amended or successor version of such + directive); and +vii. other similar, equivalent or corresponding rights throughout the + world based on applicable law or treaty, and any national + implementations thereof. + +2. Waiver. To the greatest extent permitted by, but not in contravention +of, applicable law, Affirmer hereby overtly, fully, permanently, +irrevocably and unconditionally waives, abandons, and surrenders all of +Affirmer's Copyright and Related Rights and associated claims and causes +of action, whether now known or unknown (including existing as well as +future claims and causes of action), in the Work (i) in all territories +worldwide, (ii) for the maximum duration provided by applicable law or +treaty (including future time extensions), (iii) in any current or future +medium and for any number of copies, and (iv) for any purpose whatsoever, +including without limitation commercial, advertising or promotional +purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each +member of the public at large and to the detriment of Affirmer's heirs and +successors, fully intending that such Waiver shall not be subject to +revocation, rescission, cancellation, termination, or any other legal or +equitable action to disrupt the quiet enjoyment of the Work by the public +as contemplated by Affirmer's express Statement of Purpose. + +3. Public License Fallback. Should any part of the Waiver for any reason +be judged legally invalid or ineffective under applicable law, then the +Waiver shall be preserved to the maximum extent permitted taking into +account Affirmer's express Statement of Purpose. In addition, to the +extent the Waiver is so judged Affirmer hereby grants to each affected +person a royalty-free, non transferable, non sublicensable, non exclusive, +irrevocable and unconditional license to exercise Affirmer's Copyright and +Related Rights in the Work (i) in all territories worldwide, (ii) for the +maximum duration provided by applicable law or treaty (including future +time extensions), (iii) in any current or future medium and for any number +of copies, and (iv) for any purpose whatsoever, including without +limitation commercial, advertising or promotional purposes (the +"License"). The License shall be deemed effective as of the date CC0 was +applied by Affirmer to the Work. Should any part of the License for any +reason be judged legally invalid or ineffective under applicable law, such +partial invalidity or ineffectiveness shall not invalidate the remainder +of the License, and in such case Affirmer hereby affirms that he or she +will not (i) exercise any of his or her remaining Copyright and Related +Rights in the Work or (ii) assert any associated claims and causes of +action with respect to the Work, in either case contrary to Affirmer's +express Statement of Purpose. + +4. Limitations and Disclaimers. + + a. No trademark or patent rights held by Affirmer are waived, abandoned, + surrendered, licensed or otherwise affected by this document. + b. Affirmer offers the Work as-is and makes no representations or + warranties of any kind concerning the Work, express, implied, + statutory or otherwise, including without limitation warranties of + title, merchantability, fitness for a particular purpose, non + infringement, or the absence of latent or other defects, accuracy, or + the present or absence of errors, whether or not discoverable, all to + the greatest extent permissible under applicable law. + c. Affirmer disclaims responsibility for clearing rights of other persons + that may apply to the Work or any use thereof, including without + limitation any person's Copyright and Related Rights in the Work. + Further, Affirmer disclaims responsibility for obtaining any necessary + consents, permissions or other rights required for any use of the + Work. + d. Affirmer understands and acknowledges that Creative Commons is not a + party to this document and has no duty or obligation with respect to + this CC0 or use of the Work. diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 0000000..2071b23 --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/README.md b/README.md index 716bf62..ec97a56 100644 --- a/README.md +++ b/README.md @@ -44,10 +44,10 @@ This is a fork of [auto_linker](https://github.com/smpallen99/auto_linker) by [S ## License -Copyright © 2017 E-MetroTel +Copyright © 2017-2018 E-MetroTel -Copyright © 2019-2020 Pleroma Authors +Copyright © 2019-2022 Pleroma Authors -The source is released under the MIT License. +SPDX-License-Identifier: MIT AND CC0-1.0 -Check [LICENSE](LICENSE) for more information. +Check [REUSE Specification](https://reuse.software/spec/) on how to get more information. diff --git a/lib/linkify.ex b/lib/linkify.ex index 0f97ad5..bb389b2 100644 --- a/lib/linkify.ex +++ b/lib/linkify.ex @@ -1,3 +1,7 @@ +# Copyright © 2017-2018 E-MetroTel +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT + defmodule Linkify do @moduledoc """ Create url links from text containing urls. diff --git a/lib/linkify/builder.ex b/lib/linkify/builder.ex index 0ce3661..6401aad 100644 --- a/lib/linkify/builder.ex +++ b/lib/linkify/builder.ex @@ -1,3 +1,7 @@ +# Copyright © 2017-2018 E-MetroTel +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT + defmodule Linkify.Builder do @moduledoc """ Module for building the auto generated link. diff --git a/lib/linkify/parser.ex b/lib/linkify/parser.ex index 8a6296e..233c681 100644 --- a/lib/linkify/parser.ex +++ b/lib/linkify/parser.ex @@ -1,3 +1,7 @@ +# Copyright © 2017-2018 E-MetroTel +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT + defmodule Linkify.Parser do @moduledoc """ Module to handle parsing the the input string. diff --git a/mix.exs b/mix.exs index b8efbe3..3144dec 100644 --- a/mix.exs +++ b/mix.exs @@ -1,3 +1,7 @@ +# Copyright © 2017-2018 E-MetroTel +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT + defmodule Linkify.Mixfile do use Mix.Project @@ -37,9 +41,9 @@ defmodule Linkify.Mixfile do defp package do [ - licenses: ["MIT"], + licenses: ["MIT", "CC0-1.0"], links: %{"GitLab" => "https://git.pleroma.social/pleroma/elixir-libraries/linkify"}, - files: ~w(lib priv README.md mix.exs LICENSE) + files: ~w(lib priv README.md mix.exs) ] end diff --git a/mix.lock.license b/mix.lock.license new file mode 100644 index 0000000..1ec0072 --- /dev/null +++ b/mix.lock.license @@ -0,0 +1,3 @@ +# Copyright © 2017-2018 E-MetroTel +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT diff --git a/priv/tlds.txt.license b/priv/tlds.txt.license new file mode 100644 index 0000000..4336b5c --- /dev/null +++ b/priv/tlds.txt.license @@ -0,0 +1,4 @@ +# Copyright © 2019-2020 IANA.org +# SPDX-License-Identifier: CC0-1.0 +# https://www.iana.org/help/licensing-terms +# https://data.iana.org/TLD/tlds-alpha-by-domain.txt diff --git a/test/builder_test.exs b/test/builder_test.exs index bfcd9bb..7cb0b28 100644 --- a/test/builder_test.exs +++ b/test/builder_test.exs @@ -1,3 +1,7 @@ +# Copyright © 2017-2018 E-MetroTel +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT + defmodule Linkify.BuilderTest do use ExUnit.Case, async: true doctest Linkify.Builder diff --git a/test/linkify_test.exs b/test/linkify_test.exs index fb7f5f1..1abca5f 100644 --- a/test/linkify_test.exs +++ b/test/linkify_test.exs @@ -1,3 +1,7 @@ +# Copyright © 2017-2018 E-MetroTel +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT + defmodule LinkifyTest do use ExUnit.Case, async: true doctest Linkify diff --git a/test/parser_test.exs b/test/parser_test.exs index c7298d2..50a6e68 100644 --- a/test/parser_test.exs +++ b/test/parser_test.exs @@ -1,3 +1,7 @@ +# Copyright © 2017-2018 E-MetroTel +# Copyright © 2019-2022 Pleroma Authors +# SPDX-License-Identifier: MIT + defmodule Linkify.ParserTest do use ExUnit.Case, async: true doctest Linkify.Parser diff --git a/test/test_helper.exs b/test/test_helper.exs index 869559e..6e3eca9 100644 --- a/test/test_helper.exs +++ b/test/test_helper.exs @@ -1 +1,4 @@ +# Copyright © 2017-2018 E-MetroTel +# SPDX-License-Identifier: MIT + ExUnit.start()