[rpms/pungi] f44: Backport patch 1924

A new commit has been pushed.

Repo   : rpms/pungi
Branch : f44
Commit : 6a7333df9280bb240c08405fde2145b5a11ff23e
Author : Lubomír Sedlář <lsedlar@redhat.com>
Date   : 2026-08-31T08:56:28+02:00
Stats  : +85/-1 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/pungi/c/6a7333df9280bb240c08405fde2145b5a11ff23e?branch=f44

Log:
Backport patch 1924

---
diff --git a/1924.patch b/1924.patch
new file mode 100644
index 0000000..62fcb3b
--- /dev/null
+++ b/1924.patch
@@ -0,0 +1,80 @@
+From 2265c1375c81cfd9ca2d60743479ea0d9592d2c4 Mon Sep 17 00:00:00 2001
+From: Simon de Vlieger <cmdr@supakeen.com>
+Date: Thu, 27 Aug 2026 14:58:46 +0200
+Subject: [PATCH] phases/imagebuilder: more extensions
+
+Include more extensions (and fix up the vagrant extensions) so they
+match with what `image-builder` produces. This fixes [1].
+
+These extensions were also changed upstream [2], [3].
+
+[1]: https://forge.fedoraproject.org/pungi/pungi/issues/1923
+[2]: https://github.com/osbuild/image-builder/pull/2627
+[3]: https://github.com/osbuild/image-builder/pull/2629
+
+Signed-off-by: Simon de Vlieger <cmdr@supakeen.com>
+---
+ pungi/phases/imagebuilder.py    | 5 +++--
+ tests/test_imagebuilderphase.py | 8 ++++----
+ 2 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/pungi/phases/imagebuilder.py b/pungi/phases/imagebuilder.py
+index c19fe2f0..03078da2 100644
+--- a/pungi/phases/imagebuilder.py
++++ b/pungi/phases/imagebuilder.py
+@@ -14,12 +14,13 @@ from ..threading import TelemetryWorkerThread as WorkerThread
+ from ..image_checks import validate_image_sanity
+ 
+ IMAGEBUILDEREXTENSIONS = [
+-    ("vagrant-libvirt", ["vagrant.libvirt.box"], "vagrant-libvirt.box"),
++    ("vagrant-libvirt", ["vagrant-libvirt.box"], "vagrant-libvirt.box"),
+     (
+         "vagrant-virtualbox",
+-        ["vagrant.virtualbox.box"],
++        ["vagrant-virtualbox.box"],
+         "vagrant-virtualbox.box",
+     ),
++    ("container", ["oci.tar"], "tar"),
+     ("container", ["oci.tar.xz"], "tar.xz"),
+     ("wsl2", ["wsl"], "wsl"),
+     ("vhd-compressed", ["vhd.xz"], "vhd.xz"),
+diff --git a/tests/test_imagebuilderphase.py b/tests/test_imagebuilderphase.py
+index 49dc66c8..9f66db6b 100644
+--- a/tests/test_imagebuilderphase.py
++++ b/tests/test_imagebuilderphase.py
+@@ -221,7 +221,7 @@ class TestImageBuilderThread(PungiTestCase):
+         return path
+ 
+     def test_process_vagrant_box(self, KojiWrapper, get_file_size, get_mtime, Linker):
+-        img_name = "FCBG.{arch}-Rawhide-1.6.vagrant.libvirt.box"
++        img_name = "FCBG.{arch}-Rawhide-1.6.vagrant-libvirt.box"
+         self.repo = self.topdir + "/compose/Server/$arch/os"
+         compose = DummyCompose(
+             self.topdir,
+@@ -288,12 +288,12 @@ class TestImageBuilderThread(PungiTestCase):
+         Linker.return_value.link.assert_has_calls(
+             [
+                 mock.call(
+-                    "/koji/task/1234/FCBG.amd64-Rawhide-1.6.vagrant.libvirt.box",
++                    "/koji/task/1234/FCBG.amd64-Rawhide-1.6.vagrant-libvirt.box",
+                     self._img_path("amd64", img_name.format(arch="amd64")),
+                     link_type="hardlink-or-copy",
+                 ),
+                 mock.call(
+-                    "/koji/task/1234/FCBG.x86_64-Rawhide-1.6.vagrant.libvirt.box",
++                    "/koji/task/1234/FCBG.x86_64-Rawhide-1.6.vagrant-libvirt.box",
+                     self._img_path("x86_64", img_name.format(arch="x86_64")),
+                     link_type="hardlink-or-copy",
+                 ),
+@@ -460,7 +460,7 @@ class TestImageBuilderThread(PungiTestCase):
+     def test_failable_arches_passed_to_koji(
+         self, KojiWrapper, get_file_size, get_mtime, Linker
+     ):
+-        img_name = "FCBG.{arch}-Rawhide-1.6.vagrant.libvirt.box"
++        img_name = "FCBG.{arch}-Rawhide-1.6.vagrant-libvirt.box"
+         self.repo = self.topdir + "/compose/Server/$arch/os"
+         compose = DummyCompose(
+             self.topdir,
+-- 
+2.55.0
+

diff --git a/pungi.spec b/pungi.spec
index 6b07b10..d1de0ae 100644
--- a/pungi.spec
+++ b/pungi.spec
@@ -1,11 +1,12 @@
 Name:           pungi
 Version:        4.14.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Distribution compose tool
 
 License:        GPL-2.0-only
 URL:            https://forge.fedoraproject.org/pungi/pungi
 Source0:        https://forge.fedoraproject.org/pungi/pungi/archive/%{name}-%{version}.tar.gz
+Patch:          https://forge.fedoraproject.org/pungi/pungi/pulls/1924.patch
 
 BuildRequires:  make
 BuildRequires:  python3-pytest
@@ -134,6 +135,9 @@ gzip _build/man/pungi.1
 %{_bindir}/%{name}-cache-cleanup
 
 %changelog
+* Mon Aug 31 2026 Lubomír Sedlář <lsedlar@redhat.com> - 4.14.0-2
+- Backport patch 1924
+
 * Thu Aug 20 2026 Lubomír Sedlář <lsedlar@redhat.com> - 4.14.0-1
 - Add support for building boot.iso via image-builder and kiwibuild (supakeen)
 - phase/imagebuilder: vhd-compressed mapping (cmdr)