From 439202d427098979dc57650e3a5fb2c56e48d0db Mon Sep 17 00:00:00 2001
From: Adrian Reber <adrian@lisas.de>
Date: Wed, 29 Apr 2020 17:54:25 +0200
Subject: [PATCH] Update to 3.14 (#1829399)

Signed-off-by: Adrian Reber <adrian@lisas.de>
---
 .gitignore           |  1 +
 cr-service-fix.patch | 74 --------------------------------------------
 criu.spec            | 12 +++----
 sources              |  2 +-
 4 files changed, 8 insertions(+), 81 deletions(-)
 delete mode 100644 cr-service-fix.patch

diff --git a/.gitignore b/.gitignore
index 2ca982a..51c5970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@
 /criu-3.11.tar.bz2
 /criu-3.12.tar.bz2
 /criu-3.13.tar.bz2
+/criu-3.14.tar.bz2
diff --git a/cr-service-fix.patch b/cr-service-fix.patch
deleted file mode 100644
index 020c40b..0000000
--- a/cr-service-fix.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-commit af9157ff696c4c7b45d9d4a47f8d7e71fa8c71bc
-Author: Sergei Trofimovich <slyfox@gentoo.org>
-Date:   Sun Feb 2 18:45:59 2020 +0000
-
-    criu: fix build failure against gcc-10
-    
-    On gcc-10 (and gcc-9 -fno-common) build fails as:
-    
-    ```
-    ld: criu/arch/x86/crtools.o:criu/include/cr_options.h:159:
-      multiple definition of `rpc_cfg_file'; criu/arch/x86/cpu.o:criu/include/cr_options.h:159: first defined here
-    make[2]: *** [scripts/nmk/scripts/build.mk:164: criu/arch/x86/crtools.built-in.o] Error 1
-    ```
-    
-    gcc-10 will change the default from -fcommon to fno-common:
-    https://gcc.gnu.org/PR85678.
-    
-    The error also happens if CFLAGS=-fno-common passed explicitly.
-    
-    Reported-by: Toralf Förster
-    Bug: https://bugs.gentoo.org/707942
-    Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-
-diff --git a/criu/config.c b/criu/config.c
-index 6fb6bfdff..df5d85162 100644
---- a/criu/config.c
-+++ b/criu/config.c
-@@ -30,6 +30,7 @@
- #include "common/xmalloc.h"
- 
- struct cr_options opts;
-+char *rpc_cfg_file;
- 
- static int count_elements(char **to_count)
- {
-diff --git a/criu/include/cr_options.h b/criu/include/cr_options.h
-index a7b040fbf..e02848d2d 100644
---- a/criu/include/cr_options.h
-+++ b/criu/include/cr_options.h
-@@ -147,7 +147,7 @@ struct cr_options {
- };
- 
- extern struct cr_options opts;
--char *rpc_cfg_file;
-+extern char *rpc_cfg_file;
- 
- extern int parse_options(int argc, char **argv, bool *usage_error, bool *has_exec_cmd, int state);
- extern int check_options();
-diff --git a/criu/include/pstree.h b/criu/include/pstree.h
-index 7303c1fed..61ab0ce0e 100644
---- a/criu/include/pstree.h
-+++ b/criu/include/pstree.h
-@@ -42,7 +42,7 @@ enum {
- };
- #define FDS_EVENT (1 << FDS_EVENT_BIT)
- 
--struct pstree_item *current;
-+extern struct pstree_item *current;
- 
- struct rst_info;
- /* See alloc_pstree_item() for details */
-diff --git a/criu/include/tun.h b/criu/include/tun.h
-index ce0b266a6..b82c445a7 100644
---- a/criu/include/tun.h
-+++ b/criu/include/tun.h
-@@ -5,7 +5,7 @@
- #define TUN_MINOR	200
- #endif
- 
--struct ns_id *ns;
-+extern struct ns_id *ns;
- 
- #include <linux/netlink.h>
- 
diff --git a/criu.spec b/criu.spec
index 869b9d5..8782ffd 100644
--- a/criu.spec
+++ b/criu.spec
@@ -11,8 +11,8 @@
 %undefine _annotated_build
 
 Name: criu
-Version: 3.13
-Release: 7%{?dist}
+Version: 3.14
+Release: 1%{?dist}
 Provides: crtools = %{version}-%{release}
 Obsoletes: crtools <= 1.0-2
 Summary: Tool for Checkpoint/Restore in User-space
@@ -32,8 +32,6 @@ Source3: compel.1
 Patch100: aio-fix.patch
 %endif
 
-Patch101: cr-service-fix.patch
-
 Source4: criu-tmpfiles.conf
 
 BuildRequires: gcc
@@ -44,6 +42,7 @@ BuildRequires: protobuf-devel protobuf-c-devel %{py_prefix}-devel libnl3-devel l
 BuildRequires: asciidoc xmlto
 BuildRequires: perl-interpreter
 BuildRequires: libselinux-devel
+BuildRequires: gnutls-devel
 # Checkpointing containers with a tmpfs requires tar
 Recommends: tar
 %if 0%{?fedora}
@@ -107,8 +106,6 @@ their content in human-readable form.
 %patch100 -p1
 %endif
 
-%patch101 -p1
-
 %build
 # %{?_smp_mflags} does not work
 # -fstack-protector breaks build
@@ -182,6 +179,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a
 
 
 %changelog
+* Wed Apr 29 2020 Adrian Reber <adrian@lisas.de> - 3.14-1
+- Update to 3.14 (#1829399)
+
 * Sun Mar 29 2020 Andrei Vagin <avagin@gmail.com> - 3.13-7
 - Added patch for gcc-10
 
diff --git a/sources b/sources
index 0d69e96..dd37549 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (criu-3.13.tar.bz2) = ef93ec9977512711fbcedd52807cc91b1ab582f1c031c4beda93dac7530ccf40bca45b3dee6b5d08a676ec28036caa55ad3746c450265429880e114fde0a071d
+SHA512 (criu-3.14.tar.bz2) = 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6