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

8328812: Update and move siphash license #18455

Closed
wants to merge 1 commit into from

Conversation

JesperIRL
Copy link
Member

@JesperIRL JesperIRL commented Mar 22, 2024

Updated and moved the license file.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8328812: Update and move siphash license (Bug - P3)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/18455/head:pull/18455
$ git checkout pull/18455

Update a local copy of the PR:
$ git checkout pull/18455
$ git pull https://git.openjdk.org/jdk.git pull/18455/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18455

View PR using the GUI difftool:
$ git pr show -t 18455

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/18455.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 22, 2024

👋 Welcome back jwilhelm! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Mar 22, 2024

@JesperIRL This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8328812: Update and move siphash license

Reviewed-by: lfoltan

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 4 new commits pushed to the master branch:

  • b7a51dd: 8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main
  • 739957c: 8328384: Convert java/awt/FileDialog/FileDialogOpenDirTest test to main
  • 13cf070: 8328556: Do not extract large CKO_SECRET_KEY keys from the NSS Software Token
  • 709410d: 8328679: Improve comment for UNSAFE_ENTRY_SCOPED in unsafe.cpp

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Mar 22, 2024
@openjdk
Copy link

openjdk bot commented Mar 22, 2024

@JesperIRL The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Mar 22, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 22, 2024

Webrevs

Copy link
Member

@lfoltan lfoltan left a comment

Choose a reason for hiding this comment

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

Looks good.
Lois

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Mar 22, 2024
@JesperIRL
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Mar 22, 2024

Going to push as commit ce7ebaa.
Since your change was applied there have been 4 commits pushed to the master branch:

  • b7a51dd: 8328382: Convert java/awt/FileDialog/FileDialogForPackages test to main
  • 739957c: 8328384: Convert java/awt/FileDialog/FileDialogOpenDirTest test to main
  • 13cf070: 8328556: Do not extract large CKO_SECRET_KEY keys from the NSS Software Token
  • 709410d: 8328679: Improve comment for UNSAFE_ENTRY_SCOPED in unsafe.cpp

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Mar 22, 2024
@openjdk openjdk bot closed this Mar 22, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 22, 2024
@openjdk
Copy link

openjdk bot commented Mar 22, 2024

@JesperIRL Pushed as commit ce7ebaa.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@JesperIRL
Copy link
Member Author

/backport jdk22u

@JesperIRL JesperIRL deleted the 8328812 branch March 22, 2024 16:03
@openjdk
Copy link

openjdk bot commented Mar 22, 2024

@JesperIRL the backport was successfully created on the branch backport-JesperIRL-ce7ebaa6 in my personal fork of openjdk/jdk22u. To create a pull request with this backport targeting openjdk/jdk22u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit ce7ebaa6 from the openjdk/jdk repository.

The commit being backported was authored by Jesper Wilhelmsson on 22 Mar 2024 and was reviewed by Lois Foltan.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk22u:

$ git fetch https://github.com/openjdk-bots/jdk22u.git backport-JesperIRL-ce7ebaa6:backport-JesperIRL-ce7ebaa6
$ git checkout backport-JesperIRL-ce7ebaa6
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk22u.git backport-JesperIRL-ce7ebaa6

@@ -4,12 +4,12 @@
SipHash reference C implementation

```
Copyright (c) 2012-2021 Jean-Philippe Aumasson
<jeanphilippe.aumasson@gmail.com>
Copyright (c) 2012-2014 Daniel J. Bernstein <djb@cr.yp.to>
Copy link
Contributor

Choose a reason for hiding this comment

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

Why would you remove a author or year range?

Choose a reason for hiding this comment

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

To match the license claim in the code we are using:

SipHash reference C implementation
Copyright (c) 2016 Jean-Philippe Aumasson <jeanphilippe.aumasson@gmail.com>
To the extent possible under law, the author(s) have dedicated all copyright
and related and neighboring rights to this software to the public domain
worldwide. This software is distributed without any warranty.
You should have received a copy of the CC0 Public Domain Dedication along
with
this software. If not, see
<http://creativecommons.org/publicdomain/zero/1.0/>.

Copy link
Contributor

Choose a reason for hiding this comment

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

The header file contains more claims https://github.com/veorq/SipHash/blob/master/halfsiphash.h

Choose a reason for hiding this comment

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

That header only contains a single function declaration for an entry point into the implementation.
HotSpot doesn't use that function, and doesn't have anything with a corresponding signature. So it's
not in any way derived from that header. The HotSpot code is derived from the .c file only, so that's
the license we should be referencing.

Copy link
Contributor

@ecki ecki Mar 25, 2024

Choose a reason for hiding this comment

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

The problem is that the project is a joined work and has multiple variants of copyrights (see the readme). I don’t think it’s on the safe side to pick a single (non recent) copyright - especially if you change attribution after the fact. But that’s just me. This is especially a problem because the file does NOT contain a dual license claim - the claim is in the readme with this text:

Intellectual property

This code is copyright (c) 2014-2023 Jean-Philippe Aumasson, Daniel J. Bernstein. It is dual-licensed CC0 and MIT.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copyright and license are two different things. The project has a dual license which we attribute. Code in different files can have different copyrights (as is the case in e.g. our own OpenJDK code). We copied the copyright from the file that we looked at. If you feel it has the wrong copyright please contact the authors of that file and ask them to update their code.

Copy link
Contributor

@ecki ecki Mar 25, 2024

Choose a reason for hiding this comment

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

The file has a different license also. Either you use the joined copyright and dual license or only the single copyright and cc0 license which is in the file. But I asked DJB to clarify.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants