This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch glibc-2.26 in repository glibc.
commit 183bad663e0b29b5f6951fe657ea25fb68ecbec9 Author: Samuel Thibault <samuel.thiba...@ens-lyon.org> Date: Tue Sep 26 00:11:13 2017 +0000 hurd: Remove patch submitted-resolv.diff It is actually a bug in the TCP/IP stack, whose fix will fix these tests. --- debian/changelog | 1 - debian/patches/hurd-i386/submitted-resolv.diff | 37 -------------------------- debian/patches/series | 1 - debian/testsuite-xfail-debian.mk | 5 ++++ 4 files changed, 5 insertions(+), 39 deletions(-) diff --git a/debian/changelog b/debian/changelog index f10492c..c5a809a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,7 +76,6 @@ glibc (2.26-0experimental0) UNRELEASED; urgency=medium - patches/hurd-i386/cvs-truncate64.diff: Remove unused merged patch. - patches/hurd-i386/git-tst-udp-timeout.diff: New patch. - patches/hurd-i386/git-tst-udp-nonblocking.diff: New patch. - - patches/hurd-i386/submitted-resolv.diff: New patch. - patches/hurd-i386/unsubmitted-exp-hidden-jump.diff: New patch. - patches/hurd-i386/git-hidden-def.diff: New patch. - patches/hurd-i386/git-hidden-def.diff-2: New patch. diff --git a/debian/patches/hurd-i386/submitted-resolv.diff b/debian/patches/hurd-i386/submitted-resolv.diff deleted file mode 100644 index 901e386..0000000 --- a/debian/patches/hurd-i386/submitted-resolv.diff +++ /dev/null @@ -1,37 +0,0 @@ -server_thread_udp_process_one already takes care of calling sendto() -instead of xsendto to be able to ignore the case where the client has -closed the socket. Depending on the TCP/IP stack behavior, this error -could be notified later through recvfrom(), so we need to ignore it -there too. - -* support/resolv_test.c (server_thread_udp_process_one): Call recvfrom -instead of xrecvfrom, and ignore ECONNREFUSED errors. - -https://sourceware.org/ml/libc-alpha/2017-09/msg00420.html - -diff --git a/support/resolv_test.c b/support/resolv_test.c -index 1625dcf43a..c3325b89b1 100644 ---- a/support/resolv_test.c -+++ b/support/resolv_test.c -@@ -600,7 +600,7 @@ server_thread_udp_process_one (struct resolv_test *obj, int server_index) - unsigned char query[512]; - struct sockaddr_storage peer; - socklen_t peerlen = sizeof (peer); -- size_t length = xrecvfrom (obj->servers[server_index].socket_udp, -+ ssize_t length = recvfrom (obj->servers[server_index].socket_udp, - query, sizeof (query), 0, - (struct sockaddr *) &peer, &peerlen); - /* Check for termination. */ -@@ -613,6 +613,12 @@ server_thread_udp_process_one (struct resolv_test *obj, int server_index) - return false; - } - -+ if (length < 0) -+ { -+ /* The other end had closed the socket, and we are notified only now. */ -+ TEST_VERIFY_EXIT (errno == ECONNREFUSED); -+ return true; -+ } - - struct query_info qinfo; - parse_query (&qinfo, query, length); diff --git a/debian/patches/series b/debian/patches/series index 725815c..e31b276 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -155,7 +155,6 @@ hurd-i386/git-clone.diff hurd-i386/git-gethostname.diff hurd-i386/git-tst-udp-timeout.diff hurd-i386/git-tst-udp-nonblocking.diff -hurd-i386/submitted-resolv.diff hurd-i386/unsubmitted-exp-hidden-jump.diff hurd-i386/git-hidden-def.diff hurd-i386/git-hidden-def-2.diff diff --git a/debian/testsuite-xfail-debian.mk b/debian/testsuite-xfail-debian.mk index b2172b7..81e45a5 100644 --- a/debian/testsuite-xfail-debian.mk +++ b/debian/testsuite-xfail-debian.mk @@ -645,6 +645,11 @@ test-xfail-XPG42/sys/socket.h/linknamespace = yes test-xfail-XPG42/sys/wait.h/linknamespace = yes test-xfail-XPG42/unistd.h/linknamespace = yes test-xfail-XPG42/wordexp.h/linknamespace = yes + +# will be fixed in hurd >= 20170926 +test-xfail-tst-bug18665-tcp = yes +test-xfail-tst-resolv-basic = yes +test-xfail-tst-resolv-search = yes endif -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git