rpms/NetworkManager/F-8 pk-06-fixes.patch, NONE, 1.1 NetworkManager.spec, 1.211, 1.212

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14582

Modified Files:
	NetworkManager.spec 
Added Files:
	pk-06-fixes.patch 
Log Message:
* Fri Jun  6 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.9.svn3675
- Fix PolicyKit issues when running in SELinux Enforcing mode (rh #449662)



pk-06-fixes.patch:

--- NEW FILE pk-06-fixes.patch ---
diff -up NetworkManager-0.7.0/policy/org.freedesktop.network-manager-settings.system.policy.pk-06-fixes NetworkManager-0.7.0/policy/org.freedesktop.network-manager-settings.system.policy
--- NetworkManager-0.7.0/policy/org.freedesktop.network-manager-settings.system.policy.pk-06-fixes	2008-06-06 15:37:23.000000000 -0400
+++ NetworkManager-0.7.0/policy/org.freedesktop.network-manager-settings.system.policy	2008-06-06 15:37:30.000000000 -0400
@@ -5,10 +5,6 @@
 
 <policyconfig>
 
-  <vendor>NetworkManager</vendor>
-  <vendor_url>http://www.gnome.org/projects/NetworkManager</vendor_url>
-  <icon_name>nm-icon</icon_name>
-
   <action id="org.freedesktop.network-manager-settings.system.modify">
     <description>Modify system connections</description>
     <message>System policy prevents modification of system settings</message>
diff -up NetworkManager-0.7.0/system-settings/src/nm-polkit-helpers.c.pk-06-fixes NetworkManager-0.7.0/system-settings/src/nm-polkit-helpers.c
--- NetworkManager-0.7.0/system-settings/src/nm-polkit-helpers.c.pk-06-fixes	2008-05-13 12:21:23.000000000 -0400
+++ NetworkManager-0.7.0/system-settings/src/nm-polkit-helpers.c	2008-06-06 15:36:48.000000000 -0400
@@ -86,10 +86,14 @@ create_polkit_context (void)
 	polkit_context_set_io_watch_functions (global_context, pk_io_add_watch, pk_io_remove_watch);
 	err = NULL;
 	if (!polkit_context_init (global_context, &err)) {
-		g_warning ("Cannot initialize libpolkit: %s", polkit_error_get_error_message (err));
-		polkit_error_free (err);
+		g_warning ("Cannot initialize libpolkit: %s",
+		           err ? polkit_error_get_error_message (err) : "unknown error");
+		if (err)
+			polkit_error_free (err);
 
+#if (POLKIT_VERSION_MAJOR == 0) && (POLKIT_VERSION_MINOR >= 7)
 		polkit_context_unref (global_context);
+#endif
 		global_context = NULL;
 	}
 


Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- NetworkManager.spec	5 Jun 2008 15:54:37 -0000	1.211
+++ NetworkManager.spec	6 Jun 2008 19:38:39 -0000	1.212
@@ -16,7 +16,7 @@
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.6.8.%{snapshot}%{?dist}
+Release: 0.6.9.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -28,6 +28,7 @@
 Patch3: optionally-wait-for-network.patch
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
+Patch6: pk-06-fixes.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -146,6 +147,7 @@
 %patch3 -p1 -b .wait-for-network
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
+%patch6 -p1 -b .pk-06-fixes
 
 %build
 # Even though we don't require named, we still build with it
@@ -298,6 +300,9 @@
 
 
 %changelog
+* Fri Jun  6 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.9.svn3675
+- Fix PolicyKit issues when running in SELinux Enforcing mode (rh #449662)
+
 * Wed Jun  4 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.8.svn3675
 - Move NM later in the shutdown process (rh #449070)
 - Move libnm-util into a subpackage to allow NM to be removed more easily (rh #351101)