From 499b3edb306988d9ec91db50174aa85a896e585b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 28 Jan 2018 20:36:51 +0100
Subject: [PATCH] criu: 2.12.1 -> 3.7

cc @thoughtpolice
---
 .../linux/criu/criu-2.12.1-glibc-2.26.patch         | 13 -------------
 pkgs/os-specific/linux/criu/default.nix             | 11 ++---------
 2 files changed, 2 insertions(+), 22 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch

diff --git a/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch b/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch
deleted file mode 100644
index 916161e35a4..00000000000
--- a/pkgs/os-specific/linux/criu/criu-2.12.1-glibc-2.26.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/criu/cr-restore.c
-+++ b/criu/cr-restore.c
-@@ -650,3 +650,2 @@ static void zombie_prepare_signals(void)
- 		(1 << SIGSYS)	|\
--		(1 << SIGUNUSED)|\
- 		(1 << SIGSTKFLT)|\
---- a/test/zdtm/static/pthread01.c
-+++ b/test/zdtm/static/pthread01.c
-@@ -45,3 +45,3 @@ static char *decode_signal(const sigset_t *s, char *buf)
- 	COLLECT(SIGXFSZ); COLLECT(SIGVTALRM); COLLECT(SIGPROF); COLLECT(SIGWINCH); COLLECT(SIGIO);
--	COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS); COLLECT(SIGUNUSED);
-+	COLLECT(SIGPOLL); COLLECT(SIGPWR); COLLECT(SIGSYS);
- #undef COLLECT
diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 4ceb397d9f8..4ef162e56c7 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -4,30 +4,23 @@
 
 stdenv.mkDerivation rec {
   name    = "criu-${version}";
-  version = "2.12.1";
+  version = "3.7";
 
   src = fetchurl {
     url    = "http://download.openvz.org/criu/${name}.tar.bz2";
-    sha256 = "18m0sjgcfvzc86w49fd3kxw145nmrsvc5w7zf42nxdiklmszbr1k";
+    sha256 = "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq";
   };
 
-  patches = [ ./criu-2.12.1-glibc-2.26.patch ];
-
   enableParallelBuilding = true;
   nativeBuildInputs = [ pkgconfig docbook_xsl ];
   buildInputs = [ protobuf protobufc asciidoc xmlto libpaper libnl libcap libnet python ];
 
   postPatch = ''
-    chmod +w ./scripts/gen-offsets.sh
-    substituteInPlace ./scripts/gen-offsets.sh --replace hexdump ${utillinux}/bin/hexdump
     substituteInPlace ./Documentation/Makefile --replace "2>/dev/null" ""
     substituteInPlace ./Documentation/Makefile --replace "-m custom.xsl" "-m custom.xsl --skip-validation -x ${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl"
     substituteInPlace ./criu/Makefile --replace "-I/usr/include/libnl3" "-I${libnl.dev}/include/libnl3"
     substituteInPlace ./Makefile --replace "head-name := \$(shell git tag -l v\$(CRIU_VERSION))" "head-name = ${version}.0"
     ln -sf ${protobuf}/include/google/protobuf/descriptor.proto ./images/google/protobuf/descriptor.proto
-
-    # Avoid a glibc >= 2.25 deprecation warning that gets fatal via -Werror.
-    sed 1i'#include <sys/sysmacros.h>' -i criu/include/util.h
   '';
 
   buildPhase = "make PREFIX=$out";