Merge lp:~sergiusens/phablet-extras/network-manager-packaging into lp:phablet-extras/network-manager-packaging

[Sergio Schvezov]

Updating/Merging latest from lp:network-manager/ubuntu
Releasing for raring phablet

This will only be pushed to raring.

Updates have been brought in manually from lp:network-manager/ubuntu as their is no common ancestry.

We need to determine how this is going to be landed in S.

Unmerged revisions

586. By Sergio Schvezov on 2013-03-26

* Phablet raring build
* Merge from lp:network-manager/ubuntu

585. By Tony Espy on 2013-01-23

Added code to nm-manager to ignore Android p2p0 wireless interfaces. Fixes: https://bugs.launchpad.net/bugs/1099983.

Approved by Sergio Schvezov, Ricardo Salveti.

584. By Tony Espy on 2013-01-18

Disable PolKit, session-tracking and unit tests.

=== modified file 'debian/README.source'
--- debian/README.source	2010-10-22 13:35:58 +0000
+++ debian/README.source	2013-03-26 02:35:23 +0000
@@ -18,7 +18,7 @@
 I. Packaging overview
 
   + Obtaining latest packaging:
-    bzr branch lp:~network-manager/network-manager/ubuntu.head
+    bzr branch lp:~network-manager/network-manager/ubuntu
 
   + this gives you a debian/ only bzr branch
 

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-22 20:45:29 +0000
+++ debian/changelog	2013-03-26 02:35:23 +0000
@@ -1,3 +1,187 @@
+network-manager (0.9.8.0-0ubuntu2phablet1) raring; urgency=low
+
+  * Phablet raring build
+  * Merge from lp:network-manager/ubuntu
+
+ -- Sergio Schvezov <[e-mail]>  Mon, 25 Mar 2013 23:18:11 -0300
+
+network-manager (0.9.8.0-0ubuntu2) raring; urgency=low
+
+  * debian/patches/git_machine_id_duid_gen_1d14d17.patch: dhcp: look harder
+    for machine-id, and generate random DUID if it doesn't exist. (LP: #1153266)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 25 Mar 2013 10:39:32 -0400
+
+network-manager (0.9.8.0-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+  * Resync package with Debian:
+    - debian/libnm*.install: Fix paths for vala vapi files: install to
+      /usr/share/vala, not /usr/share/vala-0.18...
+    - debian/network-manager-dispatcher.script: clean-up; hostname is still not
+      triggering any action, but doesn't need to be listed twice.
+    - debian/network-manager.NEWS: sync with Debian.
+    - debian/network-manager.dirs: add /etc/NetworkManager/VPN/, used to detect
+      newly installed VPN plugins.
+    - debian/control: update Build-Depends, Depends, Architecture fields.
+    - debian/network-manager.install: reorganize entries to match Debian.
+  * debian/patches/dnsmasq-vpn-dns-filtering.patch: refresh.
+  * debian/patches/dnsmasq-dbus-updates.patch: refresh.
+  * debian/patches/dns-dnsmasq-interface-and-dbus-path.patch: refresh.
+  * debian/patches/adhoc_use_wpa_rsn_part1.patch: refresh.
+  * debian/patches/adhoc_use_wpa_rsn_part2.patch: refresh.
+  * debian/patches/fix-vapigen-detection.patch: drop passing the wanted API to
+    VAPIGEN_CHECK, as that causes files to get installed in the versioned vapi
+    directory as well, which should be reserved for what ships with vala.
+  * debian/control: Modernize:
+    - Bump to debhelper 9.
+    - Drop Breaks/Replaces for libnm-glib2.
+    - Bump Standards-Version.
+  * debian/compat: bump to compat level 9.
+  * debian/rules:
+    - Cover the "release" case where we don't have autogen.sh -- run the same
+      commands it would run.
+    - Pass --disable-silent-rules to configure -- I want to see all the gory
+      details, thanks.
+    - Resync other configure flags with Debian's.
+    - Use -delete for the find call to remove .la files.
+  * debian/libnm-glib4.symbols, debian/libnm-util2.symbols: add new symbols.
+  * debian/*.install: update paths for multiarch, add bash completion for the
+    nmcli binary.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Thu, 07 Mar 2013 15:58:27 -0500
+
+network-manager (0.9.7.995+git201301311547.17123fc-0ubuntu1) raring; urgency=low
+
+  * upstream snapshot 2013-01-31 15:47:41 (GMT)
+    + 17123fcc612e5704d055d012a0298c954609754a
+
+  [ Marius Kotsbak ]
+  * debian/rules: enable connectivity check again, which is now optional,
+    with configure option "--enable-concheck".
+
+  [ Mathieu Trudel-Lapierre ]
+  * debian/patches/70_lp145653_no_sigaction_for_crashes.patch: dropped, applied
+    upstream.
+  * debian/patches/dhcpv6-duid-support.patch: dropped, applied upstream.
+  * debian/rules: drop --with-distro; which is no longer needed.
+  * debian/network-manager.install: drop nm-crash-logger, which is no longer
+    being built -- internal crash handling was removed.
+  * debian/libnm-glib4.symbols: new symbols:
+    + nm_client_get_logging@Base 0.9.7.995+git201301311547.17123fc
+    + nm_client_set_logging@Base 0.9.7.995+git201301311547.17123fc
+    + nm_device_wifi_request_scan_simple@Base 0.9.7.995+git201301311547.17123fc
+  * debian/tests/dnsmasq: improve the test in hope to better catch the state
+    of dnsmasq when started by NetworkManager.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 01 Feb 2013 19:12:05 -0500
+
+network-manager (0.9.6.0+git201301021750.e78c3e8-0ubuntu3) raring; urgency=low
+
+  * debian/patches/bridge_ignore_without_connections.patch: properly handle the
+    cases where we should still keep a bridge device unmanaged after resume
+    from suspend.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 21 Jan 2013 18:59:03 -0500
+
+network-manager (0.9.6.0+git201301021750.e78c3e8-0ubuntu2) raring; urgency=low
+
+  * debian/patches/bridge_ignore_without_connections.patch: Ignore bridge
+    devices that don't have configured connections, so as not to compete with
+    lxc or libvirt and trample their config. (LP: #1099155)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Fri, 18 Jan 2013 15:20:08 -0500
+
+network-manager (0.9.6.0+git201301021750.e78c3e8-0ubuntu1) raring; urgency=low
+
+  [ Mathieu Trudel-Lapierre ]
+  * upstream snapshot 2013-01-02 17:50:32 (GMT)
+    + e78c3e83d2e0b49641c9d484e0b35b3c6ff9f0db
+  * debian/patches/dhcpv6-duid-support.patch: refreshed.
+  * debian/patches/nm-change-dnsmasq-parameters.diff: refreshed.
+  * debian/patches/dnsmasq-vpn-dns-filtering.patch: refreshed.
+  * debian/patches/lp990011_use_tempaddr_sysctl_default.patch: refreshed.
+  * debian/patches/add-veth-support.diff: refreshed.
+  * debian/patches/dnsmasq-dbus-updates.patch: refreshed.
+  * debian/patches/dns-dnsmasq-interface-and-dbus-path.patch: refreshed.
+  * debian/patches/adhoc_use_wpa_rsn_part2.patch: refreshed.
+  * debian/patches/send_hostname_for_default_connection.patch: dropped, applied
+    upstream.
+  * debian/patches/fix-vapigen-detection.patch: refreshed.
+  * debian/patches/50_gettext_macros.patch: dropped.
+  * debian/rules: simplify call to dh_autoreconf; just run autogen.sh.
+  * debian/libnm-glib4.symbols: add symbols:
+    + nm_device_bridge_error_get_type@Base
+    + nm_device_bridge_error_quark@Base
+    + nm_device_bridge_get_carrier@Base
+    + nm_device_bridge_get_hw_address@Base
+    + nm_device_bridge_get_slaves@Base
+    + nm_device_bridge_get_type@Base
+    + nm_device_bridge_new@Base
+  * debian/libnm-util2.symbols: add symbols:
+    + nm_connection_get_setting_bridge@Base
+    + nm_connection_get_setting_bridge_port@Base
+    + nm_setting_bridge_error_get_type@Base
+    + nm_setting_bridge_error_quark@Base
+    + nm_setting_bridge_get_*@Base
+    + nm_setting_bridge_new@Base
+    + nm_setting_bridge_port_error_get_type@Base
+    + nm_setting_bridge_port_error_quark@Base
+    + nm_setting_bridge_port_get_*@Base
+    + nm_setting_bridge_port_new@Base
+    + nm_setting_ip6_config_get_dhcp_hostname@Base
+
+  [ Thomas Bechtold ]
+  * debian/README.source: fix branchname for ubuntu packaging
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 07 Jan 2013 10:45:49 -0500
+
+network-manager (0.9.6.0+git201211131441.e9e2c56-0ubuntu3) raring; urgency=low
+
+  * debian/patches/send_hostname_for_default_connection.patch: always send
+    the hostname to the DHCP server if we're activating a default, automatic
+    wired connection. (LP: #1084064)
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Tue, 04 Dec 2012 12:45:24 -0500
+
+network-manager (0.9.6.0+git201211131441.e9e2c56-0ubuntu2) raring; urgency=low
+
+  * debian/rules: give tests (run by dbus-test-runner) a timeout of 5 minutes.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 19 Nov 2012 15:42:45 -0500
+
+network-manager (0.9.6.0+git201211131441.e9e2c56-0ubuntu1) raring; urgency=low
+
+  * upstream snapshot 2012-11-13 14:41:20 (GMT)
+    + e9e2c5645f869f0671c29f14bf99793787c0272c
+  * debian/patches/dhcpv6-duid-support.patch:
+    - refresh patch to properly apply to git master.
+    - Fix some logic issues when failing to open a default lease file.
+  * debian/patches/lp859373_upgrade_policy_fix.patch: refreshed.
+  * debian/patches/nm-change-dnsmasq-parameters.diff: refreshed.
+  * debian/patches/dnsmasq-vpn-dns-filtering.patch: refreshed.
+  * debian/patches/add_sendsigs_omissions.patch: refreshed.
+  * debian/patches/lp990011_use_tempaddr_sysctl_default.patch: refreshed.
+  * debian/patches/dns-dnsmasq-interface-and-dbus-path.patch: refreshed.
+  * debian/patches/adhoc_use_wpa_rsn_part1.patch: refreshed.
+  * debian/patches/adhoc_use_wpa_rsn_part2.patch: refreshed.
+  * debian/patches/quit_dhclient_on_exit.patch: refreshed.
+  * debian/patches/dnsmasq-dbus-updates.patch: refreshed.
+  * debian/libnm-util2.symbols: add new symbols:
+    + nm_setting_connection_add_secondary@Base
+    + nm_setting_connection_get_num_secondaries@Base
+    + nm_setting_connection_get_secondary@Base
+    + nm_setting_connection_remove_secondary@Base
+    + nm_utils_ap_mode_security_valid@Base
+    + nm_utils_iface_valid_name@Base
+    + nm_utils_is_uuid@Base
+  * debian/libnm-glib4.symbols: add:
+    + nm_device_bond_get_slaves@Base
+  * debian/tests/dnsmasq: bump delay after setting up dnsmasq to 30 seconds, to
+    give enough time to NM to settle down and be connected.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Mon, 19 Nov 2012 14:16:51 -0500
+
 network-manager (0.9.6.0-0ubuntu7phablet2) quantal; urgency=low
 
   * debian/patches/lp1099983_ignore-p2p-wifi-devices.patch:

=== modified file 'debian/compat'
--- debian/compat	2011-05-03 19:11:21 +0000
+++ debian/compat	2013-03-26 02:35:23 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2012-08-08 15:13:22 +0000
+++ debian/control	2013-03-26 02:35:23 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Utopia Maintenance Team <[e-mail]>
 Uploaders: Michael Biebl <[e-mail]>
 Build-Depends:
- debhelper (>= 8.1.0~),
+ debhelper (>= 9),
  dh-autoreconf,
  autotools-dev,
  pkg-config,
@@ -15,34 +15,33 @@
  libiw-dev(>= 27+28pre9),
  libglib2.0-dev (>= 2.22),
  libsoup2.4-dev (>= 2.26),
- libnl-3-dev,
- libnl-genl-3-dev,
- libnl-route-3-dev,
+ libnl-3-dev (>= 3.2.7),
+ libnl-route-3-dev (>= 3.2.7),
+ libnl-genl-3-dev (>= 3.2.7),
  ppp-dev (>= 2.4.5),
  libpolkit-gobject-1-dev,
  libnss3-dev,
  uuid-dev,
- libudev-dev (>= 147),
- libgudev-1.0-dev,
- libnotify-dev (>= 0.3),
- isc-dhcp-client (>= 4.1.1-P1-4),
+ libudev-dev (>= 165),
+ libgudev-1.0-dev (>= 165),
+ libgirepository1.0-dev (>= 0.10.7-1~),
+ gobject-introspection (>= 0.9.12-4~),
  gtk-doc-tools,
+ isc-dhcp-client (>= 4.1.1-P1-4),
  dbus-test-runner,
  dbus,
- libgirepository1.0-dev (>= 0.9.12),
- gobject-introspection (>= 0.9.12-4~),
  valac-0.18 (>= 0.17.1.24),
  python-gobject-2,
  python-dbus,
  gir1.2-glib-2.0,
  gir1.2-freedesktop
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Bzr: https://code.launchpad.net/~network-manager/network-manager/ubuntu
 Homepage: http://www.gnome.org/projects/NetworkManager/
 XS-Testsuite: autopkgtest
 
 Package: network-manager
-Architecture: any
+Architecture: linux-any
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
  ${shlibs:Depends},
@@ -61,14 +60,17 @@
  network-manager-gnome | network-manager-kde | plasma-widget-networkmanagement,
  ppp (>= 2.4.5),
  iptables,
- modemmanager
+ modemmanager,
+ crda
 Suggests: avahi-autoipd, python
 Breaks:
- network-manager-gnome (<< 0.8.99),
- network-manager-kde (<< 1:0.9~~),
- network-manager-openvpn (<< 0.8.99),
- network-manager-vpnc (<< 0.8.99),
- network-manager-pptp (<< 0.8.99),
+ network-manager-gnome (<< 0.9),
+ network-manager-openvpn (<< 0.9),
+ network-manager-vpnc (<< 0.9),
+ network-manager-pptp (<< 0.9),
+ network-manager-openconnect (<< 0.9),
+ network-manager-kde (<< 1:0.9),
+ plasma-widget-networkmanagement (<< 0.9~),
  ppp (<< 2.4.5)
 Conflicts: connman
 Description: network management framework (daemon and userspace tools)
@@ -87,7 +89,7 @@
     address configuration.
 
 Package: network-manager-dev
-Architecture: any
+Architecture: linux-any
 Section: devel
 Depends: ${misc:Depends}
 Description: network management framework (development files)
@@ -103,7 +105,7 @@
 
 Package: libnm-glib4
 Section: libs
-Architecture: any
+Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
@@ -119,13 +121,13 @@
 
 Package: libnm-glib-dev
 Section: libdevel
-Architecture: any
+Architecture: linux-any
 Depends:
  libnm-glib4 (= ${binary:Version}),
  gir1.2-networkmanager-1.0 (= ${binary:Version}),
  ${misc:Depends},
  libnm-util-dev,
- network-manager-dev (>= 0.9.6.0),
+ network-manager-dev,
  libglib2.0-dev,
  libdbus-glib-1-dev
 Description: network management framework (GLib interface)
@@ -140,12 +142,10 @@
 
 Package: libnm-glib-vpn1
 Section: libs
-Architecture: any
+Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
-Breaks: libnm-glib2
-Replaces: libnm-glib2
 Description: network management framework (GLib VPN shared library)
  NetworkManager is a system network service that manages your network devices
  and connections, attempting to keep active network connectivity when
@@ -158,7 +158,7 @@
 
 Package: libnm-glib-vpn-dev
 Section: libdevel
-Architecture: any
+Architecture: linux-any
 Depends:
  libnm-glib-vpn1 (= ${binary:Version}),
  ${misc:Depends},
@@ -175,7 +175,7 @@
 
 Package: libnm-util2
 Section: libs
-Architecture: any
+Architecture: linux-any
 Depends:
  ${shlibs:Depends},
  ${misc:Depends}
@@ -191,7 +191,7 @@
 
 Package: libnm-util-dev
 Section: libdevel
-Architecture: any
+Architecture: linux-any
 Depends:
  libnm-util2 (= ${binary:Version}),
  gir1.2-networkmanager-1.0 (= ${binary:Version}),
@@ -208,7 +208,7 @@
  This package contains header and development files.
 
 Package: network-manager-dbg
-Architecture: any
+Architecture: linux-any
 Section: debug
 Priority: extra
 Depends:
@@ -224,8 +224,8 @@
  This package contains detached debugging symbols.
 
 Package: gir1.2-networkmanager-1.0
-Section: libs
-Architecture: any
+Section: introspection
+Architecture: linux-any
 Depends: ${gir:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: GObject introspection data for NetworkManager
  NetworkManager is a system network service that manages your network devices

=== modified file 'debian/gir1.2-networkmanager-1.0.install'
--- debian/gir1.2-networkmanager-1.0.install	2011-05-25 18:59:17 +0000
+++ debian/gir1.2-networkmanager-1.0.install	2013-03-26 02:35:23 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/girepository-1.0/
+debian/tmp/usr/lib/*/girepository-1.0/ usr/lib/

=== modified file 'debian/libnm-glib-dev.install'
--- debian/libnm-glib-dev.install	2012-08-07 15:22:28 +0000
+++ debian/libnm-glib-dev.install	2013-03-26 02:35:23 +0000
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/pkgconfig/libnm-glib.pc
-debian/tmp/usr/lib/libnm-glib.so
+debian/tmp/usr/lib/*/pkgconfig/libnm-glib.pc
+debian/tmp/usr/lib/*/libnm-glib.so
 debian/tmp/usr/include/libnm-glib/libnm_glib.h
 debian/tmp/usr/include/libnm-glib/nm-object.h
 debian/tmp/usr/include/libnm-glib/nm-client.h
@@ -16,4 +16,4 @@
 debian/tmp/usr/include/libnm-glib/nm-glib-enum-types.h
 debian/tmp/usr/share/gtk-doc/html/libnm-glib/
 debian/tmp/usr/share/gir-1.0/NMClient-1.0.gir
-debian/tmp/usr/share/vala-0.18/vapi/libnm-glib.*
+debian/tmp/usr/share/vala/vapi/libnm-glib.*

=== modified file 'debian/libnm-glib-vpn-dev.install'
--- debian/libnm-glib-vpn-dev.install	2012-02-17 23:39:02 +0000
+++ debian/libnm-glib-vpn-dev.install	2013-03-26 02:35:23 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/pkgconfig/libnm-glib-vpn.pc
-debian/tmp/usr/lib/libnm-glib-vpn.so
+debian/tmp/usr/lib/*/pkgconfig/libnm-glib-vpn.pc
+debian/tmp/usr/lib/*/libnm-glib-vpn.so
 debian/tmp/usr/include/libnm-glib/nm-vpn-plugin*
 debian/tmp/usr/include/libnm-glib/nm-vpn-enum-types.h

=== modified file 'debian/libnm-glib-vpn1.install'
--- debian/libnm-glib-vpn1.install	2011-03-30 14:56:25 +0000
+++ debian/libnm-glib-vpn1.install	2013-03-26 02:35:23 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libnm-glib-vpn.so.*
+debian/tmp/usr/lib/*/libnm-glib-vpn.so.*

=== modified file 'debian/libnm-glib4.install'
--- debian/libnm-glib4.install	2011-05-25 18:59:17 +0000
+++ debian/libnm-glib4.install	2013-03-26 02:35:23 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libnm-glib.so.*
+debian/tmp/usr/lib/*/libnm-glib.so.*

=== modified file 'debian/libnm-glib4.symbols'
--- debian/libnm-glib4.symbols	2012-06-08 15:40:55 +0000
+++ debian/libnm-glib4.symbols	2013-03-26 02:35:23 +0000
@@ -35,6 +35,7 @@
  nm_client_get_device_by_iface@Base 0.8.9997+git.20110721t045648.36db194
  nm_client_get_device_by_path@Base 0.7.999
  nm_client_get_devices@Base 0.7.999
+ nm_client_get_logging@Base 0.9.7.995+git201301311547.17123fc
  nm_client_get_manager_running@Base 0.7.999
  nm_client_get_permission_result@Base 0.8.2
  nm_client_get_state@Base 0.7.999
@@ -47,6 +48,7 @@
  nm_client_new_finish@Base 0.9.2.0+git201202060518.95b0b72
  nm_client_permission_get_type@Base 0.9.2.0+git201202161854.8572ecf
  nm_client_permission_result_get_type@Base 0.9.2.0+git201202161854.8572ecf
+ nm_client_set_logging@Base 0.9.7.995+git201301311547.17123fc
  nm_client_sleep@Base 0.7.999
  nm_client_wimax_get_enabled@Base 0.8.998
  nm_client_wimax_hardware_get_enabled@Base 0.8.998
@@ -66,8 +68,16 @@
  nm_device_bond_error_quark@Base 0.9.4.0~git201203162258.69247a0
  nm_device_bond_get_carrier@Base 0.9.3.995+git201203081848.bba834f
  nm_device_bond_get_hw_address@Base 0.9.3.995+git201203081848.bba834f
+ nm_device_bond_get_slaves@Base 0.9.6.0+git201211131441.e9e2c56
  nm_device_bond_get_type@Base 0.9.3.995+git201203081848.bba834f
  nm_device_bond_new@Base 0.9.3.995+git201203081848.bba834f
+ nm_device_bridge_error_get_type@Base 0.9.6.0+git201212071413.8a9759a
+ nm_device_bridge_error_quark@Base 0.9.6.0+git201212071413.8a9759a
+ nm_device_bridge_get_carrier@Base 0.9.6.0+git201212071413.8a9759a
+ nm_device_bridge_get_hw_address@Base 0.9.6.0+git201212071413.8a9759a
+ nm_device_bridge_get_slaves@Base 0.9.6.0+git201212071413.8a9759a
+ nm_device_bridge_get_type@Base 0.9.6.0+git201212071413.8a9759a
+ nm_device_bridge_new@Base 0.9.6.0+git201212071413.8a9759a
  nm_device_bt_error_get_type@Base 0.9.4.0~git201203162258.69247a0
  nm_device_bt_error_quark@Base 0.9.4.0~git201203162258.69247a0
  nm_device_bt_get_capabilities@Base 0.7.999
@@ -89,6 +99,7 @@
  nm_device_filter_connections@Base 0.8.998
  nm_device_get_active_connection@Base 0.8.9997
  nm_device_get_autoconnect@Base 0.9.4.0+git201206041025.716a09d
+ nm_device_get_available_connections@Base 0.9.8.0
  nm_device_get_capabilities@Base 0.7.999
  nm_device_get_device_type@Base 0.8.998
  nm_device_get_dhcp4_config@Base 0.7.999
@@ -147,6 +158,7 @@
  nm_device_wifi_get_permanent_hw_address@Base 0.8.2
  nm_device_wifi_get_type@Base 0.7.999
  nm_device_wifi_new@Base 0.7.999
+ nm_device_wifi_request_scan_simple@Base 0.9.7.995+git201301311547.17123fc
  nm_device_wimax_error_get_type@Base 0.9.4.0~git201203162258.69247a0
  nm_device_wimax_error_quark@Base 0.9.4.0~git201203162258.69247a0
  nm_device_wimax_get_active_nsp@Base 0.8.998

=== modified file 'debian/libnm-util-dev.install'
--- debian/libnm-util-dev.install	2012-08-07 15:22:28 +0000
+++ debian/libnm-util-dev.install	2013-03-26 02:35:23 +0000
@@ -1,5 +1,5 @@
-debian/tmp/usr/lib/pkgconfig/libnm-util.pc
-debian/tmp/usr/lib/libnm-util.so
+debian/tmp/usr/lib/*/pkgconfig/libnm-util.pc
+debian/tmp/usr/lib/*/libnm-util.so
 debian/tmp/usr/include/NetworkManager/nm-connection.h
 debian/tmp/usr/include/NetworkManager/nm-utils.h
 debian/tmp/usr/include/NetworkManager/nm-utils-enum-types.h
@@ -7,4 +7,4 @@
 debian/tmp/usr/include/NetworkManager/nm-setting-*.h
 debian/tmp/usr/share/gtk-doc/html/libnm-util/
 debian/tmp/usr/share/gir-1.0/NetworkManager-1.0.gir
-debian/tmp/usr/share/vala-0.18/vapi/libnm-util.*
+debian/tmp/usr/share/vala/vapi/libnm-util.*

=== modified file 'debian/libnm-util2.install'
--- debian/libnm-util2.install	2011-05-25 18:59:17 +0000
+++ debian/libnm-util2.install	2013-03-26 02:35:23 +0000
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libnm-util.so.*
+debian/tmp/usr/lib/*/libnm-util.so.*

=== modified file 'debian/libnm-util2.symbols'
--- debian/libnm-util2.symbols	2012-07-16 18:40:57 +0000
+++ debian/libnm-util2.symbols	2013-03-26 02:35:23 +0000
@@ -17,6 +17,8 @@
  nm_connection_get_setting_adsl@Base 0.9.4.0+git201206041025.716a09d
  nm_connection_get_setting_bluetooth@Base 0.8.998
  nm_connection_get_setting_bond@Base 0.9.1.90+git.20111124t161539.576acdd
+ nm_connection_get_setting_bridge@Base 0.9.6.0+git201212071413.8a9759a
+ nm_connection_get_setting_bridge_port@Base 0.9.6.0+git201212071413.8a9759a
  nm_connection_get_setting_by_name@Base 0.7.0
  nm_connection_get_setting_cdma@Base 0.8.998
  nm_connection_get_setting_connection@Base 0.8.998
@@ -200,6 +202,24 @@
  nm_setting_bond_get_valid_options@Base 0.9.3.995+git201203081848.bba834f
  nm_setting_bond_new@Base 0.9.1.90+git.20111124t161539.576acdd
  nm_setting_bond_remove_option@Base 0.9.2.0+git201202161854.8572ecf
+ nm_setting_bridge_error_get_type@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_error_quark@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_get_ageing_time@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_get_forward_delay@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_get_hello_time@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_get_interface_name@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_get_max_age@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_get_priority@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_get_stp@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_get_type@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_new@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_port_error_get_type@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_port_error_quark@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_port_get_hairpin_mode@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_port_get_path_cost@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_port_get_priority@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_port_get_type@Base 0.9.6.0+git201212071413.8a9759a
+ nm_setting_bridge_port_new@Base 0.9.6.0+git201212071413.8a9759a
  nm_setting_cdma_error_get_type@Base 0.7.0
  nm_setting_cdma_error_quark@Base 0.7.0
  nm_setting_cdma_get_number@Base 0.7.0
@@ -213,6 +233,7 @@
  nm_setting_compare@Base 0.7.0
  nm_setting_compare_flags_get_type@Base 0.9.2.0+git201202161854.8572ecf
  nm_setting_connection_add_permission@Base 0.8.998
+ nm_setting_connection_add_secondary@Base 0.9.6.0+git201210141544.dd42da5
  nm_setting_connection_error_get_type@Base 0.7.0
  nm_setting_connection_error_quark@Base 0.7.0
  nm_setting_connection_get_autoconnect@Base 0.7.0
@@ -220,8 +241,10 @@
  nm_setting_connection_get_id@Base 0.7.0
  nm_setting_connection_get_master@Base 0.9.1.90+git.20111124t161539.576acdd
  nm_setting_connection_get_num_permissions@Base 0.8.998
+ nm_setting_connection_get_num_secondaries@Base 0.9.6.0+git201210141544.dd42da5
  nm_setting_connection_get_permission@Base 0.8.998
  nm_setting_connection_get_read_only@Base 0.7.0
+ nm_setting_connection_get_secondary@Base 0.9.6.0+git201210141544.dd42da5
  nm_setting_connection_get_slave_type@Base 0.9.1.90+git.20111124t161539.576acdd
  nm_setting_connection_get_timestamp@Base 0.7.0
  nm_setting_connection_get_type@Base 0.7.0
@@ -231,6 +254,7 @@
  nm_setting_connection_new@Base 0.7.0
  nm_setting_connection_permissions_user_allowed@Base 0.8.998
  nm_setting_connection_remove_permission@Base 0.8.998
+ nm_setting_connection_remove_secondary@Base 0.9.6.0+git201210141544.dd42da5
  nm_setting_diff@Base 0.8.3.998
  nm_setting_diff_result_get_type@Base 0.9.2.0+git201202161854.8572ecf
  nm_setting_duplicate@Base 0.7.0
@@ -309,6 +333,7 @@
  nm_setting_ip6_config_error_get_type@Base 0.7.999
  nm_setting_ip6_config_error_quark@Base 0.7.999
  nm_setting_ip6_config_get_address@Base 0.7.999
+ nm_setting_ip6_config_get_dhcp_hostname@Base 0.9.6.0+git201212071413.8a9759a
  nm_setting_ip6_config_get_dns@Base 0.7.999
  nm_setting_ip6_config_get_dns_search@Base 0.7.999
  nm_setting_ip6_config_get_ignore_auto_dns@Base 0.7.999
@@ -490,6 +515,7 @@
  nm_setting_wireless_security_remove_pairwise@Base 0.7.0
  nm_setting_wireless_security_remove_proto@Base 0.7.0
  nm_setting_wireless_security_set_wep_key@Base 0.7.0
+ nm_utils_ap_mode_security_valid@Base 0.9.6.0+git201211131441.e9e2c56
  nm_utils_deinit@Base 0.7.0
  nm_utils_escape_ssid@Base 0.7.0
  nm_utils_file_is_pkcs12@Base 0.9.6.0~git201207161259.00297f4
@@ -499,6 +525,7 @@
  nm_utils_hwaddr_len@Base 0.9.1.90+git.20111124t161539.576acdd
  nm_utils_hwaddr_ntoa@Base 0.9.1.90+git.20111124t161539.576acdd
  nm_utils_hwaddr_type@Base 0.9.1.90+git.20111206t233146.dff0d2a
+ nm_utils_iface_valid_name@Base 0.9.6.0+git201210141544.dd42da5
  nm_utils_init@Base 0.7.0
  nm_utils_ip4_addresses_from_gvalue@Base 0.7.0
  nm_utils_ip4_addresses_to_gvalue@Base 0.7.0
@@ -514,6 +541,7 @@
  nm_utils_ip6_routes_from_gvalue@Base 0.7.999
  nm_utils_ip6_routes_to_gvalue@Base 0.7.999
  nm_utils_is_empty_ssid@Base 0.7.0
+ nm_utils_is_uuid@Base 0.9.6.0+git201210141544.dd42da5
  nm_utils_rsa_key_encrypt@Base 0.7.999
  nm_utils_same_ssid@Base 0.7.0
  nm_utils_security_type_get_type@Base 0.9.2.0+git201202161854.8572ecf
@@ -522,10 +550,12 @@
  nm_utils_ssid_to_utf8@Base 0.7.0
  nm_utils_uuid_generate@Base 0.7.0
  nm_utils_uuid_generate_from_string@Base 0.7.0
+ nm_utils_wep_key_valid@Base 0.9.8.0
  nm_utils_wifi_channel_to_freq@Base 0.8.2
  nm_utils_wifi_find_next_channel@Base 0.8.2
  nm_utils_wifi_freq_to_channel@Base 0.8.2
  nm_utils_wifi_is_channel_valid@Base 0.8.2
+ nm_utils_wpa_psk_valid@Base 0.9.8.0
  nm_vlan_flags_get_type@Base 0.9.3.995+git201203081848.bba834f
  nm_vlan_priority_map_get_type@Base 0.9.3.995+git201203081848.bba834f
  nm_wep_key_type_get_type@Base 0.9.2.0+git201202161854.8572ecf

=== modified file 'debian/network-manager-dev.install'
--- debian/network-manager-dev.install	2011-05-25 18:59:17 +0000
+++ debian/network-manager-dev.install	2013-03-26 02:35:23 +0000
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/pkgconfig/NetworkManager.pc
+debian/tmp/usr/lib/*/pkgconfig/NetworkManager.pc
 debian/tmp/usr/include/NetworkManager/NetworkManager.h
 debian/tmp/usr/include/NetworkManager/NetworkManagerVPN.h
 debian/tmp/usr/include/NetworkManager/nm-version.h

=== modified file 'debian/network-manager-dispatcher.script'
--- debian/network-manager-dispatcher.script	2011-05-30 13:40:45 +0000
+++ debian/network-manager-dispatcher.script	2013-03-26 02:35:23 +0000
@@ -28,10 +28,6 @@
 	export PHASE="post-down"
 	exec run-parts /etc/network/if-post-down.d
 	;;
-    hostname)
-	# do nothing here, the 'hostname' action is not handled by ifupdown scripts.
-	exit 0
-	;;
 # pre-up/pre-down not implemented. See
 # https://bugzilla.gnome.org/show_bug.cgi?id=387832
 #    pre-up)

