From f139c55e988feeda1b085a04b7b187033d73cc1d Mon Sep 17 00:00:00 2001
From: Adrian Reber <areber@redhat.com>
Date: Mon, 9 May 2022 08:25:18 +0200
Subject: [PATCH] Update to 3.17

 * Drop upstreamed patches
 * Remove compel man-page

Resolves: rhbz#2033446

Signed-off-by: Adrian Reber <areber@redhat.com>
---
 criu.spec       | 25 ++++++++++++++++---------
 rpminspect.yaml |  3 ++-
 sources         |  2 +-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/criu.spec b/criu.spec
index 1679283..dae86e6 100644
--- a/criu.spec
+++ b/criu.spec
@@ -6,14 +6,14 @@
 %global _lto_cflags %%{nil}
 
 Name: criu
-Version: 3.15
-Release: 13%{?dist}
+Version: 3.17
+Release: 1%{?dist}
 Provides: crtools = %{version}-%{release}
 Obsoletes: crtools <= 1.0-2
 Summary: Tool for Checkpoint/Restore in User-space
 License: GPLv2
 URL: http://criu.org/
-Source0: http://download.openvz.org/criu/criu-%{version}.tar.bz2
+Source0: https://github.com/checkpoint-restore/criu/archive/v%{version}/criu-%{version}.tar.gz
 Source1: criu-tmpfiles.conf
 BuildRequires: gcc
 BuildRequires: systemd
@@ -27,9 +27,6 @@ BuildRequires: make
 # Checkpointing containers with a tmpfs requires tar
 Recommends: tar
 
-Patch0: 0001-util-make-page-server-IPv6-safe.patch
-Patch1: 0001-Fix-building-with-annobin.patch
-
 # user-space and kernel changes are only available for x86_64, arm,
 # ppc64le, aarch64 and s390x
 # https://bugzilla.redhat.com/show_bug.cgi?id=902875
@@ -43,6 +40,7 @@ Linux in user-space.
 %package devel
 Summary: Header files and libraries for %{name}
 Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
 
 %description devel
 This package contains header files and libraries for %{name}.
@@ -73,8 +71,6 @@ their content in human-readable form.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 # %{?_smp_mflags} does not work
@@ -93,11 +89,17 @@ install -d -m 0755 %{buildroot}/run/%{name}/
 # remove static libs
 rm $RPM_BUILD_ROOT%{_libdir}/*.a
 rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
+# remove compel man-page
+rm $RPM_BUILD_ROOT%{_mandir}/man1/compel.1*
+# remove amdgpu plugin man-page
+rm $RPM_BUILD_ROOT%{_mandir}/man1/amdgpu_plugin.1*
+# remove criu-ns
+rm $RPM_BUILD_ROOT%{_sbindir}/criu-ns
+rm $RPM_BUILD_ROOT%{_mandir}/man1/criu-ns.1*
 
 %files
 %{_sbindir}/%{name}
 %{_mandir}/man8/criu.8*
-%{_mandir}/man1/compel.1*
 %dir /run/%{name}
 %{_tmpfilesdir}/%{name}.conf
 %doc README.md COPYING
@@ -119,6 +121,11 @@ rm -rf $RPM_BUILD_ROOT%{_libexecdir}/%{name}
 %doc %{_mandir}/man1/crit.1*
 
 %changelog
+* Mon May 09 2022 Adrian Reber <areber@redhat.com> - 3.17-1
+- Update to 3.17
+- Drop upstreamed patches
+- Remove compel man-page
+
 * Mon Jan 31 2022 Adrian Reber <areber@redhat.com> - 3.15-13
 - Apply patch to build with annobin enabled
 - Apply patch to fix unsafe IPv6 handling
diff --git a/rpminspect.yaml b/rpminspect.yaml
index 6cb7dba..77c04ec 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -1,3 +1,4 @@
 ---
 annocheck:
-  - rhel-policy: --verbose --skip-pie --skip-bind-now
+  jobs:
+  - hardened: --verbose --skip-pie --skip-bind-now --skip-stack-prot
diff --git a/sources b/sources
index 551a2a9..1e3c0ae 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (criu-3.15.tar.bz2) = 7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc
+SHA512 (criu-3.17.tar.gz) = febae66a7820345c0f335f4a49e64c0af5c8ae5d3a394cc0770881b64eab11ca03ad5872f06b0c4ccd1da844c519268dad3b4f8b260267e6d3f582e80d80f804