* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/
@ 2017-03-25 12:08 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2017-03-25 12:08 UTC (permalink / raw
To: gentoo-commits
commit: 5c732474a68cdacc6cb2f17d60e7af9982c057f8
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 25 12:07:13 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 12:08:10 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c732474
gnome-extra/nm-applet: fix CVE-2017-6590, nma bindings and more
Grab patches from upstream nm-1-4 branch for fixing broken NMA bindings,
translations when used in gnome-control-center (gettext domain context issue),
CVE-2017-6590 (a physical access login screen bypass issue with lightdm), and
a certification file error message fix as requested by one of our users specifically.
Thanks-to: Martin Mokrejš
Gentoo-bug: 613646
Gentoo-bug: 613768
.../nm-applet/files/1.4.6-CVE-2017-6590.patch | 253 +++++++++++++++++++++
.../nm-applet/files/1.4.6-fix-nma-bindings.patch | 38 ++++
.../files/1.4.6-fix-translations-in-g-c-c.patch | 80 +++++++
.../files/1.4.6-improved-certfile-error-msg.patch | 39 ++++
| 62 +++++
5 files changed, 472 insertions(+)
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
new file mode 100644
index 00000000000..25270e1f4c8
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.4.6-CVE-2017-6590.patch
@@ -0,0 +1,253 @@
+This is a squashed to one diff of the following 3 upstream commits:
+
+From d1ebd01abfad506d9a8797a252d4549c2df2045a Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain@orangesquash.org.uk>
+Date: Fri, 3 Mar 2017 12:27:23 +0000
+Subject: [PATCH 1/3] applet: check permissions before showing 802.1x wifi
+ dialog (CVE-2017-6590)
+
+In most places, we (or NM) check permissions before performing actions.
+One place we don't is when we need more information when connecting to
+and 802.1x network. In that case we pop up a dialog to ask for more
+information before initiaing the connection.
+
+The dialog contains a GTK+ filechooser. We don't want unprivileged users
+to have access to this as it allows opening files.
+
+Check for MODIFY_SYSTEM or MODIFY_OWN before showing the dialog for
+802.1x connections. If the user doesn't have or can't get it, don't show
+the dialog. They wouldn't have been able to create the connection
+anyway.
+
+This fixes CVE-2017-6590.
+
+https://mail.gnome.org/archives/networkmanager-list/2017-March/msg00032.html
+https://bugs.launchpad.net/bugs/1668321
+
+[bgalvani@redhat.com: changed commit subject line, added links]
+
+(cherry picked from commit 523d0439c9d5633daccc77474f793c82cbd731ee)
+
+From f1f61ade24296b93044b9719fb2de1b561955e83 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Tue, 14 Mar 2017 14:18:06 +0100
+Subject: [PATCH 2/3] applet-device-wifi: remove unused functions
+
+They are not needed since commit 9b002809514a ("applet: remove usage
+of dbus-glib and private session D-Bus API").
+
+(cherry picked from commit d1c7f4d61f2eca23d90078c587059e4d8d11d3fc)
+
+From 7a582c5e6536b9e9a542d4791ae38a9d2840936b Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Tue, 14 Mar 2017 14:37:19 +0100
+Subject: [PATCH 3/3] applet-device-wifi: return FALSE on failure of
+ new_auto_connection() method
+
+If the permission check fails, we never run the callback: return FALSE
+so that the caller can free resources.
+
+(cherry picked from commit 38303e04cefb56a0a2176c5e30b399b14f21fc05)
+
+diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
+index 7b8fa6e..cd44e05 100644
+--- a/src/applet-device-wifi.c
++++ b/src/applet-device-wifi.c
+@@ -40,12 +40,6 @@ static void wifi_dialog_response_cb (GtkDialog *dialog, gint response, gpointer
+
+ static NMAccessPoint *update_active_ap (NMDevice *device, NMDeviceState state, NMApplet *applet);
+
+-static void _do_new_auto_connection (NMApplet *applet,
+- NMDevice *device,
+- NMAccessPoint *ap,
+- AppletNewAutoConnectionCallback callback,
+- gpointer callback_data);
+-
+ /*****************************************************************************/
+
+ typedef struct {
+@@ -292,74 +286,6 @@ nma_menu_add_create_network_item (GtkWidget *menu, NMApplet *applet)
+ gtk_widget_set_sensitive (GTK_WIDGET (menu_item), FALSE);
+ }
+
+-static void
+-dbus_8021x_add_and_activate_cb (GObject *client,
+- GAsyncResult *result,
+- gpointer user_data)
+-{
+- GError *error = NULL;
+- NMActiveConnection *active;
+-
+- active = nm_client_add_and_activate_connection_finish (NM_CLIENT (client), result, &error);
+- if (error)
+- g_warning ("Failed to add/activate connection: (%d) %s", error->code, error->message);
+-
+- g_clear_object (&active);
+- g_clear_error (&error);
+-}
+-
+-typedef struct {
+- NMApplet *applet;
+- NMDevice *device;
+- NMAccessPoint *ap;
+-} Dbus8021xInfo;
+-
+-static void
+-dbus_connect_8021x_cb (NMConnection *connection,
+- gboolean auto_created,
+- gboolean canceled,
+- gpointer user_data)
+-{
+- Dbus8021xInfo *info = user_data;
+-
+- if (canceled == FALSE) {
+- g_return_if_fail (connection != NULL);
+-
+- /* Ask NM to add the new connection and activate it; NM will fill in the
+- * missing details based on the specific object and the device.
+- */
+- nm_client_add_and_activate_connection_async (info->applet->nm_client,
+- connection,
+- info->device,
+- nm_object_get_path (NM_OBJECT (info->ap)),
+- NULL,
+- dbus_8021x_add_and_activate_cb,
+- info->applet);
+- }
+-
+- g_object_unref (info->device);
+- g_object_unref (info->ap);
+- memset (info, 0, sizeof (*info));
+- g_free (info);
+-}
+-
+-gboolean
+-applet_wifi_connect_to_8021x_network (NMApplet *applet,
+- NMDevice *device,
+- NMAccessPoint *ap)
+-{
+- Dbus8021xInfo *info;
+-
+- info = g_malloc0 (sizeof (*info));
+- info->applet = applet;
+- info->device = g_object_ref (device);
+- info->ap = g_object_ref (ap);
+-
+- _do_new_auto_connection (applet, device, ap, dbus_connect_8021x_cb, info);
+- return TRUE;
+-}
+-
+-
+ typedef struct {
+ NMApplet *applet;
+ NMDeviceWifi *device;
+@@ -514,17 +440,28 @@ done:
+ gtk_widget_destroy (GTK_WIDGET (dialog));
+ }
+
+-static void
+-_do_new_auto_connection (NMApplet *applet,
+- NMDevice *device,
+- NMAccessPoint *ap,
+- AppletNewAutoConnectionCallback callback,
+- gpointer callback_data)
++static gboolean
++can_get_permission (NMApplet *applet, NMClientPermission perm)
+ {
+- NMConnection *connection = NULL;
+- NMSettingConnection *s_con = NULL;
++ if ( applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_YES
++ || applet->permissions[perm] == NM_CLIENT_PERMISSION_RESULT_AUTH)
++ return TRUE;
++ return FALSE;
++}
++
++static gboolean
++wifi_new_auto_connection (NMDevice *device,
++ gpointer dclass_data,
++ AppletNewAutoConnectionCallback callback,
++ gpointer callback_data)
++{
++ WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data;
++ NMApplet *applet;
++ NMAccessPoint *ap;
++ NMConnection *connection;
++ NMSettingConnection *s_con;
+ NMSettingWireless *s_wifi = NULL;
+- NMSettingWirelessSecurity *s_wsec = NULL;
++ NMSettingWirelessSecurity *s_wsec;
+ NMSetting8021x *s_8021x = NULL;
+ GBytes *ssid;
+ NM80211ApSecurityFlags wpa_flags, rsn_flags;
+@@ -532,9 +469,13 @@ _do_new_auto_connection (NMApplet *applet,
+ MoreInfo *more_info;
+ char *uuid;
+
+- g_assert (applet);
+- g_assert (device);
+- g_assert (ap);
++ g_return_val_if_fail (dclass_data, FALSE);
++ g_return_val_if_fail (NM_IS_DEVICE (device), FALSE);
++ g_return_val_if_fail (NM_IS_ACCESS_POINT (info->ap), FALSE);
++ g_return_val_if_fail (NM_IS_APPLET (info->applet), FALSE);
++
++ applet = info->applet;
++ ap = info->ap;
+
+ connection = nm_simple_connection_new ();
+
+@@ -590,6 +531,15 @@ _do_new_auto_connection (NMApplet *applet,
+ * Dialog Of Doom.
+ */
+ if (s_8021x) {
++ if (!can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_SYSTEM) &&
++ !can_get_permission (applet, NM_CLIENT_PERMISSION_SETTINGS_MODIFY_OWN)) {
++ const char *text = _("Failed to add new connection");
++ const char *err_text = _("Insufficient privileges.");
++ g_warning ("%s: %s", text, err_text);
++ utils_show_error_dialog (_("Connection failure"), text, err_text, FALSE, NULL);
++ g_clear_object (&connection);
++ return FALSE;
++ }
+ more_info = g_malloc0 (sizeof (*more_info));
+ more_info->applet = applet;
+ more_info->callback = callback;
+@@ -606,24 +556,10 @@ _do_new_auto_connection (NMApplet *applet,
+ /* Everything else can just get activated right away */
+ callback (connection, TRUE, FALSE, callback_data);
+ }
+-}
+
+-static gboolean
+-wifi_new_auto_connection (NMDevice *device,
+- gpointer dclass_data,
+- AppletNewAutoConnectionCallback callback,
+- gpointer callback_data)
+-{
+- WifiMenuItemInfo *info = (WifiMenuItemInfo *) dclass_data;
+-
+- g_return_val_if_fail (device != NULL, FALSE);
+- g_return_val_if_fail (info->ap != NULL, FALSE);
+-
+- _do_new_auto_connection (info->applet, device, info->ap, callback, callback_data);
+ return TRUE;
+ }
+
+-
+ static void
+ wifi_menu_item_activate (GtkMenuItem *item, gpointer user_data)
+ {
+diff --git a/src/applet.h b/src/applet.h
+index 41e95a1..b28dfa2 100644
+--- a/src/applet.h
++++ b/src/applet.h
+@@ -285,9 +285,6 @@ GdkPixbuf * nma_icon_check_and_load (const char *name,
+ NMApplet *applet);
+
+ gboolean applet_wifi_connect_to_hidden_network (NMApplet *applet);
+-gboolean applet_wifi_connect_to_8021x_network (NMApplet *applet,
+- NMDevice *device,
+- NMAccessPoint *ap);
+ gboolean applet_wifi_create_wifi_network (NMApplet *applet);
+ gboolean applet_wifi_can_create_wifi_network (NMApplet *applet);
+
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
new file mode 100644
index 00000000000..2a04a532739
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.4.6-fix-nma-bindings.patch
@@ -0,0 +1,38 @@
+From 58e47dc92d38974141e1053b25cae02d7c8414b0 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Tue, 7 Mar 2017 09:43:03 +0100
+Subject: [PATCH] libnma/pygobject: libnma/NMA must use libnm/NM instead of
+ legacy libraries
+
+libnma uses libnm, and not libnm-util/libnm-glib. Hence, the python bindings
+must load "NM" and not "NMClient"/"NetworkManager".
+
+As it was, the generated bindings for libnma were unusable and loading
+them would fail with
+
+ libnm-ERROR **: libnm-util symbols detected; Mixing libnm with libnm-util/libnm-glib is not supported
+
+https://bugzilla.gnome.org/show_bug.cgi?id=779153
+
+Fixes: 76a12beac4e8692f30071169e11e2b521ec4eab7
+(cherry picked from commit 7a59d41e5f6666d0da51f1f7aae7518befdb1182)
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a57e15f..e76c9ba 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -532,7 +532,7 @@ pkgconfig_DATA += src/libnma/libnma.pc
+
+ if HAVE_INTROSPECTION
+ src/libnma/NMA-1.0.gir: src/libnma/libnma.la
+-src_libnma_NMA_1_0_gir_INCLUDES = NMClient-1.0 NetworkManager-1.0 Gtk-3.0
++src_libnma_NMA_1_0_gir_INCLUDES = NM-1.0 Gtk-3.0
+ src_libnma_NMA_1_0_gir_EXPORT_PACKAGES = libnma
+ src_libnma_NMA_1_0_gir_CFLAGS = $(src_libnma_libnma_la_CFLAGS)
+ src_libnma_NMA_1_0_gir_LIBS = src/libnma/libnma.la
+--
+2.10.1
+
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
new file mode 100644
index 00000000000..8a1fe825e38
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.4.6-fix-translations-in-g-c-c.patch
@@ -0,0 +1,80 @@
+From 718b24286559169ba29f89536c3f6c81dcfe6e30 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani <bgalvani@redhat.com>
+Date: Mon, 13 Mar 2017 21:57:28 +0100
+Subject: [PATCH] libnma,libnm-gtk: use package-aware gettext() macro
+
+gettext("str") expands to dcgettext(NULL, "str") which gets
+translations from the last used domain, while _("str") is equivalent
+to g_dgettext(GETTEXT_PACKAGE, "str") which uses the library's
+translations.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=772362
+(cherry picked from commit 9df10e2e758a7b78aa5a69a15900030f45e48fff)
+---
+ src/libnm-gtk/nm-ui-utils.c | 10 +++++-----
+ src/libnma/nma-ui-utils.c | 10 +++++-----
+ 2 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/src/libnm-gtk/nm-ui-utils.c b/src/libnm-gtk/nm-ui-utils.c
+index e92ff80..eec9a5f 100644
+--- a/src/libnm-gtk/nm-ui-utils.c
++++ b/src/libnm-gtk/nm-ui-utils.c
+@@ -642,7 +642,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
+ icon_name_table[item]);
+ gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
+ GTK_ENTRY_ICON_SECONDARY,
+- gettext (icon_desc_table[item]));
++ _(icon_desc_table[item]));
+
+ /* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
+ * Unfortunately, making GtkEntry insensitive will also make the icon
+@@ -843,12 +843,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
+ g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
+ g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
+ group = NULL;
+- item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
++ item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0]));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
+- item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
+- item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
++ item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1]));
++ item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2]));
+ if (with_not_required)
+- item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
++ item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3]));
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
+ gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
+diff --git a/src/libnma/nma-ui-utils.c b/src/libnma/nma-ui-utils.c
+index 99e2e97..418ef5f 100644
+--- a/src/libnma/nma-ui-utils.c
++++ b/src/libnma/nma-ui-utils.c
+@@ -76,7 +76,7 @@ change_password_storage_icon (GtkWidget *passwd_entry, MenuItem item)
+ icon_name_table[item]);
+ gtk_entry_set_icon_tooltip_text (GTK_ENTRY (passwd_entry),
+ GTK_ENTRY_ICON_SECONDARY,
+- gettext (icon_desc_table[item]));
++ _(icon_desc_table[item]));
+
+ /* We want to make entry insensitive when ITEM_STORAGE_ASK is selected
+ * Unfortunately, making GtkEntry insensitive will also make the icon
+@@ -277,12 +277,12 @@ nma_utils_setup_password_storage (GtkWidget *passwd_entry,
+ g_object_set_data (G_OBJECT (popup_menu), PASSWORD_STORAGE_MENU_TAG, GUINT_TO_POINTER (TRUE));
+ g_object_set_data (G_OBJECT (popup_menu), MENU_WITH_NOT_REQUIRED_TAG, GUINT_TO_POINTER (with_not_required));
+ group = NULL;
+- item[0] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[0]));
++ item[0] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[0]));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item[0]));
+- item[1] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[1]));
+- item[2] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[2]));
++ item[1] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[1]));
++ item[2] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[2]));
+ if (with_not_required)
+- item[3] = gtk_radio_menu_item_new_with_label (group, gettext (icon_desc_table[3]));
++ item[3] = gtk_radio_menu_item_new_with_label (group, _(icon_desc_table[3]));
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[0]);
+ gtk_menu_shell_append (GTK_MENU_SHELL (popup_menu), item[1]);
+--
+2.10.1
+
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
new file mode 100644
index 00000000000..e83d4c34ca0
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.4.6-improved-certfile-error-msg.patch
@@ -0,0 +1,39 @@
+From 3609f9687728f2f7f8cdb33723c1d44660b81004 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Thu, 23 Mar 2017 12:28:12 +0100
+Subject: [PATCH] c-e: improve error message for non-existing certificate file
+
+When the connection references a certifiate file that does not exist,
+the GUI's file picker button shows an "(None)", however the "Save"
+button is disable with message:
+
+ "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: unspecified error validating eap-method file"
+
+Slightly improve that by showing instead
+
+ "Invalid setting Wi-Fi Security: invalid EAP-PEAP CA certificate: file "..." does not exist"
+
+The solution is not optimal because the GUI shows file "(None)",
+with is some hidden information that makes the connection invalid.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=780423
+(cherry picked from commit b603844fc50679fc8683227bfa0f3b6c8e77c2c7)
+---
+ src/wireless-security/eap-method.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/wireless-security/eap-method.c b/src/wireless-security/eap-method.c
+index cb733e8..b5c6609 100644
+--- a/src/wireless-security/eap-method.c
++++ b/src/wireless-security/eap-method.c
+@@ -237,6 +237,7 @@ eap_method_validate_filepicker (GtkBuilder *builder,
+
+ if (!g_file_test (filename, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) {
+ success = FALSE;
++ g_set_error (error, NMA_ERROR, NMA_ERROR_GENERIC, _("file \"%s\" does not exist"), filename);
+ goto out;
+ }
+
+--
+2.10.1
+
--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
new file mode 100644
index 00000000000..4ce79117117
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection modemmanager teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ app-crypt/libsecret
+ >=dev-libs/glib-2.32:2[dbus]
+ >=dev-libs/dbus-glib-0.88
+ >=sys-apps/dbus-1.4.1
+ >=sys-auth/polkit-0.96-r1
+ >=x11-libs/gtk+-3.4:3[introspection?]
+ >=x11-libs/libnotify-0.7.0
+
+ app-text/iso-codes
+ >=net-misc/networkmanager-1.3:=[introspection?,modemmanager?,teamd?]
+ net-misc/mobile-broadband-provider-info
+
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+ virtual/freedesktop-icon-theme
+ virtual/libgudev:=
+ modemmanager? ( net-misc/modemmanager )
+ teamd? ( >=dev-libs/jansson-2.3 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.0
+ >=dev-util/intltool-0.50.1
+ virtual/pkgconfig
+"
+
+PDEPEND="virtual/notification-daemon" #546134
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-fix-nma-bindings.patch # NMA bindings fix to be usable in python etc
+ "${FILESDIR}"/${PV}-fix-translations-in-g-c-c.patch # g-c-c == gnome-control-center
+ "${FILESDIR}"/${PV}-CVE-2017-6590.patch # bug 613768
+ "${FILESDIR}"/${PV}-improved-certfile-error-msg.patch # bug 613646
+)
+
+src_configure() {
+ gnome2_src_configure \
+ --without-appindicator \
+ --disable-more-warnings \
+ --disable-static \
+ --localstatedir=/var \
+ $(use_enable introspection) \
+ $(use_with modemmanager wwan) \
+ $(use_with teamd team)
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/
@ 2018-04-30 17:29 Pacho Ramos
0 siblings, 0 replies; 5+ messages in thread
From: Pacho Ramos @ 2018-04-30 17:29 UTC (permalink / raw
To: gentoo-commits
commit: 5bfcfc6b649b7919173ea465aa1b8576f812e36c
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 30 17:28:41 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Apr 30 17:29:38 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bfcfc6b
gnome-extra/nm-applet: Enable gcr USE by default and fix crashes
- Enable gcr by default (#642730)
- Fix VPN crashes with openconnect (#654412)
- Fix crashes when editing certs
(https://bugzilla.gnome.org/show_bug.cgi?id=785674)
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../files/nm-applet-1.8.10-cert-chooser.patch | 38 ++++++
.../files/nm-applet-1.8.10-vpn-crash.patch | 137 +++++++++++++++++++++
| 72 +++++++++++
3 files changed, 247 insertions(+)
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
new file mode 100644
index 00000000000..9aad2396953
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
@@ -0,0 +1,38 @@
+From 4d2523b482ab78134dafc02c9b99bd15f1a9174a Mon Sep 17 00:00:00 2001
+From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
+Date: Sun, 14 Jan 2018 23:28:15 +0100
+Subject: [PATCH 1/1] libnma/cert-chooser: handle case of no avalable modules
+
+Cause: Apparently it's perfectly okay if the list of modules is empty
+(e.g., NULL). However, the code assume that this indicates an error,
+tries to print the NULL error, and crashes.
+
+[lkundrak@v3.sk: cosmetic changes]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=785674
+(cherry picked from commit a37483c1a364ef3cc1cfa29e7ad51ca108d75674)
+---
+ src/libnma/nma-cert-chooser-button.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/libnma/nma-cert-chooser-button.c b/src/libnma/nma-cert-chooser-button.c
+index c7089390..00651765 100644
+--- a/src/libnma/nma-cert-chooser-button.c
++++ b/src/libnma/nma-cert-chooser-button.c
+@@ -93,10 +93,10 @@ modules_initialized (GObject *object, GAsyncResult *res, gpointer user_data)
+ gchar *label;
+
+ modules = gck_modules_initialize_registered_finish (res, &error);
+- if (!modules) {
++ if (error) {
+ /* The Front Fell Off. */
+- g_critical ("Error getting registered modules: %s", error->message);
+- g_error_free (error);
++ g_warning ("Error getting registered modules: %s", error->message);
++ g_clear_error (&error);
+ }
+
+ model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (self)));
+--
+2.14.3
+
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
new file mode 100644
index 00000000000..8f217af2dac
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
@@ -0,0 +1,137 @@
+From 46f99b295e59f44dfde50ec90e7c09627d32431e Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Wed, 20 Dec 2017 13:23:12 +0100
+Subject: [PATCH 1/2] shared/compat: fix memory handling of
+ nm_setting_vpn_get_*_keys
+
+The compat implementations return a (transfer none) strv instead of a
+(transfer container) one. This has caused double frees in nm-applet:
+https://bugs.archlinux.org/task/56772
+
+Don't copy the keys and don't free the container later.
+
+[thaller@redhat.com: patch adjusted to avoid compiler warning]
+
+Patch imported from NetworkManager commit 8ac8c01162235c2c198bfaf25fb7d1a57a595ce5.
+
+Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
+(cherry picked from commit 0c90e08f77b71d2bda699cf032fceec0122bbf82)
+---
+ shared/nm-utils/nm-compat.c | 10 +---------
+ 1 file changed, 1 insertion(+), 9 deletions(-)
+
+diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
+index 22ab675d..47035e62 100644
+--- a/shared/nm-utils/nm-compat.c
++++ b/shared/nm-utils/nm-compat.c
+@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
+ {
+ GPtrArray *a = user_data;
+
+- g_ptr_array_add (a, g_strdup (key));
++ g_ptr_array_add (a, (gpointer) key);
+ }
+
+ static const char **
+@@ -55,14 +55,6 @@ _get_keys (NMSettingVpn *setting,
+ g_ptr_array_sort (a, nm_strcmp_p);
+ g_ptr_array_add (a, NULL);
+ keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
+-
+- /* we need to cache the keys *somewhere*. */
+- g_object_set_qdata_full (G_OBJECT (setting),
+- is_secrets
+- ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
+- : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
+- keys,
+- (GDestroyNotify) g_strfreev);
+ }
+
+ NM_SET_OUT (out_length, len);
+--
+2.14.3
+
+
+From 0d13a8b4064c83146714ecee86b69042aca35f9e Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Thu, 21 Dec 2017 20:36:48 +0100
+Subject: [PATCH 2/2] shared/compat: fix memory handling of
+ nm_setting_vpn_get_*_keys()
+
+The previous fix was bad because the keys do not come from NMSettingVpn's hash
+table but are copies that are freed by nm_setting_vpn_foreach_* before
+it returns.
+
+[thaller@redhat.com: import shared code from NetworkManager, merging
+three patches together.]
+
+Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
+Fixes: 0c90e08f77b71d2bda699cf032fceec0122bbf82
+
+https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00069.html
+https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00070.html
+(cherry picked from commit a52ccb2fe170558fc0aab4dd1d15ba8808b10951)
+---
+ shared/nm-utils/nm-compat.c | 29 ++++++++++++++++++++++-------
+ 1 file changed, 22 insertions(+), 7 deletions(-)
+
+diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
+index 47035e62..90328c06 100644
+--- a/shared/nm-utils/nm-compat.c
++++ b/shared/nm-utils/nm-compat.c
+@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
+ {
+ GPtrArray *a = user_data;
+
+- g_ptr_array_add (a, (gpointer) key);
++ g_ptr_array_add (a, g_strdup (key));
+ }
+
+ static const char **
+@@ -40,22 +40,37 @@ _get_keys (NMSettingVpn *setting,
+ {
+ guint len;
+ const char **keys = NULL;
+- gs_unref_ptrarray GPtrArray *a = NULL;
++ GPtrArray *a;
+
+ nm_assert (NM_IS_SETTING_VPN (setting));
+
+- a = g_ptr_array_new ();
++ if (is_secrets)
++ len = nm_setting_vpn_get_num_secrets (setting);
++ else
++ len = nm_setting_vpn_get_num_data_items (setting);
++
++ a = g_ptr_array_sized_new (len + 1);
++
+ if (is_secrets)
+ nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
+ else
+ nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
+- len = a->len;
+
+- if (a->len) {
++ len = a->len;
++ if (len) {
+ g_ptr_array_sort (a, nm_strcmp_p);
+ g_ptr_array_add (a, NULL);
+- keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
+- }
++ keys = g_memdup (a->pdata, a->len * sizeof (gpointer));
++
++ /* we need to cache the keys *somewhere*. */
++ g_object_set_qdata_full (G_OBJECT (setting),
++ is_secrets
++ ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
++ : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
++ g_ptr_array_free (a, FALSE),
++ (GDestroyNotify) g_strfreev);
++ } else
++ g_ptr_array_free (a, TRUE);
+
+ NM_SET_OUT (out_length, len);
+ return keys;
+--
+2.14.3
+
--git a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
new file mode 100644
index 00000000000..651cf34423a
--- /dev/null
+++ b/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+GNOME_ORG_MODULE="network-manager-applet"
+
+inherit gnome2
+
+DESCRIPTION="GNOME applet for NetworkManager"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="+introspection +gcr +modemmanager selinux teamd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ >=app-crypt/libsecret-0.18
+ >=dev-libs/glib-2.38:2[dbus]
+ >=dev-libs/dbus-glib-0.88
+ >=sys-apps/dbus-1.4.1
+ >=sys-auth/polkit-0.96-r1
+ >=x11-libs/gtk+-3.10:3[introspection?]
+ >=x11-libs/libnotify-0.7.0
+
+ app-text/iso-codes
+ >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
+ net-misc/mobile-broadband-provider-info
+
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+ virtual/freedesktop-icon-theme
+ virtual/libgudev:=
+ gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
+ modemmanager? ( net-misc/modemmanager )
+ selinux? ( sys-libs/libselinux )
+ teamd? ( >=dev-libs/jansson-2.7 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.0
+ >=dev-util/intltool-0.50.1
+ virtual/pkgconfig
+"
+
+PDEPEND="virtual/notification-daemon" #546134
+
+PATCHES=(
+ # shared/compat: fix memory handling of nm_setting_vpn_get_*_keys
+ # (from 'master')
+ "${FILESDIR}"/${P}-vpn-crash.patch
+
+ # libnma/cert-chooser: handle case of no avalable modules (from
+ # 'master')
+ "${FILESDIR}"/${P}-cert-chooser.patch
+)
+
+src_configure() {
+ local myconf=(
+ --without-appindicator
+ --disable-lto
+ --disable-ld-gc
+ --disable-more-warnings
+ --disable-static
+ --localstatedir=/var
+ $(use_enable introspection)
+ $(use_with gcr)
+ $(use_with modemmanager wwan)
+ $(use_with selinux)
+ $(use_with teamd team)
+ )
+ gnome2_src_configure "${myconf[@]}"
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/
@ 2019-02-11 19:31 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2019-02-11 19:31 UTC (permalink / raw
To: gentoo-commits
commit: 0bfe07d28a9f4df96519daf7e2e145cba36536aa
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 11 19:28:31 2019 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Mon Feb 11 19:28:31 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bfe07d2
gnome-extra/nm-applet: remove old
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 1 -
.../files/nm-applet-1.8.10-cert-chooser.patch | 38 ------
.../files/nm-applet-1.8.10-vpn-crash.patch | 137 ---------------------
| 72 -----------
4 files changed, 248 deletions(-)
--git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 724703bbbc0..9de3eccb2a9 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1,2 @@
-DIST network-manager-applet-1.8.10.tar.xz 1479032 BLAKE2B 482c7a644edaf4f19ed02ca3f29ffbbcf11c01b1c9572affa430a7edb8314d1381ca6738d998e91537903f6eceea0cff1b82b88e7acd1e9b5665c566271cdf3c SHA512 319a280ad56efe8d1b31db7879aebd6242f2e67453287476d397835069f5f5c6ce7884c84d65e0177a94a554b8f1a6e1d353ab33f8ddfc63269d8133b76b1372
DIST network-manager-applet-1.8.18.tar.xz 1550448 BLAKE2B 93e0075b87c13f81d3551a62da2cfc8fa41f478043c1d19540aaa6fa3ae149ce1f08d931a8141473bb759e09fbb231bd29e9d1aec8f97fa670c059b83489d48e SHA512 4871d95f3260beb8c3207e5ec8e25437b3d01758afc3bfe7d877774b21a05f4523449ee32e4cff27c082fefef88fed01db718d2227d6896c3c9b85d09cee927b
DIST network-manager-applet-1.8.20.tar.xz 1551392 BLAKE2B 91258012715f226467126e4eefdfcd6ebde36958be80ae5e264dbf5168e0b772ce04404030d3f7dac9a6f72088918a2c5160aba694b6b7f7d4d6289b716b76f1 SHA512 5020aefe1803ad3b59562478e793737b52a3e5fd294470cfb430c73937cdbc0be6ecba5f3f8e8dbcc5bb5ac293df2866ecc919dd5019a3e681a434078d235a41
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
deleted file mode 100644
index 9aad2396953..00000000000
--- a/gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 4d2523b482ab78134dafc02c9b99bd15f1a9174a Mon Sep 17 00:00:00 2001
-From: Ben Wiederhake <BenWiederhake.GitHub@gmx.de>
-Date: Sun, 14 Jan 2018 23:28:15 +0100
-Subject: [PATCH 1/1] libnma/cert-chooser: handle case of no avalable modules
-
-Cause: Apparently it's perfectly okay if the list of modules is empty
-(e.g., NULL). However, the code assume that this indicates an error,
-tries to print the NULL error, and crashes.
-
-[lkundrak@v3.sk: cosmetic changes]
-
-https://bugzilla.gnome.org/show_bug.cgi?id=785674
-(cherry picked from commit a37483c1a364ef3cc1cfa29e7ad51ca108d75674)
----
- src/libnma/nma-cert-chooser-button.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libnma/nma-cert-chooser-button.c b/src/libnma/nma-cert-chooser-button.c
-index c7089390..00651765 100644
---- a/src/libnma/nma-cert-chooser-button.c
-+++ b/src/libnma/nma-cert-chooser-button.c
-@@ -93,10 +93,10 @@ modules_initialized (GObject *object, GAsyncResult *res, gpointer user_data)
- gchar *label;
-
- modules = gck_modules_initialize_registered_finish (res, &error);
-- if (!modules) {
-+ if (error) {
- /* The Front Fell Off. */
-- g_critical ("Error getting registered modules: %s", error->message);
-- g_error_free (error);
-+ g_warning ("Error getting registered modules: %s", error->message);
-+ g_clear_error (&error);
- }
-
- model = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (self)));
---
-2.14.3
-
diff --git a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch b/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
deleted file mode 100644
index 8f217af2dac..00000000000
--- a/gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From 46f99b295e59f44dfde50ec90e7c09627d32431e Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Wed, 20 Dec 2017 13:23:12 +0100
-Subject: [PATCH 1/2] shared/compat: fix memory handling of
- nm_setting_vpn_get_*_keys
-
-The compat implementations return a (transfer none) strv instead of a
-(transfer container) one. This has caused double frees in nm-applet:
-https://bugs.archlinux.org/task/56772
-
-Don't copy the keys and don't free the container later.
-
-[thaller@redhat.com: patch adjusted to avoid compiler warning]
-
-Patch imported from NetworkManager commit 8ac8c01162235c2c198bfaf25fb7d1a57a595ce5.
-
-Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
-(cherry picked from commit 0c90e08f77b71d2bda699cf032fceec0122bbf82)
----
- shared/nm-utils/nm-compat.c | 10 +---------
- 1 file changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
-index 22ab675d..47035e62 100644
---- a/shared/nm-utils/nm-compat.c
-+++ b/shared/nm-utils/nm-compat.c
-@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
- {
- GPtrArray *a = user_data;
-
-- g_ptr_array_add (a, g_strdup (key));
-+ g_ptr_array_add (a, (gpointer) key);
- }
-
- static const char **
-@@ -55,14 +55,6 @@ _get_keys (NMSettingVpn *setting,
- g_ptr_array_sort (a, nm_strcmp_p);
- g_ptr_array_add (a, NULL);
- keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
--
-- /* we need to cache the keys *somewhere*. */
-- g_object_set_qdata_full (G_OBJECT (setting),
-- is_secrets
-- ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
-- : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
-- keys,
-- (GDestroyNotify) g_strfreev);
- }
-
- NM_SET_OUT (out_length, len);
---
-2.14.3
-
-
-From 0d13a8b4064c83146714ecee86b69042aca35f9e Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
-Date: Thu, 21 Dec 2017 20:36:48 +0100
-Subject: [PATCH 2/2] shared/compat: fix memory handling of
- nm_setting_vpn_get_*_keys()
-
-The previous fix was bad because the keys do not come from NMSettingVpn's hash
-table but are copies that are freed by nm_setting_vpn_foreach_* before
-it returns.
-
-[thaller@redhat.com: import shared code from NetworkManager, merging
-three patches together.]
-
-Fixes: e93ca7fc129ec0f29f5313a3aa12839914df8fa2
-Fixes: 0c90e08f77b71d2bda699cf032fceec0122bbf82
-
-https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00069.html
-https://mail.gnome.org/archives/networkmanager-list/2017-December/msg00070.html
-(cherry picked from commit a52ccb2fe170558fc0aab4dd1d15ba8808b10951)
----
- shared/nm-utils/nm-compat.c | 29 ++++++++++++++++++++++-------
- 1 file changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/shared/nm-utils/nm-compat.c b/shared/nm-utils/nm-compat.c
-index 47035e62..90328c06 100644
---- a/shared/nm-utils/nm-compat.c
-+++ b/shared/nm-utils/nm-compat.c
-@@ -30,7 +30,7 @@ _get_keys_cb (const char *key, const char *val, gpointer user_data)
- {
- GPtrArray *a = user_data;
-
-- g_ptr_array_add (a, (gpointer) key);
-+ g_ptr_array_add (a, g_strdup (key));
- }
-
- static const char **
-@@ -40,22 +40,37 @@ _get_keys (NMSettingVpn *setting,
- {
- guint len;
- const char **keys = NULL;
-- gs_unref_ptrarray GPtrArray *a = NULL;
-+ GPtrArray *a;
-
- nm_assert (NM_IS_SETTING_VPN (setting));
-
-- a = g_ptr_array_new ();
-+ if (is_secrets)
-+ len = nm_setting_vpn_get_num_secrets (setting);
-+ else
-+ len = nm_setting_vpn_get_num_data_items (setting);
-+
-+ a = g_ptr_array_sized_new (len + 1);
-+
- if (is_secrets)
- nm_setting_vpn_foreach_secret (setting, _get_keys_cb, a);
- else
- nm_setting_vpn_foreach_data_item (setting, _get_keys_cb, a);
-- len = a->len;
-
-- if (a->len) {
-+ len = a->len;
-+ if (len) {
- g_ptr_array_sort (a, nm_strcmp_p);
- g_ptr_array_add (a, NULL);
-- keys = (const char **) g_ptr_array_free (g_steal_pointer (&a), FALSE);
-- }
-+ keys = g_memdup (a->pdata, a->len * sizeof (gpointer));
-+
-+ /* we need to cache the keys *somewhere*. */
-+ g_object_set_qdata_full (G_OBJECT (setting),
-+ is_secrets
-+ ? NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_secret_keys")
-+ : NM_CACHED_QUARK ("libnm._nm_setting_vpn_get_data_keys"),
-+ g_ptr_array_free (a, FALSE),
-+ (GDestroyNotify) g_strfreev);
-+ } else
-+ g_ptr_array_free (a, TRUE);
-
- NM_SET_OUT (out_length, len);
- return keys;
---
-2.14.3
-
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
deleted file mode 100644
index 7ce48b41917..00000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="+introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND="
- >=app-crypt/libsecret-0.18
- >=dev-libs/glib-2.38:2[dbus]
- >=dev-libs/dbus-glib-0.88
- >=sys-apps/dbus-1.4.1
- >=sys-auth/polkit-0.96-r1
- >=x11-libs/gtk+-3.10:3[introspection?]
- >=x11-libs/libnotify-0.7.0
-
- app-text/iso-codes
- >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
- net-misc/mobile-broadband-provider-info
-
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
- virtual/freedesktop-icon-theme
- virtual/libgudev:=
- gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
- modemmanager? ( net-misc/modemmanager )
- selinux? ( sys-libs/libselinux )
- teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.0
- >=dev-util/intltool-0.50.1
- virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-PATCHES=(
- # shared/compat: fix memory handling of nm_setting_vpn_get_*_keys
- # (from 'master')
- "${FILESDIR}"/${P}-vpn-crash.patch
-
- # libnma/cert-chooser: handle case of no avalable modules (from
- # 'master')
- "${FILESDIR}"/${P}-cert-chooser.patch
-)
-
-src_configure() {
- local myconf=(
- --without-appindicator
- --disable-lto
- --disable-ld-gc
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- $(use_enable introspection)
- $(use_with gcr)
- $(use_with modemmanager wwan)
- $(use_with selinux)
- $(use_with teamd team)
- )
- gnome2_src_configure "${myconf[@]}"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/
@ 2020-04-19 17:46 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2020-04-19 17:46 UTC (permalink / raw
To: gentoo-commits
commit: 99aded83423bc72a951aae9d4b890fe5670ec607
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 18 17:30:28 2020 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Apr 19 17:46:19 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99aded83
gnome-extra/nm-applet: fix bashisms in autoconf
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
.../nm-applet/files/1.8.24-fix-bashisms.patch | 130 +++++++++++++++++++++
| 5 +
2 files changed, 135 insertions(+)
diff --git a/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch b/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch
new file mode 100644
index 00000000000..36851e1ca3a
--- /dev/null
+++ b/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch
@@ -0,0 +1,130 @@
+From 64143dc3da8f04478acc7a875b7e9d6cb0d653b9 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 19 Apr 2020 15:08:20 +0200
+Subject: [PATCH] Remove subshells and fix invalid test syntax
+
+---
+ configure.ac | 22 +++++++++++-----------
+ m4/introspection.m4 | 4 ++--
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 22f34589..56a56fee 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -126,7 +126,7 @@ dnl
+ GTK_DOC_CHECK(1.0)
+
+ AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--with-libnm-gtk], [build legacy library libnm-gtk which depends on libnm-glib/libnm-util/dbus-glib (deprecated)]))
+-if test "$with_libnm_gtk" == yes; then
++if test "$with_libnm_gtk" = yes; then
+ PKG_CHECK_MODULES(LIBNM_GLIB,
+ [gio-2.0 >= 2.38
+ NetworkManager >= 1.7
+@@ -145,7 +145,7 @@ Configure without --with-libnm-gtk if you do not need the legacy library])])
+ else
+ with_libnm_gtk=no
+ fi
+-AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" == "yes")
++AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" = "yes")
+
+ PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0])
+ LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
+@@ -166,7 +166,7 @@ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10)
+ GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_10"
+
+ AC_ARG_WITH(libnma-gtk4, AS_HELP_STRING([--with-libnma-gtk4], [build EXPERIMENTAL libnma-gtk4 library for use with GTK4]))
+-if test "$with_libnma_gtk4" == yes; then
++if test "$with_libnma_gtk4" = yes; then
+ PKG_CHECK_MODULES(GTK4, gtk4 >= 3.94)
+ GTK4_CFLAGS="$GTK4_CFLAGS -DGTK_VERSION_MIN_REQUIRED=GTK_VERSION_3_96 -DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_96"
+ else
+@@ -214,7 +214,7 @@ AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
+
+ dnl ModemManager1 with libmm-glib for WWAN support
+ AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)]))
+-if (test "${with_wwan}" == "no"); then
++if test "${with_wwan}" = "no"; then
+ AC_DEFINE(WITH_WWAN, 0, [Define if you have ModemManager/WWAN support])
+ else
+ PKG_CHECK_MODULES(MM_GLIB,
+@@ -229,7 +229,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
+
+ dnl SELinux
+ AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [Enable support for adjusting SELinux labels in configuration editor (default: yes)]))
+-if (test "${with_selinux}" == "no"); then
++if test "${with_selinux}" = "no"; then
+ AC_DEFINE(WITH_SELINUX, 0, [Define if libselinux is available])
+ else
+ PKG_CHECK_MODULES(SELINUX,
+@@ -241,7 +241,7 @@ AM_CONDITIONAL(WITH_SELINUX, test "${with_selinux}" != "no")
+
+ dnl Jansson for team configuration editing
+ AC_ARG_WITH(team, AS_HELP_STRING([--with-team], [Enable team configuration editor (default: yes)]))
+-if (test "${with_team}" == "no"); then
++if test "${with_team}" = "no"; then
+ AC_DEFINE(WITH_JANSSON, 0, [Define if Jansson is available])
+ else
+ PKG_CHECK_MODULES(JANSSON,
+@@ -253,7 +253,7 @@ AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no")
+
+ dnl GCR for PKCS#11 enabled certificate chooser
+ AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable advanced certificate chooser (default: auto)]))
+-if (test "${with_gcr}" == "no"); then
++if test "${with_gcr}" = "no"; then
+ have_gcr=no
+ else
+ PKG_CHECK_MODULES(GCR,
+@@ -311,15 +311,15 @@ else
+ have_gcr=no);
+ fi
+
+-if (test "${have_gcr}" == "yes"); then
++if test "${have_gcr}" = "yes"; then
+ AC_DEFINE(WITH_GCR, 1, [Define if Gcr is available])
+ else
+- if (test "${with_gcr}" == "yes"); then
++ if test "${with_gcr}" = "yes"; then
+ AC_MSG_ERROR([gcr support was requested, but the gcr library is not available.])
+ fi
+ AC_DEFINE(WITH_GCR, 0, [Define if Gcr is available])
+ fi
+-AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" == "yes")
++AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" = "yes")
+
+ dnl Check for gobject introspection
+ GOBJECT_INTROSPECTION_CHECK([0.9.6])
+@@ -334,7 +334,7 @@ NM_LD_GC
+
+ # Disable extra compiler warning until GTK4 doesn't trigger it via graphene
+ # https://github.com/ebassi/graphene/issues/134
+-if test "$with_libnma_gtk4" == yes; then
++if test "$with_libnma_gtk4" = yes; then
+ _CFLAGS_SAVED="$CFLAGS"
+ CFLAGS="$CFLAGS $GTK4_CFLAGS"
+ NM_COMPILER_WARNING([_CFLAGS], [float-equal], [#include <gtk/gtk.h>])
+diff --git a/m4/introspection.m4 b/m4/introspection.m4
+index f3bda0e7..8c64bd04 100644
+--- a/m4/introspection.m4
++++ b/m4/introspection.m4
+@@ -31,7 +31,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+ INTROSPECTION_GIRDIR=
+ INTROSPECTION_TYPELIBDIR=
+
+- if test "x$enable_introspection" == "xno"; then
++ if test "x$enable_introspection" = "xno"; then
+ found_introspection="no"
+ else
+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], [
+@@ -53,7 +53,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
+ AC_MSG_RESULT([$found_introspection])
+ ], [found_introspection="no (not installed)"])
+
+- if test "x$enable_introspection" == "xyes"; then
++ if test "x$enable_introspection" = "xyes"; then
+ if test "x$found_introspection" != "xyes"; then
+ AC_MSG_ERROR([introspection enabled but can't be used])
+ fi
+--
+2.26.0
+
--git a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
index f8af43807f4..09b643ef42f 100644
--- a/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.8.24.ebuild
@@ -4,6 +4,7 @@
EAPI=6
GNOME2_LA_PUNT="yes"
GNOME_ORG_MODULE="network-manager-applet"
+GNOME2_EAUTORECONF="yes"
inherit gnome2
@@ -48,6 +49,10 @@ DEPEND="${RDEPEND}
PDEPEND="virtual/notification-daemon" #546134
+PATCHES=(
+ "${FILESDIR}"/${PV}-fix-bashisms.patch
+)
+
src_configure() {
local myconf=(
--with-appindicator=$(usex ayatana ubuntu no)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/
@ 2021-02-06 9:59 Mart Raudsepp
0 siblings, 0 replies; 5+ messages in thread
From: Mart Raudsepp @ 2021-02-06 9:59 UTC (permalink / raw
To: gentoo-commits
commit: 20bcfc2f16449573c6188cfd4b47550b7963eedf
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 6 09:37:35 2021 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sat Feb 6 09:57:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20bcfc2f
gnome-extra/nm-applet: remove old
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>
| 2 -
.../nm-applet/files/1.8.24-fix-bashisms.patch | 130 ---------------------
| 1 -
| 52 ---------
| 72 ------------
5 files changed, 257 deletions(-)
--git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 4561874c8bf..2f3267e9799 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,3 +1 @@
-DIST network-manager-applet-1.16.0.tar.xz 1944244 BLAKE2B b5181474da55d9b320d217638a960a9bba1c103d8ff69f171aea57458d425ee8347e8a525b051f1b72888cf33d9b20a850b9e10fb0a487998a5502d2acb92105 SHA512 0ad8ac1d05cf76b9a82602c6f8f7034ae52fc11bae0b5ee17cf5bd89c6c91ba3ef7b07f770397b22484d54fd69e7a9a73f8c08a4d3d9f492f11d09d0b0379ff5
DIST network-manager-applet-1.18.0.tar.xz 1950696 BLAKE2B d89f4d3c94af2c6bf514fc388fc445415b50508bf7e26f7888d8e212a63879abb24bf860002372bcae71eee94c3b8e9f2bfa9f16814a3537b0f81c486f82e396 SHA512 adca7c723600ec1cb2eed0110e369cf707fde1d64a81489440a167516d178a501fe883c08db06371b8aac896188eb2037a7577ecca721d764be33f4025a386d4
-DIST network-manager-applet-1.8.24.tar.xz 2062132 BLAKE2B fed75ab78e05b59a4f20c7570b84ac6fe3dd2cf6f8ad060f6c65bc9e2a32e29d295fc919de1037ba30c2609d35079dccb3f625ffc019150c9c69cfa94388e2c8 SHA512 76e914ec4f2e6eadd21ccc3e1f613fb97cb72d9551730a1dc09454177365dcaa2cdeea4b855c53732ad6a22cfa5e62e03f09fc8b04a277ce213dcf8c3beaf77c
diff --git a/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch b/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch
deleted file mode 100644
index 36851e1ca3a..00000000000
--- a/gnome-extra/nm-applet/files/1.8.24-fix-bashisms.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-From 64143dc3da8f04478acc7a875b7e9d6cb0d653b9 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Sun, 19 Apr 2020 15:08:20 +0200
-Subject: [PATCH] Remove subshells and fix invalid test syntax
-
----
- configure.ac | 22 +++++++++++-----------
- m4/introspection.m4 | 4 ++--
- 2 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 22f34589..56a56fee 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -126,7 +126,7 @@ dnl
- GTK_DOC_CHECK(1.0)
-
- AC_ARG_WITH(libnm-gtk, AS_HELP_STRING([--with-libnm-gtk], [build legacy library libnm-gtk which depends on libnm-glib/libnm-util/dbus-glib (deprecated)]))
--if test "$with_libnm_gtk" == yes; then
-+if test "$with_libnm_gtk" = yes; then
- PKG_CHECK_MODULES(LIBNM_GLIB,
- [gio-2.0 >= 2.38
- NetworkManager >= 1.7
-@@ -145,7 +145,7 @@ Configure without --with-libnm-gtk if you do not need the legacy library])])
- else
- with_libnm_gtk=no
- fi
--AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" == "yes")
-+AM_CONDITIONAL(WITH_LIBNM_GTK, test "$with_libnm_gtk" = "yes")
-
- PKG_CHECK_MODULES(LIBNM, [libnm >= 1.7 gio-2.0 >= 2.38 gmodule-export-2.0])
- LIBNM_CFLAGS="$LIBNM_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_38"
-@@ -166,7 +166,7 @@ PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.10)
- GTK3_CFLAGS="$GTK3_CFLAGS -DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_10 -DGDK_VERSION_MAX_ALLOWED=GDK_VERSION_3_10"
-
- AC_ARG_WITH(libnma-gtk4, AS_HELP_STRING([--with-libnma-gtk4], [build EXPERIMENTAL libnma-gtk4 library for use with GTK4]))
--if test "$with_libnma_gtk4" == yes; then
-+if test "$with_libnma_gtk4" = yes; then
- PKG_CHECK_MODULES(GTK4, gtk4 >= 3.94)
- GTK4_CFLAGS="$GTK4_CFLAGS -DGTK_VERSION_MIN_REQUIRED=GTK_VERSION_3_96 -DGTK_VERSION_MAX_ALLOWED=GTK_VERSION_3_96"
- else
-@@ -214,7 +214,7 @@ AM_CONDITIONAL(HAVE_GBT, test x"$have_gbt" = "xyes")
-
- dnl ModemManager1 with libmm-glib for WWAN support
- AC_ARG_WITH(wwan, AS_HELP_STRING([--with-wwan], [Enable WWAN support (default: yes)]))
--if (test "${with_wwan}" == "no"); then
-+if test "${with_wwan}" = "no"; then
- AC_DEFINE(WITH_WWAN, 0, [Define if you have ModemManager/WWAN support])
- else
- PKG_CHECK_MODULES(MM_GLIB,
-@@ -229,7 +229,7 @@ PKG_CHECK_MODULES(GUDEV, gudev-1.0 >= 147)
-
- dnl SELinux
- AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux], [Enable support for adjusting SELinux labels in configuration editor (default: yes)]))
--if (test "${with_selinux}" == "no"); then
-+if test "${with_selinux}" = "no"; then
- AC_DEFINE(WITH_SELINUX, 0, [Define if libselinux is available])
- else
- PKG_CHECK_MODULES(SELINUX,
-@@ -241,7 +241,7 @@ AM_CONDITIONAL(WITH_SELINUX, test "${with_selinux}" != "no")
-
- dnl Jansson for team configuration editing
- AC_ARG_WITH(team, AS_HELP_STRING([--with-team], [Enable team configuration editor (default: yes)]))
--if (test "${with_team}" == "no"); then
-+if test "${with_team}" = "no"; then
- AC_DEFINE(WITH_JANSSON, 0, [Define if Jansson is available])
- else
- PKG_CHECK_MODULES(JANSSON,
-@@ -253,7 +253,7 @@ AM_CONDITIONAL(WITH_JANSSON, test "${with_team}" != "no")
-
- dnl GCR for PKCS#11 enabled certificate chooser
- AC_ARG_WITH(gcr, AS_HELP_STRING([--with-gcr], [Enable advanced certificate chooser (default: auto)]))
--if (test "${with_gcr}" == "no"); then
-+if test "${with_gcr}" = "no"; then
- have_gcr=no
- else
- PKG_CHECK_MODULES(GCR,
-@@ -311,15 +311,15 @@ else
- have_gcr=no);
- fi
-
--if (test "${have_gcr}" == "yes"); then
-+if test "${have_gcr}" = "yes"; then
- AC_DEFINE(WITH_GCR, 1, [Define if Gcr is available])
- else
-- if (test "${with_gcr}" == "yes"); then
-+ if test "${with_gcr}" = "yes"; then
- AC_MSG_ERROR([gcr support was requested, but the gcr library is not available.])
- fi
- AC_DEFINE(WITH_GCR, 0, [Define if Gcr is available])
- fi
--AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" == "yes")
-+AM_CONDITIONAL(WITH_GCR, test "${have_gcr}" = "yes")
-
- dnl Check for gobject introspection
- GOBJECT_INTROSPECTION_CHECK([0.9.6])
-@@ -334,7 +334,7 @@ NM_LD_GC
-
- # Disable extra compiler warning until GTK4 doesn't trigger it via graphene
- # https://github.com/ebassi/graphene/issues/134
--if test "$with_libnma_gtk4" == yes; then
-+if test "$with_libnma_gtk4" = yes; then
- _CFLAGS_SAVED="$CFLAGS"
- CFLAGS="$CFLAGS $GTK4_CFLAGS"
- NM_COMPILER_WARNING([_CFLAGS], [float-equal], [#include <gtk/gtk.h>])
-diff --git a/m4/introspection.m4 b/m4/introspection.m4
-index f3bda0e7..8c64bd04 100644
---- a/m4/introspection.m4
-+++ b/m4/introspection.m4
-@@ -31,7 +31,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
- INTROSPECTION_GIRDIR=
- INTROSPECTION_TYPELIBDIR=
-
-- if test "x$enable_introspection" == "xno"; then
-+ if test "x$enable_introspection" = "xno"; then
- found_introspection="no"
- else
- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], [
-@@ -53,7 +53,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
- AC_MSG_RESULT([$found_introspection])
- ], [found_introspection="no (not installed)"])
-
-- if test "x$enable_introspection" == "xyes"; then
-+ if test "x$enable_introspection" = "xyes"; then
- if test "x$found_introspection" != "xyes"; then
- AC_MSG_ERROR([introspection enabled but can't be used])
- fi
---
-2.26.0
-
--git a/gnome-extra/nm-applet/metadata.xml b/gnome-extra/nm-applet/metadata.xml
index 7cb30b744ca..96fdf3e479a 100644
--- a/gnome-extra/nm-applet/metadata.xml
+++ b/gnome-extra/nm-applet/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo GNOME Desktop</name>
</maintainer>
<use>
- <flag name="gcr">Enable advanced certificate chooser, requires <pkg>app-crypt/gcr</pkg></flag>
<flag name="modemmanager">Enable support for mobile broadband devices
using <pkg>net-misc/modemmanager</pkg></flag>
<flag name="teamd">Enable teamd configuration editor</flag>
diff --git a/gnome-extra/nm-applet/nm-applet-1.16.0.ebuild b/gnome-extra/nm-applet/nm-applet-1.16.0.ebuild
deleted file mode 100644
index 49e66011c5f..00000000000
--- a/gnome-extra/nm-applet/nm-applet-1.16.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit gnome.org meson xdg
-
-DESCRIPTION="NetworkManager connection editor and applet"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="appindicator modemmanager selinux teamd"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
- >=dev-libs/glib-2.38:2
- >=app-crypt/libsecret-0.18
- >=net-libs/libnma-1.8.27
- >=x11-libs/gtk+-3.10:3
- >=dev-libs/libgudev-147:=
- >=x11-libs/libnotify-0.7.0
- >=net-misc/networkmanager-1.16:=[modemmanager?,teamd?]
- appindicator? (
- dev-libs/libappindicator:3
- >=dev-libs/libdbusmenu-16.04.0
- )
- modemmanager? ( net-misc/modemmanager )
- selinux? ( sys-libs/libselinux )
- teamd? ( >=dev-libs/jansson-2.7 )
-
- virtual/freedesktop-icon-theme
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-libs/libxml2
- >=sys-devel/gettext-0.19.8
- virtual/pkgconfig
-"
-
-src_configure() {
- local emesonargs=(
- -Dappindicator=$(usex appindicator ubuntu no)
- $(meson_use modemmanager wwan)
- $(meson_use selinux)
- $(meson_use teamd team)
- -Dmore_asserts=0
- -Dld_gc=false
- )
- meson_src_configure
-}
diff --git a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
deleted file mode 100644
index b606dc26460..00000000000
--- a/gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="appindicator +introspection +gcr +modemmanager selinux teamd"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
-
-RDEPEND="
- >=app-crypt/libsecret-0.18
- >=dev-libs/glib-2.38:2[dbus]
- >=dev-libs/dbus-glib-0.88
- dev-libs/libgudev:=
- >=sys-apps/dbus-1.4.1
- >=sys-auth/polkit-0.96-r1
- >=x11-libs/gtk+-3.10:3[introspection?]
- >=x11-libs/libnotify-0.7.0
-
- app-text/iso-codes
- >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?]
- net-misc/mobile-broadband-provider-info
-
- appindicator? (
- dev-libs/libappindicator:3
- >=dev-libs/libdbusmenu-16.04.0 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
- virtual/freedesktop-icon-theme
- gcr? ( >=app-crypt/gcr-3.14:=[gtk] )
- modemmanager? ( net-misc/modemmanager )
- selinux? ( sys-libs/libselinux )
- teamd? ( >=dev-libs/jansson-2.7 )
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.0
- >=sys-devel/gettext-0.18
- virtual/pkgconfig
-"
-
-PDEPEND="virtual/notification-daemon" #546134
-
-PATCHES=(
- "${FILESDIR}"/${PV}-fix-bashisms.patch
-)
-
-src_configure() {
- local myconf=(
- --with-appindicator=$(usex appindicator ubuntu no)
- --without-libnm-gtk
- --without-libnma-gtk4
- --disable-lto
- --disable-ld-gc
- --disable-more-warnings
- --disable-static
- --localstatedir=/var
- $(use_enable introspection)
- $(use_with gcr)
- $(use_with modemmanager wwan)
- $(use_with selinux)
- $(use_with teamd team)
- )
- gnome2_src_configure "${myconf[@]}"
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-02-06 9:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-30 17:29 [gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2021-02-06 9:59 Mart Raudsepp
2020-04-19 17:46 Mart Raudsepp
2019-02-11 19:31 Mart Raudsepp
2017-03-25 12:08 Mart Raudsepp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox