Author: eelco
Date: Thu Aug 5 16:51:16 2010
New Revision: 22967
URL: https://svn.nixos.org/websvn/nix/?rev=22967&sc=1
Log:
* Glibc 2.11.2.
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nss-skip-unavail.patch
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
Thu Aug 5 16:27:46 2010 (r22966)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/common.nix
Thu Aug 5 16:51:16 2010 (r22967)
@@ -11,9 +11,7 @@
let
# For GNU/Hurd, see below.
- date = "20100512";
- rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f";
- version = if hurdHeaders != null then date else "2.11.1";
+ version = if hurdHeaders != null then "20100512" else "2.11.2";
in
assert (cross != null) -> (gccCross != null);
@@ -123,11 +121,11 @@
# See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
url = "git://git.sv.gnu.org/hurd/glibc.git";
sha256 =
"f3590a54a9d897d121f91113949edbaaf3e30cdeacbb8d0a44de7b6564f6643e";
- inherit rev;
+ rev = "df4c3faf0ccc848b5a8086c222bdb42679a9798f";
}
else fetchurl {
url = "mirror://gnu/glibc/glibc-${version}.tar.bz2";
- sha256 = "18azb6518ryqhkfmddr25p0h1s2msrmx7dblij58sjlnzh61vq34";
+ sha256 = "04w74879psq961cas1amidkg8fc1h6r9yj3plfr33v9y6vp7db62";
};
srcPorts = fetchurl {
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nss-skip-unavail.patch
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nss-skip-unavail.patch
Thu Aug 5 16:27:46 2010 (r22966)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/glibc-2.11/nss-skip-unavail.patch
Thu Aug 5 16:51:16 2010 (r22967)
@@ -1,25 +1,21 @@
-diff -rc glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c
glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c
-*** glibc-2.9-20081208-orig/sysdeps/posix/getaddrinfo.c 2008-07-30
21:14:22.000000000 +0200
---- glibc-2.9-20081208/sysdeps/posix/getaddrinfo.c 2008-12-10
11:39:32.000000000 +0100
-***************
-*** 505,512 ****
- int no_data = 0;
- int no_inet6_data = 0;
- service_user *nip = NULL;
-- enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
-- enum nss_status status = NSS_STATUS_UNAVAIL;
- int no_more;
- int old_res_options;
-
---- 505,510 ----
-***************
-*** 702,707 ****
---- 700,707 ----
-
- while (!no_more)
- {
+diff -ru glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c
glibc-2.11.2/sysdeps/posix/getaddrinfo.c
+--- glibc-2.11.2-orig/sysdeps/posix/getaddrinfo.c 2010-05-19
22:38:20.000000000 +0200
++++ glibc-2.11.2/sysdeps/posix/getaddrinfo.c 2010-08-05 18:39:54.259556327
+0200
+@@ -505,8 +505,6 @@
+ int no_data = 0;
+ int no_inet6_data = 0;
+ service_user *nip = NULL;
+- enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
+- enum nss_status status = NSS_STATUS_UNAVAIL;
+ int no_more;
+ int old_res_options;
+
+@@ -702,6 +700,8 @@
+
+ while (!no_more)
+ {
+ enum nss_status inet6_status = NSS_STATUS_UNAVAIL;
+ enum nss_status status = NSS_STATUS_UNAVAIL;
- nss_gethostbyname4_r fct4
- = __nss_lookup_function (nip, "gethostbyname4_r");
- if (fct4 != NULL)
+ no_data = 0;
+ nss_gethostbyname4_r fct4
+ = __nss_lookup_function (nip, "gethostbyname4_r");
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
