From 046a2e6f5c8d120afd646d9c5c028efe1e9fcc0e Mon Sep 17 00:00:00 2001 From: Mitch Zhu Date: Wed, 29 Jul 2026 00:07:26 +0000 Subject: [PATCH] fix(libburn,libisofs): update to 1.5.8 Update libburn and libisofs to Fedora 43's 1.5.8 releases and remove the obsolete libburn C23 patch, which is included upstream. Stage these prerequisite libraries before libisoburn 1.5.8 so DEV scratch builds can resolve its matching devel dependencies and prevent xorriso runtime incompatibilities during ISO creation. Signed-off-by: Mitch Zhu --- base/comps/components.toml | 2 -- base/comps/libburn/libburn.comp.toml | 8 ++++++++ base/comps/libisofs/libisofs.comp.toml | 8 ++++++++ locks/libburn.lock | 6 +++--- locks/libisofs.lock | 6 +++--- specs/l/libburn/libburn-1.5.6-c23.patch | 23 ----------------------- specs/l/libburn/libburn.spec | 10 ++++++---- specs/l/libburn/sources | 4 ++-- specs/l/libisofs/libisofs.spec | 18 +++++++++++------- specs/l/libisofs/sources | 4 ++-- 10 files changed, 43 insertions(+), 46 deletions(-) create mode 100644 base/comps/libburn/libburn.comp.toml create mode 100644 base/comps/libisofs/libisofs.comp.toml delete mode 100644 specs/l/libburn/libburn-1.5.6-c23.patch diff --git a/base/comps/components.toml b/base/comps/components.toml index 314490260d0..f389edfbf23 100644 --- a/base/comps/components.toml +++ b/base/comps/components.toml @@ -1667,7 +1667,6 @@ includes = ["**/*.comp.toml", "component-bootstrap-uucore-pin.toml", "component- [components.libbpf] [components.libbs2b] [components.libbsd] -[components.libburn] [components.libbytesize] [components.libcacard] [components.libcamera] @@ -1771,7 +1770,6 @@ includes = ["**/*.comp.toml", "component-bootstrap-uucore-pin.toml", "component- [components.libiptcdata] [components.libiscsi] [components.libisoburn] -[components.libisofs] [components.libjaylink] [components.libjcat] [components.libjpeg-turbo] diff --git a/base/comps/libburn/libburn.comp.toml b/base/comps/libburn/libburn.comp.toml new file mode 100644 index 00000000000..019b9829444 --- /dev/null +++ b/base/comps/libburn/libburn.comp.toml @@ -0,0 +1,8 @@ +[components.libburn] + +# Pin the libburnia stack to Fedora 43's 1.5.8 update; libisoburn rejects +# older libburn and libisofs libraries at runtime. +# https://src.fedoraproject.org/rpms/libburn/c/cfce77a89906b68afbab3a5fb314eeeb460e0ee8?branch=f43 +# TODO: Drop this override once the default Fedora 43 snapshot in +# distro/azurelinux.distro.toml advances past 2026-04-03. +spec = { type = "upstream", upstream-distro = { name = "fedora", version = "43" }, upstream-commit = "cfce77a89906b68afbab3a5fb314eeeb460e0ee8" } diff --git a/base/comps/libisofs/libisofs.comp.toml b/base/comps/libisofs/libisofs.comp.toml new file mode 100644 index 00000000000..9b819912567 --- /dev/null +++ b/base/comps/libisofs/libisofs.comp.toml @@ -0,0 +1,8 @@ +[components.libisofs] + +# Pin the libburnia stack to Fedora 43's 1.5.8.pl01 update; libisoburn rejects +# older libburn and libisofs libraries at runtime. +# https://src.fedoraproject.org/rpms/libisofs/c/f4d65eeca964a70627c3a8c324e9a95fda71041f?branch=f43 +# TODO: Drop this override once the default Fedora 43 snapshot in +# distro/azurelinux.distro.toml advances past 2026-04-18. +spec = { type = "upstream", upstream-distro = { name = "fedora", version = "43" }, upstream-commit = "f4d65eeca964a70627c3a8c324e9a95fda71041f" } diff --git a/locks/libburn.lock b/locks/libburn.lock index a9aefb1f727..2de1c6502dc 100644 --- a/locks/libburn.lock +++ b/locks/libburn.lock @@ -1,6 +1,6 @@ # Managed by azldev component update. Do not edit manually. version = 1 import-commit = '11cc984771cc46007d8df19cd9a524ba8e9bbe99' -upstream-commit = '11cc984771cc46007d8df19cd9a524ba8e9bbe99' -input-fingerprint = 'sha256:6119319076494634b6fff14e94cd66394e173335b0f6b17d36d09855e59fd251' -resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' +upstream-commit = 'cfce77a89906b68afbab3a5fb314eeeb460e0ee8' +input-fingerprint = 'sha256:646580c2085cca3f1bf0f48f5090e96747cca59c21fdcfb466d0120b89ca3b5b' +resolution-input-hash = 'sha256:ae8f8ab7245122fc75b92b901a4a666da26bf6afec2f06d6a51f17ac56898001' diff --git a/locks/libisofs.lock b/locks/libisofs.lock index 824615273d0..85d079eed7d 100644 --- a/locks/libisofs.lock +++ b/locks/libisofs.lock @@ -1,6 +1,6 @@ # Managed by azldev component update. Do not edit manually. version = 1 import-commit = '1d43a3d1199128e58d7c4c43ecea2f5904bb8479' -upstream-commit = '1d43a3d1199128e58d7c4c43ecea2f5904bb8479' -input-fingerprint = 'sha256:c7ecdc67e5d890c72b71300ccfc7bc61d10acf2fb96e95970b3e99e652242f0c' -resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e' +upstream-commit = 'f4d65eeca964a70627c3a8c324e9a95fda71041f' +input-fingerprint = 'sha256:a84b89c2b08e83b055ef565e03d546a00e7ff748fb1ba80f7a535c48e861f2b8' +resolution-input-hash = 'sha256:117abc6cd82f53214dd522408750b35617898d87cebd86cbfa5d979725382b6a' diff --git a/specs/l/libburn/libburn-1.5.6-c23.patch b/specs/l/libburn/libburn-1.5.6-c23.patch deleted file mode 100644 index f6aa3078957..00000000000 --- a/specs/l/libburn/libburn-1.5.6-c23.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d537f9dd35282df834a311ead5f113af67d223b3 Mon Sep 17 00:00:00 2001 -From: Thomas Schmitt -Date: Tue, 26 Nov 2024 23:02:03 +0100 -Subject: [PATCH] Bug fix: Faulty signal handler prototype spoiled compilation - under C23 - ---- - test/poll.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/poll.c b/test/poll.c -index 660f384..cd5ff90 100644 ---- a/test/poll.c -+++ b/test/poll.c -@@ -14,7 +14,7 @@ static struct burn_drive_info *drives; - static unsigned int n_drives; - int NEXT; - --static void catch_int () -+static void catch_int (int signum) - { - NEXT = 1; - } diff --git a/specs/l/libburn/libburn.spec b/specs/l/libburn/libburn.spec index a48b56d3dd1..1f3e78b3dd1 100644 --- a/specs/l/libburn/libburn.spec +++ b/specs/l/libburn/libburn.spec @@ -5,8 +5,8 @@ Summary: Library for reading, mastering and writing optical discs Name: libburn -Version: 1.5.6 -Release: 9%{?dist} +Version: 1.5.8 +Release: 3%{?dist} License: GPL-2.0-or-later URL: https://libburnia-project.org/ Source0: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz @@ -14,7 +14,6 @@ Source1: https://files.libburnia-project.org/releases/%{pkgname}-%{versi Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854 Patch0: libburn-0.6.16-multilib.patch Patch1: libburn-1.5.4-rpath.patch -Patch2: https://dev.lovelyhq.com/libburnia/libburn/commit/d537f9dd35282df834a311ead5f113af67d223b3.patch#/libburn-1.5.6-c23.patch BuildRequires: gnupg2 BuildRequires: gcc, make, intltool, gettext %if 0%{?rhel} && "%{name}" != "%{pkgname}" @@ -64,7 +63,7 @@ features from the command line. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%autosetup -p1 -n %{pkgname}-%{version} +%autosetup -n %{pkgname}-%{version} -p1 # Rename from libburn to libburn1 for EPEL %if 0%{?rhel} && "%{name}" != "%{pkgname}" @@ -135,6 +134,9 @@ fi %{_mandir}/man1/cdrskin%{?variant}.1* %changelog +* Fri Apr 03 2026 Robert Scheck 1.5.8-1 +- Upgrade to 1.5.8 (#2454539) + * Fri Jan 16 2026 Fedora Release Engineering - 1.5.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild diff --git a/specs/l/libburn/sources b/specs/l/libburn/sources index ae5d4e7f062..8159c2d3751 100644 --- a/specs/l/libburn/sources +++ b/specs/l/libburn/sources @@ -1,2 +1,2 @@ -SHA512 (libburn-1.5.6.tar.gz) = 549cb25310aac5ce445639374d84f0c09fb1fdd70be97479588775e5afcc12dd0655c5bf51bd3f1bf8c06a66b318fd1e709dcfd72845e795ffaf353ea621accd -SHA512 (libburn-1.5.6.tar.gz.sig) = 9172c0631ab853586d2262c48f8dfea4b369ec7d3c2e316bee5c31b6c3309e1dd8d9b2161176f5d15f08e333a2ef0ac01c4ab71bcf5676055effbfee29f205d6 +SHA512 (libburn-1.5.8.tar.gz) = fa290de9c9e5270eea7752418caaf6d8ac9b9291e71ea043637f78493d91bf1daa3ec23f3c4e7b584d0134b123f3ca279c02cbb44ad3027e7e7d439966512280 +SHA512 (libburn-1.5.8.tar.gz.sig) = aef0f85c435e09bfebd0d63a6f6af267898859bcfee7d2f9df03b0cd93cef91f3b0faa742e8117ac40d76e427abd9976abaee62c977d3b008baf4cd6842ebde4 diff --git a/specs/l/libisofs/libisofs.spec b/specs/l/libisofs/libisofs.spec index 0b035a9cc41..e6cf7a5755c 100644 --- a/specs/l/libisofs/libisofs.spec +++ b/specs/l/libisofs/libisofs.spec @@ -5,13 +5,13 @@ Summary: Library to create ISO 9660 disk images Name: libisofs -Version: 1.5.6 -Release: 9%{?dist} +Version: 1.5.8 +Release: 4%{?dist} # libisofs/make_isohybrid_mbr.c is LGPL-2.0-or-later, rest is GPL-2.0-or-later License: GPL-2.0-or-later AND LGPL-2.0-or-later URL: https://libburnia-project.org/ -Source0: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz -Source1: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.tar.gz.sig +Source0: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.pl01.tar.gz +Source1: https://files.libburnia-project.org/releases/%{pkgname}-%{version}.pl01.tar.gz.sig Source2: https://keys.openpgp.org/vks/v1/by-fingerprint/44BC9FD0D688EB007C4DD029E9CBDFC0ABC0A854 Patch0: libisofs-0.6.16-multilib.patch Patch1: libisofs-1.5.4-rpath.patch @@ -52,9 +52,7 @@ documentation for developing applications that use %{name}. %prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%setup -q -n %{pkgname}-%{version} -%patch -P0 -p1 -b .multilib -%patch -P1 -p1 -b .rpath +%autosetup -n %{pkgname}-%{version} -p1 # Rename from libisofs to libisofs1 for EPEL %if 0%{?rhel} && "%{name}" != "%{pkgname}" @@ -101,6 +99,12 @@ rm -rf $RPM_BUILD_ROOT%{_defaultdocdir} %endif %changelog +* Sat Apr 18 2026 Robert Scheck 1.5.8-2 +- Upgrade to 1.5.8.pl01 (#2454542 #c16, #2456493) + +* Fri Apr 03 2026 Robert Scheck 1.5.8-1 +- Upgrade to 1.5.8 (#2454545) + * Fri Jan 16 2026 Fedora Release Engineering - 1.5.6-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild diff --git a/specs/l/libisofs/sources b/specs/l/libisofs/sources index 6d7a99441eb..aa225d47e05 100644 --- a/specs/l/libisofs/sources +++ b/specs/l/libisofs/sources @@ -1,2 +1,2 @@ -SHA512 (libisofs-1.5.6.tar.gz) = a5f573bbe9758e072fad195cc9beb672568273ddb993ece9c15585ad3f99efb0deae6fefb6d3d40b9712e73e3bc68869d79d923b2a09623d190f5dc84974d65f -SHA512 (libisofs-1.5.6.tar.gz.sig) = e0a12a75cea99878e6908b0faaab9595c75fb345c36cdb1c42ee4aba6ac9ca01a282bc9cc37874b49072fc68de990345341ce72885c072920120fb1c7f9d52ba +SHA512 (libisofs-1.5.8.pl01.tar.gz) = 6dc5acf83db11c7f5ce574224bc8c58914fc749dd7582e6f69c4199225ad786ab23155f3c753b28b145cd51c6bca4dc4db285cb9b8e99f583966a6baa9284f37 +SHA512 (libisofs-1.5.8.pl01.tar.gz.sig) = 3551f4a82f4377d9da8dd57f3afbbdb94fd40d346737d244eb38e80ec18f6fe167e892cf02889c5e833a1ee23786630b7443cce6e9cb4b2ef93b602423aed06c