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

- Disable systemd service as a temporary workaround for possibile
  security issues (CVE-2015-5228, CVE-2015-5231, bsc#943105)
- Update to criu 1.7:
  * Improved cgroups management
  * Support for seccomp strict mode
  * Support for stream unix sockets inheritance
  * Support uid/gid-restricted mounts in userns
  * Support deleted bind-mounts
  * Ability to specify maximum ghost file size
  * OverlayFS support
  * Support relative unix sockets' bind paths
  * Altivec and PSX support for PPC
  * Small PIE loader
  * Temporary proc mountpoint is mounted with nosuid, noexec and nodev
  * Less memory copies when preparing restorer binary
  * CRIT action "show" for less keystrokes on common use-case
  * Fsnotify log messages now use hex everywhere :)
  * CRIT output doesn't mix fields any more
  * Many fixes

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

criu.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package criu
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,18 +16,16 @@
 #
 
 
-%define package_version 1.6
+%define with_systemd_service 0
+%define package_version 1.7
 Name:           criu
-Version:        1.6
+Version:        1.7
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0
 Group:          System/Console
 Url:            http://criu.org/
 Source0:        http://download.openvz.org/criu/criu-%{package_version}.tar.bz2
-Patch1:         crit-install-prefix.diff
-Patch2:         lsm-prototype-fix.diff
-Patch3:         4c5b23e5-criu.pc.diff
 BuildRequires:  asciidoc
 BuildRequires:  pkg-config
 BuildRequires:  protobuf-c
@@ -67,9 +65,6 @@ to develop applications with CRIU library.
 
 %prep
 %setup -q -n %{name}-%{package_version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 # fix up the broken protobuf descriptor.proto (comment-in-comment)
 rm -f protobuf/google/protobuf/descriptor.proto
 sed -e's@/\*@@g' -e's@\*/@@g' /usr/include/google/protobuf/descriptor.proto > protobuf/google/protobuf/descriptor.proto
@@ -92,7 +87,11 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/criu-service \
 # for compatiblity
 ln -s criu %{buildroot}%{_sbindir}/crtools
 ln -s criu.8 %{buildroot}%{_mandir}/man8/crtools.8
+%if !%with_systemd_service
+rm -f %{buildroot}%{_unitdir}/criu.*
+%endif
 
+%if %with_systemd_service
 %pre
 %service_add_pre criu.service criu.socket
 exit 0
@@ -108,6 +107,7 @@ exit 0
 %postun
 %service_del_postun criu.service criu.socket
 exit 0
+%endif
 
 %post -n libcriu1 -p /sbin/ldconfig
 
@@ -119,7 +119,9 @@ exit 0
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man*/*
+%if %with_systemd_service
 %{_unitdir}/criu.*
+%endif
 %config %{_sysconfdir}/logrotate.d/*
 /usr/lib/python*/site-packages/crit-*.egg-info
 /usr/lib/python*/site-packages/pycriu