From f39a2bc1d2392355979bcc5a922d0d0b2e67c768fb348a7fdb15c74aa6c950a1 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.com>
Date: Tue, 21 Jan 2014 11:52:38 +0000
Subject: [PATCH] Accepting request 214574 from home:tiwai:branches:devel:tools

- Update to version 1.1-rc2: Bugs fixed,
  * Crash in criu check
  * RPC check always fail on 3.11 kernel
  * Failed fork() didn't abort restore
  * Dump fail not reported via RPC
  * RPC client disconnect wasn't handled
  * Page server could connect to self for writing images
  * Hang on pre-dumping task livig in net-namespace
  * VDSO page mis-handle on pre-dump
  * FPU state loss on pre-dump
  * Memory tracking turns ON w/o request
  * Various fixes (and improvements) in build system
- Fix missing struct ptrace_peeksiginfo_args on FACTORY:
  always-define-ptrace_peeksiginfo_args.diff

OBS-URL: https://build.opensuse.org/request/show/214574
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=6
---
 always-define-ptrace_peeksiginfo_args.diff | 25 ++++++++++++++++++++++
 criu-1.1-rc1.tar.bz2                       |  3 ---
 criu-1.1-rc2.tar.bz2                       |  3 +++
 criu.changes                               | 18 ++++++++++++++++
 criu.spec                                  |  8 +++++--
 5 files changed, 52 insertions(+), 5 deletions(-)
 create mode 100644 always-define-ptrace_peeksiginfo_args.diff
 delete mode 100644 criu-1.1-rc1.tar.bz2
 create mode 100644 criu-1.1-rc2.tar.bz2

diff --git a/always-define-ptrace_peeksiginfo_args.diff b/always-define-ptrace_peeksiginfo_args.diff
new file mode 100644
index 0000000..1170cd8
--- /dev/null
+++ b/always-define-ptrace_peeksiginfo_args.diff
@@ -0,0 +1,25 @@
+struct ptrace_peeksiginfo_args is defined in linux/ptrace.h but not in sys/ptrace.h.
+
+---
+ include/ptrace.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/include/ptrace.h
++++ b/include/ptrace.h
+@@ -19,6 +19,8 @@
+ 
+ #ifndef PTRACE_PEEKSIGINFO
+ #define PTRACE_PEEKSIGINFO      0x4209
++#endif
++
+ struct ptrace_peeksiginfo_args {
+         __u64 off;	/* from which siginfo to start */
+         __u32 flags;
+@@ -27,7 +29,6 @@ struct ptrace_peeksiginfo_args {
+ 
+ /* Read signals from a shared (process wide) queue */
+ #define PTRACE_PEEKSIGINFO_SHARED       (1 << 0)
+-#endif
+ 
+ #ifndef PTRACE_GETREGSET
+ # define PTRACE_GETREGSET	0x4204
diff --git a/criu-1.1-rc1.tar.bz2 b/criu-1.1-rc1.tar.bz2
deleted file mode 100644
index ce6b536..0000000
--- a/criu-1.1-rc1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1e4b720f03c02ded75917a4cae7752c53c56609b2fc4e271f985caedc6818d80
-size 322908
diff --git a/criu-1.1-rc2.tar.bz2 b/criu-1.1-rc2.tar.bz2
new file mode 100644
index 0000000..a30af93
--- /dev/null
+++ b/criu-1.1-rc2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0fd5baed387ad5a67e7b79130e66ea2ac0b516cc15276ccdb4d1ae027e312360
+size 323911
diff --git a/criu.changes b/criu.changes
index 17c5986..5020161 100644
--- a/criu.changes
+++ b/criu.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Tue Jan 21 12:23:27 CET 2014 - tiwai@suse.de
+
+- Update to version 1.1-rc2: Bugs fixed,
+  * Crash in criu check
+  * RPC check always fail on 3.11 kernel
+  * Failed fork() didn't abort restore
+  * Dump fail not reported via RPC
+  * RPC client disconnect wasn't handled
+  * Page server could connect to self for writing images
+  * Hang on pre-dumping task livig in net-namespace
+  * VDSO page mis-handle on pre-dump
+  * FPU state loss on pre-dump
+  * Memory tracking turns ON w/o request
+  * Various fixes (and improvements) in build system 
+- Fix missing struct ptrace_peeksiginfo_args on FACTORY:
+  always-define-ptrace_peeksiginfo_args.diff
+
 -------------------------------------------------------------------
 Wed Jan  8 16:40:12 CET 2014 - tiwai@suse.de
 
diff --git a/criu.spec b/criu.spec
index cfc3ce8..a2d3e3c 100644
--- a/criu.spec
+++ b/criu.spec
@@ -16,9 +16,9 @@
 #
 
 
-%define package_version 1.1-rc1
+%define package_version 1.1-rc2
 Name:           criu
-Version:        1.0.99.1 
+Version:        1.0.99.2 
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0
@@ -29,6 +29,7 @@ BuildRequires:  protobuf-c
 BuildRequires:  xmlto
 BuildRequires:  pkgconfig(systemd)
 Source0:        http://download.openvz.org/criu/criu-%{package_version}.tar.bz2
+Patch1:         always-define-ptrace_peeksiginfo_args.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64
 
@@ -41,6 +42,9 @@ the point it was frozen at.
 
 %prep
 %setup -q -n %{name}-%{package_version}
+%if 0%{suse_version} > 1310
+%patch1 -p1
+%endif
 
 %build
 export CFLAGS="%optflags"