=== modified file 'debian/network-manager.NEWS'
--- debian/network-manager.NEWS	2011-05-04 15:34:45 +0000
+++ debian/network-manager.NEWS	2013-03-26 02:35:23 +0000
@@ -1,4 +1,4 @@
-network-manager (0.6.2-3) unstable; urgency=low
+network-manager (0.6.2-2) unstable; urgency=low
 
   * NetworkManager now reads the network interface configuration specified in
     /etc/network/interfaces. Devices that are listed there and match certain

=== modified file 'debian/network-manager.dirs'
--- debian/network-manager.dirs	2012-07-31 13:41:17 +0000
+++ debian/network-manager.dirs	2013-03-26 02:35:23 +0000
@@ -1,3 +1,4 @@
 var/lib/NetworkManager/
 etc/NetworkManager/system-connections/
+etc/NetworkManager/VPN/
 etc/NetworkManager/dnsmasq.d/

=== modified file 'debian/network-manager.install'
--- debian/network-manager.install	2012-03-27 00:29:28 +0000
+++ debian/network-manager.install	2013-03-26 02:35:23 +0000
@@ -2,17 +2,16 @@
 debian/tmp/usr/bin/nm-tool
 debian/tmp/usr/bin/nm-online
 debian/tmp/usr/bin/nmcli
