From 9f4c6c955d50388c34cc6497beba07d94d88830ad2ee77308bfef5ac83c79fb0 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 8 Jan 2014 15:51:34 +0000 Subject: [PATCH] Accepting request 213205 from home:tiwai:branches:devel:tools - Update to version 1.1-rc1: New features: * libcriu.so -- wrapper library for RPC clients * new plugins: external unix sockets, external bind mounts, external net devices and unknown file types * Images deduplication in incremental dumps * Integration with systemd * Filtering of criu show output Bug fixes: * Errors in unlinked files/sockets detection on BTRFS * NFS silly-rename files are not treated as unlinked * Freezer fail to seize quickly forking/pthread_create-ing tasks * Extra stop signal queued for stopped tasks after pre-dump * Wrong dying task state detection * Lost RPC dump response * Crash when reporting restore error via RPC * Negative return code into shell * Tasks left in wrong states after failed dump * A little bit more verbose check action * Coverity checks fail here and there - Drop obsoleted criu-fix-PTRACE_LISTEN-define.diff OBS-URL: https://build.opensuse.org/request/show/213205 OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=4 --- criu-1.0.tar.bz2 | 3 --- criu-1.1-rc1.tar.bz2 | 3 +++ criu-fix-PTRACE_LISTEN-define.diff | 16 -------------- criu.changes | 26 +++++++++++++++++++++++ criu.spec | 34 +++++++++++++++++++++++------- 5 files changed, 55 insertions(+), 27 deletions(-) delete mode 100644 criu-1.0.tar.bz2 create mode 100644 criu-1.1-rc1.tar.bz2 delete mode 100644 criu-fix-PTRACE_LISTEN-define.diff diff --git a/criu-1.0.tar.bz2 b/criu-1.0.tar.bz2 deleted file mode 100644 index 65889b2..0000000 --- a/criu-1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4243202d05d9900fca6249e62814d2b4e2b775c49631bc84654c5dc09f730f1f -size 307122 diff --git a/criu-1.1-rc1.tar.bz2 b/criu-1.1-rc1.tar.bz2 new file mode 100644 index 0000000..ce6b536 --- /dev/null +++ b/criu-1.1-rc1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1e4b720f03c02ded75917a4cae7752c53c56609b2fc4e271f985caedc6818d80 +size 322908 diff --git a/criu-fix-PTRACE_LISTEN-define.diff b/criu-fix-PTRACE_LISTEN-define.diff deleted file mode 100644 index 3d9bcb7..0000000 --- a/criu-fix-PTRACE_LISTEN-define.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- - include/ptrace.h | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/include/ptrace.h -+++ b/include/ptrace.h -@@ -13,7 +13,9 @@ - # define PTRACE_INTERRUPT 0x4207 - #endif - -+#ifndef PTRACE_LISTEN - #define PTRACE_LISTEN 0x4208 -+#endif - - #ifndef PTRACE_PEEKSIGINFO - #define PTRACE_PEEKSIGINFO 0x4209 diff --git a/criu.changes b/criu.changes index 1974f21..17c5986 100644 --- a/criu.changes +++ b/criu.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Jan 8 16:40:12 CET 2014 - tiwai@suse.de + +- Update to version 1.1-rc1: + New features: + * libcriu.so -- wrapper library for RPC clients + * new plugins: external unix sockets, external bind mounts, + external net devices and unknown file types + * Images deduplication in incremental dumps + * Integration with systemd + * Filtering of criu show output + Bug fixes: + * Errors in unlinked files/sockets detection on BTRFS + * NFS silly-rename files are not treated as unlinked + * Freezer fail to seize quickly forking/pthread_create-ing tasks + * Extra stop signal queued for stopped tasks after pre-dump + * Wrong dying task state detection + * Lost RPC dump response + * Crash when reporting restore error via RPC + * Negative return code into shell + * Tasks left in wrong states after failed dump + * A little bit more verbose check action + * Coverity checks fail here and there + +- Drop obsoleted criu-fix-PTRACE_LISTEN-define.diff + ------------------------------------------------------------------- Wed Nov 27 14:29:51 CET 2013 - tiwai@suse.de diff --git a/criu.spec b/criu.spec index 73cff2e..cfc3ce8 100644 --- a/criu.spec +++ b/criu.spec @@ -1,7 +1,7 @@ # -# spec file for package alsa +# spec file for package criu # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,9 +15,11 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + +%define package_version 1.1-rc1 Name: criu -Version: 1.0 -Release: 1 +Version: 1.0.99.1 +Release: 0 Summary: Checkpoint/Restore In Userspace Tools License: GPL-2.0 Group: System/Console @@ -25,8 +27,8 @@ Url: http://criu.org/ BuildRequires: asciidoc BuildRequires: protobuf-c BuildRequires: xmlto -Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2 -Patch1: criu-fix-PTRACE_LISTEN-define.diff +BuildRequires: pkgconfig(systemd) +Source0: http://download.openvz.org/criu/criu-%{package_version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: x86_64 @@ -38,8 +40,7 @@ files. You can then use the files to restore and run the application from the point it was frozen at. %prep -%setup -q -%patch1 -p1 +%setup -q -n %{name}-%{package_version} %build export CFLAGS="%optflags" @@ -53,10 +54,27 @@ ln -s criu.8 $RPM_BUILD_ROOT%{_mandir}/man8/crtools.8 # fix up wrong permissions chmod 0644 $RPM_BUILD_ROOT%{_mandir}/man*/* +%pre +%service_add_pre criu.service criu.socket +exit 0 + +%preun +%service_del_preun criu.service criu.socket +exit 0 + +%post +%service_add_post criu.service criu.socket +exit 0 + +%postun +%service_del_postun criu.service criu.socket +exit 0 + %files %defattr(-,root,root) %doc README COPYING %{_sbindir}/* %{_mandir}/man*/* +%{_unitdir}/criu.* %changelog