From 9a42b0b52b37c7771bbfa2a3aa197bb10cd9ec2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 27 Feb 2012 18:28:29 +0000
Subject: [PATCH] GNU libc: Update the Hurd port.

svn path=/nixpkgs/trunk/; revision=32630
---
 .../libraries/glibc-2.12/common.nix           |  9 ++++-----
 .../glibc-2.12/hurd-sigstate-functions.patch  | 20 -------------------
 2 files changed, 4 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch

diff --git a/pkgs/development/libraries/glibc-2.12/common.nix b/pkgs/development/libraries/glibc-2.12/common.nix
index 8f0c092d35c..6a68077ab34 100644
--- a/pkgs/development/libraries/glibc-2.12/common.nix
+++ b/pkgs/development/libraries/glibc-2.12/common.nix
@@ -12,7 +12,7 @@ cross :
 
 let
   # For GNU/Hurd, see below.
-  version = if hurdHeaders != null then "20120221" else "2.12.2";
+  version = if hurdHeaders != null then "20120223" else "2.12.2";
 
   needsPortsNative = stdenv.isMips || stdenv.isArm;
   needsPortsCross = cross.arch == "mips" || cross.arch == "arm";
@@ -75,8 +75,7 @@ stdenv.mkDerivation ({
 
     /* Allow nixos and nix handle the locale-archive. */
     ./nix-locale-archive.patch
-  ]
-  ++ (stdenv.lib.optional (hurdHeaders != null) ./hurd-sigstate-functions.patch);
+  ];
 
   postPatch = ''
     # Needed for glibc to build with the gnumake 3.82
@@ -144,8 +143,8 @@ stdenv.mkDerivation ({
       # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
       # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
       url = "git://git.sv.gnu.org/hurd/glibc.git";
-      sha256 = "fbc053f23167059af414ae1ba9a65931a9d9afaf7d2efb9eba3e258757d12f7d";
-      rev = "b29b3d0ae35be390cab59e4798cbaf9b45fb06e3";
+      sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d";
+      rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1";
     }
     else fetchurl {
       url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
diff --git a/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch b/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch
deleted file mode 100644
index d46db7b6393..00000000000
--- a/pkgs/development/libraries/glibc-2.12/hurd-sigstate-functions.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-This patch adds a GNU ld version script entry for the `_hurd_sigstate_*'
-functions that were introduced to support SA_SIGINFO.  A similar patch
-should be applied upstream soon.
-
-diff --git a/hurd/Versions b/hurd/Versions
-index 83c8ab1..295cfda 100644
---- a/hurd/Versions
-+++ b/hurd/Versions
-@@ -156,6 +156,11 @@ libc {
-     # functions used in macros & inline functions
-     __errno_location;
-   }
-+  GLIBC_2.13 {
-+    # functions introduced for SA_SIGINFO support and referenced from
-+    # <hurd/signal.h>
-+    _hurd_sigstate_*;
-+  }
- 
- %if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
-   HURD_CTHREADS_0.3 {