From 08441c8a5878b11d0861929c28da0d579df4669a Mon Sep 17 00:00:00 2001 From: Andrei Vagin Date: Sat, 28 Mar 2020 23:39:06 -0700 Subject: [PATCH 1/3] Fix building on FC33 Signed-off-by: Andrei Vagin --- cr-service-fix.patch | 74 ++++++++++++++++++++++++++++++++++++++++++++ criu.spec | 9 +++++- 2 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 cr-service-fix.patch diff --git a/cr-service-fix.patch b/cr-service-fix.patch new file mode 100644 index 0000000..020c40b --- /dev/null +++ b/cr-service-fix.patch @@ -0,0 +1,74 @@ +commit af9157ff696c4c7b45d9d4a47f8d7e71fa8c71bc +Author: Sergei Trofimovich +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 + +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 + diff --git a/criu.spec b/criu.spec index c448646..869b9d5 100644 --- a/criu.spec +++ b/criu.spec @@ -12,7 +12,7 @@ Name: criu Version: 3.13 -Release: 6%{?dist} +Release: 7%{?dist} Provides: crtools = %{version}-%{release} Obsoletes: crtools <= 1.0-2 Summary: Tool for Checkpoint/Restore in User-space @@ -32,6 +32,8 @@ Source3: compel.1 Patch100: aio-fix.patch %endif +Patch101: cr-service-fix.patch + Source4: criu-tmpfiles.conf BuildRequires: gcc @@ -105,6 +107,8 @@ their content in human-readable form. %patch100 -p1 %endif +%patch101 -p1 + %build # %{?_smp_mflags} does not work # -fstack-protector breaks build @@ -178,6 +182,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %changelog +* Sun Mar 29 2020 Andrei Vagin - 3.13-7 +- Added patch for gcc-10 + * Tue Jan 28 2020 Fedora Release Engineering - 3.13-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From bc93d46ad83d88c39405d6c6e2a9e26f861b1b34 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Wed, 29 Apr 2020 17:54:25 +0200 Subject: [PATCH 2/3] Update to 3.14 (#1829399) Signed-off-by: Adrian Reber --- .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 -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 - -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 - 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 - 3.14-1 +- Update to 3.14 (#1829399) + * Sun Mar 29 2020 Andrei Vagin - 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 From 49662d321851460f6c0b714191d4b491e0a01908 Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Mon, 9 Nov 2020 08:29:24 +0100 Subject: [PATCH 3/3] Update to 3.15 Signed-off-by: Adrian Reber --- .gitignore | 1 + criu.spec | 26 +++++++++++++++++++++++++- sources | 2 +- 3 files changed, 27 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 51c5970..daa1199 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /criu-3.12.tar.bz2 /criu-3.13.tar.bz2 /criu-3.14.tar.bz2 +/criu-3.15.tar.bz2 diff --git a/criu.spec b/criu.spec index 8782ffd..24bcf32 100644 --- a/criu.spec +++ b/criu.spec @@ -11,7 +11,7 @@ %undefine _annotated_build Name: criu -Version: 3.14 +Version: 3.15 Release: 1%{?dist} Provides: crtools = %{version}-%{release} Obsoletes: crtools <= 1.0-2 @@ -179,6 +179,30 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libcriu.a %changelog +* Wed Nov 04 2020 Adrian Reber - 3.15-1 +- Update to 3.15 + +* Wed Sep 23 2020 Adrian Reber - 3.14-8 +- Rebuilt for protobuf 3.13 + +* Mon Jul 27 2020 Fedora Release Engineering - 3.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 14 2020 Jeff Law - 3.14-6 +- Disable LTO + +* Sun Jun 14 2020 Adrian Reber - 3.14-5 +- Rebuilt for protobuf 3.12 + +* Tue May 26 2020 Miro Hrončok - 3.14-4 +- Rebuilt for Python 3.9 + +* Thu Apr 30 2020 Adrian Reber - 3.14-3 +- BuildRequire nftables-devel for working CI + +* Thu Apr 30 2020 Adrian Reber - 3.14-2 +- Rebuild for CI fixes + * Wed Apr 29 2020 Adrian Reber - 3.14-1 - Update to 3.14 (#1829399) diff --git a/sources b/sources index dd37549..551a2a9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (criu-3.14.tar.bz2) = 97d064c5ffc41daf6e89edd6208b30e4198f313afc6d621d0dc74dadf94c303be70ba448d4e1ced9500f1c65f1bd12206eb88883be398911cc2c995310b17cc6 +SHA512 (criu-3.15.tar.bz2) = 7bfd32053e47b95d10cdd5e99494bff6a21aa3179518179f8c72e870f0aab960dd76c9f6cb6982e5b881472cf6962eefee3cf7d8ae9128b3379bcaecc937ebbc