diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2014-09-09 20:21:53 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-09-09 20:23:41 +0200 |
| commit | fb398009f9554e3a0f25e8f0a53e34533c2bdda7 (patch) | |
| tree | 394311209b95136b4322b22ed7e3f5835bc6d44f | |
| parent | 4ce258fe58ff13d583301ea35885f0930b7a3d1c (diff) | |
glib: Don't use issetugid() on Android
Android had it in older versions but the new 64 bit ABI does not
have it anymore, and some versions of the 32 bit ABI neither.
https://code.google.com/p/android-developer-preview/issues/detail?id=168
https://bugzilla.gnome.org/show_bug.cgi?id=736351
| -rw-r--r-- | recipes/glib.recipe | 1 | ||||
| -rw-r--r-- | recipes/glib/0012-gutils-Don-t-use-issetugid-on-Android.patch | 37 |
2 files changed, 38 insertions, 0 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 6bdd2282..3f7f76e6 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -36,6 +36,7 @@ class Recipe(recipe.Recipe): 'glib/0010-gio-fix-two-more-g_task_return_error_if_cancelled-le.patch', 'glib/0011-networkmonitornetlink-IN6_IS_ADDR_MC_LINKLOCAL-is-on.patch', 'glib/0001-gdbus-codgen-Use-a-proper-shebang-in-the-generator.patch', + 'glib/0012-gutils-Don-t-use-issetugid-on-Android.patch', ] files_libs = [ diff --git a/recipes/glib/0012-gutils-Don-t-use-issetugid-on-Android.patch b/recipes/glib/0012-gutils-Don-t-use-issetugid-on-Android.patch new file mode 100644 index 00000000..be8544f3 --- /dev/null +++ b/recipes/glib/0012-gutils-Don-t-use-issetugid-on-Android.patch @@ -0,0 +1,37 @@ +From 012717f32c16596246d12fd70b26a58153ecaea5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> +Date: Tue, 9 Sep 2014 20:18:20 +0200 +Subject: [PATCH] gutils: Don't use issetugid() on Android + +Android had it in older versions but the new 64 bit ABI does not +have it anymore, and some versions of the 32 bit ABI neither. + +https://code.google.com/p/android-developer-preview/issues/detail?id=168 + +https://bugzilla.gnome.org/show_bug.cgi?id=736351 +--- + glib/gutils.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/glib/gutils.c b/glib/gutils.c +index 8fd045a..e229d0d 100644 +--- a/glib/gutils.c ++++ b/glib/gutils.c +@@ -2330,8 +2330,13 @@ g_check_setuid (void) + extern int __libc_enable_secure; + return __libc_enable_secure; + } +-#elif defined(HAVE_ISSETUGID) ++#elif defined(HAVE_ISSETUGID) && !defined(__BIONIC__) + /* BSD: http://www.freebsd.org/cgi/man.cgi?query=issetugid&sektion=2 */ ++ ++ /* Android had it in older versions but the new 64 bit ABI does not ++ * have it anymore, and some versions of the 32 bit ABI neither. ++ * https://code.google.com/p/android-developer-preview/issues/detail?id=168 ++ */ + return issetugid (); + #elif defined(G_OS_UNIX) + uid_t ruid, euid, suid; /* Real, effective and saved user ID's */ +-- +2.1.0 + |