Accepting request 1136944 from Virtualization

Update supermin to version 5.3.3

OBS-URL: https://build.opensuse.org/request/show/1136944
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/supermin?expand=0&rev=21

001-Improved-debugging-of-the-supermin-if-newer-calculation.patch

@@ -0,0 +1,47 @@
+Subject: src: Improved debugging of the supermin if-newer calculation
+From: Richard W.M. Jones rjones@redhat.com Mon Jun 12 12:51:56 2023 +0100
+Date: Mon Jun 12 12:57:32 2023 +0100:
+Git: 8dd37da1b5979842b0db44b44655eeaf621f7ac9
+
+Also I expanded the code to make it easier to read.  There is no
+change to the calculation intended.
+
+--- a/src/supermin.ml
++++ b/src/supermin.ml
+@@ -239,10 +239,33 @@ appliance automatically.
+     try
+       let outputs = Mode_build.get_outputs args inputs in
+       let outputs = List.map ((//) outputdir) outputs in
+-      let odates = List.map (fun d -> (lstat d).st_mtime) (outputdir :: outputs) in
+-      let idates = List.map (fun d -> (lstat d).st_mtime) inputs in
++      let outputs = outputdir :: outputs in
++      let odates = List.map (fun f -> (lstat f).st_mtime) outputs in
++      if debug >= 2 then (
++        List.iter (
++          fun f ->
++            printf "supermin: if-newer: output %s => %.2f\n"
++              f (lstat f).st_mtime
++        ) outputs;
++      );
++      let idates = List.map (fun f -> (lstat f).st_mtime) inputs in
++      if debug >= 2 then (
++        List.iter (
++          fun f ->
++            printf "supermin: if-newer: input %s => %.2f\n"
++              f (lstat f).st_mtime
++        ) inputs;
++      );
+       let pdate = (get_package_handler ()).ph_get_package_database_mtime () in
+-      if List.for_all (fun idate -> List.for_all (fun odate -> idate < odate) odates) (pdate :: idates) then (
++      if debug >= 2 then (
++        printf "supermin: if-newer: package database date: %.2f\n" pdate;
++      );
++      let older =
++        List.for_all (
++          fun idate ->
++            List.for_all (fun odate -> idate < odate) odates
++        ) (pdate :: idates) in
++      if older then (
+         if debug >= 1 then
+           printf "supermin: if-newer: output does not need rebuilding\n%!";
+         exit 0

002-Fix-if-newer-copy-kernel.patch

@@ -0,0 +1,33 @@
+Subject: src: Fix --if-newer --copy-kernel
+From: Richard W.M. Jones rjones@redhat.com Mon Jun 12 13:02:37 2023 +0100
+Date: Mon Jun 12 13:07:51 2023 +0100:
+Git: 8c38641042e274a713a18daf7fc85584ca0fc9bb
+
+We previously copied the kernel into the appliance using 'cp -p' which
+preserves the datestamps of the installed kernel.  This can confuse
+the --if-newer calculation, if for example the package database is
+newer than the date on the installed kernel (which quite often is the
+case).  This makes it think that the appliance is always older than
+the package database, thus forcing a rebuild.
+
+We can fix this using 'cp' instead of 'cp -p'.  We don't need the
+permissions and datestamps on the copied kernel to be preserved anyway
+(in fact, it could cause problems if the permissions are restrictive).
+
+Fixes: commit 30de2cb603cdde33524a66d5466f6a9b986ce8a6
+
+diff --git a/src/format_ext2_kernel.ml b/src/format_ext2_kernel.ml
+index c592703..6d2e699 100644
+--- a/src/format_ext2_kernel.ml
++++ b/src/format_ext2_kernel.ml
+@@ -311,6 +311,9 @@ and copy_or_symlink_file copy_kernel src dest =
+   if not copy_kernel then
+     symlink src dest
+   else (
+-    let cmd = sprintf "cp -p %s %s" (quote src) (quote dest) in
++    (* NB: Do not use -p here, we want the kernel to appear newer
++     * so that --if-newer works.
++     *)
++    let cmd = sprintf "cp %s %s" (quote src) (quote dest) in
+     run_command cmd
+   )

003-Fix-kernel-filtering-for-aarch64-architecture.patch

@@ -0,0 +1,18 @@
+Subject: src/format_ext2_kernel.ml: Fix kernel filtering for aarch64 architecture
+From: Simon Fischer 1522981+Fischer-Simon@users.noreply.github.com Wed Jul 12 17:10:53 2023 +0200
+Date: Wed Jul 12 17:10:53 2023 +0200:
+Git: 4b3922feb65150f3423d0877038c5ba6e16d910c
+
+Add appropriate globs for arm based kernels. The file names end in -arm64 but the architecture is named aarch64.
+diff --git a/src/format_ext2_kernel.ml b/src/format_ext2_kernel.ml
+index 6d2e699..4589552 100644
+--- a/src/format_ext2_kernel.ml
++++ b/src/format_ext2_kernel.ml
+@@ -187,6 +187,7 @@ and patt_of_cpu host_cpu =
+     | "amd64" | "x86_64" -> ["amd64"; "x86_64"]
+     | "parisc" | "parisc64" -> ["hppa"; "hppa64"]
+     | "ppc64el" -> ["powerpc64le"]
++    | "aarch64" -> ["aarch64"; "arm64"]
+     | _ when host_cpu.[0] = 'i' && host_cpu.[2] = '8' && host_cpu.[3] = '6' -> ["?86"]
+     | _ when String.length host_cpu >= 5 && String.sub host_cpu 0 5 = "armv7" ->  ["armmp"]
+     | _ -> [host_cpu]

004-Use-output-complete-exe-instead-of-custom.patch

@@ -0,0 +1,27 @@
+Subject: ocamlc: Use -output-complete-exe instead of -custom
+From: Richard W.M. Jones rjones@redhat.com Wed Jul 12 22:37:58 2023 +0100
+Date: Wed Jul 12 22:40:27 2023 +0100:
+Git: dc80dbbef60d5d81a7d4321683a8c7305dc04972
+
+This prevents bytecode executables from being broken by strip and
+similar tools.  Note this is incompatible with OCaml < 4.10 (so breaks
+RHEL 8).  However this only affects bytecode builds which we prefer
+not to use in RHEL.  I left the old option in the Makefile so that it
+could be uncommented by someone using older OCaml + bytecode.  We need
+this for OCaml 5.0 since that drops native backends (temporarily) for
+riscv64, s390x and ppc64le.
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5b07e5d..5a1c671 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -132,7 +132,8 @@ OCAMLFLAGS = -g -warn-error +C+D+E+F+L+M+P+S+U+V+X+Y+Z-3
+ if !HAVE_OCAMLOPT
+ OBJECTS = $(BOBJECTS)
+ BEST    = c
+-OCAMLFLAGS += -custom
++#OCAMLFLAGS += -custom  # for OCaml < 4.10
++OCAMLFLAGS += -output-complete-exe
+ else
+ OBJECTS = $(XOBJECTS)
+ BEST    = opt

005-Only-supply-output-complete-exe-to-final-link.patch

@@ -0,0 +1,36 @@
+Subject: ocamlc: Only supply -output-complete-exe to final link
+From: Richard W.M. Jones rjones@redhat.com Wed Jul 12 22:51:43 2023 +0100
+Date: Wed Jul 12 22:51:43 2023 +0100:
+Git: 59a8ffc40db94a38879d9c923520e0bd70ffa271
+
+Add a separate variable to store link flags, and use that to supply
+-output-complete-exe.  Apparently ocamlc ignores -custom in the wrong
+place.
+
+Fixes: dc80dbbef60d5d81a7d4321683a8c7305dc04972
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5a1c671..1268aa5 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -132,8 +132,8 @@ OCAMLFLAGS = -g -warn-error +C+D+E+F+L+M+P+S+U+V+X+Y+Z-3
+ if !HAVE_OCAMLOPT
+ OBJECTS = $(BOBJECTS)
+ BEST    = c
+-#OCAMLFLAGS += -custom  # for OCaml < 4.10
+-OCAMLFLAGS += -output-complete-exe
++#OCAMLLINKFLAGS = -custom  # for OCaml < 4.10
++OCAMLLINKFLAGS = -output-complete-exe
+ else
+ OBJECTS = $(XOBJECTS)
+ BEST    = opt
+@@ -143,7 +143,8 @@ supermin_DEPENDENCIES = $(OBJECTS)
+ 
+ supermin_LINK = \
+ 	./supermin-link.sh \
+-	  $(OCAMLFIND) $(BEST) $(OCAMLFLAGS) $(OCAMLPACKAGES) \
++	  $(OCAMLFIND) $(BEST) $(OCAMLLINKFLAGS) $(OCAMLFLAGS) \
++	  $(OCAMLPACKAGES) \
+ 	  $(OBJECTS) -o $@
+ 
+ .mli.cmi:

006-Rename-function-file-kernel.patch

@@ -0,0 +1,29 @@
+Subject: src/format_ext2_kernel.ml: Rename function file -> kernel
+From: Richard W.M. Jones rjones@redhat.com Fri Nov 10 08:55:25 2023 +0000
+Date: Fri Nov 10 08:55:25 2023 +0000:
+Git: 9a0d078dc35fde7a715666bce6c765ed5fe5e916
+
+No change, just rename the function.
+
+diff --git a/src/format_ext2_kernel.ml b/src/format_ext2_kernel.ml
+index 4589552..36514c6 100644
+--- a/src/format_ext2_kernel.ml
++++ b/src/format_ext2_kernel.ml
+@@ -54,7 +54,7 @@ let rec build_kernel debug host_cpu copy_kernel kernel =
+     printf "supermin: kernel: modpath %s\n%!" modpath;
+   );
+ 
+-  copy_or_symlink_file copy_kernel kernel_file kernel;
++  copy_or_symlink_kernel copy_kernel kernel_file kernel;
+ 
+   (kernel_version, modpath)
+ 
+@@ -308,7 +308,7 @@ and read_string chan offset len =
+   really_input chan buf 0 len;
+   Bytes.to_string buf
+ 
+-and copy_or_symlink_file copy_kernel src dest =
++and copy_or_symlink_kernel copy_kernel src dest =
+   if not copy_kernel then
+     symlink src dest
+   else (

007-Uncompress-kernel-on-RISC-V.patch

@@ -0,0 +1,66 @@
+Subject: src: Uncompress kernel on RISC-V
+From: Richard W.M. Jones rjones@redhat.com Fri Nov 10 10:20:49 2023 +0000
+Date: Fri Nov 10 10:28:21 2023 +0000:
+Git: 5230e2c3cd07e82bd6431e871e239f7056bf25ad
+
+
+diff --git a/src/format_ext2_kernel.ml b/src/format_ext2_kernel.ml
+index 36514c6..09a3f21 100644
+--- a/src/format_ext2_kernel.ml
++++ b/src/format_ext2_kernel.ml
+@@ -25,6 +25,20 @@ open Ext2fs
+ open Fnmatch
+ open Glob
+ 
++(* Similar but not the same as get_file_type in mode_build.  There
++ * is a case for deriving a common base utility. XXX
++ *)
++type compression_type = GZip | Uncompressed
++let get_compression_type file =
++  let chan = open_in file in
++  let buf = Bytes.create 512 in
++  let len = input chan buf 0 (Bytes.length buf) in
++  close_in chan;
++  let buf = Bytes.to_string buf in
++  if len >= 3 && buf.[0] = '\x1f' && buf.[1] = '\x8b' && buf.[2] = '\x08'
++  then GZip
++  else Uncompressed (* or other unknown compression type *)
++
+ let rec build_kernel debug host_cpu copy_kernel kernel =
+   (* Locate the kernel.
+    * SUPERMIN_* environment variables override everything.  If those
+@@ -54,7 +68,19 @@ let rec build_kernel debug host_cpu copy_kernel kernel =
+     printf "supermin: kernel: modpath %s\n%!" modpath;
+   );
+ 
+-  copy_or_symlink_kernel copy_kernel kernel_file kernel;
++  (* RISC-V relies on the bootloader or firmware to uncompress the
++   * kernel and doesn't have a concept of self-extracting kernels.
++   * On Arm which is similar, qemu -kernel will automatically uncompress
++   * the kernel, but qemu-system-riscv won't do that and the code is a
++   * big mess so I don't fancy fixing it.  So we have to detect that
++   * case here and uncompress the kernel.
++   *)
++  let kernel_compression_type = get_compression_type kernel_file in
++  if string_prefix "riscv" host_cpu && kernel_compression_type <> Uncompressed
++  then
++    copy_and_uncompress_kernel kernel_compression_type kernel_file kernel
++  else
++    copy_or_symlink_kernel copy_kernel kernel_file kernel;
+ 
+   (kernel_version, modpath)
+ 
+@@ -308,6 +334,13 @@ and read_string chan offset len =
+   really_input chan buf 0 len;
+   Bytes.to_string buf
+ 
++and copy_and_uncompress_kernel compression_type src dest =
++  let cmd =
++    match compression_type with
++    | GZip -> sprintf "zcat %s > %s" (quote src) (quote dest)
++    | Uncompressed -> sprintf "cp %s %s" (quote src) (quote dest) in
++  run_command cmd
++
+ and copy_or_symlink_kernel copy_kernel src dest =
+   if not copy_kernel then
+     symlink src dest

008-Fix-link-to-renamed-kernel-documentation.patch

@@ -0,0 +1,21 @@
+Subject: init: Fix link to renamed kernel documentation
+From: Richard W.M. Jones rjones@redhat.com Mon Nov 13 10:13:26 2023 +0000
+Date: Mon Nov 13 10:13:26 2023 +0000:
+Git: c8e79b7d62730f850f9e5d46c3747f414198b902
+
+
+diff --git a/init/init.c b/init/init.c
+index bc28c69..4cc72f7 100644
+--- a/init/init.c
++++ b/init/init.c
+@@ -279,8 +279,8 @@ main ()
+     fprintf (stderr, "supermin: deleting initramfs files\n");
+   delete_initramfs_files ();
+ 
+-  /* Note that pivot_root won't work.  See the note in
+-   * Documentation/filesystems/ramfs-rootfs-initramfs.txt
++  /* Note that pivot_root won't work.  See the note in Linux
++   * Documentation/filesystems/ramfs-rootfs-initramfs.rst
+    */
+   if (!quiet)
+     fprintf (stderr, "supermin: chroot\n");

009-New-mailing-list-email-address.patch

@@ -0,0 +1,19 @@
+Subject: New mailing list email address
+From: Richard W.M. Jones rjones@redhat.com Thu Nov 16 10:43:11 2023 +0000
+Date: Thu Nov 16 10:43:11 2023 +0000:
+Git: 7e4f0931e1ee47c7fbe7e1a9917fff68a18d9235
+
+
+diff --git a/README b/README
+index a74993b..fe298b4 100644
+--- a/README
++++ b/README
+@@ -143,7 +143,7 @@ See the examples/ subdirectory.
+ Feedback and bugs
+ -----------------
+ 
+-Send feedback to libguestfs@redhat.com.  You can file bugs in
++Send feedback to guestfs@lists.libguestfs.org.  You can file bugs in
+ https://bugzilla.redhat.com/ (under "Fedora", "supermin")
+ 
+ Alternate libc

detect-aarch64-kernel.patch

@@ -1,10 +1,10 @@
 References: bsc#1187532 - virt-make-fs hangs forever
 
-Index: supermin-5.2.2/src/format_ext2_kernel.ml
+Index: supermin-5.3.3/src/format_ext2_kernel.ml
 ===================================================================
---- supermin-5.2.2.orig/src/format_ext2_kernel.ml
+--- supermin-5.3.3.orig/src/format_ext2_kernel.ml
-+++ supermin-5.2.2/src/format_ext2_kernel.ml
++++ supermin-5.3.3/src/format_ext2_kernel.ml
-@@ -129,7 +129,7 @@ and find_kernel_from_boot debug host_cpu
+@@ -155,7 +155,7 @@ and find_kernel_from_boot debug host_cpu
      if files <> [] then files
      else (
        (* In original: ls -1dvr /boot/vmlinuz-* 2>/dev/null | grep -v xen *)
@@ -13,7 +13,7 @@ Index: supermin-5.2.2/src/format_ext2_kernel.ml
        let files = ignore_unbootable_kernels host_cpu files in
        files
      ) in
-@@ -235,9 +235,14 @@ and get_kernel_version debug kernel_file
+@@ -262,9 +262,14 @@ and get_kernel_version debug kernel_file
         else (
           basename
         ) in

initrd_support_ztd-compressed_modules.patch

@@ -1,83 +0,0 @@
-From 4306a131c6cde92f8d0a2dd9376f4096ee538eff Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 5 Aug 2021 08:16:28 +0100
-Subject: [PATCH] initrd: Support ztd-compressed modules
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1990209
----
- README                    |  2 ++
- configure.ac              |  3 +++
- src/config.ml.in          |  1 +
- src/format_ext2_initrd.ml | 16 ++++++++++++++--
- 4 files changed, 20 insertions(+), 2 deletions(-)
-
-diff --git a/README b/README
-index e5187a6..ccd6f96 100644
---- a/README
-+++ b/README
-@@ -102,6 +102,8 @@ are building:
- 
-   xzcat (command) - if your kernel uses xz-compressed modules
- 
-+  zstdcat (command) - if your kernel uses zstd-compressed modules
-+
- Building and installing
- -----------------------
- 
-diff --git a/configure.ac b/configure.ac
-index cd5d8c0..ad86ca5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -157,6 +157,9 @@ AC_PATH_PROG(ZCAT,[zcat],[no])
- dnl Check for xzcat, only needed if you have xz-compressed kernel modules.
- AC_PATH_PROG(XZCAT,[xzcat],[no])
- 
-+dnl Check for zstdcat, only needed if you have zstd-compressed kernel modules.
-+AC_PATH_PROG(ZSTDCAT,[zstdcat],[no])
-+
- dnl mke2fs.
- AC_PATH_PROG([MKE2FS],[mke2fs],[no],
-              [$PATH$PATH_SEPARATOR/sbin$PATH_SEPARATOR])
-diff --git a/src/config.ml.in b/src/config.ml.in
-index 313d6e6..b0953dc 100644
---- a/src/config.ml.in
-+++ b/src/config.ml.in
-@@ -39,6 +39,7 @@ let urpmi = "@URPMI@"
- let yumdownloader = "@YUMDOWNLOADER@"
- let xzcat = "@XZCAT@"
- let zcat = "@ZCAT@"
-+let zstdcat = "@ZSTDCAT@"
- let zypper = "@ZYPPER@"
- 
- let mke2fs = "@MKE2FS@"
-diff --git a/src/format_ext2_initrd.ml b/src/format_ext2_initrd.ml
-index 6268442..98d2692 100644
---- a/src/format_ext2_initrd.ml
-+++ b/src/format_ext2_initrd.ml
-@@ -106,12 +106,24 @@ let rec build_initrd debug tmpdir modpath initrd =
-           visit deps;
- 
-           (* Copy module to the init directory.
--           * Uncompress the module, if the name ends in .xz or .gz.
-+           * Uncompress the module, if the name ends in .zst, .xz or .gz.
-            *)
-           let basename = Filename.basename modl in
-           let basename =
-             let len = String.length basename in
--            if Config.xzcat <> "no" &&
-+            if Config.zstdcat <> "no" &&
-+                 Filename.check_suffix basename ".zst"
-+            then (
-+              let basename = String.sub basename 0 (len-4) in
-+              let cmd = sprintf "%s %s > %s"
-+                                (quote Config.zstdcat)
-+                                (quote (modpath // modl))
-+                                (quote (initdir // basename)) in
-+              if debug >= 2 then printf "supermin: %s\n" cmd;
-+              run_command cmd;
-+              basename
-+            )
-+            else if Config.xzcat <> "no" &&
-                  Filename.check_suffix basename ".xz"
-             then (
-               let basename = String.sub basename 0 (len-3) in

supermin-5.2.2.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ce3921d3635c8168cfb7ca0c5a82b9d5cef5b2b271f84b776d63b8bbbeec358e
-size 555389

supermin-5.2.2.tar.gz.sig

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmIiFAQRHHJpY2hAYW5u
-ZXhpYS5vcmcACgkQkXOPc+G3aKDI5A//e7Gf3SWLg3AVOS1lY5zanPcTkVlwsL5I
-zc+EU+srbCi4ksW4qDjT9PH7aqgMg5U+p3NvbLyoCwudn3fTzcUVI6KxfkBsjGPz
-kAqF863lWjx1HSy3IltCIPRhtT0TdcZi5+FhNRJB77+84CkZNWdp0gZqhULN8A+C
-1wrCBdC0PWtXpV0J1pYb29ZilseLnPQUmenUcBKgdRpyN8ukdeFOlemtjHH87bMW
-XnJKO29tFTO/hC9nb4qBExuYs0gGQeozDX4HsxM/nl/NgTuPT3FI91hDwUSo6utx
-Cieaz76gKr8BEGzNC+32jQSMF0TOaWIwik1Y38QU5zEQJ48zIBDFtwGi6JD6AWk2
-C8mEk++KrFQCv3rcxcciRzVZRM6xuyJU7zeL+yiu6F8LwbqUtLOuWbWCRb2L5VdW
-+VACuODrtGpvS1umoak+M/UxRTb0pz4wXHLUtKW1KxaE5qNX0LiKo8zyPGlW0WrV
-/43vy2K0uTZ0i00I6Yx4Fo1/KIUKI3KgzAjT0ofT2XDPIUgstXZ/Jr7VJUrSS66U
-xqXN9XUg/1n8sRKDGKA2GArlmuyOrXcYdw94SKGz1SFgkCqF4+VgBs4F6URwFLmh
-vYrVZxAkMpY2ktmH/hjcZH3dD8Sq5DOoFNgZ9+NlOqIYfimFQeW+/O2o+HdFzznz
-eEmfLaH3r34=
-=cKOD
------END PGP SIGNATURE-----

supermin-5.3.3.tar.gz.sig

@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQJFBAABCAAvFiEE93dPsa0HSn6Mh2fqkXOPc+G3aKAFAmNOrGARHHJpY2hAYW5u
+ZXhpYS5vcmcACgkQkXOPc+G3aKAgHA/9EFGRdvIryS5UUcXz9yvaYs5WvMtuPn9s
+Dcb7lVwLsMkVpcMulOyN1sPTI4WkgqKeXSvSJXfby/Loon8p8aTlSDZkEhivMpDG
+TliKX5P8kySC+9KXSKfzHyVwKd6j/pmLtw3QvpgwuZPYdkIHzVluWKd1ql6nbLh/
+LsSg2YNyJi48i/W64xEGN0ENviYMmHoNnE56nFEApwHfG26j5bHvLZJqjFYS5ClF
+CJtoaAOEEAySbJmbKTxCByk44CxjfpUHHwupJ+QKoXIJmYFVAQO2jrW3zvR7zRyI
+rA1Woaqmft3PDszH9565AD34FFmXQ70+GOanO7tH1uk0wgK+lgpZpb0UMzcNBSPh
+6cU4wY4nvxww39HdGLQ95au54Lp4I90S8MGrtO7XD0N2fA6QlbcSMnpM3LM4CZDi
+g7SUeqWy6PRoqd6vEvO9MgAOIg/YbcnRCFZsUe2na04FvKI0jWFwor1Xm0RJIQrf
+ufpLjKG1hpjbQa0Hu0RISVKBMMnLfCg3Z5xMWq0mVysdGrJzWrTqYT5Os8KOU+04
+0Ni1DWw+o3CNacTVmOroRvsUYPzQiivutNgPovRaVIL4u6OwWw+tUtxRCpZlxzc/
+m00IGHLgKwdbHTShRqzp6P2QcuXS7SGv9EqNL7yJL3kvc5INp4XJ3QHDdpO2hz5S
+10cJfC6ph1o=
+=FSUE
+-----END PGP SIGNATURE-----

supermin-kernel_version_compressed.patch

@@ -1,6 +1,6 @@
 --- a/src/format_ext2_kernel.ml
 +++ b/src/format_ext2_kernel.ml
-@@ -225,6 +225,16 @@ and get_kernel_version debug kernel_file
+@@ -252,6 +252,16 @@ and get_kernel_version debug kernel_file
    | None ->
       (* Try to work it out from the filename instead. *)
       let basename = Filename.basename kernel_file in

supermin.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Thu Jan  4 11:07:03 MST 2024 - carnold@suse.com
+
+- Update to version 5.3.3
+  * initrd: Support ztd-compressed modules
+  * pacman: Recognise Artix, an Arch derivative
+  * Add a separate variable to store link flags, and use that to
+    supply
+  * Add appropriate globs for arm based kernels. The file names end
+    in -arm64 but the architecture is named aarch64.
+  * Add support for OCaml 5.0
+  * Add LFS support for fts functions
+  * Numerous bug fixes
+- Upstream bug fixes and features
+  001-Improved-debugging-of-the-supermin-if-newer-calculation.patch
+  002-Fix-if-newer-copy-kernel.patch
+  003-Fix-kernel-filtering-for-aarch64-architecture.patch
+  004-Use-output-complete-exe-instead-of-custom.patch
+  005-Only-supply-output-complete-exe-to-final-link.patch
+  006-Rename-function-file-kernel.patch
+  007-Uncompress-kernel-on-RISC-V.patch
+  008-Fix-link-to-renamed-kernel-documentation.patch
+  009-New-mailing-list-email-address.patch
+- Dropped initrd_support_ztd-compressed_modules.patch
+
 -------------------------------------------------------------------
 Tue Dec 27 15:59:57 UTC 2022 - Andreas Schwab <schwab@suse.de>
 

supermin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package supermin
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,22 +17,28 @@
 
 
 Name:           supermin
-Version:        5.2.2
+Version:        5.3.3
 Release:        0
 Summary:        Bootstrapping tool for creating supermin appliances
 License:        GPL-3.0-or-later
 Group:          System/Filesystems
 URL:            https://libguestfs.org/
-Source0:        https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.2.tar.gz
+Source0:        https://download.libguestfs.org/supermin/5.3-development/supermin-5.3.3.tar.gz
-Source1:        https://download.libguestfs.org/supermin/5.2-stable/supermin-5.2.2.tar.gz.sig
+Source1:        https://download.libguestfs.org/supermin/5.3-development/supermin-5.3.3.tar.gz.sig
 Source9:        supermin.keyring
-# Pending upstream review
+Patch1:         001-Improved-debugging-of-the-supermin-if-newer-calculation.patch
-Patch10:        suse_release.patch
+Patch2:         002-Fix-if-newer-copy-kernel.patch
-Patch11:        supermin-kernel_version_compressed.patch
+Patch3:         003-Fix-kernel-filtering-for-aarch64-architecture.patch
-Patch12:        disable-test-if-newer-ext2.patch
+Patch4:         004-Use-output-complete-exe-instead-of-custom.patch
-# Backport of https://github.com/libguestfs/supermin/commit/4306a131c6cde92f8d0a2dd9376f4096ee538eff.patch
+Patch5:         005-Only-supply-output-complete-exe-to-final-link.patch
-Patch13:        initrd_support_ztd-compressed_modules.patch
+Patch6:         006-Rename-function-file-kernel.patch
-Patch14:        detect-aarch64-kernel.patch
+Patch7:         007-Uncompress-kernel-on-RISC-V.patch
+Patch8:         008-Fix-link-to-renamed-kernel-documentation.patch
+Patch9:         009-New-mailing-list-email-address.patch
+Patch30:        suse_release.patch
+Patch31:        supermin-kernel_version_compressed.patch
+Patch32:        disable-test-if-newer-ext2.patch
+Patch33:        detect-aarch64-kernel.patch
 BuildRequires:  augeas
 BuildRequires:  autoconf
 BuildRequires:  automake

suse_release.patch

@@ -53,7 +53,7 @@
 +    be read or the ID_LIKE field is not defined. *)
 --- a/src/ph_rpm.ml
 +++ b/src/ph_rpm.ml
-@@ -43,6 +43,7 @@ let opensuse_detect () =
+@@ -45,6 +45,7 @@ let opensuse_detect () =
      Config.zypper <> "no" &&
      (List.mem (Os_release.get_id ()) [ "sled"; "sles" ] ||
       string_prefix "opensuse" (Os_release.get_id ()) ||