[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[glibc] 01/01: Merge branch 'sid' into glibc-2.23



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

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

commit beb727253aab3c3597b7afb4a68374d7d351f54d
Merge: 158369b efe6e23
Author: Aurelien Jarno <aurelien@aurel32.net>
Date:   Thu May 12 13:01:04 2016 +0200

    Merge branch 'sid' into glibc-2.23

 debian/changelog                                   |  54 ++++++++
 debian/control                                     |  83 ++++--------
 debian/control.in/libc                             |  10 +-
 debian/control.in/main                             |   5 +-
 debian/control.in/opt                              |  38 ------
 .../arm/unsubmitted-ldconfig-cache-abi.diff        |   4 +-
 debian/patches/hurd-i386/cvs-IPV6_PKTINFO.diff     | 103 ++++++++++++++
 debian/patches/hurd-i386/cvs-gprof-tick.diff       |  22 +++
 debian/patches/i386/submitted-i686-timing.diff     | 149 ---------------------
 debian/patches/kfreebsd/local-sysdeps.diff         |  59 ++++----
 debian/patches/series                              |   3 +-
 debian/rules                                       |  14 +-
 debian/sysdeps/hurd-i386.mk                        |  13 --
 debian/sysdeps/i386.mk                             |  12 --
 debian/sysdeps/kfreebsd-i386.mk                    |  11 --
 debian/testsuite-xfail-debian.mk                   |   9 +-
 16 files changed, 262 insertions(+), 327 deletions(-)

diff --cc debian/changelog
index 4152409,970fec2..8ceb2c2
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,153 -1,57 +1,207 @@@
 +glibc (2.23-0experimental3) UNRELEASED; urgency=medium
 +
 +  * 
 +
 + -- Aurelien Jarno <aurel32@debian.org>  Thu, 14 Apr 2016 15:08:27 +0200
 +
 +glibc (2.23-0experimental2) experimental; urgency=medium
 +
 +  [ Aurelien Jarno ]
 +  * debian/patches/git-updates.diff: update from upstream stable branch.
 +  * patches/kfreebsd/local-fbtl.diff: update to revision 5973 (from
 +    glibc-bsd).
 +  * debian/rules, debian/rules.d/build.mk: rename localedir into complocaledir
 +    following upstream change.
 +  * debian/patches/local-allocalim-header.diff: drop, obsolete.
 +  * debian/patches/any/local-no-pagesize.diff: drop, obsolete.
 +
 +  [ Adam Conrad ]
 +  * debian/testsuite-xfail-debian.mk: Also allow tst-malloc-thread-fail to
 +    fail where we've already done so for test-xfail-tst-malloc-thread-exit.
 +
 + -- Aurelien Jarno <aurel32@debian.org>  Thu, 14 Apr 2016 14:20:30 +0200
 +
 +glibc (2.23-0experimental1) experimental; urgency=medium
 +
 +  [ Aurelien Jarno ]
 +  * debian/patches/git-updates.diff: update from upstream stable branch.
 +  * 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
 +    test as xfail, it is a known issue and not a regression.
 +  * patches/kfreebsd/local-fbtl.diff: update to revision 5969 (from
 +    glibc-bsd).
 +  * debian/patches/kfreebsd/local-tst-malloc-fbtl.diff: drop, obsoleted by
 +    hurd-i386/cvs-libpthread.so.diff.
 +  * debian/patches/kfreebsd/local-tst-unique.diff: disable tst-unique* on
 +    GNU/kFreeBSD, as they are not supported by the FreeBSD ELF OSABI.
 +  * debian/patches/alpha/submitted-fts64.diff: new patch to fix the new fts64
 +    function on alpha.
 +
 +  [ Samuel Thibault ]
 +  * hurd-i386/cvs-libpthread.diff: More updates to glibc-2.23.
 +  * hurd-i386/cvs-openat.diff: Fix __openat prototype.
 +  * hurd-i386/cvs-gai_sigqueue.diff: Fix gai_sigqueue prototype.
 +  * hurd-i386/cvs-aio_sigqueue.diff: Fix aio_sigqueue prototype.
 +  * hurd-i386/cvs-libpthread.diff: Separate 2.23 changes to...
 +  * hurd-i386/cvs-libpthread-2.23.diff: ... separate patch.
 +  * hurd-i386/cvs-libpthread.so.diff: Fix building malloc tests.
 +  * testsuite-xfail-debian.mk: Skip test which just overflows memory.
 +  * hurd-i386/cvs-pt-kill.diff: Fix pthread_kill locking.
 +  * hurd-i386/cvs-open.diff: Fix __open in ld.so, thus fixing dlopen().
 +  * hurd-i386/cvs-c++-types.diff: Add expected c++-types.data.
 +  * hurd-i386/local-ihash-use.diff: Note that libpthread uses ihash.h.
 +  * testsuite-xfail-debian.mk: Add failing new tests. Disable the problematic
 +    test-lfs test.
 +  * hurd-i386/local-versions.diff: New patch to fix symbol version.
 +
 +  [ Adam Conrad ]
 +  * debian/patches/any/cvs-tst-malloc-thread-exit.diff: Backport fix from
 +    upstream to make tst-malloc-thread-exit use fewer system resources.
 +  * debian/debhelper.in/locales.config: Make default_environment_locale
 +    get preseeded correctly both with and without /etc/default/locale.
 +  * debian/control.in/i386: Remove list of Breaks that predate oldstable.
 +  * debian/control.in/*: Drop long obsolete file overlap Breaks/Replaces.
 +
 + -- Aurelien Jarno <aurel32@debian.org>  Thu, 24 Mar 2016 00:21:05 +0100
 +
 +glibc (2.23-0experimental0) experimental; urgency=medium
 +
 +  [ Aurelien Jarno ]
 +  * New upstream release: version 2.23, with git updates up to 2016-03-12:
 +    - Fix German translation of "Alarm clock".  Closes: #291293.
 +    - Fix strtol in Turkish locales.  Closes: #458611.
 +    - Add LFS support for fts functions.  Closes: #534521.
 +    - Fix build with GCC 6.  Closes: #811574.
 +    - Fix unbounded stack allocation in nan* functions (CVE-2014-9761).
 +      Closes: #813187.
 +    - debian/patches/localedata/locale-ku_TR.diff: rebased.
 +    - debian/patches/localedata/fix-lang.diff: upstreamed.
 +    - debian/patches/localedata/first_weekday.diff: rebased.
 +    - debian/patches/localedata/locale-nb_NO.diff: upstreamed.
 +    - debian/patches/localedata/cvs-bg_BG-t_fmt.diff: upstreamed.
 +    - debian/patches/alpha/local-string-functions.diff: rebased.
 +    - debian/patches/amd64/local-blacklist-for-Intel-TSX.diff: rebased.
 +    - debian/patches/arm/local-ioperm.diff: dropped.
 +    - debian/patches/hppa/cvs-allocatestack-stacktop.diff: upstreamed.
 +    - debian/patches/hppa/local-pthread_spin_unlock.diff: upstreamed.
 +    - debian/patches/hppa/submitted-mathdef.diff: upstreamed.
 +    - debian/patches/hppa/cvs-update-mman.h.diff: upstreamed.
 +    - debian/patches/hppa/submitted-dladdr.diff: upstreamed.
 +    - debian/patches/hurd-i386/local-enable-ldconfig.diff: rebased.
 +    - debian/patches/hurd-i386/tg-tls.diff: rebased.
 +    - debian/patches/hurd-i386/tg-tls-threadvar.diff: rebased.
 +    - debian/patches/hurd-i386/tg-hurdsig-fixes.diff: rebased.
 +    - debian/patches/hurd-i386/tg-hurdsig-global-dispositions.diff: rebased.
 +    - debian/patches/hurd-i386/cvs-libpthread.diff: updated.
 +    - debian/patches/hurd-i386/unsubmitted-gnumach.defs.diff: rebased.
 +    - debian/patches/hurd-i386/submitted-fork_port_leak.diff: upstreamed.
 +    - debian/patches/hurd-i386/tg-libc_getspecific.diff: rebased.
 +    - debian/patches/hurd-i386/cvs-libpthread-libc-lockP.diff: upstreamed.
 +    - debian/patches/hurd-i386/tg-mmap32th_bit.diff: upstreamed.
 +    - debian/patches/hurd-i386/tg-sysheaders.diff: upstreamed.
 +    - debian/patches/hurd-i386/cvs-bootstrap.diff: upstreamed.
 +    - debian/patches/hurd-i386/cvs-cache-mach_host_self.diff: upstreamed.
 +    - debian/patches/hurd-i386/cvs-csu_crt0.diff: upstreamed.
 +    - debian/patches/hurd-i386/cvs-s_scalbn.diff: upstreamed.
 +    - debian/patches/hurd-i386/local-mach_print.diff: rebased.
 +    - debian/patches/hurd-i386/cvs-hidden.diff: rebased.
 +    - debian/patches/hurd-i386/cvs-O_DIRECTORY.diff: upstreamed.
 +    - debian/patches/hurd-i386/cvs-raise-longjump.diff: upstreamed.
 +    - debian/patches/i386/local-i386-ulps.diff: dropped.
 +    - debian/patches/kfreebsd/local-scripts.diff: rebased.
 +    - debian/patches/m68k/submitted-gcc34-seccomment.diff: rebased.
 +    - debian/patches/mips/cvs-testsuite-o32-fp.diff: upstreamed.
 +    - debian/patches/powerpc/local-powerpc8xx-dcbz.diff: rebased.
 +    - debian/patches/sh4/local-fpscr_values.diff: rebased.
 +    - debian/patches/any/local-bindresvport_blacklist.diff: rebased.
 +    - debian/patches/any/local-libgcc-compat-main.diff: rebased.
 +    - debian/patches/any/local-libgcc-compat-abilists.diff: rebased.
 +    - debian/patches/any/local-mktemp.diff: upstreamed.
 +    - debian/patches/any/cvs-stdio-lock.diff: upstreamed.
 +    - debian/patches/any/local-tcsetaddr.diff: rebased.
 +    - debian/patches/any/local-tst-mktime2.diff: rebased.
 +    - debian/patches/any/submitted-nis-netgrp.diff: upstreamed.
 +    - debian/patches/any/submitted-longdouble.diff: rebased.
 +    - debian/patches/any/local-dynamic-resolvconf.diff: rebased.
 +    - debian/patches/any/local-static-dlopen-search-path.diff: upstreamed.
 +    - debian/patches/any/local-math-logb.diff: upstreamed.
 +    - debian/patches/any/cvs-gawk-gensub.diff: upstreamed.
 +    - debian/patches/any/cvs-grantpt-namespace.diff: upstreamed.
 +    - debian/patches/any/cvs-grantpt-pty-owner.diff: upstreamed.
 +    - debian/patches/any/cvs-bits-libc-stdio-lock.diff: upstreamed.
 +    - debian/patches/any/submitted-hle-checking-mutex.diff: upstreamed.
 +    - debian/{control,symbols.wildcards,copyright}: Updated strings for 2.23.
 +    - debian/patches/kfreebsd/local-undef-glibc.diff: rebased.
 +    - debian/patches/kfreebsd/local-tst-malloc-backtrace.diff: rebased,
 +      renamed into local-tst-malloc-fbtl.diff.
 +    - debian/patches/hurd-i386/submitted-net.diff: rebased.
 +    - debian/patches/hurd-i386/tg-bits_atomic.h_multiple_threads.diff:
 +      rebased.
 +    - debian/patches/hurd-i386/submitted-handle-eprototype.diff: dropped.
 +  * debian/testsuite-xfail-debian.mk (powerpc) mark tst-malloc-thread-fail
 +    test as xfail, it is a known issue and not a regression.
 +  * debian/testsuite-xfail-debian.mk (mipsel): mark a few math tests are
 +    failing, due to a bug in the Loongson 3 FPU.
 +  * patches/kfreebsd/local-fbtl.diff: update to revision 5940 (from
 +    glibc-bsd).
 +
 + -- Aurelien Jarno <aurel32@debian.org>  Sun, 13 Mar 2016 19:22:45 +0100
 +
+ glibc (2.22-9) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * hurd-i386/cvs-libpthread.so.diff: Fix building malloc tests.
+   * debian/testsuite-xfail-debian.mk: Update LFS tests.
+ 
+   [ Aurelien Jarno ]
+   * debian/testsuite-xfail-debian.mk: drop check on i586 flavours.
+   * debian/patches/kfreebsd/local-tst-malloc-backtrace.diff: drop, obsoleted
+     by hurd-i386/cvs-libpthread.so.diff.
+   * debian/patches/arm/unsubmitted-ldconfig-cache-abi.diff: correctly apply
+     patch. Really fix #822489.
+   * control.in/main: Bump Standards-Version to 3.9.8 (no changes).
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Thu, 12 May 2016 12:55:01 +0200
+ 
+ glibc (2.22-8) unstable; urgency=medium
+ 
+   [ Samuel Thibault ]
+   * hurd-i386/cvs-gprof-tick.diff: Cherry-pick from upstream to fix gprof
+     timing.
+   * hurd-i386/cvs-IPV6_PKTINFO.diff: Cherry-pick from upstream to fix
+     IPV6_*PKT* macros.
+ 
+   [ Aurelien Jarno ]
+   * Update from upstream stable branch:
+     - Fix a buffer overflow in the glob function (CVE-2016-1234).
+     - Fix a stack overflow in getaddrinfo function (CVE-2016-3706).
+     - Fix nss_hesiod breakage.  Closes: #821358.
+   * patches/kfreebsd/local-sysdeps.diff: update to revision 6051 (from
+     glibc-bsd) to fix FTBFS and provide PT_FOLLOW_FORK in sys/ptrace.h.
+     Closes: #822143, #823387.
+   * patches/arm/unsubmitted-ldconfig-cache-abi.diff: apply fix from Steve
+     McIntyre to fix an armhf ABI detection crash in ldconfig on arm64.
+     Closes: #822489.
+   * debian/control.in/main: upgrade breaks on binutils. This is plainly
+     wrong though, glibc should not be a special case: either we don't
+     support partial upgrades or we do that for all libraries. With that
+     let's hope people will stop reporting bugs, sigh.  Closes: #819165.
+   * Drop libc*-i686 packages as GCC now defaults to i686:
+     - debian/control: drop packages, add provides and build-depends on
+       g++-5 (>= 5.3.1-17) and dpkg-dev (>= 1.18.7).
+     - debian/sysdeps/hurd-i386.mk: stop building libc0.3-i686. Use the
+       default compiler options to build libc0.3-xen.
+     - debian/sysdeps/i386.mk: stop building libc6-i686.
+     - debian/sysdeps/kfreebsd-i386.mk: drop.
+     - debian/patches/i386/submitted-i686-timing.diff: drop.  Closes:
+       #218519.
+ 
+   [ Adam Conrad ]
+   * debian/control.in/libc: Force i686 variants off the system on upgrade.
+ 
+  -- Aurelien Jarno <aurel32@debian.org>  Wed, 11 May 2016 23:39:05 +0200
+ 
  glibc (2.22-7) unstable; urgency=medium
  
    [ Samuel Thibault ]
diff --cc debian/control
index 1fecf8f,a6e1350..d3a6d88
--- a/debian/control
+++ b/debian/control
@@@ -11,7 -11,8 +11,8 @@@ Build-Depends: gettext, dpkg-dev (>= 1.
   kfreebsd-kernel-headers [kfreebsd-any],
   binutils (>= 2.21),
   g++-5, g++-5-multilib [amd64 i386 kfreebsd-amd64 mips mipsel mipsn32 mipsn32el mips64 mips64el powerpc ppc64 s390x sparc sparc64 x32],
+  g++-5 (>= 5.3.1-17) [hurd-i386 i386 kfreebsd-i386],
 - libc-bin (>= 2.22) <cross>
 + libc-bin (>= 2.23) <cross>
  Build-Depends-Indep: perl, po-debconf (>= 1.0)
  Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
  Uploaders: Clint Adams <clint@debian.org>, Aurelien Jarno <aurel32@debian.org>, Adam Conrad <adconrad@0c3.net>, Samuel Thibault <sthibault@debian.org>
@@@ -161,13 -165,15 +162,15 @@@ Section: lib
  Priority: required
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
- Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] 
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
- Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
- Conflicts: libc6-loongson2f [mipsel]
+ Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+ Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
 -Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
 +Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
+           libc0.1-i686 [kfreebsd-i386],
+           libc0.3-i686 [hurd-i386],
+           libc6-i686 [i386],
            libc6-x32 [x32],
            libc0.1-i386 [kfreebsd-i386],
            libc6-powerpc [powerpc],
@@@ -247,13 -253,15 +250,15 @@@ Section: lib
  Priority: required
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
- Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] 
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
- Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
- Conflicts: libc6-loongson2f [mipsel]
+ Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+ Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
 -Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
 +Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
+           libc0.1-i686 [kfreebsd-i386],
+           libc0.3-i686 [hurd-i386],
+           libc6-i686 [i386],
            libc6-x32 [x32],
            libc0.1-i386 [kfreebsd-i386],
            libc6-powerpc [powerpc],
@@@ -333,13 -341,15 +338,15 @@@ Section: lib
  Priority: required
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
- Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] 
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
- Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
- Conflicts: libc6-loongson2f [mipsel]
+ Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+ Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
 -Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
 +Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
+           libc0.1-i686 [kfreebsd-i386],
+           libc0.3-i686 [hurd-i386],
+           libc6-i686 [i386],
            libc6-x32 [x32],
            libc0.1-i386 [kfreebsd-i386],
            libc6-powerpc [powerpc],
@@@ -419,13 -429,15 +426,15 @@@ Section: lib
  Priority: required
  Multi-Arch: same
  Depends: ${shlibs:Depends}, ${libgcc:Depends}
- Recommends: libc6-i686 [i386], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386] 
  Suggests: glibc-doc, debconf | debconf-2.0, libc-l10n, locales [!hurd-i386]
- Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64]
- Conflicts: libc6-loongson2f [mipsel]
+ Provides: ${locale-compat:Depends}, libc6-sparcv9b [sparc sparc64], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
+ Conflicts: libc6-loongson2f [mipsel], libc0.1-i686 [kfreebsd-i386], libc0.3-i686 [hurd-i386], libc6-i686 [i386]
 -Breaks: nscd (<< 2.22), locales (<< 2.22), locales-all (<< 2.22), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
 +Breaks: nscd (<< 2.23), locales (<< 2.23), locales-all (<< 2.23), lsb-core (<= 3.2-27) [amd64 ppc64 sparc64], libx11-6 (<< 1.1.4-2) [hurd-i386], libpthread-stubs0 (<< 0.3-4) [hurd-i386], hurd (<< 1:0.5.git20140203-1), libtirpc1 (<< 0.2.3)
  Replaces: libc6-amd64 [amd64],
            libc6-i386 [i386],
+           libc0.1-i686 [kfreebsd-i386],
+           libc0.3-i686 [hurd-i386],
+           libc6-i686 [i386],
            libc6-x32 [x32],
            libc0.1-i386 [kfreebsd-i386],
            libc6-powerpc [powerpc],
diff --cc debian/patches/series
index e36a3f7,bc30ebc..85aeac3
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -149,7 -160,7 +151,6 @@@ hurd-i386/cvs-IPV6_PKTINFO.dif
  i386/local-biarch.diff
  i386/local-cmov.diff
  i386/local-cpuid-level2.diff
- i386/submitted-i686-timing.diff
 -i386/local-i386-ulps.diff
  i386/unsubmitted-quiet-ldconfig.diff
  
  kfreebsd/submitted-waitid.diff

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


Reply to: