Merge ~bryce/ubuntu/+source/virglrenderer:merge-v1.0.0-1-noble into ubuntu/+source/virglrenderer:debian/sid

[Bryce Harrington]

Just one bit of delta remaining, which still must be included. It's been forwarded to Debian but still not taken by them yet:
  https://salsa.debian.org/debian/virglrenderer/-/merge_requests/5

PPA: https://launchpad.net/~bryce/+archive/ubuntu/virglrenderer-merge-v1.0.0-1

No autopkgtests for this package but the PPA shows it builds ok.

[Andreas Hasenack (ahasenack)]

range-diff ok
git range-diff bryce/old/debian..bryce/logical/0.10.4-1ubuntu1 bryce/new/debian..bryce/merge-v1.0.0-1-noble

single delta preserved ok

Debian changes:
only new symbols -> reverse deps? soname was kept. Does qemu need rebuild? Looks like not. I installed qemu-system-gui and ran a quick check, the binaries seem to startup fine without symbols errors. qemu doesn't take so long to rebuild, but I won't request a rebuild test for a devel release.

-Dvenus switched to true, was experimental before, and it was enabled already anyway.

GALLIUM_DRIVER changed from softpipe to llvmpipe. Debian changelog says it's for testing. I don't know what it is, and therefore can't suggest if it's a good or bad move. But since noble is an LTS, we should keep an eye on this.

Release notes for 1.0.0: https://gitlab.freedesktop.org/virgl/virglrenderer/-/releases/1.0.0 look ok.

+1

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, ahasenack
Uploaders: bryce, ahasenack
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

Thanks for the review; uploaded:

 fixup_buildinfo ../virglrenderer_1.0.0-1ubuntu1.dsc ../virglrenderer_1.0.0-1ubuntu1_source.buildinfo
 signfile buildinfo ../virglrenderer_1.0.0-1ubuntu1_source.buildinfo A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB

 fixup_changes dsc ../virglrenderer_1.0.0-1ubuntu1.dsc ../virglrenderer_1.0.0-1ubuntu1_source.changes
 fixup_changes buildinfo ../virglrenderer_1.0.0-1ubuntu1_source.buildinfo ../virglrenderer_1.0.0-1ubuntu1_source.changes
 signfile changes ../virglrenderer_1.0.0-1ubuntu1_source.changes A661100B3DAC1D4F2CAD8A54E603B2578FB8F0FB
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading virglrenderer_1.0.0-1ubuntu1.dsc: done.
  Uploading virglrenderer_1.0.0.orig.tar.bz2: done.
  Uploading virglrenderer_1.0.0-1ubuntu1.debian.tar.xz: done.
  Uploading virglrenderer_1.0.0-1ubuntu1_source.buildinfo: done.
  Uploading virglrenderer_1.0.0-1ubuntu1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index a9d1e19..2ec9982 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+virglrenderer (1.0.0-1ubuntu1) noble; urgency=medium
