diff -Nru fakeroot-1.21/debian/changelog fakeroot-1.21/debian/changelog
--- fakeroot-1.21/debian/changelog 2016-08-12 13:00:40.000000000 +0200
+++ fakeroot-1.21/debian/changelog 2016-08-12 14:52:22.000000000 +0200
@@ -1,3 +1,11 @@
+fakeroot (1.21-1ubuntu2) yakkety; urgency=medium
+
+ * Add hide-dlsym-error.patch to hide the errors from dlsym() unless
+ debugging was enabled. This fixes failures in APT test suite (and maybe
+ others) with glibc 2.24
+
+ -- Julian Andres Klode <juliank@ubuntu.com> Fri, 12 Aug 2016 12:52:21 +0000
+
fakeroot (1.21-1ubuntu1) yakkety; urgency=medium
* Merge with Debian; remaining changes:
diff -Nru fakeroot-1.21/debian/patches/hide-dlsym-error.patch fakeroot-1.21/debian/patches/hide-dlsym-error.patch
--- fakeroot-1.21/debian/patches/hide-dlsym-error.patch 1970-01-01 01:00:00.000000000 +0100
+++ fakeroot-1.21/debian/patches/hide-dlsym-error.patch 2016-08-12 14:56:46.000000000 +0200
@@ -0,0 +1,28 @@
+Description: Hide error from dlsym()
+ dlsym(), starting in glibc 2.24 actually reports errors. In our case,
+ we try to get ACL functions which are not in the glibc. This causes
+ failures in test suites, so hide those messages for non-debugging
+ purposes for now.
+Author: Julian Andres Klode <juliank@ubuntu.com>
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/830912
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: no
+Last-Update: 2016-08-12
+
+--- a/libfakeroot.c
++++ b/libfakeroot.c
+@@ -256,10 +256,12 @@ void load_library_symbols(void){
+ /* clear dlerror() just in case dlsym() legitimately returns NULL */
+ msg = dlerror();
+ *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name);
+- if ( (msg = dlerror()) != NULL){
++#ifdef LIBFAKEROOT_DEBUGGING
++ if ( (msg = dlerror()) != NULL && fakeroot_debug){
+ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg);
+ /* abort ();*/
+ }
++#endif
+ }
+ }
+
diff -Nru fakeroot-1.21/debian/patches/series fakeroot-1.21/debian/patches/series
--- fakeroot-1.21/debian/patches/series 2016-08-12 13:01:28.000000000 +0200
+++ fakeroot-1.21/debian/patches/series 2016-08-12 14:48:31.000000000 +0200
@@ -1,3 +1,4 @@
eglibc-fts-without-LFS
#glibc-xattr-types
getopt-gnu-test.patch
+hide-dlsym-error.patch