diff -Nru network-manager-1.4.4/debian/changelog network-manager-1.4.4/debian/changelog --- network-manager-1.4.4/debian/changelog 2017-02-16 23:34:15.000000000 +0100 +++ network-manager-1.4.4/debian/changelog 2017-03-22 07:25:52.000000000 +0100 @@ -1,3 +1,10 @@ +network-manager (1.4.4-1ubuntu3) zesty; urgency=medium + + * Install usr/share/vala/vapi/libnm-glib.* again (LP: #1650972) + * Add fix-format-security.patch to fix ftbfs + + -- Rico Tzschichholz Wed, 22 Mar 2017 07:25:52 +0100 + network-manager (1.4.4-1ubuntu2) zesty; urgency=medium * Cherry-pick back 98974a88 and 47c16e59 (network-manager switching from diff -Nru network-manager-1.4.4/debian/libnm-glib-dev.install network-manager-1.4.4/debian/libnm-glib-dev.install --- network-manager-1.4.4/debian/libnm-glib-dev.install 2017-02-16 23:34:15.000000000 +0100 +++ network-manager-1.4.4/debian/libnm-glib-dev.install 2017-03-22 07:25:49.000000000 +0100 @@ -16,3 +16,4 @@ usr/include/libnm-glib/nm-glib-enum-types.h usr/share/gtk-doc/html/libnm-glib/ usr/share/gir-1.0/NMClient-1.0.gir +usr/share/vala/vapi/libnm-glib.* diff -Nru network-manager-1.4.4/debian/patches/fix-format-security.patch network-manager-1.4.4/debian/patches/fix-format-security.patch --- network-manager-1.4.4/debian/patches/fix-format-security.patch 1970-01-01 01:00:00.000000000 +0100 +++ network-manager-1.4.4/debian/patches/fix-format-security.patch 2017-03-22 07:25:52.000000000 +0100 @@ -0,0 +1,79 @@ +diff --git a/src/nm-manager.c b/src/nm-manager.c +index 1003ebbb9..1edecddba 100644 +--- a/src/nm-manager.c ++++ b/src/nm-manager.c +@@ -5184,9 +5184,9 @@ prop_set_auth_done_cb (NMAuthChain *chain, + priv->auth_chains = g_slist_remove (priv->auth_chains, chain); + result = nm_auth_chain_get_result (chain, pfd->permission); + if (error || (result != NM_AUTH_CALL_RESULT_YES)) { +- reply = g_dbus_message_new_method_error (pfd->message, +- NM_PERM_DENIED_ERROR, +- (error_message = "Not authorized to perform this operation")); ++ reply = g_dbus_message_new_method_error_literal (pfd->message, ++ NM_PERM_DENIED_ERROR, ++ (error_message = "Not authorized to perform this operation")); + if (error) + error_message = error->message; + goto done; +@@ -5195,17 +5195,17 @@ prop_set_auth_done_cb (NMAuthChain *chain, + object = NM_EXPORTED_OBJECT (nm_bus_manager_get_registered_object (priv->dbus_mgr, + g_dbus_message_get_path (pfd->message))); + if (!object) { +- reply = g_dbus_message_new_method_error (pfd->message, +- "org.freedesktop.DBus.Error.UnknownObject", +- (error_message = "Object doesn't exist.")); ++ reply = g_dbus_message_new_method_error_literal (pfd->message, ++ "org.freedesktop.DBus.Error.UnknownObject", ++ (error_message = "Object doesn't exist.")); + goto done; + } + + /* do some extra type checking... */ + if (!nm_exported_object_get_interface_by_type (object, pfd->interface_type)) { +- reply = g_dbus_message_new_method_error (pfd->message, +- "org.freedesktop.DBus.Error.InvalidArgs", +- (error_message = "Object is of unexpected type.")); ++ reply = g_dbus_message_new_method_error_literal (pfd->message, ++ "org.freedesktop.DBus.Error.InvalidArgs", ++ (error_message = "Object is of unexpected type.")); + goto done; + } + +@@ -5218,9 +5218,9 @@ prop_set_auth_done_cb (NMAuthChain *chain, + global_dns = nm_config_data_get_global_dns_config (nm_config_get_data (priv->config)); + + if (global_dns && !nm_global_dns_config_is_internal (global_dns)) { +- reply = g_dbus_message_new_method_error (pfd->message, +- NM_PERM_DENIED_ERROR, +- (error_message = "Global DNS configuration already set via configuration file")); ++ reply = g_dbus_message_new_method_error_literal (pfd->message, ++ NM_PERM_DENIED_ERROR, ++ (error_message = "Global DNS configuration already set via configuration file")); + goto done; + } + /* ... but set the property on the @object itself. It would be correct to set the property +@@ -5262,18 +5262,18 @@ do_set_property_check (gpointer user_data) + + pfd->subject = nm_auth_subject_new_unix_process_from_message (pfd->connection, pfd->message); + if (!pfd->subject) { +- reply = g_dbus_message_new_method_error (pfd->message, +- NM_PERM_DENIED_ERROR, +- (error_message = "Could not determine request UID.")); ++ reply = g_dbus_message_new_method_error_literal (pfd->message, ++ NM_PERM_DENIED_ERROR, ++ (error_message = "Could not determine request UID.")); + goto out; + } + + /* Validate the user request */ + chain = nm_auth_chain_new_subject (pfd->subject, NULL, prop_set_auth_done_cb, pfd); + if (!chain) { +- reply = g_dbus_message_new_method_error (pfd->message, +- NM_PERM_DENIED_ERROR, +- (error_message = "Could not authenticate request.")); ++ reply = g_dbus_message_new_method_error_literal (pfd->message, ++ NM_PERM_DENIED_ERROR, ++ (error_message = "Could not authenticate request.")); + goto out; + } + diff -Nru network-manager-1.4.4/debian/patches/series network-manager-1.4.4/debian/patches/series --- network-manager-1.4.4/debian/patches/series 2017-02-16 23:34:15.000000000 +0100 +++ network-manager-1.4.4/debian/patches/series 2017-03-22 07:25:52.000000000 +0100 @@ -16,3 +16,4 @@ libnm-Check-self-still-NMManager-or-not.patch dns-manager-don-t-merge-split-DNS-search-domains.patch Read-system-connections-from-run.patch +fix-format-security.patch