This is an automated email from the git hooks/post-receive script.

adconrad pushed a commit to branch glibc-2.23
in repository glibc.

commit 3227d76f137e5be7f19aa77c315bc962f3a5e59e
Author: Adam Conrad <adcon...@0c3.net>
Date:   Tue Mar 22 15:28:08 2016 -0600

    debian/patches/any/submitted-resolver-leak.diff: Drop, upstreamed.
---
 debian/changelog                                |  1 +
 debian/patches/any/submitted-resolver-leak.diff | 16 ----------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 14a144e..b071e55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ glibc (2.23-0experimental1) UNRELEASED; urgency=medium
 
   [ Aurelien Jarno ]
   * debian/patches/git-updates.diff: update from upstream stable branch.
+  * debian/patches/any/submitted-resolver-leak.diff: Drop, upstreamed.
   * debian/testsuite-xfail-debian.mk (powerpc) really mark
     tst-malloc-thread-exit as xfail.
   * debian/testsuite-xfail-debian.mk (ppc64) mark tst-malloc-thread-exit
diff --git a/debian/patches/any/submitted-resolver-leak.diff 
b/debian/patches/any/submitted-resolver-leak.diff
deleted file mode 100644
index f9dae65..0000000
--- a/debian/patches/any/submitted-resolver-leak.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-2016-02-09  Andreas Schwab  <sch...@suse.de>
-
-       * resolv/res_init.c (__res_iclose): Use statp->nscount instead of
-       statp->_u._ext.nscount as loop count.
-
---- a/resolv/res_init.c
-+++ b/resolv/res_init.c
-@@ -594,7 +594,7 @@ __res_iclose(res_state statp, bool free_addr) {
-               statp->_vcsock = -1;
-               statp->_flags &= ~(RES_F_VC | RES_F_CONN);
-       }
--      for (ns = 0; ns < statp->_u._ext.nscount; ns++)
-+      for (ns = 0; ns < statp->nscount; ns++)
-               if (statp->_u._ext.nsaddrs[ns]) {
-                       if (statp->_u._ext.nssocks[ns] != -1) {
-                               
close_not_cancel_no_status(statp->_u._ext.nssocks[ns]);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-glibc/glibc.git

Reply via email to