From: Raspbian automatic forward porter <root@raspbian.org>
Date: Mon, 5 Jun 2023 03:49:04 +0000 (+0100)
Subject: Merge version 1.48.2-1+rpi1 and 1.48.2-1+deb12u1 to produce 1.48.2-1+rpi1+deb12u1
X-Git-Tag: archive/raspbian/1.48.2-1+rpi1+deb12u1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=96376e48af3571e70f65dac52e2d1073533f840e;p=guestfs-tools.git

Merge version 1.48.2-1+rpi1 and 1.48.2-1+deb12u1 to produce 1.48.2-1+rpi1+deb12u1
---

96376e48af3571e70f65dac52e2d1073533f840e
diff --cc debian/changelog
index cc10e71,9dde9ed..28cd6a5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,11 +1,21 @@@
- guestfs-tools (1.48.2-1+rpi1) bookworm-staging; urgency=medium
++guestfs-tools (1.48.2-1+rpi1+deb12u1) bookworm-staging; urgency=medium
 +
 +  [changes brought forward from 1.46.1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 28 Jan 2022 00:01:59 +0000]
 +  * Disable testsuite and remove test-only build-dependencies.
 +
 +  [changes introduced in 1.48.1-1+rpi1 by Peter Michael Green]
 +  * Add build-depends on qmeu-tools.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 30 Jul 2022 03:54:05 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Mon, 05 Jun 2023 03:49:03 +0000
++
+ guestfs-tools (1.48.2-1+deb12u1) bookworm-security; urgency=high
+ 
+   * Non-maintainer upload by the Security Team.
+ 
+   [ Hilko Bengen ]
+   * Add libguestfs-common patch, fixing CVE-2022-2211 (Closes: #1014764)
+ 
+  -- Salvatore Bonaccorso <carnil@debian.org>  Tue, 23 May 2023 22:19:49 +0200
  
  guestfs-tools (1.48.2-1) unstable; urgency=medium