[glibc] 01/01: Update hurd-i386 specific patches
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 cffca8385e7acb9c55ef23fa4547182737572f43
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Sun Mar 13 13:47:45 2016 +0100
Update hurd-i386 specific patches
---
debian/changelog | 4 +
.../hurd-i386/submitted-handle-eprototype.diff | 117 ---------------------
debian/patches/hurd-i386/submitted-net.diff | 26 ++---
.../tg-bits_atomic.h_multiple_threads.diff | 34 +++---
debian/patches/series.hurd-i386 | 1 -
debian/patches/series.kfreebsd-amd64 | 2 +-
6 files changed, 35 insertions(+), 149 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 41fcac6..671acab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -66,6 +66,10 @@ glibc (2.23-0experimental0) UNRELEASED; urgency=medium
- 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
diff --git a/debian/patches/hurd-i386/submitted-handle-eprototype.diff b/debian/patches/hurd-i386/submitted-handle-eprototype.diff
deleted file mode 100644
index b7fa694..0000000
--- a/debian/patches/hurd-i386/submitted-handle-eprototype.diff
+++ /dev/null
@@ -1,117 +0,0 @@
-http://sourceware.org/ml/libc-alpha/2013-02/msg00092.html
-
-From: Pino Toscano <toscano dot pino at tiscali dot it>
-To: libc-alpha at sourceware dot org
-Subject: [PATCH] handle EPROTOTYPE for socket invocations with SOCK_* flags
-Date: Wed, 6 Feb 2013 20:48:18 +0100
-
-Hi,
-
-since glibc 2.16, Hurd's bits/socket.h provides SOCK_CLOEXEC and=20
-SOCK_NONBLOCK (which accept4 handles), but __ASSUME_SOCK_CLOEXEC is not=20
-defined since socket and socketpair do not handle them, yet.
-
-The snippets of fallback code that handle failures of invocation of=20
-socket with SOCK_CLOEXEC or SOCK_NONBLOCK seem to not correctly disable=20
-have_sock_cloexec/__have_sock_cloexec if errno is EPROTOTYPE, as=20
-returned when the socket type (like "SOCK_STREAM | SOCK_CLOEXEC" for=20
-socket with no handling of flags) is unknown.
-
-The attached patch handles EPROTOTYPE as if it was EINVAL, disabling=20
-have_sock_cloexec/__have_sock_cloexec if socket does not handle SOCK_*=20
-flags.
-
-(OTOH, it seems that there are few Linux archs -- like mips*, arm, hppa,=20
-m68k -- which don't have __ASSUME_SOCK_CLOEXEC enabled in their
-kernel-features.h at all: does it mean the Linux kernel really returns=20
-EINVAL for unknown values as socket types?)
-
-Thanks,
-=2D-=20
-Pino Toscano
-
-Handle EPROTOTYPE for socket invocations with SOCK_* flags
-
-If SOCK_CLOEXEC and SOCK_NONBLOCK are defined but not __ASSUME_SOCK_CLOEXEC,
-trying to use them as socket type in invocations of socket will return
-EPROTOTYPE if socket and socketpair do not handle those flags; EPROTOTYPE is
-not considered properly, behaving as if those flags were actually supported.
-
-Checking for the EPROTOTYPE errno in addition to EINVAL handles the situation.
-
-2013-02-06 Pino Toscano <toscano.pino@tiscali.it>
-
- * nscd/connections.c (nscd_init) [!defined __ASSUME_SOCK_CLOEXEC]:
- Check for EPROTOTYPE in addition to EINVAL.
- * nscd/nscd_helper.c (open_socket) [defined SOCK_CLOEXEC]
- [!defined __ASSUME_SOCK_CLOEXEC]: Likewise.
- * resolv/res_send.c (reopen) [!defined __ASSUME_SOCK_CLOEXEC]: Likewise.
- * sunrpc/clnt_udp.c (__libc_clntudp_bufcreate) [defined SOCK_NONBLOCK]
- [!defined __ASSUME_SOCK_CLOEXEC]: Likewise.
- * misc/syslog.c (openlog_internal) [defined SOCK_CLOEXEC]
- [!defined __ASSUME_SOCK_CLOEXEC]: Likewise.
-
---- a/nscd/connections.c
-+++ b/nscd/connections.c
-@@ -857,7 +857,7 @@ cannot set socket to close on exec: %s;
- sock = socket (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
- #ifndef __ASSUME_SOCK_CLOEXEC
- if (have_sock_cloexec == 0)
-- have_sock_cloexec = sock != -1 || errno != EINVAL ? 1 : -1;
-+ have_sock_cloexec = sock != -1 || (errno != EINVAL && errno != EPROTOTYPE) ? 1 : -1;
- #endif
- }
- #ifndef __ASSUME_SOCK_CLOEXEC
---- a/nscd/nscd_helper.c
-+++ b/nscd/nscd_helper.c
-@@ -173,7 +173,7 @@ open_socket (request_type type, const ch
- sock = __socket (PF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0);
- # ifndef __ASSUME_SOCK_CLOEXEC
- if (__have_sock_cloexec == 0)
-- __have_sock_cloexec = sock != -1 || errno != EINVAL ? 1 : -1;
-+ __have_sock_cloexec = sock != -1 || (errno != EINVAL && errno != EPROTOTYPE) ? 1 : -1;
- # endif
- }
- #endif
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -927,7 +927,7 @@ reopen (res_state statp, int *terrno, in
- if (__have_o_nonblock == 0)
- __have_o_nonblock
- = (EXT(statp).nssocks[ns] == -1
-- && errno == EINVAL ? -1 : 1);
-+ && (errno == EINVAL || errno == EPROTOTYPE) ? -1 : 1);
- #endif
- }
- if (__glibc_unlikely (__have_o_nonblock < 0))
-@@ -945,7 +945,7 @@ reopen (res_state statp, int *terrno, in
- if (__have_o_nonblock == 0)
- __have_o_nonblock
- = (EXT(statp).nssocks[ns] == -1
-- && errno == EINVAL ? -1 : 1);
-+ && (errno == EINVAL || errno == EPROTOTYPE) ? -1 : 1);
- #endif
- }
- if (__glibc_unlikely (__have_o_nonblock < 0))
---- a/sunrpc/clnt_udp.c
-+++ b/sunrpc/clnt_udp.c
-@@ -180,7 +180,7 @@ __libc_clntudp_bufcreate (struct sockadd
- IPPROTO_UDP);
- # ifndef __ASSUME_SOCK_CLOEXEC
- if (__have_sock_cloexec == 0)
-- __have_sock_cloexec = *sockp >= 0 || errno != EINVAL ? 1 : -1;
-+ __have_sock_cloexec = *sockp >= 0 || (errno != EINVAL && errno != EPROTOTYPE) ? 1 : -1;
- # endif
- }
- #endif
---- a/misc/syslog.c
-+++ b/misc/syslog.c
-@@ -357,7 +357,7 @@ openlog_internal(const char *ident, int
- if (__have_sock_cloexec == 0)
- __have_sock_cloexec
- = ((LogFile != -1
-- || errno != EINVAL)
-+ || (errno != EINVAL && errno != EPROTOTYPE))
- ? 1 : -1);
- }
- # endif
diff --git a/debian/patches/hurd-i386/submitted-net.diff b/debian/patches/hurd-i386/submitted-net.diff
index 2774c9a..bb00774 100644
--- a/debian/patches/hurd-i386/submitted-net.diff
+++ b/debian/patches/hurd-i386/submitted-net.diff
@@ -96,7 +96,7 @@ Index: eglibc-2.16/sysdeps/gnu/net/ethernet.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ eglibc-2.16/sysdeps/gnu/net/ethernet.h 2012-07-23 00:21:13.000000000 +0200
@@ -0,0 +1,83 @@
-+/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
++/* Copyright (C) 1997-2016 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
@@ -185,7 +185,7 @@ Index: eglibc-2.16/sysdeps/gnu/net/if_arp.h
+++ eglibc-2.16/sysdeps/gnu/net/if_arp.h 2012-07-23 00:21:13.000000000 +0200
@@ -0,0 +1,183 @@
+/* Definitions for Address Resolution Protocol.
-+ Copyright (C) 1997-2015 Free Software Foundation, Inc.
++ Copyright (C) 1997-2016 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
+
@@ -372,7 +372,7 @@ Index: eglibc-2.16/sysdeps/gnu/net/if_ether.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ eglibc-2.16/sysdeps/gnu/net/if_ether.h 2012-07-23 00:21:13.000000000 +0200
@@ -0,0 +1,115 @@
-+/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
++/* Copyright (C) 1997-2016 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
@@ -666,7 +666,7 @@ Index: eglibc-2.16/sysdeps/gnu/net/route.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ eglibc-2.16/sysdeps/gnu/net/route.h 2012-07-23 00:21:13.000000000 +0200
@@ -0,0 +1,144 @@
-+/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
++/* Copyright (C) 1997-2016 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
@@ -815,7 +815,7 @@ Index: eglibc-2.16/sysdeps/gnu/netinet/if_ether.h
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ eglibc-2.16/sysdeps/gnu/netinet/if_ether.h 2012-07-23 00:21:13.000000000 +0200
@@ -0,0 +1,103 @@
-+/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
++/* Copyright (C) 1996-2016 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
@@ -937,7 +937,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/ethernet.h
--- eglibc-2.16.orig/sysdeps/mach/hurd/net/ethernet.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,75 +0,0 @@
--/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
+-/* Copyright (C) 1997-2016 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
@@ -1018,7 +1018,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/if_arp.h
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
-/* Definitions for Address Resolution Protocol.
-- Copyright (C) 1997-2015 Free Software Foundation, Inc.
+- Copyright (C) 1997-2016 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
@@ -1166,7 +1166,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/if_ether.h
--- eglibc-2.16.orig/sysdeps/mach/hurd/net/if_ether.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
--/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
+-/* Copyright (C) 1997-2016 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
@@ -1429,7 +1429,7 @@ Index: eglibc-2.16/sysdeps/mach/hurd/net/route.h
--- eglibc-2.16.orig/sysdeps/mach/hurd/net/route.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
--/* Copyright (C) 1997-2015 Free Software Foundation, Inc..
+-/* Copyright (C) 1997-2016 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
@@ -1588,7 +1588,7 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/ethernet.h
--- eglibc-2.16.orig/sysdeps/unix/sysv/linux/net/ethernet.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
--/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
+-/* Copyright (C) 1997-2016 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
@@ -1677,7 +1677,7 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/if_arp.h
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,183 +0,0 @@
-/* Definitions for Address Resolution Protocol.
-- Copyright (C) 1997-2015 Free Software Foundation, Inc.
+- Copyright (C) 1997-2016 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
-
@@ -2050,7 +2050,7 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/net/route.h
--- eglibc-2.16.orig/sysdeps/unix/sysv/linux/net/route.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,144 +0,0 @@
--/* Copyright (C) 1997-2015 Free Software Foundation, Inc.
+-/* Copyright (C) 1997-2016 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
@@ -2199,7 +2199,7 @@ Index: eglibc-2.16/sysdeps/unix/sysv/linux/netinet/if_ether.h
--- eglibc-2.16.orig/sysdeps/unix/sysv/linux/netinet/if_ether.h 2012-02-18 03:24:59.000000000 +0100
+++ /dev/null 1970-01-01 00:00:00.000000000 +0000
@@ -1,104 +0,0 @@
--/* Copyright (C) 1996-2015 Free Software Foundation, Inc.
+-/* Copyright (C) 1996-2016 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
diff --git a/debian/patches/hurd-i386/tg-bits_atomic.h_multiple_threads.diff b/debian/patches/hurd-i386/tg-bits_atomic.h_multiple_threads.diff
index fb846b9..35287e8 100644
--- a/debian/patches/hurd-i386/tg-bits_atomic.h_multiple_threads.diff
+++ b/debian/patches/hurd-i386/tg-bits_atomic.h_multiple_threads.diff
@@ -15,11 +15,11 @@ Need to override sysdeps/i386/i486/bits/atomic.h to remove Linuxisms.
sysdeps/i386/i486/bits/atomic.h | 107 +++++++++++++---------------------------
1 file changed, 37 insertions(+), 70 deletions(-)
-Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
+Index: glibc-2.23/sysdeps/i386/atomic-machine.h
===================================================================
---- eglibc-2.16.orig/sysdeps/i386/i486/bits/atomic.h 2012-07-23 00:23:16.000000000 +0200
-+++ eglibc-2.16/sysdeps/i386/i486/bits/atomic.h 2012-07-23 00:24:10.000000000 +0200
-@@ -63,35 +63,26 @@
+--- glibc-2.23.orig/sysdeps/i386/atomic-machine.h
++++ glibc-2.23/sysdeps/i386/atomic-machine.h
+@@ -66,35 +66,26 @@ typedef uintmax_t uatomic_max_t;
#define __arch_c_compare_and_exchange_val_8_acq(mem, newval, oldval) \
({ __typeof (*mem) ret; \
@@ -64,7 +64,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
ret; })
/* XXX We do not really need 64-bit compare-and-exchange. At least
-@@ -132,10 +123,8 @@
+@@ -135,10 +126,8 @@ typedef uintmax_t uatomic_max_t;
# define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval) \
({ __typeof (*mem) ret; \
__asm __volatile ("xchgl %2, %%ebx\n\t" \
@@ -76,7 +76,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
"xchgl %2, %%ebx" \
: "=A" (ret), "=m" (*mem) \
: "DS" (((unsigned long long int) (newval)) \
-@@ -143,8 +132,7 @@
+@@ -146,8 +135,7 @@ typedef uintmax_t uatomic_max_t;
"c" (((unsigned long long int) (newval)) >> 32), \
"m" (*mem), "a" (((unsigned long long int) (oldval)) \
& 0xffffffff), \
@@ -86,7 +86,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
ret; })
# else
# define __arch_compare_and_exchange_val_64_acq(mem, newval, oldval) \
-@@ -161,18 +149,15 @@
+@@ -164,18 +152,15 @@ typedef uintmax_t uatomic_max_t;
# define __arch_c_compare_and_exchange_val_64_acq(mem, newval, oldval) \
({ __typeof (*mem) ret; \
@@ -108,7 +108,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
ret; })
# endif
#endif
-@@ -207,18 +192,15 @@
+@@ -210,18 +195,15 @@ typedef uintmax_t uatomic_max_t;
if (sizeof (*mem) == 1) \
__asm __volatile (lock "xaddb %b0, %1" \
: "=q" (__result), "=m" (*mem) \
@@ -130,7 +130,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
else \
{ \
__typeof (mem) __memp = (mem); \
-@@ -235,7 +217,7 @@
+@@ -238,7 +220,7 @@ typedef uintmax_t uatomic_max_t;
__sync_fetch_and_add (mem, value)
#define __arch_exchange_and_add_cprefix \
@@ -139,7 +139,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
#define catomic_exchange_and_add(mem, value) \
__arch_exchange_and_add_body (__arch_exchange_and_add_cprefix, __arch_c, \
-@@ -251,18 +233,15 @@
+@@ -254,18 +236,15 @@ typedef uintmax_t uatomic_max_t;
else if (sizeof (*mem) == 1) \
__asm __volatile (lock "addb %b1, %0" \
: "=m" (*mem) \
@@ -161,7 +161,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
else \
{ \
__typeof (value) __addval = (value); \
-@@ -280,7 +259,7 @@
+@@ -283,7 +262,7 @@ typedef uintmax_t uatomic_max_t;
__arch_add_body (LOCK_PREFIX, __arch, mem, value)
#define __arch_add_cprefix \
@@ -170,7 +170,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
#define catomic_add(mem, value) \
__arch_add_body (__arch_add_cprefix, __arch_c, mem, value)
-@@ -329,18 +308,15 @@
+@@ -332,18 +311,15 @@ typedef uintmax_t uatomic_max_t;
if (sizeof (*mem) == 1) \
__asm __volatile (lock "incb %b0" \
: "=m" (*mem) \
@@ -192,7 +192,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
else \
{ \
__typeof (mem) __memp = (mem); \
-@@ -356,7 +332,7 @@
+@@ -359,7 +335,7 @@ typedef uintmax_t uatomic_max_t;
#define atomic_increment(mem) __arch_increment_body (LOCK_PREFIX, __arch, mem)
#define __arch_increment_cprefix \
@@ -201,7 +201,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
#define catomic_increment(mem) \
__arch_increment_body (__arch_increment_cprefix, __arch_c, mem)
-@@ -386,18 +362,15 @@
+@@ -389,18 +365,15 @@ typedef uintmax_t uatomic_max_t;
if (sizeof (*mem) == 1) \
__asm __volatile (lock "decb %b0" \
: "=m" (*mem) \
@@ -223,7 +223,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
else \
{ \
__typeof (mem) __memp = (mem); \
-@@ -413,7 +386,7 @@
+@@ -416,7 +389,7 @@ typedef uintmax_t uatomic_max_t;
#define atomic_decrement(mem) __arch_decrement_body (LOCK_PREFIX, __arch, mem)
#define __arch_decrement_cprefix \
@@ -232,7 +232,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
#define catomic_decrement(mem) \
__arch_decrement_body (__arch_decrement_cprefix, __arch_c, mem)
-@@ -484,24 +457,21 @@
+@@ -487,24 +460,21 @@ typedef uintmax_t uatomic_max_t;
if (sizeof (*mem) == 1) \
__asm __volatile (lock "andb %b1, %0" \
: "=m" (*mem) \
@@ -261,7 +261,7 @@ Index: eglibc-2.16/sysdeps/i386/i486/bits/atomic.h
#define atomic_and(mem, mask) __arch_and_body (LOCK_PREFIX, mem, mask)
-@@ -513,18 +483,15 @@
+@@ -516,18 +486,15 @@ typedef uintmax_t uatomic_max_t;
if (sizeof (*mem) == 1) \
__asm __volatile (lock "orb %b1, %0" \
: "=m" (*mem) \
diff --git a/debian/patches/series.hurd-i386 b/debian/patches/series.hurd-i386
index 9aa13cf..4629e1b 100644
--- a/debian/patches/series.hurd-i386
+++ b/debian/patches/series.hurd-i386
@@ -9,7 +9,6 @@ hurd-i386/unsubmitted-mremap.diff
hurd-i386/tg-verify.h.diff
hurd-i386/tg-fcntl-internal.h.diff
hurd-i386/tg-pagesize.diff
-hurd-i386/submitted-handle-eprototype.diff
hurd-i386/local-no-bootstrap-fs-access.diff
hurd-i386/unsubmitted-timer_routines.diff
hurd-i386/local-versions-hack.diff
diff --git a/debian/patches/series.kfreebsd-amd64 b/debian/patches/series.kfreebsd-amd64
index 8dd4b9b..3eddd34 100644
--- a/debian/patches/series.kfreebsd-amd64
+++ b/debian/patches/series.kfreebsd-amd64
@@ -3,4 +3,4 @@ kfreebsd/local-sys_queue_h.diff
kfreebsd/local-undef-glibc.diff
kfreebsd/local-initgroups-order.diff
kfreebsd/local-tst-auxv.diff
-kfreebsd/local-tst-malloc-backtrace.diff
+kfreebsd/local-tst-malloc-fbtl.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: