* Updated various stdenv packages (grep, gawk, tar, cpio, findutils,

  pcre).

svn path=/nixpkgs/branches/stdenv-updates/; revision=9758

3 files changed, 7 insertions, 49 deletions

diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 225bc557350e..3309215fb63d 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "cpio-2.7";
+  name = "cpio-2.9";
   src = fetchurl {
-    url = http://ftp.gnu.org/gnu/cpio/cpio-2.7.tar.bz2;
-    md5 = "69ad6cb3d288aafe5f969f68d9fd0fb7";
+    url = mirror://gnu/cpio/cpio-2.9.tar.bz2;
+    sha256 = "01s7f9hg8kgpis96j99hgkiqgdy53pm7qi7bhm3fzx58jfk5z6mv";
   };
   patches = [./symlink.patch ./gnulib-futimens.patch];
 }
diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index c8d77071123d..9205612f3bce 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "gnutar-1.16.1";
+  name = "gnutar-1.19";
   src = fetchurl {
-    url = mirror://gnu/tar/tar-1.16.1.tar.bz2;
-    md5 = "d51593461c5ef1f7e37134f22338bb9e";
+    url = mirror://gnu/tar/tar-1.19.tar.bz2;
+    sha256 = "1d4wh27wlgryz3ld6gp6fn56knh7dmny93bmgixy07kvlxnx9466";
   };
-  patches = [./implausible.patch ./gnulib-futimens.patch];
+  patches = [./implausible.patch];
 }
diff --git a/pkgs/tools/archivers/gnutar/gnulib-futimens.patch b/pkgs/tools/archivers/gnutar/gnulib-futimens.patch
deleted file mode 100644
index 00cdf9322e62..000000000000
--- a/pkgs/tools/archivers/gnutar/gnulib-futimens.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-now hat glibc-2.6  declares futimens.
-http://lists.gnu.org/archive/html/bug-gnulib/2007-05/msg00089.html
-
-diff -ru cpio-2.7.orig/lib/utimens.c cpio-2.7/lib/utimens.c
---- cpio-2.7.orig/lib/utimens.c	2007-05-20 21:23:57.000000000 +0900
-+++ cpio-2.7/lib/utimens.c	2007-05-21 08:40:22.000000000 +0900
-@@ -73,7 +73,7 @@
-    Return 0 on success, -1 (setting errno) on failure.  */
- 
- int
--futimens (int fd ATTRIBUTE_UNUSED,
-+gl_futimens (int fd ATTRIBUTE_UNUSED,
- 	  char const *file, struct timespec const timespec[2])
- {
-   /* There's currently no interface to set file timestamps with
-@@ -166,5 +166,5 @@
- int
- utimens (char const *file, struct timespec const timespec[2])
- {
--  return futimens (-1, file, timespec);
-+  return gl_futimens (-1, file, timespec);
- }
-diff -ru cpio-2.7.orig/lib/utimens.h cpio-2.7/lib/utimens.h
---- cpio-2.7.orig/lib/utimens.h	2007-05-20 21:23:57.000000000 +0900
-+++ cpio-2.7/lib/utimens.h	2007-05-21 08:39:57.000000000 +0900
-@@ -1,3 +1,3 @@
- #include "timespec.h"
--int futimens (int, char const *, struct timespec const [2]);
-+int gl_futimens (int, char const *, struct timespec const [2]);
- int utimens (char const *, struct timespec const [2]);
-diff -ur tar-1.16.1.orig/src/misc.c tar-1.16.1/src/misc.c
---- tar-1.16.1.orig/src/misc.c	2007-05-21 08:57:02.000000000 +0900
-+++ tar-1.16.1/src/misc.c	2007-05-21 08:57:16.000000000 +0900
-@@ -518,7 +518,7 @@
-     }
- #endif
- 
--  return futimens (fd, file, timespec);
-+  return gl_futimens (fd, file, timespec);
- }
- 
- /* A description of a working directory.  */