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

- update to version 1.6:
  * PowerPC 64bit LE support
  * Makefile.local for 3-rd party build rules
  * Ability to "enable" filesystem on dump (--enable-fs)
  * Ability to skip mountpoint on dump (--skip-mnt)
  * Prepare to deprecate "criu show" command
  * External mounts auto-detection
  * /dev/tty (current terminal) support
  * Netdev and netns (all/default) confs C/R
  * Images v1.1 with extra magic at head
  * Support fusectl (only ctl) mountpoint
  * Sub-version format is now as of git-describe
  * Apparamor labels C/R support
- Fix library path for aarch64 and ppc64le
- Fix the prototype for lsm.c (to fix build errors):
  lsm-prototype-fix.diff
- Refreshed crit-install-prefix.diff

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

crit-install-prefix.diff

@@ -1,12 +1,14 @@
-diff --git a/Makefile b/Makefile
+---
-index 2a63f0477d08..d704a06446d5 100644
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 --- a/Makefile
 +++ b/Makefile
-@@ -289,7 +289,7 @@ install-man:
+@@ -314,7 +314,7 @@ install-man:
  
  install-crit: crit
  	$(E) "  INSTALL crit"
--	$(Q) python scripts/crit-setup.py install --prefix=$(DESTDIR)
+-	$(Q) python scripts/crit-setup.py install --prefix=$(DESTDIR)$(PREFIX)
 +	$(Q) python scripts/crit-setup.py install --root=$(DESTDIR) --prefix=$(PREFIX)
  
  .PHONY: install install-man install-crit

criu-1.5.2.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e8226018ac6c4094d61a1c002543e2b2253b4041a8edb24d4c1eaa41ce5ab345
-size 457573

criu-1.6.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:35ba6f5df90bfb8a25ae5e53459272bb37b8a69790e084f86d7a9ffa0df35993
+size 484513

criu.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Mon Jun  1 15:26:56 CEST 2015 - tiwai@suse.de
+
+- update to version 1.6:
+  * PowerPC 64bit LE support
+  * Makefile.local for 3-rd party build rules
+  * Ability to "enable" filesystem on dump (--enable-fs)
+  * Ability to skip mountpoint on dump (--skip-mnt)
+  * Prepare to deprecate "criu show" command
+  * External mounts auto-detection
+  * /dev/tty (current terminal) support
+  * Netdev and netns (all/default) confs C/R
+  * Images v1.1 with extra magic at head
+  * Support fusectl (only ctl) mountpoint
+  * Sub-version format is now as of git-describe
+  * Apparamor labels C/R support
+- Fix library path for aarch64 and ppc64le
+- Fix the prototype for lsm.c (to fix build errors):
+  lsm-prototype-fix.diff
+- Refreshed crit-install-prefix.diff
+
 -------------------------------------------------------------------
 Tue Apr 28 11:54:14 CEST 2015 - tiwai@suse.de
 

criu.spec

@@ -16,9 +16,9 @@
 #
 
 
-%define package_version 1.5.2
+%define package_version 1.6
 Name:           criu
-Version:        1.5.2
+Version:        1.6
 Release:        0
 Summary:        Checkpoint/Restore In Userspace Tools
 License:        GPL-2.0
@@ -26,6 +26,7 @@ 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
 BuildRequires:  asciidoc
 BuildRequires:  pkg-config
 BuildRequires:  protobuf-c
@@ -34,7 +35,7 @@ BuildRequires:  xmlto
 BuildRequires:  pkgconfig(systemd)
 Requires:       logrotate
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch:  x86_64 aarch64
+ExclusiveArch:  x86_64 aarch64 ppc64le
 
 %description
 Checkpoint/Restore In Userspace, or CRIU, is a software tool for Linux
@@ -66,17 +67,22 @@ to develop applications with CRIU library.
 %prep
 %setup -q -n %{name}-%{package_version}
 %patch1 -p1
+%patch2 -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
 
 %build
 export CFLAGS="%{optflags}"
-make V=1 %{?_smp_mflags} PREFIX=%{_prefix} LOGROTATEDIR=%{_sysconfdir}/logrotate.d/
+make V=1 %{?_smp_mflags} PREFIX=%{_prefix} \
+     LIBDIR=%{_libdir} \
+     LOGROTATEDIR=%{_sysconfdir}/logrotate.d/
 
 %install
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
-make V=1 %{?_smp_mflags} PREFIX=%{_prefix}  LOGROTATEDIR=%{_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 \
@@ -107,7 +113,7 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%doc README COPYING
+%doc README.md COPYING
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/man*/*

lsm-prototype-fix.diff

@@ -0,0 +1,51 @@
+---
+ include/lsm.h |    6 +++---
+ lsm.c         |    4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+--- a/include/lsm.h
++++ b/include/lsm.h
+@@ -7,12 +7,12 @@
+ /*
+  * Get the Lsmtype for the current host.
+  */
+-extern Lsmtype host_lsm_type();
++extern Lsmtype host_lsm_type(void);
+ 
+ /*
+  * Initilize the Lsmtype for the current host
+  */
+-extern void kerndat_lsm();
++extern void kerndat_lsm(void);
+ 
+ /*
+  * Read the LSM profile for the pstree item
+@@ -23,7 +23,7 @@ extern int collect_lsm_profile(pid_t, Cr
+  * Validate that the LSM profiles can be correctly applied (must happen after
+  * pstree is set up).
+  */
+-extern int validate_lsm();
++int validate_lsm(CredsEntry *ce);
+ 
+ /*
+  * Render the profile name in the way that the LSM wants it written to
+--- a/lsm.c
++++ b/lsm.c
+@@ -102,7 +102,7 @@ static int selinux_get_label(pid_t pid,
+ }
+ #endif
+ 
+-void kerndat_lsm()
++void kerndat_lsm(void)
+ {
+ 	if (access("/sys/kernel/security/apparmor", F_OK) == 0) {
+ 		get_label = apparmor_get_label;
+@@ -130,7 +130,7 @@ void kerndat_lsm()
+ 	name = "none";
+ }
+ 
+-Lsmtype host_lsm_type()
++Lsmtype host_lsm_type(void)
+ {
+ 	return lsmtype;
+ }