From 7c17587163a36319ae33cc7efe8983b9438f67dda69abe21171f61ad14a917f9 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 12 Jul 2016 11:08:19 +0000
Subject: [PATCH] Accepting request 407890 from home:tiwai:branches:devel:tools

- Update to criu 2.4:
  New features:
  * Generate core from images
  * Ability to forcibly drop half-open TCP connections on C/R
  * Ability to specify cgroup ctls to dump via API
    Opened/mapped files' mode is compared between dump and restore
    times
  * AutoFS mountpoints
  * New cgroups (perf_event, net_cls, net_prio and pids)
  * Memcgroup optional properties
  * Devices cgroup
  Optimizations/improvements:
  * Pagemap image entries are cached in memory
  Fixes:
  * Configured kmem cgroup limit restore failed
  * Mem cgroup oom_control
  * Cgroup's pids.max was not C/R-ed
  * Failure to write cgroup property was ignored
  * No init PID in pre-dump action script
  * Sigactions inheritance didn't work on ARM
  * Opened "/proc" dir blocked the dump
  * Working with iptables was racy
  * Sibling mounts detection error on dump
  * Devconf accept_redirects devconf could be restored with errors
  * "All" devconfs could be overridden by "Default"
  * Name-less unix sockets got auto-bound
  * Mode was lost for PTY device file on restore
  * Newer protobuf compilers didn't recognize PB files
  * External mounts could be remounted with MS_PRIVATE
  * Build fail on Alpine Linux

OBS-URL: https://build.opensuse.org/request/show/407890
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=44
---
 criu-2.3.tar.bz2 |  3 ---
 criu-2.4.tar.bz2 |  3 +++
 criu.changes     | 39 +++++++++++++++++++++++++++++++++++++++
 criu.spec        |  9 +++++----
 4 files changed, 47 insertions(+), 7 deletions(-)
 delete mode 100644 criu-2.3.tar.bz2
 create mode 100644 criu-2.4.tar.bz2

diff --git a/criu-2.3.tar.bz2 b/criu-2.3.tar.bz2
deleted file mode 100644
index 64b534f..0000000
--- a/criu-2.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:acbdfeb2b6c5b72dbc849e014eecd4d166f0c05c76fc40424eedec0761b60bfe
-size 572580
diff --git a/criu-2.4.tar.bz2 b/criu-2.4.tar.bz2
new file mode 100644
index 0000000..a41b5b6
--- /dev/null
+++ b/criu-2.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2a38119d7baae2cad8496f98dfc461c9685e67f12131abc5f44d764d4b87e9f0
+size 602896
diff --git a/criu.changes b/criu.changes
index 96c5662..32ac9d2 100644
--- a/criu.changes
+++ b/criu.changes
@@ -1,3 +1,42 @@
+-------------------------------------------------------------------
+Tue Jul 12 12:10:20 CEST 2016 - tiwai@suse.de
+
+- Update to criu 2.4:
+  New features:
+  * Generate core from images
+  * Ability to forcibly drop half-open TCP connections on C/R
+  * Ability to specify cgroup ctls to dump via API
+    Opened/mapped files' mode is compared between dump and restore
+    times
+  * AutoFS mountpoints
+  * New cgroups (perf_event, net_cls, net_prio and pids)
+  * Memcgroup optional properties
+  * Devices cgroup
+  Optimizations/improvements:
+  * Pagemap image entries are cached in memory
+  Fixes:
+  * Configured kmem cgroup limit restore failed
+  * Mem cgroup oom_control
+  * Cgroup's pids.max was not C/R-ed
+  * Failure to write cgroup property was ignored
+  * No init PID in pre-dump action script
+  * Sigactions inheritance didn't work on ARM
+  * Opened "/proc" dir blocked the dump
+  * Working with iptables was racy
+  * Sibling mounts detection error on dump
+  * Devconf accept_redirects devconf could be restored with errors
+  * "All" devconfs could be overridden by "Default"
+  * Name-less unix sockets got auto-bound
+  * Mode was lost for PTY device file on restore
+  * Newer protobuf compilers didn't recognize PB files
+  * External mounts could be remounted with MS_PRIVATE
+  * Build fail on Alpine Linux
+  Deprecated/removed:
+  * Per-pid file locks images
+  * Per-pid fdinfo images
+  * Ancient pagemap/pages images
+- Enable builds on 32bit ARM
+
 -------------------------------------------------------------------
 Wed Jun 15 08:19:40 CEST 2016 - tiwai@suse.de
 
diff --git a/criu.spec b/criu.spec
index aed7640..1a0bfa2 100644
--- a/criu.spec
+++ b/criu.spec
@@ -17,7 +17,7 @@
 
 
 Name:           criu
-Version:        2.3
+Version:        2.4
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0
@@ -37,7 +37,7 @@ BuildRequires:  xmlto
 Requires:       python-ipaddr
 Requires:       python-protobuf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch:  x86_64 aarch64 ppc64le
+ExclusiveArch:  x86_64 aarch64 ppc64le %{arm}
 
 %description
 Checkpoint/Restore In Userspace, or CRIU, is a software tool for Linux
@@ -72,11 +72,11 @@ to develop applications with CRIU library.
 %build
 export CFLAGS="%{optflags}"
 make V=1 %{?_smp_mflags} PREFIX=%{_prefix} \
-     LIBDIR=%{_libdir}
+     LIBDIR=%{_libdir} LIBEXECDIR=%{_libexecdir}
 
 %install
 make V=1 %{?_smp_mflags} PREFIX=%{_prefix} \
-     LIBDIR=%{_libdir} \
+     LIBDIR=%{_libdir} LIBEXECDIR=%{_libexecdir} \
      DESTDIR=%{buildroot} install
 # for compatiblity
 ln -s criu %{buildroot}%{_sbindir}/crtools
@@ -92,6 +92,7 @@ ln -s criu.8 %{buildroot}%{_mandir}/man8/crtools.8
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man*/*
+%{_libexecdir}/criu
 /usr/lib/python*/site-packages/crit-*.egg-info
 /usr/lib/python*/site-packages/pycriu