re-import sources as agreed with the maintainer

.criu.metadata

@@ -0,0 +1 @@
+91eb1ccac61a7d538db14884091883c6dab5481a criu-3.15.tar.bz2

.gitignore

@@ -1,2 +1 @@
-SOURCES/criu-3.15.tar.bz2
-/criu-3.15.tar.bz2
+/*.tar.gz

0001-Fix-building-with-annobin.patch

@@ -1,57 +0,0 @@
-From 4878775c8e0f2ea6869aff139d219f6eb0c4006c Mon Sep 17 00:00:00 2001
-From: Adrian Reber <areber@redhat.com>
-Date: Fri, 28 Jan 2022 15:10:31 +0000
-Subject: [PATCH] Fix building with annobin
-
-Annobin (used at least in Fedora and RHEL) injects annotation into the
-compiled objects which break the parasite and restorer.
-
-This removes the annobin flags as used in Fedora and RHEL and makes CRIU
-work on Fedora and RHEL with annobin enabled.
-
-Signed-off-by: Adrian Reber <areber@redhat.com>
----
- compel/plugins/Makefile   | 2 +-
- criu/pie/Makefile         | 2 +-
- criu/pie/Makefile.library | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/compel/plugins/Makefile b/compel/plugins/Makefile
-index e5fa781ac..37630d438 100644
---- a/compel/plugins/Makefile
-+++ b/compel/plugins/Makefile
-@@ -1,4 +1,4 @@
--CFLAGS		:= $(filter-out -pg $(CFLAGS-GCOV) $(CFLAGS-ASAN),$(CFLAGS))
-+CFLAGS		:= $(filter-out -pg $(CFLAGS-GCOV) $(CFLAGS-ASAN) -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1,$(CFLAGS))
- CFLAGS		+= -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
- CFLAGS		+= -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
- 
-diff --git a/criu/pie/Makefile b/criu/pie/Makefile
-index 265dcf82b..386626334 100644
---- a/criu/pie/Makefile
-+++ b/criu/pie/Makefile
-@@ -4,7 +4,7 @@
- 
- target		:= parasite restorer
- 
--CFLAGS		:= $(filter-out -pg $(CFLAGS-GCOV) $(CFLAGS-ASAN),$(CFLAGS))
-+CFLAGS		:= $(filter-out -pg $(CFLAGS-GCOV) $(CFLAGS-ASAN) -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1,$(CFLAGS))
- CFLAGS		+= $(CFLAGS_PIE)
- ccflags-y	+= -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
- ccflags-y	+= -Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=0
-diff --git a/criu/pie/Makefile.library b/criu/pie/Makefile.library
-index da2a2fab3..6247afe7e 100644
---- a/criu/pie/Makefile.library
-+++ b/criu/pie/Makefile.library
-@@ -21,7 +21,7 @@ ifeq ($(ARCH),arm)
-         lib-y		+= ./$(ARCH_DIR)/pie-cacheflush.o
- endif
- 
--CFLAGS		:= $(filter-out -pg $(CFLAGS-GCOV) $(CFLAGS-ASAN),$(CFLAGS))
-+CFLAGS		:= $(filter-out -pg $(CFLAGS-GCOV) $(CFLAGS-ASAN) -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1,$(CFLAGS))
- CFLAGS		+= $(CFLAGS_PIE)
- 
- ifeq ($(ARCH),mips)
--- 
-2.34.1
-

criu.pc.patch

@@ -1,27 +0,0 @@
-From 341ef149ee259d9432ea4c01507eefab2ef8b83c Mon Sep 17 00:00:00 2001
-From: Radostin Stoyanov <radostin@redhat.com>
-Date: Thu, 14 Oct 2021 12:58:56 +0100
-Subject: [PATCH] criu.pc: Add libprotobuf-c as a dependency
-
-CRIU has a dependency on protobuf-c-devel. We express this dependency
-in pkgconfig to be auto-detected when building a package.
-
-Signed-off-by: Radostin Stoyanov <radostin@redhat.com>
----
- lib/c/criu.pc.in | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/c/criu.pc.in b/lib/c/criu.pc.in
-index 33986d10d..bcced5033 100644
---- a/lib/c/criu.pc.in
-+++ b/lib/c/criu.pc.in
-@@ -4,5 +4,6 @@ includedir=@includedir@
- Name: CRIU
- Description: RPC library for userspace checkpoint and restore
- Version: @version@
-+Requires.private: libprotobuf-c
- Libs: -L${libdir} -lcriu
- Cflags: -I${includedir}
---
-2.31.1
-

gating.yaml

@@ -1,6 +1,6 @@
 --- !Policy
 product_versions:
-  - rhel-9
+  - rhel-8
 decision_context: osci_compose_gate
 rules:
   - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

rpminspect.yaml

@@ -1,4 +0,0 @@
----
-annocheck:
-  jobs:
-  - hardened: --verbose --skip-pie --skip-bind-now --skip-stack-prot

tests/run-podman-checkpoint-restore.sh

@@ -1,14 +1,12 @@
 #!/bin/bash
 
+# crun is not built with checkpoint/restore support
+exit 0
+
 set -eux
 
 ls -la
 
-if ! crun checkpoint --help; then
-    echo "crun doesn't support checkpoint/restore"
-    exit 0
-fi
-
 echo "Start container"
 podman --log-level debug run -d quay.io/adrianreber/counter