[gentoo-commits] repo/gentoo:master commit in: sys-process/criu/files/, sys-process/criu/

["Sam James" <sam@gentoo.org>]

commit:     106d32bbb4359104c8b08e5a8f6c55f5830650f1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  1 20:33:15 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <sam <AT> 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 <radostin@redhat.com>
+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 <radostin@redhat.com>
+---
+ 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