Processed: [bts-link] source package glibc

2015-09-17 Thread Debian Bug Tracking System 
Processing commands for cont...@bugs.debian.org:

> #
> # bts-link upstream status pull for source package glibc
> # see http://lists.debian.org/debian-devel-announce/2006/05/msg1.html
> #
> user bts-link-upstr...@lists.alioth.debian.org
Setting user to bts-link-upstr...@lists.alioth.debian.org (was 
bts-link-de...@lists.alioth.debian.org).
> # remote status report for #291293 (http://bugs.debian.org/291293)
> # Bug title: bash: German translation of "Alarm clock" is misleading
> #  * http://sourceware.org/bugzilla/show_bug.cgi?id=4404
> #  * remote status changed: WAITING -> RESOLVED
> #  * remote resolution changed: (?) -> FIXED
> #  * closed upstream
> tags 291293 + fixed-upstream
Bug #291293 [libc6] bash: German translation of "Alarm clock" is misleading
Added tag(s) fixed-upstream.
> usertags 291293 - status-WAITING
Usertags were: status-WAITING.
Usertags are now: .
> usertags 291293 + status-RESOLVED resolution-FIXED
There were no usertags set.
Usertags are now: status-RESOLVED resolution-FIXED.
> thanks
Stopping processing here.

Please contact me if you need assistance.
-- 
291293: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=291293
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

r6582 - in glibc-package/branches/glibc-2.22/debian: . patches patches/all patches/amd64 patches/any patches/arm patches/hppa patches/i386 patches/localedata patches/mips patches/powerpc

2015-09-17 Thread Adam Conrad 
Author: adconrad
Date: 2015-09-17 19:00:13 + (Thu, 17 Sep 2015)
New Revision: 6582

Removed:
   glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-UTF-8.diff
   
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-ldconfig-aux-cache.diff
   
glibc-package/branches/glibc-2.22/debian/patches/any/cvs-localplt-new-readelf.diff
   glibc-package/branches/glibc-2.22/debian/patches/any/cvs-logbl-accuracy.diff
   glibc-package/branches/glibc-2.22/debian/patches/any/cvs-make-typo.diff
   glibc-package/branches/glibc-2.22/debian/patches/any/cvs-vismain-pie.diff
   
glibc-package/branches/glibc-2.22/debian/patches/any/local-xfail-stdlib-linkns.diff
   glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-arm-sfi_breg.diff
   
glibc-package/branches/glibc-2.22/debian/patches/arm/cvs-memcpy-memmove-always-bx.diff
   glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-alloca-werror.diff
   glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu-r2.diff
   glibc-package/branches/glibc-2.22/debian/patches/hppa/cvs-fpu2.diff
   glibc-package/branches/glibc-2.22/debian/patches/hppa/local-fcntl-osync.diff
   glibc-package/branches/glibc-2.22/debian/patches/hppa/local-setcontext.diff
   
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-power7-strncpy.diff
   
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-feraiseexcept.diff
   glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-pow.diff
   glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrt.diff
   glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-sqrtf.diff
   
glibc-package/branches/glibc-2.22/debian/patches/powerpc/cvs-ppc-tabort-le.diff
Modified:
   glibc-package/branches/glibc-2.22/debian/changelog
   glibc-package/branches/glibc-2.22/debian/control
   glibc-package/branches/glibc-2.22/debian/copyright
   glibc-package/branches/glibc-2.22/debian/patches/all/local-alias-et_EE.diff
   
glibc-package/branches/glibc-2.22/debian/patches/amd64/local-blacklist-on-TSX-Haswell.diff
   
glibc-package/branches/glibc-2.22/debian/patches/any/local-libgcc-compat-ports.diff
   glibc-package/branches/glibc-2.22/debian/patches/any/local-libpic.diff
   glibc-package/branches/glibc-2.22/debian/patches/any/local-no-pagesize.diff
   
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-longdouble.diff
   
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-missing-etc-hosts.diff
   
