Ubuntu
spice package

Merge ~paelzer/ubuntu/+source/spice:merge-0.15.0-4-KINETIC into ubuntu/+source/spice:debian/sid

  1. Git
  2. lp:~paelzer/ubuntu/+source/spice
  3. merge-0.15.0-4-KINETIC
  4. Merge into debian/sid
Proposed by Christian Ehrhardt 
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: git-ubuntu bot
Merged at revision: c72a711fe73df53812ef8e6079b8d4a4f36f507d
Proposed branch: ~paelzer/ubuntu/+source/spice:merge-0.15.0-4-KINETIC
Merge into: ubuntu/+source/spice:debian/sid
Diff against target: 382 lines (+288/-2)
4 files modified
debian/changelog (+229/-0)
debian/control (+3/-2)
debian/patches/Revert-reds-start-QXL-devices-if-VM-is-running-fix-r.patch (+55/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Paride Legovini (community) Approve
Canonical Server Reporter Pending
Review via email: mp+430128@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Small merge as follow up to archive rebuild:
https://people.canonical.com/~ginggs/ftbfs-report/test-rebuild-20220914-kinetic-kinetic.html#ubuntu-server-pkgset

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/spice-merge-0.15.0-4-kinetic

Revision history for this message
Paride Legovini (paride) wrote :

Looks good, all the diffs are as expected, the changelog entries are all good, update-maintainer has been run. The dropped change matches is now in Debian (as noted in the changelog). Nothing else to drop. No new delta. The package built fine in the PPA.

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: paelzer, paride
Uploaders: paelzer, paride
MP auto-approved

review: Approve
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

FYI - All builds completed

Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Thanks, uploaded
Uploading spice_0.15.0-4ubuntu1.dsc
Uploading spice_0.15.0-4ubuntu1.debian.tar.xz
Uploading spice_0.15.0-4ubuntu1_source.buildinfo
Uploading spice_0.15.0-4ubuntu1_source.changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index dc91fe1..ada4a5a 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,16 @@
6+spice (0.15.0-4ubuntu1) kinetic; urgency=medium
7+
8+ * Merge with Debian unstable. Remaining changes:
9+ - d/control: Don't recommend -libav gstreamer plugins since it is in
10+ universe. This now downgrades it to a suggest instead of completely
11+ removing the dependency.
12+ - d/p/Revert-reds-start-QXL-devices-if-VM-is-running-fix-r.patch: fix race
13+ on spice init (LP: #1964777)
14+ * Dropped changes:
15+ - test-leaks-fix-the-test-with-OpenSSL3.patch [in 0.15.0-4]
16+
17+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 20 Sep 2022 08:36:12 +0200
18+
19 spice (0.15.0-4) unstable; urgency=medium
20
21 * test-leaks-fix-the-test-with-OpenSSL3.patch:
22@@ -12,6 +25,37 @@ spice (0.15.0-3) unstable; urgency=medium
23
24 -- Michael Tokarev <mjt@tls.msk.ru> Mon, 14 Mar 2022 11:00:39 +0300
25
26+spice (0.15.0-2ubuntu4) jammy; urgency=medium
27+
28+ * d/p/Revert-reds-start-QXL-devices-if-VM-is-running-fix-r.patch: fix race
29+ on spice init (LP: #1964777)
30+
31+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Mon, 21 Mar 2022 09:23:33 +0100
32+
33+spice (0.15.0-2ubuntu3) jammy; urgency=medium
34+
35+ * No-change rebuild against openssl3
36+
37+ -- Simon Chopin <simon.chopin@canonical.com> Wed, 01 Dec 2021 16:10:53 +0000
38+
39+spice (0.15.0-2ubuntu2) jammy; urgency=medium
40+
41+ * d/p/0001-test-leaks-fix-the-test-with-OpenSSL3.patch:
42+ Fix the test suite against OpenSSL3 (LP: #1946198)
43+
44+ -- Simon Chopin <simon.chopin@canonical.com> Wed, 10 Nov 2021 14:22:14 +0100
45+
46+spice (0.15.0-2ubuntu1) jammy; urgency=medium
47+
48+ * Merge with Debian unstable (LP: #1946901). Remaining changes:
49+ - d/control: Don't recommend -libav gstreamer plugins since it is in
50+ universe. This now downgrades it to a suggest instead of completely
51+ removing the dependency.
52+ * Dropped changes
53+ - d/t/automated-tests: avoid test fail due to build errors [in Debian now]
54+
55+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 02 Nov 2021 07:52:12 +0100
56+
57 spice (0.15.0-2) unstable; urgency=medium
58
59 * switch from $DEB_TARGET_MULTIARCH to $DEB_HOST_MULTIARCH
60@@ -35,6 +79,17 @@ spice (0.15.0-1) unstable; urgency=medium
61
62 -- Michael Tokarev <mjt@tls.msk.ru> Fri, 01 Oct 2021 01:17:04 +0300
63
64+spice (0.14.3-2.1ubuntu1) impish; urgency=medium
65+
66+ * Merge with Debian unstable. Remaining changes:
67+ - d/control: Don't recommend -libav gstreamer plugins since it
68+ is in universe. This now downgrades it to a suggest instead
69+ of completely removing the dependency.
70+ - d/t/automated-tests: avoid test fail due to build
71+ errors (Closes: #973803).
72+
73+ -- Miriam España Acebal <miriam.espana@canonical.com> Fri, 13 Aug 2021 14:12:44 +0200
74+
75 spice (0.14.3-2.1) unstable; urgency=medium
76
77 * Non-maintainer upload.
78@@ -45,6 +100,21 @@ spice (0.14.3-2.1) unstable; urgency=medium
79
80 -- Salvatore Bonaccorso <carnil@debian.org> Sun, 28 Feb 2021 16:29:54 +0100
81
82+spice (0.14.3-2ubuntu3) hirsute; urgency=medium
83+
84+ * d/t/automated-tests: avoid test fail due to build errors (Closes: #973803)
85+
86+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 05 Nov 2020 11:23:42 +0100
87+
88+spice (0.14.3-2ubuntu2) hirsute; urgency=medium
89+
90+ * Merge with Debian unstable. Remaining changes:
91+ - d/control: Don't recommend -libav gstreamer plugins since it is in
92+ universe. This now downgrades it to a suggest instead of completely
93+ removing the dependency.
94+
95+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 03 Nov 2020 13:07:45 +0100
96+
97 spice (0.14.3-2) unstable; urgency=medium
98
99 [ Christian Ehrhardt ]
100@@ -69,6 +139,40 @@ spice (0.14.3-2) unstable; urgency=medium
101
102 -- Michael Tokarev <mjt@tls.msk.ru> Thu, 29 Oct 2020 10:57:02 +0300
103
104+spice (0.14.3-1ubuntu2) groovy; urgency=medium
105+
106+ * SECURITY UPDATE: multiple buffer overflows in QUIC image decoding
107+ - debian/patches/CVE-2020-14355-1.patch: check we have some data to
108+ start decoding quic image in subprojects/spice-common/common/quic.c.
109+ - debian/patches/CVE-2020-14355-2.patch: check image size in
110+ quic_decode_begin in subprojects/spice-common/common/quic.c.
111+ - debian/patches/CVE-2020-14355-3.patch: check RLE lengths in
112+ subprojects/spice-common/common/quic_tmpl.c.
113+ - debian/patches/CVE-2020-14355-4.patch: avoid possible buffer overflow
114+ in find_bucket in subprojects/spice-common/common/quic_family_tmpl.c.
115+ - CVE-2020-14355
116+
117+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 01 Oct 2020 07:00:18 -0400
118+
119+spice (0.14.3-1ubuntu1) groovy; urgency=medium
120+
121+ * Merge with Debian unstable (LP: #1881093). Remaining changes:
122+ - d/control: Don't recommend -libav gstreamer plugins since it is in
123+ universe
124+ - make autopkgtests work again
125+ - d/t/automated-tests: spice-common moved into dir subprojects
126+ - d/t/automated-tests: option --enable-automated-tests now is always on
127+ - d/t/control: make tests more debuggable by allowing stderr
128+ - d/t/control: install new test dependency python-pil
129+ - d/t/regression-test.py, d/t/base_test.ppm: add file dropped in release
130+ tarball but needed for autopkgtests
131+ - d/source/include-binaries: allow binary base_test.ppm in package
132+ * Dropped changes
133+ - d/p/lp-1874054-*: fix rescaling and some crashes (LP: 1874054)
134+ [Upstream in 0.14.3]
135+
136+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Thu, 28 May 2020 11:56:04 +0200
137+
138 spice (0.14.3-1) unstable; urgency=medium
139
140 * new upstream version (Closes: #940057, #954629)
141@@ -80,6 +184,49 @@ spice (0.14.3-1) unstable; urgency=medium
142
143 -- Michael Tokarev <mjt@tls.msk.ru> Tue, 14 Apr 2020 16:55:25 +0300
144
145+spice (0.14.2-4ubuntu3) focal; urgency=medium
146+
147+ * d/p/lp-1874054-*: fix rescaling and some crashes (LP: #1874054)
148+
149+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 21 Apr 2020 14:05:18 +0200
150+
151+spice (0.14.2-4ubuntu2) focal; urgency=medium
152+
153+ * No-change rebuild for libgcc-s1 package name change.
154+
155+ -- Matthias Klose <doko@ubuntu.com> Mon, 23 Mar 2020 07:26:08 +0100
156+
157+spice (0.14.2-4ubuntu1) focal; urgency=medium
158+
159+ * Merge with Debian unstable (LP: #1852439). Remaining changes:
160+ - d/control: Don't recommend -libav gstreamer plugins since it is in
161+ universe
162+ - make autopkgtests work again
163+ - d/t/automated-tests: spice-common moved into dir subprojects
164+ - d/t/automated-tests: option --enable-automated-tests now is always on
165+ - d/t/control: make tests more debuggable by allowing stderr
166+ - d/t/control: install new test dependency python-pil
167+ - d/t/regression-test.py, d/t/base_test.ppm: add file dropped in release
168+ tarball but needed for autopkgtests
169+ - d/source/include-binaries: allow binary base_test.ppm in package
170+ * Added changes:
171+ - d/t/automated-tests, d/t/control: make autopkgtests python3 compatible
172+ * Dropped Changes (in Debian):
173+ - d/control: Don't recommend -ugly gstreamer plugins since it is in universe
174+ - d/patches: drop patches being upstream in 0.14.2
175+ - new upstream 0.14.2
176+ - disable failing test-listen
177+ - d/libspice-server1.symbols: update for new symbols in 14.2
178+ - d/p/fix-test-qxl-parsing-on-ppc64el-and-armhf.patch: avoid FTBFS due to
179+ different handling of high words for constants
180+ - d/control: bump build dependency to libspice-protocol-dev >=0.14.0
181+ * Dropped Changes (Upstream)
182+ - SECURITY UPDATE: Integer overflow and buffer overflow CVE-2017-12194
183+ - SECURITY UPDATE: Denial of service CVE-2018-10873
184+ - SECURITY UPDATE: off-by-one error in memslot_get_virt CVE-2019-3813
185+
186+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Wed, 13 Nov 2019 15:54:00 +0100
187+
188 spice (0.14.2-4) unstable; urgency=medium
189
190 * disable failing test-listen (Closes: #941006)
191@@ -127,6 +274,42 @@ spice (0.14.2-1) unstable; urgency=medium
192
193 -- Michael Tokarev <mjt@tls.msk.ru> Fri, 30 Aug 2019 13:54:00 +0300
194
195+spice (0.14.2-0ubuntu2) eoan; urgency=medium
196+
197+ * Fixup autpkgtest (LP: #1834286)
198+ These changes will make the test able to run again, but not output mismatch
199+ errors (this matches the behavior before 0.14.2). Upstream discussion
200+ started on how to resolve that as a next step, more details at the LP bug.
201+ - d/t/automated-tests: spice-common moved into dir subprojects
202+ - d/t/automated-tests: option --enable-automated-tests now is always on"
203+ - d/t/automated-tests, d/t/control: make tests more debuggable by allowing
204+ stderr
205+ - d/t/control: install new test dependency python-pil
206+ - d/t/base_test.ppm, d/t/regression-test.py: provide test resources from
207+ upstream git not part of the released tarball anymore
208+ - d/source/include-binaries: allow binary base_test.ppm in package
209+
210+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Tue, 25 Jun 2019 12:59:01 +0200
211+
212+spice (0.14.2-0ubuntu1) eoan; urgency=medium
213+
214+ * New upstream release
215+ Among many other fixes this will resolve (LP: #1814146)
216+ - d/p/disable-failing-test-listen.patch: disable new test that is
217+ unreliable in the build environment
218+ - d/patches: drop patches being upstream in 0.14.2
219+ + debian/patches/CVE-2017-12194-1.patch
220+ + debian/patches/CVE-2017-12194-2.patch
221+ + debian/patches/CVE-2017-12194-3.patch
222+ + debian/patches/CVE-2018-10873.patch
223+ + debian/patches/CVE-2019-3813.patch
224+ - d/libspice-server1.symbols: update for new symbols in 14.2
225+ - d/p/fix-test-qxl-parsing-on-ppc64el-and-armhf.patch: avoid FTBFS due
226+ to different handling of high words for constants
227+ - d/control: bump build dependency to libspice-protocol-dev >=0.14.0
228+
229+ -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 24 May 2019 12:27:26 +0200
230+
231 spice (0.14.0-1.3) unstable; urgency=medium
232
233 * Non-maintainer upload.
234@@ -149,6 +332,52 @@ spice (0.14.0-1.1) unstable; urgency=medium
235
236 -- Salvatore Bonaccorso <carnil@debian.org> Sat, 15 Sep 2018 09:15:28 +0200
237
238+spice (0.14.0-1ubuntu5) disco; urgency=medium
239+
240+ * SECURITY UPDATE: off-by-one error in memslot_get_virt
241+ - debian/patches/CVE-2019-3813.patch: fix checks in server/memslot.c,
242+ add tests to server/tests/test-qxl-parsing.c.
243+ - CVE-2019-3813
244+ * debian/tests/automated-tests: fix incorrect test name, don't fail on
245+ build writing to stderr.
246+
247+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com> Thu, 24 Jan 2019 08:58:10 -0500
248+
249+spice (0.14.0-1ubuntu4) cosmic; urgency=medium
250+
251+ * SECURITY UPDATE: Denial of service
252+ - debian/patches/CVE-2018-10873.patch: fix in
253+ spice-common/python_modules/demarshal.py,
254+ - CVE-2018-10873
255+
256+ -- Leonidas S. Barbosa <leo.barbosa@canonical.com> Mon, 20 Aug 2018 13:26:02 -0300
257+
258+spice (0.14.0-1ubuntu3) cosmic; urgency=medium
259+
260+ * SECURITY UPDATE: Integer overflow and buffer overflow
261+ - debian/patches/CVE-2017-12194-1.patch: fix a integer overflow
262+ computing sizes in spice-common/python_modules/demarshal.py.
263+ - debian/patches/CVE-2017-12194-2.patch: avoid integer overflow
264+ in spice-common/python_modules/demarshal.py,
265+ spice-common/python_modules/marshal.py.
266+ - debian/patches/CVE-2017-12194-3.patch: add tests to verify fix.
267+ - CVE-2017-12194
268+
269+ -- Leonidas S. Barbosa <leo.barbosa@canonical.com> Tue, 22 May 2018 14:53:01 -0300
270+
271+spice (0.14.0-1ubuntu2) bionic; urgency=high
272+
273+ * No change rebuild against openssl1.1.
274+
275+ -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 06 Feb 2018 17:55:31 +0000
276+
277+spice (0.14.0-1ubuntu1) bionic; urgency=medium
278+
279+ * Don't recommend -ugly or -libav gstreamer plugins since they
280+ are in universe
281+
282+ -- Jeremy Bicha <jbicha@ubuntu.com> Wed, 01 Nov 2017 21:55:03 -0400
283+
284 spice (0.14.0-1) unstable; urgency=medium
285
286 * New upstream release
287diff --git a/debian/control b/debian/control
288index de80ee9..f6eeeb2 100644
289--- a/debian/control
290+++ b/debian/control
291@@ -1,7 +1,8 @@
292 Source: spice
293 Section: misc
294 Priority: optional
295-Maintainer: Debian QEMU Team <pkg-qemu-devel@lists.alioth.debian.org>
296+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
297+XSBC-Original-Maintainer: Debian QEMU Team <pkg-qemu-devel@lists.alioth.debian.org>
298 Uploaders: Michael Tokarev <mjt@tls.msk.ru>
299 Build-Depends:
300 debhelper-compat (= 13),
301@@ -35,10 +36,10 @@ Multi-Arch: same
302 Pre-Depends: ${misc:Pre-Depends}
303 Depends: ${misc:Depends}, ${shlibs:Depends}
304 Recommends:
305- gstreamer1.0-libav,
306 gstreamer1.0-plugins-base,
307 gstreamer1.0-plugins-good,
308 Suggests:
309+ gstreamer1.0-libav,
310 gstreamer1.0-plugins-ugly,
311 Description: Implements the server side of the SPICE protocol
312 The Simple Protocol for Independent Computing Environments (SPICE) is
313diff --git a/debian/patches/Revert-reds-start-QXL-devices-if-VM-is-running-fix-r.patch b/debian/patches/Revert-reds-start-QXL-devices-if-VM-is-running-fix-r.patch
314new file mode 100644
315index 0000000..4a816f5
316--- /dev/null
317+++ b/debian/patches/Revert-reds-start-QXL-devices-if-VM-is-running-fix-r.patch
318@@ -0,0 +1,55 @@
319+From 252729adbdca81e0ceefe8e4fc48b8cab83bfcf5 Mon Sep 17 00:00:00 2001
320+From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
321+Date: Mon, 21 Mar 2022 09:07:08 +0100
322+Subject: [PATCH] Revert "reds: start QXL devices if VM is running" (fix race)
323+
324+Due to reds->vm_running being initialized to TRUE (since c302e12c
325+"spice.h: add entries for tracking vm state") the assumption in c23cbd6f
326+"reds: start QXL devices if VM is running" was wrong and we can't check
327+on vm_running until that initalization isn't on TRUE (it is that way for
328+backward compatibility).
329+
330+Without this revert on qemu initializing spice we will have the
331+display_init side of qemu not yet ready and therefore respond badly when
332+spice sends an event as raction to `red_qxl_start`:
333+ "qxl_send_events: spice-server bug: guest stopped, ignoring."
334+
335+At least with qemu > v2.0 as a spice consumer is not showing issues as
336+`red_qxl_start` will be called just after the qemu side is ready
337+`qemu_spice_display_start` -> `spice_server_vm_start` ... `red_qxl_start`.
338+
339+Therefore - for now to avoid the current regression - Revert c23cbd6f
340+"reds: start QXL devices if VM is running" until that old (2012)
341+initialization is updated (probably an ABI change and therefore taking
342+some time).
343+
344+Fixes: https://gitlab.freedesktop.org/spice/spice/-/issues/64
345+
346+This reverts commit c23cbd6fa821fea8ac4ed97ca679afebe2333c8c.
347+---
348+ server/reds.cpp | 3 ---
349+
350+1 file changed, 3 deletions(-)
351+
352+Forwarded: https://gitlab.freedesktop.org/spice/spice/-/merge_requests/202
353+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/spice/+bug/1964777
354+Bug-Upstream: https://gitlab.freedesktop.org/spice/spice/-/issues/64
355+Last-Update: 2022-03-21
356+
357+diff --git a/server/reds.cpp b/server/reds.cpp
358+index 11eb4cb27e..1ada47d8be 100644
359+--- a/server/reds.cpp
360++++ b/server/reds.cpp
361+@@ -3244,9 +3244,6 @@ SPICE_GNUC_VISIBLE int spice_server_add_interface(SpiceServer *reds,
362+ * be called. */
363+ red_qxl_attach_worker(qxl);
364+ red_qxl_set_compression_level(qxl, calc_compression_level(reds));
365+- if (reds->vm_running) {
366+- red_qxl_start(qxl);
367+- }
368+ } else if (strcmp(base_interface->type, SPICE_INTERFACE_TABLET) == 0) {
369+ SpiceTabletInstance *tablet = SPICE_UPCAST(SpiceTabletInstance, sin);
370+ spice_debug("SPICE_INTERFACE_TABLET");
371+--
372+2.35.1
373+
374diff --git a/debian/patches/series b/debian/patches/series
375index 1617056..611d157 100644
376--- a/debian/patches/series
377+++ b/debian/patches/series
378@@ -2,3 +2,4 @@ disable-failing-test-listen.patch
379 do-not-run-nonexisting-doxygen-sh.patch
380 build-Correctly-check-for-Python-modules.patch
381 test-leaks-fix-the-test-with-OpenSSL3.patch
382+Revert-reds-start-QXL-devices-if-VM-is-running-fix-r.patch

Subscribers

People subscribed via source and target branches