Accepting request 1219895 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/1219895 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/criu?expand=0&rev=61
2024-11-01 20:00:59 +00:00 · 2024-11-01 20:00:59 +00:00 · 0fbafb1069
commit 0fbafb1069
parent 165fc4cfad babf377fa1
6 changed files with 62 additions and 32 deletions
--- a/0002-Fix-build-with-nftables-installed-in-different-direc.patch
+++ b/0002-Fix-build-with-nftables-installed-in-different-direc.patch
@ -12,7 +12,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>

 --- a/Makefile.config
 +++ b/Makefile.config
-@@ -38,13 +38,16 @@ else
+@@ -42,13 +42,16 @@ else
 endif
 
 ifeq ($(call pkg-config-check,libnftables),y)
@ -29,9 +29,9 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
                 FEATURE_DEFINES	+= -DCONFIG_HAS_NFTABLES_LIB_API_1
 +                FEATURE_CFLAGS	+= $(CFLAGS_NFTABLES)
         else
-                 $(warning Warn: you have libnftables installed but it has incompatible API)
-                 $(warning Warn: Building without nftables support)
-@@ -75,7 +78,7 @@ endif
+                 $(info Warn: Building without nftables support (incompatible API version).)
+         endif
+@@ -78,7 +81,7 @@ endif
 endif
 
 export DEFINES += $(FEATURE_DEFINES)
--- a/criu-3.19.tar.gz
+++ b/criu-3.19.tar.gz
--- a/criu-4.0.tar.gz
+++ b/criu-4.0.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c61bfb4cc8f8ddb56da8be816ad8c951aa53b0f9ac4cd56bc74d3f451be5d3a7
+size 1405673
--- a/criu-py-install-fix.diff
+++ b/criu-py-install-fix.diff
@ -1,27 +1,21 @@
 ---
- crit/Makefile           |   12 +-----------
- lib/Makefile            |   12 +-----------
+ crit/Makefile           |    6 +-----
+ lib/Makefile            |    6 +-----
 scripts/crit-setup.py   |   28 ++++++++++++++++++++++++++++
 scripts/pycriu-setup.py |   28 ++++++++++++++++++++++++++++
- 4 files changed, 58 insertions(+), 22 deletions(-)
+ 4 files changed, 58 insertions(+), 10 deletions(-)

 --- a/crit/Makefile
 +++ b/crit/Makefile
-@@ -10,18 +10,8 @@ ${VERSION_FILE}:
+@@ -7,12 +7,8 @@ ${VERSION_FILE}:
 	$(Q) echo "__version__ = '${CRIU_VERSION}'" > $@
 
 install: ${VERSION_FILE}
-ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
-ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
-	$(E) "  SKIP INSTALL crit: Externally managed python environment (See PEP 668 for more information)"
-	$(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
-else
+-ifeq ($(SKIP_PIP_INSTALL),0)
 	$(E) "  INSTALL " crit
-	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
-endif
+-	$(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./crit
 -else
-	$(E) "  INSTALL " crit
-	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./crit
+-	$(E) " SKIP INSTALL crit"
 -endif
 +	$(Q) $(PYTHON) scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
 .PHONY: install
@ -29,21 +23,15 @@
 uninstall:
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -57,18 +57,8 @@ install: lib-c lib-a lib-py lib/c/criu.p
+@@ -54,12 +54,8 @@ install: lib-c lib-a lib-py lib/c/criu.p
 	$(Q) mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
 	$(Q) sed -e 's,@version@,$(CRIU_VERSION),' -e 's,@libdir@,$(LIBDIR),' -e 's,@includedir@,$(dir $(INCLUDEDIR)/criu/),' lib/c/criu.pc.in > lib/c/criu.pc
 	$(Q) install -m 644 lib/c/criu.pc $(DESTDIR)$(LIBDIR)/pkgconfig
-ifeq ($(PYTHON_EXTERNALLY_MANAGED),1)
-ifeq ($(PIP_BREAK_SYSTEM_PACKAGES),0)
-	$(E) "  SKIP INSTALL pycriu: Externally managed python environment (See PEP 668 for more information)"
-	$(E) "  Consider using PIP_BREAK_SYSTEM_PACKAGES=1 make install"
-else
+-ifeq ($(SKIP_PIP_INSTALL),0)
 	$(E) "  INSTALL " pycriu
-	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
-endif
+-	$(Q) $(PYTHON) -m pip install $(PIPFLAGS) --prefix=$(DESTDIR)$(PREFIX) ./lib
 -else
-	$(E) "  INSTALL " pycriu
-	$(Q) $(PYTHON) -m pip install --upgrade --ignore-installed --prefix=$(DESTDIR)$(PREFIX) ./lib
+-	$(E) " SKIP INSTALL pycriu"
 -endif
 +	$(Q) $(PYTHON) scripts/pycriu-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
 .PHONY: install
--- a/criu.changes
+++ b/criu.changes
@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Thu Oct 31 14:27:35 UTC 2024 - Takashi Iwai <tiwai@suse.com>
+
+- Update to criu 4.0:
+  New features:
+  * Shadow stack support
+  * CUDA plugin: Introduced a plugin to support checkpointing and restoring
+    NVIDIA CUDA applications.
+  Bugfixes:
+  * cgroup: Add support for restoring a thread in a correct v1 cgroup
+  * mem: fix some VMAs being incorrectly mapped wtih PROT_WRITE
+  * criu: fix a fatal failure if nft doesn't work
+  * net: Fix TOCTOU race condition in unix_conf_op
+  * pagemap-cache: handle short reads
+  * Fixes here and there.
+  Improvements:
+  * Pagemap cache: Added support for PAGEMAP_SCAN ioctl
+  * zdtm: Added tests for IP_TTL restore
+  * irmap: hardcode some more interesting paths
+  * util: use close_range when it's supported
+  * Fixes and improvements in amdgpu-plugin
+- Make criu-plugin-cuda subpackage
+
 -------------------------------------------------------------------
 Tue Nov 28 15:04:29 UTC 2023 - Takashi Iwai <tiwai@suse.com>

--- a/criu.spec
+++ b/criu.spec
@ -1,7 +1,7 @@
 #
 # spec file for package criu
 #
-# Copyright (c) 2023 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
@ -33,7 +33,7 @@
 %define proto_c_ver %(protoc-c --version | head -1 | awk '{print $2}')

 Name:           criu
-Version:        3.19
+Version:        4.0
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0-only
@ -91,6 +91,15 @@ Requires:       %{name} = %{version}
 This package contains the AMDGPU ROCm support plugin for CRIU.
 %endif

+%package plugin-cuda
+Summary:        CUDA plugin for CRIU
+License:        GPL-2.0-only
+Group:          System/Console
+Requires:       %{name} = %{version}
+
+%description plugin-cuda
+This package contains the CUDA support plugin for CRIU.
+
 %package -n libcriu2
 Summary:        Library for CRIU
 License:        LGPL-2.1-only
@ -122,6 +131,11 @@ to develop applications with CRIU library.

 %prep
 %autosetup -p1
+# workaround for Leap 15.x
+%if 0%{?suse_version} < 1600
+sed -i -e's/\(^.*-mshstk\)/# \1/' criu/pie/Makefile
+%endif
+
 # default off
 echo "BINFMT_MISC_VIRTUALIZED" > .config

@ -189,6 +203,11 @@ rm -f %{buildroot}%{_mandir}/man1/criu-amdgpu-plugin.1
 %{_libdir}/criu/amdgpu_plugin.so
 %endif

+%files plugin-cuda
+%doc plugins/cuda/README.md
+%dir %{_libdir}/criu
+%{_libdir}/criu/cuda_plugin.so
+
 %files -n libcriu2
 %{_libdir}/libcriu.so.*