Accepting request 852394 from home:tiwai:branches:devel:tools

- Update to criu 3.15:
  see details at https://criu.org/Download/criu/3.15
  New features:
  * Introduced criu-image-streamer
  * Added MIPS support
  * Allow checkpointing out of existing PID namespace and restoring
    into existing PID namespace
  * Added additional file validation mechanisms
  * Added support to checkpoint and restore BPF hash maps
   (BPF_MAP_TYPE_HASH) and array maps (BPF_MAP_TYPE_ARRAY)
  * Initial cgroups v2 support
- Fix build with nftables package:
  0002-Fix-build-with-nftables-installed-in-different-direc.patch

OBS-URL: https://build.opensuse.org/request/show/852394
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=101

0002-Fix-build-with-nftables-installed-in-different-direc.patch

@@ -0,0 +1,47 @@
+From 95191250537d1cd872668647da76234241f16661 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Tue, 1 Dec 2020 16:32:19 +0100
+Subject: [PATCH] Fix build with nftables installed in different directory
+
+The cflags needs to be passed to the build test.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ Makefile.config | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/Makefile.config b/Makefile.config
+index 3d99e680be7f..720df0b11c9e 100644
+--- a/Makefile.config
++++ b/Makefile.config
+@@ -30,13 +30,16 @@ else
+ endif
+ 
+ ifeq ($(call pkg-config-check,libnftables),y)
++        CFLAGS_NFTABLES := $(shell pkg-config --cflags libnftables)
+         LIB_NFTABLES	:= $(shell pkg-config --libs libnftables)
+-        ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true)
++        ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(CFLAGS_NFTABLES) $(LIB_NFTABLES)),true)
+                 LIBS_FEATURES	+= $(LIB_NFTABLES)
+                 FEATURE_DEFINES	+= -DCONFIG_HAS_NFTABLES_LIB_API_0
+-        else ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_1),$(LIB_NFTABLES)),true)
++                FEATURE_CFLAGS	+= $(CFLAGS_NFTABLES)
++        else ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_1),$(CFLAGS_NFTABLES) $(LIB_NFTABLES)),true)
+                 LIBS_FEATURES	+= $(LIB_NFTABLES)
+                 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)
+@@ -67,7 +70,7 @@ endif
+ endif
+ 
+ export DEFINES += $(FEATURE_DEFINES)
+-export CFLAGS += $(FEATURE_DEFINES)
++export CFLAGS += $(FEATURE_DEFINES) $(FEATURE_CFLAGS)
+ 
+ FEATURES_LIST	:= TCP_REPAIR STRLCPY STRLCAT PTRACE_PEEKSIGINFO \
+ 	SETPROCTITLE_INIT MEMFD TCP_REPAIR_WINDOW FSCONFIG MEMFD_CREATE
+-- 
+2.26.2
+

criu-3.14.tar.bz2

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

criu-3.15.tar.bz2

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

criu.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Dec  1 15:58:59 CET 2020 - tiwai@suse.de
+
+- Update to criu 3.15:
+  see details at https://criu.org/Download/criu/3.15
+  New features:
+  * Introduced criu-image-streamer
+  * Added MIPS support
+  * Allow checkpointing out of existing PID namespace and restoring
+    into existing PID namespace
+  * Added additional file validation mechanisms
+  * Added support to checkpoint and restore BPF hash maps
+   (BPF_MAP_TYPE_HASH) and array maps (BPF_MAP_TYPE_ARRAY)
+  * Initial cgroups v2 support
+- Fix build with nftables package:
+  0002-Fix-build-with-nftables-installed-in-different-direc.patch
+
 -------------------------------------------------------------------
 Wed Sep 23 12:17:11 UTC 2020 - Dirk Mueller <dmueller@suse.com>
 

criu.spec

@@ -26,7 +26,7 @@
 %endif
 
 Name:           criu
-Version:        3.14
+Version:        3.15
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0-only
@@ -34,6 +34,7 @@ Group:          System/Console
 URL:            https://criu.org/
 Source0:        https://download.openvz.org/criu/%{name}-%{version}.tar.bz2
 Patch1:         criu-py-install-fix.diff
+Patch2:         0002-Fix-build-with-nftables-installed-in-different-direc.patch
 BuildRequires:  libcap-devel
 BuildRequires:  libgnutls-devel
 BuildRequires:  libnet-devel
@@ -42,6 +43,9 @@ BuildRequires:  pkgconfig
 BuildRequires:  protobuf-c
 BuildRequires:  protobuf-devel
 BuildRequires:  python3-devel
+%if 0%{?suse_version} >= 1550
+BuildRequires:  nftables-devel
+%endif
 %if 0%{?use_asciidoctor}
 BuildRequires:  rubygem(asciidoctor)
 %else
@@ -94,6 +98,7 @@ to develop applications with CRIU library.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 # default off
 echo "BINFMT_MISC_VIRTUALIZED" > .config
 
@@ -103,10 +108,11 @@ export CFLAGS="%{optflags}"
 %ifarch %arm
 export CFLAGS="$CFLAGS -Wno-error=deprecated"
 %endif
-make V=1 %{?_smp_mflags} %{?make_options}
+# WERROR=0 is needed for avoiding warning due to doubly _GNU_SOURCE defines
+make V=1 %{?_smp_mflags} %{?make_options} WERROR=0
 
 %install
-%make_install V=1 %{?make_options} \
+%make_install V=1 %{?make_options} WERROR=0 \
 	PREFIX=%{_prefix} \
 	LIBDIR=%{_libdir} \
 	LIBEXECDIR=%{_libexecdir}