glibc-package/branches/glibc-2.22/debian/patches/any/submitted-resolv-ipv6-nameservers.diff
   glibc-package/branches/glibc-2.22/debian/patches/git-updates.diff
   
glibc-package/branches/glibc-2.22/debian/patches/i386/submitted-i686-timing.diff
   
glibc-package/branches/glibc-2.22/debian/patches/localedata/local-all-no-archive.diff
   
glibc-package/branches/glibc-2.22/debian/patches/localedata/submitted-locale-bo.diff
   glibc-package/branches/glibc-2.22/debian/patches/mips/submitted-rld_map.diff
   glibc-package/branches/glibc-2.22/debian/patches/series
   glibc-package/branches/glibc-2.22/debian/symbols.wildcards
Log:
* New upstream release: version 2.22, with git updates up to 2015-09-17:
  - debian/patches/all/local-alias-UTF-8.diff: Fixed upstream.
  - debian/patches/any/cvs-ldconfig-aux-cache.diff: Upstreamed.
  - debian/patches/any/cvs-localplt-new-readelf.diff: Upstreamed.
  - debian/patches/any/cvs-logbl-accuracy.diff: Upstreamed.
  - debian/patches/any/cvs-make-typo.diff: Upstreamed.
  - debian/patches/any/cvs-vismain-pie.diff: Upstreamed.
  - debian/patches/any/local-xfail-stdlib-linkns.diff: Dropped.
  - debian/patches/arm/cvs-arm-sfi_breg.diff: Upstreamed.
  - debian/patches/arm/cvs-memcpy-memmove-always-bx.diff: Upstreamed.
  - debian/patches/hppa/cvs-alloca-werror.diff: Upstreamed.
  - debian/patches/hppa/cvs-fpu-r2.diff: Upstreamed.
  - debian/patches/hppa/cvs-fpu2.diff: Upstreamed.
  - debian/patches/hppa/local-fcntl-osync.diff: Fixed upstream.
  - debian/patches/hppa/local-setcontext.diff: Fixed upstream.
  - debian/patches/powerpc/cvs-power7-strncpy.diff: Upstreamed.
  - debian/patches/powerpc/cvs-ppc-feraiseexcept.diff: Upstreamed.
  - debian/patches/powerpc/cvs-ppc-pow.diff: Upstreamed.
  - debian/patches/powerpc/cvs-ppc-sqrt.diff: Upstreamed.
  - debian/patches/powerpc/cvs-ppc-sqrtf.diff: Upstreamed.
  - debian/patches/powerpc/cvs-ppc-tabort-le.diff: Upstreamed.
  - debian/patches/all/local-alias-et_EE.diff: Rebased.
  - debian/patches/amd64/local-blacklist-on-TSX-Haswell.diff: Rebased.
  - debian/patches/any/local-libgcc-compat-ports.diff: Rebased.
  - debian/patches/any/local-libpic.diff: Rebased.
  - debian/patches/any/local-no-pagesize.diff: Rebased.
  - debian/patches/any/submitted-longdouble.diff: Rebased.
  - debian/patches/any/submitted-missing-etc-hosts.diff: Rebased.
  - debian/patches/any/submitted-resolv-ipv6-nameservers.diff: Rebased.
  - debian/patches/i386/submitted-i686-timing.diff: Rebased.
  -

r6581 - glibc-package/branches

2015-09-17 Thread Adam Conrad 
Author: adconrad
Date: 2015-09-17 18:58:37 + (Thu, 17 Sep 2015)
New Revision: 6581

Added:
   glibc-package/branches/glibc-2.22/
Log:
Fork 2.21 branch to 2.22

r6585 - glibc-package/branches/glibc-2.22/debian/patches/hurd-i386

2015-09-17 Thread Samuel Thibault 
Author: sthibault
Date: 2015-09-18 01:19:34 + (Fri, 18 Sep 2015)
New Revision: 6585

Removed:
   
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/tg-af_local_strlen.diff
   
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/tg-select-EINTR.diff
Log:
really remove files

Deleted: 
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/tg-af_local_strlen.diff
===
--- 
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/tg-af_local_strlen.diff
  2015-09-17 23:53:19 UTC (rev 6584)
