From 2a602d88009ec1b93f2f1d78034f38abdc87764f04f5b89b9dfb536dc0d6538a Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Tue, 8 Dec 2015 11:36:43 +0000
Subject: [PATCH] Accepting request 347906 from home:tiwai

- Update to criu 1.8:
  * Ability to check CRIU features via RPC
  * Pre-dump and pre-restore action scripts
  * The "info" action in CRIT showing stats about image file
  * Python API
  * C/R of read-only bind mounts, IPv6 routes and iptables rules,
    ip rules (it ip tool supports such), ignore_routes_with_linkdown
    netns devconf, empty bridges in netns, FILTER mode of seccomp,
    and IP_FREEBIND socket option
  * Lots of fixes, two security fixes
    Service run as root could allow users to violate ptrace policies
    Service run as root could give users access to privileged files
    and directories
- Remove superfluous dependencies
- Clean up spec file, as systemd and logrotate supports have been
  officially dropped

OBS-URL: https://build.opensuse.org/request/show/347906
OBS-URL: https://build.opensuse.org/package/show/devel:tools/criu?expand=0&rev=34
---
 criu-1.7.2.tar.bz2 |  3 ---
 criu-1.8.tar.bz2   |  3 +++
 criu.changes       | 20 ++++++++++++++++++++
 criu.spec          | 40 +++-------------------------------------
 4 files changed, 26 insertions(+), 40 deletions(-)
 delete mode 100644 criu-1.7.2.tar.bz2
 create mode 100644 criu-1.8.tar.bz2

diff --git a/criu-1.7.2.tar.bz2 b/criu-1.7.2.tar.bz2
deleted file mode 100644
index f687a11..0000000
--- a/criu-1.7.2.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f5d377fd2a3c8824c592f6c27147cb4d37333ca0ce8b9c6e85a8b7cd8479b21d
-size 508012
diff --git a/criu-1.8.tar.bz2 b/criu-1.8.tar.bz2
new file mode 100644
index 0000000..e231999
--- /dev/null
+++ b/criu-1.8.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb
+size 534200
diff --git a/criu.changes b/criu.changes
index 86ee930..e959b5e 100644
--- a/criu.changes
+++ b/criu.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Dec  8 12:01:05 CET 2015 - tiwai@suse.de
+
+- Update to criu 1.8:
+  * Ability to check CRIU features via RPC
+  * Pre-dump and pre-restore action scripts
+  * The "info" action in CRIT showing stats about image file
+  * Python API
+  * C/R of read-only bind mounts, IPv6 routes and iptables rules,
+    ip rules (it ip tool supports such), ignore_routes_with_linkdown
+    netns devconf, empty bridges in netns, FILTER mode of seccomp,
+    and IP_FREEBIND socket option
+  * Lots of fixes, two security fixes
+    Service run as root could allow users to violate ptrace policies
+    Service run as root could give users access to privileged files
+    and directories
+- Remove superfluous dependencies
+- Clean up spec file, as systemd and logrotate supports have been
+  officially dropped
+
 -------------------------------------------------------------------
 Thu Nov 19 16:10:29 CET 2015 - tiwai@suse.de
 
diff --git a/criu.spec b/criu.spec
index 18ce1e6..9be7ce4 100644
--- a/criu.spec
+++ b/criu.spec
@@ -16,10 +16,9 @@
 #
 
 
-%define with_systemd_service 0
-%define package_version 1.7.2
+%define package_version 1.8
 Name:           criu
-Version:        1.7.2
+Version:        1.8
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0
@@ -31,8 +30,6 @@ BuildRequires:  pkg-config
 BuildRequires:  protobuf-c
 BuildRequires:  protobuf-devel
 BuildRequires:  xmlto
-BuildRequires:  pkgconfig(systemd)
-Requires:       logrotate
 Requires:       python-protobuf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  x86_64 aarch64 ppc64le
@@ -73,42 +70,15 @@ sed -e's@/\*@@g' -e's@\*/@@g' /usr/include/google/protobuf/descriptor.proto > pr
 %build
 export CFLAGS="%{optflags}"
 make V=1 %{?_smp_mflags} PREFIX=%{_prefix} \
-     LIBDIR=%{_libdir} \
-     LOGROTATEDIR=%{_sysconfdir}/logrotate.d/
+     LIBDIR=%{_libdir}
 
 %install
-mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 make V=1 %{?_smp_mflags} PREFIX=%{_prefix} \
      LIBDIR=%{_libdir} \
-     LOGROTATEDIR=%{_sysconfdir}/logrotate.d/ \
      DESTDIR=%{buildroot} install
-# make rpmlint happy
-mv %{buildroot}%{_sysconfdir}/logrotate.d/criu-service \
-    %{buildroot}%{_sysconfdir}/logrotate.d/criu
 # 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
-
-%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
-%endif
 
 %post -n libcriu1 -p /sbin/ldconfig
 
@@ -120,10 +90,6 @@ 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