[sru] sos upstream 4.7.0

The above debdiffs have been added, and ready for verification

We are waiting for the 4.4 main patch for bionic in #2038648 to be uploaded before we crack on with the Pro update for bionic for 4.7.0

The attachment "noble-sosreport.debdiff" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

@Arif are the attached debdiffs ready to be uploaded? I do not know if I get it right, but the bug you mentioned is not yet fixed:

https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2038648

If this is ready for ~ubuntu-sponsors, please state so. If not, please unsubscribe ~ubuntu-sponsors and subscribe again once it is ready.

@Lucas, it is ready.

We were planning to resolve that bug as part of the whole SRU of 4.7.0.

When n/m/j/f are done, we'll get the bionic one done too, and that will be 4.7.0 as well, I hope that makes sense.

Or, would you prefer us to fix the current version there first, and then do the SRU for 4.7.0?

EDIT: in-fact I already uploaded a debdiff on that LP, so that is ready for SRU for that fix too

new debdiff with new oracular being the version, and building on top of the 2 versions that were not there previously

I pushed the oracular debdiff to a git repo at
https://code.launchpad.net/~ahasenack/ubuntu/+source/sosreport/+git/sosreport/+ref/oracular-patch-pilot-sosreport-update-2054395

I'm slightly concerned with the d/copyright changes. We seem to be removing attributions from others:

diff -Nru sosreport-4.5.6/debian/copyright sosreport-4.7.0/debian/copyright
--- sosreport-4.5.6/debian/copyright 2024-04-14 22:45:27.000000000 +0100
+++ sosreport-4.7.0/debian/copyright 2024-05-01 07:51:23.000000000 +0100
@@ -1,36 +1,8 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sosreport
-Upstream-Contact: Bryn M. Reeves <email address hidden>
+Upstream-Contact: Jake Hunsaker <email address hidden>
 Source: https://github.com/sosreport/sos

-Files: *
-Copyright: 2012-2013 Bryn M. Reeves
- 2007-2013 Red Hat, Inc.
-License: GPL-2+
-
-Files: sos/report/plugins/kernelrt.py
-Copyright: 2012 Red Hat, Inc.
-License: GPL-2
-
-Files: debian/*
-Copyright: 2013 Adam Stokes <email address hidden>
-License: GPL-2+
-
-License: GPL-2
- 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; version 2.
- .
- This application 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.
- .
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
- USA.
-
 License: GPL-2+
  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

For example, the plugin sos/report/plugins/kernelrt.py is still shipped, and has the Red Hat Inc copyright text in it.

I know this change was done in the upstream git repo[1], but one of the authors is the same one pushing the change here. Previously all debian/* files were removed[2], but what was restored in [1] is not the same d/copyright.

1. https://github.com/sosreport/sos/commit/314cc502ac862494973712537bf7a7a0c34f96d8
2. https://github.com/sosreport/sos/commit/098d19684456eceb6bc2cea094b30effa19c37fc

Hi Andreas,

This was discussed in the PR [1], let me see if I can answer your questions

* All the files that need a copyright have the copyright at the top of the files, and hence not therefore require here. If we started to add all the copyright stuff, then this file would be considerably long
* The upstream core maintainer changed a few years ago, and Bryn is still one of the old maintainers, and he didn't have any issues with the change.
* I can change the debian/* back again, if that needs to change to have Adam the related copyright.

One of the main reasons of up-streaming the debian folder was to improve the CI testing, especially with some of the tests we had failed as part of SRU previously. The key thing was to be consistent upstream and downstream.

Happy to discuss the best course of action moving forward on this

[1] https://github.com/sosreport/sos/pull/3409#discussion_r1387216668

Looking at [1], it states:

  Similarly, plain text files which include their own copyright information and are installed into
  the binary package unmodified need not have that copyright information copied into
  /usr/share/doc/PACKAGE/copyright

So in principle it's ok to drop the specific entry for the kernelrt.py plugin.

The debian/* entry I don't know, I see many packages have an entry like that, while others don't. The files in debian/* themselves don't have any copyright note on them, and not all are part of the final binary installation. On the other hand, removing this stanza from d/copyright means we also lose the information on who did the original packaging.

But another change is removing GPL-2+ for "Files: *". I'm not sure it was even correct before, as the LICENSE file in the source tree is clearly just "GPL-2" (no +). So we would have to track that one down.

See how this can get complicated very quickly? Changes to d/copyright need to be meticulously verified. I would prefer they are not done here, unless such careful verification and cross-checking with the debian policy is done, and also coordination with the same package in debian.

So if you want to change d/copyright, my recommendation would be to:
- do that in a branch of its own
- coordinate with debian, so both debian and ubuntu have the same file. Might need to update the version of the package in debian first, though (which would also benefit us both)

1. https://www.debian.org/doc/debian-policy/ch-archive.html#s-pkgcopyright

Sounds good to me, I'll revert the copyright change and upload new debdiffs for all. We can tackle the copyright file in a later SRU.