diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-30 19:55:24 -0300 |
commit | e2a2cddf54e26ab2f6551c9d27b997472e5f4d45 (patch) | |
tree | 506c782411889ae8fe218db16eee680c7ae5e0e2 /core/glibc/glibc-2.14-revert-4462fad3.patch | |
parent | 7927a6b6296eecd09c8d2f70e593a378768deabe (diff) | |
parent | 5e8a6a470237711ad18f12dde87deea6f2b8b0e0 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gtk2hs-cairo/PKGBUILD
community/gtk2hs-glib/PKGBUILD
community/gtk2hs-gtk/PKGBUILD
community/gtk2hs-pango/PKGBUILD
community/haskell-dbus/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/kvirc/PKGBUILD
community/perl-gtk2-trayicon/PKGBUILD
core/binutils/PKGBUILD
core/gcc/PKGBUILD
core/glibc/PKGBUILD
core/linux-api-headers/PKGBUILD
extra/krusader/PKGBUILD
extra/libproxy/PKGBUILD
extra/libreoffice/PKGBUILD
extra/openal/PKGBUILD
extra/postgresql/PKGBUILD
extra/razor/PKGBUILD
extra/subversion/PKGBUILD
extra/swt/PKGBUILD
extra/valgrind/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdenetwork/PKGBUILD
kde-unstable/kdepim-runtime/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib/binutils-multilib/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-glibc/PKGBUILD
testing/git/PKGBUILD
testing/graphviz/PKGBUILD
testing/graphviz/install
testing/perl-xml-parser/PKGBUILD
Diffstat (limited to 'core/glibc/glibc-2.14-revert-4462fad3.patch')
-rw-r--r-- | core/glibc/glibc-2.14-revert-4462fad3.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/core/glibc/glibc-2.14-revert-4462fad3.patch b/core/glibc/glibc-2.14-revert-4462fad3.patch new file mode 100644 index 000000000..d71e37492 --- /dev/null +++ b/core/glibc/glibc-2.14-revert-4462fad3.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; |