diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-29 01:01:31 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-12-29 01:01:31 +0100 |
| commit | 291527a6d9acb707a1a25c0f40d9472260345ee7 (patch) | |
| tree | c982ad709149771114412c7e377a2559317aa4fa /pkgs/development/libraries/glibc | |
| parent | d3d3cea6bdd53b48fcb09c97f09b56f24d505566 (diff) | |
| download | nixlib-291527a6d9acb707a1a25c0f40d9472260345ee7.tar nixlib-291527a6d9acb707a1a25c0f40d9472260345ee7.tar.gz nixlib-291527a6d9acb707a1a25c0f40d9472260345ee7.tar.bz2 nixlib-291527a6d9acb707a1a25c0f40d9472260345ee7.tar.lz nixlib-291527a6d9acb707a1a25c0f40d9472260345ee7.tar.xz nixlib-291527a6d9acb707a1a25c0f40d9472260345ee7.tar.zst nixlib-291527a6d9acb707a1a25c0f40d9472260345ee7.zip | |
glibc: Drop nss-skip-unavail.patch
From a quick look at the 1063-line monstrosity that is gaih_inet(), I *think* that this patch is no longer needed. But I could be wrong.
Diffstat (limited to 'pkgs/development/libraries/glibc')
| -rw-r--r-- | pkgs/development/libraries/glibc/2.17/common.nix | 25 | ||||
| -rw-r--r-- | pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch | 21 |
2 files changed, 1 insertions, 45 deletions
diff --git a/pkgs/development/libraries/glibc/2.17/common.nix b/pkgs/development/libraries/glibc/2.17/common.nix index ccdae6200e53..a3c6466c8302 100644 --- a/pkgs/development/libraries/glibc/2.17/common.nix +++ b/pkgs/development/libraries/glibc/2.17/common.nix @@ -32,30 +32,7 @@ stdenv.mkDerivation ({ enableParallelBuilding = true; patches = - [ /* Fix for NIXPKGS-79: when doing host name lookups, when - nsswitch.conf contains a line like - - hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4 - - don't return an error when mdns4_minimal can't be found. This - is a bug in Glibc: when a service can't be found, NSS should - continue to the next service unless "UNAVAIL=return" is set. - ("NOTFOUND=return" refers to the service returning a NOTFOUND - error, not the service itself not being found.) The reason is - that the "status" variable (while initialised to UNAVAIL) is - outside of the loop that iterates over the services, the - "files" service sets status to NOTFOUND. So when the call to - find "mdns4_minimal" fails, "status" will still be NOTFOUND, - and it will return instead of continuing to "dns". Thus, the - line - - hosts: mdns4_minimal [NOTFOUND=return] dns mdns4 - - does work because "status" will contain UNAVAIL after the - failure to find mdns4_minimal. */ - ./nss-skip-unavail.patch - - /* Have rpcgen(1) look for cpp(1) in $PATH. */ + [ /* Have rpcgen(1) look for cpp(1) in $PATH. */ ./rpcgen-path.patch /* Allow NixOS and Nix to handle the locale-archive. */ diff --git a/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch b/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch deleted file mode 100644 index e48dc2bc0a6e..000000000000 --- a/pkgs/development/libraries/glibc/2.17/nss-skip-unavail.patch +++ /dev/null @@ -1,21 +0,0 @@ -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; - no_data = 0; - nss_gethostbyname4_r fct4 - = __nss_lookup_function (nip, "gethostbyname4_r"); |