From 04d74baeb054bf51b31f35f22619fe27d59fe9bb Mon Sep 17 00:00:00 2001
From: Marco Maggesi <maggesi@math.unifi.it>
Date: Tue, 22 Feb 2011 19:00:45 +0000
Subject: [PATCH] * Update dmtcp to version 1.2.0. * Remove patch
 'dont_check_uid' that was introduced to allow building   hol_light binaries
 under root, but we will avoid it in the future).

svn path=/nixpkgs/trunk/; revision=26062
---
 pkgs/os-specific/linux/dmtcp/default.nix      |  8 ++---
 .../linux/dmtcp/dont_check_uid.patch          | 35 -------------------
 2 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/dmtcp/dont_check_uid.patch

diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix
index 39759b03496c..c863be14461c 100644
--- a/pkgs/os-specific/linux/dmtcp/default.nix
+++ b/pkgs/os-specific/linux/dmtcp/default.nix
@@ -4,18 +4,16 @@
 stdenv.mkDerivation rec {
   name = "dmtcp-${version}";
 
-  version = "1.1.8";
+  version = "1.2.0";
 
   buildInputs = [ perl python ];
 
   src = fetchurl {
     url = "mirror://sourceforge/dmtcp/dmtcp_${version}.tar.gz";
-    sha256 = "05klyml5maw3f5rxl3i20fqyvpmx69bh09h7a48y19q3r4nqd8f2";
+    sha256 = "1pw3m4l1xf887xagd0yrrnb35s372j0kvjziyy3gmx9fxpga1jzb";
   };
 
-  patches = [ ./dont_check_uid.patch ];
-
-  postPatch = ''
+  preConfigure = ''
     substituteInPlace dmtcp/src/dmtcp_coordinator.cpp \
       --replace /bin/bash /bin/sh
     substituteInPlace utils/gdb-add-symbol-file \
diff --git a/pkgs/os-specific/linux/dmtcp/dont_check_uid.patch b/pkgs/os-specific/linux/dmtcp/dont_check_uid.patch
deleted file mode 100644
index 23f4a254037e..000000000000
--- a/pkgs/os-specific/linux/dmtcp/dont_check_uid.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Nuar dmtcp_1.1.8/dmtcp/src/dmtcp_restart.cpp dmtcp_1.1.8.dont_check_uid/dmtcp/src/dmtcp_restart.cpp
---- dmtcp_1.1.8/dmtcp/src/dmtcp_restart.cpp	2010-07-01 06:42:54.000000000 +0200
-+++ dmtcp_1.1.8.dont_check_uid/dmtcp/src/dmtcp_restart.cpp	2010-09-06 23:50:51.000000000 +0200
-@@ -662,14 +662,6 @@
-       sprintf(error_msg, "\ndmtcp_restart: ckpt image %s", restorename);
-       perror(error_msg);
-       doAbort = true;
--    } else if (buf.st_uid != getuid()) { /*Could also run if geteuid() matches*/
--      printf("\nProcess uid (%d) doesn't match uid (%d) of\n" \
--             "checkpoint image (%s).\n" \
--	     "This is dangerous.  Aborting for security reasons.\n" \
--           "If you still want to do this (at your own risk),\n" \
--           "  then modify dmtcp/src/%s:%d and re-compile.\n",
--           getuid(), buf.st_uid, restorename, __FILE__, __LINE__ - 6);
--      doAbort = true;
-     }
-     if (doAbort)
-       abort();
-diff -Nuar dmtcp_1.1.8/mtcp/mtcp_restart.c dmtcp_1.1.8.dont_check_uid/mtcp/mtcp_restart.c
---- dmtcp_1.1.8/mtcp/mtcp_restart.c	2010-07-01 06:42:53.000000000 +0200
-+++ dmtcp_1.1.8.dont_check_uid/mtcp/mtcp_restart.c	2010-09-07 01:49:20.000000000 +0200
-@@ -157,13 +157,6 @@
-       sprintf(error_msg, "\nmtcp_restart: ckpt image %s", restorename);
-       perror(error_msg);
-       abort();
--    } else if (buf.st_uid != getuid()) { /*Could also run if geteuid() matches*/
--      mtcp_printf("\nProcess uid (%d) doesn't match uid (%d) of\n" \
--	          "checkpoint image (%s).\n" \
--		  "This is dangerous.  Aborting for security reasons.\n" \
--	   "If you still want to do this, modify mtcp/%s:%d and re-compile.\n",
--	   getuid(), buf.st_uid, restorename, __FILE__, __LINE__ - 5);
--      abort();
-     }
-   }
-