Merge lp:~noskcaj/network-manager-applet/merge into lp:~network-manager/network-manager-applet/ubuntu

Proposed by Jackson Doak on 2014-06-20
Status: Needs review
Proposed branch: lp:~noskcaj/network-manager-applet/merge
Merge into: lp:~network-manager/network-manager-applet/ubuntu
Diff against target: 184 lines (+7/-152)
4 files modified
debian/changelog (+7/-0)
debian/patches/git_revert_system_ca_cert.patch (+0/-76)
debian/patches/git_use_paths_in_vpn_name_files_4867951.patch (+0/-74)
debian/patches/series (+0/-2)
To merge this branch: bzr merge lp:~noskcaj/network-manager-applet/merge
Reviewer Review Type Date Requested Status
Network-manager 2014-06-20 Pending
Review via email: mp+223992@code.launchpad.net

Description of the change

New upstream bugfix release

To post a comment you must log in.

Unmerged revisions

443. By Jackson Doak on 2014-06-20

* New upstream release.
* Drop git patches

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-06-17 13:53:40 +0000
3+++ debian/changelog 2014-06-20 21:41:26 +0000
4@@ -1,3 +1,10 @@
5+network-manager-applet (0.9.8.10-0ubuntu1) utopic; urgency=medium
6+
7+ * New upstream release.
8+ * Drop git patches
9+
10+ -- Jackson Doak <noskcaj@ubuntu.com> Fri, 20 Jun 2014 08:13:36 +1000
11+
12 network-manager-applet (0.9.8.8-0ubuntu7) utopic; urgency=medium
13
14 * debian/patches/git_revert_system_ca_cert.patch: don't require system CA
15
16=== removed file 'debian/patches/git_revert_system_ca_cert.patch'
17--- debian/patches/git_revert_system_ca_cert.patch 2014-06-11 19:09:24 +0000
18+++ debian/patches/git_revert_system_ca_cert.patch 1970-01-01 00:00:00 +0000
19@@ -1,76 +0,0 @@
20-From c798c40c5dce3bc6d9b615621cefe59660b5a504 Mon Sep 17 00:00:00 2001
21-From: Thomas Haller <thaller@redhat.com>
22-Date: Tue, 29 Oct 2013 21:07:38 +0100
23-Subject: Revert "libnm-gtk: default to system CA certificates for validation
24- for new connections"
25-
26-This reverts commit 3021ce121b162fc69ec2fd800776a5dd28d72042.
27-
28-For EAP connections it usually does not make sense to validate the
29-certificate with the system CA store. User mostly either want to
30-provide the one exact certificate (ca-cert) or don't do any validation
31-at all.
32-
33-Previously, nm-connection-editor set the property system-ca-certs=true
34-for new connections, but there was no field in the UI to unset this
35-setting. This effectively meant, that if the user did not provide a
36-valid ca-cert (or put the certificate in the system wide store) the
37-connection could not be established.
38-
39-Change the behavior, so that new connections created by nm-c-e don't
40-have system-ca-certs set.
41-
42-The system-ca-certs property cannot be configured from the UI and nm-c-e
43-will not touch it in existing connection. This makes sense, because referring
44-to the system store is not a common use case. On the other hand, users who
45-*really* want to use this option, can do so using e.g. nmcli. In that case,
46-nm-c-e will not tamper with the setting.
47-
48-Connections that were created by older versions of nm-c-e might be
49-unable to connect. The system-ca-certs option can be unset with:
50-
51- $ nmcli connection modify id "$ID" 802-1x.system-ca-certs false
52-
53-https://bugzilla.gnome.org/show_bug.cgi?id=702608
54-
55-Signed-off-by: Thomas Haller <thaller@redhat.com>
56-
57-diff --git a/src/wireless-security/eap-method-leap.c b/src/wireless-security/eap-method-leap.c
58-index ad5d369..44f2342 100644
59---- a/src/wireless-security/eap-method-leap.c
60-+++ b/src/wireless-security/eap-method-leap.c
61-@@ -98,7 +98,6 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
62- if (method->new_connection) {
63- g_object_set (s_8021x,
64- NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
65-- NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE,
66- NULL);
67- }
68- }
69-diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c
70-index 117997b..74830bc 100644
71---- a/src/wireless-security/eap-method-simple.c
72-+++ b/src/wireless-security/eap-method-simple.c
73-@@ -162,7 +162,6 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
74- if (method->new_connection && (not_saved == FALSE)) {
75- g_object_set (s_8021x,
76- NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
77-- NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE,
78- NULL);
79- }
80- }
81-diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
82-index b57d1ed..a48b491 100644
83---- a/src/wireless-security/eap-method-tls.c
84-+++ b/src/wireless-security/eap-method-tls.c
85-@@ -186,7 +186,6 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
86- if (method->new_connection) {
87- g_object_set (s_8021x,
88- secret_flag_prop, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
89-- NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE,
90- NULL);
91- }
92-
93---
94-cgit v0.10.1
95-
96
97=== removed file 'debian/patches/git_use_paths_in_vpn_name_files_4867951.patch'
98--- debian/patches/git_use_paths_in_vpn_name_files_4867951.patch 2014-05-16 20:33:39 +0000
99+++ debian/patches/git_use_paths_in_vpn_name_files_4867951.patch 1970-01-01 00:00:00 +0000
100@@ -1,74 +0,0 @@
101-From eba8b9370b6387b1ff0996e9ae5bd689acb32dbc Mon Sep 17 00:00:00 2001
102-From: Michael Biebl <biebl@debian.org>
103-Date: Tue, 1 Apr 2014 20:10:16 +0200
104-Subject: Use the paths specified in the VPN .name files
105-
106-Since LIBDIR of nm-applet and the VPN plugins aren't necessarily the
107-same, use the paths as specified by the VPN plugins and only
108-reconstruct the path if it is not absolute or we fail to load the plugin
109-
110-diff --git a/src/applet-vpn-request.c b/src/applet-vpn-request.c
111-index 4520fd4..09b94c0 100644
112---- a/src/applet-vpn-request.c
113-+++ b/src/applet-vpn-request.c
114-@@ -220,7 +220,7 @@ find_auth_dialog_binary (const char *service,
115- NM_SECRET_AGENT_ERROR_INTERNAL_ERROR,
116- "Could not find the authentication dialog for VPN connection type '%s'",
117- service);
118-- } else {
119-+ } else if (!g_path_is_absolute (prog)) {
120- char *prog_basename;
121-
122- /* Remove any path component, then reconstruct path to the auth
123-diff --git a/src/connection-editor/vpn-helpers.c b/src/connection-editor/vpn-helpers.c
124-index 3bef7f2..c8a3f11 100644
125---- a/src/connection-editor/vpn-helpers.c
126-+++ b/src/connection-editor/vpn-helpers.c
127-@@ -75,7 +75,7 @@ vpn_get_plugins (GError **error)
128- char *path = NULL, *service = NULL;
129- char *so_path = NULL, *so_name = NULL;
130- GKeyFile *keyfile = NULL;
131-- GModule *module;
132-+ GModule *module = NULL;
133- NMVpnPluginUiFactory factory = NULL;
134-
135- if (!g_str_has_suffix (f, ".name"))
136-@@ -95,19 +95,24 @@ vpn_get_plugins (GError **error)
137- if (!so_path)
138- goto next;
139-
140-- /* Remove any path and extension components, then reconstruct path
141-- * to the SO in LIBDIR
142-- */
143-- so_name = g_path_get_basename (so_path);
144-- g_free (so_path);
145-- so_path = g_strdup_printf ("%s/NetworkManager/%s", LIBDIR, so_name);
146-- g_free (so_name);
147-+ if (g_path_is_absolute (so_path))
148-+ module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
149-
150-- module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
151- if (!module) {
152-- g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, "Cannot load the VPN plugin which provides the "
153-- "service '%s'.", service);
154-- goto next;
155-+ /* Remove any path and extension components, then reconstruct path
156-+ * to the SO in LIBDIR
157-+ */
158-+ so_name = g_path_get_basename (so_path);
159-+ g_free (so_path);
160-+ so_path = g_strdup_printf ("%s/NetworkManager/%s", LIBDIR, so_name);
161-+ g_free (so_name);
162-+
163-+ module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
164-+ if (!module) {
165-+ g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, "Cannot load the VPN plugin which provides the "
166-+ "service '%s'.", service);
167-+ goto next;
168-+ }
169- }
170-
171- if (g_module_symbol (module, "nm_vpn_plugin_ui_factory", (gpointer) &factory)) {
172---
173-cgit v0.10.1
174-
175
176=== modified file 'debian/patches/series'
177--- debian/patches/series 2014-06-11 19:09:24 +0000
178+++ debian/patches/series 2014-06-20 21:41:26 +0000
179@@ -1,5 +1,3 @@
180-git_use_paths_in_vpn_name_files_4867951.patch
181-git_revert_system_ca_cert.patch
182 lp289466_always_show_tray_icon.patch
183 lp328572-dxteam-connect-text.patch
184 lp330571_dxteam_wired_connect_text.patch

Subscribers

People subscribed via source and target branches