Bug#1035297: unblock: qemu/1:7.2+dfsg-6
04.05.2023 00:00, Sebastian Ramacher wrote: .. 1. sync with upstream qemu stable/bugfix 7.2.1 release, by removing all patches in debian/patches/master/ and replacing them all with single debian/patches/v7.2.1.diff which is a diff between upstream qemu 7.2.0 and 7.2.1 releases. This is a bulk of the changes in there. See "Other info" section below for more information. 2. Includes upstream qemu stable/bugfix 7.2.2 release. Upstream 7.2.2 needs its own comment. Historically, qemu stable were managed up until next major release is out. Here, 7.2.2 was planned to be tagged the next day after 8.0.0 has been released (8.0 release didn't follow its schedule because of the amount of bugfixes needed there). So by the historical practice 7.2.2 should not be released. But I plan to change this practice, by providing a bit more support for previous major release of qemu, past the next major release date, and also plan to perform at least one more 7.2 upstream stable/bugfix release. We're discussing this on the qemu side. Either way, 7.2.2 is officially tagged in the upstream qemu git tree: https://gitlab.com/qemu-project/qemu/-/tags/v7.2.2 so it's only matter of making a tarball out of it and making an official announcement. So why is that added as a patch instead of uploading the new upstream release? It's been done this way in qemu debian package for ages, for decades. I don't remember anymore why it is. All previous stable qemu releases has been applied as patches to debian. It's always qemu-n.m (instead of qmu-n.m.p) and a patch n.m.p.diff on top. I think it might be relate to the huge size of orig.tar.gz and tiny stable/bugfix release difference on top (but later we reduced orig.tar.gz greatly by removing submodules which exists as separate packages in debian). Maybe we should stop doing this strange thing, but that's not bookworm material I guess. I already packaged 8.0 instead of 8.0.0 for bookworm+1 :) This wont make the diff smaller though. Speaking of actual 7.2.2, I can't reach Michael Roth, who did all official qemu releases during recent years (it is his gpg key which is used to sign the tarballs). I hope to get 7.2.2 out for real. Thanks! /mjt
Bug#1035297: unblock: qemu/1:7.2+dfsg-6
Control: tags -1 moreinfo On 2023-04-30 11:07:51 +0300, Michael Tokarev wrote: > Package: release.debian.org > Severity: normal > User: release.debian@packages.debian.org > Usertags: unblock > X-Debbugs-Cc: pkg-qemu-de...@lists.alioth.debian.org > > Please unblock package qemu > > This debian release has the following: > > 1. sync with upstream qemu stable/bugfix 7.2.1 release, by removing >all patches in debian/patches/master/ and replacing them all with >single debian/patches/v7.2.1.diff which is a diff between upstream >qemu 7.2.0 and 7.2.1 releases. This is a bulk of the changes in there. >See "Other info" section below for more information. > > 2. Includes upstream qemu stable/bugfix 7.2.2 release. >Upstream 7.2.2 needs its own comment. Historically, qemu stable >were managed up until next major release is out. Here, 7.2.2 >was planned to be tagged the next day after 8.0.0 has been >released (8.0 release didn't follow its schedule because of the >amount of bugfixes needed there). So by the historical practice >7.2.2 should not be released. But I plan to change this practice, >by providing a bit more support for previous major release of >qemu, past the next major release date, and also plan to perform >at least one more 7.2 upstream stable/bugfix release. We're >discussing this on the qemu side. Either way, 7.2.2 is officially >tagged in the upstream qemu git tree: > https://gitlab.com/qemu-project/qemu/-/tags/v7.2.2 >so it's only matter of making a tarball out of it and making >an official announcement. So why is that added as a patch instead of uploading the new upstream release? Cheers > > 3. Includes a few more fixes which are taken from the upstream >development mailing list, targetting next upstream releases >(including stable), which fixes known issues. > > 4. Includes minor changes in the debian packaging, like fixing >FTBFS due to unportable usage of \n escapes with echo and >switching gbp.conf from master branch to debian-bookworm >branch, and also includes the forgotten .desktop file which >results in a missing icon file for qemu-system processes. > > The whole thing seems quite large, and when you look at the diffstat > it is large: >3k LOC changed. But this is mostly due to the conversion > from debian/patches/master/* to debian/patches/v7.2.1.diff. > > [ Reason ] > > This debian release has numerous bug fixes which affects many aspects > of qemu functionality within debian. I will be targetting bookworm > proposed updates with the same functionality if it misses initial > bookworm release. This also includes a fix for relatively old issue > which is more specific to debian: aptitude segfaulted within qemu-user > environments, #811087. > > [ Tests ] > > The release is well-tested, as it is usual for all qemu stable releases, > due to qemu excellent CI/testsuite. I verified it, together with extra > changes, wihin my set of tests too. The extra changes (on top of 7.2.2) > has also been discussed and tested. > > [ Risks ] > > As usual, the risk of breaking something do exists. Some unusual use > case or guest which we didn't cover by testing and don't yet know about. > Still, the amount of real, actual fixes included is much more than possible > breakage. > > [ Checklist ] > [x] all changes are documented in the d/changelog > [x] I reviewed all changes and I approve them > [x] attach debdiff against the package in testing > > [ Other info ] > > Since the direct diff between 1:7.2+dfsg-5 and 1:7.2+dfsg-6 is quite large, > it's difficult to review. So I'm including 2 diffs instead. > > 1. 7.2+dfsg-6~no-v7.2.2.diff - I made an intermediate "syncing point" > debian "release", which is just a sync with upstream 7.2.1. This diff > is a difference in *source* (excluding debian/ but including d/patches > parts) between extracted 7.2+dfsg-5 and 7.2+dfsg-6 but without the v7.2.2.diff > and the extra 7.2+dfsg-6 patches. This diff shows just the sync between > debian qemu and 7.2.1 upstream qemu release, plus the changes in d/patches > which made it. The change in here is just 4 commits: > version bump to 7.2.1 > block: Handle curl 7.55.0, 7.85.0 version changes > build-sys: fix crlf-ending C code (only affects win32 builds) > tests/tcg: fix unused variable in linux-test (fix test failure) > all can be found here: https://gitlab.com/qemu-project/qemu/-/commits/v7.2.1 > > 2. From 7.2+dfsg~6-no-v7.2.2, there's another diff to the final 7.2+dfsg-6 > release, now comparing debian/ parts only. This includes addition of > v7.2.2.diff (and removal of CVE-2022-1050.patch), addition of 3 other > patches to the source fixing more bugs, and other changes to debian/. > All individual changes in v7.2.2.diff are available at > https://gitlab.com/qemu-project/qemu/-/commits/v7.2.2 - it contains > a bunch of various bugfixes in individual commits with descriptions. >
Bug#1035297: unblock: qemu/1:7.2+dfsg-6
30.04.2023 11:07, Michael Tokarev пишет: ... branch, and also includes the forgotten .desktop file which results in a missing icon file for qemu-system processes. And as I found out later, I should not ship debian-specific qemu.desktop file, since upstream provides its own, I just forgot to include it into the binary package. In the next qemu release I removed d/qemu.desktop amd added a line to d/qemu-system-common.install instead, but forgot to do the same for bookworm. /mjt
Bug#1035297: unblock: qemu/1:7.2+dfsg-6
Package: release.debian.org Severity: normal User: release.debian@packages.debian.org Usertags: unblock X-Debbugs-Cc: pkg-qemu-de...@lists.alioth.debian.org Please unblock package qemu This debian release has the following: 1. sync with upstream qemu stable/bugfix 7.2.1 release, by removing all patches in debian/patches/master/ and replacing them all with single debian/patches/v7.2.1.diff which is a diff between upstream qemu 7.2.0 and 7.2.1 releases. This is a bulk of the changes in there. See "Other info" section below for more information. 2. Includes upstream qemu stable/bugfix 7.2.2 release. Upstream 7.2.2 needs its own comment. Historically, qemu stable were managed up until next major release is out. Here, 7.2.2 was planned to be tagged the next day after 8.0.0 has been released (8.0 release didn't follow its schedule because of the amount of bugfixes needed there). So by the historical practice 7.2.2 should not be released. But I plan to change this practice, by providing a bit more support for previous major release of qemu, past the next major release date, and also plan to perform at least one more 7.2 upstream stable/bugfix release. We're discussing this on the qemu side. Either way, 7.2.2 is officially tagged in the upstream qemu git tree: https://gitlab.com/qemu-project/qemu/-/tags/v7.2.2 so it's only matter of making a tarball out of it and making an official announcement. 3. Includes a few more fixes which are taken from the upstream development mailing list, targetting next upstream releases (including stable), which fixes known issues. 4. Includes minor changes in the debian packaging, like fixing FTBFS due to unportable usage of \n escapes with echo and switching gbp.conf from master branch to debian-bookworm branch, and also includes the forgotten .desktop file which results in a missing icon file for qemu-system processes. The whole thing seems quite large, and when you look at the diffstat it is large: >3k LOC changed. But this is mostly due to the conversion from debian/patches/master/* to debian/patches/v7.2.1.diff. [ Reason ] This debian release has numerous bug fixes which affects many aspects of qemu functionality within debian. I will be targetting bookworm proposed updates with the same functionality if it misses initial bookworm release. This also includes a fix for relatively old issue which is more specific to debian: aptitude segfaulted within qemu-user environments, #811087. [ Tests ] The release is well-tested, as it is usual for all qemu stable releases, due to qemu excellent CI/testsuite. I verified it, together with extra changes, wihin my set of tests too. The extra changes (on top of 7.2.2) has also been discussed and tested. [ Risks ] As usual, the risk of breaking something do exists. Some unusual use case or guest which we didn't cover by testing and don't yet know about. Still, the amount of real, actual fixes included is much more than possible breakage. [ Checklist ] [x] all changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in testing [ Other info ] Since the direct diff between 1:7.2+dfsg-5 and 1:7.2+dfsg-6 is quite large, it's difficult to review. So I'm including 2 diffs instead. 1. 7.2+dfsg-6~no-v7.2.2.diff - I made an intermediate "syncing point" debian "release", which is just a sync with upstream 7.2.1. This diff is a difference in *source* (excluding debian/ but including d/patches parts) between extracted 7.2+dfsg-5 and 7.2+dfsg-6 but without the v7.2.2.diff and the extra 7.2+dfsg-6 patches. This diff shows just the sync between debian qemu and 7.2.1 upstream qemu release, plus the changes in d/patches which made it. The change in here is just 4 commits: version bump to 7.2.1 block: Handle curl 7.55.0, 7.85.0 version changes build-sys: fix crlf-ending C code (only affects win32 builds) tests/tcg: fix unused variable in linux-test (fix test failure) all can be found here: https://gitlab.com/qemu-project/qemu/-/commits/v7.2.1 2. From 7.2+dfsg~6-no-v7.2.2, there's another diff to the final 7.2+dfsg-6 release, now comparing debian/ parts only. This includes addition of v7.2.2.diff (and removal of CVE-2022-1050.patch), addition of 3 other patches to the source fixing more bugs, and other changes to debian/. All individual changes in v7.2.2.diff are available at https://gitlab.com/qemu-project/qemu/-/commits/v7.2.2 - it contains a bunch of various bugfixes in individual commits with descriptions. If this is too difficult for the release team to handle, I'm open to changing it somehow. All changes, in my opinion, are worth to have in bookworm, each and all were thought about with care. unblock qemu/1:7.2+dfsg-6 === begin changelog qemu (1:7.2+dfsg-6) unstable; urgency=medium [ Michael Tokarev ] * sync with upstream v7.2.1 stable release, into
