diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-06 12:13:36 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-02-06 12:13:36 -0300 |
| commit | 4a9023500f5b915ccbf556296c756ce3f2faef5b (patch) | |
| tree | 28258893f8d5094fdb84ede1e97afa36a5276696 /testing/glibc/glibc-2.14-revert-4768ae77.patch | |
| parent | 3dac66779d53dc58badb4f964177f7692c1bd92c (diff) | |
| parent | bdb5b3e66f6afa586ea147f69af5e4ba388f7615 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/gcc/PKGBUILD
extra/shared-mime-info/PKGBUILD
extra/smb4k/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
multilib/gcc-multilib/PKGBUILD
testing/xfig/PKGBUILD
Diffstat (limited to 'testing/glibc/glibc-2.14-revert-4768ae77.patch')
| -rw-r--r-- | testing/glibc/glibc-2.14-revert-4768ae77.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/testing/glibc/glibc-2.14-revert-4768ae77.patch b/testing/glibc/glibc-2.14-revert-4768ae77.patch new file mode 100644 index 000000000..11f087cb7 --- /dev/null +++ b/testing/glibc/glibc-2.14-revert-4768ae77.patch @@ -0,0 +1,37 @@ +diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c +--- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 ++++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 +@@ -549,7 +549,7 @@ + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || *resplen2 == 0)) ++ if (n == 0) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or +@@ -1275,14 +1275,10 @@ + (*thisresplenp > *thisanssizp) + ? *thisanssizp : *thisresplenp); + +- if (recvresp1 || (buf2 != NULL && recvresp2)) { +- *resplen2 = 0; ++ if (recvresp1 || (buf2 != NULL && recvresp2)) + return resplen; +- } + if (buf2 != NULL) + { +- /* No data from the first reply. */ +- resplen = 0; + /* We are waiting for a possible second reply. */ + if (hp->id == anhp->id) + recvresp1 = 1; |