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

- Update to criu 3.10:
  New features:
  * Support Python3 in ZDTM and CRIT
  * Keep names for UNIX sockets, that are unlinked from the FS
  * IPVv6 support for page server
  * Set page server socket fd via CLI
  * Large pages support for aarch64/ppc64
  * C/R of Per-thread seccomp chains
  Bugfixes:
  * Failed non-container restore could kill random task on the host
  * Failure to dump namespaces was erroneously ignored
  * CRIT didn't show cpuinfo image file
  * Tasks that got PID-reuse couldn't be dumped iteratively because
    previous images were missing
- Update to criu 3.11:
  New features:
  * cpuinfo: Detect compact frames and handle noxsaves
  * Add support for configuration files
  * Add support for external net namespaces
  * Punch holes in input files when restoring anonymous non-shared
    memory ( --auto-dedup )
  * C/R of
    + epoll: Add support for duped targets
    + tun: Add support for multiple net ns
    + x86: Support extendable fpu frames
  Bugfixes:
  * mount: Better handling of mount points propagation
  * nmk: Make collect-deps to be more precise about targets
  * lazy-pages: Don't mark current stack page as lazy
  * x86: CPU -- Rework feature testing

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

criu-3.11.tar.bz2

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

criu-3.9.tar.bz2

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

criu-asciidoctor.patch

@@ -0,0 +1,44 @@
+---
+ Documentation/Makefile |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/Documentation/Makefile
++++ b/Documentation/Makefile
+@@ -2,9 +2,15 @@ __nmk_dir ?= ../scripts/nmk/scripts/
+ include $(__nmk_dir)include.mk
+ include $(__nmk_dir)macro.mk
+ 
++ifneq ($(USE_ASCIIDOCTOR),)
++ASCIIDOC	:= asciidoctor
++A2X		:=
++XMLTO		:=
++else
+ ASCIIDOC	:= asciidoc
+ A2X		:= a2x
+ XMLTO		:= xmlto
++endif
+ 
+ FOOTER		:= footer.txt
+ SRC1		+= crit.txt
+@@ -45,13 +51,21 @@ $(FOOTER): ../Makefile.versions
+ 
+ %.1: %.txt $(FOOTER) custom.xsl
+ 	$(call msg-gen, $@)
++ifneq ($(USE_ASCIIDOCTOR),)
++	$(Q) $(ASCIIDOC) -b manpage -d manpage -o $@ $<
++else
+ 	$(Q) $(ASCIIDOC) -b docbook -d manpage -o $(patsubst %.1,%.xml,$@) $<
+ 	$(Q) $(XMLTO) man -m custom.xsl $(patsubst %.1,%.xml,$@) 2>/dev/null
++endif
+ 
+ %.8: %.txt $(FOOTER) custom.xsl
+ 	$(call msg-gen, $@)
++ifneq ($(USE_ASCIIDOCTOR),)
++	$(Q) $(ASCIIDOC) -b manpage -d manpage -o $@ $<
++else
+ 	$(Q) $(ASCIIDOC) -b docbook -d manpage -o $(patsubst %.8,%.xml,$@) $<
+ 	$(Q) $(XMLTO) man -m custom.xsl $(patsubst %.8,%.xml,$@) 2>/dev/null
++endif
+ 
+ %.ps: %.1
+ 	$(call msg-gen, $@)

criu-py-install-fix.diff

@@ -4,12 +4,12 @@
 
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -56,7 +56,7 @@ install: lib-c lib-py crit/crit lib/c/cr
+@@ -53,7 +53,7 @@ install: lib-c lib-py crit/crit lib/c/cr
  	$(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
  	$(E) "  INSTALL " crit
--	$(Q) $(PYTHON_BIN) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES)
+-	$(Q) $(PYTHON) scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX) --record $(CRIT_SETUP_FILES)
-+	$(Q) $(PYTHON_BIN) scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
++	$(Q) $(PYTHON) scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX) --record $(CRIT_SETUP_FILES)
  .PHONY: install
  
  uninstall:

criu.changes