-debian/tmp/usr/lib/NetworkManager/nm-crash-logger
 debian/tmp/usr/lib/NetworkManager/nm-dhcp-client.action
 debian/tmp/usr/lib/NetworkManager/nm-dispatcher.action
 debian/tmp/usr/lib/NetworkManager/nm-avahi-autoipd.action
-debian/tmp/usr/lib/NetworkManager/libnm-settings-plugin-ifupdown.so
-debian/debug-helper.py usr/lib/NetworkManager/
-debian/tmp/usr/lib/pppd/*/*.so
+debian/tmp/usr/lib/*/NetworkManager/libnm-settings-plugin-ifupdown.so
+debian/tmp/usr/lib/*/pppd/*/*.so
 debian/tmp/usr/share/locale/
 debian/tmp/usr/share/man/
 debian/tmp/usr/share/dbus-1/system-services/
 debian/tmp/usr/share/polkit-1/
+debian/tmp/usr/share/bash-completion/
 debian/tmp/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
 debian/tmp/etc/dbus-1/system.d/nm-dhcp-client.conf
 debian/tmp/etc/dbus-1/system.d/nm-dispatcher.conf
@@ -21,3 +20,4 @@
 debian/tmp/lib/udev/rules.d/*.rules
 debian/source_network-manager.py /usr/share/apport/package-hooks/
 debian/NetworkManager.conf etc/NetworkManager/
+debian/debug-helper.py usr/lib/NetworkManager/

=== removed file 'debian/patches/50_gettext_macros.patch'
--- debian/patches/50_gettext_macros.patch	2011-05-25 14:44:27 +0000
+++ debian/patches/50_gettext_macros.patch	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-Index: network-manager-0.9~git.20110520t163524.987a132/configure.ac
-===================================================================
---- network-manager-0.9~git.20110520t163524.987a132.orig/configure.ac	2011-05-25 10:40:42.220334592 -0400
-+++ network-manager-0.9~git.20110520t163524.987a132/configure.ac	2011-05-25 10:40:49.300334590 -0400
-@@ -80,9 +80,6 @@
- dnl
- IT_PROG_INTLTOOL([0.40.0])
- 
--AM_GNU_GETTEXT([external])
--AM_GNU_GETTEXT_VERSION([0.17])
--
- GETTEXT_PACKAGE=NetworkManager
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])

=== removed file 'debian/patches/70_lp145653_no_sigaction_for_crashes.patch'
--- debian/patches/70_lp145653_no_sigaction_for_crashes.patch	2012-05-07 18:20:33 +0000
+++ debian/patches/70_lp145653_no_sigaction_for_crashes.patch	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-From: Alexander Sack <[e-mail]>
-Subject: Do not call sigaction on crashes, we want apport to provide reports.
-Last-Update: 2011-03-03
-
- Mathieu Trudel-Lapierre <[e-mail]>:
- - Updated to add quilt .pc file to POTFILES.skip due to enabling tests in build.
-
----
- po/POTFILES.skip |    1 +
- src/main.c       |    5 -----
- 2 files changed, 1 insertion(+), 5 deletions(-)
-
-Index: b/src/main.c
-===================================================================
---- a/src/main.c
-+++ b/src/main.c
-@@ -141,11 +141,6 @@ setup_signals (void)
- 	sigaddset (&signal_set, SIGHUP);
- 	sigaddset (&signal_set, SIGINT);
- 	sigaddset (&signal_set, SIGQUIT);
--	sigaddset (&signal_set, SIGILL);
--	sigaddset (&signal_set, SIGABRT);
--	sigaddset (&signal_set, SIGFPE);
--	sigaddset (&signal_set, SIGBUS);
--	sigaddset (&signal_set, SIGSEGV);
- 	sigaddset (&signal_set, SIGPIPE);
- 	sigaddset (&signal_set, SIGTERM);
- 	sigaddset (&signal_set, SIGUSR1);
-Index: b/po/POTFILES.skip
-===================================================================
---- a/po/POTFILES.skip
-+++ b/po/POTFILES.skip
-@@ -3,3 +3,4 @@ examples/python/systray/eggtrayicon.c
- vpn-daemons/openvpn
- vpn-daemons/pptp
- vpn-daemons/vpnc
-+.pc/70_lp145653_no_sigaction_for_crashes.patch/src/main.c

=== modified file 'debian/patches/add-veth-support.diff'
--- debian/patches/add-veth-support.diff	2012-07-16 18:14:42 +0000
+++ debian/patches/add-veth-support.diff	2013-03-26 02:35:23 +0000
@@ -1,57 +1,66 @@
 From: Stéphane Graber <[e-mail]>
 Subject: Add support for veth virtual ethernet devices.
 
-Index: network-manager-0.9.4.0+git201206081144.2efeac8/src/nm-udev-manager.c
-===================================================================
---- network-manager-0.9.4.0+git201206081144.2efeac8.orig/src/nm-udev-manager.c	2012-07-16 10:30:54.003182512 -0400
-+++ network-manager-0.9.4.0+git201206081144.2efeac8/src/nm-udev-manager.c	2012-07-16 11:41:55.696204385 -0400
-@@ -392,6 +392,11 @@
- 		case NM_IFACE_TYPE_VLAN:
- 			driver = "8021q";
- 			break;
-+		case NM_IFACE_TYPE_VETH:
-+			// In a veth pair, the host side is called veth*. Don't try to manage these.
-+			if (!g_str_has_prefix (ifname, "veth"))
-+				driver = "veth";
-+			break;
- 		default:
- 			if (g_str_has_prefix (ifname, "easytether"))
- 				driver = "easytether";
-Index: network-manager-0.9.4.0+git201206081144.2efeac8/src/nm-system.c
-===================================================================
---- network-manager-0.9.4.0+git201206081144.2efeac8.orig/src/nm-system.c	2012-07-16 10:30:54.019182597 -0400
-+++ network-manager-0.9.4.0+git201206081144.2efeac8/src/nm-system.c	2012-07-16 10:30:45.163138675 -0400
-@@ -1769,6 +1769,8 @@
- 		res = NM_IFACE_TYPE_VLAN;
- 	else if (!g_strcmp0 (type, "dummy"))
- 		res = NM_IFACE_TYPE_DUMMY;
-+	else if (!g_strcmp0 (type, "veth"))
-+		res = NM_IFACE_TYPE_VETH;
- 
- 	rtnl_link_put (result);
- out:
-Index: network-manager-0.9.4.0+git201206081144.2efeac8/src/nm-system.h
-===================================================================
---- network-manager-0.9.4.0+git201206081144.2efeac8.orig/src/nm-system.h	2012-07-16 10:30:54.023182612 -0400
-+++ network-manager-0.9.4.0+git201206081144.2efeac8/src/nm-system.h	2012-07-16 10:30:49.551160436 -0400
-@@ -116,6 +116,7 @@
- 		NM_IFACE_TYPE_BOND,
- 		NM_IFACE_TYPE_VLAN,
- 		NM_IFACE_TYPE_DUMMY,
-+		NM_IFACE_TYPE_VETH,
- };
- 
- int             nm_system_get_iface_type      (int ifindex, const char *name);
-Index: network-manager-0.9.4.0+git201206081144.2efeac8/src/nm-device-ethernet.c
-===================================================================
---- network-manager-0.9.4.0+git201206081144.2efeac8.orig/src/nm-device-ethernet.c	2012-07-16 10:30:54.047182731 -0400
-+++ network-manager-0.9.4.0+git201206081144.2efeac8/src/nm-device-ethernet.c	2012-07-16 10:30:53.227178661 -0400
-@@ -252,7 +252,7 @@
- 		// FIXME: Convert this into a no-export property so type can be specified
- 		//        when the device is created.
- 		itype = nm_system_get_iface_type (nm_device_get_ifindex (self), nm_device_get_iface (self));
--		g_assert (itype == NM_IFACE_TYPE_UNSPEC);
-+		g_assert (itype == NM_IFACE_TYPE_UNSPEC || itype == NM_IFACE_TYPE_VETH);
- 
- 		nm_log_dbg (LOGD_HW | LOGD_ETHER, "(%s): kernel ifindex %d",
- 			        nm_device_get_iface (NM_DEVICE (self)),
+---
+ src/nm-device-ethernet.c |    2 +-
+ src/nm-system.c          |    2 ++
+ src/nm-system.h          |    3 ++-
+ src/nm-udev-manager.c    |    5 +++++
+ 4 files changed, 10 insertions(+), 2 deletions(-)
+
+Index: b/src/nm-udev-manager.c
+===================================================================
+--- a/src/nm-udev-manager.c
++++ b/src/nm-udev-manager.c
+@@ -407,6 +407,11 @@ dev_get_attrs (GUdevDevice *udev_device,
+ 		case NM_IFACE_TYPE_VLAN:
+ 			driver = "8021q";
+ 			break;
++		case NM_IFACE_TYPE_VETH:
++			// In a veth pair, the host side is called veth*. Don't try to manage these.
++			if (!g_str_has_prefix (ifname, "veth"))
++				driver = "veth";
++			break;
+ 		default:
+ 			if (g_str_has_prefix (ifname, "easytether"))
+ 				driver = "easytether";
+Index: b/src/nm-system.c
+===================================================================
+--- a/src/nm-system.c
++++ b/src/nm-system.c
+@@ -1882,6 +1882,8 @@ nm_system_get_iface_type (int ifindex, c
+ 		res = NM_IFACE_TYPE_BRIDGE;
+ 	else if (!g_strcmp0 (type, "dummy"))
+ 		res = NM_IFACE_TYPE_DUMMY;
++	else if (!g_strcmp0 (type, "veth"))
++		res = NM_IFACE_TYPE_VETH;
+ 
+ 	rtnl_link_put (result);
+ out:
+Index: b/src/nm-system.h
+===================================================================
+--- a/src/nm-system.h
++++ b/src/nm-system.h
+@@ -114,7 +114,8 @@ enum {
+ 		NM_IFACE_TYPE_BOND,
+ 		NM_IFACE_TYPE_VLAN,
+ 		NM_IFACE_TYPE_BRIDGE,
+-		NM_IFACE_TYPE_DUMMY
++		NM_IFACE_TYPE_DUMMY,
++		NM_IFACE_TYPE_VETH
+ };
+ 
+ int             nm_system_get_iface_type      (int ifindex, const char *name);
+Index: b/src/nm-device-ethernet.c
+===================================================================
+--- a/src/nm-device-ethernet.c
++++ b/src/nm-device-ethernet.c
+@@ -252,7 +252,7 @@ constructor (GType type,
+ 		// FIXME: Convert this into a no-export property so type can be specified
+ 		//        when the device is created.
+ 		itype = nm_system_get_iface_type (nm_device_get_ifindex (self), nm_device_get_iface (self));
+-		g_assert (itype == NM_IFACE_TYPE_UNSPEC);
++		g_assert (itype == NM_IFACE_TYPE_UNSPEC || itype == NM_IFACE_TYPE_VETH);
+ 
+ 		nm_log_dbg (LOGD_HW | LOGD_ETHER, "(%s): kernel ifindex %d",
+ 			        nm_device_get_iface (NM_DEVICE (self)),

=== modified file 'debian/patches/add_sendsigs_omissions.patch'
--- debian/patches/add_sendsigs_omissions.patch	2012-07-27 19:06:32 +0000
+++ debian/patches/add_sendsigs_omissions.patch	2013-03-26 02:35:23 +0000
@@ -9,60 +9,35 @@
 
 ---
  src/dhcp-manager/nm-dhcp-dhclient.c |    2 +-
- src/dhcp-manager/nm-dhcp-dhcpcd.c   |    2 +-
- src/dns-manager/nm-dns-bind.c       |    2 +-
- src/dns-manager/nm-dns-dnsmasq.c    |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ src/dns-manager/nm-dns-dnsmasq.c    |    4 ++++
+ 2 files changed, 5 insertions(+), 1 deletion(-)
 
 Index: b/src/dhcp-manager/nm-dhcp-dhclient.c
 ===================================================================
 --- a/src/dhcp-manager/nm-dhcp-dhclient.c
 +++ b/src/dhcp-manager/nm-dhcp-dhclient.c
-@@ -554,7 +554,7 @@ dhclient_start (NMDHCPClient *client,
+@@ -553,7 +553,7 @@ dhclient_start (NMDHCPClient *client,
  		return -1;
  	}
  
 -	pid_file = g_strdup_printf (LOCALSTATEDIR "/run/dhclient%s-%s.pid",
-+	pid_file = g_strdup_printf (LOCALSTATEDIR "/run/sendsigs.omit.d/network-manager.dhclient%s-%s.pid",
++	pid_file = g_strdup_printf ("/run/sendsigs.omit.d/network-manager.dhclient%s-%s.pid",
  		                        ipv6 ? "6" : "",
  		                        iface);
  	if (!pid_file) {
-Index: b/src/dns-manager/nm-dns-bind.c
-===================================================================
---- a/src/dns-manager/nm-dns-bind.c
-+++ b/src/dns-manager/nm-dns-bind.c
-@@ -38,7 +38,7 @@ G_DEFINE_TYPE (NMDnsBind, nm_dns_bind, N
- 
- #define NM_DNS_BIND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_BIND, NMDnsBindPrivate))
- 
--#define PIDFILE LOCALSTATEDIR "/run/nm-dns-named.pid"
-+#define PIDFILE LOCALSTATEDIR "/run/sendsigs.omit.d/network-manager.named.pid"
- #define CONFFILE LOCALSTATEDIR "/run/nm-dns-named.conf"
- 
- typedef struct {
 Index: b/src/dns-manager/nm-dns-dnsmasq.c
 ===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -39,7 +39,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
+@@ -39,7 +39,11 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
  
  #define NM_DNS_DNSMASQ_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_DNS_DNSMASQ, NMDnsDnsmasqPrivate))
  
--#define PIDFILE LOCALSTATEDIR "/run/nm-dns-dnsmasq.pid"
-+#define PIDFILE LOCALSTATEDIR "/run/sendsigs.omit.d/network-manager.dnsmasq.pid"
- #define CONFFILE LOCALSTATEDIR "/run/nm-dns-dnsmasq.conf"
- #define CONFDIR SYSCONFDIR "/NetworkManager/dnsmasq.d"
- 
-Index: b/src/dhcp-manager/nm-dhcp-dhcpcd.c
-===================================================================
---- a/src/dhcp-manager/nm-dhcp-dhcpcd.c
-+++ b/src/dhcp-manager/nm-dhcp-dhcpcd.c
-@@ -110,7 +110,7 @@ real_ip4_start (NMDHCPClient *client,
- 	iface = nm_dhcp_client_get_iface (client);
- 	uuid = nm_dhcp_client_get_uuid (client);
- 
--	priv->pid_file = g_strdup_printf (LOCALSTATEDIR "/run/dhcpcd-%s.pid", iface);
-+	priv->pid_file = g_strdup_printf (LOCALSTATEDIR "/run/network-manager.dhcpcd-%s.pid", iface);
- 	if (!priv->pid_file) {
- 		nm_log_warn (LOGD_DHCP4, "(%s): not enough memory for dhcpcd options.", iface);
- 		return -1;
++#if defined(TARGET_DEBIAN)
++#define PIDFILE "/run/sendsigs.omit.d/network-manager.dnsmasq.pid"
++#else
+ #define PIDFILE NMRUNDIR "/dnsmasq.pid"
++#endif
+ #define CONFFILE NMRUNDIR "/dnsmasq.conf"
+ #define CONFDIR NMCONFDIR "/dnsmasq.d"
+ 

=== modified file 'debian/patches/adhoc_use_wpa_rsn_part1.patch'
--- debian/patches/adhoc_use_wpa_rsn_part1.patch	2012-09-07 19:27:20 +0000
+++ debian/patches/adhoc_use_wpa_rsn_part1.patch	2013-03-26 02:35:23 +0000
@@ -14,7 +14,7 @@
 ===================================================================
 --- a/libnm-util/nm-utils.c
 +++ b/libnm-util/nm-utils.c
-@@ -1285,8 +1285,6 @@ nm_utils_security_valid (NMUtilsSecurity
+@@ -1325,8 +1325,6 @@ nm_utils_security_valid (NMUtilsSecurity
  		}
  		break;
  	case NMU_SEC_WPA_PSK:
@@ -23,7 +23,7 @@
  		if (!(wifi_caps & NM_WIFI_DEVICE_CAP_WPA))
  			return FALSE;
  		if (have_ap) {
-@@ -1313,8 +1311,6 @@ nm_utils_security_valid (NMUtilsSecurity
+@@ -1353,8 +1351,6 @@ nm_utils_security_valid (NMUtilsSecurity
  		}
  		break;
  	case NMU_SEC_WPA2_PSK:
@@ -36,7 +36,7 @@
 ===================================================================
 --- a/src/nm-device-wifi.c
 +++ b/src/nm-device-wifi.c
-@@ -967,36 +967,6 @@ real_deactivate (NMDevice *dev)
+@@ -976,36 +976,6 @@ deactivate (NMDevice *dev)
  }
  
  static gboolean
@@ -70,10 +70,10 @@
 -}
 -
 -static gboolean
- real_check_connection_compatible (NMDevice *device,
-                                   NMConnection *connection,
-                                   GError **error)
-@@ -1054,14 +1024,6 @@ real_check_connection_compatible (NMDevi
+ check_connection_compatible (NMDevice *device,
+                              NMConnection *connection,
+                              GError **error)
+@@ -1064,14 +1034,6 @@ check_connection_compatible (NMDevice *d
  		}
  	}
  
@@ -85,10 +85,10 @@
 -		return FALSE;
 -	}
 -
- 	// FIXME: check channel/freq/band against bands the hardware supports
- 	// FIXME: check encryption against device capabilities
- 	// FIXME: check bitrate against device capabilities
-@@ -1222,18 +1184,6 @@ real_complete_connection (NMDevice *devi
+ 	/* Early exit if supplicant or device doesn't support requested mode */
+ 	mode = nm_setting_wireless_get_mode (s_wireless);
+ 	if (g_strcmp0 (mode, NM_SETTING_WIRELESS_MODE_ADHOC) == 0) {
+@@ -1299,18 +1261,6 @@ complete_connection (NMDevice *device,
  			return FALSE;
  	}
  
@@ -107,9 +107,9 @@
  	g_assert (ssid);
  	str_ssid = nm_utils_ssid_to_utf8 (ssid);
  	format = g_strdup_printf ("%s %%d", str_ssid);
-@@ -2789,16 +2739,6 @@ real_act_stage1_prepare (NMDevice *dev,
- 	connection = nm_act_request_get_connection (req);
- 	g_return_val_if_fail (connection != NULL, NM_ACT_STAGE_RETURN_FAILURE);
+@@ -2973,16 +2923,6 @@ act_stage1_prepare (NMDevice *dev, NMDev
+ 	}
+ 	g_object_notify (G_OBJECT (self), NM_DEVICE_WIFI_MODE);
  
 -	/* The kernel doesn't support Ad-Hoc WPA connections well at this time,
 -	 * and turns them into open networks.  It's been this way since at least
@@ -122,13 +122,13 @@
 -	}
 -
  	/* Set spoof MAC to the interface */
- 	s_wireless = nm_connection_get_setting_wireless (connection);
- 	g_assert (s_wireless);
+ 	cloned_mac = nm_setting_wireless_get_cloned_mac_address (s_wireless);
+ 	if (cloned_mac && (cloned_mac->len == ETH_ALEN))
 Index: b/src/settings/nm-settings.c
 ===================================================================
 --- a/src/settings/nm-settings.c
 +++ b/src/settings/nm-settings.c
-@@ -1066,38 +1066,6 @@ add_cb (NMSettings *self,
+@@ -1065,38 +1065,6 @@ add_cb (NMSettings *self,
  		dbus_g_method_return (context, nm_connection_get_path (NM_CONNECTION (connection)));
  }
  
@@ -167,7 +167,7 @@
  void
  nm_settings_add_connection (NMSettings *self,
                              NMConnection *connection,
-@@ -1123,19 +1091,6 @@ nm_settings_add_connection (NMSettings *
+@@ -1122,19 +1090,6 @@ nm_settings_add_connection (NMSettings *
  		callback (self, NULL, error, context, user_data);
  		g_error_free (error);
  		return;

=== modified file 'debian/patches/adhoc_use_wpa_rsn_part2.patch'
--- debian/patches/adhoc_use_wpa_rsn_part2.patch	2012-09-07 19:27:20 +0000
+++ debian/patches/adhoc_use_wpa_rsn_part2.patch	2013-03-26 02:35:23 +0000
@@ -25,38 +25,38 @@
  include/NetworkManager.h                               |    4 +
  libnm-glib/nm-device-wifi.c                            |    3 -
  libnm-util/nm-setting-wireless-security.c              |   49 +++--------------
- libnm-util/nm-setting-wireless.c                       |   13 ++--
+ libnm-util/nm-setting-wireless.c                       |   12 ++--
  libnm-util/nm-utils.c                                  |   29 +++-------
  src/nm-wifi-ap-utils.c                                 |   47 +++++-----------
  src/nm-wifi-ap.c                                       |   43 +++++---------
  src/settings/plugins/ifcfg-rh/reader.c                 |   13 +---
  src/settings/plugins/ifcfg-rh/writer.c                 |    2 
  src/settings/plugins/ifnet/connection_parser.c         |   48 ++++++----------
- src/settings/plugins/ifnet/tests/wpa_supplicant.conf   |   10 +--
+ src/settings/plugins/ifnet/tests/wpa_supplicant.conf   |   12 ++++
  src/supplicant-manager/nm-supplicant-config.c          |    3 -
  src/supplicant-manager/nm-supplicant-settings-verify.c |    2 
  src/wifi/wifi-utils-nl80211.c                          |    3 +
- 14 files changed, 101 insertions(+), 168 deletions(-)
+ 14 files changed, 108 insertions(+), 162 deletions(-)
 
 Index: b/include/NetworkManager.h
 ===================================================================
 --- a/include/NetworkManager.h
 +++ b/include/NetworkManager.h
-@@ -155,6 +155,7 @@ typedef enum {
-  * @NM_WIFI_DEVICE_CAP_WPA: device supports WPA1 authentication
+@@ -159,6 +159,7 @@ typedef enum {
   * @NM_WIFI_DEVICE_CAP_RSN: device supports WPA2/RSN authentication
   * @NM_WIFI_DEVICE_CAP_AP: device supports Access Point mode
+  * @NM_WIFI_DEVICE_CAP_ADHOC: device supports Ad-Hoc mode
 + * @NM_WIFI_DEVICE_CAP_IBSS_RSN: device supports WPA2/RSN in an IBSS network.
   *
   * 802.11 specific device encryption and authentication capabilities.
   **/
-@@ -166,7 +167,8 @@ typedef enum {
- 	NM_WIFI_DEVICE_CAP_CIPHER_CCMP   = 0x00000008,
+@@ -171,7 +172,8 @@ typedef enum {
  	NM_WIFI_DEVICE_CAP_WPA           = 0x00000010,
  	NM_WIFI_DEVICE_CAP_RSN           = 0x00000020,
--	NM_WIFI_DEVICE_CAP_AP            = 0x00000040
-+	NM_WIFI_DEVICE_CAP_AP            = 0x00000040,
-+	NM_WIFI_DEVICE_CAP_IBSS_RSN      = 0x00000080
+ 	NM_WIFI_DEVICE_CAP_AP            = 0x00000040,
+-	NM_WIFI_DEVICE_CAP_ADHOC         = 0x00000080
++	NM_WIFI_DEVICE_CAP_ADHOC         = 0x00000080,
++	NM_WIFI_DEVICE_CAP_IBSS_RSN      = 0x00000100
  } NMDeviceWifiCapabilities;
  
  
@@ -64,7 +64,7 @@
 ===================================================================
 --- a/libnm-glib/nm-device-wifi.c
 +++ b/libnm-glib/nm-device-wifi.c
-@@ -463,8 +463,7 @@ connection_compatible (NMDevice *device,
+@@ -534,8 +534,7 @@ connection_compatible (NMDevice *device,
  	if (s_wsec) {
  		/* Connection has security, verify it against the device's capabilities */
  		key_mgmt = nm_setting_wireless_security_get_key_mgmt (s_wsec);
@@ -78,17 +78,17 @@
 ===================================================================
 --- a/libnm-util/nm-setting-wireless-security.c
 +++ b/libnm-util/nm-setting-wireless-security.c
-@@ -785,8 +785,7 @@ need_secrets (NMSetting *setting)
+@@ -732,8 +732,7 @@ need_secrets (NMSetting *setting)
  	}
  
  	/* WPA-PSK infrastructure and adhoc */
 -	if (   (strcmp (priv->key_mgmt, "wpa-none") == 0)
 -	    || (strcmp (priv->key_mgmt, "wpa-psk") == 0)) {
 +	if (strcmp (priv->key_mgmt, "wpa-psk") == 0) {
- 		if (!verify_wpa_psk (priv->psk)) {
+ 		if (!nm_utils_wpa_psk_valid (priv->psk)) {
  			g_ptr_array_add (secrets, NM_SETTING_WIRELESS_SECURITY_PSK);
  			return secrets;
-@@ -834,7 +833,7 @@ verify (NMSetting *setting, GSList *all_
+@@ -781,7 +780,7 @@ verify (NMSetting *setting, GSList *all_
  {
  	NMSettingWirelessSecurity *self = NM_SETTING_WIRELESS_SECURITY (setting);
  	NMSettingWirelessSecurityPrivate *priv = NM_SETTING_WIRELESS_SECURITY_GET_PRIVATE (self);
@@ -97,7 +97,7 @@
  	const char *valid_auth_algs[] = { "open", "shared", "leap", NULL };
  	const char *valid_protos[] = { "wpa", "rsn", NULL };
  	const char *valid_pairwise[] = { "wep40", "wep104", "tkip", "ccmp", NULL };
-@@ -970,38 +969,12 @@ verify (NMSetting *setting, GSList *all_
+@@ -917,38 +916,12 @@ verify (NMSetting *setting, GSList *all_
  		return FALSE;
  	}
  
@@ -142,7 +142,7 @@
  	}
  
  	if (priv->group && !_nm_utils_string_slist_validate (priv->group, valid_groups)) {
-@@ -1273,7 +1246,7 @@ nm_setting_wireless_security_class_init
+@@ -1220,7 +1193,7 @@ nm_setting_wireless_security_class_init
  	 * NMSettingWirelessSecurity:key-mgmt:
  	 *
  	 * Key management used for the connection.  One of 'none' (WEP), 'ieee8021x'
@@ -151,7 +151,7 @@
  	 * WPA-PSK), or 'wpa-eap' (WPA-Enterprise).  This property must be set for
  	 * any WiFi connection that uses security.
  	 **/
-@@ -1282,8 +1255,8 @@ nm_setting_wireless_security_class_init
+@@ -1229,8 +1202,8 @@ nm_setting_wireless_security_class_init
  		 g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT,
  						  "Key management",
  						  "Key management used for the connection.  One of "
@@ -166,15 +166,14 @@
 ===================================================================
 --- a/libnm-util/nm-setting-wireless.c
 +++ b/libnm-util/nm-setting-wireless.c
-@@ -184,12 +184,13 @@ nm_setting_wireless_ap_security_compatib
+@@ -190,11 +190,13 @@ nm_setting_wireless_ap_security_compatib
  	}
  
  	/* Adhoc WPA */
 -	if (!strcmp (key_mgmt, "wpa-none")) {
 -		if (ap_mode != NM_802_11_MODE_ADHOC)
 -			return FALSE;
--		// FIXME: validate ciphers if the BSSID actually puts WPA/RSN IE in
--		// it's beacon
+-		/* FIXME: validate ciphers if they're in the beacon */
 -		return TRUE;
 +	if (ap_mode == NM_802_11_MODE_ADHOC) {
 +		if (!strcmp (key_mgmt, "wpa-psk")) {
@@ -185,12 +184,12 @@
 +		return FALSE;
  	}
  
- 	/* Stuff after this point requires infrastructure */
+ 	/* Adhoc WPA2 (ie, RSN IBSS) */
 Index: b/libnm-util/nm-utils.c
 ===================================================================
 --- a/libnm-util/nm-utils.c
 +++ b/libnm-util/nm-utils.c
-@@ -1287,25 +1287,16 @@ nm_utils_security_valid (NMUtilsSecurity
+@@ -1327,25 +1327,16 @@ nm_utils_security_valid (NMUtilsSecurity
  	case NMU_SEC_WPA_PSK:
  		if (!(wifi_caps & NM_WIFI_DEVICE_CAP_WPA))
  			return FALSE;
@@ -221,7 +220,7 @@
  			}
  			return FALSE;
  		}
-@@ -1314,12 +1305,12 @@ nm_utils_security_valid (NMUtilsSecurity
+@@ -1354,12 +1345,12 @@ nm_utils_security_valid (NMUtilsSecurity
  		if (!(wifi_caps & NM_WIFI_DEVICE_CAP_RSN))
  			return FALSE;
  		if (have_ap) {
@@ -328,7 +327,7 @@
  	}
  
  	return TRUE;
-@@ -665,11 +650,13 @@ nm_ap_utils_complete_connection (const G
+@@ -666,11 +651,13 @@ nm_ap_utils_complete_connection (const G
  		return FALSE;
  
  	if (adhoc) {
@@ -351,7 +350,7 @@
 ===================================================================
 --- a/src/nm-wifi-ap.c
 +++ b/src/nm-wifi-ap.c
-@@ -628,6 +628,7 @@ nm_ap_new_fake_from_connection (NMConnec
+@@ -629,6 +629,7 @@ nm_ap_new_fake_from_connection (NMConnec
  	guint32 channel;
  	NM80211ApSecurityFlags flags;
  	gboolean psk = FALSE, eap = FALSE;
@@ -359,20 +358,20 @@
  
  	g_return_val_if_fail (connection != NULL, NULL);
  
-@@ -648,9 +649,10 @@ nm_ap_new_fake_from_connection (NMConnec
+@@ -649,9 +650,10 @@ nm_ap_new_fake_from_connection (NMConnec
  	if (mode) {
  		if (!strcmp (mode, "infrastructure"))
  			nm_ap_set_mode (ap, NM_802_11_MODE_INFRA);
 -		else if (!strcmp (mode, "adhoc"))
 +		else if (!strcmp (mode, "adhoc")) {
  			nm_ap_set_mode (ap, NM_802_11_MODE_ADHOC);
--		else
+-		else if (!strcmp (mode, "ap")) {
 +			adhoc = TRUE;
-+		} else
- 			goto error;
- 	} else {
- 		nm_ap_set_mode (ap, NM_802_11_MODE_INFRA);
-@@ -684,7 +686,7 @@ nm_ap_new_fake_from_connection (NMConnec
++		} else if (!strcmp (mode, "ap")) {
+ 			nm_ap_set_mode (ap, NM_802_11_MODE_INFRA);
+ 			NM_AP_GET_PRIVATE (ap)->hotspot = TRUE;
+ 		} else
+@@ -688,7 +690,7 @@ nm_ap_new_fake_from_connection (NMConnec
  
  	psk = !strcmp (key_mgmt, "wpa-psk");
  	eap = !strcmp (key_mgmt, "wpa-eap");
@@ -381,7 +380,7 @@
  		if (has_proto (s_wireless_sec, PROTO_WPA)) {
  			flags = nm_ap_get_wpa_flags (ap);
  			flags |= eap ? NM_802_11_AP_SEC_KEY_MGMT_802_1X : NM_802_11_AP_SEC_KEY_MGMT_PSK;
-@@ -698,42 +700,31 @@ nm_ap_new_fake_from_connection (NMConnec
+@@ -702,42 +704,31 @@ nm_ap_new_fake_from_connection (NMConnec
  
  		add_pair_ciphers (ap, s_wireless_sec);
  		add_group_ciphers (ap, s_wireless_sec);
@@ -440,7 +439,7 @@
 ===================================================================
 --- a/src/settings/plugins/ifcfg-rh/reader.c
 +++ b/src/settings/plugins/ifcfg-rh/reader.c
-@@ -1920,8 +1920,8 @@ fill_wpa_ciphers (shvarFile *ifcfg,
+@@ -1990,8 +1990,8 @@ fill_wpa_ciphers (shvarFile *ifcfg,
  				PLUGIN_WARN (IFCFG_PLUGIN_NAME, "    warning: ignoring group cipher '%s' (only one group cipher allowed in Ad-Hoc mode)",
  				             *iter);
  				continue;
@@ -451,7 +450,7 @@
  				             *iter);
  				continue;
  			}
-@@ -2707,8 +2707,8 @@ make_wpa_setting (shvarFile *ifcfg,
+@@ -2777,8 +2777,8 @@ make_wpa_setting (shvarFile *ifcfg,
  
  	/* WPA and/or RSN */
  	if (adhoc) {
@@ -462,7 +461,7 @@
  	} else {
  		char *allow_wpa, *allow_rsn;
  
-@@ -2747,10 +2747,7 @@ make_wpa_setting (shvarFile *ifcfg,
+@@ -2817,10 +2817,7 @@ make_wpa_setting (shvarFile *ifcfg,
  			}
  		}
  
@@ -478,7 +477,7 @@
 ===================================================================
 --- a/src/settings/plugins/ifcfg-rh/writer.c
 +++ b/src/settings/plugins/ifcfg-rh/writer.c
-@@ -592,7 +592,7 @@ write_wireless_security_setting (NMConne
+@@ -591,7 +591,7 @@ write_wireless_security_setting (NMConne
  		svSetValue (ifcfg, "KEY_MGMT", NULL, FALSE);
  		wep = TRUE;
  		*no_8021x = TRUE;
@@ -491,7 +490,7 @@
 ===================================================================
 --- a/src/settings/plugins/ifnet/connection_parser.c
 +++ b/src/settings/plugins/ifnet/connection_parser.c
-@@ -1333,23 +1333,6 @@ fill_wpa_ciphers (const char *ssid,
+@@ -1353,23 +1353,6 @@ fill_wpa_ciphers (const char *ssid,
  
  	list = g_strsplit_set (value, " ", 0);
  	for (iter = list; iter && *iter; iter++, i++) {
@@ -515,7 +514,7 @@
  
  		if (!strcmp (*iter, "CCMP")) {
  			if (group)
-@@ -1358,6 +1341,19 @@ fill_wpa_ciphers (const char *ssid,
+@@ -1378,6 +1361,19 @@ fill_wpa_ciphers (const char *ssid,
  			else
  				nm_setting_wireless_security_add_pairwise (wsec,
  									   "ccmp");
@@ -535,7 +534,7 @@
  		} else if (!strcmp (*iter, "TKIP")) {
  			if (group)
  				nm_setting_wireless_security_add_group (wsec,
-@@ -1498,8 +1494,8 @@ make_wpa_setting (const char *ssid,
+@@ -1518,8 +1514,8 @@ make_wpa_setting (const char *ssid,
  
  	/* WPA and/or RSN */
  	if (adhoc) {
@@ -546,7 +545,7 @@
  	} else {
  		nm_setting_wireless_security_add_proto (wsec, "wpa");
  		nm_setting_wireless_security_add_proto (wsec, "rsn");
-@@ -1515,14 +1511,9 @@ make_wpa_setting (const char *ssid,
+@@ -1535,14 +1531,9 @@ make_wpa_setting (const char *ssid,
  			      NULL);
  		g_free (psk);
  
@@ -564,7 +563,7 @@
  	} else if (!strcmp (value, "WPA-EAP") || !strcmp (value, "IEEE8021X")) {
  		if (adhoc) {
  			g_set_error (error, ifnet_plugin_error_quark (), 0,
-@@ -2115,8 +2106,7 @@ write_wireless_security_setting (NMConne
+@@ -2138,8 +2129,7 @@ write_wireless_security_setting (NMConne
  		wpa_set_data (conn_name, "key_mgmt", "NONE");
  		wep = TRUE;
  		*no_8021x = TRUE;
@@ -578,32 +577,27 @@
 ===================================================================
 --- a/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
 +++ b/src/settings/plugins/ifnet/tests/wpa_supplicant.conf
-@@ -752,15 +752,15 @@ network={
+@@ -68,3 +68,15 @@ network={
+   psk="xjtudlc3731###asdfasdfasdf"
  }
  
- 
--# IBSS/ad-hoc network with WPA-None/TKIP.
 +# IBSS/ad-hoc network with IBSS RSN.
- network={
- 	ssid="test adhoc"
- 	mode=1
- 	frequency=2412
--	proto=WPA
--	key_mgmt=WPA-NONE
--	pairwise=NONE
--	group=TKIP
++network={
++        ssid="test adhoc"
++        mode=1
++        frequency=2412
 +	proto=RSN
 +	key_mgmt=WPA-PSK
 +	pairwise=CCMP
 +	group=CCMP
- 	psk="secret passphrase"
- }
- 
++        psk="secret passphrase"
++}
++
 Index: b/src/supplicant-manager/nm-supplicant-config.c
 ===================================================================
 --- a/src/supplicant-manager/nm-supplicant-config.c
 +++ b/src/supplicant-manager/nm-supplicant-config.c
-@@ -643,8 +643,7 @@ nm_supplicant_config_add_setting_wireles
+@@ -651,8 +651,7 @@ nm_supplicant_config_add_setting_wireles
  	}
  
  	/* Only WPA-specific things when using WPA */
@@ -630,7 +624,7 @@
 ===================================================================
 --- a/src/wifi/wifi-utils-nl80211.c
 +++ b/src/wifi/wifi-utils-nl80211.c
-@@ -684,6 +684,9 @@ static int nl80211_wiphy_info_handler (s
+@@ -720,6 +720,9 @@ static int nl80211_wiphy_info_handler (s
  		}
  	}
  

=== removed file 'debian/patches/dhcpv6-duid-support.patch'
--- debian/patches/dhcpv6-duid-support.patch	2011-11-25 17:59:44 +0000
+++ debian/patches/dhcpv6-duid-support.patch	1970-01-01 00:00:00 +0000
@@ -1,553 +0,0 @@
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Subject: add DUID handling support and DUID generation.
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/849994
-
-This patch watches the DUID already provided by dhclient if it's available
-and attempts to make sure it is recorded in the future lease files when
-necessary. If the DUID isn't present anywhere, it will be generated as a
-DUID-LLT, and the values from dhclient always takes precedence.
-
-Index: network-manager-0.9.1.90+git.20111124t161539.576acdd/src/dhcp-manager/nm-dhcp-client.c
-===================================================================
---- network-manager-0.9.1.90+git.20111124t161539.576acdd.orig/src/dhcp-manager/nm-dhcp-client.c	2011-11-25 12:55:48.000000000 -0500
-+++ network-manager-0.9.1.90+git.20111124t161539.576acdd/src/dhcp-manager/nm-dhcp-client.c	2011-11-25 12:57:53.575041757 -0500
-@@ -29,6 +29,12 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <stdlib.h>
-+#include <stdint.h>
-+
-+#include <net/if.h>
-+#include <sys/time.h>
-+#include <sys/ioctl.h>
-+#include <sys/socket.h>
- 
- #include "nm-utils.h"
- #include "nm-logging.h"
-@@ -40,6 +46,7 @@
- 	gboolean     ipv6;
- 	char *       uuid;
- 	guint32      timeout;
-+	char *       duid;
- 
- 	guchar       state;
- 	GPid         pid;
-@@ -70,12 +77,119 @@
- 	PROP_IFACE,
- 	PROP_IPV6,
- 	PROP_UUID,
-+	PROP_DUID,
- 	PROP_TIMEOUT,
- 	LAST_PROP
- };
- 
- /********************************************/
- 
-+struct duid_header {
-+	uint16_t duid_type;
-+	uint16_t hw_type;
-+	uint32_t time;
-+	/* link-layer address follows */
-+} __attribute__((__packed__));
-+
-+#define DUID_TIME_EPOCH 946684800
-+#define DUID_ETHER_LEN 6
-+
-+static char *
-+escape_duid (const guint8 * duid, guint32 len)
-+{
-+        static char escaped[(sizeof(struct duid_header*) + DUID_ETHER_LEN) * 4 + 1];
-+        const guint8 *s = duid;
-+        char *d = escaped;
-+
-+        while (len--) {
-+                if (*s == '\0') {
-+                        *d++ = '\\';
-+                        *d++ = '0';
-+                        *d++ = '0';
-+                        *d++ = '0';
-+                } else if (*s == '\a') {
-+                        *d++ = '\\';
-+                        *d++ = '0';
-+                        *d++ = '0';
-+                        *d++ = '7';
-+                } else if (*s == '\b') {
-+                        *d++ = '\\';
-+                        *d++ = '0';
-+                        *d++ = '1';
-+                        *d++ = '0';
-+                } else if (*s == '\t') {
-+                        *d++ = '\\';
-+                        *d++ = '0';
-+                        *d++ = '1';
-+                        *d++ = '1';
-+                } else if (*s == '\n') {
-+                        *d++ = '\\';
-+                        *d++ = '0';
-+                        *d++ = '1';
-+                        *d++ = '2';
-+                } else if (*s == '\f') {
-+                        *d++ = '\\';
-+                        *d++ = '0';
-+                        *d++ = '1';
-+                        *d++ = '4';
-+                } else if (*s == '\r') {
-+                        *d++ = '\\';
-+                        *d++ = '0';
-+                        *d++ = '1';
-+                        *d++ = '5';
-+                } else {
-+                        *d++ = *s;
-+                }
-+                s++;
-+        }
-+        *d = '\0';
-+        return g_strescape (escaped, "\\");
-+}
-+
-+/* Get a DHCP Unique Identifier for DHCPv6.
-+ * We use the DUID-LLT method (see RFC 3315 s9.2) using code based on Debian's
-+ * netcfg code to generate DUID-LL numbers.
-+ */
-+gboolean
-+nm_dhcp_client_generate_duid (const char *iface, char **duid)
-+{
-+	GByteArray *raw_duid;
-+	struct sockaddr sa;
-+	struct ifreq ifr;
-+	struct duid_header *duid_header;
-+	struct timeval tv;
-+	int s;
-+
-+	s = socket(AF_INET, SOCK_DGRAM, 0); /* doesn't matter what kind */
-+	if (s < 0) {
-+		return FALSE;
-+	}
-+
-+	strncpy(ifr.ifr_name, iface, IFNAMSIZ);
-+	if (ioctl(s, SIOCGIFHWADDR, &ifr) < 0) {
-+		nm_log_err (LOGD_HW, "Couldn't get hardware address of %s: %s",
-+		            iface, strerror(errno));
-+		return FALSE;
-+	}
-+	memcpy(&sa, &ifr.ifr_hwaddr, sizeof((void *)&sa));
-+
-+	raw_duid = g_byte_array_sized_new (sizeof(duid_header) + DUID_ETHER_LEN);
-+
-+	duid_header = malloc (sizeof(duid_header));
-+	duid_header->duid_type = g_htons(1);
-+	duid_header->hw_type = g_htons(sa.sa_family);
-+	gettimeofday(&tv, NULL);
-+	duid_header->time = g_htonl(tv.tv_sec - DUID_TIME_EPOCH);
-+
-+	g_byte_array_append (raw_duid, (guint8*) duid_header, sizeof(duid_header));
-+	g_byte_array_append (raw_duid, (guint8*) sa.sa_data, DUID_ETHER_LEN);
-+
-+	nm_log_dbg (LOGD_HW, "MATT: DUID: '%s':%d", escape_duid(raw_duid->data, raw_duid->len), raw_duid->len);
-+	*duid = escape_duid (raw_duid->data, raw_duid->len);
-+
-+	return TRUE;
-+}
-+
- GPid
- nm_dhcp_client_get_pid (NMDHCPClient *self)
- {
-@@ -112,6 +226,15 @@
- 	return NM_DHCP_CLIENT_GET_PRIVATE (self)->uuid;
- }
- 
-+const char *
-+nm_dhcp_client_get_duid (NMDHCPClient *self)
-+{
-+       g_return_val_if_fail (self != NULL, NULL);
-+       g_return_val_if_fail (NM_IS_DHCP_CLIENT (self), NULL);
-+
-+       return NM_DHCP_CLIENT_GET_PRIVATE (self)->duid;
-+}
-+
- /********************************************/
- 
- static void
-@@ -322,6 +445,19 @@
- 	return priv->pid ? TRUE : FALSE;
- }
- 
-+void
-+nm_dhcp_client_guess_duid (NMDHCPClient *self)
-+{
-+	NMDHCPClientPrivate *priv;
-+
-+	g_return_if_fail (self != NULL);
-+	g_return_if_fail (NM_IS_DHCP_CLIENT (self));
-+
-+	priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
-+
-+	priv->duid = NM_DHCP_CLIENT_GET_CLASS (self)->guess_duid (self);
-+}
-+
- gboolean
- nm_dhcp_client_start_ip6 (NMDHCPClient *self,
-                           NMSettingIP6Config *s_ip6,
-@@ -339,6 +475,16 @@
- 	g_return_val_if_fail (priv->ipv6 == TRUE, FALSE);
- 	g_return_val_if_fail (priv->uuid != NULL, FALSE);
- 
-+        /* Dealing with IPv6 and following RFCs mean we need a default DUID for
-+         * a new connection. DUIDs can be generated, but we usually wouldn't
-+         * unless it's not available anywhere else.
-+         */
-+        if (priv->duid == NULL)
-+                nm_dhcp_client_guess_duid (self);
-+
-+        if (priv->duid != NULL)
-+                nm_log_dbg (LOGD_DHCP, "MATT: nm_dhcp_client_start_ip6: DUID is '%s'", priv->duid);
-+
- 	priv->info_only = info_only;
- 
- 	nm_log_info (LOGD_DHCP, "Activation (%s) Beginning DHCPv6 transaction (timeout in %d seconds)",
-@@ -1326,6 +1472,7 @@
- 
- 	priv->options = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
- 	priv->pid = -1;
-+	priv->duid = NULL;
- }
- 
- static void
-@@ -1344,6 +1491,9 @@
- 	case PROP_UUID:
- 		g_value_set_string (value, priv->uuid);
- 		break;
-+	case PROP_DUID:
-+		g_value_set_string (value, priv->duid);
-+		break;
- 	case PROP_TIMEOUT:
- 		g_value_set_uint (value, priv->timeout);
- 		break;
-@@ -1372,6 +1522,9 @@
- 		/* construct-only */
- 		priv->uuid = g_value_dup_string (value);
- 		break;
-+	case PROP_DUID:
-+		priv->duid = g_value_dup_string (value);
-+		break;
- 	case PROP_TIMEOUT:
- 		priv->timeout = g_value_get_uint (value);
- 		break;
-@@ -1440,6 +1593,14 @@
- 		                      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
- 
- 	g_object_class_install_property
-+		(object_class, PROP_DUID,
-+		 g_param_spec_string (NM_DHCP_CLIENT_DUID,
-+		                      "duid",
-+		                      "DUID",
-+		                      NULL,
-+		                      G_PARAM_READWRITE));
-+
-+	g_object_class_install_property
- 		(object_class, PROP_TIMEOUT,
- 		 g_param_spec_uint (NM_DHCP_CLIENT_TIMEOUT,
- 		                    "timeout",
-Index: network-manager-0.9.1.90+git.20111124t161539.576acdd/src/dhcp-manager/nm-dhcp-client.h
-===================================================================
---- network-manager-0.9.1.90+git.20111124t161539.576acdd.orig/src/dhcp-manager/nm-dhcp-client.h	2011-11-25 12:55:48.000000000 -0500
-+++ network-manager-0.9.1.90+git.20111124t161539.576acdd/src/dhcp-manager/nm-dhcp-client.h	2011-11-25 12:57:53.575041757 -0500
-@@ -37,6 +37,7 @@
- #define NM_DHCP_CLIENT_INTERFACE "iface"
- #define NM_DHCP_CLIENT_IPV6      "ipv6"
- #define NM_DHCP_CLIENT_UUID      "uuid"
-+#define NM_DHCP_CLIENT_DUID      "duid"
- #define NM_DHCP_CLIENT_TIMEOUT   "timeout"
- 
- typedef enum {
-@@ -90,12 +91,16 @@
- 	void (*stop)          (NMDHCPClient *self,
- 	                       gboolean release);
- 
-+	char * (*guess_duid)    (NMDHCPClient *self);
-+
- 	/* Signals */
- 	void (*state_changed) (NMDHCPClient *self, NMDHCPState state);
- 	void (*timeout)       (NMDHCPClient *self);
- 	void (*remove)        (NMDHCPClient *self);
- } NMDHCPClientClass;
- 
-+gboolean nm_dhcp_client_generate_duid (const char *iface, char **duid);
-+
- GType nm_dhcp_client_get_type (void);
- 
- GPid nm_dhcp_client_get_pid (NMDHCPClient *self);
-@@ -106,6 +111,8 @@
- 
- const char *nm_dhcp_client_get_uuid (NMDHCPClient *self);
- 
-+void nm_dhcp_client_guess_duid (NMDHCPClient *self);
-+
- gboolean nm_dhcp_client_start_ip4 (NMDHCPClient *self,
-                                    NMSettingIP4Config *s_ip4,
-                                    guint8 *dhcp_anycast_addr,
-Index: network-manager-0.9.1.90+git.20111124t161539.576acdd/src/dhcp-manager/nm-dhcp-dhclient.c
-===================================================================
---- network-manager-0.9.1.90+git.20111124t161539.576acdd.orig/src/dhcp-manager/nm-dhcp-dhclient.c	2011-11-25 12:55:48.000000000 -0500
-+++ network-manager-0.9.1.90+git.20111124t161539.576acdd/src/dhcp-manager/nm-dhcp-dhclient.c	2011-11-25 12:58:53.283039094 -0500
-@@ -33,6 +33,7 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <ctype.h>
-+#include <fcntl.h>
- 
- #include <config.h>
- 
-@@ -48,11 +49,14 @@
- #if defined(TARGET_DEBIAN) || defined(TARGET_SUSE) || defined(TARGET_MANDRIVA)
- #if defined(DHCLIENT_V3)
- #define NM_DHCLIENT_LEASE_DIR			LOCALSTATEDIR "/lib/dhcp3"
-+#define NM_DHCLIENT_DEFAULT_LEASE_FILE  NM_DHCLIENT_LEASE_DIR "/dhclient6.leases"
- #else
- #define NM_DHCLIENT_LEASE_DIR           LOCALSTATEDIR "/lib/dhcp"
-+#define NM_DHCLIENT_DEFAULT_LEASE_FILE  NM_DHCLIENT_LEASE_DIR "/dhclient6.leases"
- #endif
- #else
- #define NM_DHCLIENT_LEASE_DIR           LOCALSTATEDIR "/lib/dhclient"
-+#define NM_DHCLIENT_DEFAULT_LEASE_FILE  NM_DHCLIENT_LEASE_DIR "/dhclient6.leases"
- #endif
- 
- #define ACTION_SCRIPT_PATH	LIBEXECDIR "/nm-dhcp-client.action"
-@@ -337,6 +341,103 @@
- 	return success;
- }
- 
-+static gboolean
-+duid_in_leasefile (char *leasefile, char **duid)
-+{
-+	char *found_duid = NULL;
-+	char *contents;
-+	char **line, **split, **params;
-+
-+	nm_log_dbg (LOGD_DHCP, "MATT: Looking for duid in '%s'.", leasefile);
-+
-+       	if (!g_file_test (leasefile, G_FILE_TEST_EXISTS))
-+		return FALSE;
-+
-+	if (!g_file_get_contents (leasefile, &contents, NULL, NULL))
-+		return FALSE;
-+
-+	split = g_strsplit_set (contents, "\n\r", -1);
-+	g_free (contents);
-+
-+	if (!split)
-+		return FALSE;
-+
-+	for (line = split; line && *line; line++) {
-+		*line = g_strstrip (*line);
-+
-+		if (g_strstr_len (*line, -1, "default-duid")) {
-+			nm_log_dbg (LOGD_DHCP, "MATT: Found duid in '%s'.", leasefile);
-+			params = g_strsplit_set (*line, " \t\"", -1);
-+			nm_log_dbg (LOGD_DHCP, "MATT: Found DUID: '%s'", params[2]);
-+			found_duid = g_strdup (params[2]);
-+			g_strfreev (params);
-+			break;
-+		}
-+	}
-+	g_strfreev (split);
-+
-+	if (found_duid != NULL) {
-+		*duid = found_duid;
-+		return TRUE;
-+	}
-+	else
-+		return FALSE;
-+}
-+
-+static char *
-+real_guess_duid (NMDHCPClient *self)
-+{
-+	char *duid = NULL;
-+	GPtrArray *leasefiles;
-+	const char *iface, *uuid;
-+	char *leasefile, *contents;
-+	char **line, **split, **params;
-+	gboolean ipv6;
-+	int i;
-+
-+	iface = nm_dhcp_client_get_iface (self);
-+	uuid = nm_dhcp_client_get_uuid (self);
-+	ipv6 = nm_dhcp_client_get_ipv6 (self);
-+
-+	if (!ipv6)
-+		return NULL;
-+
-+	leasefiles = g_ptr_array_new ();
-+
-+	/* Always add the "default" lease file from dhclient as first place
-+         * to look for the DUID.
-+         */
-+	g_ptr_array_add (leasefiles, g_strdup(NM_DHCLIENT_DEFAULT_LEASE_FILE));
-+
-+	leasefile = get_leasefile_for_iface (iface, uuid, ipv6);
-+
-+	if (!leasefile)
-+		return NULL;
-+
-+        if (g_file_test (leasefile, G_FILE_TEST_EXISTS))
-+		g_ptr_array_add (leasefiles, leasefile);
-+
-+	for (i = 0; i < leasefiles->len; i++) {
-+		gboolean found = FALSE;
-+
-+		leasefile = g_ptr_array_index (leasefiles, i);
-+
-+		found = duid_in_leasefile (leasefile, &duid);
-+
-+		if (found && duid != NULL)
-+			break;
-+	}
-+	if (duid != NULL)
-+		nm_log_dbg (LOGD_DHCP, "MATT: again, DUID: '%s'", duid);
-+
-+	for (i = 0; i < leasefiles->len; i++)
-+		g_free (g_ptr_array_index (leasefiles, i));
-+	g_ptr_array_free (leasefiles, TRUE);
-+
-+out:
-+	return duid;
-+}
-+
- /* NM provides interface-specific options; thus the same dhclient config
-  * file cannot be used since DHCP transactions can happen in parallel.
-  * Since some distros don't have default per-interface dhclient config files,
-@@ -420,6 +521,7 @@
- 	GError *error = NULL;
- 	const char *iface, *uuid, *system_bus_address;
- 	char *binary_name, *cmd_str, *pid_file = NULL, *system_bus_address_env = NULL;
-+	char *duid = NULL;
- 	gboolean ipv6;
- 	guint log_domain;
- 
-@@ -428,6 +530,7 @@
- 	iface = nm_dhcp_client_get_iface (client);
- 	uuid = nm_dhcp_client_get_uuid (client);
- 	ipv6 = nm_dhcp_client_get_ipv6 (client);
-+	duid = nm_dhcp_client_get_duid (client);
- 
- 	log_domain = ipv6 ? LOGD_DHCP6 : LOGD_DHCP4;
- 
-@@ -469,6 +572,110 @@
- 		return -1;
- 	}
- 
-+#if !defined(DHCLIENT_V3)
-+        /* Dealing with IPv6 and following RFCs mean we need a default DUID for
-+         * a new connection. DUIDs can be generated, but we usually wouldn't
-+         * unless it's not available anywhere else.
-+         */
-+	if (ipv6) {
-+		FILE *leasef;
-+		gboolean found = FALSE;
-+		char *found_duid = NULL;
-+		char *contents = NULL, *new_contents = NULL;
-+
-+		if (!duid) {
-+			nm_log_dbg (log_domain, "MATT: oops, no DUID yet... try to guess it again.");
-+			duid = real_guess_duid (client);
-+		}
-+
-+		if (!duid) {
-+			/* We failed all tries to get a DUID from elsewhere, so generate a DUID-LLT
-+			 * to pass to the dhclient lease file.
-+			 */
-+			nm_dhcp_client_generate_duid (iface, &duid);
-+			nm_log_dbg (log_domain, "MATT: done generation: '%s'", duid);
-+
-+			/* In all likelihood if there is no DUID before it gets generated
-+			 * above, then the default dhclient lease file is also missing,
-+			 * so it's safe to create it if we verify it doesn't exist.
-+			 */
-+			if (!g_file_test (NM_DHCLIENT_DEFAULT_LEASE_FILE, G_FILE_TEST_EXISTS)) {
-+				if ((leasef = g_fopen (NM_DHCLIENT_DEFAULT_LEASE_FILE, "w")) == NULL)
-+					nm_log_warn (log_domain, "Could not create default DHCPv6 lease file '%s'.",
-+					             NM_DHCLIENT_DEFAULT_LEASE_FILE);
-+				g_chmod (NM_DHCLIENT_DEFAULT_LEASE_FILE, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-+				g_fprintf (leasef, "default-duid \"%s\";\n", duid);
-+				fclose (leasef);
-+			}
-+		}
-+
-+		if (!g_file_test (priv->lease_file, G_FILE_TEST_EXISTS)) {
-+			found = FALSE;
-+			if (g_creat (priv->lease_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH) < 0)
-+				nm_log_warn (log_domain, "Could not create DHCPv6 lease file '%s'.", priv->lease_file);
-+			g_chmod (priv->lease_file, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
-+		}
-+		else {
-+			nm_log_dbg (log_domain, "MATT: check if the DUID is available in lease file.");
-+			found = duid_in_leasefile (priv->lease_file, &found_duid);
-+		}
-+
-+		/* Write the DUID to lease file if it's not already there.
-+		 * We need not care about writing it at the end of the file, because it will be
-+		 * rewritten / sorted by dhclient when it will run.
-+		 */
-+		if (!found) {
-+			nm_log_dbg (log_domain, "MATT: oops, no DUID in lease file, write it.");
-+			if ((leasef = g_fopen (priv->lease_file, "w+")) == NULL) {
-+				nm_log_warn (log_domain, "Can't open lease file for writing DUID.");
-+				return -1;
-+			}
-+			g_fprintf (leasef, "default-duid \"%s\";\n", duid);
-+			fclose (leasef);
-+		}
-+		else {
-+			nm_log_dbg (log_domain, "MATT: DUID in lease file, let's make sure it's the right one.");
-+			if (!g_file_get_contents (priv->lease_file, &contents, NULL, &error)) {
-+				nm_log_warn (log_domain, "couldn't read current DUID from lease file: '%s'", error->message);
-+				g_error_free (error);
-+				return -1;
-+			}
-+
-+			/* We may have found a DUID in the file, and received a different value from
-+			 * dhclient's default lease file. In this case, let's use the value from dhclient
-+			 * as the good one, in case dhclient was run manually for a valid reason.
-+			 */
-+			if (g_strcmp0 (duid, found_duid) != 0) {
-+				gchar **split = NULL, **line = NULL;
-+
-+				nm_log_dbg (log_domain, "MATT: replacing DUID in lease files.");
-+
-+			        split = g_strsplit_set (contents, "\n\r", -1);
-+				g_free (contents);
-+
-+				if (!split)
-+					return -1;
-+
-+				if ((leasef = g_fopen (priv->lease_file, "w")) == NULL) {
-+					nm_log_warn (log_domain, "Can't open lease file for writing DUID.");
-+					return -1;
-+				}
-+
-+				g_fprintf (leasef, "default-duid \"%s\";\n", duid);
-+				for (line = split; line && *line; line++) {
-+					*line = g_strstrip (*line);
-+
-+					if (!g_strstr_len (*line, -1, "default-duid"))
-+						g_fprintf (leasef, "%s\n", *line);
-+				}
-+				g_strfreev (split);
-+				fclose (leasef);
-+			}
-+			nm_log_dbg (log_domain, "MATT: DUID found in lease file...");
-+		}
-+	}
-+#endif
-+
- 	argv = g_ptr_array_new ();
- 	g_ptr_array_add (argv, (gpointer) priv->path);
- 
-@@ -630,5 +837,6 @@
- 	client_class->ip4_start = real_ip4_start;
- 	client_class->ip6_start = real_ip6_start;
- 	client_class->stop = real_stop;
-+	client_class->guess_duid = real_guess_duid;
- }
- 

=== modified file 'debian/patches/dns-dnsmasq-interface-and-dbus-path.patch'
--- debian/patches/dns-dnsmasq-interface-and-dbus-path.patch	2012-08-17 21:39:38 +0000
+++ debian/patches/dns-dnsmasq-interface-and-dbus-path.patch	2013-03-26 02:35:23 +0000
@@ -1,38 +1,37 @@
 ---
- src/dns-manager/nm-dns-bind.c           |    2 +-
  src/dns-manager/nm-dns-dnsmasq.c        |    8 ++++----
  src/dns-manager/nm-dns-manager.c        |    6 +++---
  src/org.freedesktop.NetworkManager.conf |   10 ++++++++++
- 4 files changed, 18 insertions(+), 8 deletions(-)
+ 3 files changed, 17 insertions(+), 7 deletions(-)
 
 Index: b/src/dns-manager/nm-dns-dnsmasq.c
 ===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -48,7 +48,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
- #define CONFFILE LOCALSTATEDIR "/run/nm-dns-dnsmasq.conf"
- #define CONFDIR SYSCONFDIR "/NetworkManager/dnsmasq.d"
+@@ -52,7 +52,7 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
+ #define CONFFILE NMRUNDIR "/dnsmasq.conf"
+ #define CONFDIR NMCONFDIR "/dnsmasq.d"
  
 -#define DNSMASQ_DBUS_SERVICE "uk.org.thekelleys.dnsmasq"
 +#define DNSMASQ_DBUS_SERVICE "org.freedesktop.NetworkManager.dnsmasq"
  #define DNSMASQ_DBUS_PATH "/uk/org/thekelleys/dnsmasq"
  #define DNSMASQ_DBUS_INTERFACE "uk.org.thekelleys.dnsmasq"
  
-@@ -281,11 +281,11 @@ start_dnsmasq (NMDnsDnsmasq *self)
- 	argv[3] = "--no-hosts"; /* don't use /etc/hosts to resolve */
- 	argv[4] = "--bind-interfaces";
- 	argv[5] = "--pid-file=" PIDFILE;
--	argv[6] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
-+	argv[6] = "--listen-address=127.0.1.1"; /* Should work for both 4 and 6 */
- 	argv[7] = "--conf-file=" CONFFILE;
- 	argv[8] = "--cache-size=0";
- 	argv[9] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
--	argv[10] = "--enable-dbus";
-+	argv[10] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;
- 	argv[11] = "--conf-dir=" CONFDIR;
- 	argv[12] = NULL;
+@@ -290,11 +290,11 @@ start_dnsmasq (NMDnsDnsmasq *self)
+ 	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
+ 	argv[idx++] = "--bind-interfaces";
+ 	argv[idx++] = "--pid-file=" PIDFILE;
+-	argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
++	argv[idx++] = "--listen-address=127.0.1.1"; /* Should work for both 4 and 6 */
+ 	argv[idx++] = "--conf-file=" CONFFILE;
+ 	argv[idx++] = "--cache-size=0";
+ 	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
+-	argv[idx++] = "--enable-dbus";
++	argv[idx++] = "--enable-dbus=" DNSMASQ_DBUS_SERVICE;
  
-@@ -405,7 +405,7 @@ update (NMDnsPlugin *plugin,
+ 	/* dnsmasq exits if the conf dir is not present */
+ 	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
+@@ -415,7 +415,7 @@ update (NMDnsPlugin *plugin,
  
  	/* If all the configs lists are empty, there is just nothing to be caching --
  	 * we cleared up the dnsmasq cache; but we should also fail the update, so
@@ -41,24 +40,11 @@
  	 */
  	if (((vpn_configs && g_slist_length (vpn_configs) < 1) || !vpn_configs) &&
  	    ((dev_configs && g_slist_length (dev_configs) < 1) || !dev_configs) &&
-Index: b/src/dns-manager/nm-dns-bind.c
-===================================================================
---- a/src/dns-manager/nm-dns-bind.c
-+++ b/src/dns-manager/nm-dns-bind.c
-@@ -354,7 +354,7 @@ update (NMDnsPlugin *plugin,
- 		"    forward only;\n"
- 		"    recursion yes;\n"
- 		"    listen-on-v6 { ::1; };\n"
--		"    listen-on { 127.0.0.1; };\n"
-+		"    listen-on { 127.0.1.1; };\n"
- 		"    forwarders {\n");
- 
- 	for (i = 0; i < globals->len; i++) {
 Index: b/src/dns-manager/nm-dns-manager.c
 ===================================================================
 --- a/src/dns-manager/nm-dns-manager.c
 +++ b/src/dns-manager/nm-dns-manager.c
-@@ -741,7 +741,7 @@ update_dns (NMDnsManager *self,
+@@ -729,7 +729,7 @@ update_dns (NMDnsManager *self,
  	g_slist_free (dev_configs);
  	g_slist_free (other_configs);
  
@@ -67,7 +53,7 @@
  	 * to ensure that the glibc resolver doesn't try to round-robin nameservers,
  	 * but only uses the local caching nameserver.
  	 */
-@@ -749,7 +749,7 @@ update_dns (NMDnsManager *self,
+@@ -737,7 +737,7 @@ update_dns (NMDnsManager *self,
  		if (nameservers)
  			g_strfreev (nameservers);
  		nameservers = g_new0 (char*, 2);
@@ -76,15 +62,15 @@
  	}
  
  #ifdef RESOLVCONF_PATH
-@@ -1165,7 +1165,7 @@ dispose (GObject *object)
+@@ -1147,7 +1147,7 @@ dispose (GObject *object)
+ 		priv->plugins = NULL;
+ 
+ 		/* If we're quitting leave a valid resolv.conf in place, not one
+-		 * pointing to 127.0.0.1 if any plugins were active.  Thus update
++		 * pointing to 127.0.1.1 if any plugins were active.  Thus update
+ 		 * DNS after disposing of all plugins.  But if we haven't done any
+ 		 * DNS updates yet, there's no reason to touch resolv.conf on shutdown.
  		 */
- 		if (priv->last_iface != NULL) {
- 			/* If we're quitting leave a valid resolv.conf in place, not one
--			 * pointing to 127.0.0.1 if any plugins were active.  Thus update
-+			 * pointing to 127.0.1.1 if any plugins were active.  Thus update
- 			 * DNS after disposing of all plugins.
- 			 */
- 			if (!update_dns (self, priv->last_iface, TRUE, &error)) {
 Index: b/src/org.freedesktop.NetworkManager.conf
 ===================================================================
 --- a/src/org.freedesktop.NetworkManager.conf

=== modified file 'debian/patches/dnsmasq-dbus-updates.patch'
--- debian/patches/dnsmasq-dbus-updates.patch	2012-08-16 04:45:59 +0000
+++ debian/patches/dnsmasq-dbus-updates.patch	2013-03-26 02:35:23 +0000
@@ -4,11 +4,11 @@
 Subject: [PATCH] dns: update dnsmasq nameservers via its DBus SetServers method
 
 ---
- src/dns-manager/nm-dns-dnsmasq.c |  363 +++++++++++++++++++++++++--------------
+ src/dns-manager/nm-dns-dnsmasq.c |  372 ++++++++++++++++++++++++---------------
  src/dns-manager/nm-dns-manager.c |   24 ++
  src/dns-manager/nm-dns-plugin.c  |   16 +
  src/dns-manager/nm-dns-plugin.h  |    1 
- 4 files changed, 275 insertions(+), 129 deletions(-)
+ 4 files changed, 279 insertions(+), 134 deletions(-)
 
 Index: b/src/dns-manager/nm-dns-dnsmasq.c
 ===================================================================
@@ -31,9 +31,9 @@
  
  G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsmasq, NM_TYPE_DNS_PLUGIN)
  
-@@ -43,8 +48,13 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
- #define CONFFILE LOCALSTATEDIR "/run/nm-dns-dnsmasq.conf"
- #define CONFDIR SYSCONFDIR "/NetworkManager/dnsmasq.d"
+@@ -47,8 +52,13 @@ G_DEFINE_TYPE (NMDnsDnsmasq, nm_dns_dnsm
+ #define CONFFILE NMRUNDIR "/dnsmasq.conf"
+ #define CONFDIR NMCONFDIR "/dnsmasq.d"
  
 +#define DNSMASQ_DBUS_SERVICE "uk.org.thekelleys.dnsmasq"
 +#define DNSMASQ_DBUS_PATH "/uk/org/thekelleys/dnsmasq"
@@ -46,7 +46,7 @@
  } NMDnsDnsmasqPrivate;
  
  /*******************************************/
-@@ -69,12 +79,11 @@ find_dnsmasq (void)
+@@ -73,12 +83,11 @@ find_dnsmasq (void)
  }
  
  static gboolean
@@ -61,7 +61,7 @@
  
  	if (split) {
  		char **domains, **iter;
-@@ -86,17 +95,18 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -90,17 +99,18 @@ add_ip4_config (GString *str, NMIP4Confi
  		 * per domain (and the manpage says this too) so only use the first
  		 * nameserver here.
  		 */
@@ -87,7 +87,7 @@
  			added = TRUE;
  		}
  
-@@ -104,9 +114,10 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -108,9 +118,10 @@ add_ip4_config (GString *str, NMIP4Confi
  			/* If not searches, use any domains */
  			n = nm_ip4_config_get_num_domains (ip4);
  			for (i = 0; i < n; i++) {
@@ -101,7 +101,7 @@
  				added = TRUE;
  			}
  		}
-@@ -117,7 +128,9 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -121,7 +132,9 @@ add_ip4_config (GString *str, NMIP4Confi
  		domains = nm_dns_utils_get_ip4_rdns_domains (ip4);
  		if (domains) {
  			for (iter = domains; iter && *iter; iter++)
@@ -112,7 +112,7 @@
  			g_strfreev (domains);
  			added = TRUE;
  		}
-@@ -127,65 +140,18 @@ add_ip4_config (GString *str, NMIP4Confi
+@@ -131,65 +144,18 @@ add_ip4_config (GString *str, NMIP4Confi
  	if (!added) {
  		n = nm_ip4_config_get_num_nameservers (ip4);
  		for (i = 0; i < n; i++) {
@@ -178,12 +178,12 @@
 -}
 -
  static gboolean
--add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split, const char *iface)
-+add_ip6_config (DBusMessage *message, NMIP6Config *ip6, gboolean split, const char *iface)
+-add_ip6_config (GString *str, NMIP6Config *ip6, gboolean split)
++add_ip6_config (DBusMessage *message, NMIP6Config *ip6, gboolean split)
  {
  	const struct in6_addr *addr;
  	char *buf;
-@@ -201,16 +167,32 @@ add_ip6_config (GString *str, NMIP6Confi
+@@ -209,16 +175,32 @@ add_ip6_config (GString *str, NMIP6Confi
  		 * the first nameserver here.
  		 */
  		addr = nm_ip6_config_get_nameserver (ip6, 0);
@@ -222,7 +222,7 @@
  			added = TRUE;
  		}
  
-@@ -218,14 +200,13 @@ add_ip6_config (GString *str, NMIP6Confi
+@@ -226,14 +208,13 @@ add_ip6_config (GString *str, NMIP6Confi
  			/* If not searches, use any domains */
  			n = nm_ip6_config_get_num_domains (ip6);
  			for (i = 0; i < n; i++) {
@@ -241,7 +241,7 @@
  	}
  
  	/* If no searches or domains, just add the namservers */
-@@ -233,11 +214,24 @@ add_ip6_config (GString *str, NMIP6Confi
+@@ -241,11 +222,24 @@ add_ip6_config (GString *str, NMIP6Confi
  		n = nm_ip6_config_get_num_nameservers (ip6);
  		for (i = 0; i < n; i++) {
  			addr = nm_ip6_config_get_nameserver (ip6, i);
@@ -271,18 +271,19 @@
  		}
  	}
  
-@@ -245,6 +239,66 @@ add_ip6_config (GString *str, NMIP6Confi
+@@ -253,6 +247,71 @@ add_ip6_config (GString *str, NMIP6Confi
  }
  
  static gboolean
 +start_dnsmasq (NMDnsDnsmasq *self)
 +{
 +	NMDnsDnsmasqPrivate *priv = NM_DNS_DNSMASQ_GET_PRIVATE (self);
-+	const char *argv[13];
++	const char *argv[15];
 +	char *dnsmasq_owner;
 + 	GError *error = NULL;
 +	GString *conf;
 + 	GPid pid = 0;
++	guint idx = 0;
 +	int ignored;
 +
 +	/* dnsmasq is probably already started; if it's the case, don't do
@@ -311,20 +312,24 @@
 +	nm_log_dbg (LOGD_DNS, "dnsmasq local caching DNS configuration:");
 +	nm_log_dbg (LOGD_DNS, "%s", conf->str);
 +
-+	argv[0] = find_dnsmasq ();
-+	argv[1] = "--no-resolv";  /* Use only commandline */
-+	argv[2] = "--keep-in-foreground";
-+	argv[3] = "--no-hosts"; /* don't use /etc/hosts to resolve */
-+	argv[4] = "--bind-interfaces";
-+	argv[5] = "--pid-file=" PIDFILE;
-+	argv[6] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
-+	argv[7] = "--conf-file=" CONFFILE;
-+	argv[8] = "--cache-size=0";
-+	argv[9] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
-+	argv[10] = "--enable-dbus";
-+	argv[11] = "--conf-dir=" CONFDIR;
-+	argv[12] = NULL;
-+
++	argv[idx++] = find_dnsmasq ();
++	argv[idx++] = "--no-resolv";  /* Use only commandline */
++	argv[idx++] = "--keep-in-foreground";
++	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
++	argv[idx++] = "--bind-interfaces";
++	argv[idx++] = "--pid-file=" PIDFILE;
++	argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
++	argv[idx++] = "--conf-file=" CONFFILE;
++	argv[idx++] = "--cache-size=0";
++	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
++	argv[idx++] = "--enable-dbus";
++
++	/* dnsmasq exits if the conf dir is not present */
++	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
++		argv[idx++] = "--conf-dir=" CONFDIR;
++
++	argv[idx++] = NULL;
++	g_warn_if_fail (idx <= G_N_ELEMENTS (argv));
 +
 +	/* And finally spawn dnsmasq */
 +	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
@@ -338,8 +343,8 @@
  update (NMDnsPlugin *plugin,
          const GSList *vpn_configs,
          const GSList *dev_configs,
-@@ -253,23 +307,29 @@ update (NMDnsPlugin *plugin,
-         const char *iface)
+@@ -260,24 +319,29 @@ update (NMDnsPlugin *plugin,
+         const char *hostname)
  {
  	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
 -	GString *conf;
@@ -347,10 +352,11 @@
 +	DBusConnection *connection;
 +	DBusMessage *message;
  	GSList *iter, *vpn_configs_copy;
--	const char *argv[12];
+-	const char *argv[15];
  	GError *error = NULL;
 -	int ignored;
 -	GPid pid = 0;
+-	guint idx = 0;
 +	gboolean have_dnsmasq = FALSE;
  	gboolean might_default = FALSE;
 +	gboolean ret = FALSE;
@@ -380,7 +386,7 @@
  
  	/* Work on a copy of the vpn_configs list because we might want to remove
  	 * some items from it, yet not affect other DNS plugins that might run
-@@ -286,9 +346,9 @@ update (NMDnsPlugin *plugin,
+@@ -294,9 +358,9 @@ update (NMDnsPlugin *plugin,
  			might_default = !nm_ip6_config_get_never_default (iter->data);
  		if (might_default) {
  			if (NM_IS_IP4_CONFIG (iter->data))
@@ -388,11 +394,11 @@
 +				add_ip4_config (message, NM_IP4_CONFIG (iter->data), FALSE);
  			else if (NM_IS_IP6_CONFIG (iter->data))
 -				add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE, iface);
-+				add_ip6_config (message, NM_IP6_CONFIG (iter->data), FALSE, iface);
++				add_ip6_config (message, NM_IP6_CONFIG (iter->data), FALSE);
  			vpn_configs_copy = g_slist_remove (vpn_configs_copy, iter->data);
  			break;
  		}
-@@ -297,9 +357,9 @@ update (NMDnsPlugin *plugin,
+@@ -305,9 +369,9 @@ update (NMDnsPlugin *plugin,
  	/* Use split DNS for remaining VPN configs */
  	for (iter = (GSList *) vpn_configs_copy; iter; iter = g_slist_next (iter)) {
  		if (NM_IS_IP4_CONFIG (iter->data))
@@ -400,11 +406,11 @@
 +			add_ip4_config (message, NM_IP4_CONFIG (iter->data), TRUE);
  		else if (NM_IS_IP6_CONFIG (iter->data))
 -			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), TRUE, iface);
-+			add_ip6_config (message, NM_IP6_CONFIG (iter->data), TRUE, iface);
++			add_ip6_config (message, NM_IP6_CONFIG (iter->data), TRUE);
  	}
  
  	/* Now add interface configs without split DNS, unless some VPN
-@@ -310,9 +370,9 @@ update (NMDnsPlugin *plugin,
+@@ -318,62 +382,84 @@ update (NMDnsPlugin *plugin,
  	if (!might_default) {
  		for (iter = (GSList *) dev_configs; iter; iter = g_slist_next (iter)) {
  			if (NM_IS_IP4_CONFIG (iter->data))
@@ -412,19 +418,18 @@
 +				add_ip4_config (message, NM_IP4_CONFIG (iter->data), FALSE);
  			else if (NM_IS_IP6_CONFIG (iter->data))
 -				add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE, iface);
-+				add_ip6_config (message, NM_IP6_CONFIG (iter->data), FALSE, iface);
++				add_ip6_config (message, NM_IP6_CONFIG (iter->data), FALSE);
  		}
  	}
  
-@@ -321,48 +381,75 @@ update (NMDnsPlugin *plugin,
- 	 */
+ 	/* And any other random configs */
  	for (iter = (GSList *) other_configs; iter; iter = g_slist_next (iter)) {
  		if (NM_IS_IP4_CONFIG (iter->data))
 -			add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
 +			add_ip4_config (message, NM_IP4_CONFIG (iter->data), FALSE);
  		else if (NM_IS_IP6_CONFIG (iter->data))
--			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE, iface);
-+			add_ip6_config (message, NM_IP6_CONFIG (iter->data), FALSE, iface);
+-			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
++			add_ip6_config (message, NM_IP6_CONFIG (iter->data), FALSE);
  	}
  
 -	/* Write out the config file */
@@ -435,39 +440,43 @@
 -		             error && error->message ? error->message : "(unknown)");
 -		g_clear_error (&error);
 +	if (!nm_dbus_manager_get_name_owner (priv->dbus_mgr, DNSMASQ_DBUS_SERVICE, &error)) {
-+		nm_log_err (LOGD_DNS, "dnsmasq not available on the bus, can't update servers.");
++		nm_log_warn (LOGD_DNS, "dnsmasq not available on the bus, can't update servers.");
 +		if (error)
 +			nm_log_err (LOGD_DNS, "dnsmasq owner not found on bus: %s", error->message);
  		goto out;
  	}
 -	ignored = chmod (CONFFILE, 0644);
- 
+-
 -	nm_log_dbg (LOGD_DNS, "dnsmasq local caching DNS configuration:");
 -	nm_log_dbg (LOGD_DNS, "%s", conf->str);
+ 
+-	argv[idx++] = find_dnsmasq ();
+-	argv[idx++] = "--no-resolv";  /* Use only commandline */
+-	argv[idx++] = "--keep-in-foreground";
+-	argv[idx++] = "--no-hosts"; /* don't use /etc/hosts to resolve */
+-	argv[idx++] = "--bind-interfaces";
+-	argv[idx++] = "--pid-file=" PIDFILE;
+-	argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
+-	argv[idx++] = "--conf-file=" CONFFILE;
+-	argv[idx++] = "--cache-size=0";
+-	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
 +	dbus_message_set_no_reply (message, TRUE);
  
--	argv[0] = find_dnsmasq ();
--	argv[1] = "--no-resolv";  /* Use only commandline */
--	argv[2] = "--keep-in-foreground";
--	argv[3] = "--no-hosts"; /* don't use /etc/hosts to resolve */
--	argv[4] = "--bind-interfaces";
--	argv[5] = "--pid-file=" PIDFILE;
--	argv[6] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
--	argv[7] = "--conf-file=" CONFFILE;
--	argv[8] = "--cache-size=0";
--	argv[9] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
--	argv[10] = "--conf-dir=" CONFDIR;
--	argv[11] = NULL;
+-	/* dnsmasq exits if the conf dir is not present */
+-	if (g_file_test (CONFDIR, G_FILE_TEST_IS_DIR))
+-		argv[idx++] = "--conf-dir=" CONFDIR;
 +	result = dbus_connection_send (connection, message, NULL);
 +	if (!result) {
 +		nm_log_err (LOGD_DNS, "Could not send dnsmasq SetServers method.");
 +		goto out;
 +	}
  
+-	argv[idx++] = NULL;
+-	g_warn_if_fail (idx <= G_N_ELEMENTS (argv));
++	ret = TRUE;
+ 
 -	/* And finally spawn dnsmasq */
 -	pid = nm_dns_plugin_child_spawn (NM_DNS_PLUGIN (self), argv, PIDFILE, "bin/dnsmasq");
-+	ret = TRUE;
-+
 +	/* If all the configs lists are empty, there is just nothing to be caching --
 +	 * we cleared up the dnsmasq cache; but we should also fail the update, so
 +	 * that we don't write 127.0.0.1 to resolv.conf.
@@ -520,7 +529,7 @@
  static const char *
  dm_exit_code_to_msg (int status)
  {
-@@ -440,13 +527,31 @@ nm_dns_dnsmasq_new (void)
+@@ -451,13 +537,31 @@ nm_dns_dnsmasq_new (void)
  static void
  nm_dns_dnsmasq_init (NMDnsDnsmasq *self)
  {
@@ -564,7 +573,7 @@
  	CHILD_QUIT,
  	LAST_SIGNAL
  };
-@@ -133,6 +134,12 @@ watch_cb (GPid pid, gint status, gpointe
+@@ -131,6 +132,12 @@ watch_cb (GPid pid, gint status, gpointe
  	g_free (priv->progname);
  	priv->progname = NULL;
  
@@ -577,7 +586,7 @@
  	g_signal_emit (self, signals[CHILD_QUIT], 0, status);
  }
  
-@@ -312,6 +319,15 @@ nm_dns_plugin_class_init (NMDnsPluginCla
+@@ -310,6 +317,15 @@ nm_dns_plugin_class_init (NMDnsPluginCla
  					  G_OBJECT_CLASS_TYPE (object_class),
  					  G_SIGNAL_RUN_FIRST,
  					  G_STRUCT_OFFSET (NMDnsPluginClass, failed),
@@ -597,7 +606,7 @@
 ===================================================================
 --- a/src/dns-manager/nm-dns-manager.c
 +++ b/src/dns-manager/nm-dns-manager.c
-@@ -781,6 +781,27 @@ update_dns (NMDnsManager *self,
+@@ -769,6 +769,27 @@ update_dns (NMDnsManager *self,
  }
  
  static void
@@ -613,7 +622,7 @@
 +
 +	/* Try to update DNS again; since it's now available on the bus this
 +	 * might work. */
-+	if (!update_dns (self, priv->last_iface, FALSE, &error)) {
++	if (!update_dns (self, FALSE, &error)) {
 +		nm_log_warn (LOGD_DNS, "could not commit DNS changes: (%d) %s",
 +		             error ? error->code : -1,
 +		             error && error->message ? error->message : "(unknown)");
@@ -625,7 +634,7 @@
  plugin_failed (NMDnsPlugin *plugin, gpointer user_data)
  {
  	NMDnsManager *self = NM_DNS_MANAGER (user_data);
-@@ -1079,6 +1100,9 @@ load_plugins (NMDnsManager *self, const
+@@ -1065,6 +1086,9 @@ load_plugins (NMDnsManager *self, const
  
  			nm_log_info (LOGD_DNS, "DNS: loaded plugin %s", nm_dns_plugin_get_name (plugin));
  			priv->plugins = g_slist_append (priv->plugins, plugin);
@@ -646,4 +655,4 @@
 +#define NM_DNS_PLUGIN_APPEARED "appeared"
  #define NM_DNS_PLUGIN_CHILD_QUIT "child-quit"
  
- typedef struct {
+ #define IP_CONFIG_IFACE_TAG "dns-manager-iface"

=== modified file 'debian/patches/dnsmasq-vpn-dns-filtering.patch'
--- debian/patches/dnsmasq-vpn-dns-filtering.patch	2012-07-27 19:02:50 +0000
+++ debian/patches/dnsmasq-vpn-dns-filtering.patch	2013-03-26 02:35:23 +0000
@@ -3,48 +3,29 @@
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/898224
 
 ---
- src/dns-manager/nm-dns-dnsmasq.c |   58 ++++++++++++++++++++++++++++++++-------
- 1 file changed, 48 insertions(+), 10 deletions(-)
+ src/dns-manager/nm-dns-dnsmasq.c |   48 +++++++++++++++++++++++++++++++--------
+ 1 file changed, 39 insertions(+), 9 deletions(-)
 
 Index: b/src/dns-manager/nm-dns-dnsmasq.c
 ===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -79,6 +79,9 @@ add_ip4_config (GString *str, NMIP4Confi
- 	if (split) {
- 		char **domains, **iter;
- 
-+		if (nm_ip4_config_get_num_nameservers (ip4) < 1)
-+			return FALSE;
-+
- 		/* FIXME: it appears that dnsmasq can only handle one nameserver
- 		 * per domain (and the manpage says this too) so only use the first
- 		 * nameserver here.
-@@ -188,6 +191,9 @@ add_ip6_config (GString *str, NMIP6Confi
- 	gboolean added = FALSE;
- 
- 	if (split) {
-+		if (nm_ip6_config_get_num_nameservers (ip6) < 1)
-+			return FALSE;
-+
- 		/* FIXME: it appears that dnsmasq can only handle one nameserver
- 		 * per domain (at the manpage seems to indicate that) so only use
- 		 * the first nameserver here.
-@@ -246,11 +252,12 @@ update (NMDnsPlugin *plugin,
+@@ -255,12 +255,13 @@ update (NMDnsPlugin *plugin,
  {
  	NMDnsDnsmasq *self = NM_DNS_DNSMASQ (plugin);
  	GString *conf;
 -	GSList *iter;
 +	GSList *iter, *vpn_configs_copy;
- 	const char *argv[12];
+ 	const char *argv[15];
  	GError *error = NULL;
  	int ignored;
  	GPid pid = 0;
+ 	guint idx = 0;
 +	gboolean might_default = FALSE;
  
  	/* Kill the old dnsmasq; there doesn't appear to be a way to get dnsmasq
  	 * to reread the config file using SIGHUP or similar.  This is a small race
-@@ -262,23 +269,54 @@ update (NMDnsPlugin *plugin,
+@@ -272,20 +273,49 @@ update (NMDnsPlugin *plugin,
  	/* Build up the new dnsmasq config file */
  	conf = g_string_sized_new (150);
  
@@ -63,7 +44,7 @@
 -			add_ip4_config (conf, NM_IP4_CONFIG (iter->data), TRUE);
 +			might_default = !nm_ip4_config_get_never_default (iter->data);
  		else if (NM_IS_IP6_CONFIG (iter->data))
--			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), TRUE, iface);
+-			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), TRUE);
 +			might_default = !nm_ip6_config_get_never_default (iter->data);
 +		if (might_default) {
 +			if (NM_IS_IP4_CONFIG (iter->data))
@@ -83,11 +64,10 @@
 -			add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
 +			add_ip4_config (conf, NM_IP4_CONFIG (iter->data), TRUE);
  		else if (NM_IS_IP6_CONFIG (iter->data))
--			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE, iface);
+-			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE);
 +			add_ip6_config (conf, NM_IP6_CONFIG (iter->data), TRUE, iface);
- 	}
- 
--	/* And any other random configs */
++	}
++
 +	/* Now add interface configs without split DNS, unless some VPN
 +	 * grabs the default route (in which case we should not install them
 +	 * at all, since even split DNS may fail, if the local subnet defines
@@ -100,11 +80,6 @@
 +			else if (NM_IS_IP6_CONFIG (iter->data))
 +				add_ip6_config (conf, NM_IP6_CONFIG (iter->data), FALSE, iface);
 +		}
-+	}
-+
-+	/* And any other random configs, which provides a backup route if
-+	 * you actually really want an extra dns server to be queried.
-+	 */
- 	for (iter = (GSList *) other_configs; iter; iter = g_slist_next (iter)) {
- 		if (NM_IS_IP4_CONFIG (iter->data))
- 			add_ip4_config (conf, NM_IP4_CONFIG (iter->data), FALSE);
+ 	}
+ 
+ 	/* And any other random configs */

=== modified file 'debian/patches/fix-vapigen-detection.patch'
--- debian/patches/fix-vapigen-detection.patch	2012-08-07 15:18:34 +0000
+++ debian/patches/fix-vapigen-detection.patch	2013-03-26 02:35:23 +0000
@@ -1,21 +1,7 @@
 ---
- configure.ac  |    2 +-
  m4/vapigen.m4 |    8 ++++----
- 2 files changed, 5 insertions(+), 5 deletions(-)
+ 1 file changed, 4 insertions(+), 4 deletions(-)
 
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -723,7 +723,7 @@ dnl -------------------------
- dnl Vala bindings
- dnl -------------------------
- 
--VAPIGEN_CHECK(0.17.1.24)
-+VAPIGEN_CHECK(0.17.1.24, 0.18)
- 
- dnl
- dnl Tests
 Index: b/m4/vapigen.m4
 ===================================================================
 --- a/m4/vapigen.m4

=== modified file 'debian/patches/lp859373_upgrade_policy_fix.patch'
--- debian/patches/lp859373_upgrade_policy_fix.patch	2011-10-13 15:22:07 +0000
+++ debian/patches/lp859373_upgrade_policy_fix.patch	2013-03-26 02:35:23 +0000
@@ -1,7 +1,11 @@
-Index: network-manager-0.9.1.90/policy/org.freedesktop.NetworkManager.policy.in
+---
+ policy/org.freedesktop.NetworkManager.policy.in.in |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+Index: b/policy/org.freedesktop.NetworkManager.policy.in.in
 ===================================================================
---- network-manager-0.9.1.90.orig/policy/org.freedesktop.NetworkManager.policy.in	2011-10-13 10:52:29.908601001 -0400
-+++ network-manager-0.9.1.90/policy/org.freedesktop.NetworkManager.policy.in	2011-10-13 10:52:59.712599672 -0400
+--- a/policy/org.freedesktop.NetworkManager.policy.in.in
++++ b/policy/org.freedesktop.NetworkManager.policy.in.in
 @@ -108,5 +108,14 @@
      </defaults>
    </action>

=== modified file 'debian/patches/lp990011_use_tempaddr_sysctl_default.patch'
--- debian/patches/lp990011_use_tempaddr_sysctl_default.patch	2012-08-15 20:31:55 +0000
+++ debian/patches/lp990011_use_tempaddr_sysctl_default.patch	2013-03-26 02:35:23 +0000
@@ -14,47 +14,29 @@
 sysctl instead of trying to read these files, but this will do for now ;)
 
 ---
- src/backends/NetworkManagerGeneric.c |   33 +++++++++++++++++++++++----------
- src/nm-device.c                      |    2 +-
- 2 files changed, 24 insertions(+), 11 deletions(-)
+ src/nm-device.c |   35 +++++++++++++++++++++++++----------
+ 1 file changed, 25 insertions(+), 10 deletions(-)
 
 Index: b/src/nm-device.c
 ===================================================================
 --- a/src/nm-device.c
 +++ b/src/nm-device.c
-@@ -2347,13 +2347,13 @@ real_act_stage3_ip6_config_start (NMDevi
- 	ip6_privacy = CLAMP (ip6_privacy, NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN, NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR);
+@@ -2513,6 +2513,14 @@ addrconf6_cleanup (NMDevice *self)
  
- 	switch (ip6_privacy) {
--	case NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN:
- 	case NM_SETTING_IP6_CONFIG_PRIVACY_DISABLED:
- 		ip6_privacy_str = "0\n";
- 	break;
- 	case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_PUBLIC_ADDR:
- 		ip6_privacy_str = "1\n";
- 	break;
-+	case NM_SETTING_IP6_CONFIG_PRIVACY_UNKNOWN:
- 	case NM_SETTING_IP6_CONFIG_PRIVACY_PREFER_TEMP_ADDR:
- 		ip6_privacy_str = "2\n";
- 	break;
-Index: b/src/backends/NetworkManagerGeneric.c
-===================================================================
---- a/src/backends/NetworkManagerGeneric.c
-+++ b/src/backends/NetworkManagerGeneric.c
-@@ -113,6 +113,12 @@ void nm_generic_update_dns (void)
- {
- }
+ /******************************************/
  
 +static const char *sysctl_conf_paths[] = {
++#ifdef TARGET_DEBIAN
 +	"/etc/sysctl.d/10-ipv6-privacy.conf",
-+        "/etc/sysctl.conf",
-+        NULL
++#endif /* TARGET_DEBIAN */
++	"/etc/sysctl.conf",
++	NULL
 +};
 +
- /*
-  * nm_generic_ipv6_use_tempaddr
-  *
-@@ -125,24 +131,30 @@ int nm_generic_ipv6_use_tempaddr (void)
+ /* Get net.ipv6.conf.default.use_tempaddr value from /etc/sysctl.conf or
+  * /lib/sysctl.d/sysctl.conf
+  */
+@@ -2522,24 +2530,30 @@ ip6_use_tempaddr (void)
  	char *contents = NULL;
  	gsize len = 0;
  	const char *group_name = "[forged_group]\n";
@@ -93,7 +75,7 @@
  		goto done;
  
  	tmp = g_key_file_get_integer (keyfile, "forged_group", "net.ipv6.conf.default.use_tempaddr", &error);
-@@ -150,11 +162,12 @@ int nm_generic_ipv6_use_tempaddr (void)
+@@ -2547,11 +2561,12 @@ ip6_use_tempaddr (void)
  		ret = tmp;
  
  done:

=== modified file 'debian/patches/nm-change-dnsmasq-parameters.diff'
--- debian/patches/nm-change-dnsmasq-parameters.diff	2012-07-27 19:05:00 +0000
+++ debian/patches/nm-change-dnsmasq-parameters.diff	2013-03-26 02:35:23 +0000
@@ -15,12 +15,12 @@
 ===================================================================
 --- a/src/dns-manager/nm-dns-dnsmasq.c
 +++ b/src/dns-manager/nm-dns-dnsmasq.c
-@@ -308,7 +308,7 @@ update (NMDnsPlugin *plugin,
- 	argv[5] = "--pid-file=" PIDFILE;
- 	argv[6] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
- 	argv[7] = "--conf-file=" CONFFILE;
--	argv[8] = "--cache-size=400";
-+	argv[8] = "--cache-size=0";
- 	argv[9] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
- 	argv[10] = "--conf-dir=" CONFDIR;
- 	argv[11] = NULL;
+@@ -315,7 +315,7 @@ update (NMDnsPlugin *plugin,
+ 	argv[idx++] = "--pid-file=" PIDFILE;
+ 	argv[idx++] = "--listen-address=127.0.0.1"; /* Should work for both 4 and 6 */
+ 	argv[idx++] = "--conf-file=" CONFFILE;
+-	argv[idx++] = "--cache-size=400";
++	argv[idx++] = "--cache-size=0";
+ 	argv[idx++] = "--proxy-dnssec"; /* Allow DNSSEC to pass through */
+ 
+ 	/* dnsmasq exits if the conf dir is not present */

=== modified file 'debian/patches/quit_dhclient_on_exit.patch'
--- debian/patches/quit_dhclient_on_exit.patch	2012-04-23 22:52:08 +0000
+++ debian/patches/quit_dhclient_on_exit.patch	2013-03-26 02:35:23 +0000
@@ -29,7 +29,7 @@
 ===================================================================
 --- a/src/nm-device.c
 +++ b/src/nm-device.c
-@@ -3600,6 +3600,7 @@ dispose (GObject *object)
+@@ -3801,6 +3801,7 @@ dispose (GObject *object)
  
  	priv->disposed = TRUE;
  
@@ -37,14 +37,14 @@
  	/* Don't down can-assume-connection capable devices that are activated with
  	 * a connection that can be assumed.
  	 */
-@@ -3624,6 +3625,7 @@ dispose (GObject *object)
+@@ -3825,6 +3826,7 @@ dispose (GObject *object)
  				take_down = FALSE;
  		}
  	}
 +#endif /* TARGET_DEBIAN */
  
  	/* Clear any queued transitions */
- 	queued_state_clear (self);
+ 	nm_device_queued_state_clear (self);
 Index: b/src/nm-manager.c
 ===================================================================
 --- a/src/nm-manager.c

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-22 18:37:26 +0000
+++ debian/patches/series	2013-03-26 02:35:23 +0000
@@ -1,9 +1,7 @@
+git_machine_id_duid_gen_1d14d17.patch
 fix-vapigen-detection.patch
-70_lp145653_no_sigaction_for_crashes.patch
 lp191889_always_offline_with_unmanaged_devices.patch
-50_gettext_macros.patch
 libnl3-cache-args.patch
-dhcpv6-duid-support.patch
 lp859373_upgrade_policy_fix.patch
 nm-change-dnsmasq-parameters.diff
 dnsmasq-vpn-dns-filtering.patch
@@ -20,4 +18,5 @@
 nm-ipv6-route-cache.patch
 adhoc_use_wpa_rsn_part1.patch
 adhoc_use_wpa_rsn_part2.patch
+bridge_ignore_without_connections.patch
 lp1099983_ignore-p2p-wifi-devices.patch

=== modified file 'debian/rules'
--- debian/rules	2013-01-18 15:29:52 +0000
+++ debian/rules	2013-03-26 02:35:23 +0000
@@ -20,27 +20,34 @@
     DPKG_GENSYMBOLS_ARGS := -c4
 endif
 
+EXTRA_CONFIGURE_FLAGS = --disable-silent-rules
+
 %:
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
+	dh_auto_configure -- $(EXTRA_CONFIGURE_FLAGS) \
 		--libexecdir=/usr/lib/NetworkManager \
 		--with-distro=debian \
 		--with-resolvconf=/sbin/resolvconf \
 		--with-dhclient=/sbin/dhclient \
 		--with-iptables=/sbin/iptables \
 		--with-crypto=nss \
+		--with-session-tracking=none \
+		--with-suspend-resume=upower \
 		--disable-more-warnings \
+		--enable-polkit=no \
+		--enable-ppp \
+		--enable-ifupdown \
 		--enable-introspection \
+		--enable-doc \
+		--enable-concheck \
 		--enable-vala \
-		--with-docs \
-		--enable-polkit=no \
-		--with-session-tracking=none
+		--with-tests \
 
 override_dh_install:
 	# Get rid of .la files.
-	find $(CURDIR)/debian/tmp -name '*.la' -exec rm -vf {} \;
+	find $(CURDIR)/debian/tmp -name '*.la' -delete
 	# Get rid of anything else we don't want to ever install.
 	rm -vf $(CURDIR)/debian/tmp/etc/init.d/NetworkManager
 	rm -vf $(CURDIR)/debian/tmp/usr/share/NetworkManager/gdb-cmd
@@ -71,7 +78,7 @@
 	dh_girepository -plibnm-glib4
 
 override_dh_auto_test:
-	dbus-test-runner -t dh_auto_test
+	dbus-test-runner -m 300 -t dh_auto_test
 
 override_dh_clean:
 	dh_clean
@@ -87,11 +94,16 @@
 	rm -f m4/intltool.m4 intltool-*.in
 	rm -f aclocal.m4
 	rm -f po/Makefile.in.in
-	
+
 override_dh_autoreconf:
-	intltoolize -f -c
-	gtkdocize --copy
-	dh_autoreconf
+	if [ -f ./autogen.sh ]; \
+	then \
+		NOCONFIGURE=1 dh_autoreconf ./autogen.sh; \
+	else \
+		gtkdocize; \
+		autopoint --force; \
+		AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose; \
+	fi
 
 GET_SOURCE = \
 	set -e; \

=== modified file 'debian/tests/dnsmasq'
--- debian/tests/dnsmasq	2012-09-07 19:38:51 +0000
+++ debian/tests/dnsmasq	2013-03-26 02:35:23 +0000
@@ -12,14 +12,17 @@
 
 class TestDnsmasq(unittest.TestCase):
 
+  dbus_address = ""
+
   @classmethod
   def setUpClass(self):
     dbus_daemon = subprocess.Popen(['dbus-daemon', '--nofork', '--print-address',
                                    '--config-file',
                                    os.path.join(aptdaemon.test.get_tests_dir(), 'dbus.conf')],
                                    stdout=subprocess.PIPE, universal_newlines=True)
-    dbus_address = dbus_daemon.stdout.readline().strip()
-    os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = dbus_address
+    self.dbus_address = dbus_daemon.stdout.readline().strip()
+    os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = self.dbus_address
+    print ("Using DBUS address: %s" % self.dbus_address)
 
     # in tests we need to make sure there are devices not defined in /e/n/i;
     # to ensure that, run the same script we run at install to migrate (comment out)
@@ -31,7 +34,12 @@
     subprocess.call(['NetworkManager', '--pid-file=./NM.pid'])
 
     # Give NM some time to settle up.
-    sleep(15)
+    sleep(30)
+
+    print("Available devices for NetworkManager:")
+    _nmcli = subprocess.Popen(['nmcli', 'dev' ],
+                              stdout=subprocess.PIPE, universal_newlines=True)
+    print(_nmcli.stdout.readline())
 
   def testDnsmasqRunning(self):
     processes = subprocess.check_output(['ps', '-A'], universal_newlines=True)
@@ -44,12 +52,14 @@
         if 'NetworkManager' in l:
           self.assertIn('--enable-dbus', l)
     
-    bus = dbus.SystemBus()
-    dnsmasq = bus.get_object('org.freedesktop.NetworkManager.dnsmasq',
-                             '/uk/org/thekelleys/dnsmasq')
-    dnsmasq_ver = dnsmasq.GetVersion()
-    print ("Dnsmasq version is " + dnsmasq_ver)
-    self.assertIsInstance(dnsmasq_ver, dbus.String)
+    bus = dbus.bus.BusConnection(self.dbus_address)
+    names = bus.list_names()
+    if ('org.freedesktop.Networkmanager.dnsmasq' in names): 
+        dnsmasq = bus.get_object('org.freedesktop.NetworkManager.dnsmasq',
+                                 '/uk/org/thekelleys/dnsmasq')
+        dnsmasq_ver = dnsmasq.GetVersion()
+        print ("Dnsmasq version is " + dnsmasq_ver)
+        self.assertIsInstance(dnsmasq_ver, dbus.String)
 
 unittest.main(testRunner=unittest.TextTestRunner(stream=sys.stdout, verbosity=2))