Accepting request 701213 from devel:tools

OBS-URL: https://build.opensuse.org/request/show/701213 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/criu?expand=0&rev=44
2019-05-07 21:19:18 +00:00 · 2019-05-07 21:19:18 +00:00 · 4b8579ce84
commit 4b8579ce84
parent 3f5477c270 7e6c31667a
5 changed files with 35 additions and 58 deletions
--- a/criu-3.11.tar.bz2
+++ b/criu-3.11.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:886b5851a3f46755a4074414e1d09638dfbd3fddebe00706a7b5783eacafd10e
-size 809858
--- a/criu-3.12.tar.bz2
+++ b/criu-3.12.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ef276cefa4bad2ab9f3ac63c975fe95d0522fd2b8469852c7524487aabf0efc
+size 820168
--- a/criu-asciidoctor.patch
+++ b/criu-asciidoctor.patch
@ -1,44 +0,0 @@
---
- Documentation/Makefile |   14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
--- a/Documentation/Makefile
-+++ b/Documentation/Makefile
-@@ -2,9 +2,15 @@ __nmk_dir ?= ../scripts/nmk/scripts/
- include $(__nmk_dir)include.mk
- include $(__nmk_dir)macro.mk
- 
-+ifneq ($(USE_ASCIIDOCTOR),)
-+ASCIIDOC	:= asciidoctor
-+A2X		:=
-+XMLTO		:=
-+else
- ASCIIDOC	:= asciidoc
- A2X		:= a2x
- XMLTO		:= xmlto
-+endif
- 
- FOOTER		:= footer.txt
- SRC1		+= crit.txt
-@@ -45,13 +51,21 @@ $(FOOTER): ../Makefile.versions
- 
- %.1: %.txt $(FOOTER) custom.xsl
- 	$(call msg-gen, $@)
-+ifneq ($(USE_ASCIIDOCTOR),)
-+	$(Q) $(ASCIIDOC) -b manpage -d manpage -o $@ $<
-+else
- 	$(Q) $(ASCIIDOC) -b docbook -d manpage -o $(patsubst %.1,%.xml,$@) $<
- 	$(Q) $(XMLTO) man -m custom.xsl $(patsubst %.1,%.xml,$@) 2>/dev/null
-+endif
- 
- %.8: %.txt $(FOOTER) custom.xsl
- 	$(call msg-gen, $@)
-+ifneq ($(USE_ASCIIDOCTOR),)
-+	$(Q) $(ASCIIDOC) -b manpage -d manpage -o $@ $<
-+else
- 	$(Q) $(ASCIIDOC) -b docbook -d manpage -o $(patsubst %.8,%.xml,$@) $<
- 	$(Q) $(XMLTO) man -m custom.xsl $(patsubst %.8,%.xml,$@) 2>/dev/null
-+endif
- 
- %.ps: %.1
- 	$(call msg-gen, $@)
--- a/criu.changes
+++ b/criu.changes
@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Mon May  6 20:13:44 CEST 2019 - tiwai@suse.de
+
+- Update to criu 3.12:
+  New features:
+  * build CRIU with Android NDK
+  * C/R of IP RAW sockets
+  * lsm: dump and restore any SELinux process label
+  * support restoring ghost files on readonly mounts
+  Bugfixes:
+  * Do not lock network if running in the host network namespace
+  * Fix RPC configuration file handling
+  * util: don't leak file descriprots to third-party tools
+  * small fixes here and there
+  Improvements:
+  * travis: switch to the Ubuntu Xenial
+  * travis-ci: Enable ia32 tests
+  * Many improvements and bug fixes in the libcriu
+  * Changes in the API and ABI (SONAME increased from 1 to 2)
+- Updated to libcriu2 subpackage to follow SONAME 2
+- Dropped obsoleted patch:
+  criu-asciidoctor.patch
+
 -------------------------------------------------------------------
 Mon Nov 19 17:46:08 CET 2018 - tiwai@suse.de

--- a/criu.spec
+++ b/criu.spec
@ -1,7 +1,7 @@
 #
 # spec file for package criu
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #


@ -22,7 +22,7 @@
 %endif

 Name:           criu
-Version:        3.11
+Version:        3.12
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0-only
@ -30,7 +30,6 @@ Group:          System/Console
 URL:            https://criu.org/
 Source0:        https://download.openvz.org/criu/%{name}-%{version}.tar.bz2
 Patch1:         criu-py-install-fix.diff
-Patch2:         criu-asciidoctor.patch
 BuildRequires:  libcap-devel
 BuildRequires:  libnet-devel
 BuildRequires:  libnl3-devel
@ -58,12 +57,12 @@ operating system. Using this tool, you can freeze a running application
 files. You can then use the files to restore and run the application from
 the point it was frozen at.

-%package -n libcriu1
+%package -n libcriu2
 Summary:        Library for CRIU
 License:        LGPL-2.1-only
 Group:          System/Libraries

-%description -n libcriu1
+%description -n libcriu2
 This package contains the library for CRIU, Checkpoint/Restore In
 Userspace Tools.

@ -81,7 +80,7 @@ License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 Requires:       glibc-devel
 Requires:       libcompel1 = %{version}
-Requires:       libcriu1 = %{version}
+Requires:       libcriu2 = %{version}

 %description devel
 This package contains all necessary include files and libraries needed
@ -90,7 +89,6 @@ to develop applications with CRIU library.
 %prep
 %setup -q
 %patch1 -p1
-%patch2 -p1
 # default off
 echo "BINFMT_MISC_VIRTUALIZED" > .config

@ -113,8 +111,8 @@ rm -f %{buildroot}%{_includedir}/compel/plugins/std/asm/.gitignore
 ln -s criu %{buildroot}%{_sbindir}/crtools
 ln -s criu.8 %{buildroot}%{_mandir}/man8/crtools.8

-%post -n libcriu1 -p /sbin/ldconfig
-%postun -n libcriu1 -p /sbin/ldconfig
+%post -n libcriu2 -p /sbin/ldconfig
+%postun -n libcriu2 -p /sbin/ldconfig
 %post -n libcompel1 -p /sbin/ldconfig
 %postun -n libcompel1 -p /sbin/ldconfig

@ -133,7 +131,7 @@ ln -s criu.8 %{buildroot}%{_mandir}/man8/crtools.8
 %{_libexecdir}/python*/site-packages/crit-*.egg-info
 %{_libexecdir}/python*/site-packages/pycriu

-%files -n libcriu1
+%files -n libcriu2
 %{_libdir}/libcriu.so.*

 %files -n libcompel1