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

Increase the license options. #87

Merged
merged 6 commits into from
Sep 16, 2020
Merged

Increase the license options. #87

merged 6 commits into from
Sep 16, 2020

Conversation

Lokathor
Copy link
Contributor

@Lokathor Lokathor commented Jul 24, 2020

Per #66, this adds the Zlib license as a possible license for users of the crate. While we're at it, it's probably best to also add the Apache-2.0 license as an option.

I expect this to be fairly uncontroversial, but this would need sign off from past code contributors (alphabetical order):

  • alexcrichton
  • arbitrix
  • ctjhoa
  • dholbert
  • dingelish
  • eminence
  • FauxFaux
  • fhanau
  • Frommi
  • golddranks
  • ignatenkobrain
  • jonas-schievink
  • matklad
  • oyvindln
  • RReverser
  • Shnatsel
  • srijs
  • vlad20012
  • wehlutyk

If @Frommi is still on board with the idea then we can start pinging the rest of people.

@Lokathor
Copy link
Contributor Author

@dingelish
Copy link
Contributor

Signed-off by Yu Ding @dingelish
:p

@ignatenkobrain
Copy link
Contributor

Fine with me. But please add texts of those licenses into the tree.

@Lokathor
Copy link
Contributor Author

Ah, can do.

@ctjhoa
Copy link
Contributor

ctjhoa commented Jul 25, 2020

I'm ok too

@matklad
Copy link
Contributor

matklad commented Jul 25, 2020

I agree to adding Zlib and Apache 2.0 licenses

@FauxFaux
Copy link
Contributor

I don't even remember contributing, which probably means that my contribution is too small for you to even ask.

But, yes, please do.

@golddranks
Copy link
Contributor

golddranks commented Jul 25, 2020

I agree to adding Zlib and Apache 2.0 licenses.

@Shnatsel
Copy link
Contributor

I license past and future contributions under Zlib OR Apache-2.0 or MIT license, allowing licensees to chose any one at their option.

@jonas-schievink
Copy link
Contributor

I'm fine with this too

@oyvindln
Copy link
Collaborator

I'm fine with this.

@Lokathor
Copy link
Contributor Author

Apologies, there was apparently a copy/paste mixup and @alexcrichton wasn't initially on the list, so you get a ping too.

@srijs
Copy link
Contributor

srijs commented Jul 25, 2020

👍 fine by me

@eminence
Copy link
Contributor

I agree to adding Zlib and Apache 2.0 licenses

@dholbert
Copy link
Contributor

I've only contributed one commit which was a 1-character typo-fix, so I'm arguably not really a code contributor. :) But, setting that aside: sure, I'm fine with this license change.

@fhanau
Copy link
Contributor

fhanau commented Jul 25, 2020

I also agree to adding the licenses.

@vlad20012
Copy link
Contributor

I agree to adding Zlib and Apache 2.0 licenses

@RReverser
Copy link
Contributor

No problem from my side.

@alexcrichton
Copy link
Contributor

I agree to this change of licenses.

@Lokathor
Copy link
Contributor Author

Lokathor commented Aug 5, 2020

I made a gaffe and would like to apologize to everyone.

The PR had been set to affect the miniz_oxide_c_api. I intended to change things for the miniz_oxide crate. I was not clear on the repo organization at the time (the intended crate is in a sub-directory), and so I altered the wrong Cargo.toml and added the new licenses all at the repository root.

I have pushed the proper changes so that this PR now applies to just the miniz_oxide crate.

Since the relicense has been signed off on by everyone who has touched that crate specifically:

  • @Frommi I ask that you merge this PR as is, and please push out a release to crates.io some time soon.
  • I'll open a second PR for the C API crate to also get the re-license treatment, with a ping to just the one last contributor we'd need a sign off from for the C api to be also re-licensed.

@oyvindln
Copy link
Collaborator

oyvindln commented Sep 5, 2020

Okay, so the remaining two contributors, @arbitrix and @wehlutyk contributed to the C API part only so I think this should be fine to merge, looks like both have not been active lately. (@arbitrix contribution was just removing a line, so I don't know if that is something that counts as needing approval either.)

@Lokathor
Copy link
Contributor Author

@oyvindln i resolved the merge conflicts that came up recently. Can you merge and publish yourself? Or do we need to keep waiting for @Frommi ?

@oyvindln
Copy link
Collaborator

I can do that, may wait a bit with publishing unless it's urgent, would like to get #97 in.

@oyvindln oyvindln merged commit 78d13b4 into Frommi:master Sep 16, 2020
@Lokathor
Copy link
Contributor Author

Understandable. I'll subscribe to that PR too.

Thanks for getting to this!

@Lokathor Lokathor deleted the more-licenses branch September 16, 2020 16:02
@arbitrix
Copy link
Contributor

I agree to this change of licenses.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.