diff -Nru network-manager-applet-1.2.0/debian/changelog network-manager-applet-1.2.0/debian/changelog --- network-manager-applet-1.2.0/debian/changelog 2016-04-29 14:50:05.000000000 +0000 +++ network-manager-applet-1.2.0/debian/changelog 2016-05-24 07:31:13.000000000 +0000 @@ -1,8 +1,14 @@ +network-manager-applet (1.2.0-0ubuntu0.16.04.2) xenial; urgency=medium + + * cherry-pick upstream patches from post 1.2.2 + + -- Aron Xu Tue, 24 May 2016 15:30:22 +0800 + network-manager-applet (1.2.0-0ubuntu0.16.04.1) xenial; urgency=medium - * Rebase to upstream stable release. + * Rebase to upstream stable release (lp: #1576726) - -- Aron Xu Fri, 29 Apr 2016 22:49:14 +0800 + -- Aron Xu Fri, 29 Apr 2016 22:53:10 +0800 network-manager-applet (1.1.93-1ubuntu1) xenial; urgency=medium @@ -163,7 +169,7 @@ network-manager-applet (1.0.6-2ubuntu4) xenial; urgency=medium * debian/control, debian/n-m-g.install, debian/rules: - - don't build the migration helper, it's for upgrades from < 0.9 + - don't build the migration helper, it's for upgrades from < 0.9 which was before trusty, clears the depends on gnome-keyring and gconf on the way @@ -242,7 +248,7 @@ * New upstream release (LP: #1467267) * debian/control: - Bump build-depends on libnm-util-dev, libnm-glib-dev, libnm-glib-vpn-dev, - network-manager-dev + network-manager-dev * debian/libnm-gtk0.symbols: - Updated * debian/patches/clear-notification-actions.patch: @@ -343,8 +349,8 @@ * New upstream release: 0.9.10.1. * Resync packaging with Debian: - debian/rules: Set DEB_HOST_MULTIARCH, use dh_install exclusions rather - than removing .la and .a files separately. - - debian/control: Build-depends: update NM b-deps, + than removing .la and .a files separately. + - debian/control: Build-depends: update NM b-deps, bump to dh 9, update libgtk/libglib2.0 b-deps versions and make libnm-gtk Multi-Arch-aware. - debian/*.install: update paths for multi-arch. @@ -471,7 +477,7 @@ network-manager-applet (0.9.8.8-0ubuntu5) utopic; urgency=medium * debian/patches/11-user-connections.patch: Unbreak importing VPN - connections. (LP: #1294899) + connections. (LP: #1294899) * debian/patches/git_use_paths_in_vpn_name_files_4867951.patch: use the paths specified in vpn .name files. @@ -635,7 +641,7 @@ network-manager-applet (0.9.8.0-1ubuntu3) saucy; urgency=low - * debian/patches/git_dont_autostart_under_GNOME.patch (LP: #1189309) + * debian/patches/git_dont_autostart_under_GNOME.patch (LP: #1189309) -- Tim Mon, 02 Sep 2013 14:03:33 +1000 @@ -949,7 +955,7 @@ network-manager-applet (0.9.6.0~git201207161252.13c6db8-0ubuntu2) quantal; urgency=low - * debian/patches/lp341684_device_sensitive_disconnect_notify.patch: updated + * debian/patches/lp341684_device_sensitive_disconnect_notify.patch: updated to respect the "disable-disconnected-notifications" settings. (LP: #445872) -- Matvey Marinin Thu, 02 Aug 2012 16:21:04 -0400 @@ -1256,7 +1262,7 @@ network-manager-applet (0.9.1.90-0ubuntu5) oneiric; urgency=low * debian/patches/04-autostart.patch: - - revert: disable autostart when using gnome-shell (LP: #863120) + - revert: disable autostart when using gnome-shell (LP: #863120) -- Mathieu Trudel-Lapierre Fri, 30 Sep 2011 14:34:44 -0400 @@ -1291,7 +1297,7 @@ [ Dylan McCall ] * debian/patches/04-autostart.patch: - - disable autostart when using gnome-shell (LP: #852961) + - disable autostart when using gnome-shell (LP: #852961) [ Mathieu Trudel-Lapierre ] * debian/control: add libnm-gtk0 and libnm-gtk-dev binary packages. @@ -1353,7 +1359,7 @@ * debian/patches/clear-notification-actions.patch: clear actions tied to notifications being sent; otherwise stacking notifications also causes the attached actions to be stacked (resulting in multiple "Don't show this" - buttons appearing in the notification bubble. (LP: #606825) + buttons appearing in the notification bubble. (LP: #606825) * debian/control: drop gnome-bluetooth to Suggests. (LP: #844027) * debian/patches/key-certificate-extensions.patch: allow using a key certificate with a .key extension in network security dialogs. (LP: #839864) @@ -1851,13 +1857,13 @@ * refresh the device disconnection notification patch, update to new code base - updated debian/patches/lp341684_device_sensitive_disconnect_notify.patch * refreshed vpn service name patch, update to new code base - - updated debian/patches/20_use_full_vpn_dialog_service_name_path.patch + - updated debian/patches/20_use_full_vpn_dialog_service_name_path.patch * delete lazy icon loading patch from seb128, it's applied upstream - deleted debian/patches/bgo609134_lazy_icons.patch - - updated debian/patches/series + - updated debian/patches/series * delete lazy notification capabilities checking from pitti: applied upstream - deleted debian/patches/bgo610881_lazy_init_notify_caps.patch - - updated debian/patches/series + - updated debian/patches/series * bump DEB_AUTO_UPDATE_ACLOCAL and DEB_AUTO_UPDATE_AUTOMAKE to 1.11 - update debian/rules * refreshed the patch to always show the tray icon @@ -1913,7 +1919,7 @@ [ Mirco Müller (MacSlow) ] * Make nm-applet correctly update a notification, if the connection-status - has changed. This avoids displaying obsolete notifications to the user, + has changed. This avoids displaying obsolete notifications to the user, which no longer reflect the correct connection-status. Fixes LP: #460144 - add debian/patches/lp460144_correctly_update_notification.patch - update debian/patches/series @@ -1991,7 +1997,7 @@ * upstream 0.8-rc2 release - editor: protect against invalid CEPolkitButton objects (rh #549579) - - menu: ensure active menu item is valid before trying to use it (rh #546901) + - menu: ensure active menu item is valid before trying to use it (rh #546901) - editor: fix bad assignment - core: add "Enable Mobile Broadband" menu item - applet: escape notification text @@ -2012,8 +2018,8 @@ - add deb/debian/patches/revert_more_networks.patch - add deb/debian/patches/revert_disable_notifications.patch - add deb/debian/patches/revert_country_not_listed.patch - - add deb/debian/patches/revert_cleartext_priv_keys.patch - - add deb/debian/patches/revert_enable_broadband.patch + - add deb/debian/patches/revert_cleartext_priv_keys.patch + - add deb/debian/patches/revert_enable_broadband.patch - update debian/series -- Tony Espy Wed, 20 Jan 2010 10:16:56 -0500 @@ -2021,7 +2027,7 @@ network-manager-applet (0.8~a~git.20091014t134532.4033e62-0ubuntu1) karmic; urgency=low * upstream snapshot for karmic-RC 2009-10-14 13:45:32 (GMT) - + 4033e623f7af571d38281f5fb6ab28a77bfe2220 + + 4033e623f7af571d38281f5fb6ab28a77bfe2220 - core: don't crash if we can't get active connection properties from NM (LP: #430535) - gconf: restore 0.7 notification behavior defaults (LP: #444561) @@ -2038,14 +2044,14 @@ - LP: #439956 - Cannot set manual IP and DNS with nm-connection-editor - LP: #438160 - nm-applet loses ipv4 configuration - LP: #431265 - Network Manager can't connect to hidden wireless networks - - LP: #443049 - MASTER nm-connection-editor crashed with SIGSEGV in get_permissions_cb - - LP: #438374 - Failure to retain edited MTU value + - LP: #443049 - MASTER nm-connection-editor crashed with SIGSEGV in get_permissions_cb + - LP: #438374 - Failure to retain edited MTU value - LP: #436839 - Disconnect menu option looks like wireless network [ Tony Espy ] * drop wifi toplevel_sort patch that was committed upstream - delete debian/patches/wifi_toplevel_ap_sort.patch - - update debian/patches/series + - update debian/patches/series [ Alexander Sack ] * drop preview patch that was committed upstream @@ -2098,7 +2104,7 @@ network-manager-applet (0.8~a~git.20090923t220421.1ac8ffd-0ubuntu1) karmic; urgency=low * upstream snapshot 2009-09-23 22:04:21 (GMT) - + 1ac8ffd41a2d162d23713415cec6c3e96fbc3c82 + + 1ac8ffd41a2d162d23713415cec6c3e96fbc3c82 + new upstream UI for beta (prepatched) - LP: #435333 + mini-abi transition respin for libnm-glib-vpn rename fixes LP: #435888 @@ -2184,7 +2190,7 @@ - update patches/lp341684_device_sensitive_disconnect_notify.patch * re-work tarball generation code; added get-curr-source to grab a specific version; get-orig-source now grabs the tip - of new variable GIT_BRANCH; adjusted changelog version to + of new variable GIT_BRANCH; adjusted changelog version to new scheme. - update rules @@ -2518,7 +2524,7 @@ - The nm-editor tool has been replaced by nm-connection-editor. (Closes: #494148, #482107, #485651) - Show the correct configuration for WPA Enterprise setups in - nm-connection-editor (Closes: #480039) + nm-connection-editor (Closes: #480039) [ Sjoerd Simons ] * debian/patches/02-nm-api-update.patch: @@ -2600,7 +2606,7 @@ - The nm-editor tool has been replaced by nm-connection-editor. (Closes: #494148, #482107, #485651) - Show the correct configuration for WPA Enterprise setups in - nm-connection-editor (Closes: #480039) + nm-connection-editor (Closes: #480039) [ Sjoerd Simons ] * debian/patches/02-nm-api-update.patch: @@ -2887,9 +2893,9 @@ - Better handling of VPN and WPA Enterprise security. (Closes: #444977) * debian/control - The Vcs-* fields are now officially supported, so remove the XS- prefix. - - Bump Standards-Version to 3.7.3. No further changes required. + - Bump Standards-Version to 3.7.3. No further changes required. - Fix Xfce spelling error in the package description. - - Bump Build-Depends on libnm-util-dev and network-manager-dev to + - Bump Build-Depends on libnm-util-dev and network-manager-dev to (>= 0.6.6). * Removed patches - debian/patches/10-po_fr.patch (merged upstream) @@ -2920,7 +2926,7 @@ network-manager-applet (0.6.5-2) unstable; urgency=low * debian/patches/30-connection_info_hide_on_delete_event.patch - - Patch from Ubuntu. Hide connection info dialog on delete-event. + - Patch from Ubuntu. Hide connection info dialog on delete-event. (Closes: #406073) -- Michael Biebl Wed, 19 Sep 2007 22:34:18 +0200 diff -Nru network-manager-applet-1.2.0/debian/patches/apple-set-out_icon_name-for-WWAN-connections-for-ind.patch network-manager-applet-1.2.0/debian/patches/apple-set-out_icon_name-for-WWAN-connections-for-ind.patch --- network-manager-applet-1.2.0/debian/patches/apple-set-out_icon_name-for-WWAN-connections-for-ind.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-1.2.0/debian/patches/apple-set-out_icon_name-for-WWAN-connections-for-ind.patch 2016-05-24 07:29:21.000000000 +0000 @@ -0,0 +1,26 @@ +From: Mathieu Trudel-Lapierre +Date: Fri, 20 May 2016 11:07:09 -0500 +Subject: apple: set out_icon_name for WWAN connections for indicator modes + +Otherwise one would see WWAN use the last icon applied in the applet +since indicators cannot use pixmaps for the main indicator icon. + +(cherry picked from commit 73b9a58286bef20741fb66f3bebe3399b3da29e6) +--- + src/mobile-helpers.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c +index 751bea1..76294a1 100644 +--- a/src/mobile-helpers.c ++++ b/src/mobile-helpers.c +@@ -616,6 +616,9 @@ mobile_helper_get_icon (NMDevice *device, + mb_state, + mb_tech, + applet); ++ *out_icon_name = mobile_helper_get_quality_icon_name (quality_valid ? ++ quality : 0); ++ + if ((mb_state != MB_STATE_UNKNOWN) && quality_valid) { + gboolean roaming = (mb_state == MB_STATE_ROAMING); + diff -Nru network-manager-applet-1.2.0/debian/patches/applet-remove-assert-s_con-from-applet_get_active_vp.patch network-manager-applet-1.2.0/debian/patches/applet-remove-assert-s_con-from-applet_get_active_vp.patch --- network-manager-applet-1.2.0/debian/patches/applet-remove-assert-s_con-from-applet_get_active_vp.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-1.2.0/debian/patches/applet-remove-assert-s_con-from-applet_get_active_vp.patch 2016-05-24 07:30:17.000000000 +0000 @@ -0,0 +1,41 @@ +From: Thomas Haller +Date: Fri, 13 May 2016 18:22:01 +0200 +Subject: applet: remove assert(s_con) from applet_get_active_vpn_connection() + +This assertion is just to strict. On client side, we cannot expect that +all connections that NetworkManager exposes are valid. + +In libnm/libnm-glib there was an old bug, that connections which don't verify +could be completely bogus and thus hit this assertion. This got fixed by +https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=23136ecf89f279479337ead355b7ff5e80465a0b +and with a fixed libnm/libnm-glib, we would always expect that a +connection has at least a NMSettingConnection instance. + +Nonetheless, there is no reason to enforce that with an assert. + +This was already fixed before by 22468c05291d3d88ddc68f8983bffe54f29f5f82 +and reverted again by c86d66632ad76aa4a93593a07a9b4e25f18efbf7. + +https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815668 +https://bugzilla.redhat.com/show_bug.cgi?id=1313866 +https://bugzilla.redhat.com/show_bug.cgi?id=1314650 +https://bugzilla.gnome.org/show_bug.cgi?id=765830 +(cherry picked from commit c3255ed740592a2f23a7ebc47f1acd2dd2d768b3) +--- + src/applet.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +Index: network-manager-applet-1.2.0/src/applet.c +=================================================================== +--- network-manager-applet-1.2.0.orig/src/applet.c ++++ network-manager-applet-1.2.0/src/applet.c +@@ -1105,7 +1105,8 @@ applet_get_first_active_vpn_connection ( + continue; + + s_con = nm_connection_get_setting_connection (connection); +- g_assert (s_con); ++ if (!s_con) ++ continue; + + if (!strcmp (nm_setting_connection_get_connection_type (s_con), NM_SETTING_VPN_SETTING_NAME)) { + if (out_state) diff -Nru network-manager-applet-1.2.0/debian/patches/series network-manager-applet-1.2.0/debian/patches/series --- network-manager-applet-1.2.0/debian/patches/series 2016-04-29 14:47:53.000000000 +0000 +++ network-manager-applet-1.2.0/debian/patches/series 2016-05-24 07:29:50.000000000 +0000 @@ -12,3 +12,7 @@ lower_dbusmenu_requirement.patch indicator-by-default.patch ubuntu-vpn-icon-name.patch +wireless-security-fix-failed-assertion-in-default_fi.patch +wireless-security-return-error-on-eap_method_validat.patch +applet-remove-assert-s_con-from-applet_get_active_vp.patch +apple-set-out_icon_name-for-WWAN-connections-for-ind.patch diff -Nru network-manager-applet-1.2.0/debian/patches/wireless-security-fix-failed-assertion-in-default_fi.patch network-manager-applet-1.2.0/debian/patches/wireless-security-fix-failed-assertion-in-default_fi.patch --- network-manager-applet-1.2.0/debian/patches/wireless-security-fix-failed-assertion-in-default_fi.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-1.2.0/debian/patches/wireless-security-fix-failed-assertion-in-default_fi.patch 2016-05-24 07:29:17.000000000 +0000 @@ -0,0 +1,44 @@ +From: Beniamino Galvani +Date: Fri, 13 May 2016 10:26:56 +0200 +Subject: wireless-security: fix failed assertion in default_filter_privkey() + +The @out_encrypted argument of nm_utils_file_is_private_key() must be +initialized to FALSE. When using libnm-glib, keep the value set to +TRUE since encryption detection is not supported for all file types. + +This fixes the following: + +libnm-CRITICAL **: nm_utils_file_is_private_key: assertion 'out_encrypted == NULL || *out_encrypted == FALSE' failed + +https://bugzilla.gnome.org/show_bug.cgi?id=763578 +(cherry picked from commit 8e60431a7d6fc4c5545e58464e10b9131cbd3e6a) +--- + src/wireless-security/eap-method.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c +index e771b58..3c7b454 100644 +--- a/src/wireless-security/eap-method.c ++++ b/src/wireless-security/eap-method.c +@@ -393,7 +393,7 @@ default_filter_privkey (const GtkFileFilterInfo *filter_info, gpointer user_data + const char *extensions[] = { ".der", ".pem", ".p12", ".key", NULL }; + #endif + gboolean require_encrypted = !!user_data; +- gboolean is_encrypted = TRUE; ++ gboolean is_encrypted; + + if (!filter_info->filename) + return FALSE; +@@ -402,10 +402,12 @@ default_filter_privkey (const GtkFileFilterInfo *filter_info, gpointer user_data + if (!file_has_extension (filter_info->filename, extensions)) + return FALSE; + ++ is_encrypted = TRUE; + if ( !file_is_der_or_pem (filter_info->filename, TRUE, &is_encrypted) + && !nm_utils_file_is_pkcs12 (filter_info->filename)) + return FALSE; + #elif defined (LIBNM_BUILD) ++ is_encrypted = FALSE; + if (!nm_utils_file_is_private_key (filter_info->filename, &is_encrypted)) + return FALSE; + #else diff -Nru network-manager-applet-1.2.0/debian/patches/wireless-security-return-error-on-eap_method_validat.patch network-manager-applet-1.2.0/debian/patches/wireless-security-return-error-on-eap_method_validat.patch --- network-manager-applet-1.2.0/debian/patches/wireless-security-return-error-on-eap_method_validat.patch 1970-01-01 00:00:00.000000000 +0000 +++ network-manager-applet-1.2.0/debian/patches/wireless-security-return-error-on-eap_method_validat.patch 2016-05-24 07:29:17.000000000 +0000 @@ -0,0 +1,30 @@ +From: Beniamino Galvani +Date: Fri, 13 May 2016 11:06:12 +0200 +Subject: wireless-security: return error on eap_method_validate_filepicker() + failure + +(cherry picked from commit 2af8361c71416c61b96d01423b1a95d3bc692f9d) +--- + src/wireless-security/eap-method.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c +index 3c7b454..36e34ae 100644 +--- a/src/wireless-security/eap-method.c ++++ b/src/wireless-security/eap-method.c +@@ -226,8 +226,13 @@ eap_method_validate_filepicker (GtkBuilder *builder, + widget = GTK_WIDGET (gtk_builder_get_object (builder, name)); + g_assert (widget); + filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget)); +- if (!filename) +- return (item_type == TYPE_CA_CERT) ? TRUE : FALSE; ++ if (!filename) { ++ if (item_type == TYPE_CA_CERT) ++ success = TRUE; ++ else ++ g_set_error_literal (error, NMA_ERROR, NMA_ERROR_GENERIC, _("no file selected")); ++ goto out; ++ } + + if (!g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) + goto out;