Hello community,
here is the log from the commit of package NetworkManager-gnome for
openSUSE:13.1 checked in at 2013-10-08 11:03:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:13.1/NetworkManager-gnome (Old)
and /work/SRC/openSUSE:13.1/.NetworkManager-gnome.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "NetworkManager-gnome"
Changes:
--------
--- /work/SRC/openSUSE:13.1/NetworkManager-gnome/NetworkManager-gnome.changes
2013-09-23 15:28:12.000000000 +0200
+++
/work/SRC/openSUSE:13.1/.NetworkManager-gnome.new/NetworkManager-gnome.changes
2013-10-08 11:03:16.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Oct 1 10:35:42 UTC 2013 - [email protected]
+
+- Rebase nm-applet-private-connection.patch for 0.9.8.4
+ (bnc#751211)
+- Add nm-applet-probe-radius-server-cert.patch to probe the
+ certificate the RADIUS server (bnc#574266)
+
+-------------------------------------------------------------------
New:
----
nm-applet-probe-radius-server-cert.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ NetworkManager-gnome.spec ++++++
--- /var/tmp/diff_new_pack.sV2SSj/_old 2013-10-08 11:03:16.000000000 +0200
+++ /var/tmp/diff_new_pack.sV2SSj/_new 2013-10-08 11:03:16.000000000 +0200
@@ -48,8 +48,10 @@
Group: System/GUI/GNOME
Source:
http://download.gnome.org/sources/network-manager-applet/0.9/network-manager-applet-%{version}.tar.xz
Source1: nm-icons.tar.gz
-# PATCH-NEEDS-REBASE PATCH-FIX-UPSTREAM nm-applet-private-connection.patch
bnc#751211 bgo#646187 [email protected] -- Create private connections if the
user is not authorized. Allows to create wifi connections without root access.
Patch under discussion upstream.
+# PATCH-FIX-UPSTREAM nm-applet-private-connection.patch bnc#751211 bgo#646187
[email protected] -- Create private connections if the user is not
authorized. Allows to create wifi connections without root access. Patch under
discussion upstream.
Patch0: nm-applet-private-connection.patch
+# PATCH-FIX-UPSTREAM nm-applet-probe-radius-server-cert.patch bnc#574266
[email protected] -- Probe the RADIUS server certificate
+Patch1: nm-applet-probe-radius-server-cert.patch
Provides: NetworkManager-client
Requires: NetworkManager >= 0.9.3
# needed for translated country names
@@ -92,8 +94,8 @@
%lang_package
%prep
%setup -q -n network-manager-applet-%{version} -a 1
-# Needs rebase
-#patch0 -p1
+%patch0 -p1
+%patch1 -p1
##translation-update-upstream
%build
++++++ nm-applet-private-connection.patch ++++++
--- /var/tmp/diff_new_pack.sV2SSj/_old 2013-10-08 11:03:16.000000000 +0200
+++ /var/tmp/diff_new_pack.sV2SSj/_new 2013-10-08 11:03:16.000000000 +0200
@@ -1,4 +1,4 @@
-From d646ee98751194e6bd7e2f57418a2a995c634924 Mon Sep 17 00:00:00 2001
+From 1a06498ed24c3580acb286a539aba0c99a544b0f Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <[email protected]>
Date: Thu, 2 Feb 2012 18:08:56 +0800
Subject: [PATCH] Create private connections if the user is not authorized
@@ -10,59 +10,65 @@
https://bugzilla.gnome.org/show_bug.cgi?id=646187
---
- src/applet-device-cdma.c | 6 ++++
- src/applet-device-gsm.c | 6 ++++
- src/applet-device-wifi.c | 12 +++++++
- src/applet-device-wimax.c | 6 ++++
- src/applet-device-wired.c | 6 ++++
- src/connection-editor/Makefile.am | 2 +
- src/connection-editor/ce-page.c | 47 +++++++++++++++++++++++++++++
- src/gnome-bluetooth/Makefile.am | 2 +
- src/gnome-bluetooth/bt-widget.c | 59 +++++++++++++++++++++++++++++++++++++
- src/utils/Makefile.am | 3 +-
- src/utils/utils.c | 40 +++++++++++++++++++++++++
- src/utils/utils.h | 2 +
- 12 files changed, 190 insertions(+), 1 deletions(-)
+ configure.ac | 4 +++
+ src/applet-device-ethernet.c | 7 +++++
+ src/applet-device-wifi.c | 12 ++++++++
+ src/applet-device-wimax.c | 7 +++++
+ src/connection-editor/Makefile.am | 2 ++
+ src/connection-editor/ce-page.c | 47 ++++++++++++++++++++++++++++++
+ src/gnome-bluetooth/Makefile.am | 2 ++
+ src/gnome-bluetooth/nma-bt-device.c | 58 +++++++++++++++++++++++++++++++++++++
+ src/mobile-helpers.c | 6 ++++
+ src/utils/Makefile.am | 3 +-
+ src/utils/utils.c | 40 +++++++++++++++++++++++++
+ src/utils/utils.h | 2 ++
+ 12 files changed, 189 insertions(+), 1 deletion(-)
-Index: network-manager-applet-0.9.6.4/src/applet-device-cdma.c
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/applet-device-cdma.c
-+++ network-manager-applet-0.9.6.4/src/applet-device-cdma.c
-@@ -145,6 +145,12 @@ mobile_wizard_done (NMAMobileWizard *wiz
- NULL);
- g_free (uuid);
- g_free (id);
-+ if (!utils_system_connection_authorized ()) {
-+ nm_setting_connection_add_permission
((NMSettingConnection *)setting,
-+ "user",
-+ g_get_user_name(),
-+ NULL);
-+ }
- nm_connection_add_setting (connection, setting);
- }
+diff --git a/configure.ac b/configure.ac
+index 7db3018..c5ea4c6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -104,6 +104,10 @@ PKG_CHECK_MODULES(NMA,
+ libnm-glib-vpn >= 0.9.8
+ gmodule-export-2.0])
-Index: network-manager-applet-0.9.6.4/src/applet-device-gsm.c
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/applet-device-gsm.c
-+++ network-manager-applet-0.9.6.4/src/applet-device-gsm.c
-@@ -175,6 +175,12 @@ mobile_wizard_done (NMAMobileWizard *wiz
- NULL);
- g_free (uuid);
- g_free (id);
-+ if (!utils_system_connection_authorized ()) {
-+ nm_setting_connection_add_permission
((NMSettingConnection *)setting,
-+ "user",
-+ g_get_user_name(),
-+ NULL);
-+ }
- nm_connection_add_setting (connection, setting);
- }
++PKG_CHECK_MODULES(POLKIT, [polkit-gobject-1])
++AC_SUBST(POLKIT_CFLAGS)
++AC_SUBST(POLKIT_LIBS)
++
+ # With recent glib, defining GLIB_VERSION_MIN_REQUIRED avoids
+ # deprecation warnings for recently-deprecated functions (eg,
+ # GValueArray stuff). We say GLIB_VERSION_2_26 because there
+diff --git a/src/applet-device-ethernet.c b/src/applet-device-ethernet.c
+index 6e63dcb..d9176c8 100644
+--- a/src/applet-device-ethernet.c
++++ b/src/applet-device-ethernet.c
+@@ -40,6 +40,7 @@
+ #include "applet-device-ethernet.h"
+ #include "ethernet-dialog.h"
+ #include "nm-ui-utils.h"
++#include "utils.h"
+
+ typedef struct {
+ NMApplet *applet;
+@@ -86,6 +87,12 @@ ethernet_new_auto_connection (NMDevice *device,
+ NM_SETTING_CONNECTION_UUID, uuid,
+ NULL);
+ g_free (uuid);
++ if (!utils_system_connection_authorized ()) {
++ nm_setting_connection_add_permission (s_con,
++ "user",
++ g_get_user_name(),
++ NULL);
++ }
+
+ nm_connection_add_setting (connection, NM_SETTING (s_con));
-Index: network-manager-applet-0.9.6.4/src/applet-device-wifi.c
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/applet-device-wifi.c
-+++ network-manager-applet-0.9.6.4/src/applet-device-wifi.c
-@@ -460,6 +460,18 @@ _do_new_auto_connection (NMApplet *apple
+diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
+index fa3d618..edf9053 100644
+--- a/src/applet-device-wifi.c
++++ b/src/applet-device-wifi.c
+@@ -461,6 +461,18 @@ _do_new_auto_connection (NMApplet *applet,
nm_connection_add_setting (connection, NM_SETTING (s_8021x));
}
@@ -81,30 +87,21 @@
/* If it's an 802.1x connection, we need more information, so pop up the
* Dialog Of Doom.
*/
-Index: network-manager-applet-0.9.6.4/src/applet-device-wimax.c
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/applet-device-wimax.c
-+++ network-manager-applet-0.9.6.4/src/applet-device-wimax.c
-@@ -94,6 +94,12 @@ wimax_new_auto_connection (NMDevice *dev
- NM_SETTING_CONNECTION_UUID, uuid,
- NULL);
- g_free (uuid);
-+ if (!utils_system_connection_authorized ()) {
-+ nm_setting_connection_add_permission (s_con,
-+ "user",
-+ g_get_user_name(),
-+ NULL);
-+ }
+diff --git a/src/applet-device-wimax.c b/src/applet-device-wimax.c
+index a870c48..f2a5642 100644
+--- a/src/applet-device-wimax.c
++++ b/src/applet-device-wimax.c
+@@ -39,6 +39,7 @@
+ #include "nma-marshal.h"
+ #include "mb-menu-item.h"
+ #include "nm-ui-utils.h"
++#include "utils.h"
- nm_connection_add_setting (connection, NM_SETTING (s_con));
+ #define ACTIVE_NSP_TAG "active-nsp"
-Index: network-manager-applet-0.9.6.4/src/applet-device-wired.c
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/applet-device-wired.c
-+++ network-manager-applet-0.9.6.4/src/applet-device-wired.c
-@@ -86,6 +86,12 @@ wired_new_auto_connection (NMDevice *dev
- NM_SETTING_CONNECTION_UUID, uuid,
- NULL);
+@@ -94,6 +95,12 @@ wimax_new_auto_connection (NMDevice *device,
+ NM_SETTING_CONNECTION_UUID, uuid,
+ NULL);
g_free (uuid);
+ if (!utils_system_connection_authorized ()) {
+ nm_setting_connection_add_permission (s_con,
@@ -115,11 +112,11 @@
nm_connection_add_setting (connection, NM_SETTING (s_con));
-Index: network-manager-applet-0.9.6.4/src/connection-editor/Makefile.am
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/connection-editor/Makefile.am
-+++ network-manager-applet-0.9.6.4/src/connection-editor/Makefile.am
-@@ -12,6 +12,7 @@ nm_connection_editor_CPPFLAGS = \
+diff --git a/src/connection-editor/Makefile.am
b/src/connection-editor/Makefile.am
+index 4cc9005..3b6d121 100644
+--- a/src/connection-editor/Makefile.am
++++ b/src/connection-editor/Makefile.am
+@@ -11,6 +11,7 @@ nm_connection_editor_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DNMALOCALEDIR=\"$(datadir)/locale\" \
$(DBUS_CFLAGS) \
@@ -127,7 +124,7 @@
$(DISABLE_DEPRECATED) \
-I${top_srcdir}/src/utils \
-I${top_srcdir}/src/wireless-security \
-@@ -67,6 +68,7 @@ nm_connection_editor_LDADD = \
+@@ -84,6 +85,7 @@ nm_connection_editor_LDADD = \
${top_builddir}/src/libnm-gtk/libnm-gtk.la \
$(GTK_LIBS) \
$(NMA_LIBS) \
@@ -135,10 +132,10 @@
-lm
uidir = $(datadir)/nm-applet
-Index: network-manager-applet-0.9.6.4/src/connection-editor/ce-page.c
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/connection-editor/ce-page.c
-+++ network-manager-applet-0.9.6.4/src/connection-editor/ce-page.c
+diff --git a/src/connection-editor/ce-page.c b/src/connection-editor/ce-page.c
+index 1dbee85..9b533be 100644
+--- a/src/connection-editor/ce-page.c
++++ b/src/connection-editor/ce-page.c
@@ -29,6 +29,8 @@
#include <glib/gi18n.h>
@@ -148,12 +145,12 @@
#include <nm-setting-connection.h>
#include <nm-utils.h>
-@@ -490,6 +492,44 @@ ce_page_class_init (CEPageClass *page_cl
+@@ -534,6 +536,44 @@ ce_page_class_init (CEPageClass *page_class)
G_TYPE_NONE, 1, G_TYPE_POINTER);
}
+static gboolean
-+polkit_system_connection_authorized ()
++polkit_system_connection_authorized (void)
+{
+ PolkitSubject *subject;
+ PolkitAuthority *authority;
@@ -167,7 +164,7 @@
+
+ /* Check the polkit authorization */
+ authority = polkit_authority_get_sync (NULL, NULL);
-+ subject = polkit_unix_process_new (getpid ());
++ subject = polkit_unix_process_new_for_owner (getpid (), 0, -1);
+ result = polkit_authority_check_authorization_sync (authority,
+ subject,
+
"org.freedesktop.NetworkManager.settings.modify.system",
@@ -193,7 +190,7 @@
NMConnection *
ce_page_new_connection (const char *format,
-@@ -524,6 +564,13 @@ ce_page_new_connection (const char *form
+@@ -568,6 +608,13 @@ ce_page_new_connection (const char *format,
g_free (uuid);
g_free (id);
@@ -207,10 +204,10 @@
return connection;
}
-Index: network-manager-applet-0.9.6.4/src/gnome-bluetooth/Makefile.am
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/gnome-bluetooth/Makefile.am
-+++ network-manager-applet-0.9.6.4/src/gnome-bluetooth/Makefile.am
+diff --git a/src/gnome-bluetooth/Makefile.am b/src/gnome-bluetooth/Makefile.am
+index dbf5373..b25070c 100644
+--- a/src/gnome-bluetooth/Makefile.am
++++ b/src/gnome-bluetooth/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES = \
-I${top_srcdir}/src/utils \
-I${top_srcdir}/src/libnm-gtk \
@@ -219,32 +216,33 @@
$(DISABLE_DEPRECATED) \
$(WARN_CFLAGS)
-@@ -28,6 +29,7 @@ libnma_la_LIBADD = \
+@@ -32,6 +33,7 @@ libnma_la_LIBADD = \
$(top_builddir)/src/marshallers/libmarshallers.la \
$(top_builddir)/src/utils/libutils.la \
$(top_builddir)/src/libnm-gtk/libnm-gtk.la \
+ $(POLKIT_LIBS) \
$(GNOME_BLUETOOTH_LIBS)
- endif
-Index: network-manager-applet-0.9.6.4/src/gnome-bluetooth/bt-widget.c
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/gnome-bluetooth/bt-widget.c
-+++ network-manager-applet-0.9.6.4/src/gnome-bluetooth/bt-widget.c
-@@ -34,6 +34,7 @@
- #include <bluetooth-client.h>
+ if WITH_MODEM_MANAGER_1
+diff --git a/src/gnome-bluetooth/nma-bt-device.c
b/src/gnome-bluetooth/nma-bt-device.c
+index 512c5cc..a1d86b1 100644
+--- a/src/gnome-bluetooth/nma-bt-device.c
++++ b/src/gnome-bluetooth/nma-bt-device.c
+@@ -34,6 +34,8 @@
+ #include <glib.h>
+ #include <glib/gi18n-lib.h>
+
++#include <polkit/polkit.h>
++
#include <nm-remote-settings.h>
#include <nm-remote-connection.h>
-+#include <polkit/polkit.h>
-
- #include "nma-bt-device.h"
-@@ -162,6 +163,45 @@ get_device_iter (GtkTreeModel *model, co
- return FALSE;
+@@ -239,6 +241,44 @@ recheck_services_enabled (NmaBtDevice *self)
}
+ /*********************************************************************/
+static gboolean
-+polkit_system_connection_authorized ()
++polkit_system_connection_authorized (void)
+{
+ PolkitSubject *subject;
+ PolkitAuthority *authority;
@@ -258,7 +256,7 @@
+
+ /* Check the polkit authorization */
+ authority = polkit_authority_get_sync (NULL, NULL);
-+ subject = polkit_unix_process_new (getpid ());
++ subject = polkit_unix_process_new_for_owner (getpid (), 0, -1);
+ result = polkit_authority_check_authorization_sync (authority,
+ subject,
+
"org.freedesktop.NetworkManager.settings.modify.system",
@@ -281,125 +279,98 @@
+
+ return is_authorized;
+}
-+
- /*******************************************************************/
-
- static void
-Index: network-manager-applet-0.9.6.4/src/utils/utils.c
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/utils/utils.c
-+++ network-manager-applet-0.9.6.4/src/utils/utils.c
-@@ -27,6 +27,8 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
-+#include <polkit/polkit.h>
-+
- #include <nm-setting-connection.h>
- #include <nm-utils.h>
-
-@@ -360,3 +362,41 @@ utils_show_error_dialog (const char *tit
- }
- }
+ const char *
+ nma_bt_device_get_bdaddr (NmaBtDevice *device)
+@@ -380,6 +420,12 @@ dun_new_cdma (NMAMobileWizardAccessMethod *method)
+ NULL);
+ g_free (uuid);
+ g_free (id);
++ if (!polkit_system_connection_authorized ()) {
++ nm_setting_connection_add_permission ((NMSettingConnection
*)setting,
++ "user",
++ g_get_user_name(),
++ NULL);
++ }
+ nm_connection_add_setting (connection, setting);
-+gboolean
-+utils_system_connection_authorized ()
-+{
-+ PolkitSubject *subject;
-+ PolkitAuthority *authority;
-+ PolkitAuthorizationResult *result;
-+ GError *error = NULL;
-+ static gboolean is_checked = FALSE;
-+ static gboolean is_authorized = FALSE;
-+
-+ if (is_checked)
-+ return is_authorized;
-+
-+ /* Check the polkit authorization */
-+ authority = polkit_authority_get_sync (NULL, NULL);
-+ subject = polkit_unix_process_new (getpid ());
-+ result = polkit_authority_check_authorization_sync (authority,
-+ subject,
-+
"org.freedesktop.NetworkManager.settings.modify.system",
-+ NULL,
-+
POLKIT_CHECK_AUTHORIZATION_FLAGS_NONE,
-+ NULL,
-+ &error);
-+ if (error || !result) {
-+ g_warning ("%s: failed to check polkit authorization! %s",
__func__,
-+ error ? error->message : "(unknown)");
-+ g_clear_error (&error);
-+ } else if (polkit_authorization_result_get_is_authorized (result)) {
-+ is_authorized = TRUE;
-+ }
-+ g_object_unref (result);
-+ g_object_unref (authority);
-+ g_object_unref (subject);
-+
-+ is_checked = TRUE;
-+
-+ return is_authorized;
-+}
-Index: network-manager-applet-0.9.6.4/src/utils/utils.h
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/utils/utils.h
-+++ network-manager-applet-0.9.6.4/src/utils/utils.h
-@@ -61,5 +61,7 @@ typedef enum {
- NMA_ERROR_GENERIC
- } NMAError;
+ return connection;
+@@ -426,6 +472,12 @@ dun_new_gsm (NMAMobileWizardAccessMethod *method)
+ NULL);
+ g_free (uuid);
+ g_free (id);
++ if (!polkit_system_connection_authorized ()) {
++ nm_setting_connection_add_permission ((NMSettingConnection
*)setting,
++ "user",
++ g_get_user_name(),
++ NULL);
++ }
+ nm_connection_add_setting (connection, setting);
-+gboolean utils_system_connection_authorized ();
-+
- #endif /* UTILS_H */
+ return connection;
+@@ -1011,6 +1063,12 @@ add_pan_connection (NmaBtDevice *self)
+ NULL);
+ g_free (id);
+ g_free (uuid);
++ if (!polkit_system_connection_authorized ()) {
++ nm_setting_connection_add_permission ((NMSettingConnection
*)setting,
++ "user",
++ g_get_user_name(),
++ NULL);
++ }
+ nm_connection_add_setting (connection, setting);
-Index: network-manager-applet-0.9.6.4/configure.ac
-===================================================================
---- network-manager-applet-0.9.6.4.orig/configure.ac
-+++ network-manager-applet-0.9.6.4/configure.ac
-@@ -138,6 +138,10 @@ older (< 0.9) nm-applet releases.])])
- fi
- AM_CONDITIONAL(BUILD_MIGRATION_TOOL, test "$enable_migration" = "yes")
+ /* The Bluetooth settings */
+diff --git a/src/mobile-helpers.c b/src/mobile-helpers.c
+index 4c1db5f..d1997ad 100644
+--- a/src/mobile-helpers.c
++++ b/src/mobile-helpers.c
+@@ -210,6 +210,12 @@ mobile_wizard_done (NMAMobileWizard *wizard,
+ NULL);
+ g_free (uuid);
+ g_free (id);
++ if (!utils_system_connection_authorized ()) {
++ nm_setting_connection_add_permission
((NMSettingConnection *)setting,
++ "user",
++ g_get_user_name(),
++ NULL);
++ }
+ nm_connection_add_setting (connection, setting);
+ }
-+PKG_CHECK_MODULES(POLKIT, [polkit-gobject-1])
-+AC_SUBST(POLKIT_CFLAGS)
-+AC_SUBST(POLKIT_LIBS)
-+
- PKG_CHECK_MODULES(GNOME_KEYRING, [gnome-keyring-1])
- AC_SUBST(GNOME_KEYRING_CFLAGS)
- AC_SUBST(GNOME_KEYRING_LIBS)
-Index: network-manager-applet-0.9.6.4/src/utils/Makefile.am
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/utils/Makefile.am
-+++ network-manager-applet-0.9.6.4/src/utils/Makefile.am
-@@ -11,8 +11,9 @@ libutils_la_SOURCES = \
+diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
+index 1a3308c..bf028cc 100644
+--- a/src/utils/Makefile.am
++++ b/src/utils/Makefile.am
+@@ -9,7 +9,8 @@ libutils_la_SOURCES = \
libutils_la_CPPFLAGS = \
$(GTK_CFLAGS) \
$(NMA_CFLAGS) \
+ $(POLKIT_CFLAGS) \
- -DDATADIR=\""$(datadir)"\" \
$(DISABLE_DEPRECATED) \
-I${top_srcdir}/src
-libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS)
+libutils_la_LIBADD = $(GTK_LIBS) $(NMA_LIBS) $(POLKIT_LIBS)
-Index: network-manager-applet-0.9.6.4/src/gnome-bluetooth/nma-bt-device.c
-===================================================================
---- network-manager-applet-0.9.6.4.orig/src/gnome-bluetooth/nma-bt-device.c
-+++ network-manager-applet-0.9.6.4/src/gnome-bluetooth/nma-bt-device.c
-@@ -34,6 +34,8 @@
- #include <glib.h>
- #include <glib/gi18n-lib.h>
+diff --git a/src/utils/utils.c b/src/utils/utils.c
+index 00f8596..8b7e68c 100644
+--- a/src/utils/utils.c
++++ b/src/utils/utils.c
+@@ -27,6 +27,8 @@
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+#include <polkit/polkit.h>
+
- #include <nm-remote-settings.h>
- #include <nm-remote-connection.h>
-
-@@ -227,6 +229,44 @@ recheck_services_enabled (NmaBtDevice *s
+ #include <nm-setting-connection.h>
+ #include <nm-utils.h>
- /*********************************************************************/
+@@ -209,3 +211,41 @@ utils_show_error_dialog (const char *title,
+ }
+ }
-+polkit_system_connection_authorized ()
++gboolean
++utils_system_connection_authorized (void)
+{
+ PolkitSubject *subject;
+ PolkitAuthority *authority;
@@ -413,7 +384,7 @@
+
+ /* Check the polkit authorization */
+ authority = polkit_authority_get_sync (NULL, NULL);
-+ subject = polkit_unix_process_new (getpid ());
++ subject = polkit_unix_process_new_for_owner (getpid (), 0, -1);
+ result = polkit_authority_check_authorization_sync (authority,
+ subject,
+
"org.freedesktop.NetworkManager.settings.modify.system",
@@ -436,46 +407,18 @@
+
+ return is_authorized;
+}
-+
- const char *
- nma_bt_device_get_bdaddr (NmaBtDevice *device)
- {
-@@ -362,6 +402,12 @@ dun_new_cdma (NMAMobileWizardAccessMetho
- NULL);
- g_free (uuid);
- g_free (id);
-+ if (!polkit_system_connection_authorized ()) {
-+ nm_setting_connection_add_permission ((NMSettingConnection
*)setting,
-+ "user",
-+ g_get_user_name(),
-+ NULL);
-+ }
- nm_connection_add_setting (connection, setting);
-
- return connection;
-@@ -408,6 +454,12 @@ dun_new_gsm (NMAMobileWizardAccessMethod
- NULL);
- g_free (uuid);
- g_free (id);
-+ if (!polkit_system_connection_authorized ()) {
-+ nm_setting_connection_add_permission ((NMSettingConnection
*)setting,
-+ "user",
-+ g_get_user_name(),
-+ NULL);
-+ }
- nm_connection_add_setting (connection, setting);
+diff --git a/src/utils/utils.h b/src/utils/utils.h
+index 0da159a..f2d2beb 100644
+--- a/src/utils/utils.h
++++ b/src/utils/utils.h
+@@ -59,5 +59,7 @@ typedef enum {
+ NMA_ERROR_GENERIC
+ } NMAError;
- return connection;
-@@ -859,6 +911,12 @@ add_pan_connection (NmaBtDevice *self)
- NULL);
- g_free (id);
- g_free (uuid);
-+ if (!polkit_system_connection_authorized ()) {
-+ nm_setting_connection_add_permission ((NMSettingConnection
*)setting,
-+ "user",
-+ g_get_user_name(),
-+ NULL);
-+ }
- nm_connection_add_setting (connection, setting);
++gboolean utils_system_connection_authorized (void);
++
+ #endif /* UTILS_H */
- /* The Bluetooth settings */
+--
+1.8.1.4
+
++++++ nm-applet-probe-radius-server-cert.patch ++++++
++++ 1447 lines (skipped)
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
