Merge version 2.25-3+rpi1 and 2.25-5 to produce 2.25-5+rpi1

diff --cc debian/changelog
index b43f0537e087c1fa9eac6d634b315185ab4e5810,c4da8fda1cb85be616a73b0e94230d537c0e8846..19a150159b3af1b6ee32ae4742cf03682fd1f586
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,51 +1,58 @@@
- glibc (2.25-3+rpi1) buster-staging; urgency=medium
++glibc (2.25-5+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2.25-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 29 Nov 2017 03:00:21 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 09 Dec 2017 01:37:56 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 27 Dec 2017 21:11:39 +0000
++
+ glibc (2.25-5) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * hurd-i386/git-rtld-access.diff: Fix spurious errno update.
+ 
+   [ Aurelien Jarno ]
+   * debian/rules.d/debhelper.mk: strip all *crt*.o files, unless
+     DEB_BUILD_OPTIONS contains nostrip.  Closes: #884524.
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix memory leak in ld.so (CVE-2017-1000408).  Closes: #884132.
+     - Fix buffer overflow in ld.so (CVE-2017-1000409).  Closes: #884133.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Sat, 16 Dec 2017 15:37:43 +0100
+ 
+ glibc (2.25-4) unstable; urgency=medium
+ 
+   [ Aurelien Jarno ]
+   * debian/patches/kfreebsd/local-sysdeps.diff: update to revision 6194 (from
+     glibc-bsd):
+     - Provide TCP_KEEPIDLE in netinet/tcp.h.  Closes: #881185.
+     - Fix FTBFS on kfreebsd-amd64.
+   * debian/control.in/libc: add conflicts with libc0.1-i686 on kfreebsd-i386
+     and libc6-i686 on i386, to make sure the transitional packages are not
+     kept when upgrading from stretch.
+   * debian/patches/any/local-ldso-disable-hwcap.diff: use __access_noerrno
+     instead of __access.  Closes: #877493.
+   * debian/rules, debian/rules.d/debhelper.mk: reverse the logic to build
+     libc6-dbg. Only fill it with files from the main libc and optimized
+     flavours. Other debugging symbols are available in the dbgsym packages.
+     Closes: #520680.
+   * debian/rules.d/build.mk: add /usr/local multi-arch paths to ld.so.conf
+     files.  Closes: #685519, #771934.
+   * debian/patches/any/git-any-ld.so-newline.diff: add missing newline after
+     "cannot allocate TLS data structures for initial thread".  Closes:
+     #776659.
+   * debian/glibc-source.filelist: update with the latest mips* symbol files.
+   * debian/patches/git-updates.diff: update from upstream stable branch:
+     - Fix SysV IPC on IA64.  Closes: #884194.
+ 
+   [ Samuel Thibault ]
+   * patches/hurd-i386/local-no-bootstrap-fs-access.diff: Refresh.
+   * patches/hurd-i386/git-rtld-access.diff: New patch.
+   * patches/hurd-i386/local-msg-nosignal.diff: Remove, now useless.
+   * testsuite-xfail-debian.mk: Update gnu-gnu according to git-updates.diff.
+   * control: Bump hurd-dev build-dep.
+   * libc0.3.symbols.hurd-i386: Update symbols accordingly.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Tue, 12 Dec 2017 20:21:48 +0100
  
  glibc (2.25-3) unstable; urgency=medium
  

diff --cc debian/rules
Simple merge