diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/git_ifupdown_segfault.patch | 40 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 49 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 8351a8cc..7f68763d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +network-manager (1.15.2-0ubuntu2) UNRELEASED; urgency=medium + + * debian/patches/git_ifupdown_segfault.patch: + - 'settings/ifupdown: fix ifupdown plugin after merging eni_ifaces and + connections hashes' (lp: #1815742) + + -- Sebastien Bacher <seb128@ubuntu.com> Mon, 18 Feb 2019 17:06:17 +0100 + network-manager (1.15.2-0ubuntu1) disco; urgency=medium * Update to the current serie, resynchronize with Debian diff --git a/debian/patches/git_ifupdown_segfault.patch b/debian/patches/git_ifupdown_segfault.patch new file mode 100644 index 00000000..35097a9b --- /dev/null +++ b/debian/patches/git_ifupdown_segfault.patch @@ -0,0 +1,40 @@ +From b24e169ded4bc4c6f41b0ae42a150cb86d9d0c84 Mon Sep 17 00:00:00 2001 +From: Thomas Haller <thaller@redhat.com> +Date: Fri, 15 Feb 2019 15:59:32 +0100 +Subject: [PATCH] settings/ifupdown: fix ifupdown plugin after merging + eni_ifaces and connections hashes + +The @eni_ifaces hash may now contain %NULL elements. They are only markers +for interface names, but are not actual connections. + +They must be skipped. + +Fixes: 6aa66426a4168b3db115646f410bcb5deea6847b + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/124 +(cherry picked from commit 5923a30c43f9e79e368f7595d96c73797d24dd46) +--- + src/settings/plugins/ifupdown/nms-ifupdown-plugin.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c +index b66eedc70..f0e64d1de 100644 +--- a/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c ++++ b/src/settings/plugins/ifupdown/nms-ifupdown-plugin.c +@@ -282,8 +282,10 @@ initialize (NMSettingsPlugin *plugin) + + g_hash_table_iter_init (&iter, priv->eni_ifaces); + while (g_hash_table_iter_next (&iter, NULL, (gpointer *) conn)) { +- _nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self), +- NM_SETTINGS_CONNECTION (conn)); ++ if (conn) { ++ _nm_settings_plugin_emit_signal_connection_added (NM_SETTINGS_PLUGIN (self), ++ NM_SETTINGS_CONNECTION (conn)); ++ } + } + } + } +-- +2.18.1 + + diff --git a/debian/patches/series b/debian/patches/series index a7c5076a..809542fa 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,3 +7,4 @@ Disable-general-with-expect.patch libnm-Check-self-still-NMManager-or-not.patch # Upstream backport git_team_structure.patch +git_ifupdown_segfault.patch |