Merge ~alextu/libhybris/+git/libhybris:LP1536940_fixed_location_service_crash into ~libhybris-maintainers/libhybris/+git/libhybris:staging

[Alex Tu]

add freeaddrinfo to the hooks, fix a missmatch between glibc's addrinfo and bionic's getaddrinfo

from:
    https://github.com/krnlyng/libhybris/commit/cf7483232edb8b461b5f335d9d32326b17623ded
    Author: Franz-Josef <email address hidden>
    Date: Fri Jan 17 22:31:52 2014 +0200

        add freeaddrinfo to the hooks, fix a missmatch between glibc's addrinfo and bionic's getaddrinfo

Bug: https://bugs.launchpad.net/avila-private/+bug/1536940

diff --git a/debian/changelog b/debian/changelog
index 9fdad27..374065a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,17 +1,74 @@
-libhybris (0.1.0+git20151016+6d424c9-0ubuntu4) UNRELEASED; urgency=medium
+libhybris (0.1.0+git20151016+6d424c9-0ubuntu5) xenial; urgency=medium
 
-  * Hook missing pthread functions, localtime, gmtime, getlogin,
-    __sprintf_chk, __snprintf_chk, pthread_mutex_timedlock
-  * Add quirk for Mali GLES driver
-  * debian/rules:
-    - Enable Mali quirks
-  * Fix audio test case to work on Android 5.x
+  * debian: drop requirement of gcc 4.7
 
- -- Simon Fels <[e-mail]>  Thu, 07 Jan 2016 11:03:31 +0100
+ -- Simon Fels <[e-mail]>  Tue, 26 Jan 2016 12:37:21 +0100
 
-libhybris (0.1.0+git20151016+6d424c9-0ubuntu2) vivid; urgency=medium
+libhybris (0.1.0+git20151016+6d424c9-0ubuntu4) xenial; urgency=medium
+
+  [ You-Sheng Yang ]
+  * wifi: fix hardware_legacy/wifi.h not found
+  * tests: fix test_audio compilation on Android 5 or above
+
+  [ Carsten Munk ]
+  * Hook getlogin, __sprintf_chk, __snprintf_chk
+
+  [ Simon Fels ]
+  * hybris: common: dump mutex address
+  * hybris: common: add ugly workaround for malit-hist-dump thread
+  * hybris: common: also hook prctl to workaround mali-hist-dump
+  * hybris: common: also log name when prctl called with PR_SET_NAME
+  * hybris: common: add exit workaround for mali-hist-dump thread
+  * hybris: common: be more precise on prctl log messages
+  * hybris: add configuration option to enable mali related quirks
+  * hybris: common: hook localtime, gmtime and friends
+  * debian: enable mali quirks
+  * hybris: common: hook missing pthread functions
+  * hybris: common: add further debug statements for symbol hooking
+  * debian: update changelog
+
+  [ You-Sheng Yang ]
+  * compat: media: remove wrong BOARD_HAS_MEDIA_PLAYER_PAUSE guard
+  * compat: media: implement android::IMediaRecorder::resume
+
+  [ Simon Fels ]
+  * debian: drop files listed twice in .install files
+  * debian: drop -dbg package as we generate them automatically
+
+  [ You-Sheng Yang ]
+  * hooks: add pthread_mutex_timedlock
+
+  [ Thomas Voß ]
+  * Hook pthread_kill such that pthread_t values of 0 do not lead to segfaults.
+
+  [ Simon Fels ]
+  * debian: update changelog
+  * debian: correct vcs reference to point to launchpad
+
+  [ You-Sheng Yang ]
+  * hook: add pthread_condattr_setclock
+  * hook: skip only symbol names prefixed with "pthread" or "__pthread"
+
+  [ Mikko Harju ]
+  * [libhybris] Add cache for socket based property lookups.
+
+  [ Simon Fels ]
+  * hybris: common: add simple macro to check for existing symbols
+  * debian: drop stripping of not existing package
+  * Revert "debian: don't package NFC stuff anymore"
+  * utils: fix binding wrapper macro generator script
+  * debian: sync changelog up with what is released
+  * debian: enable property cache for x86 and armhf
+  * debian: rules: cleanup formatting for autoconf options
+
+ -- Simon Fels <[e-mail]>  Tue, 26 Jan 2016 11:05:14 +0100
+
+libhybris (0.1.0+git20151016+6d424c9-0ubuntu3) vivid; urgency=medium
 
   * Various fixes to allow camera access to work in the web browser
