diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-02-16 12:59:29 +0000 |
commit | 79599515788b85b18aa655e7b7f8cc05c1bbddd8 (patch) | |
tree | ade7cb031f363fad64c77139dea7aa3d81908537 /gnome-extra/nm-applet | |
parent | 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb (diff) |
gentoo resync : 16.02.1018
Diffstat (limited to 'gnome-extra/nm-applet')
-rw-r--r-- | gnome-extra/nm-applet/Manifest | 8 | ||||
-rw-r--r-- | gnome-extra/nm-applet/files/nm-applet-1.8.10-cert-chooser.patch | 38 | ||||
-rw-r--r-- | gnome-extra/nm-applet/files/nm-applet-1.8.10-vpn-crash.patch | 137 | ||||
-rw-r--r-- | gnome-extra/nm-applet/nm-applet-1.8.18.ebuild | 4 | ||||
-rw-r--r-- | gnome-extra/nm-applet/nm-applet-1.8.20.ebuild (renamed from gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild) | 22 |
5 files changed, 13 insertions, 196 deletions
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest index 5738d8a44545..e777c7624709 100644 --- a/gnome-extra/nm-applet/Manifest +++ b/gnome-extra/nm-applet/Manifest @@ -1,7 +1,5 @@ -AUX nm-applet-1.8.10-cert-chooser.patch 1421 BLAKE2B 6c867f5cca1c3b67a27cdfc9a80da728be65f80a8619dcfa0d53f910884e56d7cc1e6c2aa4a2661079d29f3abd49257a0720d59c09d0ba8024e140dc086ce033 SHA512 79ac1445ee0885b63092f28d2fbfd74b6b926696d44ee0ff47d079adc293301c05b8984ad812c66d4b7cab34c32902faed467fee1a2f14af66d2c43914858ed6 -AUX nm-applet-1.8.10-vpn-crash.patch 4613 BLAKE2B 44dbc67736d2025f177de3c29961234c8f8f1f0002bd7a4275cdd2631e5a3961f011c73c9c1a9ee77b2471945d5ce83c5120b2b26e8395f5666338e64b067359 SHA512 e2a9bc66b13f84270ac9735315d197c1ab264c99e5941218df310ebaa40900490661dec5f5972734e75c89b6db27530fd6ef02ad91a61a20c0eb388cff0b42aa -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 -EBUILD nm-applet-1.8.10-r1.ebuild 1782 BLAKE2B d4f25b89b7005270718ac2c0ede3ee063a33f8b434b6033826b5ffe793d7be4d409c0227ccefe84f6479545c636799f22e775ba3f7b8b84cbc71fb80d986e91f SHA512 03855f3ffcf930d139197f33cf2a646dc17071d2634a65021949c2e4845e5244364672b235de56a09828ef162cd1320976481df3e7026cfc802535b1646a966d -EBUILD nm-applet-1.8.18.ebuild 1626 BLAKE2B 330bd42d3950feb6e2937bd483fe25d169fb32b8050bb80e21caf03323815eb27108b9765255f99d50ed4260cbe5a356c4efd84adfef07657400b846fe31b2ba SHA512 33d9cae3c3f5ba3161648c5dad974366f9f5c2590677dc58a8b8c5f8621d102b3ba1be6e414897264eefb84b35e8a3a9635836cfeeed956717d8a5b8c275e528 +DIST network-manager-applet-1.8.20.tar.xz 1551392 BLAKE2B 91258012715f226467126e4eefdfcd6ebde36958be80ae5e264dbf5168e0b772ce04404030d3f7dac9a6f72088918a2c5160aba694b6b7f7d4d6289b716b76f1 SHA512 5020aefe1803ad3b59562478e793737b52a3e5fd294470cfb430c73937cdbc0be6ecba5f3f8e8dbcc5bb5ac293df2866ecc919dd5019a3e681a434078d235a41 +EBUILD nm-applet-1.8.18.ebuild 1633 BLAKE2B ba80b0cac495071fd961509af7c15ba7dfa3eab07663dd634282d13361972ffa3a7e103fd86116d16d5fb2ac43f72b827e6db301002537bb88493a752d0e4e56 SHA512 809d8e54ebcebcea0927d8f246c296fb4533d8553c7b133a95d557d054462ac18a4c5a45f63f33076ac41d9b5f75d1f7d9c0823d380116b2a998f9b093f225eb +EBUILD nm-applet-1.8.20.ebuild 1654 BLAKE2B e5c25bc5c9f390c8fe6b7edea11097621e5548d191b49a20cae17192edcc174459d4ddb6faf6df91d95122a5edb98c81fd42273253aa6873522b5a59c7735417 SHA512 da8d7c1ff8c3d3f3e6e3121d169ead87d12da1ca510b698aac0a2dce27124750306b1c182a8ee878eeda912d7778fdd0f47c46237e11f33a43f55257bfe4d082 MISC metadata.xml 548 BLAKE2B 2b7a8b83983ab5c3477f2fbd75b35176f875dd6c9dccd28d8cb010168b10df3ca13307ee525db41c4309f9caab8e7c8e96b0822d3bb8480479a5cec8a25650c1 SHA512 3a163bc5738f3ee35fe00273788f2a3bd943db38832096c9e8a8d7c3676e0b90ba891ed0cc4903109e11c2dbbda950c100b66a79ddfb09b4a5fcb160b6a55067 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 9aad2396953e..000000000000 --- 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 8f217af2dac6..000000000000 --- 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.18.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild index 2a27396ee54d..6caa158b082b 100644 --- a/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild +++ b/gnome-extra/nm-applet/nm-applet-1.8.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" LICENSE="GPL-2+" SLOT="0" IUSE="ayatana +introspection +gcr +modemmanager selinux teamd" -KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" RDEPEND=" >=app-crypt/libsecret-0.18 diff --git a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild b/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild index 7ce48b41917b..601b8b123ea7 100644 --- a/gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild +++ b/gnome-extra/nm-applet/nm-applet-1.8.20.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,8 +12,8 @@ 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" +IUSE="ayatana +introspection +gcr +modemmanager selinux teamd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" RDEPEND=" >=app-crypt/libsecret-0.18 @@ -28,6 +28,9 @@ RDEPEND=" >=net-misc/networkmanager-1.7:=[introspection?,modemmanager?,teamd?] net-misc/mobile-broadband-provider-info + ayatana? ( + dev-libs/libappindicator:3 + >=dev-libs/libdbusmenu-16.04.0 ) introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) virtual/freedesktop-icon-theme virtual/libgudev:= @@ -44,19 +47,10 @@ DEPEND="${RDEPEND} 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 + --with-appindicator=$(usex ayatana ubuntu no) + --with-libnm-gtk --disable-lto --disable-ld-gc --disable-more-warnings |