[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-06-03 Thread Robie Basak
Further to discussion in #ubuntu-devel just now[1], we'll aim for a 4.7.3 release that will eliminate the need for the distro patches and with Steve's other comments above addressed. For now then I'll reject the current uploads from the queue. [1]:

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-27 Thread Arif Ali
> Why, when this is an upstream release for which Canonical is the upstream, are there local Debian patches included here? Good point, we started the SRU process after 4.7.0 was released, but the time it took us to test the PPA and then the beginning of the patch pilot the noble released a minor

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-24 Thread Steve Langasek
+ * New patches: +- d/p/0002-collect-refactor-_format_version.patch +- d/p/0003-pacemaker-Use-pep440-formatted-version-on-comparison.patch +- d/p/0004-cirrus-Run-tests-on-latest-daily-builds-for-ubuntu.patch +- d/p/0005-processor-handle-msr-module-loading-via-predicate.patch Why,

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-24 Thread Andreas Hasenack
It's my understanding all uploads were done, including stable releases, where they landed in the unapproved queue. Therefore there is nothing else to sponsor here, so I'm removing that subscription, as it's now in the hands of the SRU team for their normal queue processing. -- You received this

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-22 Thread Launchpad Bug Tracker
This bug was fixed in the package sosreport - 4.7.0-0ubuntu1 --- sosreport (4.7.0-0ubuntu1) oracular; urgency=medium * New 4.7.0 upstream release. (LP: #2054395) * For more details, full release note is available here: - https://github.com/sosreport/sos/releases/tag/4.7.0

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-22 Thread Mauricio Faria de Oliveira
Autopkgtests for oracular/cockpit/s390x passed with a retry, that should unblock the oracular-proposed migration shortly. 316-1build1 sosreport/4.7.0-0ubuntu12024-05-22 15:19:06 UTC 0h 04m 29s mfo pass 1bc3dca3-467e-430b-b336-fe8c1f19b6d5 -- You received

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-21 Thread Athos Ribeiro
Be aware that, if/when those packages land, they do not fix LP: #2038648 (but that could be closed since bionic has reached EOSS anyway). -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2054395 Title:

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-21 Thread Athos Ribeiro
Hi Arif, sounds good. I applied the changes below and uploaded it for all series. oracular: I removed the ':' in the changelog entry as mentioned before, fixed the capital DEP3 header I also mentioned, and uploaded. noble: Removed the ':' as above, fixed the version in the changelog to

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-21 Thread Arif Ali
Hi Athos, sounds good to me; thanks for your detailed notes -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2054395 Title: [sru] sos upstream 4.7.0 To manage notifications about this bug go to:

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-21 Thread Athos Ribeiro
Thanks for the changes, Arif. I am reviewing the oracular changes only for now so we can get everyhing right in that one and then we can proceed to checking the SRU candidates. - The changes still correctly match the upstream changes - The patches introduced correctly match their upstream

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-14 Thread Arif Ali
Thanks for your comments, and the amendments that you have asked for. The relevant Origin + Bugs for DEP3 have all been updated on all the debdiffs. I have also updated mantic changelog, and focal to be consistent. To answer your question on the `X-Python3-Version: >= 3.6`, this is explicitly

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-14 Thread Arif Ali
** Patch added: "focal-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5778350/+files/focal-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-14 Thread Arif Ali
** Patch added: "jammy-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5778348/+files/jammy-sosreport.debdiff ** Patch removed: "focal-sosreport.debdiff"

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-14 Thread Arif Ali
** Patch added: "mantic-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5778347/+files/mantic-sosreport.debdiff ** Patch removed: "jammy-sosreport.debdiff"

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-14 Thread Arif Ali
** Patch removed: "noble-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5776703/+files/noble-sosreport.debdiff ** Patch added: "noble-sosreport.debdiff"

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-14 Thread Arif Ali
** Patch removed: "oracular-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5777621/+files/oracular-sosreport.debdiff ** Patch added: "oracular-sosreport.debdiff"

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-14 Thread Athos Ribeiro
Thanks, Arif. The contents are correct as per the upstream release. For the `X-Python3-Version: >= 3.6` entry in d/control, I kept wondering if it is this needed in anything other than bionic and I wonder how the SRU team will look at that. Unless we are supporting upgrade paths that would skip

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-12 Thread Arif Ali
Updated debdiff as suggested ** Patch removed: "oracular-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5776702/+files/oracular-sosreport.debdiff ** Patch added: "oracular-sosreport.debdiff"

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-12 Thread Athos Ribeiro
I see. So, patch debian/patches/0006-cirrus-Update-images-add-noble-to- supported-list.patch is not needed here then, right? And the changes in patch .cirrus.yml in patch debian/patches/0007-cirrus-Start-testing-on-new-devel-ubuntu-daily.patch are also not needed, right? If my assumptions above

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-10 Thread Arif Ali
The new patch that was added at the end was about the msr module loading and was also present in the CI testing we found upstream and hence added it on. In the original patch that is in noble it was == 24.04 and now it's >=24.04 this will ensure it covers any series that is noble and above, I

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Athos Ribeiro
Thanks, Arif. Thanks for fixing the typo in the focal changelog. For oracular, I see 2 new patches for cirrus (I see one of them is also present for noble). Why are we patching that file at all? AFAIU, it is a file parsed by the CI, and it is not even sipped in the package. -- You received

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Arif Ali
** Patch added: "focal-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5776707/+files/focal-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Arif Ali
** Patch added: "jammy-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5776706/+files/jammy-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Arif Ali
** Patch added: "mantic-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5776704/+files/mantic-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Arif Ali
-- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2054395 Title: [sru] sos upstream 4.7.0 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu-pro/+bug/2054395/+subscriptions

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Arif Ali
** Patch added: "oracular-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5776702/+files/oracular-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Arif Ali
** Patch added: "noble-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5776703/+files/noble-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Arif Ali
** Patch removed: "focal-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5775312/+files/focal-sosreport.debdiff ** Patch removed: "jammy-sosreport.debdiff"

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Athos Ribeiro
Thanks for the reply, Arif. Regarding the new upstream version: I understand it is not practical to go for 4.7.1 now given your explanation. Let's go with 4.7.0 then. As for the bogus debdiffs, please, fix them and make them apply cleanly with debdiff-apply. This will at least slightly reduce

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-09 Thread Arif Ali
@athos-ribeiro @eeickmeyer I created the debdiff by comparing the 2 .dsc files, and indeed it include the file, as well it's symbolic linked file to be changed. I have re-ran the debdiff locally again this morning, and I can see the same thing. I can remove the offending section, and have been

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-08 Thread Erich Eickmeyer
@athos-ribeiro A debdiff should most certainly not be trying to patch a symlink. I'd recommend trying it with `patch -p1 < {debdiff}` and build the source package to see if it works. If it complains about changes to the source that aren't reflected, then yes, there's a problem with the debdiff,

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-08 Thread Athos Ribeiro
Oh, there is one additional issue: debdiff-apply failis with File man/en/sosreport.1 is not a regular file -- refusing to patch 2 out of 2 hunks ignored ... Traceback (most recent call last): File "/usr/bin/debdiff-apply", line 382, in sys.exit(main(sys.argv[1:]))

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-08 Thread Athos Ribeiro
Thanks, Arif, the changes LGTM. I have a couple of questions: - The maintainer field in d/control was reset. Was this on purpose? - Version 4.7.1 is out since 2024-04-08; I understand this was first prepared prior that date. Still, I should ask: would you rather prepare 4.7.1 here to avoid

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-05 Thread Arif Ali
** Patch added: "jammy-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5775311/+files/jammy-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-05 Thread Arif Ali
** Patch added: "noble-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5775309/+files/noble-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-05 Thread Arif Ali
** Patch added: "focal-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5775312/+files/focal-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-05 Thread Arif Ali
** Patch added: "mantic-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5775310/+files/mantic-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-05 Thread Arif Ali
** Patch removed: "oracular-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5773527/+files/oracular-sosreport.debdiff ** Patch removed: "noble-sosreport.debdiff"

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-03 Thread Arif Ali
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. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2054395 Title:

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-03 Thread Andreas Hasenack
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

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-03 Thread Arif Ali
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

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-03 Thread Andreas Hasenack
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

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-01 Thread Arif Ali
** Patch added: "oracular-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/oracular/+source/sosreport/+bug/2054395/+attachment/5773527/+files/oracular-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-01 Thread Arif Ali
new debdiff with new oracular being the version, and building on top of the 2 versions that were not there previously ** Patch removed: "noble-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/oracular/+source/sosreport/+bug/2054395/+attachment/5772881/+files/noble-sosreport.debdiff **

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-05-01 Thread Arif Ali
** Also affects: sosreport (Ubuntu Oracular) Importance: Medium Assignee: Arif Ali (arif-ali) Status: In Progress -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/2054395 Title: [sru]

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-04-30 Thread Arif Ali
Updated noble debdiff with a couple of fixes for py3.12 and `msr` module load on noble ** Patch removed: "noble-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/jammy/+source/sosreport/+bug/2054395/+attachment/5757528/+files/noble-sosreport.debdiff ** Patch added:

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-04-26 Thread Arif Ali
** Changed in: sosreport (Ubuntu Focal) Importance: Undecided => Medium ** Changed in: sosreport (Ubuntu Jammy) Importance: Undecided => Medium ** Changed in: sosreport (Ubuntu Mantic) Importance: Undecided => Medium ** Changed in: sosreport (Ubuntu Noble) Importance: Undecided =>

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-04-26 Thread Arif Ali
@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

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-04-25 Thread Lucas Kanashiro
@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

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-03-20 Thread Ubuntu Foundations Team Bug Bot
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,

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-03-20 Thread Arif Ali
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 -- You received this bug notification because you are a member of Ubuntu Bugs, which is

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-03-20 Thread Arif Ali
** Patch added: "focal-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5757531/+files/focal-sosreport.debdiff ** Tags added: sts-sru-needed -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-03-20 Thread Arif Ali
** Patch added: "noble-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5757528/+files/noble-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-03-20 Thread Arif Ali
** Patch added: "jammy-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5757530/+files/jammy-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-03-20 Thread Arif Ali
** Patch added: "mantic-sosreport.debdiff" https://bugs.launchpad.net/ubuntu/+source/sosreport/+bug/2054395/+attachment/5757529/+files/mantic-sosreport.debdiff -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu.

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-03-18 Thread David Negreira
** Description changed: - [IMPACT] + [ Impact ] - The sos team is pleased to announce the release of sos-4.7.0 This - release focused on expanding support in policies for more and multiple - package managers. + * A new sosreport version is available upstream, and following the +

[Bug 2054395] Re: [sru] sos upstream 4.7.0

2024-03-18 Thread David Negreira
** Description changed: [IMPACT] The sos team is pleased to announce the release of sos-4.7.0 This release focused on expanding support in policies for more and multiple package managers. [TEST PLAN] Documentation for Special Cases: https://wiki.ubuntu.com/SosreportUpdates