From fb29848c689f4b1865764d668bfbe90323592c04 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Jul 14 2023 13:42:01 +0000
Subject: Rebase to 9.25.5 (RH#2195943)


---

diff --git a/.gitignore b/.gitignore
index 23b7331..e580753 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
 /kiwi-9.24.50.tar.gz
 /kiwi-9.24.52.tar.gz
 /kiwi-9.24.59.tar.gz
+/kiwi-9.25.5.tar.gz
diff --git a/0001-Use-cross-arch-macros-to-interpret-uint64_t.patch b/0001-Use-cross-arch-macros-to-interpret-uint64_t.patch
deleted file mode 100644
index f0ca3fc..0000000
--- a/0001-Use-cross-arch-macros-to-interpret-uint64_t.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ddb736c5fe7c11dbec9f323bf4ca264afa76f15e Mon Sep 17 00:00:00 2001
-From: David Cassany <dcassany@suse.com>
-Date: Fri, 28 Apr 2023 09:44:59 +0200
-Subject: [PATCH] Use cross arch macros to interpret uint64_t
-
-This commit adds inttypes.h to make use of PRIu64 style
-macros in order to properly translate uint64_t across
-different architectures. More specific this allows the
-code to compile for ix86.
-
-Signed-off-by: David Cassany <dcassany@suse.com>
----
- dracut/modules.d/80kiwi-verity/kiwi-parse-verity.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/dracut/modules.d/80kiwi-verity/kiwi-parse-verity.c b/dracut/modules.d/80kiwi-verity/kiwi-parse-verity.c
-index 5688eecca8..5fbdaaa047 100644
---- a/dracut/modules.d/80kiwi-verity/kiwi-parse-verity.c
-+++ b/dracut/modules.d/80kiwi-verity/kiwi-parse-verity.c
-@@ -22,6 +22,7 @@
- #define _POSIX_C_SOURCE (200809L)
- #define _LARGEFILE64_SOURCE
- 
-+#include <inttypes.h>
- #include <sys/types.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -219,7 +220,7 @@ static int kiwi_read_verity_info(const struct args *const args,
- 
-     offset = (off64_t)args->block_size * (off64_t)args->end_offset;
-     if (lseek64(fd, -offset, SEEK_END) < 0) {
--        printf("Failed to go to offset %lu in %s: %s (%d)\n", offset,
-+        printf("Failed to go to offset %"PRIu64" in %s: %s (%d)\n", offset,
-                 args->path, strerror(errno), errno);
-         return -errno;
-     }
-@@ -411,7 +412,7 @@ int main(int argc, char *argv[])
-     }
- 
-     if (args.verbose) {
--        printf("Reading from %s, block size %lu, block offset from end %lu\n",
-+        printf("Reading from %s, block size %"PRIu64", block offset from end %"PRIu64"\n",
-                 args.path, args.block_size, args.end_offset);
-     }
- 
diff --git a/kiwi.spec b/kiwi.spec
index 7ed79b9..c8e5458 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -11,16 +11,14 @@ and cloud systems like Xen, KVM, VMware, EC2 and more.
 
 
 Name:           kiwi
-Version:        9.24.59
-Release:        2%{?dist}
+Version:        9.25.5
+Release:        1%{?dist}
 URL:            http://osinside.github.io/kiwi/
 Summary:        Flexible operating system image builder
-License:        GPLv3+
+License:        GPL-3.0-or-later
 # We must use the version uploaded to pypi, as it contains all the required files.
 Source0:        https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz
 
-Patch0001:      https://github.com/OSInside/kiwi/commit/85b8655f81f646b973553500ba0f4620ec32f80b.patch#/0001-Use-cross-arch-macros-to-interpret-uint64_t.patch
-
 # Fedora-specific patches
 ## Use buildah instead of umoci by default for OCI image builds
 ## TODO: Consider getting umoci into Fedora?
@@ -55,9 +53,14 @@ Provides:       kiwi-image:tbz
 # tools used by kiwi
 # For building Fedora, RHEL/CentOS, and Mageia based images
 Requires:       dnf
+%if 0%{?fedora} >= 39
+Requires:       dnf5
+Provides:       kiwi-packagemanager:dnf5
+%endif
 Provides:       kiwi-packagemanager:dnf
+Provides:       kiwi-packagemanager:dnf4
 Provides:       kiwi-packagemanager:yum
-%if 0%{?fedora} || 0%{?rhel} >= 8
+%if (0%{?fedora} && 0%{?fedora} < 39) || 0%{?rhel} >= 8
 # For building Fedora, RHEL/CentOS, and Mageia based minimal images
 Requires:       microdnf
 Provides:       kiwi-packagemanager:microdnf
@@ -423,7 +426,7 @@ type attribute.
 
 %package cli
 Summary:        Flexible operating system appliance image builder
-Provides:       kiwi-schema = 7.4
+Provides:       kiwi-schema = 7.6
 # So we can reference it by the source package name while permitting this to be noarch
 Provides:       %{name} = %{version}-%{release}
 Requires:       python3-%{name} = %{version}-%{release}
@@ -555,6 +558,9 @@ done
 # Empty metapackage
 
 %changelog
+* Fri Jul 14 2023 Neal Gompa <ngompa@fedoraproject.org> - 9.25.5-1
+- Rebase to 9.25.5 (RH#2195943)
+
 * Thu Jun 29 2023 Python Maint <python-maint@redhat.com> - 9.24.59-2
 - Rebuilt for Python 3.12
 
diff --git a/sources b/sources
index fa43320..46e3957 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kiwi-9.24.59.tar.gz) = e6b85336db6fdd34bf59fe25c84e8d0d67b292157eca2c07c0f6cb2b5ba0b8df9ed5a37701692d528a80452f2dc75c6282793d4013003f91e9ad028382b3d670
+SHA512 (kiwi-9.25.5.tar.gz) = cb28da0be91b30245e9f3d811a55abbe618d154e97a69294cdc18a66666fdfe17d005ae52170b55fabfc76c704d0dd71847e10498d26fd996f2013551c53955c