--- network-manager-0.6.1.orig/src/nm-device-802-11-wireless.c +++ network-manager-0.6.1/src/nm-device-802-11-wireless.c @@ -2253,7 +2253,7 @@ } -#define NM_SUPPLICANT_TIMEOUT 20 /* how long we wait for wpa_supplicant to associate (in seconds) */ +#define NM_SUPPLICANT_TIMEOUT 60 /* how long we wait for wpa_supplicant to associate (in seconds) */ static unsigned int get_supplicant_timeout (NMDevice80211Wireless *self) --- network-manager-0.6.1.orig/debian/control +++ network-manager-0.6.1/debian/control @@ -0,0 +1,106 @@ +Source: network-manager +Section: net +Priority: optional +Maintainer: Scott James Remnant +Standards-Version: 3.6.2.1 +Build-Depends: debhelper (>= 4.0.0), gnome-common, intltool, libgnome-keyring-dev, libdbus-glib-1-dev (>= 0.60), libiw-dev(>= 27+28pre9), libhal-dev, libgnomeui-dev, libpanel-applet2-dev, libglade2-dev, libgconf2-dev, docbook-to-man, libnl-dev, wpasupplicant + +Package: network-manager +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, iproute, ifupdown, dhcdbd (>= 1.10-0ubuntu2), lsb-base (>= 2.0-6) +Recommends: network-manager-gnome | network-manager-kde, wpasupplicant +Description: network management framework (daemon) + NetworkManager attempts to keep an active network connection available at + all times. It is intended primarily for laptops where it allows easy + switching betwen local wireless networks, it's also useful on desktops + with a selection of different interfaces to use. It is not intended for + usage on servers. + . + This package provides the userspace daemons. + +Package: network-manager-gnome +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, network-manager +Provides: nm-applet +Replaces: network-manager (<< 0.5.1-0ubuntu12), nm-applet +Conflicts: nm-applet +Description: network management framework (GNOME Frontend) + NetworkManager attempts to keep an active network connection available at + all times. It is intended primarily for laptops where it allows easy + switching betwen local wireless networks, it's also useful on desktops + with a selection of different interfaces to use. It is not intended for + usage on servers. + . + This package provides a notification area applet that can control the + NetworkManager daemons and allow switching between wired and different + wireless networks. + +Package: network-manager-dev +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, pkg-config +Description: network management framework (plugin development headers) + NetworkManager attempts to keep an active network connection available at + all times. It is intended primarily for laptops where it allows easy + switching betwen local wireless networks, it's also useful on desktops + with a selection of different interfaces to use. It is not intended for + usage on servers. + . + This package provides header files that are needed to compile VPN Plugins + for NetworkManager. + +Package: libnm-glib0 +Architecture: any +Depends: ${shlibs:Depends} +Provides: libnm-glib-0 +Replaces: libnm-glib-0 +Conflicts: libnm-glib-0 +Description: network management framework (GLib shared library) + NetworkManager attempts to keep an active network connection available at + all times. It is intended primarily for laptops where it allows easy + switching betwen local wireless networks, it's also useful on desktops + with a selection of different interfaces to use. It is not intended for + usage on servers. + . + This package provides the shared library that applications can use to query + connection status via NetworkManager. + +Package: libnm-glib-dev +Architecture: any +Depends: libglib2.0-dev, libnm-glib0, libdbus-glib-1-dev (>= 0.60) +Provides: libnm-glib-0-dev +Replaces: libnm-glib-0-dev +Conflicts: libnm-glib-0-dev +Description: network management framework (GLib interface) + NetworkManager attempts to keep an active network connection available at + all times. It is intended primarily for laptops where it allows easy + switching betwen local wireless networks, it's also useful on desktops + with a selection of different interfaces to use. It is not intended for + usage on servers. + . + This package provides the interface that applications can use to query + connection status via NetworkManager. + +Package: libnm-util0 +Architecture: any +Depends: ${shlibs:Depends} +Description: network management framework (utility shared library) + NetworkManager attempts to keep an active network connection available at + all times. It is intended primarily for laptops where it allows easy + switching betwen local wireless networks, it's also useful on desktops + with a selection of different interfaces to use. It is not intended for + usage on servers. + . + This package contains a convenience library to ease the access to + NetworkManager. + +Package: libnm-util-dev +Architecture: any +Depends: libglib2.0-dev, libnm-util0, libgcrypt11-dev, libdbus-glib-1-dev (>= 0.60) +Description: network management framework (Util interface) + NetworkManager attempts to keep an active network connection available at + all times. It is intended primarily for laptops where it allows easy + switching betwen local wireless networks, it's also useful on desktops + with a selection of different interfaces to use. It is not intended for + usage on servers. + . + This package provides the interface that eases the access to NetworkManager. --- network-manager-0.6.1.orig/debian/network-manager.postinst +++ network-manager-0.6.1/debian/network-manager.postinst @@ -0,0 +1,44 @@ +#!/bin/sh -e +# # This script can be called in the following ways: +# +# After the package was installed: +# configure +# +# +# If prerm fails during upgrade or fails on failed upgrade: +# abort-upgrade +# +# If prerm fails during deconfiguration of a package: +# abort-deconfigure in-favour +# removing +# +# If prerm fails during replacement due to conflict: +# abort-remove in-favour + + +# Reload dbus and restart running network-manager services +restart() +{ + if [ -x /etc/init.d/dbus ]; then + invoke-rc.d dbus force-reload || true + fi + + /etc/dbus-1/event.d/25NetworkManager restart + /etc/dbus-1/event.d/26NetworkManagerDispatcher restart +} + + +case "$1" in + configure) + restart + ;; + abort-upgrade|abort-deconfigure|abort-remove) + ;; + *) + echo "$0 called with unknown argument \`$1'" 1>&2 + exit 1 + ;; +esac + +#DEBHELPER# +exit 0 --- network-manager-0.6.1.orig/debian/network-manager.manpages +++ network-manager-0.6.1/debian/network-manager.manpages @@ -0,0 +1,2 @@ +man/NetworkManager.1 +man/NetworkManagerDispatcher.1 --- network-manager-0.6.1.orig/debian/NetworkManager.1 +++ network-manager-0.6.1/debian/NetworkManager.1 @@ -0,0 +1,28 @@ +.TH "NetworkManager" "1" +.SH NAME +NetworkManager \- Network management framework +.SH SYNOPSIS +.B NetworkManager +[\fB\-\-no-daemon\fP] [\fB\-\-enable-test-devices\fP] [\fB\-\-help\fP] +.\" +.SH DESCRIPTION +.B NetworkManager +monitors all network connections and automatically chooses the best +connection to use. It is started as a system service by \fBdbus\fR. +\fBnm-applet\fR allows you to specify wireless access points which +wireless cards in the computer should associate with. +.\" +.SH OPTIONS +.TP +.BI --no-daemon +Don't become a daemon, messages will be logged to stdout +.TP +.BI --enable-test-devices +Allow dummy devices to be created via DBUS methods for debugging +.\" +.SH SEE ALSO +.BR nm-applet (1) +.BR NetworkManagerDispatcher (1) + +More Information about NetworkManager can be found at +http://people.redhat.com/dcbw/NetworkManager/. --- network-manager-0.6.1.orig/debian/rules +++ network-manager-0.6.1/debian/rules @@ -0,0 +1,144 @@ +#!/usr/bin/make -f +# debian/rules for the udev package. +# Copyright © 2006 Canonical Ltd. +# Author: Scott James Remnant + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export DH_OPTIONS + +CFLAGS = -Wall -g + +# Disable optimisations if noopt found in $DEB_BUILD_OPTIONS +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --build=$(DEB_HOST_GNU_TYPE) +else + confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) +endif + + +# Apply patches to the package +patch: patch-stamp +patch-stamp: + dh_testdir + @patches=debian/patches/*.patch; for patch in $$patches; do \ + echo "Applying $$patch"; \ + patch -stuN -p1 < $$patch || exit 1; \ + done + touch $@ + +# Remove patches from the package +unpatch: + dh_testdir + @if test -f patch-stamp; then \ + patches=debian/patches/*.patch; \ + for patch in $$patches; do \ + reversepatches="$$patch $$reversepatches"; \ + done; \ + for patch in $$reversepatches; do \ + echo "Reversing $$patch"; \ + patch -suRf -p1 < $$patch || exit 1; \ + done; \ + rm -f patch-stamp; \ + fi + + +# Build the package +build: patch build-stamp +build-stamp: + dh_testdir + + ./configure $(confflags) \ + CFLAGS="$(CFLAGS)" \ + --prefix=/usr \ + --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --sysconfdir=/etc \ + --with-dbus-sys=\$${sysconfdir}/dbus-1/system.d \ + --libexecdir=/usr/lib/network-manager \ + --localstatedir=/var \ + --with-dhcdbd=/sbin/dhcdbd \ + --with-wpa_supplicant=/sbin/wpa_supplicant \ + --with-distro=ubuntu + + $(MAKE) + + touch $@ + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + # Install the dbus event scripts + install -m 755 -o root -g root debian/network-manager.dbus-event \ + debian/network-manager/etc/dbus-1/event.d/25NetworkManager + install -m 755 -o root -g root debian/network-manager-dispatcher.dbus-event \ + debian/network-manager/etc/dbus-1/event.d/26NetworkManagerDispatcher + + # Install the dispatcher event script + install -m 755 -o root -g root debian/network-manager-dispatcher.script \ + debian/network-manager/usr/share/NetworkManager/dispatcher.d/01ifupdown + + # Install the configuration files + install -m 644 -o root -g root debian/network-manager.dbus-conf \ + debian/network-manager/etc/dbus-1/system.d/NetworkManager.conf + install -m 644 -o root -g root debian/nm-applet.dbus-conf \ + debian/network-manager-gnome/etc/dbus-1/system.d/nm-applet.conf + +binary: binary-arch binary-indep + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: DH_OPTIONS=-a +binary-arch: build install + dh_testdir + dh_testroot + dh_install --sourcedir=debian/tmp + dh_installchangelogs ChangeLog + dh_installdocs + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_makeshlibs + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + + +# Clean up the mess we made +clean: clean-source unpatch +clean-source: + dh_testdir + rm -f build-stamp + + -$(MAKE) clean distclean + + dh_clean + + +.PHONY: patch unpatch build install binary-indep binary-arch binary \ + clean clean-source + --- network-manager-0.6.1.orig/debian/network-manager.dbus-conf +++ network-manager-0.6.1/debian/network-manager.dbus-conf @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + --- network-manager-0.6.1.orig/debian/NetworkManagerDispatcher.1 +++ network-manager-0.6.1/debian/NetworkManagerDispatcher.1 @@ -0,0 +1,20 @@ +.TH "NetworkManagerDispatcher" "1" +.SH NAME +NetworkManagerDispatcher \- Network Manager event dispatcher +.SH SYNOPSIS +.B NetworkManagerDispatcher +.\" +.SH DESCRIPTION +.B NetworkManagerDispatcher +ensures that scripts are called each time a network device is brought up +or down by \fBNetworkManager\fR so that user-defined policy may be executed. +Scripts are run with the network device name as the first argument and the +action as the second argument ("up", "down", "pre-up" or "pre-down"). + +On Ubuntu systems these scripts are in +\fI/usr/share/NetworkManager/dispatcher.d\fR and are not intended to be +user-modifiable. Instead a script is shipped that ensures the those in +\fI/etc/network\fR subdirectories such \fI/etc/network/if-up.d\fR are run. +.\" +.SH SEE ALSO +.BR NetworkManager --- network-manager-0.6.1.orig/debian/changelog +++ network-manager-0.6.1/debian/changelog @@ -0,0 +1,403 @@ +network-manager (0.6.1-0ubuntu1) dapper; urgency=low + + Thanks to Johan Kiviniemi and Mario Danic for their work on this + package. + + * New upstream version: + - WPA and WPA2 support using wpa_supplicant. + - NIS support. + - Survives DBUS and HAL restarts. + - New tray icon look and behaviour. + - Displays speed of current connection. + + * Update debian/ using the Debian pkg-utopia SVN as a guide: + - Renamed nm-applet package to network-manager-gnome. + - Recommend network-manager-kde as an alternative for when that exists. + - Renamed libnm-glib-0 to libnm-glib0 to be consistent. + - Add new libnm-util0 packages. + - Add nm-applet and nm-vpn-properties manpages. + + * 10-dbus-api-fix.patch: + - dropped, included upstream. + * 10-manpage-name-headers.patch: + - add missing NAME header to included manpages which we now use in + favour of our own. + * 20-supplicant-timeout.patch: + - increase to 60 seconds (taken from Debian) + * 30-blacklist-devices.patch: + - Dropped; upstream implemented an nm_system_device_get_disabled() + function that we implement instead. + * 50-disable-named-and-vpn-managers.patch + - Dropped; upstream implemented an nm_system_should_modify_resolv_conf() + function that we implement instead. + - Yes kids, this means we ship VPN support now. + * 80-rml-wpa-workarounds.patch: + - Collection of workarounds for madwifi, orinoco and ndiswrapper from + Robert Love. + * 85-rml-madwifi-signal-strength: + - Patch from Robert Love to sanify the signal strength on Atheros cards. + + -- Scott James Remnant Fri, 24 Mar 2006 01:45:39 +0000 + +network-manager (0.5.1-0ubuntu19) dapper; urgency=low + + * Upload fixed version of 40-ubuntu-backend.patch that doesn't touch + files removed by a good distcleaning. + + -- Scott James Remnant Mon, 13 Mar 2006 10:32:09 +0000 + +network-manager (0.5.1-0ubuntu18) dapper; urgency=low + + * debian/patches/20-linux-wlan-ng.patch: + - Fix dbus namespace for RefreshDevice signal (org.gnome.NetworkManager -> + org.freedesktop.NetworkManager) + - Fix typo in debug messages. + * Add debian/patches/70-dont-deactivate-new-devices.patch: + - Do not immediately deactivate a freshly appeared device. Patch + 60-dispatch-more-events.patch now causes if-down scripts to be run, + which might disable the interface (e. g. to conserve power, as + linux-wlan-ng does); this breaks their activation. + * debian/network-manager.dbus-conf: + - Only allow access for at_console users, not for plugdev members. + - Do not allow org.freedesktop.NetworkManager to be owned by anyone but + root. + * debian/nm-applet.dbus-conf: + - Only allow access for at_console users, not for plugdev members. + + -- Martin Pitt Tue, 7 Mar 2006 22:58:41 +0100 + +network-manager (0.5.1-0ubuntu17) dapper; urgency=low + + * debian/nm-applet.dir, debian/rules: + - install the autostart desktop to /etc/xdg/autostart according to the + specification + +-- Sebastien Bacher Sat, 4 Mar 2006 23:38:30 +0100 + +network-manager (0.5.1-0ubuntu16) dapper; urgency=low + + * 40-ubuntu-backend.patch: + - Also consider and manage devices which are listed in + /etc/network/interfaces, but only as "auto" and "inet dhcp"; any other + options results in the device being ignored. + - Remove the note again, as the extra configuration isn't required. + + -- Scott James Remnant Mon, 20 Feb 2006 11:57:26 +0000 + +network-manager (0.5.1-0ubuntu15) dapper; urgency=low + + * network-manager recommends nm-applet. Ubuntu #32049. + * Escape backtick in dispatcher script. Ubuntu #32044. + + -- Scott James Remnant Mon, 20 Feb 2006 10:38:39 +0000 + +network-manager (0.5.1-0ubuntu14) dapper; urgency=low + + * nm-applet replaces network-manager (<< 0.5.1-0ubuntu12) (Malone #31961) + + -- Adam Conrad Sun, 19 Feb 2006 20:21:43 +1100 + +network-manager (0.5.1-0ubuntu13) dapper; urgency=low + + * Fix network-manager.postinst: s/them/then/ + + -- Christian Bjälevik Sat, 18 Feb 2006 01:51:58 +0100 + +network-manager (0.5.1-0ubuntu12) dapper; urgency=low + + * Migrate to my own style of packaging. + - Remove duplicated docs from other packages. + - Restored debian/patches directory with patches split from diff. + - Split nm-applet into a different package so that we can have + different ones in the future. + + * Take the autostart nm-applet.desktop file from CVS and install it into + the Ubuntu location so that nm-applet lives with the session. + + * 30-blacklist-devices.patch: + - Check devices against the backend before adding them to see whether + the backend wants us to ignore them, and if so, literally just ignore + them. + * 40-ubuntu-backend.patch: + - Create an Ubuntu backend from the RedHat and Debian ones. We don't + need to kill anything when we start, and don't currently support + dial-up profiles. This includes a function to indicate that anything + with an explicit configuration is blacklisted. + * 50-disable-named-and-vpn-managers.patch: + - Remove the dependency on bind9 and all attempts to tinker with + /etc/resolv.conf. Ubuntu's libc contains resolver patches to ensure + changes are noticed by running applications; also our dhclient + configuration handles writing resolv.conf itself and we're not yet + allowing NetworkManager to manage static interfaces and VPN + connections. + * 60-dispatch-more-events.patch: + - Add a DeviceDeactivated dbus event and send it when a device has + definitely finished coming down. Modify NetworkManagerDispatcher + to listen for these new events and run scripts with the pre-up and + post-down events for them. + * 65-dispatcher-script-dir.patch: + - Change the dispatcher script directory to point to + /usr/share/NetworkManager/dispatcher.d rather than something under /etc. + - Adjust manpage to match + - Ship a default script in the dispatcher.d directory to run the user + scripts under /etc/network/if-*.d + + -- Scott James Remnant Thu, 2 Feb 2006 16:07:54 +0000 + +network-manager (0.5.1-0ubuntu11) dapper; urgency=low + + * src/NetworkManagerDevice.c: nm_device_set_essid(): If the device is driven + by linux-wlan-ng (module prism2_*), call wlanctl-ng to set the ESSID. + * nm_device_set_mode(), nm_device_get_mode(), nm_device_set_essid(), + nm_device_get_essid(), nm_device_set_enc_key(): When the device is managed + by linux-wlan-ng, do not call the standard kernel IW* ioctls since they + sometimes cause kernel oopses in the prism2_* modules. + * src/NetworkManager.c: + - Add dbus signal handler. + - Add dbus signal "RefreshDevice", which causes the given interface to be + removed and re-added; This allows external programs (like an udev rule) + to tell NM that a wireless interface was enabled/disabled. + + -- Martin Pitt Wed, 1 Feb 2006 09:49:02 +0000 + +network-manager (0.5.1-0ubuntu10) dapper; urgency=low + + * debian/network-manager.manpages: + - Fix it for real this time! + + -- Christian Bjälevik Thu, 26 Jan 2006 12:15:17 +0100 + +network-manager (0.5.1-0ubuntu9) dapper; urgency=low + + * Brown paper bag! + * debian/rules: + - Have to correct path for the docbook-to-man stuff. + + -- Christian Bjälevik Thu, 26 Jan 2006 11:58:54 +0100 + +network-manager (0.5.1-0ubuntu8) dapper; urgency=low + + * debian/*.dbus-event: + - Beautify LSB in eventscripts. + * debian/control: + - Change maintainer to myself. + - Remove build-dep on dpatch. + * debian/control, debian/rules: + - Generate and install the manpages. + * debian/network-manager.docs: + - Actually place README, TODO and NEWS in the package. + + -- Christian Bjälevik Thu, 26 Jan 2006 00:54:00 +0100 + +network-manager (0.5.1-0ubuntu7) dapper; urgency=low + + * debian/rules, debian/network-manager.postinst: + - Change NetworkManagerDispatcher from 25 to 26. + - Remove 25NetworkManagerDispatcher if it exists. + * Remove patches/ and start using bzr-development :-). + + -- Christian Bjälevik Wed, 25 Jan 2006 13:14:14 +0100 + +network-manager (0.5.1-0ubuntu6) dapper; urgency=low + + * Really don't depend on bind9 being installed + + -- Matthew Garrett Mon, 26 Dec 2005 00:40:29 +0000 + +network-manager (0.5.1-0ubuntu5) dapper; urgency=low + + * debian/control: + - Version dep on dhcdbd to (>= 1.10-0ubuntu2). + + -- Christian Bjälevik Wed, 21 Dec 2005 19:08:53 +0100 + +network-manager (0.5.1-0ubuntu4) dapper; urgency=low + + * debian/control: + - Version all accurances of libdbus-glib-1-dev to (>= 0.60). + - Removed not needed Build-Dep on libxdcmp-dev, this is a dep + of libx11-dev now. + * debian/patches/01-STOLEN_FROM_HEAD-dbus-60: + - Add a patch from CVS HEAD to fix FTBFS. + No patchsystem, only applied it. + + -- Christian Bjälevik Wed, 21 Dec 2005 14:22:34 +0100 + +network-manager (0.5.1-0ubuntu3) dapper; urgency=low + + * debian/control: + - Changed versioned dep on wireless-tools to >= 28pre9 + (what upstream says in their .news). + - Removed commented out Conflicts-line. + - Do not depend on bind9 being installed. + - Added libxdmcp-dev as a Build-Dep. + * debian/*.dbus-event: + - Use "$NAME" instead of the incredible long "$DESC: ". + * debian/network-manager.postinst: + - Do not run gtk-update-icon-cache on configure cause + seb128 says it's a bad idea and explained why :-). + * debian/README: + - Fix typo (cann -> can). + * debian/rules: + - Removed named-support (we don't want bind9 for this) + - Added --with-distro=debian. + + -- Christian Bjälevik Thu, 15 Dec 2005 02:04:12 +0100 + +network-manager (0.5.1-0ubuntu2) dapper; urgency=low + + * remove .arch-ids traces + + -- Jan Gerber Sun, 13 Nov 2005 21:19:18 -0500 + +network-manager (0.5.1-0ubuntu1) dapper; urgency=low + + * New upstream version + + -- Jan Gerber Fri, 21 Oct 2005 08:33:25 -0400 + +network-manager (0.5.0-0ubuntu1) breezy; urgency=low + + * New upstream version + * split headers into network-manager-dev + + -- Jan Gerber Tue, 18 Oct 2005 17:43:56 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu5) breezy; urgency=low + + * fix postinst so its possible to install network-manager + in pbuilder + + -- Jan Gerber Tue, 11 Oct 2005 19:23:47 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu4) breezy; urgency=low + + * update postinst to restart dbus on install + + -- Jan Gerber Sat, 29 Aug 2005 13:40:26 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu3) breezy; urgency=low + + * this is NetworkManager CVS Tag NM_0_4_1_RELEASE + 3 patches + - make dhcdbd only a runtime dependency + - fix build due to one too many ,s + - fix debian backend to support static IP settings again + (all changes are upstream by now) + + -- Jan Gerber Sat, 27 Aug 2005 23:40:26 +0200 + +network-manager (0.4.1+cvs20050817-0ubuntu2) breezy; urgency=low + + * restructure build system to creat orig.tar.gz and diff.gz files + + -- Jan Gerber Sat, 27 Aug 2005 14:04:26 +0200 + +network-manager (0.4.1+cvs20050817-0unbuntu1) breezy; urgency=low + + * fix loading static IP settings from /etc/network/interfaces + + -- Jan Gerber Sun, 21 Aug 2005 19:40:26 +0200 + +network-manager (0.4.1+cvs20050817-0) breezy; urgency=low + + * update to NM_0_4_1_RELEASE + + -- Jan Gerber Sun, 21 Aug 2005 15:27:26 +0200 + +network-manager (0.4.1+cvs20050813-0) breezy; urgency=low + + * change back to using BIND + * remove dependency on resolvconf and dnsmasq + + -- Jan Gerber Sat, 13 Aug 2005 19:37:26 +0200 + +network-manager (0.4.1+cvs20050618-3) breezy; urgency=low + + * Run resolvconf instead of messing with BIND. Dependencies + changed too. Unfortunately these changes are not properly + tested :-(. + + -- Ian Jackson Sat, 18 Jun 2005 13:33:26 +0100 + +network-manager (0.4.1+cvs20050618-2) breezy; urgency=low + + * Sort out chown of /var/lib/NetworkManager + + -- Thom May Sat, 18 Jun 2005 13:33:26 +0100 + +network-manager (0.4.1+cvs20050618-1) breezy; urgency=low + + * update from CVS + * Add configure magic to ensure we get the correct path for dhcdbd + (Ubuntu: #11905) + * Ensure /var/lib/NetworkManager is created with the correct permisions + (Ubuntu: #11904) + * Rename dbus event script to correct name and restart dbus in postinst + * Depend on lsb-base and use log_*_msg in event script + + -- Thom May Sat, 18 Jun 2005 11:22:49 +0100 + +network-manager (0.4.1+cvs20050616-1) breezy; urgency=low + + * New upstream. Fix descriptions. + + -- Thom May Thu, 16 Jun 2005 14:47:30 +0100 + +network-manager (0.4.1+cvs20050614-1) unstable; urgency=low + + * New upstream release. Move to 0.4 branch; use dhcdbd. + * Drop network-manager-gnome + * add libnm-glib-0 and libnm-glib-0-dev + + -- Thom May Tue, 14 Jun 2005 12:41:29 +0100 + +network-manager (0.3.1+cvs20041108-1) unstable; urgency=low + + * New upstream release + * Add dpatch + + -- Thom May Mon, 8 Nov 2004 13:49:15 +0000 + +network-manager (0.3.1+cvs20041101-2) unstable; urgency=low + + * Update dependencies, thanks to j@bootlab.org + + -- Thom May Tue, 2 Nov 2004 16:32:45 +0000 + +network-manager (0.3.1+cvs20041101-1) unstable; urgency=low + + * New upstream release + + -- Thom May Mon, 1 Nov 2004 13:08:32 +0000 + +network-manager (0.3.1+cvs20041028-1) unstable; urgency=low + + * New upstream release + + -- Thom May Thu, 28 Oct 2004 13:12:42 +0100 + +network-manager (0.3+cvs20041016-2) unstable; urgency=low + + * fix some minor problems in packaging; clean up for pkg-utopia entry + + -- Thom May Mon, 25 Oct 2004 13:43:07 +0100 + +network-manager (0.3+cvs20041016-1) unstable; urgency=low + + * New upstream release + * Clean up backend for debian + + -- Thom May Sat, 16 Oct 2004 21:32:43 +0100 + +network-manager (0.3-1) unstable; urgency=low + + * New upstream release + + -- Thom May Fri, 15 Oct 2004 13:55:46 +0100 + +network-manager (0.2+cvs20040928-1) unstable; urgency=low + + * Initial Release. + + -- Thom May Sun, 3 Oct 2004 11:54:56 +0100 + --- network-manager-0.6.1.orig/debian/network-manager-dev.install +++ network-manager-0.6.1/debian/network-manager-dev.install @@ -0,0 +1,4 @@ +usr/lib/pkgconfig/NetworkManager.pc +usr/include/NetworkManager/NetworkManager.h +usr/include/NetworkManager/NetworkManagerVPN.h +usr/include/NetworkManager/nm-vpn-ui-interface.h --- network-manager-0.6.1.orig/debian/nm-applet.1 +++ network-manager-0.6.1/debian/nm-applet.1 @@ -0,0 +1,22 @@ +.TH "nm-applet" "1" +.SH "NAME" +nm-applet \(em Network management framework +.SH "SYNOPSIS" +.PP +\fBnm-applet\fR +.SH "DESCRIPTION" +.PP +\fBnm-applet\fR is the gnome front-end for NetworkManager +.PP +If you want to know how you can add by default nm-applet in your gnome notify-area, please read README.Debian +in /usr/share/doc/network-manager +.SH "SEE ALSO" +.PP +NetworkManager (1). nm-vpn-properties (1) +.PP +More Information about NetworkManager can be found at +http://www.gnome.org/projects/NetworkManager/ . +.SH "AUTHOR" +.PP +This manual page was written by Riccardo Setti giskard@autistici.org for +the \fBDebian\fP system. --- network-manager-0.6.1.orig/debian/libnm-glib-dev.install +++ network-manager-0.6.1/debian/libnm-glib-dev.install @@ -0,0 +1,5 @@ +usr/lib/pkgconfig/libnm_glib.pc +usr/lib/libnm_glib*.a +usr/lib/libnm_glib*.la +usr/lib/libnm_glib*.so +usr/include/NetworkManager/libnm_glib.h --- network-manager-0.6.1.orig/debian/libnm-glib0.install +++ network-manager-0.6.1/debian/libnm-glib0.install @@ -0,0 +1 @@ +usr/lib/libnm_glib*.so.* --- network-manager-0.6.1.orig/debian/network-manager.dbus-event +++ network-manager-0.6.1/debian/network-manager.dbus-event @@ -0,0 +1,89 @@ +#! /bin/sh +# +# NetworkManager NetworkManager daemon +# Daemon for automatically switching network +# connections to the best available connection. +# This file should be placed in /etc/init.d. +# +# Authors: Christian Bjälevik +# Jan Gerber +# Mark Roach +# Thom May +# +# Version: @(#)skeleton 2.85-23 28-Jul-2004 miquels@cistron.nl +# + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="NetworkManager daemon" +NAME="NetworkManager" + +DAEMON=/usr/sbin/$NAME + +PIDDIR=/var/run/NetworkManager +PIDFILE=$PIDDIR/$NAME.pid + +SCRIPTNAME=/etc/dbus-1/event.d/25$NAME +USER=root + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +# We need /sbin/ip +[ -x /sbin/ip ] || exit 1 + +. /lib/lsb/init-functions + +test -f /etc/default/rcS && . /etc/default/rcS +test -f /etc/default/NetworkManager && . /etc/default/NetworkManager + +# +# Function that starts the daemon/service. +# +d_start() { + log_begin_msg "Starting $DESC" + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $USER:$USER $PIDDIR + fi + modprobe capability >/dev/null 2>&1 || true + + test -d /var/lib/NetworkManager || mkdir -p /var/lib/NetworkManager + chmod 755 /var/lib/NetworkManager + + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $USER --exec $DAEMON -- $DAEMON_OPTS + log_end_msg $? +} + +# +# Function that stops the daemon/service. +# +d_stop() { + log_begin_msg "Stopping $DESC" + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --oknodo --user $USER --exec $DAEMON + log_end_msg $? +} + + +case "$1" in + start) + d_start + ;; + stop) + d_stop + ;; + restart|force-reload) + d_stop + sleep 1 + d_start + ;; + *) + log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- network-manager-0.6.1.orig/debian/nm-vpn-properties.1 +++ network-manager-0.6.1/debian/nm-vpn-properties.1 @@ -0,0 +1,19 @@ +.TH "nm-vpn-properties" "1" +.SH "NAME" +nm-vpn-properties \(em Network management framework +.SH "SYNOPSIS" +.PP +\fBnm-vpn-properties\fR +.SH "DESCRIPTION" +.PP +\fBnm-vpn-properties\fR is the gnome front-end for the NetworkManager VPN handler +.SH "SEE ALSO" +.PP +NetworkManager (1), nm-applet (1) +.PP +More Information about NetworkManager can be found at +http://www.gnome.org/projects/NetworkManager/ . +.SH "AUTHOR" +.PP +This manual page was written by Riccardo Setti giskard@autistici.org for +the \fBDebian\fP system. --- network-manager-0.6.1.orig/debian/compat +++ network-manager-0.6.1/debian/compat @@ -0,0 +1 @@ +4 --- network-manager-0.6.1.orig/debian/network-manager.install +++ network-manager-0.6.1/debian/network-manager.install @@ -0,0 +1,3 @@ +usr/lib/network-manager +usr/sbin/NetworkManager +usr/sbin/NetworkManagerDispatcher --- network-manager-0.6.1.orig/debian/libnm-util0.install +++ network-manager-0.6.1/debian/libnm-util0.install @@ -0,0 +1 @@ +usr/lib/libnm-util*.so.* --- network-manager-0.6.1.orig/debian/copyright +++ network-manager-0.6.1/debian/copyright @@ -0,0 +1,19 @@ +This the Ubuntu package of NetworkManager, the network management +framework. + +Copyright © 2004-2005 Red Hat, Inc. + +Licence: + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +On Ubuntu systems, the complete text of the GNU General Public License +can be found in ‘/usr/share/common-licenses/GPL’. --- network-manager-0.6.1.orig/debian/patches/60-dispatch-more-events.patch +++ network-manager-0.6.1/debian/patches/60-dispatch-more-events.patch @@ -0,0 +1,104 @@ +diff -ruNp network-manager-0.6.1~/dispatcher-daemon/NetworkManagerDispatcher.c network-manager-0.6.1/dispatcher-daemon/NetworkManagerDispatcher.c +--- network-manager-0.6.1~/dispatcher-daemon/NetworkManagerDispatcher.c 2006-03-13 16:52:08.000000000 +0000 ++++ network-manager-0.6.1/dispatcher-daemon/NetworkManagerDispatcher.c 2006-03-24 01:10:11.000000000 +0000 +@@ -44,6 +44,8 @@ enum NMDAction + NMD_DEVICE_DONT_KNOW, + NMD_DEVICE_NOW_INACTIVE, + NMD_DEVICE_NOW_ACTIVE, ++ NMD_DEVICE_GOING_INACTIVE, ++ NMD_DEVICE_GOING_ACTIVE, + }; + typedef enum NMDAction NMDAction; + +@@ -95,6 +97,10 @@ static void nmd_execute_scripts (NMDActi + if (action == NMD_DEVICE_NOW_ACTIVE) + char_act = "up"; + else if (action == NMD_DEVICE_NOW_INACTIVE) ++ char_act = "post-down"; ++ else if (action == NMD_DEVICE_GOING_ACTIVE) ++ char_act = "pre-up"; ++ else if (action == NMD_DEVICE_GOING_INACTIVE) + char_act = "down"; + else + return; +@@ -217,9 +223,13 @@ static DBusHandlerResult nmd_dbus_filter + } + + if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) +- action = NMD_DEVICE_NOW_INACTIVE; ++ action = NMD_DEVICE_GOING_INACTIVE; + else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive")) + action = NMD_DEVICE_NOW_ACTIVE; ++ else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceActivating")) ++ action = NMD_DEVICE_GOING_ACTIVE; ++ else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceDeactivated")) ++ action = NMD_DEVICE_NOW_INACTIVE; + + if (action != NMD_DEVICE_DONT_KNOW) + { +@@ -234,8 +244,10 @@ static DBusHandlerResult nmd_dbus_filter + if (dev_object_path && dev_iface_name) + { + nm_info ("Device %s (%s) is now %s.", dev_object_path, dev_iface_name, +- (action == NMD_DEVICE_NOW_INACTIVE ? "down" : +- (action == NMD_DEVICE_NOW_ACTIVE ? "up" : "error"))); ++ (action == NMD_DEVICE_NOW_INACTIVE ? "going down" : ++ (action == NMD_DEVICE_NOW_ACTIVE ? "up" : ++ (action == NMD_DEVICE_GOING_INACTIVE ? "going down" : ++ (action == NMD_DEVICE_GOING_ACTIVE ? "going up" : "error"))))); + + nmd_execute_scripts (action, dev_iface_name); + } +diff -ruNp network-manager-0.6.1~/man/NetworkManagerDispatcher.1.in network-manager-0.6.1/man/NetworkManagerDispatcher.1.in +--- network-manager-0.6.1~/man/NetworkManagerDispatcher.1.in 2006-03-24 00:19:35.000000000 +0000 ++++ network-manager-0.6.1/man/NetworkManagerDispatcher.1.in 2006-03-24 01:14:11.000000000 +0000 +@@ -13,10 +13,14 @@ The \fINetworkManagerDispatcher\fP daemo + directory in response to interfaces coming up and down. The scripts are run + alphabetically. The first parameter is the network interface name. The second + parameter is ++.I pre\-up ++before bringing the interface up, + .I up +-if the interface is now up and ++after bringing the interface up, + .I down +-if the interface is now down. ++before taking the interface down and ++.I post\-down ++after taking the interface down. + .SH OPTIONS + The following options are supported: + .TP +diff -ruNp network-manager-0.6.1~/src/NetworkManagerDbus.c network-manager-0.6.1/src/NetworkManagerDbus.c +--- network-manager-0.6.1~/src/NetworkManagerDbus.c 2006-02-24 18:59:03.000000000 +0000 ++++ network-manager-0.6.1/src/NetworkManagerDbus.c 2006-03-24 01:10:11.000000000 +0000 +@@ -193,6 +193,7 @@ static DeviceStatusSignals dev_status_si + { DEVICE_NOW_ACTIVE, "DeviceNowActive" }, + { DEVICE_ACTIVATING, "DeviceActivating" }, + { DEVICE_ACTIVATION_FAILED, "DeviceActivationFailed" }, ++ { DEVICE_DEACTIVATED, "DeviceDeactivated" }, + { DEVICE_ADDED, "DeviceAdded" }, + { DEVICE_REMOVED, "DeviceRemoved" }, + { DEVICE_CARRIER_ON, "DeviceCarrierOn" }, +diff -ruNp network-manager-0.6.1~/src/NetworkManagerDbus.h network-manager-0.6.1/src/NetworkManagerDbus.h +--- network-manager-0.6.1~/src/NetworkManagerDbus.h 2005-12-31 08:21:22.000000000 +0000 ++++ network-manager-0.6.1/src/NetworkManagerDbus.h 2006-03-24 01:10:11.000000000 +0000 +@@ -40,6 +40,7 @@ typedef enum + DEVICE_ACTIVATING, + DEVICE_ACTIVATION_FAILED, + DEVICE_ACTIVATION_CANCELED, ++ DEVICE_DEACTIVATED, + DEVICE_ADDED, + DEVICE_REMOVED, + DEVICE_CARRIER_ON, +diff -ruNp network-manager-0.6.1~/src/nm-device.c network-manager-0.6.1/src/nm-device.c +--- network-manager-0.6.1~/src/nm-device.c 2006-03-24 01:00:12.000000000 +0000 ++++ network-manager-0.6.1/src/nm-device.c 2006-03-24 01:12:51.000000000 +0000 +@@ -1442,6 +1442,7 @@ nm_device_deactivate (NMDevice *self) + NM_DEVICE_GET_CLASS (self)->deactivate (self); + + nm_schedule_state_change_signal_broadcast (self->priv->app_data); ++ nm_dbus_schedule_device_status_change_signal (self->priv->app_data, self, NULL, DEVICE_DEACTIVATED); + } + + --- network-manager-0.6.1.orig/debian/patches/80-rml-wpa-workarounds.patch +++ network-manager-0.6.1/debian/patches/80-rml-wpa-workarounds.patch @@ -0,0 +1,96 @@ +diff -ruNp network-manager-0.6.1~/src/nm-device-802-11-wireless.c network-manager-0.6.1/src/nm-device-802-11-wireless.c +--- network-manager-0.6.1~/src/nm-device-802-11-wireless.c 2006-03-24 01:10:29.000000000 +0000 ++++ network-manager-0.6.1/src/nm-device-802-11-wireless.c 2006-03-24 01:19:59.000000000 +0000 +@@ -1905,14 +1905,16 @@ nm_device_802_11_wireless_scan (gpointer + + /* Must be in infrastructure mode during scan, otherwise we don't get a full + * list of scan results. Scanning doesn't work well in Ad-Hoc mode :( +- */ +- nm_device_802_11_wireless_set_mode (self, IW_MODE_INFRA); +- +- /* We only unlock the frequency if the card is in adhoc mode, in case it is +- * a costly operation for the driver. ++ * ++ * We only set the mode and unlock the frequency if the card is in adhoc mode, ++ * in case doing so is a costly operation for the driver or the driver prefers ++ * IW_MODE_AUTO. + */ + if (orig_mode == IW_MODE_ADHOC) ++ { ++ nm_device_802_11_wireless_set_mode (self, IW_MODE_INFRA); + nm_device_802_11_wireless_set_frequency (self, 0); ++ } + + wrq.u.data.pointer = NULL; + wrq.u.data.flags = 0; +@@ -2492,13 +2494,28 @@ supplicant_interface_init (NMDevice80211 + const char * iface = nm_device_get_iface (NM_DEVICE (self)); + gboolean success = FALSE; + int tries = 0; ++ const char * wpa_driver; ++ const char * kernel_driver; + + if (!(ctrl = wpa_ctrl_open (WPA_SUPPLICANT_GLOBAL_SOCKET, NM_RUN_DIR))) + goto exit; + ++ kernel_driver = nm_device_get_driver (NM_DEVICE (self)); ++ ++ /* ++ * We want to work with the generic "wext" wpa_supplicant driver, but some kernel drivers ++ * are just utter junk. For those losers, we use a specific wpa_supplicant driver. ++ */ ++ if (!strcmp (kernel_driver, "ath_pci")) ++ wpa_driver = "madwifi"; ++ else if (!strcmp (kernel_driver, "ndiswrapper")) ++ wpa_driver = "ndiswrapper"; ++ else ++ wpa_driver = "wext"; ++ + /* wpa_cli -g/var/run/wpa_supplicant-global interface_add eth1 "" wext /var/run/wpa_supplicant */ + if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, +- "INTERFACE_ADD %s\t\twext\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface)) ++ "INTERFACE_ADD %s\t\t%s\t" WPA_SUPPLICANT_CONTROL_SOCKET "\t", iface, wpa_driver)) + goto exit; + wpa_ctrl_close (ctrl); + +@@ -2534,7 +2551,8 @@ supplicant_send_network_config (NMDevice + struct wpa_ctrl * ctrl; + gboolean user_created; + const char * hex_essid; +- const char * ap_scan = "AP_SCAN 1"; ++ const char * ap_scan; ++ const char * kernel_driver; + guint32 caps; + gboolean supports_wpa; + +@@ -2555,15 +2573,24 @@ supplicant_send_network_config (NMDevice + supports_wpa = (caps & NM_802_11_CAP_PROTO_WPA) + || (caps & NM_802_11_CAP_PROTO_WPA2); + +- /* Use "AP_SCAN 2" if: +- * - The wireless network is non-broadcast or user created +- * - The wireless driver does not support WPA +- */ + user_created = nm_ap_get_user_created (ap); +- if (!nm_ap_get_broadcast (ap) || user_created || !supports_wpa) ++ kernel_driver = nm_device_get_driver (NM_DEVICE (self)); ++ ++ /* ++ * We want to use "AP_SCAN 1", which tells wpa_supplicant to perform scanning. This seems ++ * to work better with some drivers. But we want "AP_SCAN 2", telling wpa_supplicant that ++ * we will do our own scanning, if ++ * ++ * - The driver is orinoco_cs. It chokes on "AP_SCAN 1". ++ * - The AP is non-broadcast or Ad-Hoc. Unless the driver is madwifi. ++ */ ++ if (!strcmp (kernel_driver, "orinoco_cs")) ++ ap_scan = "AP_SCAN 2"; ++ else if ((!nm_ap_get_broadcast (ap) || user_created) && strcmp (kernel_driver, "ath_pci")) + ap_scan = "AP_SCAN 2"; ++ else ++ ap_scan = "AP_SCAN 1"; + +- /* Tell wpa_supplicant that we'll do the scanning */ + if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL, ap_scan)) + goto out; + --- network-manager-0.6.1.orig/debian/patches/30-linux-wlan-ng.patch +++ network-manager-0.6.1/debian/patches/30-linux-wlan-ng.patch @@ -0,0 +1,182 @@ +diff -ruNp network-manager-0.6.1~/src/NetworkManager.c network-manager-0.6.1/src/NetworkManager.c +--- network-manager-0.6.1~/src/NetworkManager.c 2006-02-27 20:06:24.000000000 +0000 ++++ network-manager-0.6.1/src/NetworkManager.c 2006-03-24 00:42:43.000000000 +0000 +@@ -369,6 +369,52 @@ void nm_schedule_state_change_signal_bro + g_source_unref (source); + } + ++/* ++ * nm_refresh_interface ++ * ++ * Remove and add the given interface to reload its properties. This is ++ * necessary for devices which can be enabled and disabled. ++ * ++ */ ++void ++nm_refresh_interface (NMData* nmdata, const char* iface) ++{ ++ NMDevice* d = nm_get_device_by_iface (nmdata, iface); ++ if (!d) { ++ nm_error ("nm_refresh_interface(): Interface %s does not exist", iface); ++ return; ++ } ++ char* udi = g_strdup (nm_device_get_udi (d)); ++ ++ nm_info ("nm_refresh_interface(): refreshing interface %s (UDI %s)", iface, udi); ++ ++ nm_remove_device (nmdata, d); ++ nm_create_device_and_add_to_list (nmdata, udi, iface, FALSE, ++ DEVICE_TYPE_UNKNOWN); ++ g_free (udi); ++} ++ ++static DBusHandlerResult ++nm_dbus_signal_filter (DBusConnection *connection, DBusMessage *message, void *user_data) ++{ ++ NMData* nmdata = (NMData*) user_data; ++ if (dbus_message_is_signal (message, "org.freedesktop.NetworkManager", "RefreshDevice")) { ++ DBusError error; ++ char *s; ++ dbus_error_init (&error); ++ if (dbus_message_get_args ++ (message, &error, DBUS_TYPE_STRING, &s, DBUS_TYPE_INVALID)) { ++ nm_info("RefreshDevice request received for %s", s); ++ nm_refresh_interface (nmdata, s); ++ } else { ++ nm_error("RefreshDevice received, but error getting message: %s", error.message); ++ dbus_error_free (&error); ++ } ++ return DBUS_HANDLER_RESULT_HANDLED; ++ } ++ ++ return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; ++} + + /* + * nm_data_new +@@ -815,6 +861,11 @@ int main( int argc, char *argv[] ) + exit (EXIT_FAILURE); + } + ++ /* Set up dbus signal handler */ ++ nm_warning("nm_data_new: Setting up dbus filter"); ++ dbus_bus_add_match (nm_data->dbus_connection, "type='signal',interface='org.freedesktop.NetworkManager'", NULL); ++ dbus_connection_add_filter (nm_data->dbus_connection, nm_dbus_signal_filter, nm_data, NULL); ++ + /* Need to happen after DBUS is initialized */ + nm_data->vpn_manager = nm_vpn_manager_new (nm_data); + nm_data->dhcp_manager = nm_dhcp_manager_new (nm_data); +diff -ruNp network-manager-0.6.1~/src/nm-device-802-11-wireless.c network-manager-0.6.1/src/nm-device-802-11-wireless.c +--- network-manager-0.6.1~/src/nm-device-802-11-wireless.c 2006-03-09 21:51:24.000000000 +0000 ++++ network-manager-0.6.1/src/nm-device-802-11-wireless.c 2006-03-24 00:42:01.000000000 +0000 +@@ -909,6 +909,13 @@ nm_device_802_11_wireless_get_mode (NMDe + + g_return_val_if_fail (self != NULL, -1); + ++ /* Do not try the iwconfig ioctls, they cause kernel crashes in the ++ * linux-wlan-ng driver and do not work anyway. */ ++ if (!strncmp(nm_device_get_driver(NM_DEVICE (self)), "prism2_", 7)) { ++ nm_warning ("nm_device_get_mode(): not yet implemented for linux-wlan-ng"); ++ return IW_MODE_INFRA; ++ } ++ + /* Force the card into Managed/Infrastructure mode */ + if ((sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __FUNCTION__, NULL))) + { +@@ -954,6 +961,13 @@ nm_device_802_11_wireless_set_mode (NMDe + if (nm_device_802_11_wireless_get_mode (self) == mode) + return TRUE; + ++ /* Do not try the iwconfig ioctls, they cause kernel crashes in the ++ * linux-wlan-ng driver and do not work anyway. */ ++ if (!strncmp(nm_device_get_driver(NM_DEVICE (self)), "prism2_", 7)) { ++ nm_warning ("nm_device_set_mode(): not yet implemented for linux-wlan-ng"); ++ return TRUE; ++ } ++ + /* Force the card into Managed/Infrastructure mode */ + if ((sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __FUNCTION__, NULL))) + { +@@ -1208,7 +1222,15 @@ nm_device_802_11_wireless_get_essid (NMD + int err; + const char * iface; + +- g_return_val_if_fail (self != NULL, NULL); ++ g_return_val_if_fail (self != NULL, NULL); ++ ++ /* Do not try the iwconfig ioctls, they cause kernel crashes in the ++ * linux-wlan-ng driver and do not work anyway. */ ++ if (!strncmp(nm_device_get_driver(NM_DEVICE (self)), "prism2_", 7)) { ++ if (!self->priv->cur_essid) ++ self->priv->cur_essid = g_strdup (""); ++ return (self->priv->cur_essid); ++ } + + iface = nm_device_get_iface (NM_DEVICE (self)); + if ((sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __FUNCTION__, NULL))) +@@ -1239,6 +1261,34 @@ nm_device_802_11_wireless_get_essid (NMD + + + /* ++ * nm_linux_wlan_ng_set_essid ++ * ++ * Set ESSID for a linux-wlan-ng device ++ */ ++void ++nm_linux_wlan_ng_set_essid (NMDevice *dev, const char* essid) ++{ ++ const char* wlanctlng = "/sbin/wlanctl-ng"; ++ int status; ++ ++ if (!fork()) { ++ char essidarg[1024]; ++ snprintf (essidarg, sizeof (essidarg), "ssid=%s", essid); ++ execl (wlanctlng, wlanctlng, nm_device_get_iface (dev), "lnxreq_autojoin", essidarg, ++ "authtype=opensystem", NULL); ++ nm_warning ("nm_linux_wlan_ng_set_essid(): could not execute %s", wlanctlng); ++ exit(1); ++ } ++ ++ if (wait (&status) < 0) { ++ nm_warning ("nm_linux_wlan_ng_set_essid(): could not wait for wlanctl-ng: errno %i", errno); ++ return; ++ } ++ if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) ++ nm_warning ("nm_linux_wlan_ng_set_essid(): wlanctl-ng failed with status %i", status); ++} ++ ++/* + * nm_device_802_11_wireless_set_essid + * + * If a device is wireless, set the essid that it should use. +@@ -1264,6 +1314,16 @@ nm_device_802_11_wireless_set_essid (NMD + safe_essid[IW_ESSID_MAX_SIZE] = '\0'; + } + ++ /* Do not try the iwconfig ioctls, they cause kernel crashes in the ++ * linux-wlan-ng driver and do not work anyway. */ ++ if (!strncmp(nm_device_get_driver(NM_DEVICE (self)), "prism2_", 7)) { ++ nm_linux_wlan_ng_set_essid (NM_DEVICE (self), safe_essid); ++ if (self->priv->cur_essid) ++ g_free (self->priv->cur_essid); ++ self->priv->cur_essid = g_strdup (safe_essid); ++ return; ++ } ++ + iface = nm_device_get_iface (NM_DEVICE (self)); + if ((sk = nm_dev_sock_open (NM_DEVICE (self), DEV_WIRELESS, __FUNCTION__, NULL))) + { +@@ -1542,6 +1602,13 @@ nm_device_802_11_wireless_set_wep_enc_ke + + g_return_if_fail (self != NULL); + ++ /* Do not try the iwconfig ioctls, they cause kernel crashes in the ++ * linux-wlan-ng driver and do not work anyway. */ ++ if (!strncmp(nm_device_get_driver(NM_DEVICE(self)), "prism2_", 7)) { ++ nm_warning ("nm_device_set_enc_key(): not yet implemented for linux-wlan-ng"); ++ return; ++ } ++ + /* Make sure the essid we get passed is a valid size */ + if (!key) + safe_key[0] = '\0'; --- network-manager-0.6.1.orig/debian/patches/40-ubuntu-backend.patch +++ network-manager-0.6.1/debian/patches/40-ubuntu-backend.patch @@ -0,0 +1,1862 @@ +diff -ruNp network-manager-0.6.1~/Makefile.in network-manager-0.6.1/Makefile.in +--- network-manager-0.6.1~/Makefile.in 2006-03-13 16:20:08.000000000 +0000 ++++ network-manager-0.6.1/Makefile.in 2006-03-24 00:52:06.000000000 +0000 +@@ -223,6 +223,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/configure network-manager-0.6.1/configure +--- network-manager-0.6.1~/configure 2006-03-24 00:51:52.000000000 +0000 ++++ network-manager-0.6.1/configure 2006-03-24 00:51:44.000000000 +0000 +@@ -464,7 +464,7 @@ ac_includes_default="\ + # include + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS GETTEXT_PACKAGE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB TARGET_REDHAT_TRUE TARGET_REDHAT_FALSE TARGET_SUSE_TRUE TARGET_SUSE_FALSE TARGET_GENTOO_TRUE TARGET_GENTOO_FALSE TARGET_DEBIAN_TRUE TARGET_DEBIAN_FALSE TARGET_SLACKWARE_TRUE TARGET_SLACKWARE_FALSE IWLIB PKG_CONFIG ac_pt_PKG_CONFIG DBUS_CFLAGS DBUS_LIBS GTHREAD_CFLAGS GTHREAD_LIBS GLIB_CFLAGS GLIB_LIBS GMODULE_CFLAGS GMODULE_LIBS HAL_CFLAGS HAL_LIBS GTK_CFLAGS GTK_LIBS GDK_PIXBUF_CFLAGS GDK_PIXBUF_LIBS GLADE_CFLAGS GLADE_LIBS GCONF_CFLAGS GCONF_LIBS GNOME_KEYRING_CFLAGS GNOME_KEYRING_LIBS NOTIFY_CFLAGS NOTIFY_LIBS WITH_NOTIFY_TRUE WITH_NOTIFY_FALSE LIBNL_CFLAGS LIBNL_LIBS LIBGCRYPT_CONFIG LIBGCRYPT_CFLAGS LIBGCRYPT_LIBS WITH_GCRYPT_TRUE WITH_GCRYPT_FALSE PANEL_APPLET_CFLAGS PANEL_APPLET_LIBS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS DBUS_SYS_DIR DHCDBD_BINARY_PATH WPA_SUPPLICANT_BINARY_PATH EXPANDED_BINDIR LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS GETTEXT_PACKAGE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB TARGET_REDHAT_TRUE TARGET_REDHAT_FALSE TARGET_SUSE_TRUE TARGET_SUSE_FALSE TARGET_GENTOO_TRUE TARGET_GENTOO_FALSE TARGET_DEBIAN_TRUE TARGET_DEBIAN_FALSE TARGET_UBUNTU_TRUE TARGET_UBUNTU_FALSE TARGET_SLACKWARE_TRUE TARGET_SLACKWARE_FALSE IWLIB PKG_CONFIG ac_pt_PKG_CONFIG DBUS_CFLAGS DBUS_LIBS GTHREAD_CFLAGS GTHREAD_LIBS GLIB_CFLAGS GLIB_LIBS GMODULE_CFLAGS GMODULE_LIBS HAL_CFLAGS HAL_LIBS GTK_CFLAGS GTK_LIBS GDK_PIXBUF_CFLAGS GDK_PIXBUF_LIBS GLADE_CFLAGS GLADE_LIBS GCONF_CFLAGS GCONF_LIBS GNOME_KEYRING_CFLAGS GNOME_KEYRING_LIBS NOTIFY_CFLAGS NOTIFY_LIBS WITH_NOTIFY_TRUE WITH_NOTIFY_FALSE LIBNL_CFLAGS LIBNL_LIBS LIBGCRYPT_CONFIG LIBGCRYPT_CFLAGS LIBGCRYPT_LIBS WITH_GCRYPT_TRUE WITH_GCRYPT_FALSE PANEL_APPLET_CFLAGS PANEL_APPLET_LIBS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS DBUS_SYS_DIR DHCDBD_BINARY_PATH WPA_SUPPLICANT_BINARY_PATH EXPANDED_BINDIR LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -1164,7 +1164,7 @@ Optional Packages: + --with-tags[=TAGS] + include additional configurations [automatic] + --with-distro=DISTRO Specify the Linux distribution to target: One of +- redhat, suse, gentoo, debian, or slackware ++ redhat, suse, gentoo, debian, ubuntu or slackware + --with-gcrypt Use gcrypt library + --with-dbus-sys=DIR where D-BUS system.d directory is + --with-dhcdbd=/path/to/dhcdbd +@@ -1323,7 +1323,7 @@ esac + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi +- cd $ac_popdir ++ cd "$ac_popdir" + done + fi + +@@ -2713,8 +2713,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2772,8 +2771,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2889,8 +2887,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2944,8 +2941,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -2990,8 +2986,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -3035,8 +3030,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4051,7 +4045,7 @@ ia64-*-hpux*) + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4054 "configure"' > conftest.$ac_ext ++ echo '#line 4048 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -4171,8 +4165,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4501,8 +4494,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4672,8 +4664,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -4740,8 +4731,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5001,8 +4991,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5060,8 +5049,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5132,8 +5120,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5177,8 +5164,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5650,7 +5636,7 @@ fi + + + # Provide some information about the compiler. +-echo "$as_me:5653:" \ ++echo "$as_me:5639:" \ + "checking for Fortran 77 compiler version" >&5 + ac_compiler=`set X $ac_compile; echo $2` + { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +@@ -5696,8 +5682,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -5746,8 +5731,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -6713,11 +6697,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6716: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6700: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6720: \$? = $ac_status" >&5 ++ echo "$as_me:6704: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -6981,11 +6965,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:6984: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:6968: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:6988: \$? = $ac_status" >&5 ++ echo "$as_me:6972: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -7085,11 +7069,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:7088: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:7072: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:7092: \$? = $ac_status" >&5 ++ echo "$as_me:7076: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -7561,8 +7545,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -7622,8 +7605,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8890,8 +8872,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -8994,8 +8975,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9060,8 +9040,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9154,8 +9133,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9220,8 +9198,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9287,8 +9264,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9354,8 +9330,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -9430,7 +9405,7 @@ else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -10675,8 +10649,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_cxx_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -11870,11 +11843,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11873: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11846: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:11877: \$? = $ac_status" >&5 ++ echo "$as_me:11850: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -11974,11 +11947,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:11977: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:11950: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:11981: \$? = $ac_status" >&5 ++ echo "$as_me:11954: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -13544,11 +13517,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13547: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13520: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:13551: \$? = $ac_status" >&5 ++ echo "$as_me:13524: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -13648,11 +13621,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:13651: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:13624: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:13655: \$? = $ac_status" >&5 ++ echo "$as_me:13628: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -14114,8 +14087,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -14165,8 +14137,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_f77_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -15851,11 +15822,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:15854: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:15825: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:15858: \$? = $ac_status" >&5 ++ echo "$as_me:15829: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16119,11 +16090,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16122: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16093: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "$as_me:16126: \$? = $ac_status" >&5 ++ echo "$as_me:16097: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -16223,11 +16194,11 @@ else + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"\$as_me:16226: $lt_compile\"" >&5) ++ (eval echo "\"\$as_me:16197: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "$as_me:16230: \$? = $ac_status" >&5 ++ echo "$as_me:16201: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -16699,8 +16670,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -16760,8 +16730,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -18924,8 +18893,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -19096,8 +19064,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -19245,8 +19212,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -19311,8 +19277,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -19378,8 +19343,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -19613,8 +19577,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -19995,8 +19958,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20141,8 +20103,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20213,8 +20174,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20358,8 +20318,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20417,8 +20376,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20515,8 +20473,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20595,8 +20552,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20660,8 +20616,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20725,8 +20680,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20803,8 +20757,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20868,8 +20821,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -20985,8 +20937,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21153,8 +21104,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21287,8 +21237,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21373,8 +21322,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -21661,7 +21609,7 @@ if test "z$with_distro" = "z"; then + exit 1 + else + case $with_distro in +- redhat|suse|gentoo|debian|slackware) ;; ++ redhat|suse|gentoo|debian|ubuntu|slackware) ;; + *) + echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" + exit 1 +@@ -21710,6 +21658,16 @@ fi + + + ++if test x"$with_distro" = xubuntu; then ++ TARGET_UBUNTU_TRUE= ++ TARGET_UBUNTU_FALSE='#' ++else ++ TARGET_UBUNTU_TRUE='#' ++ TARGET_UBUNTU_FALSE= ++fi ++ ++ ++ + if test x"$with_distro" = xslackware; then + TARGET_SLACKWARE_TRUE= + TARGET_SLACKWARE_FALSE='#' +@@ -21747,8 +21705,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23798,8 +23755,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' ++ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +@@ -23986,6 +23942,13 @@ echo "$as_me: error: conditional \"TARGE + Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } + fi ++if test -z "${TARGET_UBUNTU_TRUE}" && test -z "${TARGET_UBUNTU_FALSE}"; then ++ { { echo "$as_me:$LINENO: error: conditional \"TARGET_UBUNTU\" was never defined. ++Usually this means the macro was only invoked conditionally." >&5 ++echo "$as_me: error: conditional \"TARGET_UBUNTU\" was never defined. ++Usually this means the macro was only invoked conditionally." >&2;} ++ { (exit 1); exit 1; }; } ++fi + if test -z "${TARGET_SLACKWARE_TRUE}" && test -z "${TARGET_SLACKWARE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"TARGET_SLACKWARE\" was never defined. + Usually this means the macro was only invoked conditionally." >&5 +@@ -24699,6 +24662,8 @@ s,@TARGET_GENTOO_TRUE@,$TARGET_GENTOO_TR + s,@TARGET_GENTOO_FALSE@,$TARGET_GENTOO_FALSE,;t t + s,@TARGET_DEBIAN_TRUE@,$TARGET_DEBIAN_TRUE,;t t + s,@TARGET_DEBIAN_FALSE@,$TARGET_DEBIAN_FALSE,;t t ++s,@TARGET_UBUNTU_TRUE@,$TARGET_UBUNTU_TRUE,;t t ++s,@TARGET_UBUNTU_FALSE@,$TARGET_UBUNTU_FALSE,;t t + s,@TARGET_SLACKWARE_TRUE@,$TARGET_SLACKWARE_TRUE,;t t + s,@TARGET_SLACKWARE_FALSE@,$TARGET_SLACKWARE_FALSE,;t t + s,@IWLIB@,$IWLIB,;t t +@@ -24910,11 +24875,6 @@ esac + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + esac + +- if test x"$ac_file" != x-; then +- { echo "$as_me:$LINENO: creating $ac_file" >&5 +-echo "$as_me: creating $ac_file" >&6;} +- rm -f "$ac_file" +- fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ +@@ -24953,6 +24913,12 @@ echo "$as_me: error: cannot find input f + fi;; + esac + done` || { (exit 1); exit 1; } ++ ++ if test x"$ac_file" != x-; then ++ { echo "$as_me:$LINENO: creating $ac_file" >&5 ++echo "$as_me: creating $ac_file" >&6;} ++ rm -f "$ac_file" ++ fi + _ACEOF + cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +diff -ruNp network-manager-0.6.1~/configure.in network-manager-0.6.1/configure.in +--- network-manager-0.6.1~/configure.in 2006-03-24 00:51:50.000000000 +0000 ++++ network-manager-0.6.1/configure.in 2006-03-24 00:51:48.000000000 +0000 +@@ -44,7 +44,7 @@ ALL_LINGUAS="bg bs ca cs da de el en_CA + AC_PROG_INTLTOOL([0.27.2]) + AM_GLIB_GNU_GETTEXT + +-AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, or slackware])) ++AC_ARG_WITH(distro, AC_HELP_STRING([--with-distro=DISTRO], [Specify the Linux distribution to target: One of redhat, suse, gentoo, debian, ubuntu or slackware])) + if test "z$with_distro" = "z"; then + AC_CHECK_FILE(/etc/redhat-release,with_distro="redhat") + AC_CHECK_FILE(/etc/SuSE-release,with_distro="suse") +@@ -60,7 +60,7 @@ if test "z$with_distro" = "z"; then + exit 1 + else + case $with_distro in +- redhat|suse|gentoo|debian|slackware) ;; ++ redhat|suse|gentoo|debian|ubuntu|slackware) ;; + *) + echo "Your distribution (${with_distro}) is not yet supported! (patches welcome)" + exit 1 +@@ -71,6 +71,7 @@ AM_CONDITIONAL(TARGET_REDHAT, test x"$wi + AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse) + AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) + AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) ++AM_CONDITIONAL(TARGET_UBUNTU, test x"$with_distro" = xubuntu) + AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) + + AC_MSG_CHECKING([for wireless-tools >= 28pre9]) +diff -ruNp network-manager-0.6.1~/dispatcher-daemon/Makefile.in network-manager-0.6.1/dispatcher-daemon/Makefile.in +--- network-manager-0.6.1~/dispatcher-daemon/Makefile.in 2006-03-13 16:20:04.000000000 +0000 ++++ network-manager-0.6.1/dispatcher-daemon/Makefile.in 2006-03-24 00:52:03.000000000 +0000 +@@ -211,6 +211,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/gnome/Makefile.in network-manager-0.6.1/gnome/Makefile.in +--- network-manager-0.6.1~/gnome/Makefile.in 2006-03-13 16:20:05.000000000 +0000 ++++ network-manager-0.6.1/gnome/Makefile.in 2006-03-24 00:52:03.000000000 +0000 +@@ -195,6 +195,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/gnome/applet/Makefile.in network-manager-0.6.1/gnome/applet/Makefile.in +--- network-manager-0.6.1~/gnome/applet/Makefile.in 2006-03-13 16:20:05.000000000 +0000 ++++ network-manager-0.6.1/gnome/applet/Makefile.in 2006-03-24 00:52:03.000000000 +0000 +@@ -284,6 +284,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/gnome/applet/icons/Makefile.in network-manager-0.6.1/gnome/applet/icons/Makefile.in +--- network-manager-0.6.1~/gnome/applet/icons/Makefile.in 2006-03-13 16:20:05.000000000 +0000 ++++ network-manager-0.6.1/gnome/applet/icons/Makefile.in 2006-03-24 00:52:03.000000000 +0000 +@@ -198,6 +198,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/gnome/libnm_glib/Makefile.in network-manager-0.6.1/gnome/libnm_glib/Makefile.in +--- network-manager-0.6.1~/gnome/libnm_glib/Makefile.in 2006-03-13 16:20:05.000000000 +0000 ++++ network-manager-0.6.1/gnome/libnm_glib/Makefile.in 2006-03-24 00:52:03.000000000 +0000 +@@ -220,6 +220,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/gnome/vpn-properties/Makefile.in network-manager-0.6.1/gnome/vpn-properties/Makefile.in +--- network-manager-0.6.1~/gnome/vpn-properties/Makefile.in 2006-03-13 16:20:05.000000000 +0000 ++++ network-manager-0.6.1/gnome/vpn-properties/Makefile.in 2006-03-24 00:52:03.000000000 +0000 +@@ -225,6 +225,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/include/Makefile.in network-manager-0.6.1/include/Makefile.in +--- network-manager-0.6.1~/include/Makefile.in 2006-03-13 16:20:06.000000000 +0000 ++++ network-manager-0.6.1/include/Makefile.in 2006-03-24 00:52:04.000000000 +0000 +@@ -199,6 +199,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/initscript/Debian/Makefile.in network-manager-0.6.1/initscript/Debian/Makefile.in +--- network-manager-0.6.1~/initscript/Debian/Makefile.in 2006-03-13 16:20:06.000000000 +0000 ++++ network-manager-0.6.1/initscript/Debian/Makefile.in 2006-03-24 00:52:04.000000000 +0000 +@@ -190,6 +190,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/initscript/Gentoo/Makefile.in network-manager-0.6.1/initscript/Gentoo/Makefile.in +--- network-manager-0.6.1~/initscript/Gentoo/Makefile.in 2006-03-13 16:20:06.000000000 +0000 ++++ network-manager-0.6.1/initscript/Gentoo/Makefile.in 2006-03-24 00:52:04.000000000 +0000 +@@ -191,6 +191,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/initscript/Makefile.in network-manager-0.6.1/initscript/Makefile.in +--- network-manager-0.6.1~/initscript/Makefile.in 2006-03-13 16:20:06.000000000 +0000 ++++ network-manager-0.6.1/initscript/Makefile.in 2006-03-24 00:52:04.000000000 +0000 +@@ -200,6 +200,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/initscript/RedHat/Makefile.in network-manager-0.6.1/initscript/RedHat/Makefile.in +--- network-manager-0.6.1~/initscript/RedHat/Makefile.in 2006-03-13 16:20:06.000000000 +0000 ++++ network-manager-0.6.1/initscript/RedHat/Makefile.in 2006-03-24 00:52:04.000000000 +0000 +@@ -192,6 +192,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/initscript/SUSE/Makefile.in network-manager-0.6.1/initscript/SUSE/Makefile.in +--- network-manager-0.6.1~/initscript/SUSE/Makefile.in 2006-03-13 16:20:06.000000000 +0000 ++++ network-manager-0.6.1/initscript/SUSE/Makefile.in 2006-03-24 00:52:04.000000000 +0000 +@@ -188,6 +188,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/initscript/Slackware/Makefile.in network-manager-0.6.1/initscript/Slackware/Makefile.in +--- network-manager-0.6.1~/initscript/Slackware/Makefile.in 2006-03-13 16:20:06.000000000 +0000 ++++ network-manager-0.6.1/initscript/Slackware/Makefile.in 2006-03-24 00:52:04.000000000 +0000 +@@ -190,6 +190,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/libnm-util/Makefile.in network-manager-0.6.1/libnm-util/Makefile.in +--- network-manager-0.6.1~/libnm-util/Makefile.in 2006-03-13 16:20:06.000000000 +0000 ++++ network-manager-0.6.1/libnm-util/Makefile.in 2006-03-24 00:52:04.000000000 +0000 +@@ -240,6 +240,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/man/Makefile.in network-manager-0.6.1/man/Makefile.in +--- network-manager-0.6.1~/man/Makefile.in 2006-03-13 16:20:07.000000000 +0000 ++++ network-manager-0.6.1/man/Makefile.in 2006-03-24 00:52:04.000000000 +0000 +@@ -193,6 +193,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/src/Makefile.in network-manager-0.6.1/src/Makefile.in +--- network-manager-0.6.1~/src/Makefile.in 2006-03-13 16:20:07.000000000 +0000 ++++ network-manager-0.6.1/src/Makefile.in 2006-03-24 00:52:05.000000000 +0000 +@@ -263,6 +263,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/src/backends/Makefile.am network-manager-0.6.1/src/backends/Makefile.am +--- network-manager-0.6.1~/src/backends/Makefile.am 2006-03-09 20:52:16.000000000 +0000 ++++ network-manager-0.6.1/src/backends/Makefile.am 2006-03-24 00:51:13.000000000 +0000 +@@ -34,6 +34,12 @@ libnmbackend_la_SOURCES += NetworkManage + interface_parser.h + endif + ++if TARGET_UBUNTU ++libnmbackend_la_SOURCES += NetworkManagerUbuntu.c \ ++ interface_parser.c \ ++ interface_parser.h ++endif ++ + if TARGET_SLACKWARE + libnmbackend_la_SOURCES += NetworkManagerSlackware.c + endif +diff -ruNp network-manager-0.6.1~/src/backends/Makefile.in network-manager-0.6.1/src/backends/Makefile.in +--- network-manager-0.6.1~/src/backends/Makefile.in 2006-03-13 16:20:07.000000000 +0000 ++++ network-manager-0.6.1/src/backends/Makefile.in 2006-03-24 00:52:05.000000000 +0000 +@@ -52,7 +52,11 @@ host_triplet = @host@ + @TARGET_DEBIAN_TRUE@ interface_parser.c \ + @TARGET_DEBIAN_TRUE@ interface_parser.h + +-@TARGET_SLACKWARE_TRUE@am__append_5 = NetworkManagerSlackware.c ++@TARGET_UBUNTU_TRUE@am__append_5 = NetworkManagerUbuntu.c \ ++@TARGET_UBUNTU_TRUE@ interface_parser.c \ ++@TARGET_UBUNTU_TRUE@ interface_parser.h ++ ++@TARGET_SLACKWARE_TRUE@am__append_6 = NetworkManagerSlackware.c + subdir = src/backends + DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +@@ -69,7 +73,7 @@ libnmbackend_la_DEPENDENCIES = $(am__DEP + am__libnmbackend_la_SOURCES_DIST = NetworkManagerRedHat.c shvar.c \ + shvar.h NetworkManagerSuSE.c NetworkManagerGentoo.c \ + NetworkManagerDebian.c interface_parser.c interface_parser.h \ +- NetworkManagerSlackware.c ++ NetworkManagerUbuntu.c NetworkManagerSlackware.c + @TARGET_REDHAT_TRUE@am__objects_1 = \ + @TARGET_REDHAT_TRUE@ libnmbackend_la-NetworkManagerRedHat.lo \ + @TARGET_REDHAT_TRUE@ libnmbackend_la-shvar.lo +@@ -82,9 +86,13 @@ am__libnmbackend_la_SOURCES_DIST = Netwo + @TARGET_DEBIAN_TRUE@am__objects_4 = \ + @TARGET_DEBIAN_TRUE@ libnmbackend_la-NetworkManagerDebian.lo \ + @TARGET_DEBIAN_TRUE@ libnmbackend_la-interface_parser.lo +-@TARGET_SLACKWARE_TRUE@am__objects_5 = libnmbackend_la-NetworkManagerSlackware.lo ++@TARGET_UBUNTU_TRUE@am__objects_5 = \ ++@TARGET_UBUNTU_TRUE@ libnmbackend_la-NetworkManagerUbuntu.lo \ ++@TARGET_UBUNTU_TRUE@ libnmbackend_la-interface_parser.lo ++@TARGET_SLACKWARE_TRUE@am__objects_6 = libnmbackend_la-NetworkManagerSlackware.lo + am_libnmbackend_la_OBJECTS = $(am__objects_1) $(am__objects_2) \ +- $(am__objects_3) $(am__objects_4) $(am__objects_5) ++ $(am__objects_3) $(am__objects_4) $(am__objects_5) \ ++ $(am__objects_6) + libnmbackend_la_OBJECTS = $(am_libnmbackend_la_OBJECTS) + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp +@@ -241,6 +249,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +@@ -303,7 +313,8 @@ INCLUDES = -I${top_srcdir} \ + + noinst_LTLIBRARIES = libnmbackend.la + libnmbackend_la_SOURCES = $(am__append_1) $(am__append_2) \ +- $(am__append_3) $(am__append_4) $(am__append_5) ++ $(am__append_3) $(am__append_4) $(am__append_5) \ ++ $(am__append_6) + libnmbackend_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS) + libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ + $(GTHREAD_CFLAGS) \ +@@ -372,6 +383,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerRedHat.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerSlackware.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerSuSE.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-NetworkManagerUbuntu.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-interface_parser.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmbackend_la-shvar.Plo@am__quote@ + +@@ -441,6 +453,13 @@ libnmbackend_la-interface_parser.lo: int + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-interface_parser.lo `test -f 'interface_parser.c' || echo '$(srcdir)/'`interface_parser.c + ++libnmbackend_la-NetworkManagerUbuntu.lo: NetworkManagerUbuntu.c ++@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerUbuntu.lo -MD -MP -MF "$(DEPDIR)/libnmbackend_la-NetworkManagerUbuntu.Tpo" -c -o libnmbackend_la-NetworkManagerUbuntu.lo `test -f 'NetworkManagerUbuntu.c' || echo '$(srcdir)/'`NetworkManagerUbuntu.c; \ ++@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnmbackend_la-NetworkManagerUbuntu.Tpo" "$(DEPDIR)/libnmbackend_la-NetworkManagerUbuntu.Plo"; else rm -f "$(DEPDIR)/libnmbackend_la-NetworkManagerUbuntu.Tpo"; exit 1; fi ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='NetworkManagerUbuntu.c' object='libnmbackend_la-NetworkManagerUbuntu.lo' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libnmbackend_la-NetworkManagerUbuntu.lo `test -f 'NetworkManagerUbuntu.c' || echo '$(srcdir)/'`NetworkManagerUbuntu.c ++ + libnmbackend_la-NetworkManagerSlackware.lo: NetworkManagerSlackware.c + @am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libnmbackend_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libnmbackend_la-NetworkManagerSlackware.lo -MD -MP -MF "$(DEPDIR)/libnmbackend_la-NetworkManagerSlackware.Tpo" -c -o libnmbackend_la-NetworkManagerSlackware.lo `test -f 'NetworkManagerSlackware.c' || echo '$(srcdir)/'`NetworkManagerSlackware.c; \ + @am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libnmbackend_la-NetworkManagerSlackware.Tpo" "$(DEPDIR)/libnmbackend_la-NetworkManagerSlackware.Plo"; else rm -f "$(DEPDIR)/libnmbackend_la-NetworkManagerSlackware.Tpo"; exit 1; fi +diff -ruNp network-manager-0.6.1~/src/backends/NetworkManagerUbuntu.c network-manager-0.6.1/src/backends/NetworkManagerUbuntu.c +--- network-manager-0.6.1~/src/backends/NetworkManagerUbuntu.c 1970-01-01 01:00:00.000000000 +0100 ++++ network-manager-0.6.1/src/backends/NetworkManagerUbuntu.c 2006-03-24 01:06:29.000000000 +0000 +@@ -0,0 +1,623 @@ ++/* NetworkManager -- Network link manager ++ * ++ * Scott James Remnant ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++ * ++ * (C) Copyright 2006 Canonical Ltd. ++ * (C) Copyright 2004 Tom Parker ++ * (C) Copyright 2004 Matthew Garrett ++ * (C) Copyright 2004 Red Hat, Inc. ++ */ ++ ++#include ++ ++#include ++#include ++#include ++ ++#include "NetworkManagerSystem.h" ++#include "NetworkManagerUtils.h" ++#include "nm-device.h" ++#include "nm-device-802-3-ethernet.h" ++#include "nm-device-802-11-wireless.h" ++ ++#include "interface_parser.h" ++#include "nm-utils.h" ++ ++ ++/* ++ * nm_system_init ++ * ++ * Initializes the distribution-specific system backend ++ * ++ */ ++void nm_system_init (void) ++{ ++} ++ ++ ++/* ++ * nm_system_device_flush_routes ++ * ++ * Flush all routes associated with a network device ++ * ++ */ ++void nm_system_device_flush_routes (NMDevice *dev) ++{ ++ g_return_if_fail (dev != NULL); ++ ++ /* Not really applicable for test devices */ ++ if (nm_device_is_test_device (dev)) ++ return; ++ ++ nm_system_device_flush_routes_with_iface (nm_device_get_iface (dev)); ++} ++ ++/* ++ * nm_system_device_flush_routes_with_iface ++ * ++ * Flush all routes associated with a network device ++ * ++ */ ++void nm_system_device_flush_routes_with_iface (const char *iface) ++{ ++ char *buf; ++ ++ g_return_if_fail (iface != NULL); ++ ++ /* Remove routing table entries */ ++ buf = g_strdup_printf ("/sbin/ip route flush dev %s", iface); ++ nm_spawn_process (buf); ++ g_free (buf); ++} ++ ++/* ++ * nm_system_device_add_default_route_via_device ++ * ++ * Add default route to the given device ++ * ++ */ ++void nm_system_device_add_default_route_via_device (NMDevice *dev) ++{ ++ g_return_if_fail (dev != NULL); ++ ++ /* Not really applicable for test devices */ ++ if (nm_device_is_test_device (dev)) ++ return; ++ ++ nm_system_device_add_default_route_via_device_with_iface (nm_device_get_iface (dev)); ++} ++ ++/* ++ * nm_system_device_add_default_route_via_device_with_iface ++ * ++ * Add default route to the given device ++ * ++ */ ++void nm_system_device_add_default_route_via_device_with_iface (const char *iface) ++{ ++ char *buf; ++ ++ g_return_if_fail (iface != NULL); ++ ++ /* Add default gateway */ ++ buf = g_strdup_printf ("/sbin/ip route add default dev %s", iface); ++ nm_spawn_process (buf); ++ g_free (buf); ++} ++ ++/* ++ * nm_system_device_add_route_via_device_with_iface ++ * ++ * Add route to the given device ++ * ++ */ ++void nm_system_device_add_route_via_device_with_iface (const char *iface, const ++ char *route) ++{ ++ char *buf; ++ ++ g_return_if_fail (iface != NULL); ++ ++ /* Add default gateway */ ++ buf = g_strdup_printf ("/sbin/ip route add %s dev %s", route, iface); ++ nm_spawn_process (buf); ++ g_free (buf); ++} ++ ++/* ++ * nm_system_device_has_active_routes ++ * ++ * Find out whether the specified device has any routes in the routing ++ * table. ++ * ++ */ ++gboolean nm_system_device_has_active_routes (NMDevice *dev) ++{ ++ return (FALSE); ++} ++ ++ ++/* ++ * nm_system_device_flush_addresses ++ * ++ * Flush all network addresses associated with a network devic ++ * ++ */ ++void nm_system_device_flush_addresses (NMDevice *dev) ++{ ++ g_return_if_fail (dev != NULL); ++ ++ /* Not really applicable for test devices */ ++ if (nm_device_is_test_device (dev)) ++ return; ++ ++ nm_system_device_flush_addresses_with_iface (nm_device_get_iface (dev)); ++} ++ ++/* ++ * nm_system_device_flush_addresses_with_iface ++ * ++ * Flush all network addresses associated with a network device ++ * ++ */ ++void nm_system_device_flush_addresses_with_iface (const char *iface) ++{ ++ char *buf; ++ ++ g_return_if_fail (iface != NULL); ++ ++ /* Remove all IP addresses for a device */ ++ buf = g_strdup_printf ("/sbin/ip addr flush dev %s", iface); ++ nm_spawn_process (buf); ++ g_free (buf); ++} ++ ++ ++/* ++ * nm_system_enable_loopback ++ * ++ * Bring up the loopback interface ++ * ++ */ ++void nm_system_enable_loopback (void) ++{ ++ nm_spawn_process ("/sbin/ifup lo"); ++} ++ ++/* ++ * nm_system_flush_loopback_routes ++ * ++ * Flush all routes associated with the loopback device, because it ++ * sometimes gets the first route for ZeroConf/Link-Local traffic. ++ * ++ */ ++void nm_system_flush_loopback_routes (void) ++{ ++ /* Remove routing table entries for lo */ ++ nm_spawn_process ("/sbin/ip route flush dev lo"); ++} ++ ++ ++/* ++ * nm_system_delete_default_route ++ * ++ * Remove the old default route in preparation for a new one ++ * ++ */ ++void nm_system_delete_default_route (void) ++{ ++ nm_spawn_process ("/sbin/ip route del default"); ++} ++ ++/* ++ * nm_system_flush_arp_cache ++ * ++ * Flush all entries in the arp cache. ++ * ++ */ ++void nm_system_flush_arp_cache (void) ++{ ++ nm_spawn_process ("/sbin/ip neigh flush all"); ++} ++ ++/* ++ * nm_system_update_dns ++ * ++ * Make glibc/nscd aware of any changes to the resolv.conf file by ++ * restarting nscd. ++ * ++ */ ++void nm_system_update_dns (void) ++{ ++ nm_spawn_process ("/usr/sbin/invoke-rc.d nscd restart"); ++} ++ ++/* ++ * nm_system_restart_mdns_responder ++ * ++ * Restart the multicast DNS responder so that it knows about new ++ * network interfaces and IP addresses. ++ * ++ */ ++void nm_system_restart_mdns_responder (void) ++{ ++ /* FIXME We don't need this with avahi, right? */ ++} ++ ++ ++/* ++ * nm_system_device_add_ip6_link_address ++ * ++ * Add a default link-local IPv6 address to a device. ++ * ++ */ ++void nm_system_device_add_ip6_link_address (NMDevice *dev) ++{ ++ char *buf; ++ struct ether_addr hw_addr; ++ unsigned char eui[8]; ++ ++ if (nm_device_is_802_3_ethernet (dev)) ++ nm_device_802_3_ethernet_get_address (NM_DEVICE_802_3_ETHERNET (dev), &hw_addr); ++ else if (nm_device_is_802_11_wireless (dev)) ++ nm_device_802_11_wireless_get_address (NM_DEVICE_802_11_WIRELESS (dev), &hw_addr); ++ ++ memcpy (eui, &(hw_addr.ether_addr_octet), sizeof (hw_addr.ether_addr_octet)); ++ memmove (eui+5, eui+3, 3); ++ eui[3] = 0xff; ++ eui[4] = 0xfe; ++ eui[0] ^= 2; ++ ++ /* Add the default link-local IPv6 address to a device */ ++ buf = g_strdup_printf ("/sbin/ip -6 addr add fe80::%x%02x:%x%02x:%x%02x:%x%02x/64 dev %s", ++ eui[0], eui[1], eui[2], eui[3], ++ eui[4], eui[5], ++ eui[6], eui[7], nm_device_get_iface (dev)); ++ nm_spawn_process (buf); ++ g_free (buf); ++} ++ ++ ++/* ++ * set_ip4_config_from_resolv_conf ++ * ++ * Add nameservers and search names from a resolv.conf format file. ++ * ++ */ ++static void set_ip4_config_from_resolv_conf (const char *filename, NMIP4Config *ip4_config) ++{ ++ char * contents = NULL; ++ char ** split_contents = NULL; ++ int i, len; ++ ++ g_return_if_fail (filename != NULL); ++ g_return_if_fail (ip4_config != NULL); ++ ++ if (!g_file_get_contents (filename, &contents, NULL, NULL) || (contents == NULL)) ++ return; ++ ++ if (!(split_contents = g_strsplit (contents, "\n", 0))) ++ goto out; ++ ++ len = g_strv_length (split_contents); ++ for (i = 0; i < len; i++) ++ { ++ char *line = split_contents[i]; ++ ++ /* Ignore comments */ ++ if (!line || (line[0] == ';') || (line[0] == '#')) ++ continue; ++ ++ line = g_strstrip (line); ++ if ((strncmp (line, "search", 6) == 0) && (strlen (line) > 6)) ++ { ++ char *searches = g_strdup (line + 7); ++ char **split_searches = NULL; ++ ++ if (!searches || !strlen (searches)) ++ continue; ++ ++ /* Allow space-separated search domains */ ++ if ((split_searches = g_strsplit (searches, " ", 0))) ++ { ++ int m, srch_len; ++ ++ srch_len = g_strv_length (split_searches); ++ for (m = 0; m < srch_len; m++) ++ { ++ if (split_searches[m]) ++ nm_ip4_config_add_domain (ip4_config, split_searches[m]); ++ } ++ g_strfreev (split_searches); ++ } ++ else ++ { ++ /* Only 1 item, add the whole line */ ++ nm_ip4_config_add_domain (ip4_config, searches); ++ } ++ ++ g_free (searches); ++ } ++ else if ((strncmp (line, "nameserver", 10) == 0) && (strlen (line) > 10)) ++ { ++ guint32 addr = (guint32) (inet_addr (line + 11)); ++ ++ if (addr != (guint32) -1) ++ nm_ip4_config_add_nameserver (ip4_config, addr); ++ } ++ } ++ ++ g_strfreev (split_contents); ++ ++out: ++ g_free (contents); ++} ++ ++ ++typedef struct ubuntu_system_config_data { ++ NMIP4Config *config; ++ gboolean use_dhcp; ++} UbuntuSystemConfigData; ++ ++/* ++ * nm_system_device_get_system_config ++ * ++ * Read in the config file for a device. ++ * ++ */ ++void *nm_system_device_get_system_config (NMDevice *dev, NMData *app_data) ++{ ++ UbuntuSystemConfigData *sys_data = NULL; ++ if_block *curr_device; ++ const char *buf; ++ ++ g_return_val_if_fail (dev != NULL, NULL); ++ ++ /* Ubuntu systems store information about manually configured ++ * networks in /etc/network/interfaces. Right now we don't ++ * want NetworkManager to even touch those, but we'll parse it ++ * in anyway for completeness ++ */ ++ ++ sys_data = g_malloc0 (sizeof (UbuntuSystemConfigData)); ++ sys_data->config = NULL; ++ sys_data->use_dhcp = TRUE; ++ ++ ifparser_init (); ++ curr_device = ifparser_getif (nm_device_get_iface (dev)); ++ if (curr_device == NULL) ++ goto error; ++ ++ sys_data->config = nm_ip4_config_new (); ++ ++ buf = ifparser_getkey (curr_device, "inet"); ++ if (buf) { ++ if (strcmp (buf, "dhcp")) { ++ sys_data->use_dhcp = FALSE; ++ set_ip4_config_from_resolv_conf (SYSCONFDIR"/resolv.conf", sys_data->config); ++ } ++ } ++ ++ buf = ifparser_getkey (curr_device, "address"); ++ if (buf) ++ nm_ip4_config_set_address (sys_data->config, inet_addr (buf)); ++ ++ buf = ifparser_getkey (curr_device, "gateway"); ++ if (buf) ++ nm_ip4_config_set_gateway (sys_data->config, inet_addr (buf)); ++ ++ buf = ifparser_getkey (curr_device, "netmask"); ++ if (buf) { ++ nm_ip4_config_set_netmask (sys_data->config, inet_addr (buf)); ++ } else { ++ guint32 addr = nm_ip4_config_get_address (sys_data->config); ++ ++ /* Make a default netmask if we have an IP address */ ++ if (((ntohl (addr) & 0xff000000) >> 24) <= 127) ++ nm_ip4_config_set_netmask (sys_data->config, htonl (0xff000000)); ++ else if (((ntohl (addr) & 0xff000000) >> 24) <= 191) ++ nm_ip4_config_set_netmask (sys_data->config, htonl (0xffff0000)); ++ else ++ nm_ip4_config_set_netmask (sys_data->config, htonl (0xffffff00)); ++ } ++ ++ buf = ifparser_getkey (curr_device, "broadcast"); ++ if (buf) { ++ nm_ip4_config_set_broadcast (sys_data->config, inet_addr (buf)); ++ } else { ++ guint32 addr = nm_ip4_config_get_address (sys_data->config); ++ guint32 mask = nm_ip4_config_get_netmask (sys_data->config); ++ ++ /* Make a default netmask if we have an IP address */ ++ nm_ip4_config_set_broadcast (sys_data->config, (addr & mask) | ~mask); ++ } ++ ++error: ++ ifparser_destroy (); ++ ++ return sys_data; ++} ++ ++/* ++ * nm_system_device_free_system_config ++ * ++ * Free stored system config data ++ * ++ */ ++void nm_system_device_free_system_config (NMDevice *dev, void *system_config_data) ++{ ++ UbuntuSystemConfigData *sys_data = system_config_data; ++ ++ g_return_if_fail (dev != NULL); ++ ++ if (!sys_data) ++ return; ++ ++ if (sys_data->config) ++ nm_ip4_config_unref (sys_data->config); ++} ++ ++/* ++ * nm_system_device_get_use_dhcp ++ * ++ * Return whether the distro-specific system config tells us to use ++ * dhcp for this device. ++ * ++ */ ++gboolean nm_system_device_get_use_dhcp (NMDevice *dev) ++{ ++ UbuntuSystemConfigData *sys_data; ++ ++ g_return_val_if_fail (dev != NULL, TRUE); ++ ++ if ((sys_data = nm_device_get_system_config_data (dev))) ++ return sys_data->use_dhcp; ++ ++ return TRUE; ++} ++ ++/* ++ * nm_system_device_get_disabled ++ * ++ * Return whether the distro-specific system config tells us that ++ * this device should be disabled. ++ * ++ */ ++gboolean nm_system_device_get_disabled (NMDevice *dev) ++{ ++ const char *iface; ++ if_block *curr_device, *curr_b; ++ if_data *curr_d; ++ gboolean blacklist = TRUE; ++ ++ g_return_val_if_fail (dev != NULL, TRUE); ++ ++ iface = nm_device_get_iface (dev); ++ ++ ifparser_init (); ++ ++ /* If the interface isn't listed in /etc/network/interfaces then ++ * it's considered okay to control it. ++ */ ++ curr_device = ifparser_getif (iface); ++ if (curr_device == NULL) { ++ blacklist = FALSE; ++ goto out; ++ } ++ ++ /* If the interface is listed and isn't marked "auto" then it's ++ * definitely not okay to control it. ++ */ ++ for (curr_b = ifparser_getfirst(); curr_b; curr_b = curr_b->next) { ++ if (!strcmp (curr_b->type, "auto") ++ && !strcmp (curr_b->name, iface)) ++ blacklist = FALSE; ++ } ++ ++ /* If the interface has no options other than just "inet dhcp" ++ * it's probably ok to fiddle with it. ++ */ ++ for (curr_d = curr_device->info; curr_d; curr_d = curr_d->next) { ++ if (strcmp (curr_d->key, "inet") ++ || strcmp (curr_d->data, "dhcp")) ++ blacklist = TRUE; ++ } ++ ++out: ++ ifparser_destroy (); ++ ++ return blacklist; ++} ++ ++NMIP4Config *nm_system_device_new_ip4_system_config (NMDevice *dev) ++{ ++ UbuntuSystemConfigData *sys_data; ++ NMIP4Config *new_config = NULL; ++ ++ g_return_val_if_fail (dev != NULL, NULL); ++ ++ if ((sys_data = nm_device_get_system_config_data (dev))) ++ new_config = nm_ip4_config_copy (sys_data->config); ++ ++ return new_config; ++} ++ ++ ++GSList *nm_system_get_dialup_config (void) ++{ ++ /* FIXME we don't have any integrated dialup stuff yet */ ++ return NULL; ++} ++ ++gboolean nm_system_activate_dialup (GSList *list, const char *dialup) ++{ ++ /* FIXME we don't have any integrated dialup stuff yet */ ++ return FALSE; ++} ++ ++gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup) ++{ ++ /* FIXME we don't have any integrated dialup stuff yet */ ++ return FALSE; ++} ++ ++void nm_system_deactivate_all_dialup (GSList *list) ++{ ++ /* FIXME we don't have any integrated dialup stuff yet */ ++} ++ ++ ++/* nm_system_set_hostname ++ * ++ * set the hostname ++ * ++ */ ++void nm_system_set_hostname (NMIP4Config *config) ++{ ++} ++ ++/* ++ * nm_system_activate_nis ++ * ++ * set up the nis domain and write a yp.conf ++ * ++ */ ++void nm_system_activate_nis (NMIP4Config *config) ++{ ++} ++ ++/* ++ * nm_system_shutdown_nis ++ * ++ * shutdown ypbind ++ * ++ */ ++void nm_system_shutdown_nis (void) ++{ ++} ++ ++ ++/* ++ * nm_system_should_modify_resolv_conf ++ * ++ * Can NM update resolv.conf, or is it locked down? ++ * ++ */ ++gboolean nm_system_should_modify_resolv_conf (void) ++{ ++ return FALSE; ++} +diff -ruNp network-manager-0.6.1~/src/dhcp-manager/Makefile.in network-manager-0.6.1/src/dhcp-manager/Makefile.in +--- network-manager-0.6.1~/src/dhcp-manager/Makefile.in 2006-03-13 16:20:07.000000000 +0000 ++++ network-manager-0.6.1/src/dhcp-manager/Makefile.in 2006-03-24 00:52:05.000000000 +0000 +@@ -206,6 +206,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/src/named-manager/Makefile.in network-manager-0.6.1/src/named-manager/Makefile.in +--- network-manager-0.6.1~/src/named-manager/Makefile.in 2006-03-13 16:20:07.000000000 +0000 ++++ network-manager-0.6.1/src/named-manager/Makefile.in 2006-03-24 00:52:05.000000000 +0000 +@@ -207,6 +207,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/src/vpn-manager/Makefile.in network-manager-0.6.1/src/vpn-manager/Makefile.in +--- network-manager-0.6.1~/src/vpn-manager/Makefile.in 2006-03-13 16:20:08.000000000 +0000 ++++ network-manager-0.6.1/src/vpn-manager/Makefile.in 2006-03-24 00:52:05.000000000 +0000 +@@ -210,6 +210,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/test/Makefile.in network-manager-0.6.1/test/Makefile.in +--- network-manager-0.6.1~/test/Makefile.in 2006-03-13 16:20:08.000000000 +0000 ++++ network-manager-0.6.1/test/Makefile.in 2006-03-24 00:52:05.000000000 +0000 +@@ -230,6 +230,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/test/libnm-util/Makefile.in network-manager-0.6.1/test/libnm-util/Makefile.in +--- network-manager-0.6.1~/test/libnm-util/Makefile.in 2006-03-13 16:20:08.000000000 +0000 ++++ network-manager-0.6.1/test/libnm-util/Makefile.in 2006-03-24 00:52:06.000000000 +0000 +@@ -214,6 +214,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/test/test-common/Makefile.in network-manager-0.6.1/test/test-common/Makefile.in +--- network-manager-0.6.1~/test/test-common/Makefile.in 2006-03-13 16:20:08.000000000 +0000 ++++ network-manager-0.6.1/test/test-common/Makefile.in 2006-03-24 00:52:06.000000000 +0000 +@@ -205,6 +205,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ +diff -ruNp network-manager-0.6.1~/utils/Makefile.in network-manager-0.6.1/utils/Makefile.in +--- network-manager-0.6.1~/utils/Makefile.in 2006-03-13 16:20:08.000000000 +0000 ++++ network-manager-0.6.1/utils/Makefile.in 2006-03-24 00:52:06.000000000 +0000 +@@ -205,6 +205,8 @@ TARGET_SLACKWARE_FALSE = @TARGET_SLACKWA + TARGET_SLACKWARE_TRUE = @TARGET_SLACKWARE_TRUE@ + TARGET_SUSE_FALSE = @TARGET_SUSE_FALSE@ + TARGET_SUSE_TRUE = @TARGET_SUSE_TRUE@ ++TARGET_UBUNTU_FALSE = @TARGET_UBUNTU_FALSE@ ++TARGET_UBUNTU_TRUE = @TARGET_UBUNTU_TRUE@ + USE_NLS = @USE_NLS@ + VERSION = @VERSION@ + WITH_GCRYPT_FALSE = @WITH_GCRYPT_FALSE@ --- network-manager-0.6.1.orig/debian/patches/85-rml-madwifi-signal-strength.patch +++ network-manager-0.6.1/debian/patches/85-rml-madwifi-signal-strength.patch @@ -0,0 +1,51 @@ +diff -ruNp network-manager-0.6.1~/src/nm-device-802-11-wireless.c network-manager-0.6.1/src/nm-device-802-11-wireless.c +--- network-manager-0.6.1~/src/nm-device-802-11-wireless.c 2006-03-24 01:19:59.000000000 +0000 ++++ network-manager-0.6.1/src/nm-device-802-11-wireless.c 2006-03-24 01:21:53.000000000 +0000 +@@ -116,7 +116,8 @@ static gboolean get_scan_results (NMDevi + guint8 **out_res_buf, + guint32 *data_len); + +-static int wireless_qual_to_percent (const struct iw_quality *qual, ++static int wireless_qual_to_percent (NMDevice *dev, ++ const struct iw_quality *qual, + const struct iw_quality *max_qual, + const struct iw_quality *avg_qual); + +@@ -1027,7 +1028,8 @@ nm_device_802_11_wireless_get_signal_str + * + */ + static int +-wireless_qual_to_percent (const struct iw_quality *qual, ++wireless_qual_to_percent (NMDevice *dev, ++ const struct iw_quality *qual, + const struct iw_quality *max_qual, + const struct iw_quality *avg_qual) + { +@@ -1122,7 +1124,7 @@ max_qual->updated); + } + + /* If the quality percent was 0 or doesn't exist, then try to use signal levels instead */ +- if ((percent < 1) && (level_percent >= 0)) ++ if ((percent < 1 || !strcmp (nm_device_get_driver (dev), "ath_pci")) && (level_percent >= 0)) + percent = level_percent; + + #ifdef IW_QUAL_DEBUG +@@ -1182,7 +1184,7 @@ nm_device_802_11_wireless_update_signal_ + #endif + if (iw_get_stats (nm_dev_sock_get_fd (sk), iface, &stats, &range, has_range) == 0) + { +- percent = wireless_qual_to_percent (&stats.qual, (const iwqual *)(&self->priv->max_qual), ++ percent = wireless_qual_to_percent (NM_DEVICE (self), &stats.qual, (const iwqual *)(&self->priv->max_qual), + (const iwqual *)(&self->priv->avg_qual)); + } + nm_dev_sock_close (sk); +@@ -3334,7 +3336,8 @@ process_scan_results (NMDevice80211Wirel + nm_ap_set_freq (ap, iw_freq2float(&(iwe->u.freq))); + break; + case IWEVQUAL: +- nm_ap_set_strength (ap, wireless_qual_to_percent (&(iwe->u.qual), ++ nm_ap_set_strength (ap, wireless_qual_to_percent (&dev->parent, ++ &(iwe->u.qual), + (const iwqual *)(&dev->priv->max_qual), + (const iwqual *)(&dev->priv->avg_qual))); + break; --- network-manager-0.6.1.orig/debian/patches/70-dont-deactivate-new-devices.patch +++ network-manager-0.6.1/debian/patches/70-dont-deactivate-new-devices.patch @@ -0,0 +1,11 @@ +diff -ruNp network-manager-0.6.1~/src/NetworkManager.c network-manager-0.6.1/src/NetworkManager.c +--- network-manager-0.6.1~/src/NetworkManager.c 2006-03-24 01:18:02.000000000 +0000 ++++ network-manager-0.6.1/src/NetworkManager.c 2006-03-24 01:18:07.000000000 +0000 +@@ -135,7 +135,6 @@ NMDevice * nm_create_device_and_add_to_l + nm_device_is_802_11_wireless (dev) ? "wireless (802.11)" : "wired Ethernet (802.3)", nm_device_get_iface (dev)); + + data->dev_list = g_slist_append (data->dev_list, dev); +- nm_device_deactivate (dev); + + nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__); + --- network-manager-0.6.1.orig/debian/patches/65-dispatcher-script-dir.patch +++ network-manager-0.6.1/debian/patches/65-dispatcher-script-dir.patch @@ -0,0 +1,33 @@ +diff -ruNp network-manager-0.6.1~/dispatcher-daemon/NetworkManagerDispatcher.c network-manager-0.6.1/dispatcher-daemon/NetworkManagerDispatcher.c +--- network-manager-0.6.1~/dispatcher-daemon/NetworkManagerDispatcher.c 2006-03-24 01:10:11.000000000 +0000 ++++ network-manager-0.6.1/dispatcher-daemon/NetworkManagerDispatcher.c 2006-03-24 01:15:52.000000000 +0000 +@@ -50,7 +50,7 @@ enum NMDAction + typedef enum NMDAction NMDAction; + + +-#define NM_SCRIPT_DIR SYSCONFDIR"/NetworkManager/dispatcher.d" ++#define NM_SCRIPT_DIR DATADIR"/NetworkManager/dispatcher.d" + + #define NMD_DEFAULT_PID_FILE LOCALSTATEDIR"/run/NetworkManagerDispatcher.pid" + +diff -ruNp network-manager-0.6.1~/man/NetworkManagerDispatcher.1.in network-manager-0.6.1/man/NetworkManagerDispatcher.1.in +--- network-manager-0.6.1~/man/NetworkManagerDispatcher.1.in 2006-03-24 01:14:11.000000000 +0000 ++++ network-manager-0.6.1/man/NetworkManagerDispatcher.1.in 2006-03-24 01:16:04.000000000 +0000 +@@ -9,7 +9,7 @@ NetworkManagerDispatcher \- daemon that + .B NetworkManagerDispatcher [\-\-no-daemon] + .SH DESCRIPTION + The \fINetworkManagerDispatcher\fP daemon runs commands in the +-.I @sysconfdir@/NetworkManager/dispatcher.d ++.I /usr/share/NetworkManager/dispatcher.d + directory in response to interfaces coming up and down. The scripts are run + alphabetically. The first parameter is the network interface name. The second + parameter is +@@ -27,7 +27,7 @@ The following options are supported: + .I "--no-daemon" + Do not daemonize. This is useful for debugging. + .SH FILES +-@sysconfdir@/NetworkManager/dispatcher.d ++/usr/share/NetworkManager/dispatcher.d + .SH SEE ALSO + .BR NetworkManager (1), + .BR nm-tool (1) --- network-manager-0.6.1.orig/debian/patches/10-manpage-name-headers.patch +++ network-manager-0.6.1/debian/patches/10-manpage-name-headers.patch @@ -0,0 +1,36 @@ +diff -ruNp network-manager-0.6.1~/man/NetworkManager.1.in network-manager-0.6.1/man/NetworkManager.1.in +--- network-manager-0.6.1~/man/NetworkManager.1.in 2006-02-01 18:14:15.000000000 +0000 ++++ network-manager-0.6.1/man/NetworkManager.1.in 2006-03-24 00:19:35.000000000 +0000 +@@ -3,6 +3,7 @@ + .\" Copyright (C) 2005 Robert Love + .\" + .TH NETWORKMANAGER "1" ++.SH NAME + NetworkManager \- network management daemon + .SH SYNOPSIS + .B NetworkManager [\-\-no-daemon] [\-\-enable-test-devices] +diff -ruNp network-manager-0.6.1~/man/NetworkManagerDispatcher.1.in network-manager-0.6.1/man/NetworkManagerDispatcher.1.in +--- network-manager-0.6.1~/man/NetworkManagerDispatcher.1.in 2006-02-01 18:14:15.000000000 +0000 ++++ network-manager-0.6.1/man/NetworkManagerDispatcher.1.in 2006-03-24 00:19:35.000000000 +0000 +@@ -1,8 +1,9 @@ +-.\" NetworkManager(1) manual page ++.\" NetworkManagerDispatcher(1) manual page + .\" + .\" Copyright (C) 2005 Robert Love + .\" + .TH NETWORKMANAGERDISPATCHER "1" ++.SH NAME + NetworkManagerDispatcher \- daemon that runs commands in response to off/online + .SH SYNOPSIS + .B NetworkManagerDispatcher [\-\-no-daemon] +diff -ruNp network-manager-0.6.1~/man/nm-tool.1.in network-manager-0.6.1/man/nm-tool.1.in +--- network-manager-0.6.1~/man/nm-tool.1.in 2006-02-01 18:14:15.000000000 +0000 ++++ network-manager-0.6.1/man/nm-tool.1.in 2006-03-24 00:19:35.000000000 +0000 +@@ -3,6 +3,7 @@ + .\" Copyright (C) 2005 Robert Love + .\" + .TH NM-TOOL "1" ++.SH NAME + nm-tool \- utility to report NetworkManager state + .SH SYNOPSIS + .B nm-tool --- network-manager-0.6.1.orig/debian/patches/20-supplicant-timeout.patch +++ network-manager-0.6.1/debian/patches/20-supplicant-timeout.patch @@ -0,0 +1,12 @@ +diff -ruNp network-manager-0.6.1~/src/nm-device-802-11-wireless.c network-manager-0.6.1/src/nm-device-802-11-wireless.c +--- network-manager-0.6.1~/src/nm-device-802-11-wireless.c 2006-03-24 01:45:06.000000000 +0000 ++++ network-manager-0.6.1/src/nm-device-802-11-wireless.c 2006-03-24 01:45:20.000000000 +0000 +@@ -2253,7 +2253,7 @@ supplicant_status_cb (GIOChannel *source + } + + +-#define NM_SUPPLICANT_TIMEOUT 20 /* how long we wait for wpa_supplicant to associate (in seconds) */ ++#define NM_SUPPLICANT_TIMEOUT 60 /* how long we wait for wpa_supplicant to associate (in seconds) */ + + static unsigned int + get_supplicant_timeout (NMDevice80211Wireless *self) --- network-manager-0.6.1.orig/debian/network-manager-dispatcher.dbus-event +++ network-manager-0.6.1/debian/network-manager-dispatcher.dbus-event @@ -0,0 +1,78 @@ +#! /bin/sh +# +# NetworkManager NetworkManagerDispatcher daemon +# Daemon for automatically switching network +# connections to the best available connection. +# This file should be placed in /etc/init.d. +# +# Authors: Christian Bjälevik +# Jan Gerber +# Mark Roach +# Thom May +# +# + +set -e + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DESC="NetworkManager dispatcher" +NAME="NetworkManagerDispatcher" +DAEMON=/usr/sbin/$NAME +PIDDIR=/var/run/NetworkManager +PIDFILE=$PIDDIR/$NAME.pid +SCRIPTNAME=/etc/dbus-1/event.d/26$NAME +USER=root + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + +. /lib/lsb/init-functions + +test -f /etc/default/rcS && . /etc/default/rcS +test -f /etc/default/NetworkManagerDispatcher && . /etc/default/NetworkManagerDispatcher + +# +# Function that starts the daemon/service. +# +d_start() { + log_begin_msg "Starting $DESC" + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $USER:$USER $PIDDIR + fi + + start-stop-daemon --start --quiet --pidfile $PIDFILE \ + --user $USER --exec $DAEMON -- $DAEMON_OPTS + log_end_msg $? +} + +# +# Function that stops the daemon/service. +# +d_stop() { + log_begin_msg "Stopping $DESC" + start-stop-daemon --stop --quiet --pidfile $PIDFILE \ + --oknodo --user $USER --exec $DAEMON + log_end_msg $? +} + + +case "$1" in + start) + d_start + ;; + stop) + d_stop + ;; + restart|force-reload) + d_stop + sleep 1 + d_start + ;; + *) + log_success_msg "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- network-manager-0.6.1.orig/debian/network-manager.dirs +++ network-manager-0.6.1/debian/network-manager.dirs @@ -0,0 +1,4 @@ +etc/dbus-1/event.d +etc/dbus-1/system.d +usr/bin +usr/share/NetworkManager/dispatcher.d --- network-manager-0.6.1.orig/debian/network-manager.docs +++ network-manager-0.6.1/debian/network-manager.docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- network-manager-0.6.1.orig/debian/network-manager-dispatcher.script +++ network-manager-0.6.1/debian/network-manager-dispatcher.script @@ -0,0 +1,44 @@ +#!/bin/sh -e +# Script to dispatch NetworkManager events +# +# Runs ifupdown scripts when NetworkManager fiddles with interfaces. + +if [ -z "$1" ]; then + echo "$0: called with no interface" 1>&2 + exit 1; +fi + +# Fake ifupdown environment +export IFACE="$1" +export LOGICAL="$1" +export ADDRFAM="NetworkManager" +export METHOD="NetworkManager" +export VERBOSITY="0" + +# Run the right scripts +case "$2" in + up) + export MODE="start" + export PHASE="up" + exec run-parts /etc/network/if-up.d + ;; + down) + export MODE="stop" + export PHASE="down" + exec run-parts /etc/network/if-down.d + ;; + pre-up) + export MODE="start" + export PHASE="pre-up" + exec run-parts /etc/network/if-pre-up.d + ;; + post-down) + export MODE="stop" + export PHASE="post-down" + exec run-parts /etc/network/if-post-down.d + ;; + *) + echo "$0: called with unknown action \`$2'" 1>&2 + exit 1 + ;; +esac --- network-manager-0.6.1.orig/debian/libnm-util-dev.install +++ network-manager-0.6.1/debian/libnm-util-dev.install @@ -0,0 +1,6 @@ +usr/lib/pkgconfig/libnm-util.pc +usr/lib/libnm-util*.a +usr/lib/libnm-util*.la +usr/lib/libnm-util*.so +usr/include/NetworkManager/cipher*.h +usr/include/NetworkManager/dbus-*.h --- network-manager-0.6.1.orig/debian/nm-applet.dbus-conf +++ network-manager-0.6.1/debian/nm-applet.dbus-conf @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + --- network-manager-0.6.1.orig/debian/network-manager-gnome.dirs +++ network-manager-0.6.1/debian/network-manager-gnome.dirs @@ -0,0 +1,4 @@ +etc/dbus-1/system.d +etc/xdg/autostart +usr/bin +usr/share/locale --- network-manager-0.6.1.orig/debian/network-manager-gnome.install +++ network-manager-0.6.1/debian/network-manager-gnome.install @@ -0,0 +1,7 @@ +usr/bin/nm-applet +usr/bin/nm-vpn-properties +usr/share/locale/* +usr/share/nm-applet/* +usr/share/icons +usr/share/gnome-vpn-properties +usr/share/gnome/autostart/nm-applet.desktop etc/xdg/autostart --- network-manager-0.6.1.orig/debian/network-manager-gnome.manpages +++ network-manager-0.6.1/debian/network-manager-gnome.manpages @@ -0,0 +1,2 @@ +debian/nm-applet.1 +debian/nm-vpn-properties.1