From ae08410274473c5ab78d300ea2365c4b1070cc61 Mon Sep 17 00:00:00 2001 From: Parabola Date: Wed, 21 Sep 2011 15:49:37 +0000 Subject: Wed Sep 21 15:49:35 UTC 2011 --- .../glibc-2.14-fix-resolver-crash-typo.patch | 22 ------------- .../lib32-glibc/glibc-2.14-revert-4462fad3.patch | 37 ---------------------- 2 files changed, 59 deletions(-) delete mode 100644 multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch delete mode 100644 multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch (limited to 'multilib') diff --git a/multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch b/multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch deleted file mode 100644 index b5d86c7d2..000000000 --- a/multilib/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/resolv/res_send.c b/resolv/res_send.c -index 97142b7..a001c1e 100644 ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ns, ansp, ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - } else { - /* Use datagrams. */ -@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, - ansp2, nansp2, resplen2); - if (n < 0) - return (-1); -- if (n == 0 && (buf2 == NULL || resplen2 == 0)) -+ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) - goto next_ns; - if (v_circuit) - // XXX Check whether both requests failed or diff --git a/multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch b/multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch deleted file mode 100644 index d71e37492..000000000 --- a/multilib/lib32-glibc/glibc-2.14-revert-4462fad3.patch +++ /dev/null @@ -1,37 +0,0 @@ -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; -- cgit v1.2.3-54-g00ecf