criu: update to 2.2.
This commit is contained in:
parent
60fc36bf69
commit
17b050582f
3 changed files with 32 additions and 19 deletions
27
srcpkgs/criu/patches/capsetget.patch
Normal file
27
srcpkgs/criu/patches/capsetget.patch
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
--- criu/namespaces.c.orig 2016-05-21 11:15:59.401905470 +0200
|
||||||
|
+++ criu/namespaces.c 2016-05-21 11:17:20.481899402 +0200
|
||||||
|
@@ -9,7 +9,7 @@
|
||||||
|
#include <stdarg.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <sched.h>
|
||||||
|
-#include <sys/capability.h>
|
||||||
|
+#include <linux/capability.h>
|
||||||
|
|
||||||
|
#include "util.h"
|
||||||
|
#include "imgset.h"
|
||||||
|
@@ -701,13 +701,13 @@ static int check_user_ns(int pid)
|
||||||
|
hdr.version = _LINUX_CAPABILITY_VERSION_3;
|
||||||
|
hdr.pid = 0;
|
||||||
|
|
||||||
|
- if (capget(&hdr, data) < 0) {
|
||||||
|
+ if (syscall(SYS_capget, &hdr, data) < 0) {
|
||||||
|
pr_perror("capget");
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
data[0].effective = data[0].permitted;
|
||||||
|
data[1].effective = data[1].permitted;
|
||||||
|
- if (capset(&hdr, data) < 0) {
|
||||||
|
+ if (syscall(SYS_capset, &hdr, data) < 0) {
|
||||||
|
pr_perror("capset");
|
||||||
|
return -1;
|
||||||
|
}
|
|
@ -1,15 +0,0 @@
|
||||||
diff --git include/ptrace.h include/ptrace.h
|
|
||||||
index dfc5ecd..efea594 100644
|
|
||||||
--- include/ptrace.h
|
|
||||||
+++ include/ptrace.h
|
|
||||||
@@ -44,8 +44,10 @@ struct ptrace_peeksiginfo_args {
|
|
||||||
# define PTRACE_SETREGSET 0x4205
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifndef PTRACE_GETSIGMASK
|
|
||||||
#define PTRACE_GETSIGMASK 0x420a
|
|
||||||
#define PTRACE_SETSIGMASK 0x420b
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
#ifndef PTRACE_SECCOMP_GET_FILTER
|
|
||||||
#define PTRACE_SECCOMP_GET_FILTER 0x420c
|
|
|
@ -1,16 +1,17 @@
|
||||||
# Template file for 'criu'
|
# Template file for 'criu'
|
||||||
pkgname=criu
|
pkgname=criu
|
||||||
version=1.8
|
version=2.2
|
||||||
revision=1
|
revision=1
|
||||||
hostmakedepends="pkg-config protobuf-c protobuf python asciidoc xmlto"
|
hostmakedepends="pkg-config protobuf-c protobuf python asciidoc xmlto"
|
||||||
makedepends="libbsd-devel protobuf-c-devel protobuf-devel"
|
makedepends="libbsd-devel protobuf-c-devel protobuf-devel libnl3-devel"
|
||||||
depends="python-ipaddr"
|
depends="python-ipaddr"
|
||||||
short_desc="Utility to checkpoint/restore a process tree"
|
short_desc="Utility to checkpoint/restore a process tree"
|
||||||
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
maintainer="Enno Boland <gottox@voidlinux.eu>"
|
||||||
license="GPL-2, LGPL-2"
|
license="GPL-2, LGPL-2"
|
||||||
homepage="http://criu.org/"
|
homepage="http://criu.org/"
|
||||||
distfiles="http://download.openvz.org/criu/criu-$version.tar.bz2"
|
distfiles="https://download.openvz.org/criu/criu-$version.tar.bz2"
|
||||||
checksum=d1d6693d23181b1cd7378d77c142e41bcac3cb2ae5c71ea4c5b7de01f65575bb
|
checksum=f893938f72d2c0693a9430e7dd39dc3d32a40187de5edbd65830c6ade0f34e53
|
||||||
|
nopie=yes
|
||||||
|
|
||||||
only_for_archs="x86_64"
|
only_for_archs="x86_64"
|
||||||
pycompile_module="pycriu"
|
pycompile_module="pycriu"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue