diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 155 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch | 4 | ||||
| -rw-r--r-- | debian/patches/Fix-arping-path.patch | 38 | ||||
| -rw-r--r-- | debian/patches/Force-online-state-with-unmanaged-devices.patch | 10 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
6 files changed, 168 insertions, 50 deletions
diff --git a/debian/changelog b/debian/changelog index 4bf58f75..a110fb29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,75 @@ +network-manager (1.12.4-1ubuntu1) UNRELEASED; urgency=medium + + * Merge with Debian (LP: #1795704). Remaining changes: + - Use systemd-resolved instead of dnsmasq + - debian/control: + + Depend on isc-dhcp-client instead of recommends + + Recommend network-manager-pptp + + Suggest avahi-autoipd for IPv4LL support + - debian/rules, debian/network-manager.postinst: + + Don't restart NetworkManager on upgrade but recommend restarting + the computer + - debian/rules, debian/network-manager.postinst: + + Don't install sysvinit scripts or migrate from sysvinit + - debian/network-manager.postinst: + + Don't add the netdev group. + + drop in an empty override file for NetworkManager to manage all + devices for upgrade from any version, as long as there is no + netplan configuration yet. + - debian/network-manager.maintscript + + Remove /etc/dbus-1/system.d/nm-ofono.conf + - debian/default-wifi-powersave-on.conf, debian/rules: + + Install a config file to enable WiFi powersave + - Enable build tests + - Add autopkgtests + - debian/source_network-manager.py, debian/network-manager.install, + debian/network-manager.links: Add apport hook + - Add network-manager-config-connectivity-ubuntu package + - NetworkManager.conf: disable MAC randomization feature. There is no + easy way for desktop users to disable this feature yet. And there are + reports that it doesn't work well with some systems. + - Update Vcs links to point to Ubuntu branch + - Add patches. See patch descriptions for more details: + + Provide-access-to-some-of-NM-s-interfaces-to-whoopsie.patch + + Update-dnsmasq-parameters.patch + + Disable-general-with-expect.patch + + libnm-Check-self-still-NMManager-or-not.patch + + dns-manager-don-t-merge-split-DNS-search-domains.patch (but disabled) + + Read-system-connections-from-run.patch + - debian/tests/urfkill-integration - don't stop/start network manager + + -- Iain Lane <iain.lane@canonical.com> Wed, 03 Oct 2018 09:27:59 +0100 + +network-manager (1.12.4-1) unstable; urgency=medium + + * New upstream version 1.12.4 + * Rebase patches + + -- Michael Biebl <biebl@debian.org> Sun, 23 Sep 2018 10:23:25 +0200 + +network-manager (1.12.2-3) unstable; urgency=medium + + [ Simon McVittie ] + * Apply patch from upstream to fix FTBFS with GLib 2.57 (Closes: #906965) + + -- Michael Biebl <biebl@debian.org> Tue, 04 Sep 2018 16:07:24 +0200 + +network-manager (1.12.2-2) unstable; urgency=medium + + * Fix compile error due to NM_AVAILABLE_IN_1_12_2 macro (Closes: #905372) + + -- Michael Biebl <biebl@debian.org> Sun, 05 Aug 2018 15:00:41 +0200 + +network-manager (1.12.2-1) unstable; urgency=medium + + * New upstream version 1.12.2 + - Robustness fixes to connectivity checking (Closes: #903996) + * Rebase patches + * Update symbols file for libnm0 + * Bump Standards-Version to 4.1.5 + + -- Michael Biebl <biebl@debian.org> Wed, 25 Jul 2018 13:35:31 +0200 + network-manager (1.12.2-0ubuntu5) cosmic; urgency=medium * debian/tests/nm: Add the required `gi.require_version()` calls - thanks to @@ -56,6 +128,89 @@ network-manager (1.12.2-0ubuntu1) cosmic; urgency=medium -- Sebastien Bacher <seb128@ubuntu.com> Fri, 24 Aug 2018 09:27:39 +0200 +network-manager (1.12.0-5) unstable; urgency=medium + + * manager: accept non-null device for VPN activations (Closes: #903109) + + -- Michael Biebl <biebl@debian.org> Thu, 12 Jul 2018 13:24:13 +0200 + +network-manager (1.12.0-4) unstable; urgency=medium + + * Add Conflicts to network-manager-dev against deprecated libraries. + The deprecated libnm-glib-dev, libnm-glib-vpn-dev and libnm-util-dev + require header files from network-manager-dev which are no longer + provided in newer versions. Add Conflicts to network-manager-dev to + ensure that we don't get a broken combination of installed packages. + (Closes: #903029) + * Update description of network-manager-dev + + -- Michael Biebl <biebl@debian.org> Thu, 05 Jul 2018 13:48:51 +0200 + +network-manager (1.12.0-3) unstable; urgency=medium + + * Increase timeout in test-nm-client to 30s. + On slow architectures it can take longer then 3s for the test service to + start up. + + -- Michael Biebl <biebl@debian.org> Thu, 05 Jul 2018 03:58:53 +0200 + +network-manager (1.12.0-2) unstable; urgency=medium + + * Upload to unstable + + -- Michael Biebl <biebl@debian.org> Tue, 03 Jul 2018 23:55:36 +0200 + +network-manager (1.12.0-1) experimental; urgency=medium + + * New upstream version 1.12.0 + * Rebase patches + + -- Michael Biebl <biebl@debian.org> Sun, 01 Jul 2018 21:14:07 +0200 + +network-manager (1.11.90-2) experimental; urgency=medium + + * Drop libnl3 build dependency. + Upstream has copied the code directly from libnl3 for the few functions it + needs with a few small modifications. + * Drop libiw build dependency. + Hasn't been needed for a long time and was simply a left over from older + releases. + * Cherry-pick upstream fixes to make test suite pass on slower buildds + + -- Michael Biebl <biebl@debian.org> Mon, 18 Jun 2018 14:15:40 +0200 + +network-manager (1.11.90-1) experimental; urgency=medium + + * New upstream version 1.11.90 (1.12 rc1) + * Rebase patches + * Update symbols file for libnm0 + + -- Michael Biebl <biebl@debian.org> Sun, 17 Jun 2018 15:43:10 +0200 + +network-manager (1.11.4-1) experimental; urgency=medium + + * New upstream version 1.11.4 + * Update install path for plugins, it now includes a version number + * Update symbols file for libnm0 + * Make sure the example server.conf is actually installed + * Rebase patches + * Drop dh_strip override, the dbgsym migration is done + * Enable iwd support + * Drop version requirements when oldstable ships a newer version + + -- Michael Biebl <biebl@debian.org> Mon, 11 Jun 2018 13:28:39 +0200 + +network-manager (1.11.3-1) experimental; urgency=medium + + * New upstream version 1.11.3 + * Rebase patches + * Update symbols file for libnm0 + * Drop inetutils-arputils Suggests. + The ACD functionality of NetworkManager is no longer using arping, so + the Suggests is no longer useful. + + -- Michael Biebl <biebl@debian.org> Mon, 23 Apr 2018 23:35:35 +0200 + network-manager (1.10.8-1ubuntu4) cosmic; urgency=medium * debian/10-globally-managed-devices.conf: adjust exception for wwan to diff --git a/debian/control b/debian/control index 8c56baea..7f83ff9e 100644 --- a/debian/control +++ b/debian/control @@ -95,9 +95,13 @@ Section: devel Architecture: linux-any Multi-Arch: same Depends: ${misc:Depends} +Conflicts: libnm-glib-dev, + libnm-glib-vpn-dev, + libnm-util-dev, Description: network management framework (development files) - This package provides general header and development files and documentation - of configuration formats, command line utilities and the D-Bus API. + This package provides documentation of the NetworkManager D-Bus API, the + configuration formats and command line utilities. + It also provides D-Bus introspection files. Package: libnm-glib4 Section: libs diff --git a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch index 51d0a0b2..b8a4c486 100644 --- a/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch +++ b/debian/patches/Don-t-make-NetworkManager-D-Bus-activatable.patch @@ -10,10 +10,10 @@ to be autostarted by a client request. 2 files changed, 6 deletions(-) diff --git a/Makefile.am b/Makefile.am -index b1a2e69..b168008 100644 +index 0b8becd..1803e1a 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -3894,11 +3894,6 @@ endif +@@ -3895,11 +3895,6 @@ endif data/NetworkManager-dispatcher.service: $(srcdir)/data/NetworkManager-dispatcher.service.in $(AM_V_GEN) $(data_edit) $< >$@ diff --git a/debian/patches/Fix-arping-path.patch b/debian/patches/Fix-arping-path.patch deleted file mode 100644 index f56e3d8f..00000000 --- a/debian/patches/Fix-arping-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Laurent Bigonville <bigon@bigon.be> -Date: Mon, 27 Oct 2014 11:08:02 +0100 -Subject: Fix arping path - -Debian provides two arping implementations: -/usr/sbin/arping, shipped by the arping package, -/usr/bin/arping, shipped by the iputils-arping package. - -They aren't completely command line compatible, so we choose the one -which upstream (Fedora) is using, i.e. iputils-arping. - -Closes: #755039 ---- - src/devices/nm-arping-manager.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c -index 51f80e0..3564acc 100644 ---- a/src/devices/nm-arping-manager.c -+++ b/src/devices/nm-arping-manager.c -@@ -223,7 +223,7 @@ nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **er - - priv->completed = 0; - -- argv[0] = nm_utils_find_helper ("arping", NULL, NULL); -+ argv[0] = nm_utils_find_helper ("arping", "/usr/bin/arping", NULL); - if (!argv[0]) { - g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, - "arping could not be found"); -@@ -343,7 +343,7 @@ send_announcements (NMArpingManager *self, const char *mode_arg) - return; - } - -- argv[0] = nm_utils_find_helper ("arping", NULL, NULL); -+ argv[0] = nm_utils_find_helper ("arping", "/usr/bin/arping", NULL); - if (!argv[0]) { - _LOGW ("arping could not be found; no ARPs will be sent"); - return; diff --git a/debian/patches/Force-online-state-with-unmanaged-devices.patch b/debian/patches/Force-online-state-with-unmanaged-devices.patch index 094c39be..022154c6 100644 --- a/debian/patches/Force-online-state-with-unmanaged-devices.patch +++ b/debian/patches/Force-online-state-with-unmanaged-devices.patch @@ -12,7 +12,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=512286 1 file changed, 115 insertions(+) diff --git a/src/nm-manager.c b/src/nm-manager.c -index 289dcf8..1b657fe 100644 +index ad90616..d5f0f95 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -62,6 +62,8 @@ @@ -73,7 +73,7 @@ index 289dcf8..1b657fe 100644 if ( new_state >= NM_STATE_CONNECTED_LOCAL && priv->connectivity_state == NM_CONNECTIVITY_FULL) { new_state = NM_STATE_CONNECTED_GLOBAL; -@@ -5872,6 +5902,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, +@@ -5884,6 +5914,62 @@ impl_manager_check_connectivity (NMDBusObject *obj, nm_auth_chain_add_call (chain, NM_AUTH_PERMISSION_NETWORK_CONTROL, TRUE); } @@ -136,7 +136,7 @@ index 289dcf8..1b657fe 100644 static void start_factory (NMDeviceFactory *factory, gpointer user_data) { -@@ -6022,6 +6108,9 @@ nm_manager_start (NMManager *self, GError **error) +@@ -6034,6 +6120,9 @@ nm_manager_start (NMManager *self, GError **error) nm_clear_g_source (&priv->devices_inited_id); priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL); @@ -146,7 +146,7 @@ index 289dcf8..1b657fe 100644 return TRUE; } -@@ -6885,6 +6974,22 @@ nm_manager_init (NMManager *self) +@@ -6897,6 +6986,22 @@ nm_manager_init (NMManager *self) KERNEL_FIRMWARE_DIR); } @@ -169,7 +169,7 @@ index 289dcf8..1b657fe 100644 /* Update timestamps in active connections */ priv->timestamp_update_id = g_timeout_add_seconds (300, (GSourceFunc) periodic_update_active_connection_timestamps, self); -@@ -7160,6 +7265,16 @@ dispose (GObject *object) +@@ -7172,6 +7277,16 @@ dispose (GObject *object) g_clear_object (&priv->fw_monitor); } diff --git a/debian/patches/series b/debian/patches/series index 7639a789..7e32455e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,6 +8,3 @@ Disable-general-with-expect.patch libnm-Check-self-still-NMManager-or-not.patch #dns-manager-don-t-merge-split-DNS-search-domains.patch Read-system-connections-from-run.patch -git-newglib-test.patch -version-fix-compile-error-due-to-NM_AVAILABLE_IN_1_12_2-m.patch -utils-test-don-t-assert-on-debug-level-messages.patch |