pool/NetworkManager
SHA256
22
0
Fork 3
Code Issues Pull Requests Activity

Accepting request 19805 from GNOME:Factory

Browse Source 
Copy from GNOME:Factory/NetworkManager based on submit request 19805 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/19805
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/NetworkManager?expand=0&rev=60
This commit is contained in:
OBS User autobuild
2009-09-03 23:11:59 +00:00
committed by Git OBS Bridge
parent 4bba712245
commit 6d02a59746
4 changed files with 143 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
NetworkManager.changes
+18
View File
@@ -1,3 +1,21 @@
-------------------------------------------------------------------
Wed Aug 26 07:42:53 UTC 2009 - tambet@novell.com
- HAL added 'ssb' (Silicon Sonics Backplane, used internally on
most Broadcom ethernet and wifi chipsets) in 0.5.13, which
changed the device list layout and made NM unable to get the
driver for the wifi device. Fix that (bnc #526105).
-------------------------------------------------------------------
Tue Aug 25 08:28:14 UTC 2009 - tambet@novell.com
- Fix issues with root being at_console (bnc #530430).
-------------------------------------------------------------------
Thu Aug 20 09:14:01 UTC 2009 - aj@suse.de
- Require libiw-devel for building instead of wireless-tools.
-------------------------------------------------------------------
Tue Jul 21 14:21:18 CEST 2009 - aj@suse.de
NetworkManager.spec
+7 -3
View File
@@ -20,10 +20,10 @@
Name: NetworkManager
Url: http://www.gnome.org/projects/NetworkManager/
Version: 0.7.1
Release: 2
Release: 3
License: GPL v2 or later
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: PolicyKit-devel dhcp-client gtk-doc hal-devel intltool iproute2 libgcrypt-devel libnl-devel libtool libuuid-devel mozilla-nss-devel ppp-devel translation-update-upstream wireless-tools
BuildRequires: PolicyKit-devel dhcp-client gtk-doc hal-devel intltool iproute2 libgcrypt-devel libiw-devel libnl-devel libtool libuuid-devel mozilla-nss-devel ppp-devel translation-update-upstream
Group: Productivity/Networking/System
Summary: Network Link Manager and User Applications
Source0: NetworkManager-%{version}.tar.bz2
@@ -43,6 +43,8 @@ Patch10: 0010-Increase-wired-802.1x-wired-authentication-timeout.patch
Patch11: 0011-Don-t-bring-wireless-devices-up-when-wifi-is-disable.patch
Patch12: 0012-Update-resolv.conf-once.patch
Patch13: 0013-iptables-path.patch
Patch14: nm-root-at-console-permissions.patch
Patch15: nm-hal-tree-changes.patch
Requires: wpa_supplicant >= 0.5.8-54
Requires: dhcp-client
Requires: dnsmasq
@@ -133,7 +135,7 @@ Authors:
%prep
%setup -n %{name}-0.7.1 -q
translation-update-upstream
#translation-update-upstream
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -147,6 +149,8 @@ translation-update-upstream
%patch11 -p1
%patch12 -p1
%patch13 -p0
%patch14 -p1
%patch15 -p1
pppddir=`ls -1d /usr/%_lib/pppd/2*`
test -n "$pppddir" || exit 1
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
nm-hal-tree-changes.patch
+45
View File
@@ -0,0 +1,45 @@
Index: NetworkManager-0.7.1/src/nm-hal-manager.c
===================================================================
--- NetworkManager-0.7.1.orig/src/nm-hal-manager.c
+++ NetworkManager-0.7.1/src/nm-hal-manager.c
@@ -110,12 +110,40 @@ get_creator (NMHalManager *self, const c
/* Common helpers for built-in device creators */
static char *
+hal_get_subsystem (LibHalContext *ctx, const char *udi)
+{
+ char *subsys;
+
+ subsys = libhal_device_get_property_string (ctx, udi, "info.subsystem", NULL);
+ if (!subsys) {
+ /* info.bus is deprecated */
+ subsys = libhal_device_get_property_string (ctx, udi, "info.bus", NULL);
+ }
+ return subsys;
+}
+
+static char *
nm_get_device_driver_name (LibHalContext *ctx, const char *udi)
{
char *origdev_udi;
+ char *subsystem;
char *driver_name = NULL;
origdev_udi = libhal_device_get_property_string (ctx, udi, "net.originating_device", NULL);
+ if (!origdev_udi)
+ return NULL;
+
+ subsystem = hal_get_subsystem (ctx, origdev_udi);
+ if (subsystem && (!strcmp (subsystem, "ibmebus") || !strcmp (subsystem, "ssb"))) {
+ char *tmp;
+
+ /* The driver name is on the grandparent of the net device */
+ tmp = libhal_device_get_property_string (ctx, origdev_udi, "info.parent", NULL);
+ libhal_free_string (origdev_udi);
+ origdev_udi = tmp;
+ }
+ libhal_free_string (subsystem);
+
if (origdev_udi && libhal_device_property_exists (ctx, origdev_udi, "info.linux.driver", NULL)) {
char *drv;
nm-root-at-console-permissions.patch
+73
View File
@@ -0,0 +1,73 @@
commit 5aa1f7bb6d547f43cc7a82b163a3a10550720d0c
Author: Dan Williams <dcbw@redhat.com>
Date: Sun May 10 00:20:12 2009 -0400
dbus: fix issues with root being at_console
When root is at_console, the at_console stuff overrides the user=root
section. Since the default section will deny-by-default, explicitly
allow certain D-Bus interfaces to be usable by at_console users (including
root when root is at_console) prevents root from being denied access to
those interfaces when root is at_console.
diff --git a/src/NetworkManager.conf b/src/NetworkManager.conf
index bb1c771..c3d7b84 100644
--- a/src/NetworkManager.conf
+++ b/src/NetworkManager.conf
@@ -12,15 +12,51 @@
<policy at_console="true">
<allow send_destination="org.freedesktop.NetworkManager"/>
- <deny send_destination="org.freedesktop.NetworkManager"
- send_interface="org.freedesktop.NetworkManager.PPP"/>
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.DBus.Introspectable"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.DBus.Properties"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.AccessPoint"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.Connection.Active"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.Device.Cdma"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.Device.Wired"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.Device.Gsm"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.Device.Serial"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.Device.Wireless"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.Device"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.DHCP4Config"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.IP4Config"/>
+
+ <allow send_destination="org.freedesktop.NetworkManager"
+ send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
</policy>
<policy context="default">
<deny own="org.freedesktop.NetworkManager"/>
<deny send_destination="org.freedesktop.NetworkManager"/>
-
- <deny send_destination="org.freedesktop.NetworkManager"
- send_interface="org.freedesktop.NetworkManager.PPP"/>
</policy>
<limit name="max_replies_per_connection">512</limit>