Hello community, here is the log from the commit of package criu for openSUSE:Factory checked in at 2015-06-02 10:11:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/criu (Old) and /work/SRC/openSUSE:Factory/.criu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "criu" Changes: -------- --- /work/SRC/openSUSE:Factory/criu/criu.changes 2015-04-30 11:50:47.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.criu.new/criu.changes 2015-06-02 10:11:34.000000000 +0200 @@ -1,0 +2,21 @@ +Mon Jun 1 15:26:56 CEST 2015 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- criu-1.5.2.tar.bz2 New: ---- criu-1.6.tar.bz2 lsm-prototype-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ criu.spec ++++++ --- /var/tmp/diff_new_pack.4GgK3Q/_old 2015-06-02 10:11:35.000000000 +0200 +++ /var/tmp/diff_new_pack.4GgK3Q/_new 2015-06-02 10:11:35.000000000 +0200 @@ -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 @@ 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: 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 @@ %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 @@ %files %defattr(-,root,root) -%doc README COPYING +%doc README.md COPYING %{_sbindir}/* %{_bindir}/* %{_mandir}/man*/* ++++++ crit-install-prefix.diff ++++++ --- /var/tmp/diff_new_pack.4GgK3Q/_old 2015-06-02 10:11:35.000000000 +0200 +++ /var/tmp/diff_new_pack.4GgK3Q/_new 2015-06-02 10:11:35.000000000 +0200 @@ -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 -> criu-1.6.tar.bz2 ++++++ ++++ 14133 lines of diff (skipped) ++++++ lsm-prototype-fix.diff ++++++ --- 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; }
