diff --git a/NetworkManager-0.6.5-fixup-internal-applet-build.patch b/NetworkManager-0.6.5-fixup-internal-applet-build.patch index d2dc219..dd73b6b 100644 --- a/NetworkManager-0.6.5-fixup-internal-applet-build.patch +++ b/NetworkManager-0.6.5-fixup-internal-applet-build.patch @@ -1,44 +1,46 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac ---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2007-11-13 09:53:39.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2007-11-13 15:14:13.000000000 -0500 -@@ -60,9 +60,6 @@ AC_C_BIGENDIAN +--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2008-06-17 13:51:13.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-07-18 11:52:29.000000000 -0400 +@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.72 glib-2.0 >= 2.10 - NetworkManager >= 0.7.0 -- libnm_glib -- libnm-util +- libnm_glib >= 0.7.0 +- libnm-util >= 0.7.0 +- libnm_glib_vpn >= 0.7.0 gtk+-2.0 >= 2.10 libglade-2.0 - gconf-2.0 -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am.buildfix 2007-09-22 22:54:27.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/vpn-properties/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -1,6 +1,10 @@ + gmodule-export-2.0 +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-07-03 07:08:55.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-07-18 11:52:29.000000000 -0400 +@@ -2,6 +2,10 @@ NULL= - bin_PROGRAMS = nm-vpn-properties + bin_PROGRAMS = nm-connection-editor +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ + -I${top_srcdir}/../libnm-glib + - nm_vpn_propertiesdir=$(includedir)/NetworkManager - - nm_vpn_properties_HEADERS = \ -@@ -28,7 +32,9 @@ nm_vpn_properties_CFLAGS = \ - - nm_vpn_properties_LDADD = \ + nm_connection_editor_CPPFLAGS = \ + $(NMA_CFLAGS) \ + -DICONDIR=\""$(datadir)/icons"\" \ +@@ -60,7 +64,10 @@ nm_connection_editor_LDADD = \ + ${top_builddir}/src/wireless-security/libwireless-security.la \ + ${top_builddir}/src/utils/libutils.la \ $(NMA_LIBS) \ -- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la -+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ +- $(POLKIT_LIBS) ++ $(POLKIT_LIBS) \ + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - CLEANFILES = $(server_DATA) *.bak *.gladep *~ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la + gladedir = $(datadir)/nm-applet + glade_DATA = \ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2007-10-27 18:23:56.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2007-11-13 15:14:13.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -47,8 +49,7 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buil noinst_LTLIBRARIES = libgconf-helpers.la libgconf_helpers_la_SOURCES = \ -@@ -13,6 +17,8 @@ libgconf_helpers_la_CPPFLAGS = \ - +@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \ libgconf_helpers_la_LIBADD = \ $(NMA_LIBS) \ ${top_builddir}/src/marshallers/libmarshallers.la \ @@ -57,9 +58,34 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buil + -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2008-07-03 08:48:24.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-07-18 11:52:29.000000000 -0400 +@@ -4,6 +4,10 @@ NULL= + + bin_PROGRAMS = nm-applet + ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + nm_applet_CPPFLAGS = \ + $(NMA_CFLAGS) \ + $(NOTIFY_CFLAGS) \ +@@ -57,7 +61,9 @@ nm_applet_LDADD = \ + ${top_builddir}/src/marshallers/libmarshallers.la \ + ${top_builddir}/src/utils/libutils.la \ + ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ +- ${top_builddir}/src/wireless-security/libwireless-security.la ++ ${top_builddir}/src/wireless-security/libwireless-security.la \ ++ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + + gladedir = $(datadir)/nm-applet + glade_DATA = applet.glade keyring.png diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2007-11-13 15:41:01.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2007-11-13 15:42:30.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -78,8 +104,8 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix Net + -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2007-11-07 12:12:16.000000000 -0500 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2007-11-13 15:14:13.000000000 -0500 +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-07-18 11:52:29.000000000 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la @@ -99,54 +125,3 @@ diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am. + -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ + -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2007-09-20 07:40:37.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -2,6 +2,10 @@ NULL= - - bin_PROGRAMS = nm-connection-editor - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_connection_editor_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -29,8 +33,10 @@ nm_connection_editor_LDADD = \ - $(top_builddir)/src/gconf-helpers/libgconf-helpers.la \ - ${top_builddir}/src/wireless-security/libwireless-security.la \ - ${top_builddir}/src/utils/libutils.la \ - $(NMA_LIBS) \ -- $(POLKIT_LIBS) -+ $(POLKIT_LIBS) \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - gladedir = $(datadir)/nm-applet - glade_DATA = nm-connection-editor.gladediff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2007-10-27 18:11:31.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2007-11-13 15:14:13.000000000 -0500 -@@ -4,6 +4,10 @@ NULL= - - bin_PROGRAMS = nm-applet - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_applet_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -58,7 +62,9 @@ nm_applet_LDADD = \ - $(NMA_LIBS) \ - ${top_builddir}/src/utils/libutils.la \ - ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -- ${top_builddir}/src/wireless-security/libwireless-security.la -+ ${top_builddir}/src/wireless-security/libwireless-security.la \ -+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - if WITH_NOTIFY - nm_applet_LDADD += $(NOTIFY_LIBS) - diff --git a/NetworkManager.spec b/NetworkManager.spec index 7b76d05..d5e4499 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -6,17 +6,17 @@ ExcludeArch: s390 s390x %define gtk2_version 2.12.0 %define wireless_tools_version 1:28-0pre9 -%define libnl_version 1.0-0.15.pre8.git20071218 +%define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot svn3747 -%define applet_snapshot svn755 +%define snapshot svn3846 +%define applet_snapshot svn798 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 Version: 0.7.0 -Release: 0.7.%{snapshot}%{?dist} +Release: 0.11.%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -25,10 +25,12 @@ Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz Source2: nm-system-settings.conf Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch Patch2: disable-editing-system-connections-for-now.patch +Patch3: old-dbus-glib.patch Patch4: serial-debug.patch Patch5: explain-dns1-dns2.patch Patch6: pk-06-fixes.patch Patch7: preserve-f8-priorities.patch +Patch20: old-glib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -41,11 +43,14 @@ Requires: wpa_supplicant >= 0.5.7-21 Requires: libnl >= %{libnl_version} Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: ppp >= %{ppp_version} +Requires: avahi-autoipd +Requires: dnsmasq Obsoletes: dhcdbd # Due to VPN auth-dialog changes in applet r662 -Conflicts: NetworkManager-vpnc < 1:0.7.0-0.7.7.svn3549 -Conflicts: NetworkManager-openvpn < 1:0.7.0-9.svn3549 +# Due to using prefixes instead of netmasks in NM > r3812 +Conflicts: NetworkManager-vpnc < 1:0.7.0-0.10.svn3830 +Conflicts: NetworkManager-openvpn < 1:0.7.0-11.svn3830 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -92,6 +97,7 @@ This package contains various headers accessing some NetworkManager functionalit from applications. + %package gnome Summary: GNOME applications for use with NetworkManager Group: Applications/Internet @@ -100,7 +106,6 @@ Requires: %{name}-glib = %{epoch}:%{version}-%{release} Requires: gnome-panel Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} -Requires: hal >= %{hal_version} Requires: libnotify >= 0.4.3 PreReq: gtk2 >= %{gtk2_version} Requires: gnome-keyring @@ -117,6 +122,9 @@ Summary: Libraries for adding NetworkManager support to applications that use gl Group: Development/Libraries Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} +# Evil hack for multi-lib due to move of libnm-util from core package to -glib +Requires: %{name} = %{epoch}:%{version}-%{release} +Obsoletes: %{name} < %{epoch}:%{version}-0.9.4.svn3675 %description glib This package contains the libraries that make it easier to use some NetworkManager @@ -144,31 +152,28 @@ NetworkManager functionality from applications that use glib. tar -xzf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .disable-system +%patch3 -p1 -b .old-dbus-glib %patch4 -p1 -b .serial-debug %patch5 -p1 -b .explain-dns1-dns2 %patch6 -p1 -b .pk-06-fixes %patch7 -p1 -b .f8-priorities +%patch20 -p1 -b .old-glib %build -# Even though we don't require named, we still build with it -# so that if the user installs it, NM will use it automatically autoreconf -i %configure \ --disable-static \ - --with-named=/usr/sbin/named \ - --with-named-dir=/var/named/data \ - --with-named-user=named + --with-distro=redhat \ + --with-dhcp-client=dhclient \ + --with-crypto=nss \ + --enable-more-warnings=yes make # build the applet pushd nm-applet-0.7.0 autoreconf -i intltoolize --force - %configure \ - --disable-static \ - --with-notify \ - --with-nss=yes \ - --with-gnutls=no + %configure --disable-static make popd @@ -178,7 +183,7 @@ popd # install NM make install DESTDIR=$RPM_BUILD_ROOT -%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/ +%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ # install the applet pushd nm-applet-0.7.0 @@ -210,10 +215,12 @@ fi %preun if [ $1 -eq 0 ]; then /sbin/service NetworkManager stop >/dev/null 2>&1 + killall -TERM nm-system-settings >/dev/null 2>&1 /sbin/chkconfig --del NetworkManager fi %triggerun -- NetworkManager < 1:0.7.0-0.9.2.svn3614 +/sbin/service NetworkManagerDispatcher stop >/dev/null 2>&1 /sbin/chkconfig --del NetworkManagerDispatcher exit 0 @@ -237,18 +244,20 @@ fi %doc COPYING ChangeLog NEWS AUTHORS README CONTRIBUTING TODO %{_sysconfdir}/dbus-1/system.d/NetworkManager.conf %{_sysconfdir}/dbus-1/system.d/nm-dhcp-client.conf +%{_sysconfdir}/dbus-1/system.d/nm-avahi-autoipd.conf %{_sysconfdir}/dbus-1/system.d/nm-dispatcher.conf %{_sysconfdir}/dbus-1/system.d/nm-system-settings.conf %config %{_sysconfdir}/rc.d/init.d/NetworkManager %{_sbindir}/%{name} %{_sbindir}/nm-system-settings -%{_sysconfdir}/nm-system-settings.conf -%dir %{_sysconfdir}/NetworkManager/ -%dir %{_sysconfdir}/NetworkManager/dispatcher.d -%dir %{_sysconfdir}/NetworkManager/VPN +%dir %{_sysconfdir}/%{name}/ +%dir %{_sysconfdir}/%{name}/dispatcher.d +%dir %{_sysconfdir}/%{name}/VPN +%{_sysconfdir}/%{name}/nm-system-settings.conf %{_bindir}/nm-tool %{_bindir}/nm-online %{_libexecdir}/nm-dhcp-client.action +%{_libexecdir}/nm-avahi-autoipd.action %{_libexecdir}/nm-dispatcher.action %dir %{_libdir}/NetworkManager %{_libdir}/NetworkManager/*.so* @@ -274,9 +283,7 @@ fi %defattr(-,root,root,0755) %{_sysconfdir}/dbus-1/system.d/nm-applet.conf %{_bindir}/nm-applet -%{_bindir}/nm-vpn-properties %{_bindir}/nm-connection-editor -%{_datadir}/gnome-vpn-properties/nm-vpn-properties.glade %{_datadir}/nm-applet/ %{_datadir}/icons/hicolor/16x16/apps/*.png %{_datadir}/icons/hicolor/22x22/apps/*.png @@ -293,13 +300,33 @@ fi %{_includedir}/libnm-glib/*.h %{_includedir}/NetworkManager/nm-*.h %{_libdir}/pkgconfig/libnm_glib.pc +%{_libdir}/pkgconfig/libnm_glib_vpn.pc %{_libdir}/pkgconfig/libnm-util.pc %{_libdir}/libnm_glib.so %{_libdir}/libnm_glib_vpn.so %{_libdir}/libnm-util.so - %changelog +* Thu Jul 24 2008 Dan Williams - 1:0.7.0-0.11.svn3846 +- Convert stored IPv4 static IP addresses to new prefix-based scheme automatically +- Fix pppd connections to some 3G providers (rh #455348) +- Make PPPoE "Show Password" option work +- Hide IPv4 config options that don't make sense in certain configurations +- Expose server-returned DHCP options via D-Bus +- Use avahi-autoipd rather than old built-in IPv4LL implementation +- Send hostname to DHCP server if provided (DHCP_HOSTNAME ifcfg option) +- Support sending DHCP Client Identifier to DHCP server +- Allow forcing 802.1x PEAP Label to '0' +- Make connection sharing more robust +- Show status for shared and Ad-Hoc connections if no other connection is active +- Revert fix for (rh #351101) since it breaks multi-lib (rh #451519) +- Drop explicit hal dep in -gnome +- Move VPN configuration into connection editor +- Fix mobile broadband username/password issues +- Fix issues with broken rfkill setups (rh #448889) +- Honor APN setting for GSM mobile broadband configurations +- Fix adding CDMA connections in the connection editor + * Wed Jun 11 2008 Dan Williams - 1:0.7.0-0.7.svn3747 - Update to latest SVN - Enable connection sharing diff --git a/old-dbus-glib.patch b/old-dbus-glib.patch new file mode 100644 index 0000000..2aebda0 --- /dev/null +++ b/old-dbus-glib.patch @@ -0,0 +1,12 @@ +diff -up NetworkManager-0.7.0/configure.in.dbusglib NetworkManager-0.7.0/configure.in +--- NetworkManager-0.7.0/configure.in.dbusglib 2008-07-18 14:17:51.000000000 -0400 ++++ NetworkManager-0.7.0/configure.in 2008-07-18 14:18:14.000000000 -0400 +@@ -170,7 +170,7 @@ if test "$ac_have_iwevgenie" = no; then + AC_MSG_ERROR(wireless-tools >= 28pre9 not installed or not functional) + fi + +-PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.75) ++PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= 0.73) + + ##### Find out the version of DBUS we're using + dbus_version=`pkg-config --modversion dbus-1` diff --git a/old-glib.patch b/old-glib.patch new file mode 100644 index 0000000..51840d5 --- /dev/null +++ b/old-glib.patch @@ -0,0 +1,13 @@ +diff -up NetworkManager-0.7.0/src/nm-device-wifi.c.no-warn-if-fail NetworkManager-0.7.0/src/nm-device-wifi.c +--- NetworkManager-0.7.0/src/nm-device-wifi.c.no-warn-if-fail 2008-07-25 09:53:53.000000000 -0400 ++++ NetworkManager-0.7.0/src/nm-device-wifi.c 2008-07-25 09:54:33.000000000 -0400 +@@ -3417,7 +3417,8 @@ nm_device_wifi_set_enabled (NMDeviceWifi + return; + + if (enabled) { +- g_warn_if_fail (state == NM_DEVICE_STATE_UNAVAILABLE); ++ if (state == NM_DEVICE_STATE_UNAVAILABLE) ++ g_warning ("%s: state was already unavailable!", __func__); + + if (!nm_device_hw_bring_up (NM_DEVICE (self), TRUE)) { + /* The device sucks, or HAL was lying to us about the killswitch state */ diff --git a/sources b/sources index 70f1cc9..61e7aeb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -25a1612c01ec19ba2864ad97ac98c759 NetworkManager-0.7.0.svn3747.tar.gz -4ae0a5d13783f4de4e4e6f7fb949aaed nm-applet-0.7.0.svn755.tar.gz +2ead19fc2a5c47c0573ada0d9d1fdb6f NetworkManager-0.7.0.svn3846.tar.gz +93704b83076413e4ded64c958d474bca nm-applet-0.7.0.svn798.tar.gz