diff options
| author | Edward Hervey <edward@collabora.com> | 2014-05-14 07:53:32 +0200 |
|---|---|---|
| committer | Edward Hervey <edward@collabora.com> | 2014-05-14 10:44:07 +0200 |
| commit | c037ab57d68343151da9569a7f069896fd997754 (patch) | |
| tree | 3ac090615f3da3655db40cd0e887c56cc2979d5b /recipes | |
| parent | 648d4d22aea0d9199ffa25ede36cd3a4dbaca4ce (diff) | |
recipe: Backport glib compilation fix
Original commit: c7a661988eb8fd18fb02565d83f52b0136fd3e85
From: Olivier Crete <olivier.crete@collabora.com>
Date: Wed, 26 Mar 2014 19:45:52 -0400
Subject: networkmonitornetlink: IN6_IS_ADDR_MC_LINKLOCAL is only guaranteed to
work on struct in6_addr*
https://bugzilla.gnome.org/show_bug.cgi?id=727119
Diffstat (limited to 'recipes')
12 files changed, 45 insertions, 11 deletions
diff --git a/recipes/glib.recipe b/recipes/glib.recipe index 989660f8..58768eed 100644 --- a/recipes/glib.recipe +++ b/recipes/glib.recipe @@ -33,7 +33,8 @@ class Recipe(recipe.Recipe): 'glib/0007-giomodule-do-not-try-to-load-modules-from-gio-module.patch', 'glib/0008-configure-fix-link-with-Carbon-framework.patch', 'glib/0009-socketclient-Fix-leak.patch', - 'glib/0010-gio-fix-two-more-g_task_return_error_if_cancelled-le.patch' + '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' ] files_libs = [ diff --git a/recipes/glib/0001-Unhide-_g_io_modules_ensure_extension_points_registe.patch b/recipes/glib/0001-Unhide-_g_io_modules_ensure_extension_points_registe.patch index db6f47fa..24028872 100644 --- a/recipes/glib/0001-Unhide-_g_io_modules_ensure_extension_points_registe.patch +++ b/recipes/glib/0001-Unhide-_g_io_modules_ensure_extension_points_registe.patch @@ -1,7 +1,7 @@ From 1e910a5abb72b296370478f4a3cc392c4072ae1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> Date: Fri, 7 Mar 2014 13:59:22 +0100 -Subject: [PATCH 01/10] Unhide _g_io_modules_ensure_extension_points_registered +Subject: [PATCH 01/11] Unhide _g_io_modules_ensure_extension_points_registered for calling by gio modules --- diff --git a/recipes/glib/0002-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch b/recipes/glib/0002-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch index 1aaaa9ea..15ad5b3a 100644 --- a/recipes/glib/0002-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch +++ b/recipes/glib/0002-Let-user-disable-Cocoa-and-Carbon-support-on-demand.patch @@ -1,7 +1,7 @@ From a1a15efce96ee7107aecee2cdb850b9e189bfe43 Mon Sep 17 00:00:00 2001 From: Thibault Saunier <thibault.saunier@collabora.com> Date: Fri, 25 Jan 2013 12:37:43 -0300 -Subject: [PATCH 02/10] Let user disable Cocoa and Carbon support on demand +Subject: [PATCH 02/11] Let user disable Cocoa and Carbon support on demand Conflicts: configure.ac diff --git a/recipes/glib/0003-Optionally-revert-to-the-old-pre-2.28-URI-handler-co.patch b/recipes/glib/0003-Optionally-revert-to-the-old-pre-2.28-URI-handler-co.patch index ca3390a8..21d79cfa 100644 --- a/recipes/glib/0003-Optionally-revert-to-the-old-pre-2.28-URI-handler-co.patch +++ b/recipes/glib/0003-Optionally-revert-to-the-old-pre-2.28-URI-handler-co.patch @@ -1,7 +1,7 @@ From 6059729c739662573bda47dc04fbb698400b05d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> Date: Fri, 9 Mar 2012 08:44:13 +0100 -Subject: [PATCH 03/10] Optionally revert to the old (pre-2.28) URI handler +Subject: [PATCH 03/11] Optionally revert to the old (pre-2.28) URI handler code This is required to work with the GVfs distributed on Linux distributions diff --git a/recipes/glib/0004-Add-support-for-loading-GIO-modules-from-the-distro-.patch b/recipes/glib/0004-Add-support-for-loading-GIO-modules-from-the-distro-.patch index 26f91208..f2cfab91 100644 --- a/recipes/glib/0004-Add-support-for-loading-GIO-modules-from-the-distro-.patch +++ b/recipes/glib/0004-Add-support-for-loading-GIO-modules-from-the-distro-.patch @@ -1,7 +1,7 @@ From 7eededaa8606187ce0fcbe32fd8a3e4bd76168d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> Date: Fri, 9 Mar 2012 08:51:12 +0100 -Subject: [PATCH 04/10] Add support for loading GIO modules from the distro's +Subject: [PATCH 04/11] Add support for loading GIO modules from the distro's GIO module path This is needed to e.g. load GVfs from the distro. Without this elements diff --git a/recipes/glib/0005-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch b/recipes/glib/0005-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch index 6cd963e9..5481030f 100644 --- a/recipes/glib/0005-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch +++ b/recipes/glib/0005-Allow-for-a-second-distro-GIO-module-path-as-used-on.patch @@ -1,7 +1,7 @@ From 3499b675a04e519b942bcfd6c660439f8e390e84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> Date: Mon, 12 Mar 2012 13:04:41 +0100 -Subject: [PATCH 05/10] Allow for a second distro GIO module path as used on +Subject: [PATCH 05/11] Allow for a second distro GIO module path as used on Ubuntu ...because apparently only half of their packages are multi-arch diff --git a/recipes/glib/0006-Blacklist-the-bamf-GIO-module.patch b/recipes/glib/0006-Blacklist-the-bamf-GIO-module.patch index 2dfe9c01..4462a04d 100644 --- a/recipes/glib/0006-Blacklist-the-bamf-GIO-module.patch +++ b/recipes/glib/0006-Blacklist-the-bamf-GIO-module.patch @@ -1,7 +1,7 @@ From 20041dde79ec5346e4edf7d40e779d9c8f5d9c5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk> Date: Mon, 12 Mar 2012 14:30:02 +0100 -Subject: [PATCH 06/10] Blacklist the bamf GIO module +Subject: [PATCH 06/11] Blacklist the bamf GIO module I uses Ubuntu specific GLib API on Ubuntu... and thus crashes everything that ever tries to use GIO. diff --git a/recipes/glib/0007-giomodule-do-not-try-to-load-modules-from-gio-module.patch b/recipes/glib/0007-giomodule-do-not-try-to-load-modules-from-gio-module.patch index 792bdc3f..d3785589 100644 --- a/recipes/glib/0007-giomodule-do-not-try-to-load-modules-from-gio-module.patch +++ b/recipes/glib/0007-giomodule-do-not-try-to-load-modules-from-gio-module.patch @@ -1,7 +1,7 @@ From c43c2c8e98a2335241cdeeb88ae375bb30fc8234 Mon Sep 17 00:00:00 2001 From: Thiago Santos <thiago.sousa.santos@collabora.com> Date: Wed, 22 May 2013 15:00:34 -0300 -Subject: [PATCH 07/10] giomodule: do not try to load modules from +Subject: [PATCH 07/11] giomodule: do not try to load modules from gio-module-dir in IOS There is no gio-module-dir for ios. When it tries to load on a real diff --git a/recipes/glib/0008-configure-fix-link-with-Carbon-framework.patch b/recipes/glib/0008-configure-fix-link-with-Carbon-framework.patch index 868eac50..a9a985e6 100644 --- a/recipes/glib/0008-configure-fix-link-with-Carbon-framework.patch +++ b/recipes/glib/0008-configure-fix-link-with-Carbon-framework.patch @@ -1,7 +1,7 @@ From 180e757d61b1f98e5307849641685d2185ceeaa2 Mon Sep 17 00:00:00 2001 From: Andoni Morales Alastruey <ylatuya@gmail.com> Date: Mon, 28 Oct 2013 12:19:00 +0100 -Subject: [PATCH 08/10] configure: fix link with Carbon framework +Subject: [PATCH 08/11] configure: fix link with Carbon framework --- configure.ac | 2 +- diff --git a/recipes/glib/0009-socketclient-Fix-leak.patch b/recipes/glib/0009-socketclient-Fix-leak.patch index 9d525987..4ac16f0c 100644 --- a/recipes/glib/0009-socketclient-Fix-leak.patch +++ b/recipes/glib/0009-socketclient-Fix-leak.patch @@ -1,7 +1,7 @@ From 14bb9538ca0274eb93b08bcd945e91e930cd7a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com> Date: Mon, 17 Mar 2014 23:50:30 -0400 -Subject: [PATCH 09/10] socketclient: Fix leak +Subject: [PATCH 09/11] socketclient: Fix leak https://bugzilla.gnome.org/show_bug.cgi?id=726611 --- diff --git a/recipes/glib/0010-gio-fix-two-more-g_task_return_error_if_cancelled-le.patch b/recipes/glib/0010-gio-fix-two-more-g_task_return_error_if_cancelled-le.patch index 2d2ea158..639d29ea 100644 --- a/recipes/glib/0010-gio-fix-two-more-g_task_return_error_if_cancelled-le.patch +++ b/recipes/glib/0010-gio-fix-two-more-g_task_return_error_if_cancelled-le.patch @@ -1,7 +1,7 @@ From 59f8d3884f75f3e158d3aa1a5028e9ea4a896025 Mon Sep 17 00:00:00 2001 From: Dan Winship <danw@gnome.org> Date: Tue, 18 Mar 2014 09:56:23 -0400 -Subject: [PATCH 10/10] gio: fix two more g_task_return_error_if_cancelled() +Subject: [PATCH 10/11] gio: fix two more g_task_return_error_if_cancelled() leaks https://bugzilla.gnome.org/show_bug.cgi?id=726611 diff --git a/recipes/glib/0011-networkmonitornetlink-IN6_IS_ADDR_MC_LINKLOCAL-is-on.patch b/recipes/glib/0011-networkmonitornetlink-IN6_IS_ADDR_MC_LINKLOCAL-is-on.patch new file mode 100644 index 00000000..4c9f0d21 --- /dev/null +++ b/recipes/glib/0011-networkmonitornetlink-IN6_IS_ADDR_MC_LINKLOCAL-is-on.patch @@ -0,0 +1,33 @@ +From 40b6d210f0bf61da4c79bffab191cfdb9e8afa52 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= <olivier.crete@collabora.com> +Date: Wed, 26 Mar 2014 19:45:52 -0400 +Subject: [PATCH 11/11] networkmonitornetlink: IN6_IS_ADDR_MC_LINKLOCAL is only + guaranteed to work on struct in6_addr* + +https://bugzilla.gnome.org/show_bug.cgi?id=727119 +--- + gio/gnetworkmonitornetlink.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gio/gnetworkmonitornetlink.c b/gio/gnetworkmonitornetlink.c +index fd916b3..21a7ad5 100644 +--- a/gio/gnetworkmonitornetlink.c ++++ b/gio/gnetworkmonitornetlink.c +@@ -382,10 +382,13 @@ read_netlink_messages (GSocket *socket, + * IPv6 link-local multicast routes, which are added and + * removed all the time for some reason. + */ ++#define UNALIGNED_IN6_IS_ADDR_MC_LINKLOCAL(a) \ ++ ((a[0] == 0xff) && ((a[1] & 0xf) == 0x2)) ++ + if (!nl->priv->dump_networks && + rtmsg->rtm_family == AF_INET6 && + rtmsg->rtm_dst_len != 0 && +- IN6_IS_ADDR_MC_LINKLOCAL (dest)) ++ UNALIGNED_IN6_IS_ADDR_MC_LINKLOCAL (dest)) + continue; + + if (msg->nlmsg_type == RTM_NEWROUTE) +-- +1.9.0 + |