+  * Fix compat layer compilation when API functions are missing on
+    certain devices in the media player implementation.
+  * Add initial support for Android 5.x
 
  -- Simon Fels <[e-mail]>  Thu, 07 Jan 2016 08:07:11 +0100
 
diff --git a/debian/control b/debian/control
index 50ae6e7..9ab338f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,6 @@ Build-Depends: debhelper (>= 9.0.0),
                autotools-dev,
                dh-autoreconf,
                android-headers (>= 4.4.2),
-               gcc-4.7,
-               g++-4.7,
                quilt,
                pkg-config,
                libgles2-mesa-dev,
diff --git a/debian/rules b/debian/rules
index acb0a21..8fe083a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,10 +17,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-# Compiler
-export CC=gcc-4.7
-export CXX=g++-4.7
-
 # Strong needs at least gcc 4.9
 export DEB_BUILD_MAINT_OPTIONS=hardening=-stackprotectorstrong
 
@@ -61,9 +57,18 @@ get-packaged-orig-source:
 
 override_dh_auto_configure:
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), armhf))
-	dh_auto_configure --sourcedirectory=hybris -- --enable-wayland --enable-arch=arm --with-android-headers=/usr/include/android --enable-mali-quirks
+	dh_auto_configure --sourcedirectory=hybris -- \
+		--enable-wayland \
+		--enable-arch=arm \
+		--with-android-headers=/usr/include/android \
+		--enable-mali-quirks \
+		--enable-property-cache
 else
-	dh_auto_configure --sourcedirectory=hybris -- --enable-wayland --enable-arch=x86 --with-android-headers=/usr/include/android
+	dh_auto_configure --sourcedirectory=hybris -- \
+		--enable-wayland \
+		--enable-arch=x86 \
+		--with-android-headers=/usr/include/android \
+		--enable-property-cache
 endif
 
 override_dh_install:
diff --git a/hybris/common/hooks.c b/hybris/common/hooks.c
index 62b28b1..a7c761f 100644
--- a/hybris/common/hooks.c
+++ b/hybris/common/hooks.c
@@ -1386,6 +1386,41 @@ static int my_readdir_r(DIR *dir, struct bionic_dirent *entry,
     return res;
 }
 
+static inline void swap(void **a, void **b)
+{
+    void *tmp = *a;
+    *a = *b;
+    *b = tmp;
+}
+
+static int my_getaddrinfo(const char *hostname, const char *servname,
+    const struct addrinfo *hints, struct addrinfo **res)
+{
+    // make a local copy of hints
+    struct addrinfo *fixed_hints = (struct addrinfo*)malloc(sizeof(struct addrinfo));
+    memcpy(fixed_hints, hints, sizeof(struct addrinfo));
+    // fix bionic -> glibc missmatch
+    swap((void**)&(fixed_hints->ai_canonname), (void**)&(fixed_hints->ai_addr));
+    // do glibc getaddrinfo
+    int result = getaddrinfo(hostname, servname, fixed_hints, res);
+    // release the copy of hints
+    free(fixed_hints);
+    // fix bionic <- glibc missmatch
+    struct addrinfo *it = *res;
+    while(NULL != it)
+    {
+        swap((void**)&(it->ai_canonname), (void**)&(it->ai_addr));
+        it = it->ai_next;
+    }
+    return result;
+}
+
+static void my_freeaddrinfo(struct addrinfo *__ai)
+{
+    swap((void**)&(__ai->ai_canonname), (void**)&(__ai->ai_addr));
+    freeaddrinfo(__ai);
+}
+
 extern long my_sysconf(int name);
 
 FP_ATTRIB static double my_strtod(const char *nptr, char **endptr)
@@ -1745,7 +1780,8 @@ static struct _hook hooks[] = {
     {"__errno", __errno_location},
     {"__set_errno", my_set_errno},
     /* net specifics, to avoid __res_get_state */
-    {"getaddrinfo", getaddrinfo},
+    {"getaddrinfo", my_getaddrinfo},
+    {"freeaddrinfo", my_freeaddrinfo},
     {"gethostbyaddr", gethostbyaddr},
     {"gethostbyname", gethostbyname},
     {"gethostbyname2", gethostbyname2},