File project.diff of Package python-kiwi
--- python-kiwi.changes.orig
+++ python-kiwi.changes
@@ -1,4 +1,23 @@
-------------------------------------------------------------------
+Mon Sep 19 17:19:20 UTC 2022 - Olaf Kirch <okir@suse.com>
+
+- Make luks device randomization optional: introduce new attr
+ luks_randomize=true/false
+ * luks-optional-randomize.patch
+
+-------------------------------------------------------------------
+Fri Sep 16 16:09:42 UTC 2022 - Olaf Kirch <okir@suse.com>
+
+- Move the LUKS keyfile from /.root.keyfile to /root/.root.keyfile
+ * frob-luks-boot-keyname.patch
+
+-------------------------------------------------------------------
+Wed Sep 14 14:25:28 UTC 2022 - Olaf Kirch <okir@suse.com>
+
+- Added patches to support ALP Full Disk Encryption (not yet submitted
+ upstream)
+
+-------------------------------------------------------------------
Tue Aug 23 11:48:16 CEST 2022 - Marcus Schäfer <marcus.schaefer@gmail.com>
- Bump version: 9.24.47 → 9.24.48
--- python-kiwi.spec.orig
+++ python-kiwi.spec
@@ -1,7 +1,7 @@
#
-# spec file for package kiwi
+# spec file for package python-kiwi
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -11,13 +11,11 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-# Please submit bugfixes or comments via:
-#
-# https://github.com/OSInside/kiwi/issues
-#
-# If they aren't provided by a system installed macro, define them
+
%{!?_defaultdocdir: %global _defaultdocdir %{_datadir}/doc}
%{!?__python3: %global __python3 /usr/bin/python3}
@@ -46,16 +44,21 @@ Name: python-kiwi
Version: 9.24.48
Provides: kiwi-schema = 7.5
Release: 0
-Url: https://github.com/OSInside/kiwi
+URL: https://github.com/OSInside/kiwi
Summary: KIWI - Appliance Builder Next Generation
License: GPL-3.0-or-later
%if "%{_vendor}" == "debbuild"
# Needed to set Maintainer in output debs
-Packager: Marcus Schaefer <ms@suse.de>
%endif
Group: %{pygroup}
Source: %{name}.tar.gz
Source1: %{name}-rpmlintrc
+Patch1: luks-pbkdf-dumb-down.patch
+Patch2: kiwi-dump-add-crypto-tfms.patch
+Patch3: grub-use-disk-password.patch
+Patch4: luks-resize-reenable.patch
+Patch5: frob-luks-boot-keyname.patch
+Patch6: luks-optional-randomize.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc
BuildRequires: python%{python3_pkgversion}-%{develsuffix} >= 3.6
@@ -85,15 +88,15 @@ Provides: kiwi-image:tbz
%endif
# tools conditionally used by kiwi
%if 0%{?fedora} || 0%{?rhel} >= 8
-Recommends: gnupg2
Recommends: debootstrap
Recommends: dpkg
+Recommends: gnupg2
%endif
%if 0%{?suse_version}
-Recommends: gpg2
-Recommends: dnf
Recommends: debootstrap
+Recommends: dnf
Recommends: dpkg
+Recommends: gpg2
%endif
# package managers required by distro
%if 0%{?fedora} || 0%{?rhel} >= 8 || 0%{?suse_version} >= 1550
@@ -116,11 +119,11 @@ Requires: gnupg
%endif
# tools required by kiwi
Requires: kiwi-tools
+Requires: lsof
Requires: mtools
+Requires: openssl
Requires: rsync
Requires: tar >= 1.2.7
-Requires: lsof
-Requires: openssl
%description -n kiwi-systemdeps-core
This metapackage installs the necessary system dependencies
@@ -134,12 +137,12 @@ Obsoletes: kiwi-image-docker-requir
Provides: kiwi-image-wsl-requires = %{version}-%{release}
Obsoletes: kiwi-image-wsl-requires < %{version}-%{release}
%if "%{_vendor}" != "debbuild"
-Provides: kiwi-image:docker
Provides: kiwi-image:appx
+Provides: kiwi-image:docker
%endif
%if 0%{?suse_version}
-Requires: umoci
Requires: fb-util-for-appx
+Requires: umoci
%else
Requires: buildah
%endif
@@ -164,9 +167,9 @@ Requires: xorriso
%ifarch %{ix86} x86_64
Requires: syslinux
%endif
+Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
Requires: kiwi-systemdeps-core = %{version}-%{release}
Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
-Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
%description -n kiwi-systemdeps-iso-media
Host setup helper to pull in all packages required/useful on
@@ -215,8 +218,8 @@ Obsoletes: kiwi-image-pxe-requires
Provides: kiwi-filesystem-requires = %{version}-%{release}
Obsoletes: kiwi-filesystem-requires < %{version}-%{release}
%if "%{_vendor}" != "debbuild"
-Provides: kiwi-image:pxe
Provides: kiwi-image:kis
+Provides: kiwi-image:pxe
%if ! (0%{?rhel} >= 8)
Provides: kiwi-filesystem:btrfs
%endif
@@ -267,19 +270,19 @@ Obsoletes: kiwi-image-vmx-requires
Provides: kiwi-image:oem
Provides: kiwi-image:vmx
%endif
-Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
+Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
Requires: kiwi-systemdeps-iso-media = %{version}-%{release}
%if 0%{?suse_version}
Requires: gptfdisk
%else
Requires: gdisk
%endif
-Requires: lvm2
-Requires: parted
-Requires: kpartx
Requires: cryptsetup
+Requires: kpartx
+Requires: lvm2
Requires: mdadm
+Requires: parted
Requires: util-linux
# lsblk is part of util-linux-systemd on openSUSE
%if 0%{?suse_version}
@@ -312,14 +315,14 @@ languages
%package -n kiwi-systemdeps
Summary: KIWI - Host system dependencies
Group: %{sysgroup}
-Requires: kiwi-systemdeps-core = %{version}-%{release}
Requires: kiwi-systemdeps-bootloaders = %{version}-%{release}
+Requires: kiwi-systemdeps-core = %{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} || 0%{?suse_version}
# None of the container build tools are available in Debian/Ubuntu
Requires: kiwi-systemdeps-containers = %{version}-%{release}
%endif
-Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
Requires: kiwi-systemdeps-disk-images = %{version}-%{release}
+Requires: kiwi-systemdeps-filesystems = %{version}-%{release}
Requires: kiwi-systemdeps-iso-media = %{version}-%{release}
%if 0%{?fedora} || 0%{?suse_version}
Requires: kiwi-systemdeps-image-validation = %{version}-%{release}
@@ -329,25 +332,27 @@ Requires: kiwi-systemdeps-image-va
Host setup helper to pull in all packages required/useful to
leverage all functionality in KIWI.
+
+
# python3-kiwi
%package -n python%{python3_pkgversion}-kiwi
Summary: KIWI - Appliance Builder Next Generation
Group: %{pygroup}
Obsoletes: python2-kiwi
-Conflicts: python2-kiwi
Conflicts: kiwi-man-pages < %{version}
-Requires: screen
+Conflicts: python2-kiwi
Requires: python%{python3_pkgversion} >= 3.6
+Requires: screen
%if 0%{?ubuntu} || 0%{?debian}
Requires: python%{python3_pkgversion}-yaml
%else
Requires: python%{python3_pkgversion}-PyYAML
%endif
-Requires: python%{python3_pkgversion}-simplejson
Requires: python%{python3_pkgversion}-docopt
Requires: python%{python3_pkgversion}-lxml
Requires: python%{python3_pkgversion}-requests
Requires: python%{python3_pkgversion}-setuptools
+Requires: python%{python3_pkgversion}-simplejson
%if (0%{?suse_version} && 0%{?suse_version} < 1550)
Requires: python%{python3_pkgversion}-xattr
%else
@@ -422,8 +427,8 @@ Requires: btrfs-progs
%else
Recommends: btrfs-progs
%endif
-Requires: gdisk
Requires: dracut-network
+Requires: gdisk
%else
%if 0%{?debian} || 0%{?ubuntu}
Recommends: btrfs-tools
@@ -444,16 +449,16 @@ Requires: util-linux
%if 0%{?suse_version}
Requires: util-linux-systemd
%endif
-Requires: xfsprogs
+Requires: curl
Requires: dialog
Requires: pv
-Requires: curl
+Requires: xfsprogs
%if 0%{?debian} || 0%{?ubuntu}
-Requires: xz-utils
Requires: dmsetup
+Requires: xz-utils
%else
-Requires: xz
Requires: device-mapper
+Requires: xz
%endif
%ifarch s390 s390x
Requires: s390-tools
@@ -491,8 +496,8 @@ Summary: KIWI - Dracut module for
BuildRequires: dracut
%endif
Requires: dracut-kiwi-lib = %{version}-%{release}
-Requires: kexec-tools
Requires: gawk
+Requires: kexec-tools
Requires: kpartx
License: GPL-3.0-or-later
Group: %{sysgroup}
@@ -514,9 +519,9 @@ Summary: KIWI - Dracut module for
BuildRequires: dracut
%endif
Requires: dialog
-Requires: xfsprogs
Requires: e2fsprogs
Requires: util-linux
+Requires: xfsprogs
# lsblk is part of util-linux-systemd on openSUSE
%if 0%{?suse_version}
Requires: util-linux-systemd
@@ -533,8 +538,8 @@ Requires: dracut-network
Requires: device-mapper
%endif
Requires: dracut
-Requires: xorriso
Requires: parted
+Requires: xorriso
License: GPL-3.0-or-later
Group: %{sysgroup}
@@ -550,8 +555,8 @@ Summary: KIWI - Dracut module for
# to set up the build environment...
BuildRequires: dracut
%endif
-Requires: dracut-kiwi-lib = %{version}-%{release}
Requires: dracut
+Requires: dracut-kiwi-lib = %{version}-%{release}
License: GPL-3.0-or-later
Group: %{sysgroup}
@@ -570,6 +575,12 @@ Provides manual pages to describe the ki
%prep
%setup -q -n kiwi-%{version}
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
# Drop shebang for kiwi/xml_parse.py, as we don't intend to use it
# as an independent script
