1 |
commit: 0612ae7f2c47f64a7354b8678e74c00577b52dad |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jul 15 19:40:46 2018 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 15 19:41:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0612ae7f |
7 |
|
8 |
gnome-extra/nm-applet: remove old |
9 |
|
10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
11 |
|
12 |
gnome-extra/nm-applet/Manifest | 1 - |
13 |
.../nm-applet/files/1.4.6-CVE-2017-6590.patch | 253 --------------------- |
14 |
.../nm-applet/files/1.4.6-fix-nma-bindings.patch | 38 ---- |
15 |
.../files/1.4.6-fix-translations-in-g-c-c.patch | 80 ------- |
16 |
.../files/1.4.6-improved-certfile-error-msg.patch | 39 ---- |
17 |
gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild | 62 ----- |
18 |
gnome-extra/nm-applet/nm-applet-1.8.10.ebuild | 62 ----- |
19 |
7 files changed, 535 deletions(-) |
20 |
|
21 |
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest |
22 |
index 1bcdcebb074..071bda456bc 100644 |
23 |
--- a/gnome-extra/nm-applet/Manifest |
24 |
+++ b/gnome-extra/nm-applet/Manifest |
25 |
@@ -1,3 +1,2 @@ |
26 |
-DIST network-manager-applet-1.4.6.tar.xz 1388916 BLAKE2B 697587e4451d37ab91e99e25e40a1d797724e26568d252c77361e25f32508722a58dba1b2b4d2c784150479493c0451173da0b42314ebb17f1b7215628675444 SHA512 f0eab5c50739c2309fa19336e23ead6603dc953b62fff0600a91988df8d41c2f300c22ebd4d5be8654a3fd7bac38dacc23be149f1a7085f10bb55e1830d9472f |
27 |
DIST network-manager-applet-1.8.10.tar.xz 1479032 BLAKE2B 482c7a644edaf4f19ed02ca3f29ffbbcf11c01b1c9572affa430a7edb8314d1381ca6738d998e91537903f6eceea0cff1b82b88e7acd1e9b5665c566271cdf3c SHA512 319a280ad56efe8d1b31db7879aebd6242f2e67453287476d397835069f5f5c6ce7884c84d65e0177a94a554b8f1a6e1d353ab33f8ddfc63269d8133b76b1372 |
28 |
DIST network-manager-applet-1.8.14.tar.xz 1513668 BLAKE2B a07baa11717632333b4957e6cc60b9ee8d9c656874e99337d5e5c9d115c99f10daee94b2a75f72991fa4a20d268122e73cf2ed74f41d29bbee7614965f0b9900 SHA512 e446a2e90faf17e672fa79a53280957dfd9a7a022293dfd578b4ebb71e821c2f387f8ec821c2dcd9a24d1e00e0bd32a4ac3c5d802b9a4fdd7f876c870f406eea |
29 |
|
30 |
diff --git a/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch b/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch |
31 |
deleted file mode 100644 |
32 |
index 25270e1f4c8..00000000000 |
33 |
--- a/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch |
34 |
+++ /dev/null |
35 |
@@ -1,253 +0,0 @@ |
36 |
-This is a squashed to one diff of the following 3 upstream commits: |
37 |
- |
38 |
-From d1ebd01abfad506d9a8797a252d4549c2df2045a Mon Sep 17 00:00:00 2001 |
39 |
-From: Iain Lane <iain@××××××××××××××××.uk> |
40 |
-Date: Fri, 3 Mar 2017 12:27:23 +0000 |
41 |
-Subject: [PATCH 1/3] applet: check permissions before showing 802.1x wifi |
42 |
- dialog (CVE-2017-6590) |
43 |
- |
44 |
-In most places, we (or NM) check permissions before performing actions. |
45 |
-One place we don't is when we need more information when connecting to |
46 |
-and 802.1x network. In that case we pop up a dialog to ask for more |
47 |
-information before initiaing the connection. |
48 |
- |
49 |
-The dialog contains a GTK+ filechooser. We don't want unprivileged users |
50 |
-to have access to this as it allows opening files. |
51 |
- |
52 |
-Check for MODIFY_SYSTEM or MODIFY_OWN before showing the dialog for |
53 |
-802.1x connections. If the user doesn't have or can't get it, don't show |
54 |
-the dialog. They wouldn't have been able to create the connection |
55 |
-anyway. |
56 |
- |
57 |
-This fixes CVE-2017-6590. |
58 |
- |
59 |
-https://mail.gnome.org/archives/networkmanager-list/2017-March/msg00032.html |
60 |
-https://bugs.launchpad.net/bugs/1668321 |
61 |
- |
62 |
-[bgalvani@××××××.com: changed commit subject line, added links] |
63 |
- |
64 |
-(cherry picked from commit 523d0439c9d5633daccc77474f793c82cbd731ee) |
65 |
- |
66 |
-From f1f61ade24296b93044b9719fb2de1b561955e83 Mon Sep 17 00:00:00 2001 |
67 |
-From: Beniamino Galvani <bgalvani@××××××.com> |
68 |
-Date: Tue, 14 Mar 2017 14:18:06 +0100 |
69 |
-Subject: [PATCH 2/3] applet-device-wifi: remove unused functions |
70 |
- |
71 |
-They are not needed since commit 9b002809514a ("applet: remove usage |
72 |
-of dbus-glib and private session D-Bus API"). |
73 |
- |
74 |
-(cherry picked from commit d1c7f4d61f2eca23d90078c587059e4d8d11d3fc) |
75 |
- |
76 |
-From 7a582c5e6536b9e9a542d4791ae38a9d2840936b Mon Sep 17 00:00:00 2001 |
77 |
-From: Beniamino Galvani <bgalvani@××××××.com> |
78 |
-Date: Tue, 14 Mar 2017 14:37:19 +0100 |
79 |
-Subject: [PATCH 3/3] applet-device-wifi: return FALSE on failure of |
80 |
- new_auto_connection() method |
81 |
- |
82 |
-If the permission check fails, we never run the callback: return FALSE |
83 |
-so that the caller can free resources. |
84 |
- |
85 |
-(cherry picked from commit 38303e04cefb56a0a2176c5e30b399b14f21fc05) |
86 |
- |
87 |
-diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c |
88 |
-index 7b8fa6e..cd44e05 100644 |
89 |
---- a/src/applet-device-wifi.c |
90 |
-+++ b/src/applet-device-wifi.c |
91 |
-@@ -40,12 +40,6 @@ static void wifi_dialog_response_cb (GtkDialog *dialog, gint response, gpointer |
92 |
- |
93 |
- static NMAccessPoint *update_active_ap (NMDevice *device, NMDeviceState state, NMApplet *applet); |
94 |
- |
95 |
--static void _do_new_auto_connection (NMApplet *applet, |
96 |
-- NMDevice *device, |
97 |
-- NMAccessPoint *ap, |
98 |
-- AppletNewAutoConnectionCallback callback, |
99 |
-- gpointer callback_data); |
100 |
-- |
101 |
- /*****************************************************************************/ |
102 |
- |
103 |
- typedef struct { |
104 |
-@@ -292,74 +286,6 @@ nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet) |
105 |
- gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE); |
106 |
- } |
107 |
- |
108 |
--static void |
109 |
--dbus_8021x_add_and_activate_cb (GObject *client, |
110 |
-- GAsyncResult *result, |
111 |
-- gpointer user_data) |
112 |
--{ |
113 |
-- GError *error = NULL; |
114 |
-- NMActiveConnection *active; |
115 |
-- |
116 |
-- active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error); |
117 |
-- if (error) |
118 |
-- g_warning ("Failed to add/activate connection: (%d) %s", error->code, error->message); |
119 |
-- |
120 |
-- g_clear_object (&active); |
121 |
-- g_clear_error (&error); |
122 |
--} |
123 |
-- |
124 |
--typedef struct { |
125 |
-- NMApplet *applet; |
126 |
-- NMDevice *device; |
127 |
-- NMAccessPoint *ap; |
128 |
--} Dbus8021xInfo; |
129 |
-- |
130 |
--static void |
131 |
--dbus_connect_8021x_cb (NMConnection *connection, |
132 |
-- gboolean auto_created, |
133 |
-- gboolean canceled, |
134 |
-- gpointer user_data) |
135 |
--{ |
136 |
-- Dbus8021xInfo *info = user_data; |
137 |
-- |
138 |
-- if (canceled == FALSE) { |
139 |
-- g_return_if_fail (connection != NULL); |
140 |
-- |
141 |
-- /* Ask NM to add the new connection and activate it; NM will fill in the |
142 |
-- * missing details based on the specific object and the device. |
143 |
-- */ |
144 |
-- nm_client_add_and_activate_connection_async (info->applet->nm_client, |
145 |
-- connection, |
146 |
-- info->device, |
147 |
-- nm_object_get_path (NM_OBJECT (info->ap)), |
148 |
-- NULL, |
149 |
-- dbus_8021x_add_and_activate_cb, |
150 |
-- info->applet); |
151 |
-- } |
152 |
-- |
153 |
-- g_object_unref (info->device); |
154 |
-- g_object_unref (info->ap); |
155 |
-- memset (info, 0, sizeof (*info)); |
156 |
-- g_free (info); |
157 |
--} |
158 |
-- |
159 |
--gboolean |
160 |
--applet_wifi_connect_to_8021x_network (NMApplet *applet, |
161 |
-- NMDevice *device, |
162 |
-- NMAccessPoint *ap) |
163 |
--{ |
164 |
-- Dbus8021xInfo *info; |
165 |
-- |
166 |
-- info = g_malloc0 (sizeof (*info)); |
167 |
-- info->applet = applet; |
168 |
-- info->device = g_object_ref (device); |
169 |
-- info->ap = g_object_ref (ap); |
170 |
-- |
171 |
-- _do_new_auto_connection (applet, device, ap, dbus_connect_8021x_cb, info); |
172 |
-- return TRUE; |
173 |
--} |
174 |
-- |
175 |
-- |
176 |
- typedef struct { |
177 |
- NMApplet *applet; |
178 |
- NMDeviceWifi *device; |
179 |
-@@ -514,17 +440,28 @@ done: |
180 |
- gtk_widget_destroy (GTK_WIDGET (dialog)); |
181 |
- } |
182 |
- |
183 |
--static void |
184 |
--_do_new_auto_connection (NMApplet *applet, |
185 |
-- NMDevice *device, |
186 |
-- NMAccessPoint *ap, |
187 |
-- AppletNewAutoConnectionCallback callback, |
188 |
-- gpointer callback_data) |
189 |
-+static gboolean |
190 |
-+can_get_permission (NMApplet *applet, NMClientPermission perm) |
191 |
- { |
192 |
-- NMConnection *connection = NULL; |
193 |
-- NMSettingConnection *s_con = NULL; |
194 |
-+ if ( applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_YES |
195 |
-+ || applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_AUTH) |
196 |
-+ return TRUE; |
197 |
-+ return FALSE; |
198 |
-+} |
199 |
-+ |
200 |
-+static gboolean |
201 |
-+wifi_new_auto_connection (NMDevice *device, |
202 |
-+ gpointer dclass_data, |
203 |
-+ AppletNewAutoConnectionCallback callback, |
204 |
-+ gpointer callback_data) |
205 |
-+{ |
206 |
-+ WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data; |
207 |
-+ NMApplet *applet; |
208 |
-+ NMAccessPoint *ap; |
209 |
-+ NMConnection *connection; |
210 |
-+ NMSettingConnection *s_con; |
211 |
- NMSettingWireless *s_wifi = NULL; |
212 |
-- NMSettingWirelessSecurity *s_wsec = NULL; |
213 |
-+ NMSettingWirelessSecurity *s_wsec; |
214 |
- NMSetting8021x *s_8021x = NULL; |
215 |
- GBytes *ssid; |
216 |
- NM80211ApSecurityFlags wpa_flags, rsn_flags; |
217 |
-@@ -532,9 +469,13 @@ _do_new_auto_connection (NMApplet *applet, |
218 |
- MoreInfo *more_info; |
219 |
- char *uuid; |
220 |
- |
221 |
-- g_assert (applet); |
222 |
-- g_assert (device); |
223 |
-- g_assert (ap); |
224 |
-+ g_return_val_if_fail (dclass_data, FALSE); |
225 |
-+ g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); |
226 |
-+ g_return_val_if_fail (NM_IS_ACCESS_POINT (info->ap), FALSE); |
227 |
-+ g_return_val_if_fail (NM_IS_APPLET (info->applet), FALSE); |
228 |
-+ |
229 |
-+ applet = info->applet; |
230 |
-+ ap = info->ap; |
231 |
- |
232 |
- connection = nm_simple_connection_new (); |
233 |
- |
234 |
-@@ -590,6 +531,15 @@ _do_new_auto_connection (NMApplet *applet, |
235 |
- * Dialog Of Doom. |
236 |
- */ |
237 |
- if (s_8021x) { |
238 |
-+ if (!can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM) && |
239 |
-+ !can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN)) { |
240 |
-+ const char *text = _("Failed to add new connection"); |
241 |
-+ const char *err_text = _("Insufficient privileges."); |
242 |
-+ g_warning ("%s: %s", text, err_text); |
243 |
-+ utils_show_error_dialog (_("Connection failure"), text, err_text, FALSE, NULL); |
244 |
-+ g_clear_object (&connection); |
245 |
-+ return FALSE; |
246 |
-+ } |
247 |
- more_info = g_malloc0 (sizeof (*more_info)); |
248 |
- more_info->applet = applet; |
249 |
- more_info->callback = callback; |
250 |
-@@ -606,24 +556,10 @@ _do_new_auto_connection (NMApplet *applet, |
251 |
- /* Everything else can just get activated right away */ |
252 |
- callback (connection, TRUE, FALSE, callback_data); |
253 |
- } |
254 |
--} |
255 |
- |
256 |
--static gboolean |
257 |
--wifi_new_auto_connection (NMDevice *device, |
258 |
-- gpointer dclass_data, |
259 |
-- AppletNewAutoConnectionCallback callback, |
260 |
-- gpointer callback_data) |
261 |
--{ |
262 |
-- WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data; |
263 |
-- |
264 |
-- g_return_val_if_fail (device != NULL, FALSE); |
265 |
-- g_return_val_if_fail (info->ap != NULL, FALSE); |
266 |
-- |
267 |
-- _do_new_auto_connection (info->applet, device, info->ap, callback, callback_data); |
268 |
- return TRUE; |
269 |
- } |
270 |
- |
271 |
-- |
272 |
- static void |
273 |
- wifi_menu_item_activate (GtkMenuItem *item, gpointer user_data) |
274 |
- { |
275 |
-diff --git a/src/applet.h b/src/applet.h |
276 |
-index 41e95a1..b28dfa2 100644 |
277 |
---- a/src/applet.h |
278 |
-+++ b/src/applet.h |
279 |
-@@ -285,9 +285,6 @@ GdkPixbuf * nma_icon_check_and_load (const char *name, |
280 |
- NMApplet *applet); |
281 |
- |
282 |
- gboolean applet_wifi_connect_to_hidden_network (NMApplet *applet); |
283 |
--gboolean applet_wifi_connect_to_8021x_network (NMApplet *applet, |
284 |
-- NMDevice *device, |
285 |
-- NMAccessPoint *ap); |
286 |
- gboolean applet_wifi_create_wifi_network (NMApplet *applet); |
287 |
- gboolean applet_wifi_can_create_wifi_network (NMApplet *applet); |
288 |
- |
289 |
|
290 |
diff --git a/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch b/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch |
291 |
deleted file mode 100644 |
292 |
index 2a04a532739..00000000000 |
293 |
--- a/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch |
294 |
+++ /dev/null |
295 |
@@ -1,38 +0,0 @@ |
296 |
-From 58e47dc92d38974141e1053b25cae02d7c8414b0 Mon Sep 17 00:00:00 2001 |
297 |
-From: Thomas Haller <thaller@××××××.com> |
298 |
-Date: Tue, 7 Mar 2017 09:43:03 +0100 |
299 |
-Subject: [PATCH] libnma/pygobject: libnma/NMA must use libnm/NM instead of |
300 |
- legacy libraries |
301 |
- |
302 |
-libnma uses libnm, and not libnm-util/libnm-glib. Hence, the python bindings |
303 |
-must load "NM" and not "NMClient"/"NetworkManager". |
304 |
- |
305 |
-As it was, the generated bindings for libnma were unusable and loading |
306 |
-them would fail with |
307 |
- |
308 |
- libnm-ERROR **: libnm-util symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported |
309 |
- |
310 |
-https://bugzilla.gnome.org/show_bug.cgi?id=779153 |
311 |
- |
312 |
-Fixes: 76a12beac4e8692f30071169e11e2b521ec4eab7 |
313 |
-(cherry picked from commit 7a59d41e5f6666d0da51f1f7aae7518befdb1182) |
314 |
---- |
315 |
- Makefile.am | 2 +- |
316 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
317 |
- |
318 |
-diff --git a/Makefile.am b/Makefile.am |
319 |
-index a57e15f..e76c9ba 100644 |
320 |
---- a/Makefile.am |
321 |
-+++ b/Makefile.am |
322 |
-@@ -532,7 +532,7 @@ pkgconfig_DATA += src/libnma/libnma.pc |
323 |
- |
324 |
- if HAVE_INTROSPECTION |
325 |
- src/libnma/NMA-1.0.gir: src/libnma/libnma.la |
326 |
--src_libnma_NMA_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0 |
327 |
-+src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0 |
328 |
- src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma |
329 |
- src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS) |
330 |
- src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la |
331 |
--- |
332 |
-2.10.1 |
333 |
- |
334 |
|
335 |
diff --git a/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch b/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch |
336 |
deleted file mode 100644 |
337 |
index 8a1fe825e38..00000000000 |
338 |
--- a/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch |
339 |
+++ /dev/null |
340 |
@@ -1,80 +0,0 @@ |
341 |
-From 718b24286559169ba29f89536c3f6c81dcfe6e30 Mon Sep 17 00:00:00 2001 |
342 |
-From: Beniamino Galvani <bgalvani@××××××.com> |
343 |
-Date: Mon, 13 Mar 2017 21:57:28 +0100 |
344 |
-Subject: [PATCH] libnma,libnm-gtk: use package-aware gettext() macro |
345 |
- |
346 |
-gettext("str") expands to dcgettext(NULL, "str") which gets |
347 |
-translations from the last used domain, while _("str") is equivalent |
348 |
-to g_dgettext(GETTEXT_PACKAGE, "str") which uses the library's |
349 |
-translations. |
350 |
- |
351 |
-https://bugzilla.gnome.org/show_bug.cgi?id=772362 |
352 |
-(cherry picked from commit 9df10e2e758a7b78aa5a69a15900030f45e48fff) |
353 |
---- |
354 |
- src/libnm-gtk/nm-ui-utils.c | 10 +++++----- |
355 |
- src/libnma/nma-ui-utils.c | 10 +++++----- |
356 |
- 2 files changed, 10 insertions(+), 10 deletions(-) |
357 |
- |
358 |
-diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c |
359 |
-index e92ff80..eec9a5f 100644 |
360 |
---- a/src/libnm-gtk/nm-ui-utils.c |
361 |
-+++ b/src/libnm-gtk/nm-ui-utils.c |
362 |
-@@ -642,7 +642,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item) |
363 |
- icon_name_table[item]); |
364 |
- gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry), |
365 |
- GTK_ENTRY_ICON_SECONDARY, |
366 |
-- gettext (icon_desc_table[item])); |
367 |
-+ _(icon_desc_table[item])); |
368 |
- |
369 |
- /* We want to make entry insensitive when ITEM_STORAGE_ASK is selected |
370 |
- * Unfortunately, making GtkEntry insensitive will also make the icon |
371 |
-@@ -843,12 +843,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry, |
372 |
- g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE)); |
373 |
- g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required)); |
374 |
- group = NULL; |
375 |
-- item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0])); |
376 |
-+ item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0])); |
377 |
- group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0])); |
378 |
-- item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1])); |
379 |
-- item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2])); |
380 |
-+ item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1])); |
381 |
-+ item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2])); |
382 |
- if (with_not_required) |
383 |
-- item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3])); |
384 |
-+ item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3])); |
385 |
- |
386 |
- gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]); |
387 |
- gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]); |
388 |
-diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c |
389 |
-index 99e2e97..418ef5f 100644 |
390 |
---- a/src/libnma/nma-ui-utils.c |
391 |
-+++ b/src/libnma/nma-ui-utils.c |
392 |
-@@ -76,7 +76,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item) |
393 |
- icon_name_table[item]); |
394 |
- gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry), |
395 |
- GTK_ENTRY_ICON_SECONDARY, |
396 |
-- gettext (icon_desc_table[item])); |
397 |
-+ _(icon_desc_table[item])); |
398 |
- |
399 |
- /* We want to make entry insensitive when ITEM_STORAGE_ASK is selected |
400 |
- * Unfortunately, making GtkEntry insensitive will also make the icon |
401 |
-@@ -277,12 +277,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry, |
402 |
- g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE)); |
403 |
- g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required)); |
404 |
- group = NULL; |
405 |
-- item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0])); |
406 |
-+ item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0])); |
407 |
- group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0])); |
408 |
-- item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1])); |
409 |
-- item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2])); |
410 |
-+ item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1])); |
411 |
-+ item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2])); |
412 |
- if (with_not_required) |
413 |
-- item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3])); |
414 |
-+ item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3])); |
415 |
- |
416 |
- gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]); |
417 |
- gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]); |
418 |
--- |
419 |
-2.10.1 |
420 |
- |
421 |
|
422 |
diff --git a/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch b/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch |
423 |
deleted file mode 100644 |
424 |
index e83d4c34ca0..00000000000 |
425 |
--- a/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch |
426 |
+++ /dev/null |
427 |
@@ -1,39 +0,0 @@ |
428 |
-From 3609f9687728f2f7f8cdb33723c1d44660b81004 Mon Sep 17 00:00:00 2001 |
429 |
-From: Thomas Haller <thaller@××××××.com> |
430 |
-Date: Thu, 23 Mar 2017 12:28:12 +0100 |
431 |
-Subject: [PATCH] c-e: improve error message for non-existing certificate file |
432 |
- |
433 |
-When the connection references a certifiate file that does not exist, |
434 |
-the GUI's file picker button shows an "(None)", however the "Save" |
435 |
-button is disable with message: |
436 |
- |
437 |
- "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: unspecified error validating eap-method file" |
438 |
- |
439 |
-Slightly improve that by showing instead |
440 |
- |
441 |
- "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: file "..." does not exist" |
442 |
- |
443 |
-The solution is not optimal because the GUI shows file "(None)", |
444 |
-with is some hidden information that makes the connection invalid. |
445 |
- |
446 |
-https://bugzilla.gnome.org/show_bug.cgi?id=780423 |
447 |
-(cherry picked from commit b603844fc50679fc8683227bfa0f3b6c8e77c2c7) |
448 |
---- |
449 |
- src/wireless-security/eap-method.c | 1 + |
450 |
- 1 file changed, 1 insertion(+) |
451 |
- |
452 |
-diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c |
453 |
-index cb733e8..b5c6609 100644 |
454 |
---- a/src/wireless-security/eap-method.c |
455 |
-+++ b/src/wireless-security/eap-method.c |
456 |
-@@ -237,6 +237,7 @@ eap_method_validate_filepicker (GtkBuilder *builder, |
457 |
- |
458 |
- if (!g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) { |
459 |
- success = FALSE; |
460 |
-+ g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("file \"%s\" does not exist"), filename); |
461 |
- goto out; |
462 |
- } |
463 |
- |
464 |
--- |
465 |
-2.10.1 |
466 |
- |
467 |
|
468 |
diff --git a/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild |
469 |
deleted file mode 100644 |
470 |
index 6a00ca01df6..00000000000 |
471 |
--- a/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild |
472 |
+++ /dev/null |
473 |
@@ -1,62 +0,0 @@ |
474 |
-# Copyright 1999-2018 Gentoo Foundation |
475 |
-# Distributed under the terms of the GNU General Public License v2 |
476 |
- |
477 |
-EAPI=6 |
478 |
-GNOME2_EAUTORECONF="yes" |
479 |
-GNOME2_LA_PUNT="yes" |
480 |
-GNOME_ORG_MODULE="network-manager-applet" |
481 |
- |
482 |
-inherit gnome2 |
483 |
- |
484 |
-DESCRIPTION="GNOME applet for NetworkManager" |
485 |
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
486 |
- |
487 |
-LICENSE="GPL-2+" |
488 |
-SLOT="0" |
489 |
-IUSE="+introspection +modemmanager teamd" |
490 |
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" |
491 |
- |
492 |
-RDEPEND=" |
493 |
- app-crypt/libsecret |
494 |
- >=dev-libs/glib-2.32:2[dbus] |
495 |
- >=dev-libs/dbus-glib-0.88 |
496 |
- >=sys-apps/dbus-1.4.1 |
497 |
- >=sys-auth/polkit-0.96-r1 |
498 |
- >=x11-libs/gtk+-3.4:3[introspection?] |
499 |
- >=x11-libs/libnotify-0.7.0 |
500 |
- |
501 |
- app-text/iso-codes |
502 |
- >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?] |
503 |
- net-misc/mobile-broadband-provider-info |
504 |
- |
505 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) |
506 |
- virtual/freedesktop-icon-theme |
507 |
- virtual/libgudev:= |
508 |
- modemmanager? ( net-misc/modemmanager ) |
509 |
- teamd? ( >=dev-libs/jansson-2.3 ) |
510 |
-" |
511 |
-DEPEND="${RDEPEND} |
512 |
- >=dev-util/gtk-doc-am-1.0 |
513 |
- >=dev-util/intltool-0.50.1 |
514 |
- virtual/pkgconfig |
515 |
-" |
516 |
- |
517 |
-PDEPEND="virtual/notification-daemon" #546134 |
518 |
- |
519 |
-PATCHES=( |
520 |
- "${FILESDIR}"/${PV}-fix-nma-bindings.patch # NMA bindings fix to be usable in python etc |
521 |
- "${FILESDIR}"/${PV}-fix-translations-in-g-c-c.patch # g-c-c == gnome-control-center |
522 |
- "${FILESDIR}"/${PV}-CVE-2017-6590.patch # bug 613768 |
523 |
- "${FILESDIR}"/${PV}-improved-certfile-error-msg.patch # bug 613646 |
524 |
-) |
525 |
- |
526 |
-src_configure() { |
527 |
- gnome2_src_configure \ |
528 |
- --without-appindicator \ |
529 |
- --disable-more-warnings \ |
530 |
- --disable-static \ |
531 |
- --localstatedir=/var \ |
532 |
- $(use_enable introspection) \ |
533 |
- $(use_with modemmanager wwan) \ |
534 |
- $(use_with teamd team) |
535 |
-} |
536 |
|
537 |
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild |
538 |
deleted file mode 100644 |
539 |
index 52554e8a0ba..00000000000 |
540 |
--- a/gnome-extra/nm-applet/nm-applet-1.8.10.ebuild |
541 |
+++ /dev/null |
542 |
@@ -1,62 +0,0 @@ |
543 |
-# Copyright 1999-2018 Gentoo Foundation |
544 |
-# Distributed under the terms of the GNU General Public License v2 |
545 |
- |
546 |
-EAPI=6 |
547 |
-GNOME2_LA_PUNT="yes" |
548 |
-GNOME_ORG_MODULE="network-manager-applet" |
549 |
- |
550 |
-inherit gnome2 |
551 |
- |
552 |
-DESCRIPTION="GNOME applet for NetworkManager" |
553 |
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
554 |
- |
555 |
-LICENSE="GPL-2+" |
556 |
-SLOT="0" |
557 |
-IUSE="+introspection gcr +modemmanager selinux teamd" |
558 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 x86" |
559 |
- |
560 |
-RDEPEND=" |
561 |
- >=app-crypt/libsecret-0.18 |
562 |
- >=dev-libs/glib-2.38:2[dbus] |
563 |
- >=dev-libs/dbus-glib-0.88 |
564 |
- >=sys-apps/dbus-1.4.1 |
565 |
- >=sys-auth/polkit-0.96-r1 |
566 |
- >=x11-libs/gtk+-3.10:3[introspection?] |
567 |
- >=x11-libs/libnotify-0.7.0 |
568 |
- |
569 |
- app-text/iso-codes |
570 |
- >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] |
571 |
- net-misc/mobile-broadband-provider-info |
572 |
- |
573 |
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) |
574 |
- virtual/freedesktop-icon-theme |
575 |
- virtual/libgudev:= |
576 |
- gcr? ( >=app-crypt/gcr-3.14:=[gtk] ) |
577 |
- modemmanager? ( net-misc/modemmanager ) |
578 |
- selinux? ( sys-libs/libselinux ) |
579 |
- teamd? ( >=dev-libs/jansson-2.7 ) |
580 |
-" |
581 |
-DEPEND="${RDEPEND} |
582 |
- >=dev-util/gtk-doc-am-1.0 |
583 |
- >=dev-util/intltool-0.50.1 |
584 |
- virtual/pkgconfig |
585 |
-" |
586 |
- |
587 |
-PDEPEND="virtual/notification-daemon" #546134 |
588 |
- |
589 |
-src_configure() { |
590 |
- local myconf=( |
591 |
- --without-appindicator |
592 |
- --disable-lto |
593 |
- --disable-ld-gc |
594 |
- --disable-more-warnings |
595 |
- --disable-static |
596 |
- --localstatedir=/var |
597 |
- $(use_enable introspection) |
598 |
- $(use_with gcr) |
599 |
- $(use_with modemmanager wwan) |
600 |
- $(use_with selinux) |
601 |
- $(use_with teamd team) |
602 |
- ) |
603 |
- gnome2_src_configure "${myconf[@]}" |
604 |
-} |