From 4ebc864590aafa5956a11dad5df05562c27ce3f8 Mon Sep 17 00:00:00 2001
From: eabdullin <eabdullin@almalinux.org>
Date: Tue, 7 Nov 2023 11:59:25 +0000
Subject: [PATCH] import UBI criu-3.18-1.el9

---
 .criu.metadata          |  2 +-
 .gitignore              |  2 +-
 SOURCES/pycriu-setup-py | 30 ++++++++++++++++++++++++++++++
 SPECS/criu.spec         | 30 ++++++++++++++++++++++--------
 4 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 SOURCES/pycriu-setup-py

diff --git a/.criu.metadata b/.criu.metadata
index 2755bfb..3058556 100644
--- a/.criu.metadata
+++ b/.criu.metadata
@@ -1 +1 @@
-5c2725361d0d131a3f6142cb2ae8abff6d50aed3 SOURCES/criu-3.17.tar.gz
+f359d9a3af080f5d3293c847af5ab10f58639d85 SOURCES/criu-3.18.tar.gz
diff --git a/.gitignore b/.gitignore
index b97c52b..9ac16f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/criu-3.17.tar.gz
+SOURCES/criu-3.18.tar.gz
diff --git a/SOURCES/pycriu-setup-py b/SOURCES/pycriu-setup-py
new file mode 100644
index 0000000..6bfe3b1
--- /dev/null
+++ b/SOURCES/pycriu-setup-py
@@ -0,0 +1,30 @@
+import os
+from setuptools import setup, find_packages
+
+print(find_packages('.'))
+
+def get_version():
+    version = '0.0.1'
+    env = os.environ
+    if 'CRIU_VERSION_MAJOR' in env and 'CRIU_VERSION_MINOR' in env:
+        version = '{}.{}'.format(
+            env['CRIU_VERSION_MAJOR'],
+            env['CRIU_VERSION_MINOR']
+        )
+        if 'CRIU_VERSION_SUBLEVEL' in env and env['CRIU_VERSION_SUBLEVEL']:
+            version += '.' + env['CRIU_VERSION_SUBLEVEL']
+    return version
+
+
+setup(
+    name='pycriu',
+    version=get_version(),
+    description='CRiu Image Tool',
+    author='CRIU team',
+    author_email='criu@openvz.org',
+    license='GPLv2',
+    url='https://github.com/checkpoint-restore/criu',
+    packages=['pycriu','pycriu.images'],
+   package_dir = {'pycriu': '.', 'pycriu.images':'images'}
+
+)
diff --git a/SPECS/criu.spec b/SPECS/criu.spec
index 04fec5a..2d555bf 100644
--- a/SPECS/criu.spec
+++ b/SPECS/criu.spec
@@ -6,8 +6,8 @@
 %global _lto_cflags %%{nil}
 
 Name: criu
-Version: 3.17
-Release: 5%{?dist}
+Version: 3.18
+Release: 1%{?dist}
 Provides: crtools = %{version}-%{release}
 Obsoletes: crtools <= 1.0-2
 Summary: Tool for Checkpoint/Restore in User-space
@@ -15,11 +15,15 @@ License: GPLv2
 URL: http://criu.org/
 Source0: https://github.com/checkpoint-restore/criu/archive/v%{version}/criu-%{version}.tar.gz
 Source1: criu-tmpfiles.conf
+Source2: pycriu-setup-py
 BuildRequires: gcc
 BuildRequires: systemd
 BuildRequires: libnet-devel
 BuildRequires: protobuf-devel protobuf-c-devel %{py_prefix}-devel libnl3-devel libcap-devel
 BuildRequires: asciidoc xmlto
+BuildRequires: %{py_prefix}-pip
+BuildRequires: %{py_prefix}-setuptools
+BuildRequires: %{py_prefix}-wheel
 BuildRequires: perl-interpreter
 BuildRequires: libselinux-devel
 BuildRequires: gnutls-devel
@@ -76,9 +80,9 @@ their content in human-readable form.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1
 
 %build
 # %{?_smp_mflags} does not work
@@ -87,6 +91,10 @@ CFLAGS+=`echo %{optflags} | sed -e 's,-fstack-protector\S*,,g'` make V=1 WERROR=
 make docs V=1
 
 %install
+cp %{SOURCE2} lib/py/setup.py
+sed -e "s,--upgrade --force-reinstall,--disable-pip-version-check --progress-bar off --verbose,g;
+        s,\./crit,./crit lib/py,g;" -i lib/Makefile
+rm -f crit/pyproject.toml
 make install-criu DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
 make install-lib DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir} PYTHON=%{py_binary}
 make install-man DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} LIBDIR=%{_libdir}
@@ -122,15 +130,21 @@ rm $RPM_BUILD_ROOT%{_mandir}/man1/criu-ns.1*
 
 %files -n %{py_prefix}-%{name}
 %{python3_sitelib}/pycriu/*
-%{python3_sitelib}/*egg-info
+%{python3_sitelib}/pycriu-%{version}.dist-info
 
 %files -n crit
 %{_bindir}/crit
+%{python3_sitelib}/crit-%{version}.dist-info
 %doc %{_mandir}/man1/crit.1*
 
 %changelog
-* Thu May 11 2023 Adrian Reber <areber@redhat.com> - 3.17-5
-- Apply patch to work with Sapphire Rapids CPU
+* Tue Apr 25 2034 Adrian Reber <adrian@lisas.de> - 3.18-1
+- Update to 3.18
+- Apply patch from upstream to support newer CPUs
+
+* Fri Mar 31 2023 Jindrich Novy <jnovy@redhat.com> - 3.17.1-1
+- update to https://github.com/checkpoint-restore/criu/releases/tag/v3.17.1
+- Related: #2176063
 
 * Mon Jul 11 2022 Radostin Stoyanov <radostin@redhat.com> - 3.17-4
 - Rebuilt to pick up glibc rseq() changes