From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 496F3158086 for ; Wed, 1 Dec 2021 20:34:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A1012BC0D1; Wed, 1 Dec 2021 20:34:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E6E82BC0D1 for ; Wed, 1 Dec 2021 20:34:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9173F343047 for ; Wed, 1 Dec 2021 20:34:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4BEAA1E3 for ; Wed, 1 Dec 2021 20:34:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1638390864.106d32bbb4359104c8b08e5a8f6c55f5830650f1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/criu/criu-3.15-r2.ebuild sys-process/criu/criu-3.15-r3.ebuild sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch X-VCS-Directories: sys-process/criu/ sys-process/criu/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 106d32bbb4359104c8b08e5a8f6c55f5830650f1 X-VCS-Branch: master Date: Wed, 1 Dec 2021 20:34:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 906eeb9b-629a-41f5-8101-d0f6019c7ed8 X-Archives-Hash: 8df7e580fa3b72fb30985a0e01f3d3d1 commit: 106d32bbb4359104c8b08e5a8f6c55f5830650f1 Author: Sam James gentoo org> AuthorDate: Wed Dec 1 20:33:15 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 1 20:34:24 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106d32bb sys-process/criu: really add extra protobuf-c hunk Doh! Bug: https://bugs.gentoo.org/814056 Closes: https://bugs.gentoo.org/822006 Signed-off-by: Sam James gentoo.org> .../{criu-3.15-r2.ebuild => criu-3.15-r3.ebuild} | 0 .../criu/files/criu-3.15-protobuf-c-1.4.0.patch | 24 ++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/sys-process/criu/criu-3.15-r2.ebuild b/sys-process/criu/criu-3.15-r3.ebuild similarity index 100% rename from sys-process/criu/criu-3.15-r2.ebuild rename to sys-process/criu/criu-3.15-r3.ebuild 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 index 5e57fa084975..86d9cd31724d 100644 --- 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 @@ -168,3 +168,27 @@ index 3d64939584..d2bfbf958c 100644 void criu_set_notify_cb(int (*cb)(char *action, criu_notify_arg_t na)); /* Get pid of root task. 0 if not available */ +From: Radostin Stoyanov +Date: Fri, 3 Sep 2021 14:14:41 +0100 +Subject: [PATCH] lib: install images/rpc.pb-c.h + +Since commit 1c25914 compiling crun with libcriu also requires +/usr/include/criu/rpc.pb-c.h + +Signed-off-by: Radostin Stoyanov +--- + lib/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Makefile b/lib/Makefile +index f9b66701e0..575a7bad3f 100644 +--- a/lib/Makefile ++++ b/lib/Makefile +@@ -1,6 +1,6 @@ + CRIU_SO := libcriu.so + CRIU_A := libcriu.a +-UAPI_HEADERS := lib/c/criu.h images/rpc.proto criu/include/version.h ++UAPI_HEADERS := lib/c/criu.h images/rpc.proto images/rpc.pb-c.h criu/include/version.h + + # + # File to keep track of files installed by setup.py