commit: 24ba952b3ff906ee79987fcfb100ca495a23675d Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sun Sep 5 05:57:18 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Sep 5 05:57:18 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24ba952b
sys-process/criu: add patch for >=dev-libs/protobuf-c-1.4.0 Could be adapted to earlier versions in theory. Closes: https://bugs.gentoo.org/809092 Signed-off-by: Sam James <sam <AT> gentoo.org> sys-process/criu/criu-3.15-r1.ebuild | 140 +++++++++++++++++ .../criu/files/criu-3.15-protobuf-c-1.4.0.patch | 168 +++++++++++++++++++++ 2 files changed, 308 insertions(+) diff --git a/sys-process/criu/criu-3.15-r1.ebuild b/sys-process/criu/criu-3.15-r1.ebuild new file mode 100644 index 00000000000..bb76d9a19d3 --- /dev/null +++ b/sys-process/criu/criu-3.15-r1.ebuild @@ -0,0 +1,140 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9} ) + +inherit toolchain-funcs linux-info python-r1 + +DESCRIPTION="utility to checkpoint/restore a process tree" +HOMEPAGE="https://criu.org/"; +SRC_URI="https://download.openvz.org/criu/${P}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64" +IUSE="doc selinux setproctitle static-libs" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +RDEPEND=" + ${PYTHON_DEPS} + >=dev-libs/protobuf-c-1.4.0:= + dev-libs/libnl:3 + net-libs/libnet:1.1 + sys-libs/libcap + selinux? ( sys-libs/libselinux ) + setproctitle? ( dev-libs/libbsd )" +DEPEND="${RDEPEND}" +BDEPEND=" + doc? ( + app-text/asciidoc + app-text/xmlto + )" +RDEPEND="${RDEPEND} + dev-python/protobuf-python[${PYTHON_USEDEP}]" + +CONFIG_CHECK="~CHECKPOINT_RESTORE ~NAMESPACES ~PID_NS ~FHANDLE ~EVENTFD ~EPOLL ~INOTIFY_USER + ~UNIX_DIAG ~INET_DIAG ~INET_UDP_DIAG ~PACKET_DIAG ~NETLINK_DIAG ~TUN ~NETFILTER_XT_MARK" + +# root access required for tests +RESTRICT="test" + +PATCHES=( + "${FILESDIR}"/2.2/${PN}-2.2-flags.patch + "${FILESDIR}"/2.3/${PN}-2.3-no-git.patch + "${FILESDIR}"/${PN}-3.12-automagic-libbsd.patch + "${FILESDIR}"/${PN}-3.15-pkg-config.patch + "${FILESDIR}"/${PN}-3.15-protobuf-c-1.4.0.patch +) + +criu_arch() { + # criu infers the arch from $(uname -m). We never want this to happen. + case ${ARCH} in + amd64) echo "x86";; + arm64) echo "aarch64";; + ppc64*) echo "ppc64";; + *) echo "${ARCH}";; + esac +} + +pkg_setup() { + use amd64 && CONFIG_CHECK+=" ~IA32_EMULATION" + linux-info_pkg_setup +} + +src_prepare() { + default + + if ! use selinux; then + sed \ + -e 's:libselinux:no_libselinux:g' \ + -i Makefile.config || die + fi + + use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install +} + +src_configure() { + # Gold linker generates invalid object file when used with criu's custom + # linker script. Use the bfd linker instead. See https://crbug.com/839665#c3 + tc-ld-disable-gold + + # Build system uses this variable as a trigger to append coverage flags + # we'd like to avoid it. https://bugs.gentoo.org/744244 + unset GCOV + + python_setup +} + +src_compile() { + local target="all $(usex doc 'docs' '')" + emake \ + HOSTCC="$(tc-getBUILD_CC)" \ + CC="$(tc-getCC)" \ + LD="$(tc-getLD)" \ + AR="$(tc-getAR)" \ + PKG_CONFIG="$(tc-getPKG_CONFIG)" \ + PYTHON="${EPYTHON%.?}" \ + FULL_PYTHON="${PYTHON%.?}" \ + OBJCOPY="$(tc-getOBJCOPY)" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + ARCH="$(criu_arch)" \ + V=1 WERROR=0 DEBUG=0 \ + SETPROCTITLE=$(usex setproctitle) \ + ${target} +} + +src_test() { + # root privileges are required to dump all necessary info + if [[ ${EUID} -eq 0 ]] ; then + emake -j1 CC="$(tc-getCC)" ARCH="$(criu_arch)" V=1 WERROR=0 test + fi +} + +install_crit() { + "${EPYTHON}" scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" || die + python_optimize +} + +src_install() { + emake \ + ARCH="$(criu_arch)" \ + PREFIX="${EPREFIX}"/usr \ + PYTHON="${EPYTHON%.?}" \ + FULL_PYTHON="${PYTHON%.?}" \ + LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \ + DESTDIR="${D}" \ + LIBDIR="${EPREFIX}/usr/$(get_libdir)" \ + V=1 WERROR=0 DEBUG=0 \ + install + + use doc && dodoc CREDITS README.md + + python_foreach_impl install_crit + + if ! use static-libs; then + find "${D}" -name "*.a" -delete || die + fi +} diff --git a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch new file mode 100644 index 00000000000..ea0b9134c68 --- /dev/null +++ b/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch @@ -0,0 +1,168 @@ +https://bugs.gentoo.org/809092 +https://github.com/checkpoint-restore/criu/commit/1c25914a5dd1eb385937dffdd85901c3f5e39b8c + +From 1c25914a5dd1eb385937dffdd85901c3f5e39b8c Mon Sep 17 00:00:00 2001 +From: Zeyad Yasser <[email protected]> +Date: Thu, 22 Jul 2021 11:39:34 +0200 +Subject: [PATCH] protobuf: remove leading underscores from protobuf structs + +Fixes: #1560 + +The latest protobuf-c compiler breaks CRIU because they removed +leading underscores from structs in 1.4.0. + +This replaces those definitions with the standard generated structs. + +v2: remove struct _VmaEntry, struct _CredsEntry and struct _CoreEntry + +Signed-off-by: Zeyad Yasser <[email protected]> +--- + criu/include/irmap.h | 8 +++++--- + criu/include/parasite-syscall.h | 8 +++----- + criu/include/pstree.h | 2 +- + criu/include/rst_info.h | 5 ++--- + criu/include/shmem.h | 1 - + criu/mem.c | 2 +- + lib/c/criu.h | 3 ++- + 7 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/criu/include/irmap.h b/criu/include/irmap.h +index 033f71e372..188d753f4d 100644 +--- a/criu/include/irmap.h ++++ b/criu/include/irmap.h +@@ -1,13 +1,15 @@ + #ifndef __CR_IRMAP__H__ + #define __CR_IRMAP__H__ ++ ++#include "images/fh.pb-c.h" ++ + char *irmap_lookup(unsigned int s_dev, unsigned long i_ino); +-struct _FhEntry; + int irmap_queue_cache(unsigned int dev, unsigned long ino, +- struct _FhEntry *fh); ++ FhEntry *fh); + int irmap_predump_prep(void); + int irmap_predump_run(void); + int check_open_handle(unsigned int s_dev, unsigned long i_ino, +- struct _FhEntry *f_handle); ++ FhEntry *f_handle); + int irmap_load_cache(void); + int irmap_scan_path_add(char *path); + #endif +diff --git a/criu/include/parasite-syscall.h b/criu/include/parasite-syscall.h +index c86a724fd1..afba95a9e7 100644 +--- a/criu/include/parasite-syscall.h ++++ b/criu/include/parasite-syscall.h +@@ -11,8 +11,6 @@ struct parasite_dump_misc; + struct parasite_drain_fd; + struct vm_area_list; + struct pstree_item; +-struct _CredsEntry; +-struct _CoreEntry; + struct list_head; + struct cr_imgset; + struct fd_opts; +@@ -31,11 +29,11 @@ extern int parasite_dump_posix_timers_seized(struct proc_posix_timers_stat *proc + struct parasite_ctl *ctl, struct pstree_item *); + + extern int parasite_dump_misc_seized(struct parasite_ctl *ctl, struct parasite_dump_misc *misc); +-extern int parasite_dump_creds(struct parasite_ctl *ctl, struct _CredsEntry *ce); +-extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, struct _CoreEntry *core); ++extern int parasite_dump_creds(struct parasite_ctl *ctl, CredsEntry *ce); ++extern int parasite_dump_thread_leader_seized(struct parasite_ctl *ctl, int pid, CoreEntry *core); + extern int parasite_dump_thread_seized(struct parasite_thread_ctl *tctl, + struct parasite_ctl *ctl, int id, +- struct pid *tid, struct _CoreEntry *core); ++ struct pid *tid, CoreEntry *core); + extern int dump_thread_core(int pid, CoreEntry *core, + const struct parasite_dump_thread *dt); + +diff --git a/criu/include/pstree.h b/criu/include/pstree.h +index 61ab0ce0eb..17d22e791e 100644 +--- a/criu/include/pstree.h ++++ b/criu/include/pstree.h +@@ -113,7 +113,7 @@ extern int prepare_task_entries(void); + extern int prepare_dummy_task_state(struct pstree_item *pi); + + extern int get_task_ids(struct pstree_item *); +-extern struct _TaskKobjIdsEntry *root_ids; ++extern TaskKobjIdsEntry *root_ids; + + extern void core_entry_free(CoreEntry *core); + extern CoreEntry *core_entry_alloc(int alloc_thread_info, int alloc_tc); +diff --git a/criu/include/rst_info.h b/criu/include/rst_info.h +index 3283849e44..3dc119a931 100644 +--- a/criu/include/rst_info.h ++++ b/criu/include/rst_info.h +@@ -5,6 +5,7 @@ + #include "common/list.h" + #include "vma.h" + #include "kerndat.h" ++#include "images/mm.pb-c.h" + + struct task_entries { + int nr_threads, nr_tasks, nr_helpers; +@@ -25,8 +26,6 @@ struct fdt { + futex_t fdt_lock; + }; + +-struct _MmEntry; +- + struct rst_info { + struct list_head fds; + +@@ -40,7 +39,7 @@ struct rst_info { + struct fdt *fdt; + + struct vm_area_list vmas; +- struct _MmEntry *mm; ++ MmEntry *mm; + struct list_head vma_io; + unsigned int pages_img_id; + +diff --git a/criu/include/shmem.h b/criu/include/shmem.h +index 9afdb799af..798e28f347 100644 +--- a/criu/include/shmem.h ++++ b/criu/include/shmem.h +@@ -5,7 +5,6 @@ + #include "common/lock.h" + #include "images/vma.pb-c.h" + +-struct _VmaEntry; + struct vma_area; + + extern int collect_shmem(int pid, struct vma_area *vma); +diff --git a/criu/mem.c b/criu/mem.c +index 9fabe4c470..b0a76e4da9 100644 +--- a/criu/mem.c ++++ b/criu/mem.c +@@ -1230,7 +1230,7 @@ static int restore_priv_vma_content(struct pstree_item *t, struct page_read *pr) + + static int maybe_disable_thp(struct pstree_item *t, struct page_read *pr) + { +- struct _MmEntry *mm = rsti(t)->mm; ++ MmEntry *mm = rsti(t)->mm; + + /* + * There is no need to disable it if the page read doesn't +diff --git a/lib/c/criu.h b/lib/c/criu.h +index 3d64939584..d2bfbf958c 100644 +--- a/lib/c/criu.h ++++ b/lib/c/criu.h +@@ -22,6 +22,7 @@ + #include <stdbool.h> + + #include "version.h" ++#include "rpc.pb-c.h" + + #ifdef __GNUG__ + extern "C" { +@@ -112,7 +113,7 @@ void criu_set_pidfd_store_sk(int sk); + * some non-existing one is reported. + */ + +-typedef struct _CriuNotify *criu_notify_arg_t; ++typedef CriuNotify *criu_notify_arg_t; + void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na)); + + /* Get pid of root task. 0 if not available */