+++ 
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/tg-af_local_strlen.diff
  2015-09-18 01:19:34 UTC (rev 6585)
@@ -1,144 +0,0 @@
-From: Samuel Thibault 
-Subject: [PATCH] Fix connect/sendto/sendmsg into making sure to ignore bytes 
beyond sockaddr length
-
-2014-03-01  Samuel Thibault  
-
-Thanks Tanaka Akira for the report.
-
-* hurd/hurdsocket.h: New file, defines _hurd_sun_path_dupa which duplicates
-ADDR->sun_path with sockaddr LEN limitation.
-* sysdeps/mach/hurd/connect.c: Include 
-(__connect): Give result of _hurd_sun_path_dupa to name lookup.
-* sysdeps/mach/hurd/sendmsg.c: Likewise.
-* sysdeps/mach/hurd/sendto.c: Likewise.
-* sysdeps/mach/hurd/bind.c: Call _hurd_sun_path_dupa instead of implementing it
-by hand.
-
-Signed-off-by: Samuel Thibault 
-

- hurd/hurdsocket.h   |   22 ++
- sysdeps/mach/hurd/bind.c|8 +++-
- sysdeps/mach/hurd/connect.c |4 +++-
- sysdeps/mach/hurd/sendmsg.c |4 +++-
- sysdeps/mach/hurd/sendto.c  |4 +++-
- 5 files changed, 34 insertions(+), 8 deletions(-)
-
 /dev/null
-+++ b/hurd/hurdsocket.h
-@@ -0,0 +1,22 @@
-+/* Hurd-specific socket functions
-+   Copyright (C) 2013 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   .  */
-+
-+#include 
-+
-+#define _hurd_sun_path_dupa(__addr, __len) \
-+  strndupa ((__addr)->sun_path, (__len) - offsetof (struct sockaddr_un, 
sun_path))
 a/sysdeps/mach/hurd/bind.c
