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

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

commit:     65fbfa15aa71be1fde62e9fcbffbda0b3d69f336
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May  1 12:48:06 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May  1 12:49:01 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65fbfa15

sys-process/criu: drop 3.15, 3.15-r3, 3.16.1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-process/criu/Manifest                          |   2 -
 sys-process/criu/criu-3.15-r3.ebuild               | 140 ---------------
 sys-process/criu/criu-3.15.ebuild                  | 139 ---------------
 sys-process/criu/criu-3.16.1.ebuild                | 162 -----------------
 sys-process/criu/files/criu-3.15-pkg-config.patch  | 141 ---------------
 .../criu/files/criu-3.15-protobuf-c-1.4.0.patch    | 194 ---------------------
 6 files changed, 778 deletions(-)

diff --git a/sys-process/criu/Manifest b/sys-process/criu/Manifest
index 8e3b332bc860..17a9661b07b3 100644
--- a/sys-process/criu/Manifest
+++ b/sys-process/criu/Manifest
@@ -1,3 +1 @@
-DIST criu-3.15.tar.bz2 913904 BLAKE2B 2a3c7ad7ac32a407493e8908886d2929606e1dd0a1dd499be75cb954c1c4d60d0c59f0524d173dcdd89fa638e1edcc0c31886262069e3478173648ef09b4c159 SHA512 7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
-DIST criu-3.16.1.tar.gz 1228535 BLAKE2B 45aa87ee00a18b91474e767dc0326cce6c0942af7771a0c5536751361c171c86ba2065c54587e82b51fd6d7ab116e659324369955086c5237cd7fd26b60d6ce6 SHA512 a558af41f1927a1b1d87f8d11163a5f3d2e4f83a74aba00619b45a6d464d5477a6a0aac3c1b9d9a17e3343a4bf21a3fd6b279b51fa0c347c86c307381a4d0739
 DIST criu-3.17.tar.gz 1321713 BLAKE2B 3bc13a7df0da0a17c74e0c12f07b81fe7f294be4d1980647b64c74e35383416ffbc10e7c04398f307bc68ff701f76a9586ea58825057b0df16b40f6aab3cbd0e SHA512 febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804

diff --git a/sys-process/criu/criu-3.15-r3.ebuild b/sys-process/criu/criu-3.15-r3.ebuild
deleted file mode 100644
index f4108c16202b..000000000000
--- a/sys-process/criu/criu-3.15-r3.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_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 -riscv"
-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/criu-3.15.ebuild b/sys-process/criu/criu-3.15.ebuild
deleted file mode 100644
index 283d46ee4859..000000000000
--- a/sys-process/criu/criu-3.15.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_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 -riscv"
-IUSE="doc selinux setproctitle static-libs"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/protobuf-c
-	dev-libs/libnl:3
-	net-libs/libnet:1.1
-	sys-libs/libcap
-	selinux? ( sys-libs/libselinux )
-	setproctitle? ( dev-libs/libbsd )"
-DEPEND="${RDEPEND}
-	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
-)
-
-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/criu-3.16.1.ebuild b/sys-process/criu/criu-3.16.1.ebuild
deleted file mode 100644
index 7c36938828cc..000000000000
--- a/sys-process/criu/criu-3.16.1.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit toolchain-funcs linux-info python-r1
-
-DESCRIPTION="utility to checkpoint/restore a process tree"
-HOMEPAGE="
-	https://criu.org/
-	https://github.com/checkpoint-restore/
-"
-SRC_URI="https://github.com/checkpoint-restore/${PN}/archive/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 -riscv"
-IUSE="bpf doc gnutls nftables selinux setproctitle static-libs test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=dev-libs/protobuf-c-1.4.0:=
-	dev-libs/libnl:3=
-	net-libs/libnet:1.1=
-	sys-libs/libcap:=
-	bpf? ( dev-libs/libbpf:= )
-	gnutls? ( net-libs/gnutls:= )
-	nftables? ( net-libs/gnutls:= )
-	selinux? ( sys-libs/libselinux:= )
-	setproctitle? ( dev-libs/libbsd:= )
-"
-DEPEND="${COMMON_DEPEND}"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		app-text/asciidoc
-		app-text/xmlto
-	)
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	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? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/2.2/criu-2.2-flags.patch"
-	"${FILESDIR}/2.3/criu-2.3-no-git.patch"
-	"${FILESDIR}/criu-3.12-automagic-libbsd.patch"
-	"${FILESDIR}/criu-3.16.1-buildsystem.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
-
-	use doc || sed -i 's_\(install: \)install-man _\1_g' Makefile.install
-}
-
-criu_use() {
-	if ! use "${1}"; then
-		sed \
-			-e "s:${2:-${1}}:no_${2:-lib${1}}:g" \
-			-i Makefile.config || die
-	fi
-}
-
-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
-
-	# we have to sed the Makdfile.config to disable automagic deps
-	criu_use selinux
-	criu_use bpf
-	criu_use nftables
-
-	emake_opts=(
-		SETPROCTITLE="$(usex setproctitle)"
-		NO_GNUTLS="$(usex gnutls '' '1')"
-	)
-
-	python_setup
-}
-
-criu_emake() {
-	emake \
-		AR="$(tc-getAR)" \
-		ARCH="$(criu_arch)" \
-		CC="$(tc-getCC)" \
-		FULL_PYTHON="${PYTHON%.*}" \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		LD="$(tc-getLD)" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		LOGROTATEDIR="${EPREFIX}"/etc/logrotate.d \
-		OBJCOPY="$(tc-getOBJCOPY)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		PREFIX="${EPREFIX}"/usr \
-		PYTHON="${EPYTHON%.*}" \
-		V=1 WERROR=0 DEBUG=0 \
-		"${emake_opts[@]}" \
-		"${@}"
-}
-
-build_crit() {
-	"${EPYTHON}" scripts/crit-setup.py build || die
-}
-
-src_compile() {
-	local -a targets=(
-		all
-		$(usex doc 'docs' '')
-	)
-	criu_emake ${targets}
-}
-
-src_test() {
-	criu_emake unittest
-}
-
-install_crit() {
-	"${EPYTHON}" scripts/crit-setup.py install --root="${D}" --prefix="${EPREFIX}/usr/" || die
-	python_optimize
-}
-
-src_install() {
-	criu_emake DESTDIR="${D}" install
-	python_foreach_impl install_crit
-
-	dodoc CREDITS README.md
-
-	if ! use static-libs; then
-		find "${D}" -name "*.a" -delete || die
-	fi
-}

diff --git a/sys-process/criu/files/criu-3.15-pkg-config.patch b/sys-process/criu/files/criu-3.15-pkg-config.patch
deleted file mode 100644
index 69d83bfc399a..000000000000
--- a/sys-process/criu/files/criu-3.15-pkg-config.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-https://github.com/checkpoint-restore/criu/pull/1517
-
-From d72536d9a821f9ff64f5dd62c9f8a282e3e5ec85 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Wed, 16 Jun 2021 15:43:04 -0400
-Subject: [PATCH] build: respect $PKG_CONFIG settings
-
-The build needs to respect $PKG_CONFIG env var like other standard
-build systems and the the upstream pkg-config project itself.  This
-allows the package builder to point it to the right tool when doing
-a cross-compile build.  Otherwise the host pkg-config tool is used
-which won't have access to the packages in the cross sysroot.
-
-Signed-off-by: Mike Frysinger <vapier@chromium.org>
----
- Makefile.config              | 2 +-
- criu/Makefile                | 2 +-
- scripts/nmk/scripts/tools.mk | 1 +
- scripts/nmk/scripts/utils.mk | 2 +-
- test/zdtm/Makefile.inc       | 8 +++++---
- test/zdtm/lib/Makefile       | 2 +-
- test/zdtm/static/Makefile    | 2 +-
- 7 files changed, 11 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.config b/Makefile.config
-index 3d99e680be7f..6e3e1b062256 100644
---- a/Makefile.config
-+++ b/Makefile.config
-@@ -30,7 +30,7 @@ else
- endif
- 
- ifeq ($(call pkg-config-check,libnftables),y)
--        LIB_NFTABLES	:= $(shell pkg-config --libs libnftables)
-+        LIB_NFTABLES	:= $(shell $(PKG_CONFIG) --libs libnftables)
-         ifeq ($(call try-cc,$(FEATURE_TEST_NFTABLES_LIB_API_0),$(LIB_NFTABLES)),true)
-                 LIBS_FEATURES	+= $(LIB_NFTABLES)
-                 FEATURE_DEFINES	+= -DCONFIG_HAS_NFTABLES_LIB_API_0
-diff --git a/criu/Makefile b/criu/Makefile
-index ceb49ce09925..11d454c81026 100644
---- a/criu/Makefile
-+++ b/criu/Makefile
-@@ -27,7 +27,7 @@ CFLAGS			+= -iquote include
- CFLAGS			+= -iquote images
- CFLAGS			+= -iquote $(ARCH_DIR)/include
- CFLAGS			+= -iquote .
--CFLAGS			+= $(shell pkg-config --cflags libnl-3.0)
-+CFLAGS			+= $(shell $(PKG_CONFIG) --cflags libnl-3.0)
- CFLAGS			+= $(CONFIG-DEFINES)
- 
- ifeq ($(GMON),1)
-diff --git a/scripts/nmk/scripts/tools.mk b/scripts/nmk/scripts/tools.mk
-index c5794401c734..1681d4e9092b 100644
---- a/scripts/nmk/scripts/tools.mk
-+++ b/scripts/nmk/scripts/tools.mk
-@@ -17,6 +17,7 @@ AR		:= $(CROSS_COMPILE)ar
- STRIP		:= $(CROSS_COMPILE)strip
- OBJCOPY		:= $(CROSS_COMPILE)objcopy
- OBJDUMP		:= $(CROSS_COMPILE)objdump
-+PKG_CONFIG	?= pkg-config
- NM		:= $(CROSS_COMPILE)nm
- MAKE		:= make
- MKDIR		:= mkdir -p
-diff --git a/scripts/nmk/scripts/utils.mk b/scripts/nmk/scripts/utils.mk
-index b9790615ca7f..f93fdf911cef 100644
---- a/scripts/nmk/scripts/utils.mk
-+++ b/scripts/nmk/scripts/utils.mk
-@@ -16,7 +16,7 @@ try-asm = $(call try-compile,assembler-with-cpp,$(1),$(2),$(3))
- 
- # pkg-config-check
- # Usage: ifeq ($(call pkg-config-check, library),y)
--pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
-+pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
- 
- #
- # Remove duplicates.
-diff --git a/test/zdtm/Makefile.inc b/test/zdtm/Makefile.inc
-index 43763321f956..e4af9c51e9e4 100644
---- a/test/zdtm/Makefile.inc
-+++ b/test/zdtm/Makefile.inc
-@@ -37,6 +37,7 @@ HOSTCC	?= gcc
- ifeq ($(origin CC), default)
-         CC := $(CROSS_COMPILE)$(HOSTCC)
- endif
-+PKG_CONFIG ?= pkg-config
- CFLAGS	+= -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
- CFLAGS	+= -Wdeclaration-after-statement -Wstrict-prototypes
- CFLAGS	+= $(USERCFLAGS)
-@@ -54,8 +55,9 @@ endif
- RM := rm -f --one-file-system
- 
- ifeq ($(COMPAT_TEST),y)
-+$(error bad juju)
-         # Firstly look for 32-bit libs and then in standard path.
--        PKG_CONFIG_PATH := $(shell pkg-config --variable pc_path pkg-config)
-+        PKG_CONFIG_PATH := $(shell $(PKG_CONFIG) --variable pc_path pkg-config)
-         PKG_CONFIG_PATH := /usr/lib32/pkgconfig:$(PKG_CONFIG_PATH)
- ifeq ($(ARCH),x86)
-         export CFLAGS += -m32
-@@ -66,11 +68,11 @@ endif
- endif
- 
- define pkg-libs
--        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --libs $(1))
-+        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --libs $(1))
- endef
- 
- define pkg-cflags
--        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" pkg-config --cflags $(1))
-+        $(shell PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" $(PKG_CONFIG) --cflags $(1))
- endef
- 
- %.d: %.c
-diff --git a/test/zdtm/lib/Makefile b/test/zdtm/lib/Makefile
-index 05fe64e91703..5ecf8bccf27b 100644
---- a/test/zdtm/lib/Makefile
-+++ b/test/zdtm/lib/Makefile
-@@ -6,7 +6,7 @@ LIB	:= libzdtmtst.a
- 
- LIBSRC	:= datagen.c msg.c parseargs.c test.c streamutil.c lock.c ns.c tcp.c unix.c fs.c sysctl.c
- 
--pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
-+pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
- ifeq ($(call pkg-config-check,libbpf),y)
- LIBSRC	+= bpfmap_zdtm.c
- endif
-diff --git a/test/zdtm/static/Makefile b/test/zdtm/static/Makefile
-index e60fe6dc2d66..c5f3c98be3ed 100644
---- a/test/zdtm/static/Makefile
-+++ b/test/zdtm/static/Makefile
-@@ -241,7 +241,7 @@ TST_NOFILE	:=				\
- 		sigtrap01			\
- #		jobctl00			\
- 
--pkg-config-check = $(shell sh -c 'pkg-config $(1) && echo y')
-+pkg-config-check = $(shell sh -c '$(PKG_CONFIG) $(1) && echo y')
- ifeq ($(call pkg-config-check,libbpf),y)
- TST_NOFILE	+=				\
- 		bpf_hash			\
--- 
-2.31.1
-

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
deleted file mode 100644
index 86d9cd31724d..000000000000
--- a/sys-process/criu/files/criu-3.15-protobuf-c-1.4.0.patch
+++ /dev/null
@@ -1,194 +0,0 @@
-https://bugs.gentoo.org/809092
-https://bugs.gentoo.org/814056
-https://github.com/checkpoint-restore/criu/commit/1c25914a5dd1eb385937dffdd85901c3f5e39b8c
-https://github.com/checkpoint-restore/criu/commit/6a15dbdefa5c23a75eb3d1137681404588a16efa
-
-From 1c25914a5dd1eb385937dffdd85901c3f5e39b8c Mon Sep 17 00:00:00 2001
-From: Zeyad Yasser <zeyady98@gmail.com>
-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 <zeyady98@gmail.com>
----
- 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 */
-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