@@ -1,3 +1,50 @@
+-------------------------------------------------------------------
+Mon Nov 19 17:46:08 CET 2018 - tiwai@suse.de
+
+- Update to criu 3.10:
+  New features:
+  * Support Python3 in ZDTM and CRIT
+  * Keep names for UNIX sockets, that are unlinked from the FS
+  * IPVv6 support for page server
+  * Set page server socket fd via CLI
+  * Large pages support for aarch64/ppc64
+  * C/R of Per-thread seccomp chains
+  Bugfixes:
+  * Failed non-container restore could kill random task on the host
+  * Failure to dump namespaces was erroneously ignored
+  * CRIT didn't show cpuinfo image file
+  * Tasks that got PID-reuse couldn't be dumped iteratively because
+    previous images were missing
+
+- Update to criu 3.11:
+  New features:
+  * cpuinfo: Detect compact frames and handle noxsaves
+  * Add support for configuration files
+  * Add support for external net namespaces
+  * Punch holes in input files when restoring anonymous non-shared
+    memory ( --auto-dedup )
+  * C/R of
+    + epoll: Add support for duped targets
+    + tun: Add support for multiple net ns
+    + x86: Support extendable fpu frames
+  Bugfixes:
+  * mount: Better handling of mount points propagation
+  * nmk: Make collect-deps to be more precise about targets
+  * lazy-pages: Don't mark current stack page as lazy
+  * x86: CPU -- Rework feature testing
+  * files: Fix O(n^2) restore in terms of the number of fds
+  * fdstore: Unlimit fdstore queue on start
+  * mount: Fix regression where open_mountpoint failed on readonly fs
+  * page server: Handle partial splicing
+  * ... lots of small fixes here and there
+  Improvements:
+  * Remove all magic of service descriptors when it isn't required
+
+- Switch to python3
+
+- Use asciidoctor instead of asciidoc for formatting manuals:
+  criu-asciidoctor.patch
+
 -------------------------------------------------------------------
 Mon May 28 21:15:10 UTC 2018 - avindra@opensuse.org
 

criu.spec

@@ -12,12 +12,17 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+%if 0%{?suse_version} >= 1330
+%define use_asciidoctor 1
+%define make_options USE_ASCIIDOCTOR=1
+%endif
+
 Name:           criu
-Version:        3.9
+Version:        3.11
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0-only
@@ -25,17 +30,22 @@ Group:          System/Console
 URL:            https://criu.org/
 Source0:        https://download.openvz.org/criu/%{name}-%{version}.tar.bz2
 Patch1:         criu-py-install-fix.diff
-BuildRequires:  asciidoc
+Patch2:         criu-asciidoctor.patch
 BuildRequires:  libcap-devel
 BuildRequires:  libnet-devel
 BuildRequires:  libnl3-devel
 BuildRequires:  pkgconfig
 BuildRequires:  protobuf-c
 BuildRequires:  protobuf-devel
-BuildRequires:  python-devel
+BuildRequires:  python3-devel
+%if 0%{?use_asciidoctor}
+BuildRequires:  rubygem(asciidoctor)
+%else
+BuildRequires:  asciidoc
 BuildRequires:  xmlto
-Requires:       python-ipaddr
+%endif
-Requires:       python-protobuf
+Requires:       python3-ipaddr
+Requires:       python3-protobuf
 ExclusiveArch:  x86_64 aarch64 ppc64le %{arm} s390x
 %if 0%{?suse_version} > 1320
 BuildRequires:  libbsd-devel
@@ -80,15 +90,16 @@ to develop applications with CRIU library.
 %prep
 %setup -q
 %patch1 -p1
+%patch2 -p1
 # default off
 echo "BINFMT_MISC_VIRTUALIZED" > .config
 
 %build
 export CFLAGS="%{optflags}"
-make V=1 %{?_smp_mflags}
+make V=1 %{?_smp_mflags} %{?make_options}
 
 %install
-%make_install V=1 \
+%make_install V=1 %{?make_options} \
 	PREFIX=%{_prefix} \
 	LIBDIR=%{_libdir} \
 	LIBEXECDIR=%{_libexecdir}