diff options
Diffstat (limited to 'debian/patches')
3 files changed, 59 insertions, 0 deletions
diff --git a/debian/patches/libnm-fix-NMSettingVxlan-ageing-and-limit-max-values.patch b/debian/patches/libnm-fix-NMSettingVxlan-ageing-and-limit-max-values.patch new file mode 100644 index 00000000..a6617827 --- /dev/null +++ b/debian/patches/libnm-fix-NMSettingVxlan-ageing-and-limit-max-values.patch @@ -0,0 +1,35 @@ +From: Dan Williams <dcbw@redhat.com> +Date: Fri, 5 Feb 2016 16:24:40 -0600 +Subject: libnm: fix NMSettingVxlan ageing and limit max values + +They are actually u32 in the kernel. Plus if we use G_MAXINT32 it +causes gtkdoc to write out "Allowed values: <= G_MAXLONG" on i386 +and "Allowed values: <= G_MAXINT" on x86_64, breaking multilib. + +Fixes: 95dfd99afc3fe815b013a8613fbd2cf178355952 +--- + libnm-core/nm-setting-vxlan.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libnm-core/nm-setting-vxlan.c b/libnm-core/nm-setting-vxlan.c +index f1567d8..d071532 100644 +--- a/libnm-core/nm-setting-vxlan.c ++++ b/libnm-core/nm-setting-vxlan.c +@@ -707,7 +707,7 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *setting_class) + g_object_class_install_property + (object_class, PROP_AGEING, + g_param_spec_uint (NM_SETTING_VXLAN_AGEING, "", "", +- 0, G_MAXINT32, 300, ++ 0, G_MAXUINT32, 300, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | +@@ -724,7 +724,7 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *setting_class) + g_object_class_install_property + (object_class, PROP_LIMIT, + g_param_spec_uint (NM_SETTING_VXLAN_LIMIT, "", "", +- 0, G_MAXINT32, 0, ++ 0, G_MAXUINT32, 0, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT | + NM_SETTING_PARAM_INFERRABLE | diff --git a/debian/patches/libnm-fix-copy-paste-error-in-NMSettingVxlan-properties.patch b/debian/patches/libnm-fix-copy-paste-error-in-NMSettingVxlan-properties.patch new file mode 100644 index 00000000..35818406 --- /dev/null +++ b/debian/patches/libnm-fix-copy-paste-error-in-NMSettingVxlan-properties.patch @@ -0,0 +1,22 @@ +From: Dan Williams <dcbw@redhat.com> +Date: Fri, 5 Feb 2016 16:18:05 -0600 +Subject: libnm: fix copy & paste error in NMSettingVxlan properties + +Fixes: 95dfd99afc3fe815b013a8613fbd2cf178355952 +--- + libnm-core/nm-setting-vxlan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libnm-core/nm-setting-vxlan.c b/libnm-core/nm-setting-vxlan.c +index 814623b..f1567d8 100644 +--- a/libnm-core/nm-setting-vxlan.c ++++ b/libnm-core/nm-setting-vxlan.c +@@ -722,7 +722,7 @@ nm_setting_vxlan_class_init (NMSettingVxlanClass *setting_class) + * Since: 1.2 + **/ + g_object_class_install_property +- (object_class, PROP_AGEING, ++ (object_class, PROP_LIMIT, + g_param_spec_uint (NM_SETTING_VXLAN_LIMIT, "", "", + 0, G_MAXINT32, 0, + G_PARAM_READWRITE | diff --git a/debian/patches/series b/debian/patches/series index f6d70ca7..96ddf072 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -12,3 +12,5 @@ tests-use-dbus-run-session-instead-of-dbus-launch.patch systemd-add-chroot-capability.patch Use-bash-explicitly-when-running-the-tests.patch dns-clean-up-error-paths-in-dns-manager.patch +libnm-fix-copy-paste-error-in-NMSettingVxlan-properties.patch +libnm-fix-NMSettingVxlan-ageing-and-limit-max-values.patch |