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

MDEV-34287: Update debian/copyright to be compatible with Dep-5 #3532

Open
wants to merge 1 commit into
base: 10.11
Choose a base branch
from

Conversation

illuusio
Copy link
Contributor

  • The Jira issue number for this PR is: MDEV-34287

Description

Update Debian machine readable copyright information to be compatible with Dep-5 standard.
This PR focuses C, C headers and shell scripts. There is plenty of Perl script which should be applied in next round.

Release Notes

Probably nothing as this is kind of update of information not a change of anything.

How can this PR be tested?

Clone repo and install makedep tool with apt install makedep then go to repo dir and run makedep -k which should be executed without any warnings or errors.

Basing the PR against the correct MariaDB version

  • This is a bug fix, and the PR is based against the earliest maintained branch in which the bug can be reproduced.

PR quality check

  • I checked the CODING_STANDARDS.md file and my PR conforms to this where appropriate.
  • For any trivial modifications to the PR, I am ok with the reviewer making the changes themselves.

@illuusio illuusio force-pushed the 10.11-MDEV-34287-copyright-update branch from d3f0e07 to 9fd9b01 Compare September 24, 2024 06:34
@illuusio illuusio force-pushed the 10.11-MDEV-34287-copyright-update branch from 9fd9b01 to a0f3534 Compare October 7, 2024 06:43
Copy link
Member

@grooverdan grooverdan left a comment

Choose a reason for hiding this comment

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

Good work. Some interesting finds.

Single standza for copyright would make it a little more readable - https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#copyright-field

debian/copyright Outdated
On Debian systems, the complete text of the GNU General Public License and the
Artistic License can be found in `/usr/share/common-licenses/'.
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: MariaDB
Copy link
Member

Choose a reason for hiding this comment

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

For clarity can we go for "MariaDB Server"

debian/copyright Outdated
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: MariaDB
Source: https://github.com/MariaDB/server
Disclaimer: MariaDB: The innovative open source database
Copy link
Member

Choose a reason for hiding this comment

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

This doesn't appear what a Disclaimer, Comment or other fields is for.

https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/#disclaimer-field
I think it should just be omitted.

debian/copyright Outdated
vio/viossl.c
vio/viosslfactories.c
vio/viotest-ssl.c
Copyright: 2000, 2010, Oracle and/or its affiliates.
Copy link
Member

Choose a reason for hiding this comment

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

Can we abbreviate this down to the minimal encompassing set of years/year ranges for each entity?

Copy link
Contributor Author

@illuusio illuusio Oct 23, 2024

Choose a reason for hiding this comment

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

I'll chew them down.. I assume that for example leaving just 2000, 2003-2007, MySQL AB, 2009 Sun Microsystems, Inc. will be correct.

debian/copyright Outdated
2011, 2017, MariaDB Corporation.
2011, Monty Program Ab
2011, Oleksandr Byelkin
Richard A. O'Keefe
Copy link
Member

Choose a reason for hiding this comment

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

Would -1984 for Richard be fair based on strings/README? optional.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This one is also fixed in new local version but let's see what else should be changes before I'll update.

debian/copyright Outdated
2002, 2006, MySQL AB, 2009 Sun Microsystems, Inc.
2020, MariaDB Corporation.
2009, 2020, MariaDB Corporation
License: GPL
Copy link
Member

Choose a reason for hiding this comment

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

given GPL isn't a SPDX identifier can/should be go GPL-2.0 based on the Oracle source?

If that's decided the text isn't quantifying more.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They are under

   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation.

   There are special exceptions to the terms and conditions of the GPL as it
   is applied to this software. View the full text of the exception in file
   EXCEPTIONS-CLIENT in the directory of this software distribution.

So assuming that they are GPL-2.0 should not be wrong or are they GPL-1.0?

Copy link
Member

Choose a reason for hiding this comment

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

Fairly sure GPL-1.0 was never used.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Ok I've update it to GPL-2.0 as I assume that it's not GPL 1.x neither.

@illuusio illuusio force-pushed the 10.11-MDEV-34287-copyright-update branch from a0f3534 to 569f135 Compare October 24, 2024 09:47
@illuusio
Copy link
Contributor Author

Ok now it's chewed little bit sorter. I made new commit (which I can rebase after review) for easier reviewing are everything added to new sorted list.

@illuusio illuusio force-pushed the 10.11-MDEV-34287-copyright-update branch from 569f135 to c6ab74d Compare October 24, 2024 11:54
Copy link
Member

@grooverdan grooverdan left a comment

Choose a reason for hiding this comment

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

Thanks @illuusio

Update Debian machine readable copyright information to be
compatible with dep 5 standard.
@illuusio illuusio force-pushed the 10.11-MDEV-34287-copyright-update branch from c6ab74d to 137939b Compare October 28, 2024 10:10
@illuusio
Copy link
Contributor Author

It's same as last time I just rebased them to one commit so it looks better

Copy link
Contributor

@LinuxJedi LinuxJedi left a comment

Choose a reason for hiding this comment

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

There are a lot of issues here, I've highlighted a few, but it is not an exhaustive list. There is the additional problem of keeping this up to date when new files are added.

The copyright headers for the files are notoriously unmaintained. It might be better to fix these first, then find a way of dynamically generating this.

2016-2024, MariaDB Corporation
2017, Aliyun and/or its affiliates
2017-2018, MariaDB Foundation
2023, MariaDB Plc
Copy link
Contributor

Choose a reason for hiding this comment

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

This entry combined with the date range from MariaDB Corp 4 lines up is confusing.

2014-2015, SkySQL Ab & MariaDB Foundation
2014, Google Inc.
2014, SkySQL Ab, MariaDB Corporation
2015, Daniel Black.
Copy link
Contributor

Choose a reason for hiding this comment

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

Daniel Black is an independent author of all these files in 2015? Surely he would have signed a CLA.

2013, MariaDB Foundation
2018, Monty Program Ab
2019-2020, IBM.
2021, Eric Herman and MariaDB Foundation.
Copy link
Contributor

Choose a reason for hiding this comment

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

Was Eric really an independent author of all these files, not covered by a CLA?

support-files/wsrep_notify.sh
License: GPL-2.0
Comment: These files do not have a GPL 2.0 header.
If someone has obligations, please state otherwise.
Copy link
Contributor

Choose a reason for hiding this comment

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

Yikes! That's not how anything works.

2009-2011, 2013, Monty Program Ab
2011-2012, Oleksandr Byelkin
2011, 2017, MariaDB Corporation
2011, Oleksandr Byelkin
Copy link
Contributor

Choose a reason for hiding this comment

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

Sanja would be covered by his Monty Program / MariaDB Corp employment? Also, why is he listed twice?

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
Copy link
Contributor

Choose a reason for hiding this comment

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

So... License text is here, but not elsewhere? Is that correct?

2001, Korakot Chaovavanich <[email protected]> and
2003, Sathit Jittanupat
2009, 2020, MariaDB Corporation.
License: NTP
Copy link
Contributor

Choose a reason for hiding this comment

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

No, it's not. It is closer to "NTP No Attribution" but that isn't right either. Not even sure what this license is.

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

Successfully merging this pull request may close these issues.

3 participants