+
+  * Merge with Debian unstable (LP: #2040435). Remaining changes:
+    - d/rules: Disable video acceleration on Ubuntu until libva gets
+      repromoted
+
+ -- Bryce Harrington <[e-mail]>  Wed, 22 Nov 2023 18:15:12 -0800
+
 virglrenderer (1.0.0-1) unstable; urgency=medium
 
   * New upstream version 1.0.0
@@ -7,6 +15,27 @@ virglrenderer (1.0.0-1) unstable; urgency=medium
 
  -- Gert Wollny <[e-mail]>  Sat, 14 Oct 2023 20:28:16 +0200
 
+virglrenderer (0.10.4-1ubuntu1) lunar; urgency=medium
+
+  * Merge with Debian unstable (LP: #1993453).
+  * Added changes:
+    - d/rules: Disable video acceleration on Ubuntu until libva gets repromoted.
+  * Dropped:
+    - d/p/lp-1950941*: fix out of bounds check
+      (LP #1950941)
+      [Fixed in upstream release 0.10.0]
+    - out-of-bounds write in read_transfer_data()
+      + d/p/CVE-2022-0135.patch: Add test to resource OOB write
+        and fix it in src/vrend_renderer.c, tests/test_fuzzer_formats.c.
+      [Fixed in upstream release 0.10.0]
+    - info leak in vrend_resource_alloc_buffer()
+      + d/p/CVE-2022-0175.patch: clear memory when allocating a
+        host-backed memory resource in src/vrend_renderer.c,
+        tests/test_virgl_transfer.c.
+      [Fixed in upstream release 0.10.0]
+
+ -- Bryce Harrington <[e-mail]>  Thu, 05 Jan 2023 06:49:25 -0800
+
 virglrenderer (0.10.4-1) unstable; urgency=medium
 
   * New upstream version 0.10.4
@@ -63,6 +92,27 @@ virglrenderer (0.10.0-1) unstable; urgency=medium
   * Enable video backend and add dependency accordingly
  -- Gert Wollny <[e-mail]>  Fri, 02 Sep 2022 17:36:05 +0200
 
+virglrenderer (0.9.1-1~exp1ubuntu2) jammy; urgency=medium
+
+  * SECURITY UPDATE: out-of-bounds write in read_transfer_data()
+    - debian/patches/CVE-2022-0135.patch: Add test to resource OOB write
+      and fix it in src/vrend_renderer.c, tests/test_fuzzer_formats.c.
+    - CVE-2022-0135
+  * SECURITY UPDATE: info leak in vrend_resource_alloc_buffer()
+    - debian/patches/CVE-2022-0175.patch: clear memory when allocating a
+      host-backed memory resource in src/vrend_renderer.c,
+      tests/test_virgl_transfer.c.
+    - CVE-2022-0175
+
+ -- Marc Deslauriers <[e-mail]>  Mon, 28 Feb 2022 14:19:07 -0500
+
+virglrenderer (0.9.1-1~exp1ubuntu1) jammy; urgency=medium
+
+  * Merge with Debian unstable (LP: #1959175). Remaining changes:
+    - d/p/lp-1950941*: fix out of bounds check (LP #1950941)
+
+ -- Utkarsh Gupta <[e-mail]>  Fri, 25 Feb 2022 02:23:43 +0530
+
 virglrenderer (0.9.1-1~exp1) experimental; urgency=medium
 
   * New upstream version 0.9.1
@@ -76,6 +126,18 @@ virglrenderer (0.9.0-1~exp1) experimental; urgency=medium
 
  -- Gert Wollny <[e-mail]>  Tue, 06 Apr 2021 15:24:55 +0200
 
+virglrenderer (0.8.2-5ubuntu1) jammy; urgency=medium
+
+  * d/p/lp-1950941*: fix out of bounds check (LP: #1950941)
+
+ -- Christian Ehrhardt <[e-mail]>  Thu, 02 Dec 2021 08:34:48 +0100
+
+virglrenderer (0.8.2-5build1) impish; urgency=medium
+
+  * No-change rebuild to build packages with zstd compression.
+
+ -- Matthias Klose <[e-mail]>  Thu, 07 Oct 2021 12:26:08 +0200
+
 virglrenderer (0.8.2-5) unstable; urgency=medium
 
   [ Christian Ehrhardt ]
diff --git a/debian/control b/debian/control
index dc591e6..e7b4a0e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: virglrenderer
 Section: libs
 Priority: optional
-Maintainer: Gert Wollny <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Gert Wollny <[e-mail]>
 Build-Depends: check,
                debhelper-compat (= 13),
                libdrm-dev,
diff --git a/debian/rules b/debian/rules
index 6ff1f63..1868777 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,19 @@ include /usr/share/dpkg/buildflags.mk
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export CK_TIMEOUT_MULTIPLIER=100
 
+# libva is not currently in Ubuntu main
+ifeq ($(shell dpkg-vendor --query vendor),Ubuntu)
+VIDEO := -Dvideo=false
+else
+VIDEO := -Dvideo=true
+endif
+
 %:
 	dh $@ --buildsystem=meson
 
 configure-opts = \
 	-Dtests=true \
-	-Dvideo=true \
+	$(VIDEO) \
 
 ifneq (armel, ${DEB_HOST_ARCH})
 # vulkan requires 32bit atomic ints, armel lacks one (#1021861)