Created by Marius B. Kotsbak on 2012-10-09 and last modified on 2012-10-09
Get this branch:
bzr branch lp:~mariusko/network-manager/ubuntu_refresh_patches_for_upstream
Only Marius B. Kotsbak can upload to this branch. If you are Marius B. Kotsbak please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Marius B. Kotsbak

Recent revisions

584. By Marius B. Kotsbak on 2012-10-09

Refreshed the patches for current upstream master version.

Dropped some patches/hunks that are implemented upstream.

583. By Mathieu Trudel-Lapierre on 2012-09-14

releasing version

582. By Mathieu Trudel-Lapierre on 2012-09-14

debian/network-manager.dnsmasq: Drop "except-interface=lo", since we don't
listen on directly anymore and keeping that directive has the
tendency to break system-wide instances of dnsmasq which would write out to /etc/resolv.conf but never listen on that IP. (LP: #1044388)

581. By Mathieu Trudel-Lapierre on 2012-09-07

releasing version

580. By Mathieu Trudel-Lapierre on 2012-09-07

* debian/tests/nm: drop the test testNMConnected; in a build environment it
  tends to be racy; sometimes NM isn't quite ready to transition to the
  CONNECTING or CONNECTED states, we don't want to hold things up because of
  it. (LP: #1047224)
* debian/tests/dnsmasq: update the test to correctly point to the new DBus
  address for NetworkManager's dnsmasq instance. (LP: #1047221)

579. By Mathieu Trudel-Lapierre on 2012-09-07

debian/patches/adhoc_use_wpa_rsn_part2.patch: Re-enable WPA for Adhoc; but
use WPA2/RSN for encryption rather than WPA-None, which is clearly broken.
(LP: #1046918)

578. By Mathieu Trudel-Lapierre on 2012-08-30

releasing version

577. By Mathieu Trudel-Lapierre on 2012-08-29

debian/patches/nm-ipv6-route-cache.patch: don't re-add routes we receive
from kernel notifications to the routing table if they have the
RTM_F_CLONED flag; since that means they're host routes used temporarily
by the kernel to reach a specific destination; keeping them would cause at
least issues with VPNs, and possibly confusion with routing daemons.
Thanks to Ben Jenks for the patch. (LP: #1038541)

576. By Mathieu Trudel-Lapierre on 2012-08-21

releasing version

575. By Mathieu Trudel-Lapierre on 2012-08-17

debian/patches/dns-dnsmasq-interface-and-dbus-path.patch: set the address
dnsmasq (and bind) plugins should listen on for DNS resolution to,
as opposed to to avoid conflicts with other instances that might
need to run on the system with that address.
Also set the dnsmasq DBus service name to our own custom name:
org.freedesktop.NetworkManager.dnsmasq, which will also avoid conflicting
with other dnsmasq instances which might have --enable-dbus enabled.
(LP: #1034946)

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.