-+++ b/sysdeps/mach/hurd/bind.c
-@@ -25,7 +25,7 @@
- #include 
- #include 
- #include 
--#include 
-+#include "hurd/hurdsocket.h"
- 
- /* Give the socket FD the local address ADDR (which is LEN bytes long).  */
- int
-@@ -37,13 +37,11 @@ __bind  (int fd, __CONST_SOCKADDR_ARG ad
- 
-   if (addr->sun_family == AF_LOCAL)
- {
-+  char *name = _hurd_sun_path_dupa (addr, len);
-   /* For the local domain, we must create a node in the filesystem
-using the ifsock translator and then fetch the address from it.  */
-   file_t dir, node, ifsock;
--  char name[len - offsetof (struct sockaddr_un, sun_path) + 1], *n;
--
--  strncpy (name, addr->sun_path, sizeof name - 1);
--  name[sizeof name - 1] = '\0'; /* Make sure */
-+  char *n;
- 
-   dir = __file_name_split (name, );
-   if (dir == MACH_PORT_NULL)
 a/sysdeps/mach/hurd/connect.c
-+++ b/sysdeps/mach/hurd/connect.c
-@@ -22,6 +22,7 @@
- #include 
- #include 
- #include 
-+#include "hurd/hurdsocket.h"
- 
- /* Open a connection on socket FD to peer at ADDR (which LEN bytes long).
-For connectionless socket types, just set the default address to send to
-@@ -36,9 +37,10 @@ __connect (int fd, __CONST_SOCKADDR_ARG
- 
-   if (addr->sun_family == AF_LOCAL)
- {
-+  char *name = _hurd_sun_path_dupa (addr, len);
-   /* For the local domain, we must look up the name as a file and talk
-to it with the ifsock protocol.  */
--  file_t file = __file_name_lookup (addr->sun_path, 0, 0);
-+  file_t file = __file_name_lookup (name, 0, 0);
-   if (file == MACH_PORT_NULL)
-   return -1;
-   err = __ifsock_getsockaddr (file, );
 a/sysdeps/mach/hurd/sendmsg.c
-+++ b/sysdeps/mach/hurd/sendmsg.c
-@@ -24,6 +24,7 @@
- #include 
- #include 
- #include 
-+#include "hurd/hurdsocket.h"
- 
- /* Send a message described MESSAGE on socket FD.
-Returns the number of bytes sent, or -1 for errors.  */
-@@ -150,9 +151,10 @@ __libc_sendmsg (int fd, const struct msg
- {
-   if (addr->sun_family == AF_LOCAL)
-   {
-+char *name = _hurd_sun_path_dupa (addr, addr_len);
- /* For the local domain,

r6586 - in glibc-package/branches/glibc-2.22/debian: . patches patches/hurd-i386

2015-09-17 Thread Samuel Thibault 
Author: sthibault
Date: 2015-09-18 01:20:02 + (Fri, 18 Sep 2015)
New Revision: 6586

Added:
   glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-csu_crt0.diff
   glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-s_scalbn.diff
Modified:
   glibc-package/branches/glibc-2.22/debian/changelog
   glibc-package/branches/glibc-2.22/debian/patches/series
Log:
hurd-i386/cvs-csu_crt0.diff: New patch, fixes gcrt0.o build.
hurd-i386/cvs-s_scalbn.diff: New patch, fixes s_scalbn.S build.


Modified: glibc-package/branches/glibc-2.22/debian/changelog
===
--- glibc-package/branches/glibc-2.22/debian/changelog  2015-09-18 01:19:34 UTC 
(rev 6585)
+++ glibc-package/branches/glibc-2.22/debian/changelog  2015-09-18 01:20:02 UTC 
(rev 6586)
@@ -54,6 +54,10 @@
   * debian/patches/hurd-i386/cvs-warnings.diff: Upstreamed.
   * debian/patches/hurd-i386/cvs-check-local-headers.diff: Upstreamed.
   * debian/patches/hurd-i386/cvs-mlock.diff: Upstreamed.
+  * debian/patches/hurd-i386/cvs-csu_crt0.diff: New patch, fixes gcrt0.o
+build.
+  * debian/patches/hurd-i386/cvs-s_scalbn.diff: New patch, fixes s_scalbn.S
+build.
 
  -- Adam Conrad   Tue, 15 Sep 2015 17:57:41 -0600
 

Added: 
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-csu_crt0.diff
===
--- 
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-csu_crt0.diff
(rev 0)
+++ 
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-csu_crt0.diff
2015-09-18 01:20:02 UTC (rev 6586)
@@ -0,0 +1,49 @@
+commit edd4cbcf83fb466dd8a1b5d63d55b1fea96356fe
+Author: Samuel Thibault 
+Date:   Fri Aug 7 01:38:39 2015 +0200
+
+Fix gcrt0.o compilation
+
+When static-start-installed-name is different from
+start-installed-name, we must not use the shared objects.
+
+* csu/Makefile
+(extra-objs): Add gmon-start.o when building shared library and
+$(static-start-installed-name) is different from
+$(start-installed-name).
+$(objpfx)g$(static-start-installed-name): When building shared
+library and $(static-start-installed-name) is different from
+$(static-start-installed-name), revert to non-shared rule,
+i.e. using $(objpfx)% and gmon-start.o.
+
+diff --git a/csu/Makefile b/csu/Makefile
+index 9f0855a..4df5d10 100644
+--- a/csu/Makefile
 b/csu/Makefile
+@@ -47,6 +47,9 @@ tests-static := tst-empty
+ 
+ ifeq (yes,$(build-shared))
+ extra-objs += S$(start-installed-name) gmon-start.os
++ifneq ($(start-installed-name),$(static-start-installed-name))
++extra-objs += gmon-start.o
++endif
+ install-lib += S$(start-installed-name)
+ generated += start.os
+ else
+@@ -98,10 +101,14 @@ endif
+ # startfile with gmon-start.o, which defines a constructor function
+ # to turn on profiling code at startup.
+ ifeq (yes,$(build-shared))
+-$(addprefix $(objpfx),$(sort g$(start-installed-name) \
+-   g$(static-start-installed-name))): \
++$(objpfx)g$(start-installed-name): \
+   $(objpfx)g%: $(objpfx)S% $(objpfx)gmon-start.os
+   $(link-relocatable)
++ifneq ($(start-installed-name),$(static-start-installed-name))
++$(objpfx)g$(static-start-installed-name): \
++  $(objpfx)g%: $(objpfx)% $(objpfx)gmon-start.o
++  $(link-relocatable)
++endif
+ else
+ $(addprefix $(objpfx),$(sort g$(start-installed-name) \
+g$(static-start-installed-name))): \

Added: 
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-s_scalbn.diff
===
--- 
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-s_scalbn.diff
(rev 0)
+++ 
glibc-package/branches/glibc-2.22/debian/patches/hurd-i386/cvs-s_scalbn.diff
2015-09-18 01:20:02 UTC (rev 6586)
@@ -0,0 +1,21 @@
+commit 86955bf62e5690f65995ee8055b1ed529f80842b
+Author: Samuel Thibault 
+Date:   Fri Aug 7 09:53:56 2015 +0200
+
+Fix sysdeps/i386/fpu/s_scalbn.S build
+
+* math/Versions (libc: GLIBC_2_22): New (empty) version set.
+
+diff --git a/math/Versions b/math/Versions
+index 513ab14..5ab9123 100644
+--- a/math/Versions
 b/math/Versions
+@@ -29,6 +29,8 @@ libc {
+ # s*
+ scalbln; scalblnf; scalblnl;
+   }
++  GLIBC_2.22 {
++  }
+ }
+ 
+ libm {

Modified: glibc-package/branches/glibc-2.22/debian/patches/series
===
--- glibc-package/branches/glibc-2.22/debian/patches/series 2015-09-18 
01:19:34 UTC (rev 6585)
+++ glibc-package/branches/glibc-2.22/debian/patches/series 2015-09-18 
01:20:02 UTC (rev 6586)
@@ -134,6 +134,8 @@
 hurd-i386/tg-sysheaders.diff
 hurd-i386/cvs-bootstrap.diff
 hurd-i386/local-bootstrap.diff
+hurd-i386/cvs-csu_crt0.diff

r6584 - glibc-package/branches/glibc-2.22/debian

2015-09-17 Thread Samuel Thibault 
Author: sthibault
Date: 2015-09-17 23:53:19 + (Thu, 17 Sep 2015)
New Revision: 6584

Modified:
   glibc-package/branches/glibc-2.22/debian/changelog
Log:
Fix credits :)

Modified: glibc-package/branches/glibc-2.22/debian/changelog
===
--- glibc-package/branches/glibc-2.22/debian/changelog  2015-09-17 23:52:00 UTC 
(rev 6583)
+++ glibc-package/branches/glibc-2.22/debian/changelog  2015-09-17 23:53:19 UTC 
(rev 6584)
@@ -1,5 +1,6 @@
 glibc (2.22-0experimental0) UNRELEASED; urgency=medium
 
+  [ Adam Conrad ]
   * New upstream release: version 2.22, with git updates up to 2015-09-17:
 - debian/patches/all/local-alias-UTF-8.diff: Fixed upstream.
 - debian/patches/any/cvs-ldconfig-aux-cache.diff: Upstreamed.
@@ -33,25 +34,27 @@
 - debian/patches/localedata/local-all-no-archive.diff: Rebased.
 - debian/patches/localedata/submitted-locale-bo.diff: Rebased.
 - debian/patches/mips/submitted-rld_map.diff: Rebased.
-- debian/patches/hurd-i386/tg-tls.diff: Rebased.
-- debian/patches/hurd-i386/tg-tls-threadvar.diff: Rebased.
-- debian/patches/hurd-i386/tg-ioctl-base-types.diff: Upstreamed.
-- debian/patches/hurd-i386/tg-extern_inline.diff: Rebased.
-- debian/patches/hurd-i386/tg-aio_misc.diff: Upstreamed.
-- debian/patches/hurd-i386/tg-chflags.diff: Upstreamed.
-- debian/patches/hurd-i386/tg-select-EINTR.diff: Upstreamed.
-- debian/patches/hurd-i386/tg-af_local_strlen.diff: Upstreamed.
-- debian/patches/hurd-i386/tg-nice.diff: Upstreamed.
-- debian/patches/hurd-i386/tg-nfds-poll.diff: Upstreamed.
-- debian/patches/hurd-i386/tg-sigstate_locking.diff: Upstreamed.
-- debian/patches/hurd-i386/tg-mmap_file_prot_none_fix.diff: Upstreamed.
-- debian/patches/hurd-i386/cvs-unwind-resume.diff: Upstreamed.
-- debian/patches/hurd-i386/cvs-libc-modules.h.diff: Upstreamed.
-- debian/patches/hurd-i386/cvs-warnings.diff: Upstreamed.
-- debian/patches/hurd-i386/cvs-check-local-headers.diff: Upstreamed.
-- debian/patches/hurd-i386/cvs-mlock.diff: Upstreamed.
   * debian/{control,symbols.wildcards,copyright}: Updated strings for 2.22.
 
+  [ Samuel Thibault ]
+  * debian/patches/hurd-i386/tg-tls.diff: Rebased.
+  * debian/patches/hurd-i386/tg-tls-threadvar.diff: Rebased.
+  * debian/patches/hurd-i386/tg-ioctl-base-types.diff: Upstreamed.
+  * debian/patches/hurd-i386/tg-extern_inline.diff: Rebased.
+  * debian/patches/hurd-i386/tg-aio_misc.diff: Upstreamed.
+  * debian/patches/hurd-i386/tg-chflags.diff: Upstreamed.
+  * debian/patches/hurd-i386/tg-select-EINTR.diff: Upstreamed.
+  * debian/patches/hurd-i386/tg-af_local_strlen.diff: Upstreamed.
+  * debian/patches/hurd-i386/tg-nice.diff: Upstreamed.
+  * debian/patches/hurd-i386/tg-nfds-poll.diff: Upstreamed.
+  * debian/patches/hurd-i386/tg-sigstate_locking.diff: Upstreamed.
+  * debian/patches/hurd-i386/tg-mmap_file_prot_none_fix.diff: Upstreamed.
+  * debian/patches/hurd-i386/cvs-unwind-resume.diff: Upstreamed.
+  * debian/patches/hurd-i386/cvs-libc-modules.h.diff: Upstreamed.
+  * debian/patches/hurd-i386/cvs-warnings.diff: Upstreamed.
+  * debian/patches/hurd-i386/cvs-check-local-headers.diff: Upstreamed.
+  * debian/patches/hurd-i386/cvs-mlock.diff: Upstreamed.
+
  -- Adam Conrad   Tue, 15 Sep 2015 17:57:41 -0600
 
 glibc (2.21-0experimental2) UNRELEASED; urgency=medium

r6587 - glibc-package/branches/glibc-2.22/debian/patches/mips

2015-09-17 Thread Adam Conrad 
Author: adconrad
Date: 2015-09-18 04:20:05 + (Fri, 18 Sep 2015)
New Revision: 6587

Modified:
   glibc-package/branches/glibc-2.22/debian/patches/mips/submitted-rld_map.diff
Log:
Fix mismatched brackets in mips/submitted-rld_map.diff

Modified: 
glibc-package/branches/glibc-2.22/debian/patches/mips/submitted-rld_map.diff
===
--- 
glibc-package/branches/glibc-2.22/debian/patches/mips/submitted-rld_map.diff
2015-09-18 01:20:02 UTC (rev 6586)
+++ 
glibc-package/branches/glibc-2.22/debian/patches/mips/submitted-rld_map.diff
2015-09-18 04:20:05 UTC (rev 6587)
@@ -14,7 +14,7 @@
 *(ElfW(Addr) *)ptr = (ElfW(Addr)) (r); \
 } \
 - else if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
-+ else if ((l)->l_info[DT_MIPS (RLD_MAP)]) && \
++ else if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
 +   (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
 *(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
 (ElfW(Addr)) (r); \