Merge lp://staging/~awe/network-manager/update-1.2 into lp://staging/~network-manager/network-manager/ubuntu

Proposed by Tony Espy
Status: Merged
Merged at revision: 1018
Proposed branch: lp://staging/~awe/network-manager/update-1.2
Merge into: lp://staging/~network-manager/network-manager/ubuntu
Diff against target: 12570 lines (+3949/-6206)
78 files modified
debian/changelog (+72/-0)
debian/control (+7/-6)
debian/copyright (+27/-2)
debian/libnm-glib4.symbols (+4/-0)
debian/libnm-util2.symbols (+4/-0)
debian/libnm0.symbols (+215/-11)
debian/network-manager-dev.install (+1/-0)
debian/network-manager.dirs (+2/-1)
debian/network-manager.install (+1/-2)
debian/network-manager.maintscript (+5/-4)
debian/network-manager.upstart (+0/-24)
debian/patches/0001-Debian-specific-tweaks-for-NetworkManager-systemd-se.patch (+0/-33)
debian/patches/0001-dns-use-DBus-to-make-dnsmasq-nameserver-changes.patch (+428/-394)
debian/patches/0001-libnm-libnm-util-add-Wi-Fi-powersave-property.patch (+0/-253)
debian/patches/0001-wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch (+0/-108)
debian/patches/0001-wwan-add-support-for-using-oFono-as-a-modem-manager.patch (+0/-1653)
debian/patches/0002-Force-online-state-with-unmanaged-devices.patch (+0/-194)
debian/patches/0002-fixup-libnm-libnm-util-add-Wi-Fi-powersave-property.patch (+0/-30)
debian/patches/0002-wifi-cull-the-scan-list-before-signalling-ScanDone-b.patch (+0/-171)
debian/patches/0002-wifi-expose-the-last_seen-property-for-a-NMAccessPoi.patch (+0/-337)
debian/patches/0003-Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch (+0/-61)
debian/patches/0003-cli-add-support-for-wifi.powersave-setting.patch (+0/-89)
debian/patches/0004-Use-symlinks-for-nmtui.patch (+0/-35)
debian/patches/0004-wifi-set-wireless-power-save-for-nl80211-devices-whe.patch (+0/-242)
debian/patches/0005-Mark-virtual-ethernet-interfaces-as-unmanaged.patch (+0/-69)
debian/patches/0005-fixup-wifi-set-wireless-power-save-for-nl80211-devic.patch (+0/-50)
debian/patches/0008-Use-the-correct-path-when-calling-dnssec-trigger-scr.patch (+0/-23)
debian/patches/0019-Don-t-make-NetworkManager-D-Bus-activatable.patch (+0/-40)
debian/patches/Check-at-runtime-whether-to-start-ModemManager.patch (+70/-0)
debian/patches/Debian-specific-tweaks-for-NetworkManager-systemd-se.patch (+34/-0)
debian/patches/Don-t-block-network.target-on-NetworkManager-wait-on.patch (+54/-0)
debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch (+40/-0)
debian/patches/Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch (+77/-0)
debian/patches/Fix-iscsiadm-path.patch (+23/-0)
debian/patches/Force-online-state-with-unmanaged-devices.patch (+193/-0)
debian/patches/add_ofono_settings_support.patch (+169/-179)
debian/patches/add_sendsigs_omissions.patch (+0/-40)
debian/patches/adhoc_use_wpa_rsn_part1.patch (+12/-12)
debian/patches/adhoc_use_wpa_rsn_part2.patch (+83/-42)
debian/patches/conditional_libteam_tests.patch (+2/-2)
debian/patches/default_powersave_on.patch (+5/-4)
debian/patches/demarshal_int64_properties.patch (+0/-23)
debian/patches/disable_general_with_expect_test.patch (+4/-4)
debian/patches/dnsmasq-vpn-dns-filtering.patch (+65/-65)
debian/patches/fix-NetworkManager-wait-online.service.patch (+0/-28)
debian/patches/fix-arping-path.patch (+38/-0)
debian/patches/git_avoid_conflict_reinstall_dev_route_e439478c.patch (+0/-377)
debian/patches/git_config_parse_cmdline_args_8a22a981.patch (+0/-33)
debian/patches/git_fix_broken_ssid_01.patch (+0/-41)
debian/patches/git_fix_broken_ssid_02.patch (+0/-26)
debian/patches/git_fix_duplicate_unittest_names_7b70a840.patch (+0/-247)
debian/patches/git_fix_race_external_down_e29ab543.patch (+0/-111)
debian/patches/git_route_fixes_part1_207ab013.patch (+0/-109)
debian/patches/git_route_fixes_part2_529591d8.patch (+0/-106)
debian/patches/git_set_vpn_mtu_9736327b.patch (+0/-53)
debian/patches/ignore_rfkill_if_urfkill_is_present.patch (+144/-166)
debian/patches/ignore_rild_modem_devices.patch (+3/-3)
debian/patches/lp1099983_ignore-p2p-wifi-devices.patch (+3/-3)
debian/patches/lp1425172-fix-wifi-scanlist-cull.patch (+0/-33)
debian/patches/lp1444162-add-ip6-config-to-nm-ofono-connections.patch (+0/-47)
debian/patches/lp1445080-modify-device-modem-avail.patch (+3/-4)
debian/patches/lp1445080-nm-modem-check-for-set-mm-enabled-func.patch (+0/-32)
debian/patches/lp1446689_git_use_kernel_pppoe_6fdfb031.patch (+0/-138)
debian/patches/lp1461593-add-modem-reconnect-delay-to-policy.patch (+9/-18)
debian/patches/lp1461593-add-nm-settings-connection-reset-retries-methods.patch (+24/-24)
debian/patches/lp1496434_warn_on_invalid_new_link.patch (+0/-35)
debian/patches/lp1499827_device_avoid_undefined_mtu_c44069c1.patch (+0/-22)
debian/patches/lp1499827_dont_change_unset_mtu_a92d8b0c.patch (+0/-46)
debian/patches/lp936712_dnsmasq_ip6_ns_ordering.patch (+2/-2)
debian/patches/monotonic_timestamp_as_boottime.patch (+0/-115)
debian/patches/nm-change-dnsmasq-parameters.diff (+10/-11)
debian/patches/prioritize_3g_later.patch (+0/-52)
debian/patches/quit_dhclient_on_exit.patch (+0/-68)
debian/patches/series (+15/-46)
debian/patches/whoopsie-daisy-dbus-support.patch (+3/-3)
debian/patches/wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch (+94/-0)
debian/patches/wwan-add-ofono-modem-support.patch (+1984/-0)
debian/rules (+20/-4)
To merge this branch: bzr merge lp://staging/~awe/network-manager/update-1.2
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Pending
Review via email: mp+291271@code.staging.launchpad.net

Description of the change

This is an update of lp:~cyphermox/network-manager/update-1.2 to rebase it on the recently released NM 1.2 rc1 release ( 1.1.93 ).

The update drops the following patches which have been upstreamed:

  - tests-fix-bashism-in-run-test-dbus-session.sh.patch
  - wifi-hack-for-wext-devices-reporting-IW_MODE_AUTO-configu.patch
  - lp1496434_warn_on_invalid_new_link.patch

The remaining patches have been refreshed where needed, and the issue with incorrect nameservers fixed in the d/p/0001-dns-use-DBus-to-make-dnsmasq-nameserver-changes.patch.

Tested WPA2 WiFi on my Thinkpad 410s, and also tested that the Canonical VPN works correctly.

To post a comment you must log in.
1031. By Tony Espy

Remove stale lp1444162-add-ip6-config-to-nm-ofono-connections.patch

Already folded into add_ofono_settings_support.patch.

1032. By Tony Espy

Removed stale lp1445080-nm-modem-check-for-set-mm-enabled-func.patch

Code has been upstreamed.

1033. By Tony Espy

Rename ignore_rmnet_devices.path to ignore_rild_modem_devices.patch

1034. By Tony Espy

Restore wifi-Signal-on-the-wifi-device-when-its-supplicant-i.patch

1035. By Tony Espy

wwan-add-ofono-modem-support.patch: fix crash

Fix a crash caused by a bad update of the patch, which failed
to remove a g_error call from NM_ASSERT_VALID_PATH_COMPONENT
( which was removed in the earlier version of the patch ).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches