Merge ~laney/libhybris/+git/libhybris:master into ~libhybris-maintainers/libhybris/+git/libhybris:master

[Iain Lane]

libhybris (in git or in yakkety) fails to build like this since the gcc6 switch:

hooks.c: At top level:
hooks.c:2586:5: error: built-in function ‘__memcpy_chk’ must be directly called
     {"__memcpy_chk", __memcpy_chk},
     ^
hooks.c:2587:5: error: built-in function ‘__memset_chk’ must be directly called
     {"__memset_chk", __memset_chk},
     ^
hooks.c:2589:5: error: built-in function ‘__strncpy_chk’ must be directly called
     {"__strncpy_chk",__strncpy_chk},
     ^

This was always an error - just earlier GCC versions were buggy in not making it one.

My fix is to just remove these from the table; not sure if that's right.

I uploaded this to yakkety already.

By the way, the versioning in libhybris is weird. It's at ...ubuntu22 now - but I would have expected you to generate new upstream tarballs for most of these uploads. Also git here has its Debian releases incremented out of step with the archive (at least yakkety), which is unusual.

[Simon Fels (morphis)]

LGTM

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 223bc60..f9a4ca1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libhybris (0.1.0+git20151016+6d424c9-0ubuntu23) UNRELEASED; urgency=medium
+
+  * hooks:c: Don't pass builtin functions.
+
+ -- Iain Lane <[e-mail]>  Tue, 09 Aug 2016 11:40:54 +0100
+
 libhybris (0.1.0+git20151016+6d424c9-0ubuntu22) yakkety; urgency=medium
 
   [ You-Sheng Yang ]
diff --git a/hybris/common/hooks.c b/hybris/common/hooks.c
index ce9972b..67a9b89 100644
--- a/hybris/common/hooks.c
+++ b/hybris/common/hooks.c
@@ -2583,10 +2583,7 @@ static struct _hook hooks_mm[] = {
     {"malloc_usable_size", _hybris_hook_malloc_usable_size},
     {"posix_memalign", _hybris_hook_posix_memalign},
     {"mprotect", _hybris_hook_mprotect},
-    {"__memcpy_chk", __memcpy_chk},
-    {"__memset_chk", __memset_chk},
     {"__gnu_strerror_r",_hybris_hook__gnu_strerror_r},
-    {"__strncpy_chk",__strncpy_chk},
     {"pthread_rwlockattr_getkind_np", _hybris_hook_pthread_rwlockattr_getkind_np},
     {"pthread_rwlockattr_setkind_np", _hybris_hook_pthread_rwlockattr_setkind_np},
     /* unistd.h */