Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update formulae with multiple licenses #58869

Closed
wants to merge 41 commits into from

Conversation

SeekingMeaning
Copy link
Contributor

  • Have you followed the guidelines for contributing?
  • Have you checked that there aren't other open pull requests for the same formula update/change?
  • Have you built your formula locally with brew install --build-from-source <formula>, where <formula> is the name of the formula you're submitting?
  • Is your test running fine brew test <formula>, where <formula> is the name of the formula you're submitting?
  • Does your build pass brew audit --strict <formula> (after doing brew install <formula>)?

DNM: need to wait for next brew release

@BrewTestBot BrewTestBot added the missing license Formula has a missing license which should be added label Jul 31, 2020
@dawidd6 dawidd6 removed the missing license Formula has a missing license which should be added label Jul 31, 2020
Formula/feedgnuplot.rb Outdated Show resolved Hide resolved
@@ -3,8 +3,7 @@ class Mongoose < Formula
homepage "https://github.com/cesanta/mongoose"
url "https://github.com/cesanta/mongoose/archive/6.17.tar.gz"
sha256 "5bff3cc70bb2248cf87d06a3543f120f3b29b9368d25a7715443cb10612987cc"
# license ["GPL-2.0", "Cesanta"] - pending https://github.com/Homebrew/brew/pull/7953
license "GPL-2.0"
license ["GPL-2.0", "Cesanta"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Casenta isn't listed in the SPDX License List so I don't think we can allow it (it will fail brew audit)

Copy link
Member

@Rylan12 Rylan12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aside from my above comments, looks good ✅

Once a new release has been made, we just need to check to make sure there will be no major merge conflicts, and then we're good to go.

Formula/ffms2.rb Outdated
@@ -6,7 +6,7 @@ class Ffms2 < Formula
sha256 "b09b2aa2b1c6f87f94a0a0dd8284b3c791cbe77f0f3df57af99ddebcd15273ed"
# The FFMS2 source is licensed under the MIT license, but its binaries
# are licensed under the GPL because GPL components of FFmpeg are used.
license "GPL-2.0"
license ["MIT", "GPL-2.0"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way we've been using the multiple-license syntax is for when the user is given a choice for which license to use.

That's not the case here, because parts are under MIT and parts are under GPL-2.0. We should only specify the more restrictive license (which, I think, would be GPL-2.0)

chenrui333
chenrui333 previously approved these changes Aug 2, 2020
Copy link
Member

@chenrui333 chenrui333 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work.

@SeekingMeaning SeekingMeaning added the CI-syntax-only Change only affects brew syntax, not the install. Only run syntax CI. label Aug 6, 2020
@vladimyr
Copy link
Contributor

vladimyr commented Aug 8, 2020

Adding fd to the list. According to https://github.com/sharkdp/fd#license it should be marked as Apache-2.0 or MIT:

diff --git a/Formula/fd.rb b/Formula/fd.rb
index 22e33ce2d5..20fc11a74d 100644
--- a/Formula/fd.rb
+++ b/Formula/fd.rb
@@ -3,7 +3,7 @@ class Fd < Formula
   homepage "https://github.com/sharkdp/fd"
   url "https://github.com/sharkdp/fd/archive/v8.1.1.tar.gz"
   sha256 "7b327dc4c2090b34c7fb3e5ac7147f7bbe6266c2d44b182038d36f3b1d347cc1"
-  license "Apache-2.0"
+  license ["Apache-2.0", "MIT"]
   head "https://github.com/sharkdp/fd.git"
 
   bottle do

@SeekingMeaning
Copy link
Contributor Author

fd is distributed under the terms of both the MIT License and the Apache License 2.0.

MIT and Apache-2.0?

@vladimyr
Copy link
Contributor

vladimyr commented Aug 8, 2020

@SeekingMeaning Maybe I'm wrong but I parsed it as or: sharkdp/fd#105 (comment)

@SeekingMeaning
Copy link
Contributor Author

Ah, I agree. Thank you for clarification

@dtrodrigues
Copy link
Member

There's a couple more that I don't see in this PR:

rainbarf.rb
rust.rb
sheldon.rb
sql-translator.rb
transmission-cli.rb
ttf2eot.rb

@SeekingMeaning
Copy link
Contributor Author

SeekingMeaning commented Aug 11, 2020

I'm not sure how to license ttf2eot since WebKit is licensed as party LGPL and partly BSD:

https://webkit.org/licensing-webkit/

WebKit is open source software with portions licensed under the LGPL and BSD licenses available here.

Would this be LGPL-2.0-or-later AND BSD-2-Clause? This would require Homebrew/brew#8260

@SeekingMeaning SeekingMeaning added the deprecated license Formula uses a deprecated SPDX license which should be updated label Aug 11, 2020
@SeekingMeaning
Copy link
Contributor Author

This needs to updated to the new Homebrew/brew#8260 syntax
(goffice, libfabric, and sheldon have already been updated)

@SeekingMeaning SeekingMeaning deleted the licenses branch August 21, 2020 16:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI-syntax-only Change only affects brew syntax, not the install. Only run syntax CI. deprecated license Formula uses a deprecated SPDX license which should be updated
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants