From d458ceae9c3e9a26333995f328330d2e171b77bd85159833638e64f0bd9791d7 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 17 May 2016 12:24:47 +0000
Subject: [PATCH] Accepting request 396192 from home:tiwai:branches:devel:tools

- Update to criu 2.2: mostly bugfixes
  New features:
  * "Post-resume" added to action scripts
  * Root task's PID in environment for action scripts
  * Devconfs drop_gratuitous_arp and drop_unicast_in_l2_multicast
  * Serial ttys
  Optimizations/improvements
  * Lighter link-remaps restore on newer kernels
  Fixes:
  * Race when restoring userns vs setting ns' maps
  * Tasks with zero fds failed the dump
  * Restore of TCP recv queue could fail due to kernel mem alloc
    constraints
  * No errors were written to logs when launching helper
    (tar/iptables) app in userns restore
  * User-mode dumped no memory pages sometimes
  * Bind mounts considered not as bind sometimes
  * Two mounts in the same directory blocked the dump
  * Off-by in on /dev/tty{1,63} dumping
  * Forking of cgroupns task was done with screwed clone flags
  Deprecated/removed:
  * Greedy mode of pagemap dumping (on some kernels we do not
    support user-mode)
  * Removed the --namespaces option

OBS-URL: https://build.opensuse.org/request/show/396192
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=40
---
 criu-2.1.tar.bz2 |  3 ---
 criu-2.2.tar.bz2 |  3 +++
 criu.changes     | 28 ++++++++++++++++++++++++++++
 criu.spec        |  4 ++--
 4 files changed, 33 insertions(+), 5 deletions(-)
 delete mode 100644 criu-2.1.tar.bz2
 create mode 100644 criu-2.2.tar.bz2

diff --git a/criu-2.1.tar.bz2 b/criu-2.1.tar.bz2
deleted file mode 100644
index 1a6eb5c..0000000
--- a/criu-2.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7a9fe6f2858a3086e652e17ffb85174f72cf19e87e776fc5ddab66013f16d4c4
-size 556820
diff --git a/criu-2.2.tar.bz2 b/criu-2.2.tar.bz2
new file mode 100644
index 0000000..415e9e6
--- /dev/null
+++ b/criu-2.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53
+size 558926
diff --git a/criu.changes b/criu.changes
index cc607e7..8f78a00 100644
--- a/criu.changes
+++ b/criu.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Tue May 17 14:03:06 CEST 2016 - tiwai@suse.de
+
+- Update to criu 2.2: mostly bugfixes
+  New features:
+  * "Post-resume" added to action scripts
+  * Root task's PID in environment for action scripts
+  * Devconfs drop_gratuitous_arp and drop_unicast_in_l2_multicast
+  * Serial ttys
+  Optimizations/improvements
+  * Lighter link-remaps restore on newer kernels
+  Fixes:
+  * Race when restoring userns vs setting ns' maps
+  * Tasks with zero fds failed the dump
+  * Restore of TCP recv queue could fail due to kernel mem alloc
+    constraints
+  * No errors were written to logs when launching helper
+    (tar/iptables) app in userns restore
+  * User-mode dumped no memory pages sometimes
+  * Bind mounts considered not as bind sometimes
+  * Two mounts in the same directory blocked the dump
+  * Off-by in on /dev/tty{1,63} dumping
+  * Forking of cgroupns task was done with screwed clone flags
+  Deprecated/removed:
+  * Greedy mode of pagemap dumping (on some kernels we do not
+    support user-mode)
+  * Removed the --namespaces option
+
 -------------------------------------------------------------------
 Tue Apr 12 16:35:06 CEST 2016 - tiwai@suse.de
 
diff --git a/criu.spec b/criu.spec
index 938b871..10da449 100644
--- a/criu.spec
+++ b/criu.spec
@@ -16,9 +16,9 @@
 #
 
 
-%define package_version 2.1
+%define package_version 2.2
 Name:           criu
-Version:        2.1
+Version:        2.2
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0