From 42c5e1c3607b6deb8c5a69cbaaa1b1b8c813680c Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 21 Oct 2024 14:34:22 +0100 Subject: [PATCH 1/7] Use stable owner, group and mtime in base.tar.gz (RHBZ#2320025) --- ...le-owner-group-and-mtime-in-base.tar.patch | 33 +++++++++++++++++++ supermin.spec | 10 +++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch diff --git a/0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch b/0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch new file mode 100644 index 0000000..6e70551 --- /dev/null +++ b/0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch @@ -0,0 +1,33 @@ +From 7a80a6eec799841b828ba7f617709562d8061435 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Mon, 21 Oct 2024 11:55:53 +0100 +Subject: [PATCH] prepare: Use stable owner, group and mtime in base.tar.gz + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2320025 +Signed-off-by: Richard W.M. Jones +--- + src/mode_prepare.ml | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/mode_prepare.ml b/src/mode_prepare.ml +index 70f9dd4..6af47b1 100644 +--- a/src/mode_prepare.ml ++++ b/src/mode_prepare.ml +@@ -166,9 +166,12 @@ let prepare debug (copy_kernel, format, host_cpu, + let base = outputdir // "base.tar.gz" in + if debug >= 1 then printf "supermin: writing %s\n%!" base; + let cmd = +- sprintf "tar%s -C %s -zcf %s -T %s" ++ let mtime = ++ try sprintf "--mtime=@%s" (quote (Sys.getenv "SOURCE_DATE_EPOCH")) ++ with Not_found -> "" in ++ sprintf "tar%s -C %s -z --owner=0 --group=0 %s -cf %s -T %s" + (if debug >=1 then " -v" else "") +- (quote dir) (quote base) (quote files_from) in ++ (quote dir) mtime (quote base) (quote files_from) in + run_command cmd; + ) + else ( +-- +2.46.0 + diff --git a/supermin.spec b/supermin.spec index 30f7a51..21e015d 100644 --- a/supermin.spec +++ b/supermin.spec @@ -38,7 +38,7 @@ ExcludeArch: %{ix86} Summary: Tool for creating supermin appliances Name: supermin Version: 5.3.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL-2.0-or-later ExclusiveArch: %{kernel_arches} @@ -53,6 +53,11 @@ Source1: http://download.libguestfs.org/supermin/%{source_directory}/%{nam # Keyring used to verify tarball signature. Source2: libguestfs.keyring +# Use stable owner, group and mtime in base.tar.gz +# Upstream in > 5.3.5 +# https://bugzilla.redhat.com/show_bug.cgi?id=2320025 +Patch1: 0001-prepare-Use-stable-owner-group-and-mtime-in-base.tar.patch + BuildRequires: gcc BuildRequires: make BuildRequires: autoconf, automake @@ -206,6 +211,9 @@ make check || { %changelog +* Mon Oct 21 2024 Richard W.M. Jones - 5.3.5-2 +- Use stable owner, group and mtime in base.tar.gz (RHBZ#2320025) + * Sat Aug 31 2024 Richard W.M. Jones - 5.3.5-1 - New upstream version 5.3.5 From 38ee6830fa36b39dc3c804bc505dc110eff81027 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Thu, 9 Jan 2025 13:28:26 -0700 Subject: [PATCH 2/7] OCaml 5.3.0 rebuild for Fedora 42 --- supermin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/supermin.spec b/supermin.spec index 21e015d..6a26a39 100644 --- a/supermin.spec +++ b/supermin.spec @@ -38,7 +38,7 @@ ExcludeArch: %{ix86} Summary: Tool for creating supermin appliances Name: supermin Version: 5.3.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL-2.0-or-later ExclusiveArch: %{kernel_arches} @@ -211,6 +211,9 @@ make check || { %changelog +* Thu Jan 9 2025 Jerry James - 5.3.5-3 +- OCaml 5.3.0 rebuild for Fedora 42 + * Mon Oct 21 2024 Richard W.M. Jones - 5.3.5-2 - Use stable owner, group and mtime in base.tar.gz (RHBZ#2320025) From 1c53902718d952ab457c965e712f4aaef902761a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 11:59:02 +0000 Subject: [PATCH 3/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- supermin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/supermin.spec b/supermin.spec index 6a26a39..0b7c4ed 100644 --- a/supermin.spec +++ b/supermin.spec @@ -38,7 +38,7 @@ ExcludeArch: %{ix86} Summary: Tool for creating supermin appliances Name: supermin Version: 5.3.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL-2.0-or-later ExclusiveArch: %{kernel_arches} @@ -211,6 +211,9 @@ make check || { %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 5.3.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jan 9 2025 Jerry James - 5.3.5-3 - OCaml 5.3.0 rebuild for Fedora 42 From dfd1c6610dd3fc514e36ec5d7e29e68ef9da0732 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Fri, 11 Jul 2025 14:39:10 -0600 Subject: [PATCH 4/7] Rebuild to fix OCaml dependencies --- supermin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/supermin.spec b/supermin.spec index 0b7c4ed..737900b 100644 --- a/supermin.spec +++ b/supermin.spec @@ -38,7 +38,7 @@ ExcludeArch: %{ix86} Summary: Tool for creating supermin appliances Name: supermin Version: 5.3.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL-2.0-or-later ExclusiveArch: %{kernel_arches} @@ -211,6 +211,9 @@ make check || { %changelog +* Fri Jul 11 2025 Jerry James - 5.3.5-5 +- Rebuild to fix OCaml dependencies + * Sun Jan 19 2025 Fedora Release Engineering - 5.3.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From dbb5a2fe0e36ccacdf586f2c846094f20d7d5a88 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 18:54:20 +0000 Subject: [PATCH 5/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- supermin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/supermin.spec b/supermin.spec index 737900b..c82cad2 100644 --- a/supermin.spec +++ b/supermin.spec @@ -38,7 +38,7 @@ ExcludeArch: %{ix86} Summary: Tool for creating supermin appliances Name: supermin Version: 5.3.5 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL-2.0-or-later ExclusiveArch: %{kernel_arches} @@ -211,6 +211,9 @@ make check || { %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 5.3.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jul 11 2025 Jerry James - 5.3.5-5 - Rebuild to fix OCaml dependencies From 1ce3d77b47fc8501087121de70cab4733d7d1b38 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Mon, 13 Oct 2025 18:50:43 +0100 Subject: [PATCH 6/7] OCaml 5.4.0 rebuild --- supermin.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/supermin.spec b/supermin.spec index c82cad2..a1fe3bb 100644 --- a/supermin.spec +++ b/supermin.spec @@ -38,7 +38,7 @@ ExcludeArch: %{ix86} Summary: Tool for creating supermin appliances Name: supermin Version: 5.3.5 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-2.0-or-later ExclusiveArch: %{kernel_arches} @@ -211,6 +211,9 @@ make check || { %changelog +* Mon Oct 13 2025 Richard W.M. Jones - 5.3.5-7 +- OCaml 5.4.0 rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 5.3.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 809fd5e0a1e395c5ed5e12d7c8eb6ac845587b7b Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 13 Jan 2026 20:49:14 -0700 Subject: [PATCH 7/7] Fix a changelog entry --- supermin.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supermin.spec b/supermin.spec index a1fe3bb..ee09a0f 100644 --- a/supermin.spec +++ b/supermin.spec @@ -217,7 +217,7 @@ make check || { * Fri Jul 25 2025 Fedora Release Engineering - 5.3.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild -* Fri Jul 11 2025 Jerry James - 5.3.5-5 +* Fri Jul 11 2025 Jerry James - 5.3.5-5 - Rebuild to fix OCaml dependencies * Sun Jan 19 2025 Fedora Release Engineering - 5.3.5-4