diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/git_team_structure.patch | 36 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 41 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 844abd7e..f76cafeb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,9 @@ network-manager (1.15.2-0ubuntu1) UNRELEASED; urgency=medium - updated for the new version * debian/patches - removed the changes that are included in the new version + * debian/patches/git_team_structure.patch: + - backport upstream change 'fix team link-watcher struct layout', + the tests/build failed on i386 * debian/rules: - strip '-Wl,-Bsymbolic-functions' from LDFLAGS otherwise the tests fails on 'cannot register existing type 'NMAgentManagerError'' diff --git a/debian/patches/git_team_structure.patch b/debian/patches/git_team_structure.patch new file mode 100644 index 00000000..32495ebf --- /dev/null +++ b/debian/patches/git_team_structure.patch @@ -0,0 +1,36 @@ +From 63b90f0dd175c7b38aecb3b8e9bad3fb8bad2265 Mon Sep 17 00:00:00 2001 +From: Beniamino Galvani <bgalvani@redhat.com> +Date: Sat, 26 Jan 2019 18:37:12 +0100 +Subject: [PATCH] libnm-core: fix team link-watcher struct layout + +As the comment above the union says, structs in the union must have +the same layout of arp_ping. 'vlanid' is in the wrong place and breaks +that. + +Fixes: f44c793f6cd89c3e84e83872478daf286821ed64 + +https://gitlab.freedesktop.org/NetworkManager/NetworkManager/issues/110 +--- + libnm-core/nm-setting-team.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c +index 3161c05f4..867db5227 100644 +--- a/libnm-core/nm-setting-team.c ++++ b/libnm-core/nm-setting-team.c +@@ -84,10 +84,10 @@ struct NMTeamLinkWatcher { + int init_wait; + int interval; + int missed_max; +- int vlanid; + char *target_host; + char *source_host; + NMTeamLinkWatcherArpPingFlags flags; ++ int vlanid; + } arp_ping; + }; + }; +-- +2.18.1 + + diff --git a/debian/patches/series b/debian/patches/series index f3f8df16..a7c5076a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,5 @@ Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch Update-dnsmasq-parameters.patch Disable-general-with-expect.patch libnm-Check-self-still-NMManager-or-not.patch +# Upstream backport +git_team_structure.patch |