[gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/

2021-02-06 Thread Mart Raudsepp 
commit: 20bcfc2f16449573c6188cfd4b47550b7963eedf
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Feb  6 09:37:35 2021 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Feb  6 09:57:04 2021 +
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  gentoo.org>

 gnome-extra/nm-applet/Manifest |   2 -
 .../nm-applet/files/1.8.24-fix-bashisms.patch  | 130 -
 gnome-extra/nm-applet/metadata.xml |   1 -
 gnome-extra/nm-applet/nm-applet-1.16.0.ebuild  |  52 -
 gnome-extra/nm-applet/nm-applet-1.8.24-r1.ebuild   |  72 
 5 files changed, 257 deletions(-)

diff --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..000
--- 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 
-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 @@

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/

2020-04-19 Thread Mart Raudsepp 
commit: 99aded83423bc72a951aae9d4b890fe5670ec607
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sat Apr 18 17:30:28 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Apr 19 17:46:19 2020 +
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  gentoo.org>

 .../nm-applet/files/1.8.24-fix-bashisms.patch  | 130 +
 gnome-extra/nm-applet/nm-applet-1.8.24.ebuild  |   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 000..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 
+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

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/

2019-02-11 Thread Mart Raudsepp 
commit: 0bfe07d28a9f4df96519daf7e2e145cba36536aa
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Mon Feb 11 19:28:31 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Mon Feb 11 19:28:31 2019 +
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  gentoo.org>

 gnome-extra/nm-applet/Manifest |   1 -
 .../files/nm-applet-1.8.10-cert-chooser.patch  |  38 --
 .../files/nm-applet-1.8.10-vpn-crash.patch | 137 -
 gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild   |  72 ---
 4 files changed, 248 deletions(-)

diff --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 
4871d95f3260beb8c3207e5ec8e25437b3d01758afc3bfe7d84b21a05f4523449ee32e4cff27c082fefef88fed01db718d2227d6896c3c9b85d09cee927b
 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..000
--- 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 
-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.
-
-[lkund...@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, );
--  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 ();
-   }
- 
-   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..000
--- 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)" 
-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.
-
-[thal...@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

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/

2018-04-30 Thread Pacho Ramos 
commit: 5bfcfc6b649b7919173ea465aa1b8576f812e36c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Apr 30 17:28:41 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Apr 30 17:29:38 2018 +
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 +
 gnome-extra/nm-applet/nm-applet-1.8.10-r1.ebuild   |  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 000..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 
+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.
+
+[lkund...@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, );
+-  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 ();
+   }
+ 
+   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 000..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)" 
+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.
+
+[thal...@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 (), 
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);
+

[gentoo-commits] repo/gentoo:master commit in: gnome-extra/nm-applet/files/, gnome-extra/nm-applet/

2017-03-25 Thread Mart Raudsepp 
commit: 5c732474a68cdacc6cb2f17d60e7af9982c057f8
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Mar 25 12:07:13 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sat Mar 25 12:08:10 2017 +
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 
 gnome-extra/nm-applet/nm-applet-1.4.6-r1.ebuild|  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 000..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 
+Date: Fri, 3 Mar 2017 12:27:23 +
+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
+
+[bgalv...@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 
+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 
+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, );
+-  if (error)
+-  g_warning ("Failed to add/activate connection: (%d) %s", 
error->code, error->message);
+-
+-  g_clear_object ();
+-  g_clear_error ();
+-}
+-
+-typedef struct {
+-